From 5bfd6d44918c0a442baf4b085fd7349fcd18744f Mon Sep 17 00:00:00 2001 From: Monson Shao Date: Sun, 17 Jan 2021 06:10:04 +0800 Subject: [PATCH 0001/1522] unixtools: use real provider name instead of inaccurate version The version "1003.1-2008" comes from IEEE Std but is not quite accurate. Using the provider name could give us more info in store path. --- pkgs/top-level/unixtools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index b4f708ad565..b7fea20b76b 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -19,7 +19,7 @@ let provider = providers.${stdenv.hostPlatform.parsed.kernel.name} or providers.linux; bin = "${getBin provider}/bin/${cmd}"; manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; - in runCommand "${cmd}-${version}" { + in runCommand "${cmd}-${provider.name}" { meta = { priority = 10; platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all; @@ -43,7 +43,7 @@ let # more is unavailable in darwin # so we just use less - more_compat = runCommand "more-${version}" {} '' + more_compat = runCommand "more-${pkgs.less.name}" {} '' mkdir -p $out/bin ln -s ${pkgs.less}/bin/less $out/bin/more ''; From cd168c56c7e0b9f21d5d5a544e2d3125dfcb6918 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 00:31:15 +0000 Subject: [PATCH 0002/1522] petsc: 3.14.2 -> 3.14.3 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index a1e9d1e3051..de1c11a98e1 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.14.2"; + version = "3.14.3"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9"; + sha256 = "sha256-1rdyLNSH8jMkmIg88uHMN3ZXqTHAtzU1adybJEZzJ9M="; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; From 1c2a2b0a0848d58407fb4ff73a8dc1e854f5a270 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 25 Jan 2021 13:57:48 +0700 Subject: [PATCH 0003/1522] treewide: fold -> foldr --- lib/attrsets.nix | 8 ++++---- lib/deprecated.nix | 10 +++++----- lib/trivial.nix | 2 +- nixos/doc/manual/default.nix | 2 +- nixos/modules/config/users-groups.nix | 2 +- nixos/modules/misc/nixpkgs.nix | 2 +- nixos/modules/services/backup/znapzend.nix | 2 +- nixos/modules/services/mail/postfix.nix | 4 ++-- nixos/modules/services/networking/autossh.nix | 2 +- nixos/modules/services/networking/nylon.nix | 2 +- nixos/modules/services/networking/quicktun.nix | 2 +- nixos/modules/services/networking/tinc.nix | 2 +- nixos/modules/services/networking/wakeonlan.nix | 2 +- nixos/modules/system/activation/top-level.nix | 2 +- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/tasks/encrypted-devices.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 2 +- pkgs/tools/typesetting/tex/nix/default.nix | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index d91d7a0cd47..d8bc73ca874 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -5,7 +5,7 @@ let inherit (builtins) head tail length; inherit (lib.trivial) and; inherit (lib.strings) concatStringsSep sanitizeDerivationName; - inherit (lib.lists) fold concatMap concatLists; + inherit (lib.lists) fold foldr concatMap concatLists; in rec { @@ -152,8 +152,8 @@ rec { => { a = [ 2 3 ]; } */ foldAttrs = op: nul: list_of_attrs: - fold (n: a: - fold (name: o: + foldr (n: a: + foldr (name: o: o // { ${name} = op n.${name} (a.${name} or nul); } ) a (attrNames n) ) {} list_of_attrs; @@ -433,7 +433,7 @@ rec { => true */ matchAttrs = pattern: attrs: assert isAttrs pattern; - fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: + foldr and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in if length values == 1 then false else if isAttrs pat then isAttrs val && matchAttrs pat val diff --git a/lib/deprecated.nix b/lib/deprecated.nix index be0ef904c66..ddce69f160c 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -77,11 +77,11 @@ rec { # Output : are reqs satisfied? It's asserted. checkReqs = attrSet: argList: condList: ( - fold lib.and true + foldr lib.and true (map (x: let name = (head x); in ((checkFlag attrSet name) -> - (fold lib.and true + (foldr lib.and true (map (y: let val=(getValue attrSet argList y); in (val!=null) && (val!=false)) (tail x))))) condList)); @@ -177,7 +177,7 @@ rec { # merge attributes with custom function handling the case that the attribute # exists in both sets mergeAttrsWithFunc = f: set1: set2: - fold (n: set: if set ? ${n} + foldr (n: set: if set ? ${n} then setAttr set n (f set.${n} set2.${n}) else set ) (set2 // set1) (attrNames set2); @@ -196,7 +196,7 @@ rec { mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"], overrideSnd ? [ "buildPhase" ] }: attrs1: attrs2: - fold (n: set: + foldr (n: set: setAttr set n ( if set ? ${n} then # merge if elem n mergeLists # attribute contains list, merge them by concatenating @@ -224,7 +224,7 @@ rec { mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; } // (maybeAttr "mergeAttrBy" {} x) // (maybeAttr "mergeAttrBy" {} y); in - fold lib.mergeAttrs {} [ + foldr lib.mergeAttrs {} [ x y (mapAttrs ( a: v: # merge special names using given functions if x ? ${a} diff --git a/lib/trivial.nix b/lib/trivial.nix index 268f39d3210..5ee7fc99206 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -305,7 +305,7 @@ rec { warn = msg: builtins.trace "warning: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; - showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings; + showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings; ## Function annotations diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index af7a2e08220..151743d9fb5 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -12,7 +12,7 @@ let # E.g. if some `options` came from modules in ${pkgs.customModules}/nix, # you'd need to include `extraSources = [ pkgs.customModules ]` prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); - stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; + stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip; optionsDoc = buildPackages.nixosOptionsDoc { inherit options revision; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 5b3e9a8ceb7..051693d3ff8 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -386,7 +386,7 @@ let }; }; - idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: + idsAreUnique = set: idAttr: !(foldr (name: args@{ dup, acc }: let id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set)); exists = builtins.hasAttr id acc; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8160bfef4a3..a2ac5c58528 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -39,7 +39,7 @@ let if c x then true else lib.traceSeqN 1 x false; in traceXIfNot isConfig; - merge = args: fold (def: mergeConfig def.value) {}; + merge = args: foldr (def: mergeConfig def.value) {}; }; overlayType = mkOptionType { diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 0ca71b413ce..debb2a39705 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -279,7 +279,7 @@ let src_plan = plan; tsformat = timestampFormat; zend_delay = toString sendDelay; - } // fold (a: b: a // b) {} ( + } // foldr (a: b: a // b) {} ( map mkDestAttrs (builtins.attrValues destinations) ); diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 1dcdcab8d48..8fd3ef18c0d 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -193,7 +193,7 @@ let # We need to handle the last column specially here, because it's # open-ended (command + args). lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf); - in fold foldLine (genList (const 0) (length labels)) lines; + in foldr foldLine (genList (const 0) (length labels)) lines; # Pad a string with spaces from the right (opposite of fixedWidthString). pad = width: str: let @@ -202,7 +202,7 @@ let in str + optionalString (padWidth > 0) padding; # It's + 2 here, because that's the amount of spacing between columns. - fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths; + fullWidth = foldr (width: acc: acc + width + 2) 0 maxWidths; formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line); diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix index a8d9a027e9f..245f2bfc2cf 100644 --- a/nixos/modules/services/networking/autossh.nix +++ b/nixos/modules/services/networking/autossh.nix @@ -79,7 +79,7 @@ in systemd.services = - lib.fold ( s : acc : acc // + lib.foldr ( s : acc : acc // { "autossh-${s.name}" = let diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index bfc358cb12f..a20fa615af8 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -160,7 +160,7 @@ in users.groups.nylon.gid = config.ids.gids.nylon; - systemd.services = fold (a: b: a // b) {} nylonUnits; + systemd.services = foldr (a: b: a // b) {} nylonUnits; }; } diff --git a/nixos/modules/services/networking/quicktun.nix b/nixos/modules/services/networking/quicktun.nix index fb783c83646..438e67d5ebb 100644 --- a/nixos/modules/services/networking/quicktun.nix +++ b/nixos/modules/services/networking/quicktun.nix @@ -87,7 +87,7 @@ with lib; }; config = mkIf (cfg != []) { - systemd.services = fold (a: b: a // b) {} ( + systemd.services = foldr (a: b: a // b) {} ( mapAttrsToList (name: qtcfg: { "quicktun-${name}" = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index b6afd83a9ab..9e433ad1a98 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -351,7 +351,7 @@ in config = mkIf (cfg.networks != { }) { - environment.etc = fold (a: b: a // b) { } + environment.etc = foldr (a: b: a // b) { } (flip mapAttrsToList cfg.networks (network: data: flip mapAttrs' data.hosts (host: text: nameValuePair ("tinc/${network}/hosts/${host}") diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix index 35ff67937fc..f41b6ec2740 100644 --- a/nixos/modules/services/networking/wakeonlan.nix +++ b/nixos/modules/services/networking/wakeonlan.nix @@ -19,7 +19,7 @@ let ${ethtool} -s ${interface} ${methodParameter {inherit method password;}} ''; - concatStrings = fold (x: y: x + y) ""; + concatStrings = foldr (x: y: x + y) ""; lines = concatStrings (map (l: line l) interfaces); in diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b0f77ca3fb8..179d35b9b9f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -126,7 +126,7 @@ let else showWarnings config.warnings baseSystem; # Replace runtime dependencies - system = fold ({ oldDependency, newDependency }: drv: + system = foldr ({ oldDependency, newDependency }: drv: pkgs.replaceDependency { inherit oldDependency newDependency drv; } ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 289c2b19986..3aaf5b435e5 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -75,7 +75,7 @@ let else "${convertedFont}"); }); - bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} + bootDeviceCounters = foldr (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} (concatMap (args: args.devices) cfg.mirroredBoots); convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {} diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index dd337de9869..06117d19af4 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -8,7 +8,7 @@ let keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; anyEncrypted = - fold (j: v: v || j.encrypted.enable) false encDevs; + foldr (j: v: v || j.encrypted.enable) false encDevs; encryptedFSOptions = { diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ac9d6fbb2b5..cc7d1a52367 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -68,7 +68,7 @@ assert stdenv.isLinux; let # Combine the `features' attribute sets of all the kernel patches. - kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({ + kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({ iwlwifi = true; efiBootStub = true; needsCifsUtils = true; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 4ee45bf4bc8..fbb6fdb0fe0 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -77,7 +77,7 @@ rec { in if fn != null then [{key = fn;}] ++ xs else xs; - in pkgs.lib.fold foundDeps [] deps; + in pkgs.lib.foldr foundDeps [] deps; }; From 198ba9ef2765662b73aa99f0574a099f8c19f551 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 08:43:47 +0000 Subject: [PATCH 0004/1522] aws-sdk-cpp: 1.8.121 -> 1.8.130 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd..0f97ce5ec0b 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.121"; + version = "1.8.130"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; + sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; }; # FIXME: might be nice to put different APIs in different outputs From 402ec3b1ac7db3e9539775a43a376b65a0c20140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 15:28:43 +0000 Subject: [PATCH 0005/1522] dyncall: 1.1 -> 1.2 --- pkgs/development/libraries/dyncall/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 0e3fa3ac7dc..8a829aa3c91 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "dyncall"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz"; - # https://www.dyncall.org/r1.1/SHA256 - sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795"; + url = "https://www.dyncall.org/r1.2/dyncall-1.2.tar.gz"; + # https://www.dyncall.org/r1.2/SHA256 + sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) From c3db2d3a1b37562e547aaf7d2dd57575b69d34ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 21:01:00 +0000 Subject: [PATCH 0006/1522] libffcall: 2.1 -> 2.2 --- pkgs/development/libraries/libffcall/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 8967ec49a09..30e5aa0cfa9 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libffcall"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0"; + sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c="; }; enableParallelBuilding = false; From bdc96d33511d95a783ead5533b0d866b0a251aab Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 3 Feb 2021 17:18:49 +0200 Subject: [PATCH 0007/1522] nixos/gitlab-runner: warn about possible secrets leak --- .../services/continuous-integration/gitlab-runner.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 2c6d9530a6b..15c37c2bc76 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -339,6 +339,9 @@ in CI_SERVER_URL=<CI server URL> REGISTRATION_TOKEN=<registration secret> + + WARNING: make sure to use quoted absolute path, + or it is going to be copied to Nix Store. ''; }; registrationFlags = mkOption { @@ -523,7 +526,10 @@ in }; }; config = mkIf cfg.enable { - warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; + warnings = (mapAttrsToList + (n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") + (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services)) + ++ optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { description = "Gitlab Runner"; From a033a6e23eb941369f8895e3eba7e35d8c94ba6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 16:07:52 +0000 Subject: [PATCH 0008/1522] kdev-php: 5.6.1 -> 5.6.2 --- pkgs/applications/editors/kdevelop5/kdev-php.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 23c8f0698cf..62c201a4d49 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0xjijkmp3drnfrx4gb4bwf8n1dgwk310c0mssm6drffwix7ljpbz"; + sha256 = "sha256-P7u/KIf/1YkJ2uWsuVThILP87vaYSbHpx5CtnSR3YbU="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 27724b4702471eb712708c15bcaff520edd3f701 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 16:34:55 +0000 Subject: [PATCH 0009/1522] kdev-python: 5.6.1 -> 5.6.2 --- pkgs/applications/editors/kdevelop5/kdev-python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 041c25f1728..b17b0b57129 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1jma7j70imzxlyz8580m79jycif7zphga3zzfmqimn8syzz917hv"; + sha256 = "sha256-Iw3puQ3ZS0eNfBvaZ4cxsP49IRqIMX3R+r3OPG771RI="; }; cmakeFlags = [ From 023518351ebfc18c614ee3b412680d320c391963 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 22:30:11 +0000 Subject: [PATCH 0010/1522] reproc: 14.1.0 -> 14.2.2 --- pkgs/development/libraries/reproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index 6531414601d..e7570fdb592 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "reproc"; - version = "14.1.0"; + version = "14.2.2"; src = fetchFromGitHub { owner = "DaanDeMeyer"; repo = "reproc"; rev = "v${version}"; - sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + sha256 = "sha256-QOQcNDQkG929cEchIZ+XzjRncUUB10DpdB4zqgPqv4A="; }; nativeBuildInputs = [ cmake ]; From e45b53d2bc45d910de702bac3ea6dd1da482f0cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 07:53:05 +0000 Subject: [PATCH 0011/1522] libebur128: 1.2.5 -> 1.2.6 --- pkgs/development/libraries/libebur128/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index db6c9f93fae..656923da3d1 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA="; + sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; }; nativeBuildInputs = [ cmake pkg-config ]; From 52b8c89fce445849c684ab2cf3f03ab8ead98e3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Feb 2021 15:52:17 +0000 Subject: [PATCH 0012/1522] librelp: 1.9.0 -> 1.10.0 --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 8d950d66bd2..7b5a7d228d5 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY="; + sha256 = "sha256-aJLsUtik5aXfsdi+8QoDgbi4VUZ8gV3YPA6kIY6wzs4="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 27f5088cd2bfc31eb6aabb3f7bd33ee195690d85 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 23 Jan 2021 15:33:57 +0900 Subject: [PATCH 0013/1522] adoptopenjdk-bin: link jni_md.h to include folder See https://discourse.nixos.org/t/nix-shell-environment-to-debug-a-build-of-an-r-package/11010/4 --- .../development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 3 +++ pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 31a7346108e..9479e15cd6f 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -23,6 +23,9 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; mv $sourceRoot $out + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/ + rm -rf $out/Home/demo # Remove some broken manpages. diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index ed8935b0042..44126a54d5b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -65,6 +65,9 @@ let result = stdenv.mkDerivation rec { mv $sourceRoot $out + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + rm -rf $out/demo # Remove some broken manpages. From 9cc0da0f7f4b686f799525400c8384b28e370618 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 23 Jan 2021 15:35:21 +0900 Subject: [PATCH 0014/1522] zulu, zulu8: link jni_md.h to include folder See https://discourse.nixos.org/t/nix-shell-environment-to-debug-a-build-of-an-r-package/11010/4 --- pkgs/development/compilers/zulu/8.nix | 3 +++ pkgs/development/compilers/zulu/default.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index dd1660d9fec..edbe3494a93 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -70,6 +70,9 @@ in stdenv.mkDerivation { mkdir -p $out cp -r ./* "$out/" + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index c7b01877ad5..678a248785f 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -72,6 +72,9 @@ in stdenv.mkDerivation { mkdir -p $out cp -r ./* "$out/" + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs From ff3e401d1228ef096209af2d4fb42da0113c2d63 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 23 Jan 2021 15:35:48 +0900 Subject: [PATCH 0015/1522] graalvm8-ce, graalvm11-ce: link jni_md.h to include folder See https://discourse.nixos.org/t/nix-shell-environment-to-debug-a-build-of-an-r-package/11010/4 --- pkgs/development/compilers/graalvm/community-edition.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 3a8fca2c1a0..0cecfe5889e 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -182,7 +182,10 @@ let "11-darwin-amd64" = '' echo "" ''; - }.${javaVersionPlatform}; + }.${javaVersionPlatform} + '' + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + ''; dontStrip = true; From 9282a96ebcbc683766ccf490bc54c7539c29a60c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 08:47:06 +0000 Subject: [PATCH 0016/1522] linuxquota: 4.05 -> 4.06 --- pkgs/tools/misc/linuxquota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 729dc41a107..fbfb488f906 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { - version = "4.05"; + version = "4.06"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; + sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0="; }; outputs = [ "out" "dev" "doc" "man" ]; From 47d3bb69bd187ba9f9ec28352e73d279120e3097 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 15:54:52 +0000 Subject: [PATCH 0017/1522] sshpass: 1.06 -> 1.09 --- pkgs/tools/networking/sshpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 60c9ab97a8b..4704339aed6 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sshpass"; - version = "1.06"; + version = "1.09"; src = fetchurl { url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; - sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; + sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c="; }; meta = with lib; { From 3298a4056435752f3ea2b6323cce0a1487270572 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 18:35:49 +0000 Subject: [PATCH 0018/1522] stdman: 2018.03.11 -> 2020.11.17 --- pkgs/data/documentation/stdman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 9308c538d35..e0f08e6049d 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stdman"; - version = "2018.03.11"; + version = "2020.11.17"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = version; - sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r"; + sha256 = "sha256-pzAVuXSuUfwI7gQpFqmH/+klSUH3KipZup2TgZs8XsY="; }; outputDevdoc = "out"; From 5f49a8dfe8df18267030c35af9f95c403959bde0 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 13 Mar 2021 01:24:54 +0900 Subject: [PATCH 0019/1522] Revert "Revert "findutils: 4.7.0 -> 4.8.0"" This reverts commit 4acf7fd6bc131f0d36ab2353db0a8c9fccc00855. --- pkgs/tools/misc/findutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 18881ef181d..9b55a4a86b8 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp"; }; postPatch = '' From c85ce73a2c6010cfee63bc75a86c2bb56a9bc4b9 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 13 Mar 2021 01:46:06 +0900 Subject: [PATCH 0020/1522] findutils: fix darwin build --- pkgs/tools/misc/findutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 9b55a4a86b8..57839f73056 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; + CFLAGS = [ + # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 + # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 + "-D__nonnull\\(params\\)=" + ]; + enableParallelBuilding = true; meta = { From e12bbb6ad8f22fd6e2c903ebf660681f8429c373 Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Wed, 31 Mar 2021 19:46:32 +0200 Subject: [PATCH 0021/1522] Update nmap to 7.91 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 531eb6eae4a..a6d2ab14362 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -12,11 +12,11 @@ with lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.80"; + version = "7.91"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; + sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; }; patches = [ ./zenmap.patch ] From 1d304d07a64a16ae8f8156abcf08c08f8e4704d0 Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Tue, 6 Apr 2021 11:45:35 +0200 Subject: [PATCH 0022/1522] Alias nmap-unfree to nmap --- pkgs/tools/security/nmap-unfree/default.nix | 65 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/tools/security/nmap-unfree/default.nix diff --git a/pkgs/tools/security/nmap-unfree/default.nix b/pkgs/tools/security/nmap-unfree/default.nix deleted file mode 100644 index 1e6ed42bae4..00000000000 --- a/pkgs/tools/security/nmap-unfree/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libpcap -, pkg-config -, openssl -, lua5_3 -, pcre -, liblinear -, libssh2 -, zlib -, withLua ? true -}: - -stdenv.mkDerivation rec { - pname = "nmap-unfree"; - version = "7.91"; - - src = fetchurl { - url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace libz/configure \ - --replace /usr/bin/libtool ar \ - --replace 'AR="libtool"' 'AR="ar"' \ - --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; - - configureFlags = [ - (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") - ]; - - makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "AR=${stdenv.cc.bintools.targetPrefix}ar" - "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" - "CC=${stdenv.cc.targetPrefix}gcc" - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - pcre - liblinear - libssh2 - libpcap - openssl - zlib - ]; - - enableParallelBuilding = true; - - # Tests require network access - doCheck = false; - - meta = with lib; { - description = "Open source utility for network discovery and security auditing"; - homepage = "http://www.nmap.org"; - # Nmap Public Source License Version 0.93 - # https://github.com/nmap/nmap/blob/master/LICENSE - license = licenses.unfree; - maintainers = with maintainers; [ fab SuperSandro2000 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 74fbe88a128..8628de2c5ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,7 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nix-review = nixpkgs-review; # added 2019-12-22 nmap_graphical = nmap-graphical; # added 2017-01-19 + nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae0a495894..83f5cecbb47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6822,8 +6822,6 @@ in graphicalSupport = true; }; - nmap-unfree = callPackage ../tools/security/nmap-unfree { }; - nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; From ecae4bfe9de8b4560cd498283e53bbfecb904808 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 23:37:30 +0200 Subject: [PATCH 0023/1522] libreddit: init at 0.10.1 --- pkgs/servers/libreddit/add-Cargo.lock.patch | 1466 +++++++++++++++++++ pkgs/servers/libreddit/default.nix | 40 + pkgs/top-level/all-packages.nix | 4 + 3 files changed, 1510 insertions(+) create mode 100644 pkgs/servers/libreddit/add-Cargo.lock.patch create mode 100644 pkgs/servers/libreddit/default.nix diff --git a/pkgs/servers/libreddit/add-Cargo.lock.patch b/pkgs/servers/libreddit/add-Cargo.lock.patch new file mode 100644 index 00000000000..c1dc433c7fc --- /dev/null +++ b/pkgs/servers/libreddit/add-Cargo.lock.patch @@ -0,0 +1,1466 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..dcb4875 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1460 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "askama" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" ++dependencies = [ ++ "askama_derive", ++ "askama_escape", ++ "askama_shared", ++] ++ ++[[package]] ++name = "askama_derive" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" ++dependencies = [ ++ "askama_shared", ++ "proc-macro2", ++ "syn", ++] ++ ++[[package]] ++name = "askama_escape" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" ++ ++[[package]] ++name = "askama_shared" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" ++dependencies = [ ++ "askama_escape", ++ "nom", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "async-mutex" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-recursion" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "async-trait" ++version = "0.1.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "base-x" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitvec" ++version = "0.19.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" ++dependencies = [ ++ "funty", ++ "radium", ++ "tap", ++ "wyz", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" ++ ++[[package]] ++name = "bytes" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++ ++[[package]] ++name = "cached" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e2afe73808fbaac302e39c9754bfc3c4b4d0f99c9c240b9f4e4efc841ad1b74" ++dependencies = [ ++ "async-mutex", ++ "async-trait", ++ "cached_proc_macro", ++ "cached_proc_macro_types", ++ "futures", ++ "hashbrown", ++ "once_cell", ++] ++ ++[[package]] ++name = "cached_proc_macro" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf857ae42d910aede5c5186e62684b0d7a597ce2fe3bd14448ab8f7ef439848c" ++dependencies = [ ++ "async-mutex", ++ "cached_proc_macro_types", ++ "darling", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "cached_proc_macro_types" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" ++ ++[[package]] ++name = "cc" ++version = "1.0.67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "bitflags", ++ "textwrap", ++ "unicode-width", ++] ++ ++[[package]] ++name = "const_fn" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" ++ ++[[package]] ++name = "cookie" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627" ++dependencies = [ ++ "time", ++ "version_check", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++ ++[[package]] ++name = "ct-logs" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" ++dependencies = [ ++ "sct", ++] ++ ++[[package]] ++name = "darling" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" ++dependencies = [ ++ "darling_core", ++ "darling_macro", ++] ++ ++[[package]] ++name = "darling_core" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" ++dependencies = [ ++ "fnv", ++ "ident_case", ++ "proc-macro2", ++ "quote", ++ "strsim", ++ "syn", ++] ++ ++[[package]] ++name = "darling_macro" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" ++dependencies = [ ++ "darling_core", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "discard" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" ++ ++[[package]] ++name = "event-listener" ++version = "2.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" ++ ++[[package]] ++name = "fastrand" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "funty" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" ++ ++[[package]] ++name = "futures" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" ++ ++[[package]] ++name = "futures-lite" ++version = "1.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project-lite", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "h2" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio", ++ "tokio-util", ++ "tracing", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "http" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" ++dependencies = [ ++ "bytes", ++ "http", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" ++ ++[[package]] ++name = "httpdate" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" ++ ++[[package]] ++name = "hyper" ++version = "0.14.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" ++dependencies = [ ++ "bytes", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2", ++ "http", ++ "http-body", ++ "httparse", ++ "httpdate", ++ "itoa", ++ "pin-project", ++ "socket2", ++ "tokio", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-rustls" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" ++dependencies = [ ++ "ct-logs", ++ "futures-util", ++ "hyper", ++ "log", ++ "rustls", ++ "rustls-native-certs", ++ "tokio", ++ "tokio-rustls", ++ "webpki", ++] ++ ++[[package]] ++name = "ident_case" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" ++ ++[[package]] ++name = "idna" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lexical-core" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" ++dependencies = [ ++ "arrayvec", ++ "bitflags", ++ "cfg-if", ++ "ryu", ++ "static_assertions", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" ++ ++[[package]] ++name = "libreddit" ++version = "0.10.1" ++dependencies = [ ++ "askama", ++ "async-recursion", ++ "cached", ++ "clap", ++ "cookie", ++ "futures-lite", ++ "hyper", ++ "hyper-rustls", ++ "regex", ++ "route-recognizer", ++ "serde", ++ "serde_json", ++ "time", ++ "tokio", ++ "url", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "mio" ++version = "0.7.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" ++dependencies = [ ++ "libc", ++ "log", ++ "miow", ++ "ntapi", ++ "winapi", ++] ++ ++[[package]] ++name = "miow" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "nom" ++version = "6.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" ++dependencies = [ ++ "bitvec", ++ "funty", ++ "lexical-core", ++ "memchr", ++ "version_check", ++] ++ ++[[package]] ++name = "ntapi" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" ++dependencies = [ ++ "cfg-if", ++ "instant", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "winapi", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "radium" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" ++ ++[[package]] ++name = "ring" ++version = "0.16.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" ++dependencies = [ ++ "cc", ++ "libc", ++ "once_cell", ++ "spin", ++ "untrusted", ++ "web-sys", ++ "winapi", ++] ++ ++[[package]] ++name = "route-recognizer" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "824172f0afccf3773c3905f5550ac94572144efe0deaf49a1f22bbca188d193e" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "rustls" ++version = "0.19.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" ++dependencies = [ ++ "base64", ++ "log", ++ "ring", ++ "sct", ++ "webpki", ++] ++ ++[[package]] ++name = "rustls-native-certs" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" ++dependencies = [ ++ "openssl-probe", ++ "rustls", ++ "schannel", ++ "security-framework", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "sct" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "security-framework" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.64" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha1" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "smallvec" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++ ++[[package]] ++name = "socket2" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "spin" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" ++ ++[[package]] ++name = "standback" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "static_assertions" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" ++ ++[[package]] ++name = "stdweb" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" ++dependencies = [ ++ "discard", ++ "rustc_version", ++ "stdweb-derive", ++ "stdweb-internal-macros", ++ "stdweb-internal-runtime", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "stdweb-derive" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "serde", ++ "serde_derive", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-macros" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" ++dependencies = [ ++ "base-x", ++ "proc-macro2", ++ "quote", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "sha1", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-runtime" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" ++ ++[[package]] ++name = "strsim" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++ ++[[package]] ++name = "syn" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tap" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "time" ++version = "0.2.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" ++dependencies = [ ++ "const_fn", ++ "libc", ++ "standback", ++ "stdweb", ++ "time-macros", ++ "version_check", ++ "winapi", ++] ++ ++[[package]] ++name = "time-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" ++dependencies = [ ++ "proc-macro-hack", ++ "time-macros-impl", ++] ++ ++[[package]] ++name = "time-macros-impl" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "standback", ++ "syn", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "tokio" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" ++dependencies = [ ++ "autocfg", ++ "bytes", ++ "libc", ++ "memchr", ++ "mio", ++ "num_cpus", ++ "once_cell", ++ "parking_lot", ++ "pin-project-lite", ++ "signal-hook-registry", ++ "tokio-macros", ++ "winapi", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-rustls" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" ++dependencies = [ ++ "rustls", ++ "tokio", ++ "webpki", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f" ++dependencies = [ ++ "bytes", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite", ++ "tokio", ++] ++ ++[[package]] ++name = "tower-service" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" ++ ++[[package]] ++name = "tracing" ++version = "0.1.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" ++dependencies = [ ++ "cfg-if", ++ "pin-project-lite", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "untrusted" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" ++ ++[[package]] ++name = "url" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[package]] ++name = "want" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++dependencies = [ ++ "log", ++ "try-lock", ++] ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "webpki" ++version = "0.21.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "wyz" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix new file mode 100644 index 00000000000..374c0d1e368 --- /dev/null +++ b/pkgs/servers/libreddit/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, nixosTests +, rustPlatform +, fetchFromGitHub +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "libreddit"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "spikecodes"; + repo = pname; + rev = "v${version}"; + sha256 = "0f5xla6fgq4l9g95gwwvfxksaxj4zpayrsjacf53akjpxaqvqxdj"; + }; + + cargoSha256 = "039k6kncdgy6q2lbcssj5dm9npk0yss5m081ps4nmdj2vjrkphf0"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + cargoPatches = [ + # Patch file to add/update Cargo.lock in the source code + # https://github.com/spikecodes/libreddit/issues/191 + ./add-Cargo.lock.patch + ]; + + passthru.tests = { + inherit (nixosTests) libreddit; + }; + + meta = with lib; { + description = "Private front-end for Reddit"; + homepage = "https://github.com/spikecodes/libreddit"; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c740d0e156b..425b6788c83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6245,6 +6245,10 @@ in libzmf = callPackage ../development/libraries/libzmf {}; + libreddit = callPackage ../servers/libreddit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; libreswan = callPackage ../tools/networking/libreswan { }; From 1c5bdf76e97868e06e887a880055344ccdba1d64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 01:05:25 +0200 Subject: [PATCH 0024/1522] nixos/libreddit: init module and test --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/libreddit.nix | 66 +++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/libreddit.nix | 19 +++++++ 4 files changed, 87 insertions(+) create mode 100644 nixos/modules/services/misc/libreddit.nix create mode 100644 nixos/tests/libreddit.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eaf046b160f..78fe5a6cb6c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -496,6 +496,7 @@ ./services/misc/logkeys.nix ./services/misc/leaps.nix ./services/misc/lidarr.nix + ./services/misc/libreddit.nix ./services/misc/lifecycled.nix ./services/misc/mame.nix ./services/misc/matrix-appservice-discord.nix diff --git a/nixos/modules/services/misc/libreddit.nix b/nixos/modules/services/misc/libreddit.nix new file mode 100644 index 00000000000..77b34a85620 --- /dev/null +++ b/nixos/modules/services/misc/libreddit.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + + let + cfg = config.services.libreddit; + + args = concatStringsSep " " ([ + "--port ${toString cfg.port}" + "--address ${cfg.address}" + ] ++ optional cfg.redirect "--redirect-https"); + +in +{ + options = { + services.libreddit = { + enable = mkEnableOption "Private front-end for Reddit"; + + address = mkOption { + default = "0.0.0.0"; + example = "127.0.0.1"; + type = types.str; + description = "The address to listen on"; + }; + + port = mkOption { + default = 8080; + example = 8000; + type = types.port; + description = "The port to listen on"; + }; + + redirect = mkOption { + type = types.bool; + default = false; + description = "Enable the redirecting to HTTPS"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the libreddit web interface"; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.libreddit = { + description = "Private front-end for Reddit"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.libreddit}/bin/libreddit ${args}"; + AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + Restart = "on-failure"; + RestartSec = "2s"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62188ddf9e8..47302e4eb4d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -209,6 +209,7 @@ in latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; + libreddit = handleTest ./libreddit.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; diff --git a/nixos/tests/libreddit.nix b/nixos/tests/libreddit.nix new file mode 100644 index 00000000000..f7ef701d086 --- /dev/null +++ b/nixos/tests/libreddit.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "libreddit"; + meta.maintainers = with maintainers; [ fab ]; + + nodes.machine = + { pkgs, ... }: + { services.libreddit.enable = true; }; + + testScript = '' + machine.wait_for_unit("libreddit.service") + machine.wait_for_open_port("8080") + # The service wants to get data from https://www.reddit.com + machine.succeed("curl http://localhost:8080/") + ''; +}) From 23ab12364036aebff032bdb4343312ebea0dbcaf Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 1 May 2021 17:24:57 +0300 Subject: [PATCH 0025/1522] llvm_11: disable failing 'dependent-libraries.test' on armv7l --- pkgs/development/compilers/llvm/11/llvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index ee2fe9c90b2..7d6028ad3a6 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -82,6 +82,7 @@ in stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-inlined.ll rm test/DebugInfo/X86/convert-linked.ll rm test/tools/dsymutil/X86/op-convert.test + rm test/tools/llvm-readobj/ELF/dependent-libraries.test '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll From 10f9d7d2e960836a963e0ce4c8388f4e2c88b0a9 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Sat, 8 May 2021 02:07:15 +0200 Subject: [PATCH 0026/1522] freeciv: build with `gtk` when `gtkClient = true` the configure flag was missing, and now the `freeciv-gtk3` binary will be produced. --- pkgs/games/freeciv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 58e91a44842..bef50d807c7 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 , zlib, bzip2, curl, xz, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? false, gtk3 +, gtkClient ? stdenv.isLinux, gtk3 , qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite @@ -46,6 +46,7 @@ in stdenv.mkDerivation rec { "--enable-client=qt" "--with-qt5-includes=${qt5.qtbase.dev}/include" ] + ++ optionals gtkClient [ "--enable-client=gtk3.22" ] ++ optional enableSqlite "--enable-fcdb=sqlite3" ++ optional (!gtkClient) "--enable-fcmp=cli" ++ optional (!server) "--disable-server"; From 30330899d3de21acaac5a655c102a8e5aca7c575 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 14 May 2021 17:29:40 -0400 Subject: [PATCH 0027/1522] replay-sorcery: init at 0.5.0 --- pkgs/tools/video/replay-sorcery/default.nix | 56 +++++++++++++++++++ .../replay-sorcery/hardcode-libnotify.patch | 25 +++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 83 insertions(+) create mode 100644 pkgs/tools/video/replay-sorcery/default.nix create mode 100644 pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch diff --git a/pkgs/tools/video/replay-sorcery/default.nix b/pkgs/tools/video/replay-sorcery/default.nix new file mode 100644 index 00000000000..9557a1ed54f --- /dev/null +++ b/pkgs/tools/video/replay-sorcery/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, cmake +, pkg-config +, ffmpeg +, libX11 +, drmSupport ? true, libdrm +, notifySupport ? true, libnotify +, pulseaudioSupport ? true, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "replay-sorcery"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "matanui159"; + repo = "ReplaySorcery"; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-HPkSOwfwcg4jLUzKfqdXgLu7mgD5H4wb9d2BrqWQeHc="; + }; + + # Patch in libnotify if support is enabled. + patches = lib.optional notifySupport (substituteAll { + src = ./hardcode-libnotify.patch; + inherit libnotify; + }); + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ ffmpeg libX11 ] + ++ lib.optional drmSupport libdrm + ++ lib.optional pulseaudioSupport libpulseaudio; + + cmakeFlags = [ + "-DRS_SYSTEMD_DIR=${placeholder "out"}/lib/systemd/user" + + # SETUID & SETGID permissions required for hardware accelerated + # video capture can't be set during the build. + "-DRS_SETID=OFF" + ]; + + meta = with lib; { + description = "An open-source, instant-replay solution for Linux"; + homepage = "https://github.com/matanui159/ReplaySorcery"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch b/pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch new file mode 100644 index 00000000000..8ff42bec92f --- /dev/null +++ b/pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch @@ -0,0 +1,25 @@ +diff --git a/src/config.c b/src/config.c +index 3af7455..12cb6b5 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -129,7 +129,7 @@ static const AVOption configOptions[] = { + CONFIG_CONST(alt, RS_CONFIG_KEYMOD_ALT, keyMods), + CONFIG_CONST(super, RS_CONFIG_KEYMOD_SUPER, keyMods), + CONFIG_STRING(outputFile, "~/Videos/ReplaySorcery_%F_%H-%M-%S.mp4"), +- CONFIG_STRING(outputCommand, "notify-send " RS_NAME " \"Saved replay as %s\""), ++ CONFIG_STRING(outputCommand, "@libnotify@/bin/notify-send " RS_NAME " \"Saved replay as %s\""), + {NULL}}; + + static const AVClass configClass = { +diff --git a/sys/replay-sorcery.conf b/sys/replay-sorcery.conf +index 5cd0aa6..c600e7f 100644 +--- a/sys/replay-sorcery.conf ++++ b/sys/replay-sorcery.conf +@@ -123,5 +123,5 @@ outputFile = ~/Videos/ReplaySorcery_%F_%H-%M-%S.mp4 + + # A command to run when a video is successfully saved + # Possible values: a printf formatted command +-# Default value: notify-send ReplaySorcery "Saved replay as %s" +-outputCommand = notify-send ReplaySorcery "Saved replay as %s" ++# Default value: @libnotify@/bin/notify-send ReplaySorcery "Saved replay as %s" ++outputCommand = @libnotify@/bin/notify-send ReplaySorcery "Saved replay as %s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932e506fcaf..b9150fd19de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3118,6 +3118,8 @@ in razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; + replay-sorcery = callPackage ../tools/video/replay-sorcery { }; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { From b6e764bd6824422b6fcf949d24a1dfc7687bbc68 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 14 May 2021 18:01:02 -0400 Subject: [PATCH 0028/1522] nixos/replay-sorcery: add module --- nixos/modules/module-list.nix | 1 + .../modules/services/video/replay-sorcery.nix | 70 +++++++++++++++++++ pkgs/tools/video/replay-sorcery/default.nix | 12 +++- .../replay-sorcery/fix-global-config.patch | 13 ++++ 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/services/video/replay-sorcery.nix create mode 100644 pkgs/tools/video/replay-sorcery/fix-global-config.patch diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 33b4d01ebff..c27fc9114bc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -912,6 +912,7 @@ ./services/wayland/cage.nix ./services/video/epgstation/default.nix ./services/video/mirakurun.nix + ./services/video/replay-sorcery.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix diff --git a/nixos/modules/services/video/replay-sorcery.nix b/nixos/modules/services/video/replay-sorcery.nix new file mode 100644 index 00000000000..d78e782c796 --- /dev/null +++ b/nixos/modules/services/video/replay-sorcery.nix @@ -0,0 +1,70 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.replay-sorcery; + configFile = generators.toKeyValue {} cfg.settings; +in +{ + options = with types; { + services.replay-sorcery = { + enable = mkEnableOption "the ReplaySorcery service for instant-replays"; + + enableSysAdminCapability = mkEnableOption '' + the system admin capability to support hardware accelerated + video capture. This is equivalent to running ReplaySorcery as + root, so use with caution''; + + autoStart = mkOption { + type = bool; + default = false; + description = "Automatically start ReplaySorcery when graphical-session.target starts."; + }; + + settings = mkOption { + type = attrsOf (oneOf [ str int ]); + default = {}; + description = "System-wide configuration for ReplaySorcery (/etc/replay-sorcery.conf)."; + example = literalExample '' + { + videoInput = "hwaccel"; # requires `services.replay-sorcery.enableSysAdminCapability = true` + videoFramerate = 60; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment = { + systemPackages = [ pkgs.replay-sorcery ]; + etc."replay-sorcery.conf".text = configFile; + }; + + security.wrappers = mkIf cfg.enableSysAdminCapability { + replay-sorcery = { + source = "${pkgs.replay-sorcery}/bin/replay-sorcery"; + capabilities = "cap_sys_admin+ep"; + }; + }; + + systemd = { + packages = [ pkgs.replay-sorcery ]; + user.services.replay-sorcery = { + wantedBy = mkIf cfg.autoStart [ "graphical-session.target" ]; + partOf = mkIf cfg.autoStart [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = mkIf cfg.enableSysAdminCapability [ + "" # Tell systemd to clear the existing ExecStart list, to prevent appending to it. + "${config.security.wrapperDir}/replay-sorcery" + ]; + }; + }; + }; + }; + + meta = { + maintainers = with maintainers; [ kira-bruneau ]; + }; +} diff --git a/pkgs/tools/video/replay-sorcery/default.nix b/pkgs/tools/video/replay-sorcery/default.nix index 9557a1ed54f..8f362c3beb9 100644 --- a/pkgs/tools/video/replay-sorcery/default.nix +++ b/pkgs/tools/video/replay-sorcery/default.nix @@ -23,8 +23,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-HPkSOwfwcg4jLUzKfqdXgLu7mgD5H4wb9d2BrqWQeHc="; }; - # Patch in libnotify if support is enabled. - patches = lib.optional notifySupport (substituteAll { + patches = [ + # Use global config generated by NixOS (/etc/replay-sorcery.conf) + # instead of $out/etc/replay-sorcery.conf. + ./fix-global-config.patch + ] ++ lib.optional notifySupport (substituteAll { + # Patch in libnotify if support is enabled. Can't use makeWrapper + # since it would break the security wrapper in the NixOS module. src = ./hardcode-libnotify.patch; inherit libnotify; }); @@ -42,7 +47,8 @@ stdenv.mkDerivation rec { "-DRS_SYSTEMD_DIR=${placeholder "out"}/lib/systemd/user" # SETUID & SETGID permissions required for hardware accelerated - # video capture can't be set during the build. + # video capture can't be set during the build. Use the NixOS + # module if you want hardware accelerated video capture. "-DRS_SETID=OFF" ]; diff --git a/pkgs/tools/video/replay-sorcery/fix-global-config.patch b/pkgs/tools/video/replay-sorcery/fix-global-config.patch new file mode 100644 index 00000000000..4f30e2875cf --- /dev/null +++ b/pkgs/tools/video/replay-sorcery/fix-global-config.patch @@ -0,0 +1,13 @@ +diff --git a/src/rsbuild.h.in b/src/rsbuild.h.in +index ff0a0f6..5529556 100644 +--- a/src/rsbuild.h.in ++++ b/src/rsbuild.h.in +@@ -20,7 +20,7 @@ + #ifndef RS_BUILD_H + #define RS_BUILD_H + +-#define RS_BUILD_GLOBAL_CONFIG "@CMAKE_INSTALL_PREFIX@/etc/replay-sorcery.conf" ++#define RS_BUILD_GLOBAL_CONFIG "/etc/replay-sorcery.conf" + #define RS_BUILD_LOCAL_CONFIG "%s/.config/replay-sorcery.conf" + + #cmakedefine RS_BUILD_PTHREAD_FOUND From 19b491249ca0dc0733b351e154030cebeef9f442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 May 2021 23:30:57 +0200 Subject: [PATCH 0029/1522] README.md: mention SEPA transfers They don't incur a fee and should thus be preferred. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f52d915005..048c1421ca3 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,8 @@ Foundation](https://nixos.org/nixos/foundation.html). To ensure the continuity and expansion of the NixOS infrastructure, we are looking for donations to our organization. -You can donate to the NixOS foundation by using Open Collective: +You can donate to the NixOS foundation through [SEPA bank +transfers](https://nixos.org/donate.html) or by using Open Collective: From 8fe0143d88e87e529c3d143ae2fb589ce651dcb6 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 2 May 2021 12:00:00 +0000 Subject: [PATCH 0030/1522] nixos: add option to load wireless regulatory database as firmware use it when networkmanager or wpa_supplicant is enabled. fixes #57053 fixes "Direct firmware load for regulatory.db failed with error -2" in dmesg Note that all kernels on unstable are newer that 4.15, which is required for this to work. --- nixos/modules/hardware/all-firmware.nix | 12 ++++++++++++ nixos/modules/services/networking/networkmanager.nix | 3 ++- nixos/modules/services/networking/wpa_supplicant.nix | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 3e88a4c20ad..524dae57010 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -35,6 +35,14 @@ in { ''; }; + hardware.wirelessRegulatoryDatabase = mkOption { + default = false; + type = types.bool; + description = '' + Load the wireless regulatory database at boot. + ''; + }; + }; @@ -58,6 +66,7 @@ in { ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; + hardware.wirelessRegulatoryDatabase = true; }) (mkIf cfg.enableAllFirmware { assertions = [{ @@ -75,5 +84,8 @@ in { b43FirmwareCutter ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; }) + (mkIf cfg.wirelessRegulatoryDatabase { + hardware.firmware = [ pkgs.wireless-regdb ]; + }) ]; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 135f29be58c..8a12a5eec41 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,7 +6,6 @@ let cfg = config.networking.networkmanager; basePackages = with pkgs; [ - crda modemmanager networkmanager networkmanager-fortisslvpn @@ -367,6 +366,8 @@ in { } ]; + hardware.wirelessRegulatoryDatabase = true; + environment.etc = with pkgs; { "NetworkManager/NetworkManager.conf".source = configFile; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8a0685c3d96..f592cc2d207 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -228,7 +228,8 @@ in { environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; - services.udev.packages = [ pkgs.crda ]; + + hardware.wirelessRegulatoryDatabase = true; # FIXME: start a separate wpa_supplicant instance per interface. systemd.services.wpa_supplicant = let From 5c2a47d5c7deed77ebd6f09721279ba07f1f8e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 May 2021 20:45:20 +0200 Subject: [PATCH 0031/1522] nix: enable pie --- pkgs/tools/package-management/nix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 159fc5b39c1..4a1d6c741f2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -38,6 +38,8 @@ common = outputs = [ "out" "dev" "man" "doc" ]; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] From 1369b86ee3f46a9f40a0e882d174afc2f99e83ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 03:46:03 +0000 Subject: [PATCH 0032/1522] ethash: 0.6.0 -> 0.7.0 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index dcb10b8ba08..c1ef9cee990 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA="; + sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8="; }; nativeBuildInputs = [ From 92cbe52e19c42ba606b040bee5933dd35b0e8267 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Tue, 25 May 2021 23:52:46 +0200 Subject: [PATCH 0033/1522] nixos/filesystems: condition mount-pstore.service on pstore module systemd's modprobe@.service does not require success so mount-pstore executed despite a non-present pstore module, leading to an error about the /sys/fs/pstore mountpoint not existing on CONFIG_PSTORE=n systems. --- nixos/modules/tasks/filesystems.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 065d6cc95d1..330facdca63 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -309,6 +309,8 @@ in "mount-pstore" = { serviceConfig = { Type = "oneshot"; + # skip on kernels without the pstore module + ExecCondition = "${pkgs.kmod}/bin/modprobe -b pstore"; ExecStart = "${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" '' set -eu @@ -325,8 +327,6 @@ in ConditionVirtualization = "!container"; DefaultDependencies = false; # needed to prevent a cycle }; - after = [ "modprobe@pstore.service" ]; - requires = [ "modprobe@pstore.service" ]; before = [ "systemd-pstore.service" ]; wantedBy = [ "systemd-pstore.service" ]; }; From af871f619ca3ae8c162436e723241e995b088dd6 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sun, 30 May 2021 03:29:52 +0200 Subject: [PATCH 0034/1522] nixos/filesystems: await builtin pstore module backend in mount-pstore If the pstore module is builtin, it nonetheless can take considerable time to register a backend despite /sys/fs/pstore already appearing mounted, so the condition is moved into the main script to extend waiting for the backend to this case. --- nixos/modules/tasks/filesystems.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 330facdca63..49c9a37a900 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -305,25 +305,30 @@ in in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)) // { # Mount /sys/fs/pstore for evacuating panic logs and crashdumps from persistent storage onto the disk using systemd-pstore. # This cannot be done with the other special filesystems because the pstore module (which creates the mount point) is not loaded then. - # Since the pstore filesystem is usually empty right after mounting because the backend isn't registered yet, and a path unit cannot detect files inside of it, the same service waits for that to happen. systemd's restart mechanism can't be used here because the first failure also fails all dependent units. "mount-pstore" = { serviceConfig = { Type = "oneshot"; # skip on kernels without the pstore module ExecCondition = "${pkgs.kmod}/bin/modprobe -b pstore"; - ExecStart = "${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; - ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" '' + ExecStart = pkgs.writeShellScript "mount-pstore.sh" '' set -eu - TRIES=0 - while [ $TRIES -lt 20 ] && [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do - sleep 0.1 - TRIES=$((TRIES+1)) + # if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons. + ${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore + # wait up to five seconds (arbitrary, happened within one in testing) for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units. + TRIES=50 + while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do + if (( $TRIES )); then + sleep 0.1 + TRIES=$((TRIES-1)) + else + echo "Persistent Storage backend was not registered in time." >&2 + exit 1 + fi done ''; RemainAfterExit = true; }; unitConfig = { - ConditionPathIsMountPoint = "!/sys/fs/pstore"; ConditionVirtualization = "!container"; DefaultDependencies = false; # needed to prevent a cycle }; From eca4094cd22cf5763702602d10a6e20872307cb5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 10:17:40 +0000 Subject: [PATCH 0035/1522] gerbera: 1.8.1 -> 1.8.2 --- pkgs/servers/gerbera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 35290de6b24..acb8c139be6 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o="; + sha256 = "sha256-RVFzATHNCW4lR9dVrtY2fo2BiJrXPCpelBaUXBwOWyY="; }; postPatch = lib.optionalString enableMysql '' From 5a9129160d5cee76c00fbb80a74248013b1d4c66 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 2 Jun 2021 23:02:49 -0700 Subject: [PATCH 0036/1522] terraform-providers.acme: 1.5.0-patched -> 2.4.0 and move to upstream source --- .../cluster/terraform-providers/default.nix | 11 +++++++---- .../cluster/terraform-providers/providers.json | 11 ++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d88602d75ba..868f2f06c81 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ , buildGoModule , buildGoPackage , fetchFromGitHub +, fetchpatch , callPackage }: let @@ -46,10 +47,12 @@ let # These are the providers that don't fall in line with the default model special-providers = { acme = automated-providers.acme.overrideAttrs (attrs: { - prePatch = attrs.prePatch or "" + '' - substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme - substituteInPlace main.go --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme - ''; + patches = attrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/vancluever/terraform-provider-acme/commit/a5834747aebc3677225c68a08ef784cfd7b35e6c.patch"; + sha256 = "091484whrpq6ykpgpndc8kc9cbvd9wwr0b51m1yxp31750lydp8m"; + }) + ]; }); # Packages that don't fit the default model diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4171aa4da2..234a9c2bca4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -7,12 +7,13 @@ "version": "0.2.3" }, "acme": { - "owner": "getstackhead", - "provider-source-address": "registry.terraform.io/getstackhead/acme", + "owner": "vancluever", + "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v1.5.0-patched", - "sha256": "1wdrjpd3l0xadsa3lqhsc9c57g8x2qkwb76q824sk8za1a7lapii", - "version": "1.5.0-patched" + "rev": "v2.4.0", + "sha256": "0r7i55gdscw94b954nfkvgfsrw7piq63gp06vh9smrwax9i2xc2f", + "vendorSha256": "09zmw2xm5fwwsa9bqwscq0s67hlxjk2kd3j02ayr4mxzhaagh1z9", + "version": "2.4.0" }, "akamai": { "owner": "terraform-providers", From aebd78e40d05e68f9b54dc4864205a53319d140b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 17:19:42 +0200 Subject: [PATCH 0037/1522] python3Packages.vultr: 0.1.2 -> 1.0.1 --- .../python-modules/vultr/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 975e4098112..b6f8a407b23 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -5,26 +5,29 @@ }: buildPythonPackage rec { - version = "0.1.2"; + version = "1.0.1"; pname = "vultr"; src = fetchFromGitHub { - owner = "spry-group"; - repo = "python-vultr"; - rev = version; - sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + owner = "spry-group"; + repo = "python-vultr"; + rev = "v${version}"; + sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests disabled. They fail because they try to access the network doCheck = false; + pythonImportsCheck = [ "vultr" ]; + meta = with lib; { description = "Vultr.com API Client"; homepage = "https://github.com/spry-group/python-vultr"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; - } From 49bd30eb33e54081b11255a2862cea78278c6c27 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 6 Jun 2021 21:39:14 +0200 Subject: [PATCH 0038/1522] Add the -a param to the docs The patch utility does not understand git formatted patches. For text files, there is no problem, but binary files use the git format. The -a param makes git diff put binary files into the patch in raw format that can be understood by the patch tool. --- doc/contributing/coding-conventions.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 1eaa06a659d..8022213a656 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -520,7 +520,7 @@ If you do need to do create this sort of patch file, one way to do so is with gi 4. Use git to create a diff, and pipe the output to a patch file: ```ShellSession - $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch + $ git diff -a > nixpkgs/pkgs/the/package/0001-changes.patch ``` If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: From 764a102f35757e8916039f4ed3e88ba35d7a2195 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Jun 2021 17:10:53 +0100 Subject: [PATCH 0039/1522] exif: add patches for CVE-2021-27815 --- pkgs/tools/graphics/exif/default.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 130e2d96124..f07f3d05541 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libexif, popt, libintl }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, libexif +, popt +, libintl +}: stdenv.mkDerivation rec { pname = "exif"; @@ -11,6 +20,19 @@ stdenv.mkDerivation rec { sha256 = "1xlb1gdwxm3rmw7vlrynhvjp9dkwmvw23mxisdbdmma7ah2nda3i"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-27815.part-1.patch"; + url = "https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch"; + sha256 = "0mfx7l8w3w1c2mn5h5d6s7gdfyd91wnml8v0f19v5sdn70hx5aa4"; + }) + (fetchpatch { + name = "CVE-2021-27815.part-2.patch"; + url = "https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch"; + sha256 = "11lyvy20maisiyhxgxvm85v5l5ba7p0bpd4m0g4ryli32mrwwy0l"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libexif popt libintl ]; From ba000a9ca54522e979d894f74c0df7761dd61c42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 14:32:56 +0000 Subject: [PATCH 0040/1522] leptonica: 1.81.0 -> 1.81.1 --- pkgs/development/libraries/leptonica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 363140b5f58..723b5a0ec1f 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.81.0"; + version = "1.81.1"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0="; + sha256 = "sha256-D06zFem93deX9MVf3qTh9F/Kfjs1ii/Gk/2VfOLEPKk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 7cc5590b9236a62ba53b92e36a06f1c61b4ef682 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 17 Jun 2021 20:28:08 +0200 Subject: [PATCH 0041/1522] soundtracker: 1.0.1 -> 1.0.2.1 --- pkgs/applications/audio/soundtracker/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 3dc9089b241..25e784b2735 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.1"; + version = "1.0.2.1"; src = fetchurl { # Past releases get moved to the "old releases" directory. # Only the latest release is at the top level. # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. - url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2"; - sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks"; + url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; + sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; }; nativeBuildInputs = [ @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { goocanvas ] ++ lib.optional stdenv.isLinux alsa-lib; - hardeningDisable = [ "format" ]; - meta = with lib; { description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; longDescription = '' From ade48138df8b77c1d76f4b5f016be5ebee06565e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 20 Jun 2021 14:02:42 +0200 Subject: [PATCH 0042/1522] soundtracker: Fix on Darwin --- .../audio/soundtracker/default.nix | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 25e784b2735..251725ea6b2 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, autoconf +, autoreconfHook , gtk2 , alsa-lib , SDL @@ -23,10 +23,32 @@ stdenv.mkDerivation rec { sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin binutils don't support D option for ar + # ALSA macros are missing on Darwin, causing error + substituteInPlace configure.ac \ + --replace ARFLAGS=crD ARFLAGS=cru \ + --replace AM_PATH_ALSA '#AM_PATH_ALSA' + # Avoid X11-specific workaround code on more than just Windows + substituteInPlace app/keys.c \ + --replace '!defined(_WIN32)' '!defined(_WIN32) && !defined(__APPLE__)' + # "The application with bundle ID (null) is running setugid(), which is not allowed." + sed -i -e '/seteuid/d' -e '/setegid/d' app/main.c + ''; + + configureFlags = [ + "--with-graphics-backend=gdk" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--disable-alsa" + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config - autoconf + autoreconfHook ]; + buildInputs = [ gtk2 SDL @@ -49,7 +71,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - # gdk/gdkx.h not found - broken = stdenv.isDarwin; }; } From f6ea60666cf8b9a8e32b2de8c5c9d1bdcb62990b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 24 Jun 2021 06:49:43 +0000 Subject: [PATCH 0043/1522] generate-expr-from-tarballs.pl: use nix-shell as script interpreter --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 6ec75517147..ee083afa745 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -1,10 +1,7 @@ -#! /usr/bin/env perl - -# Usage: -# -# manually update tarballs.list -# then run: cat tarballs.list | perl ./generate-expr-from-tarballs.pl +#!/usr/bin/env nix-shell +#!nix-shell --pure --keep NIX_PATH -i perl -p cacert nix perl +# Usage: manually update tarballs.list then run: ./generate-expr-from-tarballs.pl tarballs.list use strict; use warnings; From bdb0bbef089df3b6b236aeef8ab9eb1212893160 Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Fri, 25 Jun 2021 16:34:32 -0400 Subject: [PATCH 0044/1522] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss: updated config.php creation The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8. The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337. --- nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++---------- pkgs/servers/tt-rss/default.nix | 6 +- 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b78487cc928..b9feea7ffc5 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,80 +22,6 @@ let tt-rss-config = pkgs.writeText "config.php" '' Date: Sat, 3 Oct 2020 18:55:03 -0400 Subject: [PATCH 0045/1522] tdb: fix cross-compilation --- pkgs/development/libraries/tdb/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 658bdb2f9d5..2e2e09be108 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + python3 pkg-config wafHook libxslt @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "The trivial database"; longDescription = '' From e8b2b2c8e934a52097a731669bb0a5a13332cb40 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 3 Oct 2020 18:55:56 -0400 Subject: [PATCH 0046/1522] heimdal: install compile_et for cross-compilation --- pkgs/development/libraries/kerberos/heimdal.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b9d97052031..c426ec922ae 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -81,6 +81,9 @@ stdenv.mkDerivation rec { # asn1 compilers, move them to $dev mv $out/libexec/heimdal/heimdal/* $dev/bin rmdir $out/libexec/heimdal/heimdal + + # compile_et is needed for cross-compiling this package and samba + mv lib/com_err/.libs/compile_et $dev/bin ''; # Issues with hydra From 773369673c7741af55a0a1e675e35c8f3248e1e0 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 3 Oct 2020 19:02:46 -0400 Subject: [PATCH 0047/1522] samba: fix cross-compilation --- pkgs/servers/samba/4.x.nix | 38 ++++++-- ...uilt-heimdal-build-tools-in-case-of-.patch | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3ae30699546..fe2891f2ac7 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,13 +1,15 @@ { lib, stdenv +, buildPackages , fetchurl -, python +, python3 +, wafHook , pkg-config , bison , flex , perl , libxslt +, heimdal , docbook_xsl -, rpcgen , fixDarwinDylibNames , docbook_xml_dtd_45 , readline @@ -17,7 +19,6 @@ , libarchive , zlib , liburing -, fam , gnutls , libunwind , systemd @@ -59,26 +60,30 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch + ./build-find-pre-built-heimdal-build-tools-in-case-of-.patch ]; nativeBuildInputs = [ + python3 + wafHook pkg-config bison flex perl perl.pkgs.ParseYapp libxslt + buildPackages.stdenv.cc + heimdal docbook_xsl docbook_xml_dtd_45 cmocka rpcsvc-proto ] ++ optionals stdenv.isDarwin [ - rpcgen fixDarwinDylibNames ]; buildInputs = [ - python + python3 readline popt dbus @@ -86,7 +91,6 @@ stdenv.mkDerivation rec { libbsd libarchive zlib - fam libunwind gnutls libtasn1 @@ -102,6 +106,8 @@ stdenv.mkDerivation rec { ++ optional enableAcl acl ++ optional enablePam pam; + wafPath = "buildtools/bin/waf"; + postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions @@ -112,7 +118,11 @@ stdenv.mkDerivation rec { patchShebangs ./buildtools/bin ''; - configureFlags = [ + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + ''; + + wafConfigureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--enable-fhs" @@ -126,7 +136,15 @@ stdenv.mkDerivation rec { "--without-ads" ] ++ optional enableProfiling "--with-profiling-data" ++ optional (!enableAcl) "--without-acl-support" - ++ optional (!enablePam) "--without-pam"; + ++ optional (!enablePam) "--without-pam" + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--bundled-libraries=!asn1_compile,!compile_et" + ]; + + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; preBuild = '' export MAKEFLAGS="-j $NIX_BUILD_CORES" @@ -146,6 +164,10 @@ stdenv.mkDerivation rec { patchelf --shrink-rpath "\$BIN"; EOF find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; + + # Samba does its own shebang patching, but uses build Python + find "$out/bin" -type f -executable -exec \ + sed -i '1 s^#!${python3.pythonForBuild}/bin/python.*^#!${python3.interpreter}^' {} \; ''; passthru = { diff --git a/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch new file mode 100644 index 00000000000..b8636958ee2 --- /dev/null +++ b/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -0,0 +1,87 @@ +From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From: Uri Simchoni +Date: Sun, 20 Oct 2019 00:03:14 +0300 +Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded + heimdal + +This patch fixes the case of finding asn1_compile and compile_et for +building embedded heimdal, by setting +--bundled-libraries='!asn1_compile,!compile_et' as configure flags. + +The Heimdal build tools compile_et and asn1_compile are needed *only* +if we use the embedded heimdal (otherwise we don't build heimdal and +use headers that have been generated by those tools elsewhere). + +For cross-compilation with embedded heimdal, it is vital to use host build +tools, and so asn1_compile and compile_et must be supplied and not +built. One way of doing this would be to set the COMPILE_ET and +ASN1_COMPILE env vars to the location of supplied binaries. Another way, +which is more commonly used, is to exclude asn1_compile and compile_et +from bundled packages via the switch +-bundled-libraries='!asn1_compile,!compile_et'. When this is done, +the build script searches the path for those tools and sets the +ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly +kind of a round-about way of doing things but this has become the +de-facto standard amongst embedded distro builders). + +In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of +finding the binaris has been moved to be carried out only in the +system heimdal case. As explained above, we only need these tools, +and hence the check, in bundled mode. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 + +Signed-off-by: Uri Simchoni +Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 4.11.13] +--- + wscript_configure_embedded_heimdal | 11 +++++++++++ + wscript_configure_system_heimdal | 11 ----------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal +index 8c55ae2a938..4fdae8062c5 100644 +--- a/wscript_configure_embedded_heimdal ++++ b/wscript_configure_embedded_heimdal +@@ -1 +1,12 @@ + conf.RECURSE('source4/heimdal_build') ++ ++def check_system_heimdal_binary(name): ++ if conf.LIB_MAY_BE_BUNDLED(name): ++ return False ++ if not conf.find_program(name, var=name.upper()): ++ return False ++ conf.define('USING_SYSTEM_%s' % name.upper(), 1) ++ return True ++ ++check_system_heimdal_binary("compile_et") ++check_system_heimdal_binary("asn1_compile") +diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal +index 0ff6dad2f55..f77c177442f 100644 +--- a/wscript_configure_system_heimdal ++++ b/wscript_configure_system_heimdal +@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): + conf.define('USING_SYSTEM_%s' % name.upper(), 1) + return True + +-def check_system_heimdal_binary(name): +- if conf.LIB_MAY_BE_BUNDLED(name): +- return False +- if not conf.find_program(name, var=name.upper()): +- return False +- conf.define('USING_SYSTEM_%s' % name.upper(), 1) +- return True +- + check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") + + if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): +@@ -96,7 +96,4 @@ + #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): + # conf.define('USING_SYSTEM_TOMMATH', 1) + +-check_system_heimdal_binary("compile_et") +-check_system_heimdal_binary("asn1_compile") +- + conf.define('USING_SYSTEM_KRB5', 1) +-- +2.20.1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae2cee9d8d..164e82e4650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20027,10 +20027,7 @@ in deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba4 = callPackage ../servers/samba/4.x.nix { - rpcgen = netbsd.rpcgen; - python = python3; - }; + samba4 = callPackage ../servers/samba/4.x.nix { }; samba = samba4; From d9ff248390474edc0428d3c87b413a707b3b5223 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 28 Jun 2021 11:03:15 -0400 Subject: [PATCH 0048/1522] talloc: remove special case for cross-compiling Setting PYTHON_CONFIG = "/invalid" works for native builds as well, so we can avoid special-casing cross builds. --- pkgs/development/libraries/talloc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 27705c57858..f37f3d34d49 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -10,7 +10,7 @@ , wafHook }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "talloc"; version = "2.3.2"; @@ -42,6 +42,11 @@ stdenv.mkDerivation (rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + # this must not be exported before the ConfigurePhase otherwise waf whines preBuild = lib.optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_LINK="-no-pie -shared"; @@ -57,9 +62,4 @@ stdenv.mkDerivation (rec { license = licenses.gpl3; platforms = platforms.all; }; -} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly when cross-compiling. - PYTHON_CONFIG = "/invalid"; -}) +} From 7a6ecf8e8938d3b25f6f9b45ae6e7f323d5acb9c Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 09:39:06 -0700 Subject: [PATCH 0049/1522] terraform-providers.acme: 2.4.0 -> 2.5.2 --- .../networking/cluster/terraform-providers/default.nix | 10 ---------- .../cluster/terraform-providers/providers.json | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 868f2f06c81..82906f86729 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,7 +2,6 @@ , buildGoModule , buildGoPackage , fetchFromGitHub -, fetchpatch , callPackage }: let @@ -46,15 +45,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - acme = automated-providers.acme.overrideAttrs (attrs: { - patches = attrs.patches or [ ] ++ [ - (fetchpatch { - url = "https://github.com/vancluever/terraform-provider-acme/commit/a5834747aebc3677225c68a08ef784cfd7b35e6c.patch"; - sha256 = "091484whrpq6ykpgpndc8kc9cbvd9wwr0b51m1yxp31750lydp8m"; - }) - ]; - }); - # Packages that don't fit the default model ansible = callPackage ./ansible {}; cloudfoundry = callPackage ./cloudfoundry {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 234a9c2bca4..c40552399fb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -10,10 +10,10 @@ "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.4.0", - "sha256": "0r7i55gdscw94b954nfkvgfsrw7piq63gp06vh9smrwax9i2xc2f", - "vendorSha256": "09zmw2xm5fwwsa9bqwscq0s67hlxjk2kd3j02ayr4mxzhaagh1z9", - "version": "2.4.0" + "rev": "v2.5.2", + "sha256": "0yk5yxx8vdfymxggydpzsb2a0iw4n8010wlprz23qg37gb2p26yf", + "vendorSha256": "04zrrn67w30ib0n5s4f31x3nl3h3xz2r522ldkbbx20jy5iabrkk", + "version": "2.5.2" }, "akamai": { "owner": "terraform-providers", From e513bf6dc81597a4a604e021815cece09beff7b2 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 1 Jul 2021 12:21:51 +0800 Subject: [PATCH 0050/1522] spaceship-prompt: 3.12.6 -> 3.12.25 --- pkgs/shells/zsh/spaceship-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index e5725a78fc5..1e699997fd8 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.12.6"; + version = "3.12.25"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tKFah8b62wuw5vaNHddmj31UNd9kKCcQ99p8GlTnR6s="; + sha256 = "sha256-qDy0HkaX3N7VGptv88gB3284yDTbp2EpiZ1kvaLX8dc="; }; dontBuild = true; From 1a6a19509840fef43c52426fcae49cdd04969a58 Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Thu, 1 Jul 2021 15:38:04 -0400 Subject: [PATCH 0051/1522] Api didn't seem to work with the systemd envs I am not sure why it was working for me, but after restarting phpfpm-tt-rss it quit working. --- nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++----------- 1 file changed, 77 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b9feea7ffc5..0b23ba56cab 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -19,8 +19,84 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - tt-rss-config = pkgs.writeText "config.php" '' + tt-rss-config = let + password = + if (cfg.database.password != null) then + "${(escape ["'" "\\"] cfg.database.password)}" + else if (cfg.database.passwordFile != null) then + "file_get_contents('${cfg.database.passwordFile}'" + else + "" + ; + in pkgs.writeText "config.php" '' Date: Fri, 2 Jul 2021 00:47:42 -0700 Subject: [PATCH 0052/1522] eigen: 3.3.7 -> 3.3.9 --- pkgs/development/libraries/eigen/default.nix | 4 ++-- pkgs/development/libraries/eigen/include-dir.patch | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index a16cb628008..37180580421 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "eigen"; - version = "3.3.7"; + version = "3.3.9"; src = fetchFromGitLab { owner = "libeigen"; repo = pname; rev = version; - hash = "sha256-oXJ4V5rakL9EPtQF0Geptl0HMR8700FdSrOB09DbbMQ="; + sha256 = "sha256-JMIG7CLMndUsECfbKpXE3BtVFuAjn+CZvf8GXZpLkFQ="; }; patches = [ diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/development/libraries/eigen/include-dir.patch index 7f3bd88557e..42f8e189c0b 100644 --- a/pkgs/development/libraries/eigen/include-dir.patch +++ b/pkgs/development/libraries/eigen/include-dir.patch @@ -8,7 +8,16 @@ # guard against in-source builds -@@ -408,13 +408,6 @@ install(FILES +@@ -407,7 +407,7 @@ set(PKGCONFIG_INSTALL_DIR + CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" + ) + +-foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) ++foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + if(IS_ABSOLUTE "${${var}}") + message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") + endif() +@@ -429,13 +429,6 @@ install(FILES DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) @@ -22,7 +31,7 @@ add_subdirectory(Eigen) add_subdirectory(doc EXCLUDE_FROM_ALL) -@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) +@@ -531,8 +524,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) set ( EIGEN_DEFINITIONS "") From 7542395c3e9e1f1fc2c7f3e14671c6a87a0b38cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jul 2021 10:58:40 +0200 Subject: [PATCH 0053/1522] unetbootin: 681 -> 702 --- pkgs/tools/cd-dvd/unetbootin/default.nix | 49 ++++++++++++++++-------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 71a0a763285..f80f6060847 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,23 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook -, p7zip, mtools, syslinux }: +{ lib +, stdenv +, coreutils +, fetchFromGitHub +, libsForQt5 +, mtools +, p7zip +, qt5 +, syslinux +, util-linux +, which +}: stdenv.mkDerivation rec { pname = "unetbootin"; - version = "681"; + version = "702"; src = fetchFromGitHub { - owner = "unetbootin"; - repo = "unetbootin"; - rev = version; - sha256 = "0ppqb7ywh4cpcjr5nw6f65dx4s8kx09gnhihnby3zjhxdf4l99fm"; + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-psX15XicPXAsd36BhuvK0G3GQS8hV/hazzO0HByCqV4="; }; setSourceRoot = '' sourceRoot=$(echo */src/unetbootin) ''; - buildInputs = [ qt4 ]; - nativeBuildInputs = [ makeWrapper qmake4Hook ]; + buildInputs = [ + qt5.qtbase + qt5.qttools + libsForQt5.qmake + ]; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + enableParallelBuilding = true; # Lots of nice hard-coded paths... @@ -50,18 +66,19 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/unetbootin unetbootin_*.qm install -Dm644 -t $out/share/applications unetbootin.desktop - wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \ - --set QT_X11_NO_MITSHM 1 - runHook postInstall ''; + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]}" + "--set QT_X11_NO_MITSHM 1" + ]; + meta = with lib; { - homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + homepage = "http://unetbootin.github.io/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; + platforms = platforms.linux; }; } From bf227785854c9fd4a14c20db12dd6d3ebaf02981 Mon Sep 17 00:00:00 2001 From: Kazutoshi Noguchi Date: Tue, 6 Jul 2021 17:12:28 +0900 Subject: [PATCH 0054/1522] nixos/binfmt: run binfmt activation script after mounting /run binfmt activation script creates /run/binfmt before mounting /run when system activation. To fix it I added dependency to specialfs to binfmt activation script. --- nixos/modules/system/boot/binfmt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index cbdf581d73a..2408ecc80d2 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkOption types optionalString; + inherit (lib) mkOption types optionalString stringAfter; cfg = config.boot.binfmt; @@ -270,7 +270,7 @@ in { environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); - system.activationScripts.binfmt = '' + system.activationScripts.binfmt = stringAfter [ "specialfs" ] '' mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; From 99367c36acb6f4698908591bc173b03b0b0e0419 Mon Sep 17 00:00:00 2001 From: Brecht Savelkoul Date: Tue, 6 Jul 2021 21:15:31 +0200 Subject: [PATCH 0055/1522] maintainers: add brecht --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e436ce47eec..55a29e393d3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1512,6 +1512,12 @@ githubId = 1111035; name = "Break Yang"; }; + brecht = { + email = "brecht.savelkoul@alumni.lse.ac.uk"; + github = "brechtcs"; + githubId = 6107054; + name = "Brecht Savelkoul"; + }; brettlyons = { email = "blyons@fastmail.com"; github = "brettlyons"; From b6985b0fbe95a2d20937dbd5b7d30cf67c4181a8 Mon Sep 17 00:00:00 2001 From: Brecht Savelkoul Date: Tue, 6 Jul 2021 21:16:01 +0200 Subject: [PATCH 0056/1522] twurl: init at 0.9.6 Twurl gives more low-level access to the Twitter API than the `t` tool that's already available in nixpkgs right now --- pkgs/tools/misc/twurl/Gemfile | 3 +++ pkgs/tools/misc/twurl/Gemfile.lock | 15 +++++++++++++++ pkgs/tools/misc/twurl/default.nix | 17 +++++++++++++++++ pkgs/tools/misc/twurl/gemset.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 60 insertions(+) create mode 100644 pkgs/tools/misc/twurl/Gemfile create mode 100644 pkgs/tools/misc/twurl/Gemfile.lock create mode 100644 pkgs/tools/misc/twurl/default.nix create mode 100644 pkgs/tools/misc/twurl/gemset.nix diff --git a/pkgs/tools/misc/twurl/Gemfile b/pkgs/tools/misc/twurl/Gemfile new file mode 100644 index 00000000000..55b6e9f5650 --- /dev/null +++ b/pkgs/tools/misc/twurl/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'twurl' diff --git a/pkgs/tools/misc/twurl/Gemfile.lock b/pkgs/tools/misc/twurl/Gemfile.lock new file mode 100644 index 00000000000..d29268e656d --- /dev/null +++ b/pkgs/tools/misc/twurl/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + oauth (0.5.6) + twurl (0.9.6) + oauth (~> 0.4) + +PLATFORMS + ruby + +DEPENDENCIES + twurl + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/twurl/default.nix b/pkgs/tools/misc/twurl/default.nix new file mode 100644 index 00000000000..dccb67fbaf6 --- /dev/null +++ b/pkgs/tools/misc/twurl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "twurl"; + gemdir = ./.; + exes = [ "twurl" ]; + + passthru.updateScript = bundlerUpdateScript "twurl"; + + meta = with lib; { + description = "OAuth-enabled curl for the Twitter API"; + homepage = "https://github.com/twitter/twurl"; + license = "MIT"; + maintainers = with maintainers; [ brecht ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/twurl/gemset.nix b/pkgs/tools/misc/twurl/gemset.nix new file mode 100644 index 00000000000..a1a2ed835d3 --- /dev/null +++ b/pkgs/tools/misc/twurl/gemset.nix @@ -0,0 +1,23 @@ +{ + oauth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; + type = "gem"; + }; + version = "0.5.6"; + }; + twurl = { + dependencies = ["oauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jgsxa0cnkajnsxxlsrgl2wq3m7khaxvr0rcir4vwbc1hx210700"; + type = "gem"; + }; + version = "0.9.6"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1415e4fc4f6..4cf3a6fa379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9441,6 +9441,8 @@ in twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; + twurl = callPackage ../tools/misc/twurl { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; From 97cb387fb97a41ee455c129935ce12e38c789d55 Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Fri, 25 Jun 2021 16:34:32 -0400 Subject: [PATCH 0057/1522] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss: updated config.php creation The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8. The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337. --- nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++---------- pkgs/servers/tt-rss/default.nix | 6 +- 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b78487cc928..b9feea7ffc5 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,80 +22,6 @@ let tt-rss-config = pkgs.writeText "config.php" '' Date: Thu, 1 Jul 2021 15:38:04 -0400 Subject: [PATCH 0058/1522] Api didn't seem to work with the systemd envs I am not sure why it was working for me, but after restarting phpfpm-tt-rss it quit working. --- nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++----------- 1 file changed, 77 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b9feea7ffc5..0b23ba56cab 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -19,8 +19,84 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - tt-rss-config = pkgs.writeText "config.php" '' + tt-rss-config = let + password = + if (cfg.database.password != null) then + "${(escape ["'" "\\"] cfg.database.password)}" + else if (cfg.database.passwordFile != null) then + "file_get_contents('${cfg.database.passwordFile}'" + else + "" + ; + in pkgs.writeText "config.php" '' Date: Thu, 8 Jul 2021 16:49:10 +0200 Subject: [PATCH 0059/1522] fftw: enable fortran bindings --- pkgs/development/libraries/fftw/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 9385903b3f5..3f6b028a45a 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, llvmPackages ? null, precision ? "double", perl }: +{ fetchurl, stdenv, lib, gfortran, llvmPackages ? null, precision ? "double", perl }: with lib; @@ -25,6 +25,8 @@ stdenv.mkDerivation { ++ optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom + nativeBuildInputs = [ gfortran ]; + buildInputs = lib.optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp From e503e43a03db20972cf8e9b3da20d24542336ee1 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 9 Jul 2021 10:38:10 +0200 Subject: [PATCH 0060/1522] cp2k: init at 8.2.0 cp2k: cleanup/formatting cp2k: change license cp2k: remove comment --- .../science/chemistry/cp2k/default.nix | 117 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 119 insertions(+) create mode 100644 pkgs/applications/science/chemistry/cp2k/default.nix diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix new file mode 100644 index 00000000000..6bb99ce556d --- /dev/null +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -0,0 +1,117 @@ +{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack +, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper +, libxsmm, spglib, which +} : + +let + cp2kVersion = "psmp"; + arch = "Linux-x86-64-gfortran"; + +in stdenv.mkDerivation rec { + pname = "cp2k"; + version = "8.2.0"; + + src = fetchFromGitHub { + owner = "cp2k"; + repo = "cp2k"; + rev = "v${version}"; + sha256 = "0kykq5p318hxjzd4gzqjwv9gqshbdvbg0gnjbd9bdfjx1r6jkjn3"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ python3 which openssh makeWrapper ]; + buildInputs = [ + gfortran + fftw + gsl + libint + libvori + libxc + libxsmm + spglib + scalapack + blas + lapack + ]; + + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + + makeFlags = [ + "ARCH=${arch}" + "VERSION=${cp2kVersion}" + ]; + + doCheck = true; + + enableParallelBuilding = true; + + postPatch = '' + patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k + substituteInPlace exts/dbcsr/.cp2k/Makefile --replace '/usr/bin/env python3' '${python3}/bin/python' + ''; + + configurePhase = '' + cat > arch/${arch}.${cp2kVersion} << EOF + CC = mpicc + CPP = + FC = mpif90 + LD = mpif90 + AR = ar -r + DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ + -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ + -D__MAX_CONTR=4 -D__LIBVORI + CFLAGS = -fopenmp + FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ + -ftree-vectorize -funroll-loops -msse2 \ + -std=f2008 \ + -fopenmp -ftree-vectorize -funroll-loops \ + -I${libxc}/include -I${libxsmm}/include \ + -I${libint}/include + LIBS = -lfftw3 -lfftw3_threads \ + -lscalapack -lblas -llapack \ + -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ + -lint2 -lstdc++ -lvori \ + -lgomp -lpthread -lm \ + -fopenmp + LDFLAGS = \$(FCFLAGS) \$(LIBS) + EOF + ''; + + checkPhase = '' + export OMP_NUM_THREADS=1 + + export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox + export OMPI_MCA_rmaps_base_oversubscribe=1 + export CP2K_DATA_DIR=data + + mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/cp2k + + cp exe/${arch}/* $out/bin + + for i in cp2k cp2k_shell graph; do + wrapProgram $out/bin/$i.${cp2kVersion} \ + --set-default CP2K_DATA_DIR $out/share/cp2k + done + + wrapProgram $out/bin/cp2k.popt \ + --set-default CP2K_DATA_DIR $out/share/cp2k \ + --set OMP_NUM_THREADS 1 + + cp -r data/* $out/share/cp2k + ''; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Quantum chemistry and solid state physics program"; + homepage = "https://www.cp2k.org"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sheepforce ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d844813acd..e04e95265b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29609,6 +29609,8 @@ in chemtool = callPackage ../applications/science/chemistry/chemtool { }; + cp2k = callPackage ../applications/science/chemistry/cp2k { }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; From 250f0514f2cfbf1c4f099870c329eb6ecc6a0115 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:20 +0200 Subject: [PATCH 0061/1522] python38: 3.8.10 -> 3.8.11 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index be0d6ce1e43..7944f2f345b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -122,10 +122,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "8"; - patch = "10"; + patch = "11"; suffix = ""; }; - sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka"; + sha256 = "1chg8b0m1yrz50lizid20zha0dmj40z0iih3jqcrg7pyxca126pv"; }; python39 = { sourceVersion = { From 360c50f11d675f0a19e2245e3ebfa1179ff28360 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:41 +0200 Subject: [PATCH 0062/1522] python39: 3.9.5 -> 3.9.6 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7944f2f345b..c7eb9e38b50 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -131,10 +131,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "5"; + patch = "6"; suffix = ""; }; - sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; + sha256 = "12hhw2685i68pwfx5hdkqngzhbji4ccyjmqb5rzvkigg6fpj0y9r"; }; }; From e1e245f203e2d1b568b730eb363026ea81fdfc1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:56 +0200 Subject: [PATCH 0063/1522] python36: 3.6.13 -> 3.6.14 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c7eb9e38b50..91c9bf7a817 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -158,10 +158,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "pHpDpTq7QihqLBGWU0P/VnEbnmTo0RvyxnAaT7jOGg8="; + sha256 = "1bnm0bx7xf1jpfm0bmzlq19vwm0bvcbl7klx4rvgq05xryhafqr6"; inherit (darwin) configd; inherit passthruFun; }; From b322c5ecaab811090690b026e1db857de6523e64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:02:07 +0200 Subject: [PATCH 0064/1522] python37: 3.7.10 -> 3.7.11 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 91c9bf7a817..9f68819c6c5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -171,10 +171,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "10"; + patch = "11"; suffix = ""; }; - sha256 = "+NgudXLIbsnVXIYnquUEAST9IgOvQAw4PIIbmAMG7ms="; + sha256 = "0d57b5a47wapzpkkq5rbvvi4caylc35j5910b64rxxn4nmm1kd6x"; inherit (darwin) configd; inherit passthruFun; }; From 370a25c0eeec6451db0a1fa424308e661b340fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 10 Jul 2021 08:42:06 +0200 Subject: [PATCH 0065/1522] nettools: Add mii-tool --- pkgs/os-specific/linux/net-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index c9410c27df9..9630b5c0c7a 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { "HAVE_SERIAL_TOOLS=1" "HAVE_HOSTNAME_TOOLS=1" "HAVE_HOSTNAME_SYMLINKS=1" + "HAVE_MII=1" ]; meta = { From f2099aa3765437b81323aeb4b64bb83a1ec24b33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jul 2021 18:14:21 +0200 Subject: [PATCH 0066/1522] python3Packages.simplejson: 3.17.2 -> 3.17.3 --- .../development/python-modules/simplejson/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index dd27c02dc87..0d4d45cce5d 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,17 +7,20 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.2"; - doCheck = !stdenv.isDarwin; + version = "3.17.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2ZC7aKyUUcth43Ce0j6JdjrJ4gb4QfJDlY2M5TLMQ+o="; + sha256 = "sha256-Ev1vKyxexPvTT+esf9ngUcHu70Brl27P3qbS5fK2HxU="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + doCheck = !stdenv.isDarwin; pythonImportsCheck = [ "simplejson" ]; From 75db7f8eb049e825ca2a5e201180aa45dd82709a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Apr 2021 22:23:30 +0000 Subject: [PATCH 0067/1522] netbsd: Use rsync to speed up source merging The find -exec that was there before is quite slow on my machine. This is much faster. --- pkgs/os-specific/bsd/netbsd/default.nix | 27 ++++++++++++++----------- pkgs/os-specific/bsd/setup-hook.sh | 8 ++++---- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index bb0984d9738..1e933148000 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -7,6 +7,8 @@ }: let + inherit (buildPackages.buildPackages) rsync; + fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; @@ -60,7 +62,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - install tsort lorder mandoc groff statHook + install tsort lorder mandoc groff statHook rsync ]; buildInputs = with self; compatIfNeeded; @@ -116,7 +118,7 @@ in lib.makeScopeWithSplicing version = "9.2"; buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook ]; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; skipIncludesPhase = true; @@ -165,6 +167,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ bsdSetupHook makeMinimal + rsync ]; buildInputs = with self; commonDeps; @@ -237,7 +240,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - mandoc groff + mandoc groff rsync ]; skipIncludesPhase = true; buildInputs = with self; compatIfNeeded ++ [ fts ]; @@ -259,7 +262,7 @@ in lib.makeScopeWithSplicing sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook rsync ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ @@ -297,7 +300,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - install mandoc groff + install mandoc groff rsync ]; }; @@ -319,7 +322,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - install mandoc groff + install mandoc groff rsync ]; }; @@ -330,7 +333,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - install mandoc groff + install mandoc groff rsync ]; }; ## @@ -463,7 +466,7 @@ in lib.makeScopeWithSplicing NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook - makeMinimal install mandoc byacc flex + makeMinimal install mandoc byacc flex rsync ]; buildInputs = with self; compatIfNeeded; extraPaths = with self; [ cksum.src ]; @@ -482,7 +485,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal - install mandoc groff nbperf rpcgen + install mandoc groff rsync nbperf rpcgen ]; extraPaths = with self; [ common ]; headersOnly = true; @@ -508,7 +511,7 @@ in lib.makeScopeWithSplicing propagatedBuildInputs = with self; [ include ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook - makeMinimal install tsort lorder statHook uudecode config genassym + makeMinimal install tsort lorder statHook rsync uudecode config genassym ]; postConfigure = '' @@ -748,7 +751,7 @@ in lib.makeScopeWithSplicing bsdSetupHook makeMinimal install mandoc groff flex - byacc genassym gencat lorder tsort statHook + byacc genassym gencat lorder tsort statHook rsync ]; buildInputs = with self; [ headers ]; extraPaths = with self; [ sys.src ld_elf_so.src ]; @@ -786,7 +789,7 @@ in lib.makeScopeWithSplicing bsdSetupHook makeMinimal install mandoc groff flex - byacc genassym gencat lorder tsort statHook rpcgen + byacc genassym gencat lorder tsort statHook rsync rpcgen ]; buildInputs = with self; [ headers csu ]; NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index 45babc38d7a..98fee66f5df 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -70,10 +70,7 @@ setBSDSourceDir() { export _SRC_TOP_=$BSDSRCDIR chmod -R u+w $sourceRoot for path in $extraPaths; do - cd $path - find . -type d -exec mkdir -p $sourceRoot/\{} \; - find . -type f -exec cp -pr \{} $sourceRoot/\{} \; - chmod -R u+w $sourceRoot + rsync -Er --chmod u+w $path/ $sourceRoot/ done cd $sourceRoot @@ -104,6 +101,9 @@ moveUsrDir() { if [ -d $prefix ]; then # Remove lingering /usr references if [ -d $prefix/usr ]; then + # Didn't try using rsync yet because per + # https://unix.stackexchange.com/questions/127712/merging-folders-with-mv, + # it's not neessarily better. pushd $prefix/usr find . -type d -exec mkdir -p $out/\{} \; find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; From c854b8570285ac4c14282a5efa0f8334a520ac8d Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 11 Jul 2021 12:48:10 +1000 Subject: [PATCH 0068/1522] nixos/gitea: use gitea to refresh hooks and keys Gitea now provides this functionality as an admin command. Is significantly faster, especially on slow disks. --- nixos/modules/services/misc/gitea.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index b6c1ca3e61a..2f8e595cad0 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -523,19 +523,12 @@ in ''} # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*") - if [ "$HOOKS" ] - then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS - fi + ${gitea}/bin/gitea admin regenerate hooks # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys + ${gitea}/bin/gitea admin regenerate keys fi ''; From 4164ca1b1418fa5ff6f2d41a9b3d6f781638fc29 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 11 Jul 2021 00:15:42 +0200 Subject: [PATCH 0069/1522] gtk3: 3.24.27 -> 3.24.30 drop json-glib from inputs https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3729 --- pkgs/development/libraries/gtk/3.x.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index f9b5d5f68b5..01b98d06bf3 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -25,7 +25,6 @@ , fribidi , xorg , epoxy -, json-glib , libxkbcommon , libxml2 , gmp @@ -60,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.27"; + version = "3.24.30"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p"; + sha256 = "sha256-unW//zIK0fTPvukrqBPsM2MizDxmDUBqrQFLBwh6O6k="; }; patches = [ @@ -111,7 +110,6 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy - json-glib isocodes ] ++ lib.optionals stdenv.isDarwin [ AppKit From 0476c760b738c3d0e259e7333aad5e039eb246c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Jun 2021 10:20:59 +0200 Subject: [PATCH 0070/1522] python3Packages.geocachingapi: init at 0.1.0 --- .../python-modules/geocachingapi/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/geocachingapi/default.nix diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix new file mode 100644 index 00000000000..952457c5360 --- /dev/null +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, backoff +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, yarl +}: + +buildPythonPackage rec { + pname = "geocachingapi"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Sholofly"; + repo = "geocachingapi-python"; + rev = version; + sha256 = "1vdknsxd7rvw6g5lwxlxj97l9ic8cch8rdki3aczs6xzw5adxhcs"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + aiohttp + backoff + yarl + ]; + + # Tests require a token and network access + doCheck = false; + + pythonImportsCheck = [ "geocachingapi" ]; + + meta = with lib; { + description = "Python API to control the Geocaching API"; + homepage = "https://github.com/Sholofly/geocachingapi-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78db6b3db5c..019c238f187 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2820,6 +2820,8 @@ in { geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; + geocachingapi = callPackage ../development/python-modules/geocachingapi { }; + geographiclib = callPackage ../development/python-modules/geographiclib { }; geoip2 = callPackage ../development/python-modules/geoip2 { }; From 79d94779a85bf7aa1be1c568b19bcc1531a9ab15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 10 Jul 2021 23:53:54 +0000 Subject: [PATCH 0071/1522] binutils: Apply patch to fix 300x strip performance regression. Fixes #129467 --- ...t-read-non-existing-secondary-relocs.patch | 26 +++++++++++++++++++ .../tools/misc/binutils/default.nix | 9 +++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/bfd-elf-Dont-read-non-existing-secondary-relocs.patch diff --git a/pkgs/development/tools/misc/binutils/bfd-elf-Dont-read-non-existing-secondary-relocs.patch b/pkgs/development/tools/misc/binutils/bfd-elf-Dont-read-non-existing-secondary-relocs.patch new file mode 100644 index 00000000000..c166066c980 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/bfd-elf-Dont-read-non-existing-secondary-relocs.patch @@ -0,0 +1,26 @@ +X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Felf.c;h=af62aadc3d446cd5b1f0201b207c90c22e7809b1;hp=36733e080dd9d9be28b576b246aaf5bd8c8569c7;hb=84fd26d8209e99fc3a432dd0b09b6c053de1ce65;hpb=abe2a28aaa7a2bfd0f3061c72a98eb898976b721 + +diff --git a/bfd/elf.c b/bfd/elf.c +index 36733e080dd..af62aadc3d4 100644 +--- a/bfd/elf.c ++++ b/bfd/elf.c +@@ -2454,6 +2454,8 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) + "for section %pA found - ignoring"), + abfd, name, target_sect); + } ++ else ++ esdt->has_secondary_relocs = TRUE; + goto success; + } + +@@ -12587,6 +12589,9 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd, + #endif + r_sym = elf32_r_sym; + ++ if (!elf_section_data (sec)->has_secondary_relocs) ++ return TRUE; ++ + /* Discover if there are any secondary reloc sections + associated with SEC. */ + for (relsec = abfd->sections; relsec != NULL; relsec = relsec->next) + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index a4233886a85..7a06e290a96 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch + # Fix quadratic slowdown in `strip` performance. + # See #129467 and https://sourceware.org/bugzilla/show_bug.cgi?id=28058 + # Remove when we're on binutils > 2.36.1. + # The patch is downloaded from + # https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd/elf.c;h=af62aadc3d446cd5b1f0201b207c90c22e7809b1;hp=36733e080dd9d9be28b576b246aaf5bd8c8569c7;hb=84fd26d8209e99fc3a432dd0b09b6c053de1ce65;hpb=abe2a28aaa7a2bfd0f3061c72a98eb898976b721 + # which is the 2.36 backport (using `TRUE` instead of `true` of binutils master commit: + # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=956ea65cd707707c0f725930214cbc781367a831 + ./bfd-elf-Dont-read-non-existing-secondary-relocs.patch + ./CVE-2020-35448.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch ++ # This patch was suggested by Nick Clifton to fix From 03e499425d2f3968eeb9b568d0350b6cf3da6b64 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 10 Jul 2021 12:08:31 -0700 Subject: [PATCH 0072/1522] zstd: don't build contrib when cross-compiling Tests and `./gen_html` from contrib need to run on host architecture. Disable them when doing cross-compiliation. --- pkgs/tools/compression/zstd/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 5253d7faa40..16504d50dbf 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,6 +3,9 @@ , file , legacySupport ? false , static ? stdenv.hostPlatform.isStatic +# these need to be ran on the host, thus disable when cross-compiling +, buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform +, doCheck ? stdenv.hostPlatform == stdenv.buildPlatform }: stdenv.mkDerivation rec { @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; BUILD_STATIC = static; - BUILD_CONTRIB = true; + BUILD_CONTRIB = buildContrib; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; BUILD_TESTS = doCheck; @@ -53,7 +56,7 @@ stdenv.mkDerivation rec { ''; checkInputs = [ file ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + inherit doCheck; checkPhase = '' runHook preCheck # Patch shebangs for playTests @@ -64,7 +67,6 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $bin/bin - cp contrib/pzstd/pzstd $bin/bin/pzstd substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$bin/bin/zstdcat" @@ -73,6 +75,8 @@ stdenv.mkDerivation rec { --replace "zstdcat" "$bin/bin/zstdcat" '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd + '' + lib.optionalString buildContrib '' + cp contrib/pzstd/pzstd $bin/bin/pzstd ''; outputs = [ "bin" "dev" ] From c81250a1d3e6f199e7e98529e54cdf4557620f4f Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 12 Jul 2021 16:45:17 +0200 Subject: [PATCH 0073/1522] emacs: fix overrideScope' examples --- doc/builders/packages/emacs.section.md | 2 +- pkgs/build-support/emacs/wrapper.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index 93a819bc79b..577f1a23ce0 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -110,7 +110,7 @@ overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages +((emacsPackagesFor emacs).overrideScope' overrides).withPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687c..a35fdcbabad 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -27,7 +27,7 @@ let customEmacsPackages = # use the unstable MELPA version of magit magit = self.melpaPackages.magit; }); -in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) +in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` */ From fc141011d23866b830858fc01ce90595bfaf6504 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 01:11:23 +0200 Subject: [PATCH 0074/1522] nspr: 4.31 -> 4.32 NSPR 4.32 contains the following changes: - implement new socket option PR_SockOpt_DontFrag - support larger DNS records by increasing the default buffer size for DNS queries See https://bugzilla.mozilla.org/buglist.cgi?resolution=FIXED&query_format=advanced&product=NSPR&target_milestone=4.32 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 91532b3771e..c68354a18b6 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.31"; + version = "4.32"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"; + sha256 = "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv"; }; patches = [ From 04bc2667d11daae41723e0fe6477f1e097be4028 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 12 Jul 2021 16:49:48 +0200 Subject: [PATCH 0075/1522] nss: 3.67 -> 3.68 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ced72d33e17..1d38ed4531f 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.67"; + version = "3.68"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n"; + sha256 = "0nvj7h2brcw21p1z99nrsxka056d0r1yy9nqqg0lw0w3mhnb60n4"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From b8edd5a22448dfec5c0afe5ad470f7a8f1b6a4e8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 13 Jul 2021 17:50:58 +0200 Subject: [PATCH 0076/1522] modemmanager: 1.16.6 -> 1.16.8 --- pkgs/tools/networking/modem-manager/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 2a99c127acb..9d8f13a4070 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.16.6"; + version = "1.16.8"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "05wn94x71qr36avxjzvyf56nj5illynnf9nn15b17lv61wkbd41a"; + sha256 = "sha256-If36+UFxJhrZ2ZdxiU9a3kvDnvPR/x1CEFTRRxPpeIA="; }; - patches = [ - # Fix a broken test. - # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/556 - (fetchpatch { - url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/a324667386f35df0c3b3bbf615fa0560d215485d.patch"; - sha256 = "1xj9gfl6spbp4xdp6gn76k8zvzam5m6lgmbiwdn6ixffzhlfwi5l"; - }) - ]; - nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; From ac79f89b704d61bb7649fe7a90609dd4b468d9a7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 5 Jul 2021 21:12:16 +0200 Subject: [PATCH 0077/1522] skype4pidgin: remove It hasn't worked for years, since the old skype for linux was retired. --- .../pidgin-plugins/skype4pidgin/default.nix | 41 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix deleted file mode 100644 index 6e14ee1a2b8..00000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus -, dbus-glib }: - -stdenv.mkDerivation rec { - name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; - src = fetchurl { - url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f"; - name = "${name}.tar.gz"; - sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0"; - }; - - NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify"; - - patchPhase = '' - sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \ - -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile - pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify - ''; - - buildPhase = "make libskype.so libskype_dbus.so"; - - installPhase = '' - mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin - cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16 - cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22 - cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48 - cp libskype.so libskype_dbus.so $out/lib/pidgin - ''; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; - - meta = { - homepage = "https://github.com/novas0x2a/skype4pidgin"; - license = lib.licenses.gpl3Plus; - description = "Plugin to use a running skype account through pidgin"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c59db87b73..0f7876645c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -754,6 +754,7 @@ mapAliases ({ sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 slic3r-prusa3d = prusa-slicer; # added 2019-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280283e0761..03890b64ca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26821,8 +26821,6 @@ in skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; slmenu = callPackage ../applications/misc/slmenu {}; From f339344359c92ab2833ae8c8f5aee3fab48ce05f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Jul 2021 12:46:13 +0200 Subject: [PATCH 0078/1522] fish-irssi: use fetchFromGitHub and pname&version --- .../networking/irc/irssi/fish/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index d3b814fb161..df59ddec6a9 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: stdenv.mkDerivation rec { - name = "fish-irssi-20130413-e98156bebd"; + pname = "fish-irssi"; + version = "unstable-2013-04-13"; - src = fetchurl { - url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; - name = "${name}.tar.gz"; - sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a"; + src = fetchFromGitHub { + owner = "falsovsky"; + repo = "FiSH-irssi"; + rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6"; + sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp"; }; preConfigure = '' From d3dfacfc285846c26c309e045bd93e4d30acb905 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Jul 2021 12:48:49 +0200 Subject: [PATCH 0079/1522] pidgin-msn-pecan: fix source and pname&version --- .../pidgin-plugins/msn-pecan/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index c32bd6f3e39..7a761c1e91c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, pidgin} : +{ lib, stdenv, fetchFromGitHub, pidgin} : -stdenv.mkDerivation { - name = "pidgin-msn-pecan-0.1.4"; - src = fetchurl { - url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2"; - sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; +stdenv.mkDerivation rec { + pname = "pidgin-msn-pecan"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "felipec"; + repo = "msn-pecan"; + rev = "v${version}"; + sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh"; }; meta = { From 62c3e45f3056c0fdf6efc05e4a87e208ed12f989 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Jul 2021 12:50:42 +0200 Subject: [PATCH 0080/1522] purple-xmpp-http-upload: use fetchFromGitHub and pname&version --- .../pidgin-plugins/purple-xmpp-http-upload/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 6ade8e5f19e..cb450aa1bc3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, pidgin, glib, libxml2 }: +{ lib, stdenv, fetchFromGitHub, pidgin, glib, libxml2 }: stdenv.mkDerivation { - name = "purple-xmpp-upload-2017-12-31"; + pname = "purple-xmpp-upload"; + version = "unstable-2017-12-31"; - src = fetchgit { - url = "https://github.com/Junker/purple-xmpp-http-upload"; + src = fetchFromGitHub { + owner = "Junker"; + repo = "purple-xmpp-http-upload"; rev = "178096cbfc9df165c2dc1677666439969d212b37"; sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp"; }; From aa6a03467f4353c6edb1f2c14ab5e892b21d7840 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 14 Jul 2021 12:23:41 +0200 Subject: [PATCH 0081/1522] flashtool/proglodyte-wasm: add removal notice --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df082ff35c..83bd08da9a8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -232,6 +232,7 @@ mapAliases ({ flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # added 2021-06-31 flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 @@ -646,6 +647,7 @@ mapAliases ({ privateer = throw "privateer was removed because it was broken"; # added 2021-05-18 processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 + proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16 pygmentex = texlive.bin.pygmentex; # added 2019-12-15 From a13ae31c53631a8ad2f51bb0e32de87afc46e3b0 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 14 Jul 2021 16:12:24 +0200 Subject: [PATCH 0082/1522] libsForQt515.qtbase: fix gcc11 compatibility --- pkgs/development/libraries/qt-5/5.15/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5cfca8d80c7..a8ba5128665 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -115,6 +115,11 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch + (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/339323 is included in an release. + name = "0014-gcc11-compat.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8"; + sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; From 3f63c29812e0f1fd1c8763e746de79ae08da4c10 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 23 Jun 2021 17:41:35 +0300 Subject: [PATCH 0083/1522] linux: enable LIRC --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 355e653c8ea..fce451ee889 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -846,6 +846,8 @@ let X86_AMD_PLATFORM_DEVICE = yes; X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; + LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot From 840fd0a4f8d1d7cd32328b9d853b34165884fdfc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 14 Jul 2021 19:03:58 +0200 Subject: [PATCH 0084/1522] doc/coding-conventions: Increase passthru test timeout 3s -> 60s 3s is too small a margin for a loaded slow system to start a bloated program. This leads to problems when tests are written on decent dev hardware but later run on build farms of potentially slower hardware, particularly in the case of non x86. The chance of needing the timeout is actually very small, so those rare 57s are a reasonable price to pay for fewer timeouts on build farms, each of which should be investigated and usually fixed by increasing the timeout. --- doc/contributing/coding-conventions.chapter.md | 2 +- pkgs/tools/misc/phoronix-test-suite/tests.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index e42ba512b98..240260105c3 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -568,7 +568,7 @@ let inherit (phoronix-test-suite) pname version; in -runCommand "${pname}-tests" { meta.timeout = 3; } +runCommand "${pname}-tests" { meta.timeout = 60; } '' # automatic initial setup to prevent interactive questions ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/tools/misc/phoronix-test-suite/tests.nix index 06bd9def9aa..85249c1242f 100644 --- a/pkgs/tools/misc/phoronix-test-suite/tests.nix +++ b/pkgs/tools/misc/phoronix-test-suite/tests.nix @@ -4,7 +4,7 @@ let inherit (phoronix-test-suite) pname version; in -runCommand "${pname}-tests" { meta.timeout = 3; } +runCommand "${pname}-tests" { meta.timeout = 60; } '' # automatic initial setup to prevent interactive questions ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null From b82409869abb3c92d80f1a9b854ad51ba9a7bd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Wed, 14 Jul 2021 19:20:11 +0200 Subject: [PATCH 0085/1522] texlive: use sha256 (#130097) --- .../tools/typesetting/tex/texlive/default.nix | 3 +- .../typesetting/tex/texlive/fixHashes.awk | 2 +- .../typesetting/tex/texlive/fixedHashes.nix | 18186 ++++++++-------- 3 files changed, 9095 insertions(+), 9096 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 386e0d8d3be..79fa05b966c 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -19,7 +19,6 @@ let }; # map: name -> fixed-output hash - # sha1 in base32 was chosen as a compromise between security and length fixedHashes = lib.optionalAttrs useFixedHashes (import ./fixedHashes.nix); # function for creating a working environment from a set of TL packages @@ -175,7 +174,7 @@ let }; } // lib.optionalAttrs (fixedHash != null) { outputHash = fixedHash; - outputHashAlgo = "sha1"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; } ) diff --git a/pkgs/tools/typesetting/tex/texlive/fixHashes.awk b/pkgs/tools/typesetting/tex/texlive/fixHashes.awk index 88ba0bc1528..d9f1acd08ea 100755 --- a/pkgs/tools/typesetting/tex/texlive/fixHashes.awk +++ b/pkgs/tools/typesetting/tex/texlive/fixHashes.awk @@ -10,7 +10,7 @@ BEGIN { print "No match for \""$0"\"" > "/dev/stderr" exit 1 } - cmd="nix-hash --type sha1 --base32 "$0 + cmd="nix-hash --type sha256 --base32 "$0 if (( cmd | getline hash ) <= 0) { print "Error executing nix-hash" > "/dev/stderr" exit 1 diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index d7182086f9a..22e6daacb2e 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -1,9095 +1,9095 @@ { -"amsfonts-3.04"="hi87s0fxrkcq0w2389kwpxd3zzwsk1zf"; -"amsfonts.doc-3.04"="ch872rwfiar58praz8f880rcspy4mjxa"; -"amsfonts.source-3.04"="vjiw3vdxv44nl4yvaxqfy4b78girpjs7"; -"bibtex-0.99d"="ybimfc49fzmgpy88wagy0z55sdsshr50"; -"bibtex.doc-0.99d"="jbk7qsya6x0l8c3bvnf3dzp59hak4alq"; -"kpathsea-58622"="9d0ldcy58xcyd2b8hckkl14518bw5p5s"; -"kpathsea.doc-58622"="l0s26mhn17liv00kggh0x4kb02i044a3"; -"cm-57963"="5xrqls79s3drpagj8j3ihqzkll10605w"; -"cm.doc-57963"="zkdw4jhvmz2gd3zgazhx548lrj1a4lws"; -"colorprofiles-20181105"="9rs3wkarffy7hf7c9kymzacy20znvcqf"; -"colorprofiles.doc-20181105"="v1asppz0kqvfg85skaiisphh2z4y6mbh"; -"dvipdfmx-58645"="2a9i7p590z9v716a235rb52yxvzkyr2p"; -"dvipdfmx.doc-58645"="icyrpqvnwznpzgw6vp2k6pdvad1hy2lp"; -"glyphlist-54074"="i4nay4q38l3367hlc93rhkgxvrkcmyjb"; -"dvips-57972"="3mixrkqhlx0d7lkcvm3z1yh3z5gmjhiq"; -"dvips.doc-57972"="36fjspl0a9dlih2r5jqymhp96h81z37q"; -"ec-1.0"="kjq23jms9m9h5af2ri4bxd65w82lli3v"; -"ec.doc-1.0"="a8mvwdx6s8swxhagcc1p36dsy335fhby"; -"enctex-34957"="j6lf040j733q0aj90wvx2vwq0x61zwdm"; -"enctex.doc-34957"="p2pad1ncy8izfag44p0pndyvgckfngvv"; -"etex-56291"="mdrs8yrrjf03pcndsr5azzxz7lvk08jp"; -"etex.doc-56291"="xdmkddsi3lykqy5hm03xamxsmmwplmnb"; -"etex-pkg-2.7"="2p6j6s4jm1y7k82jhh9lrfgcbph03h1a"; -"etex-pkg.doc-2.7"="0xlalpljqrcinaazh35yv9vc2a925h90"; -"graphics-def-58539"="8zfx2iisxpsx0arxxhpbs8wp1x69rxfs"; -"graphics-def.doc-58539"="a0kws0r8a2624wl1ph0i63b5593h6y99"; -"hyph-utf8-58619"="iv6hq9jb4bldmdipjxc7gija6mmd4nb0"; -"hyph-utf8.doc-58619"="xxzpsbz4hgizhg7jdwrq41l5mmdhc23i"; -"hyph-utf8.source-58619"="c8z88ky9r4d4rvnsbnq1jfcjxjgfxmv3"; -"hyphen-base-58630"="aix2l8fcl4r9wpggrrck7qs832c9ywqk"; -"hyphenex-57387"="5d1fyhzq5zpxj1p0smrk3c1z9nw3yzgg"; -"hyphenex.source-57387"="js2q0pjhyskdkc71zjkr0wqbva8i8x3p"; -"ifplatform-0.4a"="sfnfrx7iqg6kikiqd44yx8004l2mqkza"; -"ifplatform.doc-0.4a"="sab580hpgp0nw6gq5li9vvv3x5gxp50b"; -"ifplatform.source-0.4a"="nkwc32c56f1s585rr18r54ib1xa9hn4z"; -"iftex-1.0d"="hnrm1vi2gwwl7b45i0sglk0yi8ziiqy5"; -"iftex.doc-1.0d"="0kk8byzsjwajb12yglvaif7msy8kpj7i"; -"knuth-lib-57963"="7fv2zxbgi2bn3vxgfj072mg5jh158zp3"; -"knuth-local-57963"="3qlxj0kh5k7mqbfz2mq74857bwrjxmmh"; -"lua-alt-getopt-0.7.0"="s2qkgq8dv65ib6chsah4xcargxh26bml"; -"lua-alt-getopt.doc-0.7.0"="xv8zqch612n2ww2pnpfranafcf7jhl96"; -"luahbtex.doc-57972"="gbmcspvgx5dnm60kydiqwdv7gvwjkvzi"; -"luatex-58702"="kqr6nzj6qjbmfhfhpfypxc2qx1dlj96h"; -"luatex.doc-58702"="d3y285q35sqp8dmd7ylhbjx4f9q3njzj"; -"plain-3.141592653"="7656rww13pgcvcarad6n6jdl1315p399"; -"tex-ini-files-40533"="831h7dslin8dnan7llz8mki6zibqfglj"; -"tex-ini-files.doc-40533"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic"; -"unicode-data-1.14"="l3va6jrpqxc96kl6idaqgnhhzx9cwcnk"; -"unicode-data.doc-1.14"="jrwxwchmf7m8qrarf1d4dzg5jpqn0r66"; -"makeindex-52851"="yzy90d3n087yrdsawabd0bn7iwz3m1i6"; -"makeindex.doc-52851"="ygvhwf55z6f9ix5jny8im72qwva5w560"; -"mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4"; -"mflogo.doc-2.0"="rdirf33m53y719b35aby2d98v1i0jhh5"; -"mflogo.source-2.0"="hl5rzcmk83lpc5rxcvy31kzm6qbwx3g5"; -"mfware-57972"="7mwvvyrb9cz2d3k5jl8r1fl238m3gl6n"; -"mfware.doc-57972"="1gywjmyvdp5l925k9fvnd5h1w2pmzyj7"; -"modes-4.2"="wd0kik99kf8r6h0ddfb74hrfkiajrb1g"; -"modes.doc-4.2"="zs48h22mggw31g7sbykzzdsjzx4kg3xm"; -"pdftex-57973"="jlscd5nj9rdhdhczjah0vmarhrqdv9z2"; -"pdftex.doc-57973"="795k9m0c29s3wv3fjhw73zx81bwz3z98"; -"dehyph-48599"="dwnq2aajr29sdydc45056na079ph8gc6"; -"tex.doc-3.141592653"="wg2czmd4ii2b2srn1bfq6zgsm1m508p0"; -"texlive-common.doc-58055"="c3gi08560s2lr8c7ih7h25p4fyl852d8"; -"texlive-docindex.doc-58780"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; -"texlive-en.doc-58572"="qyys3p34z9qcnmwxlgdfppvmy94xvabl"; -"texlive-scripts-58791"="nx7agd300r1yy7g18v60ksmyxldlyvnp"; -"texlive-scripts.doc-58791"="9xqk6wv9cyijm1q5knnjlxi2xv5b0hwk"; -"tlshell-58792"="fj8yx6k5z5jd0kw6a1cwbn578b2mqbl8"; -"tlshell.doc-58792"="yps67a47kr5r3ljhd18kq35bhn2qjj3y"; -"aaai-named-52470"="3lh28gvljcszn9vhzgsb6fp93m7n4d1d"; -"aichej-15878"="rmm8q17dvb470lyarcvgbpgip24a4fxb"; -"ajl-34016"="j0z05x267dbbw5r8s0ybvlj0hwky6sg5"; -"amsrefs-2.14"="crmn3pm2zy2fcr5d82dwwwxjm42na6j3"; -"amsrefs.doc-2.14"="r45n92fihia786v5nsab5vgjvwgmij6d"; -"amsrefs.source-2.14"="k1rzn2d509i2nkfwclpbpir3q6a41ya9"; -"annotate-52824"="ialyl5d9w1gip0k9n3kjf83w6991bdcc"; -"apacite-6.03"="sj9k6bnr8qhfddlzk7wd0daf12458yi9"; -"apacite.doc-6.03"="cbhyw6lwyg7mnx8h421y0hxf3h5m6n4y"; -"apacite.source-6.03"="cby7n3f9rzm83736nm4rn1m77km3lr9y"; -"apalike2-54080"="vf25kvilm8g379d8c5mkzv749nd9p8ap"; -"archaeologie-2.4.5"="s5r653hgvq14sy4g4jg6yylfdfd9a857"; -"archaeologie.doc-2.4.5"="s8sycgiz1p9ijzsqpnjq68iqlrrd3z14"; -"archaeologie.source-2.4.5"="6azzb6zrv4xcrqc89a0f23inxgicin0c"; -"authordate-52564"="d2bswrn2prjx106g6qyxs0sdhxxr0wfh"; -"authordate.doc-52564"="0p505jmjdgvy26acbbgmkw9cp008kzl1"; -"beebe-58697"="1vprhdr8b2cnm0aylklbr81s43bihwcp"; -"besjournals-45662"="n3ljrkamca5v9w0rk3m38nqw86s1izc8"; -"besjournals.doc-45662"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77"; -"bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq"; -"bestpapers.doc-1.0"="mmlnsl83sil5zbdhwq16b6025sxdh9s6"; -"bib2gls-2.7"="kgiw7xkmfmg7n4d2jbvb8d4cv5g77djq"; -"bib2gls.doc-2.7"="21wmffrl60n5p15c2ip5v4c612yflxkd"; -"bib2gls.source-2.7"="mhcwmipmy51887r810ydxs4dkh3zppmy"; -"bibarts-2.2"="w813f5qw2kbsmlhcwxsg62na06bp0p0r"; -"bibarts.doc-2.2"="xrv6r5iwpdyrjzqzanvgw2dy07xgkgb0"; -"bibarts.source-2.2"="c4js97f9wx1ndh8isk3fgg6lp1rhrrmb"; -"biber.doc-2.16"="283hs3rvg9m38yk97pvajyzwkgyv38j9"; -"biber.source-2.16"="nbbnd4gdmkw2y15wigqrjxv1b2xvsdbg"; -"bibexport-3.03"="gxzcd5xddarag47glbq02fmxgpn5ndw3"; -"bibexport.doc-3.03"="mvqlfzqzyhbnqw8xixa01qdfgrlm5xln"; -"bibexport.source-3.03"="q41ipwczv79cxnl2420cvcj5q9c6l57l"; -"bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv"; -"bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4"; -"biblatex-3.16"="1y6ynai1zf5mx9106yhka418lhki79v6"; -"biblatex.doc-3.16"="5papwbpfnyfrimwh18p0nsnpajfkb6px"; -"etoolbox-2.5k"="1b2h9kr3gk2by5n0dswnq3z1hf68q5lm"; -"etoolbox.doc-2.5k"="51558shd94h5lrary13dznhss225wrfd"; -"kvoptions-3.14"="vplbvmnl37ypgrdqcn0mycsnwr5z1ha4"; -"kvoptions.doc-3.14"="2avi8y8yglncwa87vs41akaxlvbcjgbi"; -"kvoptions.source-3.14"="rl5bv5ip88w4251w0hf2wk5p8nzl9lwj"; -"logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0"; -"logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv"; -"pdftexcmds-0.33"="pa208jqk3rvps51niwccdmnx3c0zhlc2"; -"pdftexcmds.doc-0.33"="3nbk8p285nzhw2vqaa31xnhr7cxflqqb"; -"pdftexcmds.source-0.33"="gzwymkn5xcy2fkvhn4qsny7cm6fx4hrf"; -"url-3.4"="vf34zjwlv43kcw53sdla9052x7x0kn7y"; -"url.doc-3.4"="ii3z3l7xkmrkxb8dkgk6lcqyb34niirc"; -"biblatex-abnt-3.4"="ryrk1n85x197ff723jla7vrcv4jkb2fv"; -"biblatex-abnt.doc-3.4"="i1b7mjmy8din75dzaqb407n5byavjwzy"; -"biblatex-ajc2020unofficial-0.2.0"="kiiyd9fswfrwzgl79h06a4izzsa0m1ns"; -"biblatex-ajc2020unofficial.doc-0.2.0"="bqqpysk5gxxy0mvyghz126zh4rbqlxqx"; -"biblatex-anonymous-2.6.2"="yv83qimx8n31f00csmlxxlmymxsq1ngf"; -"biblatex-anonymous.doc-2.6.2"="s3g5ndv0alcpi8jmslrashcg4slb96hz"; -"biblatex-apa-9.14"="1hv74dv3bqgafga8mmckmx7davj7f2l5"; -"biblatex-apa.doc-9.14"="nx2dj10pvvqmxzrm80cssba35v5hcy32"; -"biblatex-apa6-8.5"="byr40jxzifn0kpnksclsn8gz2am6h4w5"; -"biblatex-apa6.doc-8.5"="bkm3wh8c227wfl8f3899ra3swwavv7fh"; -"biblatex-archaeology-2.2"="4f3a6ma209x4902fw43xhhs9wkk741hn"; -"biblatex-archaeology.doc-2.2"="n8377bbiwq09fszgq2lq7i3qkzr32jbi"; -"biblatex-archaeology.source-2.2"="c6316rahqfyxqkb546gpljvqj8jncccx"; -"biblatex-arthistory-bonn-1.2"="298lp84p62rlsin8y7spz0ig2g8wla3b"; -"biblatex-arthistory-bonn.doc-1.2"="bkssng4czmqvimlv8f2bdh4sxdrag13i"; -"biblatex-bath-4.0"="04wgqz6s9qal2pg2li291nkn5p16zv6v"; -"biblatex-bath.doc-4.0"="ygd05m4f5gjc9yvhary19jnfklzv9iy4"; -"biblatex-bath.source-4.0"="ymsxcycg2jchikapk6nqqdwknwrl0bx0"; -"biblatex-bookinarticle-1.3.1a"="bnx6iravlnrkkyqb3ah21p0ikq00ab57"; -"biblatex-bookinarticle.doc-1.3.1a"="6shjhb1lajkivsh3mrr2whli5hcsb8b4"; -"biblatex-bookinother-2.3.3"="lcqqnr0za3jf3h3yr0kbffwnxpg7ww9k"; -"biblatex-bookinother.doc-2.3.3"="wz5w9vgr3c19kd5x6fic9sx3qs6lz0vy"; -"biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w"; -"biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq"; -"biblatex-caspervector-0.3.5"="lfrll315pr653wb5cp3263na44g2m8lh"; -"biblatex-caspervector.doc-0.3.5"="jdq7pdz08pzhrzd4ym6i8fws90a4bhfh"; -"biblatex-chem-1.1z"="lrk5pn8lihal829bvncmcvswpy86bgvj"; -"biblatex-chem.doc-1.1z"="dv8kdrfpypwy067bli57gl3rd9wb91hr"; -"biblatex-chicago-2.1"="4rm94ng8vz4sd37g7cnf4yjgc03x7l61"; -"biblatex-chicago.doc-2.1"="3mj4x64f6h7sky4s2yqg3dvh4y4kqbw4"; -"biblatex-claves-1.2.1"="yq5s9plvimz4w9san81swl08g2v6pa6q"; -"biblatex-claves.doc-1.2.1"="36qjs0m893389s9wkw5wxai04qp8zxs6"; -"biblatex-dw-1.7"="9nf2hg43q6if3v5hdrfxnpbdww7y06jv"; -"biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m"; -"biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg"; -"biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y"; -"biblatex-ext-0.12"="ppbwvlki0rgcjq9d1ypiwcpr9g62zqmq"; -"biblatex-ext.doc-0.12"="bw9mqrm7qpbx3yzx6jh0hjvhd9b16m3z"; -"biblatex-fiwi-1.7"="xwb00mw95l90bba4fc31kw62p43cxjz1"; -"biblatex-fiwi.doc-1.7"="y5hpi0gwp2s7hgqir2qw2yam9l3aqzdw"; -"biblatex-gb7714-2015-1.0x"="fm4gcbb9bis4y77cfmvph2za02snm1j6"; -"biblatex-gb7714-2015.doc-1.0x"="5fxv6gsf6fsik5frsybagpg2m6wwwx79"; -"biblatex-german-legal-002"="wfjfph758mzj742z6gmg8dbrh6snmgw4"; -"biblatex-german-legal.doc-002"="ds43kijns6a8qjirib258w4nvm46nb54"; -"biblatex-gost-1.21"="ix95xf69yj6b48w761q1i5wvyc0x5lqa"; -"biblatex-gost.doc-1.21"="bn90k270bs89314iss1rv9sbiiyk5vq3"; -"biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8"; -"biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb"; -"biblatex-ieee-1.3e"="zlryry7wpvvlpn6lvsyb5xwm7psq4jrr"; -"biblatex-ieee.doc-1.3e"="ipcvmv5rvssbc4wbnw7bxqxw0rqwfr5y"; -"biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf"; -"biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki"; -"biblatex-iso690-0.4"="f4hhfkq9hg3m1s3vcxddqqsi1wfhy4c7"; -"biblatex-iso690.doc-0.4"="mn63yqr0r3jrx7ds6myzx9gix3gl4ppx"; -"biblatex-jura2-0.4"="gwij6q3c9z10d9jlndb3x9avi26wiywm"; -"biblatex-jura2.doc-0.4"="9s1w54g9sh8j3i3z4bnsm0rp8g8kazxs"; -"biblatex-juradiss-0.23"="f9z0md8rgzixjxp78p1bb96pr71f7bls"; -"biblatex-juradiss.doc-0.23"="zspyq2lkxh56cq2ldcskhiwmab549r69"; -"biblatex-license-0.1"="r076ckpwly451hvj16rgprxsjp8masab"; -"biblatex-license.doc-0.1"="l91aqvq0r3414498xfrp80jwypwshb3j"; -"biblatex-lni-0.5"="hqp4whkb7d4h71kdc8gvqjrrr12f6dda"; -"biblatex-lni.doc-0.5"="z9pj0sxkl3ld3hq89bnlllx1522rv3kn"; -"biblatex-luh-ipw-0.3"="83gar343q3h1h96h8lzs2bmsp1ba82n0"; -"biblatex-luh-ipw.doc-0.3"="yxcknwckw9s58qhrbdd70jz5yrpnyip2"; -"biblatex-manuscripts-philology-2.1.2"="j14fgf20nw86id6f508kyf2ki91yr24p"; -"biblatex-manuscripts-philology.doc-2.1.2"="196869iqggbx5kbhpmqx0kn9v474ny5p"; -"biblatex-mla-1.9"="1m10jmh42x7qahq16bzi2rwvv7j7biq5"; -"biblatex-mla.doc-1.9"="f6b9nj6xj93vikp4agvkrjddrrgfvjc2"; -"biblatex-morenames-1.3.1"="vbcnaicg2pa0jrqd170cs31wim08yk07"; -"biblatex-morenames.doc-1.3.1"="ksn965q79yv6badima68frbgmycjz9pn"; -"biblatex-multiple-dm-1.0.1"="6c7h8i04ksazrq2lbc6hbpcxkjdvih07"; -"biblatex-multiple-dm.doc-1.0.1"="j1hb0xn9gz6mywx018i4rq4g5xwi7af4"; -"biblatex-musuos-1.0"="dj5nsyf90mbi4dlghyh8aklqr28jvx76"; -"biblatex-musuos.doc-1.0"="ypw7naafkwm22kfq1hd4b0z665g4jz9p"; -"biblatex-nature-1.3d"="vqvnb88jb6rwsdxigpcs2mr03p8d3npj"; -"biblatex-nature.doc-1.3d"="yvc82f9vdh7kh6x444gz7h3bzm8cq15w"; -"biblatex-nejm-0.5.0"="vybm8b0dqd5xyw3x6wp5xmq3dvl4by1k"; -"biblatex-nejm.doc-0.5.0"="6ppfzm4xdys6akhzc300kfh31jg49hlf"; -"biblatex-nejm.source-0.5.0"="q9s7ml5f366r7v1130brjvx20c4bpy6y"; -"biblatex-nottsclassic-0.1"="gyisgdfsns506vcbhyr7a20mnbhmldr9"; -"biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh"; -"biblatex-opcit-booktitle-1.9.0"="3aspv5b3a0lpif4wksanjq3fqclqkdij"; -"biblatex-opcit-booktitle.doc-1.9.0"="sz4gb2ahn58y76cl92hpap7xxg0mg0y5"; -"biblatex-oxref-2.2"="nmnl6kak235xwv1nhsxs0aln3dw654bz"; -"biblatex-oxref.doc-2.2"="p6dwicdcn1wniwlji7bhg16babx179r6"; -"biblatex-oxref.source-2.2"="wi8a83vmwcgqvk49xarg6sycsp7fz38s"; -"biblatex-philosophy-1.9.8c"="n2nkfafqbs1rmij23q45ry0gww43s6c4"; -"biblatex-philosophy.doc-1.9.8c"="lsllrjkqva40nfz6bxmgiklh2sc6rzs0"; -"biblatex-philosophy.source-1.9.8c"="j2sp7vlflcfgj7r4cwdr0xys52gnf3c6"; -"biblatex-phys-1.1b"="w0pxnyvy531qn79ahihx1iim8snhlyn7"; -"biblatex-phys.doc-1.1b"="jxa3qi102kdamzn9yc0bqrck650wib7b"; -"biblatex-publist-1.21"="m4ca3llqdjm9n5w2r7vy5g3fldzzynkr"; -"biblatex-publist.doc-1.21"="gqbkq5880gn9maswfdvsfkbgh9y93j9a"; -"biblatex-realauthor-2.7.1a"="6qb576bh9x616f02msiq3xz83xzaa047"; -"biblatex-realauthor.doc-2.7.1a"="9pbd2aixmwj8as9lrmivkkfl4081820q"; -"biblatex-sbl-0.12"="c20vk47abw6af6h8xwx2193kck6vsby9"; -"biblatex-sbl.doc-0.12"="3d0pwf6w0gcnrkg1d6pqaqi0rkbidl5b"; -"biblatex-science-1.2"="7ql42aav0jqxx7zdfd3mavkbv14rwq7n"; -"biblatex-science.doc-1.2"="y4vhwv5nybp628i852dmq61wqccqpgvn"; -"biblatex-shortfields-1.0.1"="ji0p9w4dzyf4mi46nbcpvswas9r40xij"; -"biblatex-shortfields.doc-1.0.1"="4lq9x8wydvl7vmnl7wvz3x3zarnjgld0"; -"biblatex-socialscienceshuberlin-0.0.1"="63ccn3japdafc8mdxncldds97zvkwa64"; -"biblatex-socialscienceshuberlin.doc-0.0.1"="08n3z5lxx9sjrlwf747h9z38a1nk1wdp"; -"biblatex-software-1.2-3"="xw45p93s5r99w1fj0ykbzirpgvpccvyb"; -"biblatex-software.doc-1.2-3"="zx86j66l0l1ygqc39ykdf3j4bkz86l9d"; -"biblatex-software.source-1.2-3"="vv4qgzbghn93cxlhvk2md69mj16m06w9"; -"biblatex-source-division-2.4.2"="kdxm789jnmvyzkx7pi9983jq25p30iib"; -"biblatex-source-division.doc-2.4.2"="4j6h8k98v95n05lzfzp8804gir24vbmc"; -"biblatex-subseries-1.2.0"="v7rfg6wqkqgzm8fwrg0ncwinjzsibcdf"; -"biblatex-subseries.doc-1.2.0"="hgqxbs3qjqya9pxs1spylh2m1clfg5zk"; -"biblatex-swiss-legal-1.1.2a"="lp3jw955jpyfjyn6mp6wna8rqwbhsvfj"; -"biblatex-swiss-legal.doc-1.1.2a"="23bam0vm3zqrcj1cd10g8bml0jsyvmcq"; -"biblatex-trad-0.5"="cqmqlc92pav8ggy23dmkramc8kn5jcbg"; -"biblatex-trad.doc-0.5"="bgkn896cgkvj9m7rvb5pqqspqma7s44l"; -"biblatex-true-citepages-omit-2.0.0"="y7mg4jqb3fl9mzy93xcpxz3y0l5fw3kc"; -"biblatex-true-citepages-omit.doc-2.0.0"="7cxbqdyazdfp0masgk6a31rr3h9606xd"; -"biblatex-unified-1.00"="ks0l3ggiidbwhsnvfxzck8m8ji42zx63"; -"biblatex-unified.doc-1.00"="8x3k2cn8srdw8j359xinicb47dvbmr6l"; -"biblatex-vancouver-0.1"="1ml0897m983ym5gzw58q2kscx106xdd1"; -"biblatex-vancouver.doc-0.1"="k5j8nx2xgp3i85s0sczblaj1in2yq11q"; -"biblatex2bibitem-0.2.0"="wllvyb15idz442hmnkz4kbdbp7qc64zv"; -"biblatex2bibitem.doc-0.2.0"="fymi4mzi8z1f1i4hjh928v8cajfyblgp"; -"biblist-17116"="b565jl60ysccd5qkzgidjb188i509y9l"; -"biblist.doc-17116"="50kjqxwhdncn09c7cx0abkcihvhfzzpl"; -"bibtexperllibs-1.6"="prnsdd72d808kfrkv2s4c9flzs7dqq25"; -"bibtexperllibs.source-1.6"="idmidg8svnznmhzsg0qb2104bw4d9yhs"; -"bibtopic-1.1a"="r3rbv97qik2ikmkp3vx6srw7qf5v704c"; -"bibtopic.doc-1.1a"="anrfs022bvwbfwsm05hxl10zgwckidn6"; -"bibtopic.source-1.1a"="s32v3bwk7a1aqfkmp1scaf812x6ra9rx"; -"bibtopicprefix-1.10"="88rj42z15zlp4x439faf8x8qm062vqmw"; -"bibtopicprefix.doc-1.10"="km3hfa44kxwjbf0d1np34vsc0n7qkn9b"; -"bibtopicprefix.source-1.10"="9al2wqnk8affigq30j4zb70ds2hgzqmd"; -"bibunits-2.2"="vkahqz7zjn0g4dkpffvg8rfhjlynvmnf"; -"bibunits.doc-2.2"="d6xcf9xdkabjg3jrnyklla7kpbylrg61"; -"bibunits.source-2.2"="1hxc8yqjpri8pn512pfvcq7b2m9qnwib"; -"biolett-bst-42217"="c2iw962bwa5815qk2sbhhqjd7z4ygmns"; -"biolett-bst.doc-42217"="7w39z3hdps980l2g1yqbzy8384w4vbqr"; -"bookdb-0.2"="b4mqk50dn86zf30w2z8953ms8m8v9lrs"; -"bookdb.doc-0.2"="y5sdn2fijycnyx9is1cqc5vx6zkyav62"; -"breakcites-21014"="cvqm5ljgdl47idyjvfs2hg98xmkscfj9"; -"breakcites.doc-21014"="jjqimy63648q6n4mzlwrd7p723m09cbw"; -"cell-42428"="qlg2sy9fj9cv6c8jbdmwzysadl8fhw8b"; -"cell.doc-42428"="61a0456g9i76nxwhpv18fw532nimk2l4"; -"chbibref-1.0"="7d51sy03z9ww5ns8x0mfiplyk00dgb00"; -"chbibref.doc-1.0"="xyypa6w4gx297hpp1ixg8g431rz436qf"; -"chembst-0.2.5"="08b5a38p2x2xgv5nw1ibi0xpc4xqixnn"; -"chembst.doc-0.2.5"="wgbb4bcl51wnixp4rb94qqqn880mxm7f"; -"chembst.source-0.2.5"="360yyds5c6mbcsm60mm3jq8xfxcpnw5v"; -"chicago-15878"="k9y76g5a4nfy88igklw08n27zvnnap2b"; -"chicago-annote-15878"="nyasy7sal5vikd1jysdvhg0ym7hs6q0p"; -"chicago-annote.doc-15878"="8qhd3kj016s9laavhg1wvimy4325zz0g"; -"chicagoa-52567"="7ka9kkyvy1w4s0xipgr6f49lajd78nzn"; -"chscite-2.9999"="yc7v9v66md3dy5k2gjswzh58xzxdhwp4"; -"chscite.doc-2.9999"="fbcykh46rifs4kvn728sav04fnshr6br"; -"chscite.source-2.9999"="vsii846cdlrd9fdmf4npwy8jxh0fcafb"; -"citeall-1.4"="q68vpb470x12izyjbf7ax4ni71hvwpr4"; -"citeall.doc-1.4"="246v29kz1slb8m3ib5rhnp74lhyn761j"; -"citeref-1.1"="hs7rw9cynm2zbr8s7455l1hakvr2nz2r"; -"citeref.doc-1.1"="fifrx8d8fq9msajvpg2wwj7xhv6l4h20"; -"ae-1.4"="zx6mlxrdhfvp0a5ql61jhlj97pcxazwz"; -"ae.doc-1.4"="pgvyvlql6hncc8bv2wdf8ja6xxqjjqs7"; -"ae.source-1.4"="jzwswwwsb988mvhiiyb7p43g33985n8p"; -"amscls-2.20.6"="m5zwmxar85gyv6pd1bjr4wm3plpjw566"; -"amscls.doc-2.20.6"="63ggqvhkqm7s5kwka5ys9292i9scxnjf"; -"amscls.source-2.20.6"="bzksjmshkzxdxc8mh86yx6cl8sb4w9q6"; -"amsmath-56514"="gl23v3yd7q2lcd9fjdnbni1y2hqw54px"; -"amsmath.doc-56514"="2x5rg53gv1s4mlyjmdr583ssy1clzg6m"; -"amsmath.source-56514"="720p54x5jha7ay8n0nap77kj5xnbcam4"; -"atbegshi-1.19"="rd12v7qnwk6mig4vcr1xziqrji613i8m"; -"atbegshi.doc-1.19"="qpmwwvq8lzm95iipc1bqmff8z1fjwr20"; -"atbegshi.source-1.19"="h4ah2l0qz9yh9y4sj51ai95n5ynd65bd"; -"atveryend-1.11"="j6dsf39s82bqanyknzzfj6mkbj11alyp"; -"atveryend.doc-1.11"="bb83sv1dyy4dmk0qripn9i08myb3vjr1"; -"atveryend.source-1.11"="h1pvzqx2qna6kzhfxrl81f1r83sp543l"; -"auxhook-1.6"="xac68wvfhmds8251pc9ii7rjlak9ya27"; -"auxhook.doc-1.6"="gmg6905gsw51mvqwpksajw3p8yjag16c"; -"auxhook.source-1.6"="d0f1ia58xllmkg796dvky2b4mv86p7yd"; -"babel-3.56"="cin8hn6wrmk577hn8wq3dpxh8426zhxy"; -"babel.doc-3.56"="h48skznpr10l4a3qndqv1pgs9f1d6331"; -"babel.source-3.56"="nnvc50xf1igagmm2g2cqmzs7yjgjfzvp"; -"babel-english-3.3r"="lrsz299wwvr17sshfjvsvrzs0s9y2acs"; -"babel-english.doc-3.3r"="y7rp46lrpxsp8z1ridc6msxnbb008k0c"; -"babel-english.source-3.3r"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9"; -"babelbib-1.34"="f59py6xcjdpkdrn7gs3ik7ci2b091vrh"; -"babelbib.doc-1.34"="3ajzfn5k7i3ywhhgpx55dvph91amlqsa"; -"bigintcalc-1.5"="3ivnkj1qyviffssxymdjy0nagrkh95yp"; -"bigintcalc.doc-1.5"="hmfcvfzcyal8sz74ywhcqx3ydhmywgnm"; -"bigintcalc.source-1.5"="jlaf6n169xxpipzg2d83dclk05v72h74"; -"bitset-1.3"="nw1h1rrc82r2saka495mncrd6vn54dj6"; -"bitset.doc-1.3"="srlljjm4s7sfkclndy4ziwcgm3r6mpjb"; -"bitset.source-1.3"="1fc9dp30lpgicd4c3cj0vkqy4j01lzkq"; -"bookmark-1.29"="m0fqwisbqakdvza2bnr7clwz5nhi9wlw"; -"bookmark.doc-1.29"="vr3fyr67n83j9pcj5piyy3z88n13m9ya"; -"bookmark.source-1.29"="vfkirhdggrclpxvcjv1bk6bz89zy1m6y"; -"carlisle-56753"="7cp342lr12vvr9zy0g84l5jy0aj241v5"; -"carlisle.doc-56753"="0wbnc5y0vvwd9208z2ylwfffaqr3i88p"; -"carlisle.source-56753"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; -"colortbl-1.0e"="v55k9b9db0gy7fhqp0lg3isy4v9slphm"; -"colortbl.doc-1.0e"="445wygx49bhlsyqm9czmp4npksgxxs01"; -"colortbl.source-1.0e"="jbxzz8nx1gxm642yr63am3nz9f3sqq5b"; -"epstopdf-pkg-2.11"="zv5klqnzp6iwpllzly6rhxqk5c5bb21k"; -"epstopdf-pkg.doc-2.11"="j34mjnq5zirwy9bb3gjfkrxzwh8svxrl"; -"epstopdf-pkg.source-2.11"="a8yniblkh6p3lcqdlmp7xdyv0glp9ivm"; -"etexcmds-1.7"="5ihd653q0sbq1q40hd9pvwxj73j099iq"; -"etexcmds.doc-1.7"="h35i02fn3bim95f50bvq50pwiymjdpag"; -"etexcmds.source-1.7"="dkiaxggiyzx1w07brj8zgqn7f1s4vs4h"; -"fancyhdr-4.0.1"="xk1q6p8d8s7bckh0sfrh5x5daaj8qsjg"; -"fancyhdr.doc-4.0.1"="y9sc7d2jic4nnqclr52av2rdgfq4fg7m"; -"fancyhdr.source-4.0.1"="24f2hv3qhvr7xgc6b3q5arcyhsqihnc1"; -"firstaid-1.0j"="4fkmvxmkkbna6x9x9b1mw48zw4dlj6pp"; -"firstaid.doc-1.0j"="6g9vrr42bdalrsjc81sl6962lb15sis3"; -"firstaid.source-1.0j"="hf1b4ln4lw2k1aj7kgj320zh0lgxvkcr"; -"fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83"; -"fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng"; -"fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p"; -"geometry-5.9"="lh2ipfx1nhgq622jg0d63h34pcmf9w62"; -"geometry.doc-5.9"="lbicfnq1a337hyqqv9a8gka58d9na7pf"; -"geometry.source-5.9"="7clx1fs5q3w4qy58x4iicybgjm0985hw"; -"graphics-56514"="vrbps04ijp3mfn7q097n3cwprhaqv8k2"; -"graphics.doc-56514"="y748ygwssmq48hlb4rx6i7fxx9chvrxn"; -"graphics.source-56514"="ig68pkabrdsdfpzzl144p9r50iig4iq2"; -"graphics-cfg-41448"="j73na78ajl4n50wn2is5wvw7mf27da86"; -"graphics-cfg.doc-41448"="nzdjyk00lx0xhflm04d2kmyn5ya2v487"; -"gettitlestring-1.6"="a4i7kyl19gyxdjkmmmrq7cwsjz92mapc"; -"gettitlestring.doc-1.6"="hrn7918v2qlw7xlcsslms56w33wcfag1"; -"gettitlestring.source-1.6"="lskbp47gqwb0gydcbq2dva1wskr9isjp"; -"grfext-1.3"="ds9vw8yvxaazr9jwfx7s4pldwpqkmynn"; -"grfext.doc-1.3"="zdbrsf2a9y0g128nl2j124b2qyn9japz"; -"grfext.source-1.3"="zig714i8cp2ibvchcigj4h7pvls2xw4v"; -"hopatch-1.4"="lp72821hqi9bhrldni1056wp7kg6valp"; -"hopatch.doc-1.4"="rx61jfcnn581l2078xaw7bslk953g7cd"; -"hopatch.source-1.4"="c140sgy5nbx9s6jhx6qd13b6hs83mkbn"; -"hycolor-1.10"="fpks9kvhjvqs20wq3ay8i5fhy9vf0r15"; -"hycolor.doc-1.10"="fmls09bj0wgl6bx5djbyimqd7dhyfcjs"; -"hycolor.source-1.10"="pdsx5dzxqw064s62bllxw2r27102p689"; -"hyperref-7.00k"="dpncl7i5ima1xzjfyha59m0zrcch10a1"; -"hyperref.doc-7.00k"="f4h96xqly1gjspi3zdxx7izps1q1yy08"; -"hyperref.source-7.00k"="9068hchhckdfingjn3iyf2lg331b8z9c"; -"intcalc-1.3"="3qbzf5d01w7jk4ffnn3h254vf0n4qqhj"; -"intcalc.doc-1.3"="g6yv27w5qs315nywq85qmicvawyp6wp4"; -"intcalc.source-1.3"="mz1j4jmq5i376ldqik3c9ayl94d78cyc"; -"kvdefinekeys-1.6"="fldkjwcdqbhd7i17cfgq0vdfbvzig8l0"; -"kvdefinekeys.doc-1.6"="wmqgxhq2mivr2xkkwld1fl9hvnfdadv6"; -"kvdefinekeys.source-1.6"="77gvvb7rbdbpllgrf7nmzpwccjhyaccb"; -"kvsetkeys-1.18"="a9h084zz8smpw0x7n6yk11rflljgvzds"; -"kvsetkeys.doc-1.18"="74m2j2fayy0s6bn3s2ard83jbz8wvvh6"; -"kvsetkeys.source-1.18"="wbj79prrl1h2f8csxp4js2kjzixlxpip"; -"letltxmacro-1.6"="1hik240za8h6rs8yz8x6f5vnzanmr79x"; -"letltxmacro.doc-1.6"="yjy1hvgprhi7n60dpgm847k65zz91v5m"; -"letltxmacro.source-1.6"="m8q4jdw8fxwff5yrdg4rq3kmf0a05zg9"; -"ltxcmds-1.25"="gyfgkyx4ds7mq4dkr2813nz4f2nwzhnf"; -"ltxcmds.doc-1.25"="hcgnp0dh8xiip47i9cxvbq9hplp2ngj9"; -"ltxcmds.source-1.25"="pyzd96nldhdlzv2h05vaz43pm9h1c89d"; -"pdfescape-1.15"="4150ga4j3q8q8g73k2f263arfdav6mpd"; -"pdfescape.doc-1.15"="rdc2ws2iy75nympsdis3y6wfillzn8rd"; -"pdfescape.source-1.15"="dji9isdc78x365cg06il8pmi7cl985yr"; -"refcount-3.6"="kkajyqzfl96l97d9bxf6rv73b352i80n"; -"refcount.doc-3.6"="pz7hz3r7fb1wfc6hn3nns9lki50b0vja"; -"refcount.source-3.6"="bxx3kybs3z4psj5an2zi5mm7s06byc4s"; -"rerunfilecheck-1.9"="2ad5yfj4lzqpa7ryfq6f1j8fk6z60zb4"; -"rerunfilecheck.doc-1.9"="1cxpz0mniq4fblfwh9yr0w050wwmkkc4"; -"rerunfilecheck.source-1.9"="rgh8xfwx2j1m99adrj9s5gjmk6kg7zz0"; -"uniquecounter-1.4"="mk6m54q43qz49g046bh3ijlqbjm0im3f"; -"uniquecounter.doc-1.4"="s5cssk7vhkxpas18fgr0d7wdmg6kchs2"; -"uniquecounter.source-1.4"="3kqrkl3sgz2dgwsh6x0027xzhil5rigp"; -"stringenc-1.12"="mmjk31qhflv57x6gpwdipcxz2i2x8fx1"; -"stringenc.doc-1.12"="7cnk13y2ilryc5pccp0l0aj6gd1386n8"; -"stringenc.source-1.12"="x2qlpjnp9jaygakbvw30wlg9sh8xyr08"; -"zapfding-31835"="6prjnqim0yrvzj1ary8i5761byqi0ca9"; -"l3backend-58509"="3ccqr5bhd5rj6r2x3wczq19faxnqdnqa"; -"l3backend.doc-58509"="h84x01ff60chwzsqvrlvcvhgnjhx8d96"; -"l3backend.source-58509"="vl09wc9bxzabf0figs6yysqx1pirfgfs"; -"l3kernel-57789"="rhpra0zbsa53frlxm0w61ya4dz6w0z39"; -"l3kernel.doc-57789"="7a7hiqsm79g2784iyiilyhdglc5rb3vc"; -"l3kernel.source-57789"="8wf5y5ncxyhisn9zysk0m1s5m3wiai3l"; -"l3packages-58296"="f89jdw85g201493hiz1q9k44252m6ram"; -"l3packages.doc-58296"="39fchna3mhqikshsg95x2r7ybz5nx7f7"; -"l3packages.source-58296"="xibrz1840iwm2cm2a47irqvw90hfp0x6"; -"latex-2020-10-01-PL4"="85wa2sw72nzh6lwf47pwjzmd4zypjd6d"; -"latex.doc-2020-10-01-PL4"="ddgjcjhlyqs4v336h0rxlq3bpfki985j"; -"latex.source-2020-10-01-PL4"="igvlaq2pg82a4cf66yrdi5cpc9glrpzx"; -"latex-fonts-28888"="pw97wy7b4hhzm28r0wl44lacn7nx41ia"; -"latex-fonts.doc-28888"="mv9ivpdxgyjj92fq9141bsw5s306mg83"; -"latexconfig-53525"="p0p0bmn0xa6pny05y862pnviafrjhr7i"; -"latex-bin.doc-57972"="s1vj36h9s8nsdvn30h2agvg1l7c18i9x"; -"everyshi-4.00"="z9jwa1p2n1463ssx82dzdnj6wy69l856"; -"everyshi.doc-4.00"="hk1m31wikxs1b66sjmh8vkjd0js50c6v"; -"everyshi.source-4.00"="lz9d57cvr57z25j3263ddyiv9xvq9h8d"; -"lm-2.005"="9fjqjbdpbkzkgi0rlm3zhhbhs647s00v"; -"lm.doc-2.005"="38k2pryqy5sy8yff86dkxisaigim6h2z"; -"luaotfload-3.17"="v7vj49icybjinrd27cxavmxld5r1ia7a"; -"luaotfload.doc-3.17"="hf8814qwpr54icwkfn7m1gpy8009r3b1"; -"luaotfload.source-3.17"="423i6lpfcs4f8y3hlh0fk7ihmpwkbz20"; -"lualibs-2.73"="jcdwmmdkg2kbvnvybfyskf1k10wnxc6k"; -"lualibs.doc-2.73"="mvdgcbmrwamdn0ddqx866v94grdm5abn"; -"lualibs.source-2.73"="5ambrmj82026wa0ginan4sjgfxhzm87r"; -"ltxmisc-21927"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x"; -"mfnfss-46036"="52p8xnxca0ypcxbbjakx42mljjwv5jjj"; -"mfnfss.doc-46036"="0c2hn0h964j1c0kzn0aq19cvff0n87hs"; -"mfnfss.source-46036"="829y6cng0z45bdsb2vdrs4wkq2pp0cxz"; -"mptopdf-57347"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96"; -"mptopdf.doc-57347"="5lrz8b6a6k130gkh0skg72y1m1cjpzwq"; -"natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj"; -"natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg"; -"natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj"; -"oberdiek-56291"="hh8lv79mk91rpmmg4dghwhxf0dn5bspr"; -"oberdiek.doc-56291"="flbpbinnhlmzdkn70zlg1zllrrgr8wf6"; -"oberdiek.source-56291"="xgj6s1953j85qhyhx0cf3lhijv51c2km"; -"grffile-2.1"="syj6z9xmjbkjwn9fvk88bh5z0jsxqhfh"; -"grffile.doc-2.1"="lbm6cjskdpf47d9imp0ina431wagj5aw"; -"grffile.source-2.1"="a5pp25fmbhj3zb33hx18pcfc2i14gjcm"; -"infwarerr-1.5"="75sarxc1v1ycj4rj6hikd7i0wx6b2w65"; -"infwarerr.doc-1.5"="s0g9m590r3jq0r9d3lidi6pd8paydimk"; -"infwarerr.source-1.5"="idalazzzcx2mh2b23q9sk7amwsk3f1wr"; -"pagesel-1.10"="a3bipby43s0bnbbycdap5js574jfn3yd"; -"pagesel.doc-1.10"="qz26gbs5mn6z4raxlwi6adm7g4mxps7h"; -"pagesel.source-1.10"="y2qqg5hjld7rvfvfnmj1mgshwzfzh9mj"; -"pslatex-1.3"="4zn88wal7mb97pphhns3ipazpiz60g0n"; -"pslatex.source-1.3"="cqc3yah7p9cgbbsj6var19b4xzyqj01l"; -"psnfss-9.3"="xcfg32llsp1zwclhdwmyp7ll4vn013fr"; -"psnfss.doc-9.3"="p1psj7zb6i3jykmmh8ia3y9d94mdx72s"; -"psnfss.source-9.3"="rv9p5ih5nhsmafdvx99ndbch07yj071c"; -"symbol-31835"="3w7a6aib8mdrap257pxjw8x39lck4nyc"; -"pspicture-15878"="siqi85kfmyg91cf7nggs71jh38g2aicl"; -"pspicture.doc-15878"="h26v6akzzgg6hn4ay096fvg2qw6l2ww8"; -"pspicture.source-15878"="fclpkng5q7dhd1vfzv2031r4l3f3vh5y"; -"tools-56514"="k94mh7vvdfnkzcd4sz4ra52byb6n2crs"; -"tools.doc-56514"="r5fnxcyk8rjqyid8i4ymhxr4lynrdrcs"; -"tools.source-56514"="yl31ix955ds02gf84492pzf9a4zjd5di"; -"collref-2.0c"="xxcnjj8qnbb06zkmh5kqysdm6k5yf4z4"; -"collref.doc-2.0c"="5a9ns23lv1n780ll3kp969dhi0mx93gb"; -"collref.source-2.0c"="7msfby8bxs89i87jiibpbnp97byjs6p5"; -"compactbib-15878"="5365y0lxziirnp7rraxwbcksrky9hr1m"; -"crossrefware-47861"="qb2vwvcmvb0xmsj75vxgd7fn26c5npmf"; -"crossrefware.doc-47861"="69qdw8b3xrqnydxih94sjpj7pd8jpy5x"; -"custom-bib-4.33"="9vqjbilzlsqg3f609hnz27pwmrl5gfg5"; -"custom-bib.doc-4.33"="nz1gxi8ixypxpf4cv7nilabq1ivr6fiz"; -"custom-bib.source-4.33"="vmak3xkin0hmg92mmpxj53dgs2f2yihg"; -"din1505-19441"="dc7lv2c8zid1c6pklllsiac390hx0v4c"; -"din1505.doc-19441"="fhdc3badjmz3zylmgahy34fbzjgkss0m"; -"dk-bib-0.6"="yvbpqypgxkh6i47yvkk0cp7qsfy083gr"; -"dk-bib.doc-0.6"="px69q4pi9444kwmw6fpmajvdwl8ivw9i"; -"dk-bib.source-0.6"="1jmv0pg8x913y6y0xjb888s0zg91iw1l"; -"doipubmed-1.01"="wcw6jjj2y6mikmx8a4if14277szjqzak"; -"doipubmed.doc-1.01"="yiws3r5cbfhdws0s74sn314q4iq4hxjf"; -"doipubmed.source-1.01"="mz2ld43x7sp8np0qmcs86p5lc09nl4dr"; -"ecobiblatex-1.0"="ikxp3jlzlsnc7jh7vcxcfq8wvpd5r8ll"; -"ecobiblatex.doc-1.0"="y5hifg3r0xkgv6zklw7l9j7shl87fnf0"; -"econ-bst-2.8"="942nshsxan2vlsdrxzrj2idn6w5g09i6"; -"econ-bst.doc-2.8"="wzs32mgk5h8cvdsf3s52pgkxch1ynypa"; -"economic-32639"="xw85nd7v6i1d2ma0airnc7bwf1fdsipp"; -"economic.doc-32639"="pv3irnv3gj70q22ac3kr858hac50vrbz"; -"fbs-15878"="h6ghp5i14cqy46hzp9i481c8gvk2ddza"; -"figbib-19388"="imp65i6ddqyw5xck7k6gzb976glq9xj8"; -"figbib.doc-19388"="6v3sj56vg039mrm7kk71wdjhp04h1rf6"; -"footbib-2.0.7"="xhrwnw5kvs3rxp32a8awv8ma7098cv6h"; -"footbib.doc-2.0.7"="dzyra0rwf5hl2g6f7c2pw88d78f7yls1"; -"footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm"; -"francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia"; -"francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd"; -"gbt7714-2.1"="d72pw49b373nj1rrl3phvcmnyjcx4772"; -"gbt7714.doc-2.1"="rpvsgxsm3j492qsyadxnchk8hbasm6ch"; -"gbt7714.source-2.1"="0ndyqhqkrrqc8mvfga8hrm8dhzd6clcz"; -"geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6"; -"geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm"; -"geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1"; -"harvard-2.0.5"="yhk8zvlhgd1knzfdndba31whwj7ixh1j"; -"harvard.doc-2.0.5"="c3jps721d0cndqjqgqkhcz4n7xvaj1f2"; -"harvard.source-2.0.5"="kjg78fvynjjna03hh2xzcrqvsm8d9yjw"; -"harvmac-15878"="30iiq3zikvmyy87j98knxbc9iak232bb"; -"harvmac.doc-15878"="3q1j6s2rdz18fg3hknp7ifyzixgmwr8h"; -"historische-zeitschrift-1.2"="6zli1x9hz1dsy8p4hpi9rdb0hs35vka9"; -"historische-zeitschrift.doc-1.2"="y76j031x8zym5i6sqr0r67ws0z49q306"; -"icite-1.3a"="pci3xglq0l93bp7zicyp82xf7wnqm0qd"; -"icite.doc-1.3a"="8f1w2r4m5bw4zflqqjp04n48axm653ik"; -"icite.source-1.3a"="6ifix61qncaxmf04miqm2gzcssb09syd"; -"ietfbibs.doc-1.0.0"="mqqb9qjrk1lg7w85w8jbhizmh1qh4zqa"; -"ijqc-1.2"="ry2ydiqc71zjfkb46l4fvlxa1h6wnq1c"; -"ijqc.doc-1.2"="zz9ai19qd2rxvpw5kx1k1rd3ndndjv6v"; -"inlinebib-22018"="gkr44f3f9m92bx42gcvwgzclbjya5gdm"; -"inlinebib.doc-22018"="bpfx7h4w0zqr7xdxn51glllzf20qj24y"; -"iopart-num-2.1"="92jbzj605pi9chj3ymfxm9ii2dh62haz"; -"iopart-num.doc-2.1"="smix69mc1n89q45nw3rl18lasn2c2kwa"; -"is-bst-2.03"="cyhqhj4jmhm2f1wv24dvv2nvh3xag114"; -"is-bst.doc-2.03"="y2s834n5j3la07m240diyldjajy2jwzy"; -"jbact-1.30"="x7l9mlgzq1x9hyi7pb6g4ygg2fm4qmiv"; -"jmb-1.21"="cxj2552g8qzak7hkidh855amhaggp4bh"; -"jneurosci-1.00"="r5k91lza98jn52s8fmgrbclslb6zps08"; -"jneurosci.doc-1.00"="z01ga0ccmahx9i6p2bvvl7mr8676ki7p"; -"jurabib-0.6"="xlxc8i2x6ddydrb6n8myqkh0j5acn9y1"; -"jurabib.doc-0.6"="jgf4mbfd2vy1ihxa2fm7h90s75wp8mjz"; -"jurabib.source-0.6"="2ihyirxdbfz55js8nb8fjnzj4fwr5fji"; -"ksfh_nat-1.1"="9rsf0xfzd2am2ap7skhj4nrs6nkyxpp7"; -"listbib-2.2"="h7sl4g92wc0h56k7a13crhnj9g0xlb3g"; -"listbib.doc-2.2"="jgdniqxy4x1awiyls70z9lsycy61fb0l"; -"listbib.source-2.2"="266hzszszrdwa0x6hk5xrz9gjs1srsb8"; -"ltb2bib-0.01"="mid475rg33jg29rxq0ci49vq4y81j4ng"; -"ltb2bib.doc-0.01"="7k2q8zzzhf5zf71fw0yinyghlb1kwqy7"; -"ltb2bib.source-0.01"="8py2zhz04b0hals44ypv67m2c71b1j0p"; -"luabibentry-0.1a"="lm4x9gqyj8ha0cjwmmy7h4yffnd8wymx"; -"luabibentry.doc-0.1a"="psn62xnv0l494i67jzsc0sbij0r2kcvb"; -"luabibentry.source-0.1a"="9l96kjwd1kwkj7rjcrlq3vcyiylbawrl"; -"margbib-1.0c"="315vswcfl035s528hmj5wvl43iar5d0p"; -"margbib.doc-1.0c"="lix6xbc2in8r6cc1yvdb565nky1f6jq3"; -"margbib.source-1.0c"="gnjk0pwcdim1mnbsyq9mmkmrqw75a771"; -"multibib-1.4"="6sjcmriv5y27z54i0q6nb4c0wxyqc06f"; -"multibib.doc-1.4"="gwyxcbw8csmiyid8ck2sjgkq9hmx0k6m"; -"multibib.source-1.4"="kp5q2hjb64a1vhj4zbb0ah0c9c5cc0xw"; -"multibibliography-1.03"="3svp5l6al4k7adk99d6fcy7m54qbfbqy"; -"multibibliography.doc-1.03"="1bl112qsviy7jzhm1qdvn42x0lvcnjkd"; -"multibibliography.source-1.03"="65bvyr4gr7sdwhsraq9rmbv16d4fi6qc"; -"munich-15878"="0a6hgpvjyd8hzvmrf5bjc6rniwj39bx8"; -"munich.doc-15878"="22c6rhm479c1gg7df9mzza2vl7jgb3ij"; -"nar-3.19"="iaann8dbnvignc32m1wnlz4j77i7ngx8"; -"nmbib-1.04"="mbz1wjyaxsx3cn4wymvz4w9wf10580da"; -"nmbib.doc-1.04"="s6bbxc8lyp7kbrpsi0i4jrvda00260ks"; -"nmbib.source-1.04"="x0gvyn54csgywd7wlmbi0c8djkwrp4xq"; -"notes2bib-2.0m"="18cgk3w262q3ji8c2safphbnv63yh7j7"; -"notes2bib.doc-2.0m"="3ivpnsxqwfsy5rhrc5wacl0b6va2sva1"; -"notes2bib.source-2.0m"="75wz1scfq0j5pdix1ksvwh90y5j3dzaf"; -"notex-bst-42361"="x4042ry48i6p1qr2l4yv0d52x4wmjarg"; -"oscola-1.7"="fi1rcwnsdb74grgsvv0553plqz0nk8bn"; -"oscola.doc-1.7"="yy7as7z897x520hbs5a3cha3nsg7wm8d"; -"perception-48861"="xpljy8xycf22akdj5dzzzmcb34zx8d1z"; -"perception.doc-48861"="sn4m1gc1s04h1crw3gbaahbxa6b76npy"; -"plainyr-52783"="nxim123jmj05q71s0mhf06djsn36damc"; -"pnas2009-1.0"="k4xy9dabg8i4mf18317wf8mp3hrlpmqy"; -"rsc-3.1f"="4hhv7zw4v3w8sslxwj14pk4azil1cdhh"; -"rsc.doc-3.1f"="d20wkd2qw8dabh30gdpasxqacn193f1b"; -"rsc.source-3.1f"="rfsxjn597ylr3m2vl72dh7fa8x2a08yw"; -"showtags-1.05"="hbxk7ijniaffjnk02hkjwgw8gwgnx5qb"; -"showtags.doc-1.05"="q22k5ckq0q4228ssvqnz9n139x32a5iq"; -"sort-by-letters-27128"="4m8cm6rnhgsc40liy2yhfc4r76zpdnsq"; -"sort-by-letters.doc-27128"="3z4kw7hvnjmp7hlfjw2gchraw69zyx09"; -"splitbib-1.17"="az1n021wdajs8dc0q93wgfb1r0jcr2h2"; -"splitbib.doc-1.17"="qsb89h2ch89qhbxir7f90xx5sqvgm1px"; -"splitbib.source-1.17"="c9m7hp7fh86qj53qwaqxh8xj8yf3gxdy"; -"turabian-formatting-58561"="57qvb9ss73rxayiqln4vmyps0nkfd6rd"; -"turabian-formatting.doc-58561"="fy2w6ighw6x0yqfp0y2z6by52s19c1fl"; -"uni-wtal-ger-0.2"="i4nr7hq5gym5rcs2pc43qclci7jy9y4m"; -"uni-wtal-ger.doc-0.2"="a4r7w5m71h1kfgzxgpmb84hndnhrxhhy"; -"uni-wtal-lin-0.2"="8cdd4qcy3i5bvf25nn89kdaqph3a6fan"; -"uni-wtal-lin.doc-0.2"="cmaxr111gp38f9s5n42lg66c4i7iyz2l"; -"urlbst-0.8"="sq9q7vzdfgmx1j16mdbimczajjk985pa"; -"urlbst.doc-0.8"="j5y3m03lbs32i9w2fvzm6bnhmchgs4s0"; -"urlbst.source-0.8"="i907zv423gy5ic3wb6qcyzwg8i3zfcki"; -"usebib-1.0a"="4b8sv3fknxfaz9cgnvn3l5wf9c8c76wx"; -"usebib.doc-1.0a"="ba1nqv90zkfzi8n17xlk7rkx2s92lkd9"; -"usebib.source-1.0a"="967j287dsb1j4wa5k9sxsv4xp7194q3b"; -"vak-23431"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl"; -"vak.doc-23431"="sr1gi7csll74iw13j24r1hdwn3gql9ak"; -"windycity-57577"="rxqr98lq37q331n4mmh1nshyyf1n4cmj"; -"windycity.doc-57577"="dj7sxgxj29xnh2bbi58xzrhbj74jxqra"; -"xcite-16383.99998"="wvb8mc5cp8s32hvi76gby25nk3n887jd"; -"xcite.doc-16383.99998"="h07vrlm1107k8a8mjv4f8p0s69k5d08p"; -"xcite.source-16383.99998"="kllh0w903i2jybhciiy925rs186klrh2"; -"zootaxa-bst-1.0"="78lffb7mvla2yryr0lmljd5w4pmakggp"; -"zootaxa-bst.doc-1.0"="bx9v8rj2nlbdapknqk8wigrq9jdfjggn"; -"a2ping-2.84p"="6lndjb87fbdxxvs14s9plg6p0avxnsf7"; -"a2ping.doc-2.84p"="i79dh9x0k85xl1cn33j110g62mh4a297"; -"adhocfilelist-29349"="l8ayz7mqaa5lma2bvqb2brc879y0viij"; -"adhocfilelist.doc-29349"="gm20nhwq88s1cmch3pcgkqnyahb5gnri"; -"adhocfilelist.source-29349"="3qx23im0z07cnk2bd5vrskl153zxy6ff"; -"arara-6.1.0"="ifkdj4nzvpi0ghsd5q9i6p9rgnb43m6a"; -"arara.doc-6.1.0"="f8swvswxiygc4jb6is2diddhc4s954lx"; -"arara.source-6.1.0"="l9jm2g72kn1bfw08v9j0l2cd9wnxv41j"; -"asymptote-2.70"="1rsa2yqg8j68icg1w324iy928ylrkwcb"; -"asymptote.doc-2.70"="sqj9ihis956yayha0sj2l6mmnq01j4d8"; -"bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1"; -"bibtex8.doc-3.71"="d5gk5h3a5milfx9lb1bcyzc6y5pz3d2c"; -"bibtexu.doc-52851"="djmr91p0ig74imwgym82lpm81jp3csgb"; -"bundledoc-3.4"="3r6cx7n6wy995jd9hpg2n4qkbhwmnyfi"; -"bundledoc.doc-3.4"="cd59kzd2v9pq2d058jx5pxkcjhbvbrr1"; -"checklistings-1.0"="a2gvh85pcmrc82wq4h6n9ycqj86z9f8d"; -"checklistings.doc-1.0"="ymkplhp7331fs0kq4qcpmh9la0wxj5lq"; -"checklistings.source-1.0"="8ya9yd2by50zppk7rrqjkc34ans6ffb0"; -"chklref-3.1.2"="xybaxh2l6c61hkkjqhx64hivq08wz2pa"; -"chklref.doc-3.1.2"="f8vcn1hnn9hp9kd92v2m2qpd0my6p0pd"; -"chktex-1.7.6"="4khiza97qvhdbzdlz7pacnr16zmi9b9d"; -"chktex.doc-1.7.6"="k3rrz1fss7mhkh1g45vq0glhcl75z6lh"; -"clojure-pamphlet-1.3"="czmy129a09h3r5ssnlhaxgz932vmqx6g"; -"clojure-pamphlet.doc-1.3"="cha12zds1j3adykqd9d697izik89i3xh"; -"clojure-pamphlet.source-1.3"="flbrsg215hp85fn6hrpygjmdggrzx6rs"; -"cluttex-0.5"="g36i3ravfqcpaxag2iyggc4wqs9n9mqw"; -"cluttex.doc-0.5"="ykigfq6hmh4zb0h8n8q2id4cm2b9arwv"; -"ctan-o-mat-1.2"="jcmhpw3irmr4hix6j1n1wk1g4wgc0nm7"; -"ctan-o-mat.doc-1.2"="f43qd3ynl7x47g4wwfnd1icsrzxj3sgp"; -"ctan_chk.doc-1.0"="m4i1vj19h48zyk9pxadfq1qrwmvqy3i1"; -"ctanbib-0.1d"="wiax2a49wa64ga9g1smf2jyhlpv2n1qq"; -"ctanbib.doc-0.1d"="arizd3ayag3733c551wvcibdvy99imrb"; -"ctanify-1.9.1"="y939628500ks8apq2qdzcbj490y0c4bb"; -"ctanify.doc-1.9.1"="dfah3y6kn3r18mjj39p13mq7y6zpalqb"; -"ctanupload-1.2c"="jmvh3rrdy0hyvdxz55gydlgsh7xzp4vv"; -"ctanupload.doc-1.2c"="38wlhcxvvpbk01sj6vhwjs9mccw1xs14"; -"ctie.doc-1.1"="08fyf9gb04jsy5gcwilpg84jgzd71ins"; -"cweb-57972"="cqx0j3ki42fxywk4ikpfp9f290m1hnhz"; -"cweb.doc-57972"="hfn37yhf16yhvvh44m4b379xjs180cv5"; -"de-macro-1.4"="v1qasn8wjqi7mr9q0p0kqv2w7bhxf4md"; -"de-macro.doc-1.4"="r5smyw0q3djlrxd8vf48cj1dzzy9cwxf"; -"detex.doc-57972"="1iimjgirxh9rid26wrk81iqh7g3jjk5f"; -"dtl.doc-0.6.1"="8jshhykhf7smf4s9ngv2jlhbih126xwz"; -"dtxgen-1.08"="n3cwjwkf92c5zgbs7hmc9fgrwjvwky9i"; -"dtxgen.doc-1.08"="87sb4lz077jgnzpya1y1qyzakwd5j00x"; -"dvi2tty.doc-6.0.0"="zrffg69y6ix300909k1zpjp2s9kl2d15"; -"dviasm-56373"="nn7cb25lgakifq0465af8rxcl6372l03"; -"dviasm.doc-56373"="k3dyqivnf16bmbdpqlcc9i4pwnark6h8"; -"dvicopy.doc-1.5"="5z7bgqawqldca4j3c12dc26784cj5ii3"; -"dvidvi.doc-52851"="hz3ynxfbxw3w8ravgb3hhw3yglb0gxzh"; -"dviinfox-1.04"="zjbfw4kzwfqnvlwzvjibsgim855fc30c"; -"dviinfox.doc-1.04"="1n52la52nchv27j82lisrh8q7wygx6lp"; -"dviljk.doc-52851"="sj8yggxdk8a4y3k1ssr1szzb1m91050q"; -"dviout-util.doc-52851"="g20rq0qgf4va4icrg830k9r9h2by1cj9"; -"dvipng.doc-1.17"="6qck54jh65gml230b2rb87lcq6y0gvgh"; -"dvipos.doc-52851"="6m8fym7ky0a7xy6pmn0aklh5jg0ppbzx"; -"dvisvgm.doc-2.11"="5sy769alfv97nz32ayn3jnbbv214g6jz"; -"findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv"; -"findhyph.doc-3.4"="ivpfnjybcl80xzda2jlrplaglqhf9adc"; -"fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir"; -"fragmaster.doc-1.6"="vwmmc7jmhxfvblz3fpdj0saxjs75bgia"; -"git-latexdiff-1.6.0"="q4b590rk01xis5g2nk8skfp9ifigrgsh"; -"git-latexdiff.doc-1.6.0"="c62p00iqp80a9k24syw6dfynbm33an3g"; -"gsftopk-1.19.2"="s7f70s4jyd5rnif4gwrli43k0pmfhhw9"; -"gsftopk.doc-1.19.2"="k2s28hx5mq78ikd8383v0s8gvcbav9f5"; -"hook-pre-commit-pkg.doc-1.1.2"="0rf4zqwdix7npi9g6nlcpp95mdpxana5"; -"installfont-1.7"="ds2zbs2f6kasda98jn1k8i0ym5168ax8"; -"installfont.doc-1.7"="jmwwjkliwr7wl1gyx8fzpyslscsnlqlx"; -"ketcindy-20191225.0"="c4wr13x0p4gzbzdnjbq9l4jlalxayzn6"; -"ketcindy.doc-20191225.0"="q4sbjwwvkc9cdvwgsn1m5m6wil99z1md"; -"lacheck.doc-54070"="6phk49bmf9n4s8m38dp0ryjd22bgdcjb"; -"latex-git-log-1.0.0"="qj0jib59wmz1l6gpk7q0zb5b29fpqk51"; -"latex-git-log.doc-1.0.0"="d4qhflvp1isk5z5yrknbjcps4ixabhcs"; -"latex-papersize-1.63"="qiqs3ayqsaivrqcm5mi68jrnbr0f9j8i"; -"latex-papersize.doc-1.63"="8w0cczb884w53zzv3dwra31zcvjh4jzf"; -"latex2man-1.29"="0c6w2zmys7mpnc5lvaix37bcksk19wq3"; -"latex2man.doc-1.29"="wclw51af38i0m17pclqpc46163wq3z6b"; -"latex2nemeth-1.0.2"="98hr8kv95134psvibf43j4jgshixra16"; -"latex2nemeth.doc-1.0.2"="jzy9jr0bwxg90lm7w5cwi0p040wxn236"; -"latexdiff-1.3.1.1"="maq80g01dlrs186ag253issysy9jd24f"; -"latexdiff.doc-1.3.1.1"="0fks08hh9z03bcyax837dn7rlf3xliq6"; -"latexfileversion-0.3"="79yrcgv4lj33pavgn48ycvsd9a1x49s3"; -"latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8"; -"latexindent-3.9.2"="zdcq8lnfjfjyd7dppb7pwa9dv2p69sjy"; -"latexindent.doc-3.9.2"="n8bhh59h4a1v3kzb5kmdk8fingaw7rn6"; -"latexmk-4.70b"="21lwd164g7z57rz6w2kjfgzm2km1hwff"; -"latexmk.doc-4.70b"="39gnyyhwbmpwnz82215icd78jms1na3q"; -"latexmk.source-4.70b"="a6zcqynkxjfrlldpg1js76ffbh2i6m3p"; -"latexpand-1.6"="did3i2gjfqllqckvnb09n9n8iy16yrmh"; -"latexpand.doc-1.6"="4mrnh6mqwv6f3is1cz5f6pp710amqnx7"; -"light-latex-make-0.2.0"="pazkrw4bvc1d8mvxx381rnwwqr4sgasm"; -"light-latex-make.doc-0.2.0"="wdkfy0imk1af0w1mml3d97liabbjv300"; -"listings-ext-67"="zbinp0czaglig761svs0s13np81qpsr6"; -"listings-ext.doc-67"="slcbwzsy505nhjriszn993pgqlmdlfib"; -"listings-ext.source-67"="95y2zv6bcfkvqmwf6cpa4piaydlkjwz5"; -"ltxfileinfo-2.04"="fqka5xkp7758sr7hyiyy18nns1dir95f"; -"ltxfileinfo.doc-2.04"="rbqwgb89q514rih3hf5bv613xqw1gbci"; -"ltximg-2.0"="a1kyxnvrdp9kbgq7s2r8b8k0pkjmdqkm"; -"ltximg.doc-2.0"="ilmv3b66w7671wa7s3h12c7cm2arbak7"; -"luajittex.doc-57972"="kg7z5qmgwdnmgl46ck3s62qxcfyb4lyx"; -"make4ht-0.3g"="bl3dgdww9iq93wphnbn37ixc7mhyil2h"; -"make4ht.doc-0.3g"="i1wd9hlbwg5lg6v28pcyhj6brxfw13g8"; -"match_parens-1.43"="hahwx0ca506ykknc9plsnrfg6fsb5rs4"; -"match_parens.doc-1.43"="1h445p7nl5n70rskvq4d10b15kb8058k"; -"mflua-54074"="zicmiqdsbqz7ddgmbwjcay8q5q4jyzqj"; -"metafont-2.71828182"="51bwj1md9dckcakmb2icmb3f5pyxx3rq"; -"metafont.doc-2.71828182"="809kdckalk6kixkh3hqcsjyfjfam9b6h"; -"mkjobtexmf-0.8"="raq7ql17c3fdqqpaqbd53r0dg7kjrvh2"; -"mkjobtexmf.doc-0.8"="3cgxbgxpha9139jfz4v3478ny7yv3xm1"; -"mkjobtexmf.source-0.8"="dky5rv3xrbjqj7pg8spdjsllggpq61k9"; -"patgen.doc-2.4"="cl45bg0yq5m0xqwwpq0h209kj6rv90is"; -"pdfbook2-1.4"="5d9ygxiff1hlzjb4lp55f6611x0939lq"; -"pdfbook2.doc-1.4"="ic3xl30b2qprsxyx892bd10smcz7nq7y"; -"pdfcrop-1.40"="ac5w5qdg0hfb5a75ziq9qi2rbzzm5z62"; -"pdfcrop.doc-1.40"="wxah72mp14rhziw8wmw1d1s41c6mjd19"; -"pdfjam-3.03"="8vh7hia6anrhmp5w2aibq12yd0p3y6fp"; -"pdfjam.doc-3.03"="5q7wazmr6rz1mnjln28ryakv7x0q40nb"; -"pdflatexpicscale-0.32"="sc7xcy0agdg458w49n72q6sd8sk8zqn4"; -"pdflatexpicscale.doc-0.32"="ria6cfi0nvviddn0gmylwcjw53v6ryqy"; -"pdftex-quiet-1.1.0"="3cx8zd0q9z19d1xhhc8rd640ifwsrjxc"; -"pdftex-quiet.doc-1.1.0"="84mb3zp9h3jnl179kc6svsd52pmx13pd"; -"pdftosrc.doc-57972"="wbpmp9d306ckj3azix169xjm9isf8gkh"; -"pdfxup-2.00"="mza819bgnq201y9pqkjb06ky44kjc6kw"; -"pdfxup.doc-2.00"="xjwqzajjp6hayyxldqnb6n1gczx1rqlw"; -"pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435"; -"pfarrei.doc-r36"="bi4wqwx32x2498kr0k1rmkmslyz134x0"; -"pfarrei.source-r36"="zrdbqakfqkm5kwbpwpy5d1pqp4w5sz42"; -"pkfix-1.7"="gmnyddib832v8lxj6j0w73z2xcars3kv"; -"pkfix.doc-1.7"="r2lyi06ra63icn8b63l3hzkfv8min1w8"; -"pkfix-helper-1.6"="vjir8pv43abgpf5djbfpf0vbwinrf3gb"; -"pkfix-helper.doc-1.6"="gkgpxfz7iypg1xiswn4p843pa2v8dkzl"; -"purifyeps-1.1"="qmwy8zk8h0kzpsknp0430gdxq0zqj4hf"; -"purifyeps.doc-1.1"="4fj0jj42mjldhg90pkvj7bsd1b682x0c"; -"pythontex-0.17"="1gza81rq8sz3172y81zkm5lvg8193spd"; -"pythontex.doc-0.17"="4z6bswby7179xqx47n89qfzcd7sxvxg9"; -"pythontex.source-0.17"="pnzqd2k0q1nng61d2ral344q8211vfma"; -"seetexk.doc-57972"="r0yp9ffrpjja0w2w1qlzs77wh965rgj7"; -"spix-1.1.0"="73qaq9y7hi67hsndah7qnxn5970s4jzg"; -"spix.doc-1.1.0"="08xbscwq5prsc085zfkj3fnpfaf3idwl"; -"srcredact-1.0"="dzxdwnn9l06gngyvaarf10h6ws8aa73y"; -"srcredact.doc-1.0"="m028dd5fqv2x9xcxq7vhdsaz2xcyxwl1"; -"sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib"; -"sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65"; -"synctex.doc-54074"="wk9fbvv3gdqzyh12gxa05zbd88l5zh65"; -"tex4ebook-0.3c"="s2d0w5089zd6xai6qhj8cksijbrgk2bl"; -"tex4ebook.doc-0.3c"="z54xmjb89jfz1j06gmzrli0f13kr4095"; -"texcount-3.1.1"="spfdnfgbcy8y8c7191pd973wmdnrgp8j"; -"texcount.doc-3.1.1"="idd45zpjjy6cgibnndxygdmljw28gyq4"; -"texdef-1.9"="jc5hxmivzlsr1cklddvxmv3zxcyq5j6v"; -"texdef.doc-1.9"="gp2xj30b1whqvg24jjyvba456w48dq0i"; -"texdef.source-1.9"="028z9c2lxpkwx2dvdgxhp16qxrj0vjir"; -"texdiff-0.4"="83vghxcac89m0kji1rr4ry3fy55im9sa"; -"texdiff.doc-0.4"="r9wsmivjyiwdnav7qc35kydk9b8pbcz8"; -"texdirflatten-1.3"="135358h2mb608wg3ni93rrsvvqgxm4ya"; -"texdirflatten.doc-1.3"="n9jxdwjiylvwy6n55vgci9a32qi10xhl"; -"texdoc-3.3"="zybis3ds27vzr62qsvkmph787jb12msz"; -"texdoc.doc-3.3"="ri2jcsh0ja8wmjs9y9692m0zc0z8gxvi"; -"texdoctk-0.6.0"="p6c2lakbnbg1wdc7i4iavscn9k0xamw5"; -"texdoctk.doc-0.6.0"="xfl4g9m6d9nbn4f9hgxj58jg9g4laa7l"; -"texfot-1.40"="h5l0m8p439v0j8c4dpx9wql4my29bri8"; -"texfot.doc-1.40"="svihfvh53hc42dr5b613h52fvkpkixj2"; -"texlive-scripts-extra-54744"="prm2z9007xv13q0ny18rcq11f73c8vxi"; -"texlive-scripts-extra.doc-54744"="smy9j2bvwmz9dm9s9v8fsvlcc27279nm"; -"texliveonfly-55777"="8csnp69s8i4bs18r18qqr2cmkqhgx437"; -"texliveonfly.doc-55777"="ic6vdfmbvl34zjqrn0lvp59armsin54n"; -"texloganalyser-0.11"="xsbl0y7fkjhbpavx9g10bl3zhkk4zqcv"; -"texloganalyser.doc-0.11"="i6mk318pdkma4xmfa3rsl1xiyqhx8f9i"; -"texosquery-1.7"="bls961qcx9s6fwhhjqsx20wczk10qhbz"; -"texosquery.doc-1.7"="8dr8ayinwjayi9vynaw0m6q9rrk31nas"; -"texosquery.source-1.7"="bpv9sr00x6vv90zclfjsl838kd6zcb76"; -"texplate-1.0.3"="qwc9286zs7yhw0y19zici7ij8nvsjijm"; -"texplate.doc-1.0.3"="9d0a9zxzjd5dhjy5i215b7fypqmbzv5l"; -"texplate.source-1.0.3"="aaslsxscr12j99xsjaq09rqhxq6jr8a0"; -"texware.doc-57972"="f95gr03s8p65mc103gid4synigindg76"; -"tie.doc-2.4"="68d4mmysa0k8zfw4x8nxiyq30ajkx0mx"; -"tlcockpit-1.2"="0c2p37yr8qncfamfn96wd57bvm87nhs9"; -"tlcockpit.doc-1.2"="nxadh1w5c1g1n2vhrvqfgsx701znkc6x"; -"tlcockpit.source-1.2"="aqjlazcsv4yiz4zfrxb5zdw573wmhaba"; -"tpic2pdftex.doc-52851"="s255ics89hxsf04fkcz1ahfz130q9y3x"; -"typeoutfileinfo-0.31"="vjs333wmdxb9s1vd215af0vryplvb8hl"; -"typeoutfileinfo.doc-0.31"="qdrwm9hi7qk7hxzcz0grv7cfl4r9k4v6"; -"web.doc-4.5"="c8yi707dacmc6a751s87254wb6avj9as"; -"xindex-0.28"="5wmxpzvpz1dyn8im2fz4asybkbc13dzz"; -"xindex.doc-0.28"="l71h3aa6c8jgy4ar35lf7ciq8q59nc85"; -"xindy-2.5.1"="h2fphqpbm4cqqamzwdgplj1j5g531r4v"; -"xindy.doc-2.5.1"="c0vyg2jz54hi23m1ys081mmmymgh3ah4"; -"xpdfopen.doc-0.86"="p7h2jmrh1c2n964pv2gfqqi36paf7c1d"; -"context-58167"="if7cs06gavsmqrfpmq73bdp23icfa5ck"; -"context.doc-58167"="lvcq4fkcxqrwk59c6hd6a3qck6slq9s6"; -"lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7"; -"lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq"; -"manfnt-font-45777"="isk7hkf6lfg41mjli9sgn77kvn6fkl96"; -"metapost-57972"="6hm4z5b1yw7qdhnk5zvr0li679rvfvi0"; -"metapost.doc-57972"="2xml7biqp6arvl4liyj6rbhyq5gc358a"; -"mflogo-font-1.002"="m5lb3rhr5yighsixjb0k6zp2hx8fxvr9"; -"mflogo-font.doc-1.002"="va6f9qjbh5ah4zvlmc4wi9m395x3bhpr"; -"stmaryrd-22027"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35"; -"stmaryrd.doc-22027"="r91xmqmmm6i6jka78qyaiilas94xc5hi"; -"stmaryrd.source-22027"="ch2gj89jxrqysjsl24s40za3y5z03yan"; -"xetex-57972"="5mai30qjzqsc5hdmzavbsgchlarv6gfh"; -"xetex.doc-57972"="z3vkncv076qiz497zk05gjh3q52143n4"; -"xetexconfig-45845"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp"; -"context-account-47085"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr"; -"context-account.doc-47085"="lms208c3s9clga2ymi1j2i5whyz2dffy"; -"context-algorithmic-47085"="zvjfp5dzy3saz67hcfl2n1haxjdkavml"; -"context-algorithmic.doc-47085"="gsckrj1g30x8lq52cil2z9bq7zf5vaba"; -"context-animation-47085"="lg4cn50cshxd9qg2i7hd54lcgsy8zwyz"; -"context-animation.doc-47085"="lazsfqd8djbbkn4byqrgl93nnvygm8xd"; -"context-annotation-47085"="vgnpr8wv2l93qcwifsyslyanyd9hp1vz"; -"context-annotation.doc-47085"="05lrbacq308akhvdbdpwlwg9b0dhsghp"; -"context-bnf-47085"="pzpk8q0zc179zbpj2l9w5fw3r8gmhq82"; -"context-bnf.doc-47085"="jyvr2yk2shkzj122v53khmxx4skbasn0"; -"context-chromato-47085"="721l06z298fqfaj6rcz9sh66jshq447s"; -"context-chromato.doc-47085"="lwbqab6vnyipsjq0xlfgl15iag6h27nj"; -"context-cmscbf-47085"="nwk7dqb2kxbj9y6ijlpa3ack1an9d5f8"; -"context-cmscbf.doc-47085"="s09578i62xh352zmd1rssg0rd1qjpc7q"; -"context-cmttbf-47085"="dgrblidva7k2q8yvmkdb0kg2n4bzln1k"; -"context-cmttbf.doc-47085"="fp7blzzh8p24bpab0vnlyc336kildj4b"; -"context-construction-plan-47085"="b42ncfcmywfwwnvzy2z58pig0spz39g2"; -"context-construction-plan.doc-47085"="x76mm90ba9lwvjb3dkhmbv6ajc93444z"; -"context-cyrillicnumbers-47085"="iwzzhbrrkf377k54rfbna7zfbhdal6g6"; -"context-cyrillicnumbers.doc-47085"="4q6ba2gxc5apykkirfjhyn29n387ifq1"; -"context-degrade-47085"="d7fvjlrj0gya4ycpy01b3xw96cqpgmw7"; -"context-degrade.doc-47085"="nkal1h165g0mnf0h677b22c7r5q89sbp"; -"context-fancybreak-47085"="dkqfx16sjcxdl8a50al6x87rhwbrz61z"; -"context-fancybreak.doc-47085"="vqgypbxyr7ay3qasrnfsxsvnzg1rddfc"; -"context-filter-55718"="2zc3825f0qs66xbmafhl2p826cx3l7h0"; -"context-filter.doc-55718"="bdw1fapc6dy9wm79c2r456nlvyxr30kx"; -"context-french-54215"="f44vj4in9b4kry17a7cw7ad11ygmnvkr"; -"context-french.doc-54215"="pnndx81zpi4625r2bpk3nyz7x1md9l6v"; -"context-fullpage-47085"="cjfrxynfxahlz5pc60jq27fprlg9jwac"; -"context-fullpage.doc-47085"="4xh4v0zq3wqdaf25jnjpkl73d72h5100"; -"context-gantt-47085"="v50p405xz9ddwlqb0q1hi9m8wbx0c01g"; -"context-gantt.doc-47085"="6600xvqy3ayzn81z6agxpdg6xac1mf90"; -"hatching-0.11"="kngng0rbi2q99417zr3vv3jl0zzjwh6l"; -"hatching.doc-0.11"="5c0n8fhchwpa3vgby9v6dzcg9v834xgr"; -"context-gnuplot-47085"="21gc0nq12aps3d3333yxll6xllnlw0x2"; -"context-gnuplot.doc-47085"="53y32f428jh6lii2zcl4csh8yzfs2ij5"; -"context-handlecsv-51306"="zpdagxljjxskjqd1fpzkba1dn0vxilnm"; -"context-handlecsv.doc-51306"="bc0dzhw5dwjidgscqgwlnfs2xdnapdyz"; -"context-inifile-47085"="fmf14m6wz9ya4lxy3w6mxjzqk491jdd4"; -"context-inifile.doc-47085"="acx93f08cc2z4x4jwwchd8njnkil3bfq"; -"context-layout-47085"="438mv86y37wbxdv9js2s3clnkl7866ff"; -"context-layout.doc-47085"="adh7d3hmcjqqgh69nr8agxznzwijkggk"; -"context-letter-56073"="9yb59mbbs9sby1wbg3c1wxysd17hqymf"; -"context-letter.doc-56073"="s8i0hpk9qfkabfgrvziapw843v9l55pp"; -"context-lettrine-47085"="wmfy4c9c13jj525hmrf742kzkiqqmwgk"; -"context-lettrine.doc-47085"="xf4mr1w0z7ybcas306959nmgxih59082"; -"context-mathsets-47085"="5gxx8rbkp1znjh8ycd0k8nflhjcm25kw"; -"context-mathsets.doc-47085"="jjc6lkfrw2a84n4cwvpdnn92wv59pvis"; -"context-notes-zh-cn.doc-23171"="x85l6d8ydz6nw51z8ak3a7cvpc6c45lz"; -"context-rst-47085"="5mwhydc35iywmkdz759sdpz53wkqa64x"; -"context-rst.doc-47085"="c8khxkv5vs9wzfb6l7116iglnwng98gd"; -"context-ruby-47085"="jrwrrwhcvb4bbia0g2lnl6rr0yydh6ix"; -"context-ruby.doc-47085"="s8s9kmgim38l2x08a6cq2n9jjz9hbw6p"; -"context-simplefonts-47085"="5h1qrkcjlkdbd5rc888xrp2nfksyf7x5"; -"context-simplefonts.doc-47085"="xfdzrvfp6kr1abbnsja6grxnvcnbj2wl"; -"context-simpleslides-47085"="idd4q63cvh7qqiv5wzkq3xgrxwhm9z87"; -"context-simpleslides.doc-47085"="smx89kphvq9qjl4mzd2nd2j3nasv6vfj"; -"context-title-47085"="ywgzzyzyvd02qwffkzxpymwhpb548g3k"; -"context-title.doc-47085"="d3m29w07jmdkxhb3g8254ry27j3y5qri"; -"context-transliterator-47085"="q0klk1fqlky9drg0ak4xlcn3xpsi4kyr"; -"context-transliterator.doc-47085"="xik3slvbsnrmjcjd9ypmwxhbslyank86"; -"context-typearea-47085"="ck1fbjmlyq93id8a15nrn81cd10jlcib"; -"context-typearea.doc-47085"="yvf0njazm748j5d40dsyk9l3p4is0g8x"; -"context-typescripts-47085"="q33whgk69qflc06i9q8jpb5lnwvdbhr5"; -"context-typescripts.doc-47085"="gxsm980lz4ddjnnj61yj4yv2vdnck1x9"; -"context-vim-58082"="5b0bk35x5ng4f7p6flnmaa7vfkxn35fh"; -"context-vim.doc-58082"="wlhn239qfi2g45909wbck779a19jgi7d"; -"context-visualcounter-47085"="sh6jnhkfbi4rpw34zw489148rgwsb14r"; -"context-visualcounter.doc-47085"="hbainxhhkx26imhab5kl4k1f7ljhifqv"; -"context-visualcounter.source-47085"="7wbyascsdwh2m9hpwm3c7sd0q5940fd1"; -"jmn-45751"="sxkb92pakb4lx5d9pjpang6mhfrgm4b5"; -"npp-for-context.doc-0.98"="7pczkchxrk8snrl81lrv7wgn928lngq3"; -"Asana-Math-000.958"="ra3pfarx03afq6hzv16an1v2fb22pcpx"; -"Asana-Math.doc-000.958"="wy3f3p15aj22vm3i391dpf2ssphqln97"; -"academicons-1.9.0"="lmsffq22z1m2lkq1xr3595z4zc11p2c5"; -"academicons.doc-1.9.0"="whzkxl5xfcd404afasyrk0jzml6giqmk"; -"accanthis-32089"="3ai0zz1fwlq9v25dsfz63if6i7wgrhp3"; -"accanthis.doc-32089"="zlxlfbawiicbkminjw2laximsn07zpi0"; -"adforn-1.1b"="av77crahnvrjdla03d5511inpd0hikjv"; -"adforn.doc-1.1b"="0r9vmhq3m0m5agj8vhgh9rwi10p238yr"; -"adfsymbols-1.2b"="qsglgklwqna03lj0dyd37vdqlmh3fxwm"; -"adfsymbols.doc-1.2b"="q3840xankbi9xr7fdsfxd3gkgydrvmxr"; -"aesupp-1"="39bvzid3ikay6dgdsy33nwcfjr73146k"; -"aesupp.doc-1"="4lryjai2f2jlk55hl42b6pgl45j7np3b"; -"aesupp.source-1"="r16cllryd2scwcjf6nw3i3bdxrmf8d5q"; -"alegreya-54512"="g97xv22dfmdfhyn4yqz67rj42mkp35qj"; -"alegreya.doc-54512"="ds3p6fvf6bdrzf9clxksrcl9r3lbbknx"; -"alfaslabone-0.0.1"="q13lgalx5mzdx6vjzl5cwjyx9jdrbfsj"; -"alfaslabone.doc-0.0.1"="j1j5y3vvfibs10jag9sbfb1714falvls"; -"algolrevived-1.052"="9bhf3s32fk8p0vfw81c05jcpcbjmmsrm"; -"algolrevived.doc-1.052"="vcfri2j0bl3bs2lvf3ykz9ydrva030kk"; -"allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr"; -"allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv"; -"allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy"; -"almendra-56035"="jwk6aqznr0b5qnc0g8f2wq9246080l7h"; -"almendra.doc-56035"="lp3pgbn9azv12hmr1q5fgdrsyam7k0qz"; -"almfixed-0.92"="kcaraz14gg5k8ws8zkrjfvvn22njv759"; -"almfixed.doc-0.92"="34f4a82gsr0vq47bp9wbdd4wkhhr984j"; -"anonymouspro-2.2"="kzf7kf4bc5cl8vw0k5m34hv7pj566w1n"; -"anonymouspro.doc-2.2"="0952v93206i1n1sziifc0pmrpz6ksina"; -"anonymouspro.source-2.2"="k8bivdv3ghdp0a9inhrirfh01kbszsrn"; -"antiqua-001.003"="131gc30l7jaj79zkc37if3w70nr8w6ic"; -"antiqua.doc-001.003"="36kkp06c9grcgz7py0k7fnr5a56cvsgk"; -"antt-2.08"="ln7vvpz0p5lz4sikwky7f7zmkg08zmcv"; -"antt.doc-2.08"="2449s2gpspkwfmyhvvl8g5h1dqn8bg72"; -"archaic-38005"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n"; -"archaic.doc-38005"="mb0z3xq325y48yv0bx4xsz8x5f790c60"; -"archaic.source-38005"="j05dan5d8xxzg43iay4v76vbcdscc6zn"; -"archivo-0.0.2"="6cklwzyrf0b5pwakna7qgfwl6f1rgz4v"; -"archivo.doc-0.0.2"="s7qhxip5n0iwgx8c10lg1c5blkvby4x8"; -"arev-15878"="xc3i2264d5w0ijv10n6ka53311bgnib0"; -"arev.doc-15878"="s39jgnizjbpnh1czr3ck5yd32bxks476"; -"arev.source-15878"="msk58av5fwg6hi4mzpz8abgzigqyskf2"; -"arimo-42880"="1z5ij30qfbd4y2c0292aai2dsg87n1rm"; -"arimo.doc-42880"="2fr1vjv5386lvixzs8idr0wyf9ghlg1f"; -"arvo-57213"="jz4jq6bin6pnwz643z576hdcvldvkbv6"; -"arvo.doc-57213"="macfnskh7cjjcxsr1mhh8d74kzw67wcz"; -"asapsym-1.0"="gbn04lk9k66wj689vna4kgxq8gddhwca"; -"asapsym.doc-1.0"="qfbaary485cs3q5azl6d650z53kd9s73"; -"asapsym.source-1.0"="g9m2vwmd438fwfczm8xwhv4wdp2aj114"; -"ascii-font-2.0"="xagip7afzxinz33nlz8pf8vbcvbj1qa7"; -"ascii-font.doc-2.0"="8r3hq592fxf4hd5n6dphfv7ggd7chhcj"; -"ascii-font.source-2.0"="ackrvh7723ifwjhl2pzf3mynk3c947f4"; -"aspectratio-2.0"="jhfd7l8dwy9mwi3qa5md8nzraf0fkajj"; -"aspectratio.doc-2.0"="xv7z3aa40dn6fzchrhqwg03356r2znjf"; -"astro-2.20"="isnx9q009wchs33xq4bphi4cp4cnb2m9"; -"astro.doc-2.20"="xa1szbc33k2yyahgwy294mgiiyi5yiy4"; -"atkinson-57624"="np7g8vknrgcppbdwdd76gd7k8i3wad7v"; -"atkinson.doc-57624"="sk8fmy92pj5djsip6234cv1878ys5sgz"; -"augie-18948"="w863x04n1ks9jkmaw8fm4hd6a1390s3x"; -"augie.doc-18948"="dlmy9i2fh0db4aghd8dqsv9227cqk4d9"; -"auncial-new-2.0"="nnaar0yvi6r1fynyzxmqhw7mnify474d"; -"auncial-new.doc-2.0"="jvyica87kxg5gm3zb8kmka9ja87f28si"; -"auncial-new.source-2.0"="hfdl71c7lx3lpb9rkwfz5vpaq0s19bh6"; -"aurical-1.5"="nsq6vfvs11v1z0jyrhizbd29fkn1jp9w"; -"aurical.doc-1.5"="3glvxhpb6l2y06kz1icv2cpgrxacl998"; -"b1encoding-1.0"="cxsgg97c3bsw9dl2aj9c9rb8vlpyn4s4"; -"b1encoding.doc-1.0"="mcm5yr55av0rj342bxdljkdid5qxyv97"; -"b1encoding.source-1.0"="jdnzzki5929xpzvpfvx5a9z51dk40pvs"; -"barcodes-15878"="8j88bc82j5a0xhm46671mj0k439zm5da"; -"barcodes.doc-15878"="7729a4f9hn4qzx2cndyxv04wwpchpjax"; -"barcodes.source-15878"="yh5ci4axi82ps6hbm6f0a08alrnapxiv"; -"baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs"; -"baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk"; -"baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1"; -"baskervaldx-1.076"="hv5ycdbvsgrajd2waycsl0ail4vj9kh2"; -"baskervaldx.doc-1.076"="km1ycjnk0sksv73rl38dfx0jlrvdin5n"; -"baskervillef-1.051"="5mb4w2c9i85hi0vdn3nkakrhbzin59ma"; -"baskervillef.doc-1.051"="7000j6d5p3ar92imfm53ss57xm63r17k"; -"bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g"; -"bbding.doc-1.01"="zjngi582jrb99j6w1amwbyvjmfvsk40d"; -"bbding.source-1.01"="axvp8f0zag6bkr9v3fg22j4h5gcbcgzx"; -"bbm-15878"="ayg703c4frfpv9mhahz36f9zs11y9vxc"; -"bbm.doc-15878"="bzfab62k5j167p5qzs79gps14hbpq7nq"; -"bbm-macros-17224"="lbvpxxa0rzhl0z0081s6wfdvmx3vlhv4"; -"bbm-macros.doc-17224"="ncijdxbxfk9xkrnvvsk937ji5nd60z1s"; -"bbm-macros.source-17224"="39wj6mqzn9qcvavqr8p5ny4ajjxm9m8w"; -"bbold-1.01"="s88rwky3f2jjcg6w00g7s5lkvviqkwpm"; -"bbold.doc-1.01"="sa83x4g1n5b2lafj9n61cggkyk7h1z5v"; -"bbold.source-1.01"="ki3gxl970iirhkckqblr490jlznl0kc7"; -"bbold-type1-33143"="00rizb6fky3rsyn1id4p1dik8963bhwr"; -"bbold-type1.doc-33143"="lnpyln41q3qdsmzdkini0q1wqx7v2n7h"; -"belleek-18651"="8y1nbwn46cgyzfyd3and8aws7mqclsfa"; -"belleek.doc-18651"="8d258516ak2b5va5smkfc87ipyj329f9"; -"belleek.source-18651"="n6fypvkn7cq1c1l7jqvjb6cfjyqrq0wv"; -"bera-20031"="mq0j1sn7fg1qk7qd7x1l4ixqddyp3rjg"; -"bera.doc-20031"="6iv3gc8kfqcw909sa4x7msc7dsxndy8i"; -"berenisadf-1.004"="2ci0vxfqyc18anpy68r6anbdz76nrf2b"; -"berenisadf.doc-1.004"="00vx76lkvv0vf68a7sck05ls3l5va5gj"; -"beuron-1.3"="c04r71cvsva6yr9gvj1jrmix7q8n1i94"; -"beuron.doc-1.3"="6iihw343dcgq64505br49lkllnjxn8lw"; -"bguq-0.4"="cgq4fhairknzbp65cmhv0m19zn0cnkgp"; -"bguq.doc-0.4"="9rwhzxijcyl4zzrc88dg8730p11hkm4q"; -"bguq.source-0.4"="7856n14czw3z30maxv7m4xz6js47rkbj"; -"bitter-56026"="v844qmmw2336gglg1lvfzmzb799gjbq8"; -"bitter.doc-56026"="nl5n897n92mnwwswpb5p1p4jlpqf5740"; -"blacklettert1-15878"="hzd441k3wi58rrysk0h48yklnp5i776p"; -"blacklettert1.doc-15878"="8n61621w6273ik991i2asvsm4w8xlimx"; -"blacklettert1.source-15878"="ir0cn80nw9jgchx4kisv9j27gpgykhvc"; -"boisik-0.5"="xz0hk8fwnrwnydy9dglm93c4gzrqpz87"; -"boisik.doc-0.5"="wsssy9bh8wi35x67ifgnj9wrjx0vpmvy"; -"bookhands-46480"="6dgc2p6zs8hxjx4b3xa317ni1pglza7c"; -"bookhands.doc-46480"="l8mlzpwi0bh220ag4ip8qzxq6vxz9s5g"; -"bookhands.source-46480"="xx98dvqz312dbb4fm57fmh3yp3krq7wj"; -"boondox-1.02d"="i1hwfxc7ji83724177ir5hdgfn6cbcqr"; -"boondox.doc-1.02d"="wwa8ar557myv3rfjkw9jlw1pxs26vwbh"; -"braille-20655"="slk0qzcahb3qkmq91jcrm5gakcwa7czv"; -"braille.doc-20655"="00dv14s64fm8g5jy8b30dx813a304nlh"; -"brushscr-28363"="342p5p6h8v377mnbrv1f56kicbbjfcdx"; -"brushscr.doc-28363"="hikb5s9iv60pfq2kjdbfiq1216d3rabk"; -"cabin-55907"="w65bzixchj3mdz8z2l0dkmqa9kjzcy9p"; -"cabin.doc-55907"="p0gqqmr9g08mgc6xjzhzxh9wjdg8gbpx"; -"caladea-34991"="1rb8sq2yh4hizlcjp8zd68ayb7cx6275"; -"caladea.doc-34991"="9qr79slzxmnnvvh2iy310ypqj9g11s4b"; -"calligra-15878"="cisw7fvdys863szqvsxzm164vina8al3"; -"calligra.doc-15878"="36bzakyiw9awp36v7c6dyb3vwl01shb0"; -"calligra-type1-001.000"="2bl0g899jhyspyhyzh45xdkkis88ja46"; -"calligra-type1.doc-001.000"="3zza4sgsnvcg2asdv27gd7y6jmab5j4y"; -"cantarell-3.2"="kfhii4bxf2s204kidpr7d9cwa5kd1vwy"; -"cantarell.doc-3.2"="22q109ydjdvd11y6dhxbgsax3rnd43qi"; -"carlito-35002"="7v0571swhiw0pbsqcb1a4sj7izdincb0"; -"carlito.doc-35002"="bs67zjydc9fcigiaaf9y9lm05lkgw68a"; -"carolmin-ps-15878"="rx6y9nb8l3cslla44c422jzwjlqw7ilz"; -"carolmin-ps.doc-15878"="hq8477r3q2cg2laafi8ryvjan90wxjcg"; -"cascadia-code-0.0.1"="m0xyvyrmprl5nbqa4lvqlnwha5pkigs5"; -"cascadia-code.doc-0.0.1"="4p2m5vm8lr2983gvj9jssa09nn77hrb9"; -"ccicons-1.6"="g89dzfgas16vgx8ydp43ihina82z8df8"; -"ccicons.doc-1.6"="sphr2i8d6yf8xz5rkr0ib5ji6x6w428l"; -"ccicons.source-1.6"="1rkyqlpvm3v01cswmjmycayxh0kbgin6"; -"cfr-initials-1.01"="piy7c7f39bjqk0igmqcvrjk0pg86lw6z"; -"cfr-initials.doc-1.01"="4grvqnf5f5ga3d8jdsmanfgiwpp5gygc"; -"cfr-lm-1.5"="7y9qg3jnq6xnlq0f1wqm6493qax92cc3"; -"cfr-lm.doc-1.5"="cfshavfcmpkig5p9kypglmrs55rl5lsb"; -"cfr-lm.source-1.5"="nglav2q22aybb23snhm6x17dxz3976sc"; -"charissil-5.0"="cca3i6y7d4kbcdxw8nhpsifzdamhc7gs"; -"charissil.doc-5.0"="1kb1gm8vrjxa45q7pm7cvwysf32h7yni"; -"cherokee-21046"="hmmaav3k7vd1rh6rm26l2nal48r1wxz3"; -"cherokee.doc-21046"="zaq092r56asdcf62a7zscfp4zp7a5lwq"; -"chivo-2.1"="0xrf456zk0yvgw2v6rss6rzlzpb0qkmk"; -"chivo.doc-2.1"="w9p59bx5wdz963lcdqvwc7v50pm1a8da"; -"chivo.source-2.1"="mqwg3ryb1lfam2ii20dn6m6j7pahqqxr"; -"cinzel-54512"="g6w1yxjm4bb49qdhgwrrmnj535za01kp"; -"cinzel.doc-54512"="4kj5zj40jq8dm7br7xb9vr2nwwqjl530"; -"clara-54512"="z7c5lggc4dy39dczhiql9sl48n6v5wjq"; -"clara.doc-54512"="r7x0a5q7l021a6i6skr34f1s5000ggz3"; -"clearsans-54512"="zp2572jdcnzq8b32pxzsmlyqxvsmj0mn"; -"clearsans.doc-54512"="6f9lri3fq95h9hgbady7fbgfk9msy7s5"; -"cm-lgc-0.5"="wnmmrhnlldps15r2v360bdvlfyjd1fpn"; -"cm-lgc.doc-0.5"="wb18g3w86wfb7fv2iaaxm0j2amrws9yf"; -"cm-mf-extra-bold-54512"="87n4wnhy5wylwl1qw8i0nq4jj7jfr5fs"; -"cm-unicode-0.7.0"="wmmgwafdisxnkgdh571y2mlcybjlnvf6"; -"cm-unicode.doc-0.7.0"="6nykmggl860gvrzr1v9xahvl6gpy7phg"; -"cmathbb-1.0"="xsxjimwahlhbhzk9fq5zrh6v8axcmhhz"; -"cmathbb.doc-1.0"="a7fvfpvia4ybway7apcbc9hs6mkaydqf"; -"cmbright-8.1"="rjlqiwya67ispglypa4gmix8hyk6f2h3"; -"cmbright.doc-8.1"="wsjakpl6b7zyv3j9yx50v9hjm3sgx317"; -"cmbright.source-8.1"="vwgnzs47an6mjgw898scvdp8dc3m1w0w"; -"cmexb-54074"="jxb62ixs1vqaqscv1ixg27vv1p7na0p1"; -"cmexb.doc-54074"="92888gd06jfx2q4xd01n45c1yyhnp03l"; -"cmll-17964"="bipbbgh6jc5r1imk467r5pvj4m62a85k"; -"cmll.doc-17964"="k2sshj6rp40m29fm29jd7jy492gcrwcf"; -"cmll.source-17964"="lbaw2209cz5ymklza36486jzfpq1cqc5"; -"cmpica-15878"="z5mc7yl40mzwk5bcjs3lb1ifqsr7x4s1"; -"cmpica.doc-15878"="9bl7bhpb9dhp58p9hxay8xka0nz2cg2l"; -"cmsrb-4.0"="sbnwa4gqj1y9pah89qlnivsnn5g4b2ih"; -"cmsrb.doc-4.0"="mn4vnkf8sczwx73219r664vkrz0iwyb0"; -"cmtiup-2.1"="k6sk5isdzms460hm17lkx5b6p6p9wz1g"; -"cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h"; -"cmupint-1.1"="y3vd4gx3bm5432xbhp6kd6fgvgxb24id"; -"cmupint.doc-1.1"="jh5gh9ca5gwvjc0zpbb8wzlbi7kzfmf6"; -"cochineal-1.066"="nqvc3r3rvl2b8jg5iyl2iys8xdippmxq"; -"cochineal.doc-1.066"="v35n3000808gmsks4w1gwbpr65n6yx8j"; -"coelacanth-0.005"="qbhn9dh24pnw2bzsjgv2inr1fyh26qka"; -"coelacanth.doc-0.005"="dbx6zwlbflq60b3zgkff1aj284bl77i3"; -"comfortaa-3.2"="r9sis4ra19lgzsl56h3xp8s56awhlbrq"; -"comfortaa.doc-3.2"="jqsyn47waavk5a34d7cin4fc2z4pc9z6"; -"comicneue-1.2"="cfr1kqc912hb1lm6n6ks4jh7xqbwwhk3"; -"comicneue.doc-1.2"="h793ar1xgvf5l95z029vxysls2ypl884"; -"concmath-fonts-17218"="875viaxzrrljcarkg11cb830fmq5321f"; -"concmath-fonts.doc-17218"="q2wyl5cw03rbk4602vg18jrxg3j133lj"; -"cookingsymbols-1.1"="qhjzkivpxbk3rk6pricxsxpdk7c40rxc"; -"cookingsymbols.doc-1.1"="8l7yii9vvmaxfnf0h2snis7476k18mlc"; -"cookingsymbols.source-1.1"="z7r8n2lhgaqzgpx0jz8xq4sd4zzigbs9"; -"cormorantgaramond-3.601"="xqgifhi42dx6dbcbx72kdchyzk07f4d7"; -"cormorantgaramond.doc-3.601"="amjjqgdd9ng92mhiph56pflx2l7ggx3w"; -"countriesofeurope-0.23"="12hskf06qcaaq2ngadchixzg58sq1v55"; -"countriesofeurope.doc-0.23"="z2rmvqi92b23rwk5msp5zyqa27x8x70n"; -"courier-scaled-24940"="qrm6a468azlw2s89v7j992wxs2mkqfv9"; -"courier-scaled.doc-24940"="1bwlrdxpl1fj4f9ml688ybimig5ylxwv"; -"courierten-55436"="zc995z33ykbgfhmsry87a3fsn8xlb9zz"; -"courierten.doc-55436"="n3qgxqvpavn06yif3czxjk3075glzd1b"; -"crimson-54512"="wwvxgknvkd3ycswpp9wnlp9dlkilj7wz"; -"crimson.doc-54512"="wnxfzc5llkk38ky7bf8hkn7zsdawpr2x"; -"crimsonpro-54512"="hw8fac0b3762dbrc71xnzwys5429ih5x"; -"crimsonpro.doc-54512"="1vxxf4zr3rmknnxjq51myq954s2w8mab"; -"cryst-15878"="56jlp0hk9vrfxbhlfjnpim398ggxccjg"; -"cryst.doc-15878"="qazhz2hzgpqlghbg67fnmf8adba1wl5d"; -"cuprum-49909"="lb84z2x4ab6q22wj6vh0m2rqnfqr5cgm"; -"cuprum.doc-49909"="88iiq2wn37gz4bqawpsb0q8a0nrdpr62"; -"cyklop-0.915"="5ksv3v36mc6557jckr5gk22pbqr30wnr"; -"cyklop.doc-0.915"="d85643zgnh0r0j53gfpi84qsx4694xpv"; -"dancers-13293"="qlpshkppzr84rr3smqpwch5j11klm3a7"; -"dantelogo-0.03"="iiqbbimigxpj8kg628sj694xha98q0fw"; -"dantelogo.doc-0.03"="d42k8bqdvp20af1wzilbcjfd1b7ywim5"; -"dejavu-2.34"="90lkxdpj8ihrs68355fal0h0a1dp3v67"; -"dejavu.doc-2.34"="2v6nhxrkny5haczrpvqjzcal7bixngas"; -"dejavu-otf-0.04"="ssbkk7plshbikfmxsm8fhs860c921ri8"; -"dejavu-otf.doc-0.04"="h5xkf02syyclkizh6xhxha96ay14f3kb"; -"dice-28501"="916yfiq60a1qz7d0jn1jd9slck7rjwy1"; -"dice.doc-28501"="rfkm493k3g4slyjsy6bcgljxjsy88z76"; -"dictsym-20031"="lc5sz8d50hirk5yqg9baj2vhj4f7cf8x"; -"dictsym.doc-20031"="d13rhwg29k9gd4ymlipbp5ink908sdnn"; -"dingbat-1.0"="9yc0zy6qlxi9zmpyi3wd5irgq89shanr"; -"dingbat.doc-1.0"="z4km9f9xrw1n44ylh16872lzq8r4zvy4"; -"dingbat.source-1.0"="rq7v2cny05d4f8bkxbs2z6kj36q5bwfd"; -"domitian-1.0.1"="h6nmi8210w114mrgbzbjq57s2ii8dmcp"; -"domitian.doc-1.0.1"="qcnjkq47z176kgl8980098zidn3r6ida"; -"doublestroke-1.111"="z58ah73655dsas48b432ahkkags5n8wv"; -"doublestroke.doc-1.111"="403diym6rx34bwmrh63zaka3xdhzs2dp"; -"doulossil-0.1"="xd9sgg9nj1977hc9svbd5qp0vxc9sx03"; -"doulossil.doc-0.1"="1aysxh73wks623xr7x6dj14n1r0f0xp2"; -"dozenal-7.2"="6d1mbaf4l9yk7admwg05a6ix98cq5h97"; -"dozenal.doc-7.2"="5qfx3qa1dnadw5qc1fxq156xhh9wrjws"; -"dozenal.source-7.2"="w7i42zvkj2ln8z9m4r8p5371jbjn56kp"; -"drm-4.4"="i8782x71pbzgag927fqjqgw2w7zdisvj"; -"drm.doc-4.4"="vs4rq0w6c2yyyzv4g4qk1pn25z0czs8l"; -"drm.source-4.4"="g1n0k02ma60mrb12cdq20qfw8khgdpmm"; -"droid-3.2"="9r4y9qywb92m9jsc2wq0x9gpj13l1qdk"; -"droid.doc-3.2"="7imljgs9xh8zavab0kh5bj0fdgvf8pq1"; -"dsserif-1.01"="n3yxb7dh1amaxgyxlhlyyvg23hjdns2n"; -"dsserif.doc-1.01"="84pcbmflmwkfzclm3ygbdrm817l4dbdp"; -"dsserif.source-1.01"="yawadjy2742rvvkp232zadkjsij8ja3m"; -"duerer-20741"="vbldf1vbzs3if3mp2lcl65afgiqa54j4"; -"duerer.doc-20741"="75dd80vmi5wx804zkrq48z12y3alihqc"; -"duerer-latex-1.1"="nwigxc3gb4phmv584bma819dcrrafsmx"; -"duerer-latex.doc-1.1"="9nkvhaa662x9la2spm3iwmni9bj86kll"; -"dutchcal-1.0"="6gpi804yy8xyiznzwyy2nqg7qvq6q2rd"; -"dutchcal.doc-1.0"="s0m4n06xg8h0jmlj31w27la569vkl1im"; -"ean-20851"="m0gkapni85n6zw1armbn1y770n8aj0rm"; -"ean.doc-20851"="1b7rkp30r8k0dgk9clz71jp8dlsvhrqc"; -"ebgaramond-54721"="fxf69dhligq556cggd9gz5vsjf5cbchv"; -"ebgaramond.doc-54721"="nkhb81wpx51kkfqg2g2mw9vy4dhnzj7h"; -"ebgaramond-maths-1.2"="7xa6g5hnnl2ry0v3gf0s33p6l3qqn3ds"; -"ebgaramond-maths.doc-1.2"="2l73rdm7kwy43k9z4fwnxlvd7prca25a"; -"ecc-15878"="0g013kqml9jfkqq94v7zi46mhrwdzdck"; -"ecc.doc-15878"="v9al4v4j1qlrc9w7ph6ww1h1mc6flqsz"; -"eco-1.3"="7ycccps2kab77rr3cpwsbpi2cpl40kl7"; -"eco.doc-1.3"="1r1jxijx9wk6q2124xjwrmsjps7446fp"; -"eco.source-1.3"="4kcml0rm4pkg827qpfvhywnzrrx5p7dz"; -"eczar-0.1"="rnk4ahis52ivhpbyl6n75kdbbvcv06bf"; -"eczar.doc-0.1"="4k1sdkibfnis7gb2xp5caadk50ic7v75"; -"eiad-15878"="m3n9a3rawxsj5gm64vggw7xvrq4cy4ry"; -"eiad.doc-15878"="z3wss8sc5vnawaqkz7kagwm1gv4l1czv"; -"eiad-ltx-1.0"="0zq83567n75h8zxlag2qas2q8li6vyqn"; -"eiad-ltx.doc-1.0"="7kymr597yg8j8291gy7jz16a89aqmqny"; -"eiad-ltx.source-1.0"="illi6i1hp4lmx7ylxazrmmzi89ymh9cs"; -"ektype-tanka-0.2"="rqd2g9ibqc83vxsi040pxn97bxxv8qvr"; -"ektype-tanka.doc-0.2"="0q47s8q2bpdxc1dd11pf46iicyvy3lx9"; -"electrum-1.005-b"="6hdyjv1dakcj5zxn6p8rrksdvc7jl0sb"; -"electrum.doc-1.005-b"="c11jl0zjq8nva5nl96p9qyq3nrvgx0zn"; -"electrum.source-1.005-b"="67i1gwyiwwarncpbnj47fmws4dc42bii"; -"elvish-15878"="wp858zclk17yrhpf1yrgd3c4srh07vcj"; -"elvish.doc-15878"="mwgvj8fzb806dsjcx01zs6lhdygx35r8"; -"epigrafica-1.01"="mc08k5ajn2lr4k30lzhsn2si922frq9c"; -"epigrafica.doc-1.01"="vv1fqij6w2fir3myffcafyyrdckvvi4q"; -"epsdice-2.1"="xbz7jkdzzsqrskdi4vhb0ra7m62hk9q1"; -"epsdice.doc-2.1"="7lc7wwfxwxnjfgf13br3wa6n8j25ml6w"; -"epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3"; -"erewhon-1.115"="4pfa8lybdjfb1q21imsfvhsby9iyx5nb"; -"erewhon.doc-1.115"="7n0gz74gl7s50fxypsjydxbn9lx2khbr"; -"erewhon-math-0.45"="hx56393y3qvz6xhdkm1sqlnzk1bs8fgy"; -"erewhon-math.doc-0.45"="q1yyga9zqywjf4ic103h5clx6sap79dg"; -"esrelation-37236"="zhs9fa75r0wr060cfsk4gmmvn06mywmy"; -"esrelation.doc-37236"="08i1bczpz8sccj5lf32axfl3c5ix1sri"; -"esrelation.source-37236"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv"; -"esstix-1.0"="0ddmfrgh39pwcd2n8rggma4pqwgamp7s"; -"esstix.doc-1.0"="5pf3r0xhssrgkp779n06a63yjb5cdg6a"; -"esvect-1.3"="dd9wb3zgs99s93z0jig2z5pwccxh3vvk"; -"esvect.doc-1.3"="c9x8najv8ihx22n1kfd9hbqba40ilz3x"; -"esvect.source-1.3"="170376cm3v7mzlh5909qyzw6y18m5rjm"; -"etbb-1.051"="dy8w22hbxmmfz7krnj85qsh6i6l5cx8w"; -"etbb.doc-1.051"="sz630vnzl7rlyvrs5l14436mmyzzqgia"; -"eulervm-4.0"="ica20j8a3ljzxrmp03k60y6f4kpcbiy2"; -"eulervm.doc-4.0"="g5fxzw7dvnff2w9ys2gpgnvr2x8dabx6"; -"eulervm.source-4.0"="ifvn5n0dvcr4qpcv1yp4xvnx9lj26krg"; -"euxm-54074"="pb3kg627b3skhbi0prgik6y9n9zgk8s0"; -"fbb-1.16"="fj9qhal40mhidcypy6gkiw5yxlzarkcb"; -"fbb.doc-1.16"="wlawnph3igcrbhkrfjhd3ghg3mlclshb"; -"fdsymbol-0.8"="hx8wp66hsznj0sj8jkz0vdah0bp9vvyb"; -"fdsymbol.doc-0.8"="n457nji3718qh1nrjr9wbj9zqj21nkw0"; -"fdsymbol.source-0.8"="3n6d2j9wh5cxakdmxg087mznnrdkjw27"; -"fetamont-43812"="4b0n4awl8k1zz1pn0pnc2hic5shsyb2h"; -"fetamont.doc-43812"="vq97fpky2mf9p09zwqvk6vkl5k9swkbb"; -"fetamont.source-43812"="j6zizdhly6lam1y4f37sy8py5ibaz4xz"; -"feyn-0.4.1"="mb9rzhjkx06m1yv6knnfx59if98wda3n"; -"feyn.doc-0.4.1"="hz41vacil1r726v0f6k2fjpn7zky7xrz"; -"feyn.source-0.4.1"="lqz2b6w4z325ba7mq42aj0brw2hpx01z"; -"fge-1.25"="59jqqyl11vinxa29f6gmalv30q6zfbzi"; -"fge.doc-1.25"="49bgdsclk4zlpdfj9pimffpr4qkd2z7q"; -"fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl"; -"fira-4.3"="7djxip2p87v4bjjnlqigzyia0cdwp1yl"; -"fira.doc-4.3"="llsvxv1afxxlkxxwyk9mrq32bnz4hjml"; -"firamath-0.3.4"="jcqr18y6256nz7pj740yimvqj6f1rwng"; -"firamath.doc-0.3.4"="mbzsrizx3rh5gq4j8aqq7jgfcri0xhf1"; -"firamath-otf-0.02a"="8va0xil2r5i2bjmmv7xj39jbk9j8l9d8"; -"firamath-otf.doc-0.02a"="0i3j6rfpa5jahxipwa5ibfkh4x7vhz48"; -"foekfont-15878"="wha0shrvr3lv9ll9d3gv60mcav605vcc"; -"foekfont.doc-15878"="n91sl0xzglqfbdyb9mzv7wav3y4zv9sx"; -"fonetika-21326"="firgrcsksy4jdk632aqfwlaki3xxgmak"; -"fonetika.doc-21326"="ahz61pg6qnn2dpi3c9iz2kh2f4fvywbl"; -"fontawesome-4.6.3.2"="0n13dha58d0w511pzzckcq51fal6zxgl"; -"fontawesome.doc-4.6.3.2"="x7hzlyxv5k2zjz5lk8hy15pnvbhhhijj"; -"fontawesome5-5.13.0"="1aif8izj40a35ajy3kk7jh1y81r8vv32"; -"fontawesome5.doc-5.13.0"="ag4vgqas7ji3q4ahz05jxpfvvzxijc96"; -"fontmfizz-43546"="rkf93c9imj2wd7aps85m6450zbd9p3yl"; -"fontmfizz.doc-43546"="y70dshapwj7xp7h9b6sbjipv6v9k02wg"; -"fonts-churchslavonic-2.2"="dv81dap48xibffaaqz9lv3vn9k4lqp99"; -"fonts-churchslavonic.doc-2.2"="av2wni5sdkp83fd61c3hdzddscz11i8r"; -"forum-56025"="mgaad8q8g47k4x60vvfrwn7asni9hrf4"; -"forum.doc-56025"="w0qr0r8hr149nn075f8d0rjp4nfn01p8"; -"fourier-2.2"="ghdri86l3nlrnqm057sif3w4yjsqzhbz"; -"fourier.doc-2.2"="p9qmlb4xkdc321gv3iwypqabrkw8mnh7"; -"fouriernc-29646"="9pxp21fllg7yh9jfa8nzpy6ifa3w6y18"; -"fouriernc.doc-29646"="dn9wfy53asfp1bbxnfa9nxvnfy3z9nn1"; -"frcursive-24559"="fs9aw12gfd5gs55fhqxg2p06c50i9s1v"; -"frcursive.doc-24559"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy"; -"frederika2016-1.000_2016_initial_release"="bl8g27dfv6xsqfwlr2i6w9yar7916qnn"; -"frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6"; -"frimurer-1"="fh6b7ag1zzzggi6xzb6by04hwhhl2k4x"; -"frimurer.doc-1"="vghsyznfdxa6ab2irz1gppr57sbc6b6p"; -"frimurer.source-1"="ixvp583gb0qlfi28hxy52hzbivnz77k8"; -"garamond-libre-1.4"="sjc7j87aq5vi8zgxiigg9hslvgq43fwv"; -"garamond-libre.doc-1.4"="k0m63fxp3f8fhyjachi19la5kz7wgz3d"; -"garamond-math-52820"="mr7aafbkhy8z5iy5qc0l7pmpqbvnzq4n"; -"garamond-math.doc-52820"="agb1azq7b7c5gpvz4nwxb29lg7pzqg9y"; -"genealogy-25112"="hdl046d3paihjmlkh2q3crfj1n88fsyv"; -"genealogy.doc-25112"="7115cwa2l6nsnyijcdik7kw513q3a41h"; -"gentium-tug-1.1.1"="gdd212mv253371hvn1bxlr2q863qzy3m"; -"gentium-tug.doc-1.1.1"="02avjmn2f3hlr18688rn12y1f5qc68ff"; -"gentium-tug.source-1.1.1"="k50zhzwymzygzqf7xywv4bzz47vw5hxs"; -"gfsartemisia-1.0"="98gdcspx1jqdry7iiq7mgxxmicl57zz0"; -"gfsartemisia.doc-1.0"="drbwq4z57xl8748mwmy86j97ycs3b16a"; -"gfsbodoni-1.01"="dzcgyjfwabmywpi5zkac7lbf88jzsbpj"; -"gfsbodoni.doc-1.01"="cbw698q7jmg09k301zwbnnqig853c14i"; -"gfscomplutum-1.0"="bic1cr1c3dii9nlfmhlgsm6rpj3g0im7"; -"gfscomplutum.doc-1.0"="ddz279xl7glgi201dizr2gdkcgiy77qz"; -"gfsdidot-54080"="j0mg1pn4n9dfy9hdia5v88hds4j2h2d2"; -"gfsdidot.doc-54080"="xrnlqx0gkb79g50mwzsmi9g6ib1pa92y"; -"gfsdidotclassic-001.001"="mv8li5kjf7gd779h7ap57qm6wz7m69mf"; -"gfsdidotclassic.doc-001.001"="1z68ixilpnx61pjs5spbmay6861sqc8z"; -"gfsneohellenic-54080"="az5rq4d44zysnvcqlky0hr5qb7bh3nza"; -"gfsneohellenic.doc-54080"="04y313wjm59sgg4xlnili0kfw3dwljp9"; -"gfsneohellenicmath-1.0.1"="w946ahij7k25dk2dhvwpcrlcxpdndsl2"; -"gfsneohellenicmath.doc-1.0.1"="djwb6m03rymqc84dcgv531lq4wx8qx5n"; -"gfssolomos-1.0"="wq24prphxxnn94n0nd4xmrf23f5yqchp"; -"gfssolomos.doc-1.0"="rq87k1bymgyb837k103ps50w9krmxca8"; -"gillcm-1.1"="42vc5sx8shjzqkc10qv7gyq9689bzlgq"; -"gillcm.doc-1.1"="4rmm7nn5z0bw3qgn8gfkl86bblkvkh6g"; -"gillius-32068"="fw49hi1cvp9zknv23xccgffkxyqwimqv"; -"gillius.doc-32068"="dhkvy2y5v117xzm4lan27k7q2rcdvs5p"; -"gnu-freefont-29349"="1zqn27grz5h290g4fk4q8kd9pf4l05ag"; -"gnu-freefont.doc-29349"="3saxb0d0h7dn8a1f7l8ax0dj5ic8piib"; -"gnu-freefont.source-29349"="716drmmfwyq7pabpgagk0zwkj77lrhda"; -"gofonts-54512"="gd9n6q1il2jfwz6hjp5hag2gkpr2mhl5"; -"gofonts.doc-54512"="4r2jm1373lkk3j89i9clb528dj04lmly"; -"gothic-49869"="p88xyzda6r94ibzxlv1r7kkb7mc99h68"; -"gothic.doc-49869"="wrpx52hq1g5dhi38sjj7dxi2y7gh1201"; -"gothic.source-49869"="6gh7hma17066gk20ri4qjvml8d424c1h"; -"greenpoint-15878"="qlqfkgcn8gc1hy7gmfajqliriilf68ck"; -"greenpoint.doc-15878"="xf889ii8gmck30vlpwkfp7d9242ivffr"; -"grotesq-35859"="rqv47whzwig31vfd8581ncd87ja7pb82"; -"grotesq.doc-35859"="rim68sz4x0r1m6j69zryv98gfgvpkbz0"; -"gudea-0.0.1"="5pp223vvpcdqm8ypnm1jpi46i9p04jcy"; -"gudea.doc-0.0.1"="gmn455nvhhpkr3l1rzgi2yx85y17djyv"; -"hacm-0.1"="jvhbypj31pcc0imgwlmzpv8nmb1n9dxk"; -"hacm.doc-0.1"="0dys4q83mfgxlwrz16fsm2cx2vgcn5ly"; -"hands-13293"="570kl4m7mximvq87lfqa6fim30hmjjqz"; -"heuristica-1.092"="9y69nm9nw275afi7qzdlm6rr207rq1xd"; -"heuristica.doc-1.092"="kyhkr5x04gs4k2pqgnhysgdg9wk96s1h"; -"hfbright-29349"="j8vk71r5c8iyhfmfwqspj1c4iczl2p0f"; -"hfbright.doc-29349"="wqqxw523sh1yjl0hnh31902wap7xcjwm"; -"hfoldsty-1.15"="79zmah1m2xg56m7cvfybzw68kbfcf5c5"; -"hfoldsty.doc-1.15"="16gmfqd9kwg0isf4wp1nlndfwn5132ph"; -"hfoldsty.source-1.15"="vyly65j4d7wl49gmm8wgpxrnv1s2ygq2"; -"hindmadurai-0.0.1"="p51ilgj92map420hac4c2xhwzdw46jsj"; -"hindmadurai.doc-0.0.1"="9gpq48c0l768kmppj58fl6865sbjlhvz"; -"ibarra-55820"="zm9m981v0x0mppmcr64fhnk22qr0dn40"; -"ibarra.doc-55820"="h9cndsg3q17n275ah59cf93m1is22ad8"; -"ifsym-24868"="qy3w8h8slb44vg4s7q7ddb9db2fd9s06"; -"ifsym.doc-24868"="wpnp4ykxz7qa1ycwzkfpp5sjrs49np12"; -"imfellenglish-38547"="y1vkapnwlqxwb3via4yhpszgfmlyqa9q"; -"imfellenglish.doc-38547"="g7r6rv584d412gqassqba30jfg3i1490"; -"inconsolata-1.121"="wk0j1458yhq5r1zl03qlb3gbzm0dwfb3"; -"inconsolata.doc-1.121"="iyjsfc6sgi4g6k3vljlmdjr6arvm09bn"; -"initials-54080"="sd0v18xidrmnllf1ihmgk02jz3v2qw8j"; -"initials.doc-54080"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g"; -"inriafonts-1.0"="v2z21gr8glh8557carc8405d39h9yxyq"; -"inriafonts.doc-1.0"="dq2aix14cqch32dywqyka5ci8qn31ayw"; -"inter-57213"="217klka90d7inpzwvjv0cmrfrmgylpjs"; -"inter.doc-57213"="a2rnff5s05lc06k48mcidc1biyczvnyf"; -"ipaex-type1-0.5"="pzqc88hkzspswvgps1bswsn6khablb87"; -"ipaex-type1.doc-0.5"="xls1iggs58i1mnpc79fp15v1f1i59h3y"; -"iwona-0.995b"="l8pylg2zq5pvxs7czq17b3v1xpar4qkr"; -"iwona.doc-0.995b"="piyd7fk40bqwdb3fxshkcwwrdi8gra32"; -"jablantile-16364"="7fh0mnp320r5b8740vs3z19dg1l0i4ds"; -"jablantile.doc-16364"="yml29hq7xcawh3zkd6b32dbsk0aj024q"; -"jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9"; -"jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0"; -"josefin-57152"="18lrkgv2giwpm43g71ygmd77nr4s4df4"; -"josefin.doc-57152"="zg0p38v21kscdcr20xn6g4a4vx4r7ylc"; -"junicode-1.0.2"="2vg9bfcpawwij52yxai93fb276v351wy"; -"junicode.doc-1.0.2"="49dyn91fjdhs7yzc6j7y9ihnxkc9wpml"; -"kixfont-18488"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40"; -"kixfont.doc-18488"="xp8ai67z856fmkzcssavksidg7n7j2yj"; -"kpfonts-3.33"="rsl5v8zsm8pblyjryw3f14svxjzhnchm"; -"kpfonts.doc-3.33"="rr7q8ww1nkpzqy29xmxhsyizszf59mqx"; -"kpfonts.source-3.33"="448xjy1djbz9l9wbhmq7r6fpgvsn9dyy"; -"kpfonts-otf-0.35"="iyczbphywkcslakdz2cma4q1mqiy4b45"; -"kpfonts-otf.doc-0.35"="kdlysi6gmavm0mvaxdj50sqq65kya2l5"; -"kurier-0.995b"="dadp8vkzvblj60424k75bchravcr0338"; -"kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b"; -"lato-3.3"="5cl837pwnp1zd7h8w5j7cwqpvf6pmik6"; -"lato.doc-3.3"="fjxgmfdin3rrl6dn338f9ss9729napxr"; -"lexend-1.1.0.70"="5hrva48vpgfqxym4wb3ykq8czk8gkvhs"; -"lexend.doc-1.1.0.70"="zc8ra5shn7nhy6k1rvapfmi35h35jnc1"; -"lfb-1.0"="kqspj6w9i4bzbxcngqdfk8rnw33j0yyd"; -"lfb.doc-1.0"="ikbhi6ahzxlplvizphmpimf9ah2ninqg"; -"libertine-5.3.0"="xs46n4q5hv8n321ai81358spg2r3y6n6"; -"libertine.doc-5.3.0"="jlnf3pmkj1yxhgfppdxhrv5qn9lsivg9"; -"fontaxes-1.0e"="27hpaxcvnnw00g8g74snij3pzssk1xa2"; -"fontaxes.doc-1.0e"="39pckgyrm5w4nj3z5l4vl7ypizxbn7k9"; -"fontaxes.source-1.0e"="4cgxjx83a87dpmandkb36j4pjvmypvg7"; -"mweights-53520"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq"; -"mweights.doc-53520"="zkki0s268s1a23zm962ymbxl3gi7mzix"; -"xkeyval-2.8"="42rn633ggns36f6cxy4alii7mspfq0b2"; -"xkeyval.doc-2.8"="sa7qsydnwsl5s5yr0gdnmiv125j1163y"; -"xkeyval.source-2.8"="wsj7l9nya5753423srdk6dxzza8b0mf5"; -"libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7"; -"libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857"; -"libertinus-0.02"="hvyjkdpyb4i742jrp38jvihki874ynzy"; -"libertinus.doc-0.02"="00qv91migs6yq98sq8yzvgxyn2nfmnf2"; -"libertinus-fonts-7.040"="ms3pd16y9m57qr0cy7wj0diyvp0xczss"; -"libertinus-fonts.doc-7.040"="8binqqhkclivajvchkv0abz7k83d5v8f"; -"libertinus-otf-0.28"="a94l5s996h8qdf7wa2rvsjp04cr7d4yd"; -"libertinus-otf.doc-0.28"="sql0fnsk6k97vsx22smb32crqmn8c2vq"; -"libertinus-type1-57754"="alnbi8kk5q97jp3lhlvp3ydj1c2h6fsz"; -"libertinus-type1.doc-57754"="135mvv91v5v6p1c33q5nff38716g62fl"; -"libertinust1math-1.2.2"="pc8wfs8px04bnsgwkhbi46gs6synmvs1"; -"libertinust1math.doc-1.2.2"="v094dws0m9cv01iamdpirrwlvmdsf665"; -"librebaskerville-56018"="n7ld6vxki5zh7svbpgzl239y3gb9h2xn"; -"librebaskerville.doc-56018"="31pv0p1g3za88z7br5zx2jfhvpaij6m7"; -"librebodoni-39375"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5"; -"librebodoni.doc-39375"="hzihx71p9ggdp2pxrjvck7lhx2mrgdmj"; -"librecaslon-56003"="nd68dagix0k3fnssygsn1ghb6nf15qfn"; -"librecaslon.doc-56003"="sv1i8sfnqd073n6vrlajw509azn32yhf"; -"librefranklin-54512"="rb1fxs903zc5nnvhkza1dy8wn3j5j9ik"; -"librefranklin.doc-54512"="25nnnvx6gqjkbfl8bp0fiqdkr74dqb61"; -"libris-1.007"="fi5cn5ag6zgprgc0iqgk4iln6kb8knv8"; -"libris.doc-1.007"="82p29lh7cbavrshdx4s0pvqpgbvb21d4"; -"libris.source-1.007"="gd4aiv3pxy5as8cwfy9m1f4a8jp7v6d1"; -"linearA-15878"="fs5s95s31qczmlr0m3dk16c7gl4kpn3z"; -"linearA.doc-15878"="6b5jz6pfmv5f88gkwj5642jvd35ga3gm"; -"linearA.source-15878"="zdfpl9gwgrxwvs9ymj3vngfxdc23vv0q"; -"linguisticspro-54512"="034xndbaadw3kssnpam8sxmh3cx38c7z"; -"linguisticspro.doc-54512"="pc4glvhi0xsy43qx70c91byyc7f3m1n4"; -"lobster2-56019"="zn660hm4k3qcf6qixrian248zngnl70j"; -"lobster2.doc-56019"="q66bcdlbc5zb7pgq1wmpmrbc49ld5y5x"; -"logix-1.08"="6xhmmnnzkiyxvghzbrcky60885m7fwr7"; -"logix.doc-1.08"="4rgj31zlh52nd4za1q4vxz1vx15cfv61"; -"lxfonts-2.0b"="3s303f06r7561x3x38sy3c9nr80x8gdq"; -"lxfonts.doc-2.0b"="swgvazf325j99kjrcb94r8611fs6jmqv"; -"lxfonts.source-2.0b"="sxn1hl96bsg6ai8fafskxj8palg8vpk7"; -"ly1-47848"="ry7x1505pv1szprb9fi2x21s97m23ln2"; -"ly1.doc-47848"="iw3amhkw5vjcmrq43cwqg653nyc3ks1p"; -"magra-0.0.1"="wrcmmmbnb3h0pm8k76pz3q6qck3wiafg"; -"magra.doc-0.0.1"="m5giv23xgkx0h84a5j90jzxv7mlaihbl"; -"marcellus-56016"="qp4g991zc71fcii4mj70rw8ywkjmg14b"; -"marcellus.doc-56016"="8v3dhdlkq24vykk6lq67nfn7ppmxrkvk"; -"mathabx-15878"="qgy1qqn1bk43nk938d7bvbyj75v4fz57"; -"mathabx.doc-15878"="q0n88v61h3bqf0vvldd1lb03d6i1z8mc"; -"mathabx-type1-21129"="z96jirmwabbav354qlyphhjvxnsgjqxl"; -"mathabx-type1.doc-21129"="yq8n84cpw8kqvqivham4pqxq1740z36w"; -"mathdesign-2.31"="30x7w3a7v1654a9n5mcj5kdak8i2qxw2"; -"mathdesign.doc-2.31"="sgp7bi4m5480jvsdj9n2pq933cfjkiqr"; -"mdputu-1.2"="6wr48jgiyfprwwrla53qshm2817zrmm2"; -"mdputu.doc-1.2"="9lfn1jh6370mv6ic1gg36nlannbv73pf"; -"mdsymbol-0.5"="hjaz8ph3zrnl7x0545k3937yl5a0ghqh"; -"mdsymbol.doc-0.5"="g8m1964gq8gnn3cc3ij1iqhc4akwmc3q"; -"mdsymbol.source-0.5"="7hy2zpaw41c46i7kd4m65lhzgbpkn5xv"; -"merriweather-56365"="112s3drbic1y4b29why5dqk8y1nsby6d"; -"merriweather.doc-56365"="16sp2c11hyllpc2fn55yim0rdp9p7kyr"; -"miama-1.1"="w96rjiv6fhqv14lfl1w4rvlcy2z7x6dc"; -"miama.doc-1.1"="hs6gq60jbv0mvvfznhfrzz0g6s2l3rrp"; -"miama.source-1.1"="4khxj1rk9xzil5nlp19v7a9rxf9npq99"; -"mintspirit-32069"="wc4wyi1dfc7ql5sdcyycyqxjfir4g97r"; -"mintspirit.doc-32069"="w1ld9009591p4inkky5jfppjaiy0ja8s"; -"missaali-2.0"="96x2m5d8absim9r2hlmliy779s9vs9j5"; -"missaali.doc-2.0"="shxd513vi0qhbb9ddlhfamg6z21qi98z"; -"mlmodern-1.2"="0vrr6vqzzsiajmpr47dyxhcmicacwq1f"; -"mlmodern.doc-1.2"="skad815qs9a4na4hx1ikl9ms9g7y1sw3"; -"mnsymbol-1.4"="gmjs2ra3yb01bxw90gjdri3p6n7kbc6l"; -"mnsymbol.doc-1.4"="7ngazrr147x9gdadm651fv9hjr1f87i2"; -"mnsymbol.source-1.4"="7bf82bljx9w783jg3kibc5rn2l9j0ym2"; -"montserrat-1.03"="0jfqmisw57gkaz06kv0iq8ncfn9cj5hw"; -"montserrat.doc-1.03"="0hb2s3xrsawiza8qn21hwkji1sxxi4xz"; -"mpfonts-54512"="ar90vvz924ppxyfbqa3g7j7q9l4ddah2"; -"mpfonts.doc-54512"="kyij6dba277ysdwyd74bfybqi2bgm436"; -"newcomputermodern-3.02"="7bc96w8rmrrw01hsyf0xwvcywmvashmc"; -"newcomputermodern.doc-3.02"="jlhyrg5qd8c33jsb7899czmn9bp22cnm"; -"newpx-1.414"="dhhrp4ylaz6xk7z0n19lbp5506nkx7zb"; -"newpx.doc-1.414"="3kvjf9vzmbhmcsrkcqzp9yk6v32l9wgq"; -"newtx-1.642"="wg2j8h9igz4ch532q4csazvs412ymsjb"; -"newtx.doc-1.642"="p8x17blpzh4xc50v0nwhjw3ax9wb3ic0"; -"kastrup-15878"="qdr5cacl37ans3zd5jlzwr2356xxgswy"; -"kastrup.doc-15878"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw"; -"kastrup.source-15878"="13vj32k48f0ahs5694zrsvk953kxjrwc"; -"newtxsf-1.053"="hzxr78pc8bvqx1lmz5qqazaxnscw4zwz"; -"newtxsf.doc-1.053"="4yq9cdx50c88gi84l1cxilihs2xw88sw"; -"newtxtt-1.056"="chh34kv4xssw395m003j4pdnmw62b63v"; -"newtxtt.doc-1.056"="k4bq1vqqb394n6yx35qapgx846cp54lg"; -"niceframe-type1-44671"="0kr9sg5vnawjrd2aw8vbf8mg975sifl1"; -"niceframe-type1.doc-44671"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a"; -"nimbus15-1.013"="9k2ck6b5lj3n5fjlpmwxs589mf9ph02y"; -"nimbus15.doc-1.013"="pb7vyh76yjs5ywb1hcwpxid9gzdq082q"; -"fontools-58747"="4y719xzq79r8h09i5x52s0l8kxa53p3x"; -"fontools.doc-58747"="kdk0snq2hqcmv6j9si7jkx55nf7q3ma7"; -"nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd"; -"nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff"; -"nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279"; -"noto-54512"="sx5x2lf2y4c0rxhzrqc6l8hdk29agykq"; -"noto.doc-54512"="ws089havhd1gi0rs7mvdh6nb0f1npbxl"; -"noto-emoji-2019-11-19-unicode12"="4hgmkcwhy0air6pw59331ydfxbjj0fxv"; -"noto-emoji.doc-2019-11-19-unicode12"="viyj6daza3fqvdsj101l75v32v9xkv8x"; -"notomath-1.02"="82i6a43z09zmn5rxgyxpwiakb1rxr4z6"; -"notomath.doc-1.02"="d1jm948b38gr7m3wfpdjhh7idf97p11v"; -"nunito-0.0.1"="0q3czq86802h415shhlbf4zchl8bh2ba"; -"nunito.doc-0.0.1"="w3sh4bxjvy1bs35lsf3iqgj9dynvcb82"; -"obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh"; -"obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl"; -"ocherokee-25689"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a"; -"ocherokee.doc-25689"="p9lx15xl112908b004y0y6nlfxzgam24"; -"ocr-b-20852"="q1id788vglvlc7lsfr35gvzf0xmgr22n"; -"ocr-b.doc-20852"="lgwx91waimda6cdr05fi2jdwh4x18fqf"; -"ocr-b-outline-20969"="b8hhnggqxzs8285f55ixpwcpd7hb2dym"; -"ocr-b-outline.doc-20969"="bl1m2hny1zvs3wy4i4pndd2vxq7jhd9j"; -"ocr-b-outline.source-20969"="pf5dql2llykwb6x5a2s3scg4kc5r2f77"; -"ogham-24876"="22q1nc2fd6vv7hr7l4iryxi5bp6hqfnb"; -"ogham.doc-24876"="awnlhhzp2ch289lpnwybhz1k3zqwqq5d"; -"oinuit-28668"="n4di43fhkw1zcmy9xgxn7g4wl23qinyi"; -"oinuit.doc-28668"="s5hi4bk5yc19fb5lhmnc2vvxpr3ahd2k"; -"oinuit.source-28668"="caij5pbyylnhlhx149kl2h5sj4qda57z"; -"old-arrows-2.0"="7s0s5g2vif8hkzj768a0zgg46xjh57y6"; -"old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb"; -"oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd"; -"oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda"; -"oldstandard-2.6"="95xqbrjzizc2qhjaw30zi0x2h7w77cqm"; -"oldstandard.doc-2.6"="dmgzhqgqk0h11ix5y0gs4ci7r73cfawc"; -"opensans-2.2"="a68ghfiy4iiv9n6z78s956grswbdyf4k"; -"opensans.doc-2.2"="c70nwprgs35f2a7bvabdbsnmkayxyvd3"; -"orkhun-15878"="fmazxvhmc0r0m96ms6a234wj139g00iy"; -"orkhun.doc-15878"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l"; -"oswald-57253"="rajfni01q60wwf2vjvahqhndykkjx8cj"; -"oswald.doc-57253"="qxvy0gzc4nz345qvg2k8441lh86jqc1g"; -"overlock-56079"="ml25rmi7bi6q1yag7sj91zjmq49rmznd"; -"overlock.doc-56079"="vcm3nk33hlydpv1yaz2gw9038mk6gbcz"; -"pacioli-24947"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv"; -"pacioli.doc-24947"="5pzk9mjcdlzcnxwfkba4hzn23bzlhfh9"; -"pacioli.source-24947"="wwvfswngg0rrng6f3xck0f4qyg5m3shk"; -"paratype-32859"="877hrpz9vdgw6hsi6zf9d44bwnqjd6cb"; -"paratype.doc-32859"="12a3wq98sk2sb66rd08sx3f3vqvyqsr3"; -"phaistos-1.0"="5vv58ibkgjmpih67p2qgm9vdiqh4ag6m"; -"phaistos.doc-1.0"="z69jyiz7nm44yg9qy5vfhrzwby903g3s"; -"phaistos.source-1.0"="clhmyfpd5l1zx29352smmnyhal3lpa5q"; -"phonetic-56468"="1ha5wc46jqc3r9ziq7wmx0va8svybyjk"; -"phonetic.doc-56468"="zyqpk97ipcmi1898h6dxc7vhynblwzqs"; -"pigpen-0.2"="d6rr06gpzr27134dqh8rv6h6g4i9hg4x"; -"pigpen.doc-0.2"="gqnp68lkhnnyh1ib0sa34cxjg52jj0rs"; -"playfair-56005"="k691vzvmarxn1d8fz2d5hkn177yr89df"; -"playfair.doc-56005"="931mlzpd1mp93dmwdlzfzf7na4cxaiyx"; -"plex-54512"="clbqiqsl3i6y337mlkrda8nk0wf15nsq"; -"plex.doc-54512"="yf6z2wd095cln6lcg885b8qx6grnkr1z"; -"plex-otf-0.07a"="2k3j1snsf3d414k4pjq56d9b1vn2vh1x"; -"plex-otf.doc-0.07a"="z6clw20q3nfwzn087f3c3ifc4g2yr4kp"; -"plimsoll-1"="di983hrdafxqnqf406bgrph743kslqmk"; -"plimsoll.doc-1"="9rz48f3k6b03lvd585g8g50vn6f8xz1p"; -"plimsoll.source-1"="11ypgr9wnihsggwp3jrwr93yf93hjfvj"; -"poiretone-56070"="isnd3cmsm0ps7dh40sjqiwa9vrpc1d19"; -"poiretone.doc-56070"="k2g9vk6snvf66n1g6x2d4hd2d1z6cghm"; -"poltawski-1.101"="ipqjw12syp38hj1pw4b9g03kx07l40vn"; -"poltawski.doc-1.101"="g3shi2lp499x96az1f77y5bf8mhrgzl2"; -"prodint-21893"="vgqm1rmgqqvn7d4akab3x7jqz89kb0hq"; -"prodint.doc-21893"="fclf35r9hmfq76bvxwz5df0q18zms1sm"; -"punk-27388"="1bqwz8g3apk49mhg7m63qsynrxjxg76x"; -"punk.doc-27388"="1gc59v1xvh9sls0nr2ypmifripdspd1l"; -"punk-latex-1.1"="i1gqgbivxd8yl1rwjbssf2g0ib9nvb57"; -"punk-latex.doc-1.1"="8nzibnm4247rapxb9kfkyv5i49w19ipk"; -"punknova-1.003"="0q3dx65cyb1kh2iwbs9if8p6943m3gw8"; -"punknova.doc-1.003"="hjlldk6yr4hjh4chwcxmzq761h1ygwnq"; -"pxtxalfa-1"="rapvsla1cgyinabn1w9cshpm3y5af13r"; -"pxtxalfa.doc-1"="fg8arijrsm7gc3liyf3036pj014w0243"; -"qualitype-54512"="g25g7rmvwsrn41da05wmx9r1qbzh2xaj"; -"qualitype.doc-54512"="nm2vc0k5x3h5vks67zqak7p1i0qd6bqi"; -"quattrocento-56020"="9avifkc1mi6q3ia38624gwkrazgpmsl7"; -"quattrocento.doc-56020"="cpq31smkrbm84d5cgchbrihjilvskc30"; -"raleway-1.4"="qyqkxw2r0kjdc5ccq6ixlsjgv75gcmhv"; -"raleway.doc-1.4"="kw13y1533fwj7lgjc986ydb97plij1vh"; -"recycle-15878"="4fgfdk09nzljd5a6vz52nvv8b23xk8rw"; -"recycle.doc-15878"="3wazkwncn9gh1lpcax4hb8x38jr6ynxd"; -"roboto-54512"="whybwc6p6bzqhwdafwnjkvn8grf2yrq4"; -"roboto.doc-54512"="85mmkpnfgwann7dxrzphg39hswnlpnqn"; -"romande-1.008-v7-sc"="v5sf9cqkvd7wmbrrb48dffi59m048kal"; -"romande.doc-1.008-v7-sc"="bf5a3jzcqr74l7qp2im80r9x73rk3asy"; -"romande.source-1.008-v7-sc"="g2p0didwlqqf9gsdzrhmh0f9543wdwwz"; -"rosario-2.1"="mhjqi8h40lfdhv9b0q1qzla4s577l0ky"; -"rosario.doc-2.1"="az8qmdmm2fsrwygfmp4rfklpbwnkzjqi"; -"rosario.source-2.1"="pyzgnc976vz8grb6dx3cwzkgxv2i11i8"; -"rsfso-1.02"="3n75qwpji7z995wb2r3dqwrszkw6m61m"; -"rsfso.doc-1.02"="vga3jyv3s730mgx97mqw92igvvypbyb4"; -"sansmathaccent-53628"="s26h8qfkc1qkh8afc3wj5wg8rxqzbc1w"; -"sansmathaccent.doc-53628"="4rvf51yh5fg1sfkr1arxqbdyf81i9ln7"; -"sansmathfonts-51356"="90f8gdxlqiqx6aw1nx0hfbmkrs6aw331"; -"sansmathfonts.doc-51356"="wcnhx85h99brrisdz8yb0m34mv5qsvd9"; -"sauter-2.4"="flw49y2l5355jpvq7f3q3vannwcfni3f"; -"sauterfonts-15878"="kciqmij0w173na214ix5yhngc18likch"; -"sauterfonts.doc-15878"="x2lc53r2wnwrjfainmngafdsg39zyf48"; -"sauterfonts.source-15878"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m"; -"scholax-1.030"="zjh09ryiii8704yvy0bvmjii3q2m4vxv"; -"scholax.doc-1.030"="hp453hjav1bj0an3a8a8gvz1grmq1c54"; -"schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807"; -"schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81"; -"semaphor-18651"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35"; -"semaphor.doc-18651"="5lc0796kh9slmk1hrm3720mcnqjlqrcv"; -"shobhika-1.05"="rcrfsl2fd8mq929xv6zjlk91hmwvw85c"; -"shobhika.doc-1.05"="cb72lp8n0xrj4gvfhzy6mvr4jz44m27g"; -"skull-0.1"="4nkkh74v0mlyyriyhqwgk4la8l3mjxhj"; -"skull.source-0.1"="szzd5b98j04aj4f4aq5av7fs7316156m"; -"sourcecodepro-2.7"="yx2x3lbn1mc24xx25b4vpq03rbazdby5"; -"sourcecodepro.doc-2.7"="vqwr6xly6p3yds1la5cdn3c0hi95q2xk"; -"sourcesanspro-2.8"="axl11355zgfdm0xgscjnks9i18smp49q"; -"sourcesanspro.doc-2.8"="iyk2jh81qg0bq9j0zi8g35mypd0zcll7"; -"sourceserifpro-1.4"="zxfp95p1ah6yv6n7p0bdsvnmrpm42kjl"; -"sourceserifpro.doc-1.4"="qg32lg4s8ba732ac5z3gzc6i7iy0mdls"; -"spectral-57296"="s16pqm20px7mjdqdvgq2ikifrbimcm83"; -"spectral.doc-57296"="zayb8fwvv08a4wbvvk5z3jmp0x6pb8sw"; -"starfont-1.2"="phdad9yy6nvcxi7ym1chdvz0vvb309ag"; -"starfont.doc-1.2"="96h183mv5rmxmnkgy6766519cz5nff6g"; -"staves-15878"="9vcnfl7q4czfhyl3zxadig3nzdxg900r"; -"staves.doc-15878"="rn25a0syl0d0n89jp09906y30679mr7v"; -"staves.source-15878"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3"; -"step-2.0.5"="nr1cw7y05s41v9ndh46l6yi7g9j9ich4"; -"step.doc-2.0.5"="ym39n0yndkc213b0mckbwbvp9nwm8qk8"; -"stepgreek-3.0b1"="w7245whipp7l165zrl18q578bi9rmvc2"; -"stepgreek.doc-3.0b1"="h631y9sxkkq9wwj28z3cpk0h8307ksp8"; -"stickstoo-1.034"="1s3rabdgy9m5brnp0ldpinhsr7d1v6ay"; -"stickstoo.doc-1.034"="2ca34j220kgnmx9nmnvrm6wravidazhw"; -"stix-1.1.3"="sxfvkk30xb94rfby1kli4xny57xsbqv8"; -"stix.doc-1.1.3"="xa4z5gssrb74xsdc392ni8rww37c2phd"; -"stix.source-1.1.3"="m4csxq0wlzy246f1kgbd4n0sfgrcbnri"; -"stix2-otf-2.12"="ralamika1qnpmxphmgcx279l1nrr3ch7"; -"stix2-otf.doc-2.12"="2yzr1cj3l93phil3wnlww1iddz884f4n"; -"stix2-type1-2.0.2"="s0xh2qz3wrin8ajy6lzjb3bf1plw13v8"; -"stix2-type1.doc-2.0.2"="kw4qdl2zdnnsca05i25vdbai5ha61jsa"; -"stix2-type1.source-2.0.2"="yk64i2hkhmqirc9xcw9fkzf07909z1k0"; -"superiors-1.06"="gw1aw7hc05xzywylps60lzgwif3gli7i"; -"superiors.doc-1.06"="m2ppyah3wrk61cvq149bsvdgrjww94yk"; -"svrsymbols-2.0b"="wgq0gxpls40hwxlbxw65ykap0zkw8y1d"; -"svrsymbols.doc-2.0b"="na04gi2mhbqlxyp4jajs65vn9gx0rgc0"; -"svrsymbols.source-2.0b"="3f15gcxzd2rm4m95ikwvpnvil128i71h"; -"tapir-0.2"="sawmv4raa4l1x5sb5df85ds4l4w14ly6"; -"tapir.doc-0.2"="4kn8pfirjbny0k07r1vp1vqyb0r69rqi"; -"tempora-1.05"="b3l8kqm33s3f24smwljks341214ljsz8"; -"tempora.doc-1.05"="62ib93cvg5q0gvdi6bjv9xzg7x9q31jz"; -"tengwarscript-1.3.1"="krhlp4pdfk21rkn0bfm4ghg9sl6hh8qd"; -"tengwarscript.doc-1.3.1"="rj77kc9g6cpy4xnmn8gyl0c68wnrzirf"; -"tengwarscript.source-1.3.1"="8pkcc064pbw50jcn40hzzcrpkvd5hvn5"; -"tfrupee-1.02"="2srhr23mwajngahy1hcihhivix7x6af3"; -"tfrupee.doc-1.02"="pvmd0anqdv38a904hhafsr9mq5hy7f5d"; -"tfrupee.source-1.02"="sz4z2j5kzk9431pvdhj2l11b8qsw3mlv"; -"theanodidot-54512"="wq3wrhkk66z3q327fq4mdv0lw8wghm4d"; -"theanodidot.doc-54512"="6c7za0972a3x9cqa4gmj9c42bz9k7hqp"; -"theanomodern-54512"="2mv2fh328c75bffssj0l8dgdkaq519lv"; -"theanomodern.doc-54512"="qs48kz3hqbh0wv36m5ph30za13wmss3x"; -"theanooldstyle-54512"="ww6kab8p4jm1wsvlsn7hydl2fa1s3nnf"; -"theanooldstyle.doc-54512"="pn7xnn9dq4i2b1wdrn2qqzx7dx9cqrcz"; -"tinos-42882"="c1b84zg78hqp8fm15cgr59qrksqd5prp"; -"tinos.doc-42882"="09w8iyqc8538x1d7cm8jcwk1mkmv93vx"; -"tpslifonts-0.6"="6d6zngl99bgbzqidn4249bv3p3ykz5pb"; -"tpslifonts.doc-0.6"="64fr89dkcr0zzxcmshmhpczvbc4byp22"; -"tpslifonts.source-0.6"="0267nah6ffiwph29ay6cpfl9zqm4vgbh"; -"trajan-1.1"="j8dsrxip2s58sgw90hl98v2w9r106cz6"; -"trajan.doc-1.1"="kwiwf13cr6c6v10vd1irq5srl82kvl58"; -"trajan.source-1.1"="nm5fpl91wscxri9bgcvfhmyfqrryvdil"; -"twemoji-colr-0.5.1"="2vzfrpljxnijw6ds3z2a0ak3jgsccri8"; -"twemoji-colr.doc-0.5.1"="k6mjhjkxlrm0s7zjf49w36gk5cam45pq"; -"txfontsb-1.1.1"="f8012p25mf8n4zj4nkmgpvgf54jb9i52"; -"txfontsb.doc-1.1.1"="r3xzad7mqh97g9firmqvb57bn44xa8cf"; -"txfontsb.source-1.1.1"="4zypgg4dchni1zh8sx4wh4sb5fdh8x98"; -"txuprcal-1.00"="8yk9lvdxj1ap0lcnywllxhzdz8hplk78"; -"txuprcal.doc-1.00"="pmlz2hhjd7a2q3bdbz01yd61w3hf2i79"; -"typicons-2.0.7"="0mmcwr2xcx7hdb4yllndrzq7bxava3yb"; -"typicons.doc-2.0.7"="6bcmldiywvwfhknmdvpj8fdz0fmdizkp"; -"umtypewriter-001.002"="4k8n89mabkcc3pyc6vhj47hvxncz40zm"; -"universa-2.1"="1hdi5bjzg9w8ipll8d3hdjxr23adcg16"; -"universa.doc-2.1"="pxdcwsm75lji29nggdy53wv4y96ixqjh"; -"universa.source-2.1"="adayns5x3p33i2apy5q7582ahl9kr5wq"; -"universalis-33860"="fwhl8bzgbw53ka6j71zbpc2fxsb20896"; -"universalis.doc-33860"="4w17vpjjhk2wwmc4m6z2n67814fdlrdx"; -"uppunctlm-0.1"="snyyw4gj0736fqykkf94fhkp9d31ml9q"; -"uppunctlm.doc-0.1"="h6cblhxd6xb6nnp3szb0fwv1r7pdwg99"; -"urwchancal-1"="kk9r6rk48qqq9s8l4k42fgj6c84912bw"; -"urwchancal.doc-1"="z0p6cn21n3cxi4mjijy39z9hacfhkk5l"; -"venturisadf-1.005"="nnn3pq2sx0rayjhhsh2pyavkf7c4i7jw"; -"venturisadf.doc-1.005"="gjzclw11zah2cpmgjdpknflrfsaahq9h"; -"venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g"; -"wsuipa-25469"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz"; -"wsuipa.doc-25469"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm"; -"xcharter-1.216"="dhlax11idmxycjh9lcjdg2x14a48yi9c"; -"xcharter.doc-1.216"="nfc4a592qy84xh3rl76yzarihix6l8gk"; -"xits-1.302"="p0s2ycdklzp3nwp8ix7zfq30hp2wfgwj"; -"xits.doc-1.302"="avh0lr47xhdnfqpcxbjxlcp9q7q1mi59"; -"yfonts-1.4"="i2aacxlhsnkbgfb9i8p0sdwb57qv6gb6"; -"yfonts.doc-1.4"="lw30qiavn4l0ikg3hckps3swjch3wd6s"; -"yfonts.source-1.4"="rcvacgid92pk4m2mqy158gr20jax4835"; -"yfonts-t1-1.0"="b1j2a6sc3npjli2k0y02fgl87k5kq7xb"; -"yfonts-t1.doc-1.0"="say9m82dcmna0f9g1h4ng5ihjkpzwh00"; -"yinit-otf-1.0"="8dd8yhd7fy5wvsl9qnshkvm69g9wx1fj"; -"yinit-otf.doc-1.0"="7rhfxzlfdwl3g0bdlxwsyzzf83f24xx2"; -"zlmtt-1.02"="46x1539n1kc2jqywf2jndg9dzq3zxrvr"; -"zlmtt.doc-1.02"="3yk18czbymf6kynf2ir44b8bh9jyirfj"; -"avantgar-31835"="6x48hsg7wdw4qmf0pyqvb7zmqpn6izqr"; -"bookman-31835"="r9bkd40g0hwcbjhfa2n637i0qyk6ahyf"; -"charter-15878"="1iha6fak3i1mwa6pa6fps80vzik65a4c"; -"charter.doc-15878"="fvn827jh9gfdbs6gnnm83s2yialawz7l"; -"cm-super-15878"="wqamwks565frzn4nf6pq9skasdx5jbmy"; -"cm-super.doc-15878"="246p6vn62gq68n7bnxh1iz258gn3wi85"; -"cmextra-57866"="kqywbrwmg5w0xj0r0qffh1y9z9hlvlaf"; -"courier-35058"="f3rhv0jy01gfhn1rdnai7693y2xy90d4"; -"euro-1.1"="mpzw5yyqlyb864cqx4wczdnbln4sv4b2"; -"euro.doc-1.1"="82srlwf5vlsmfpwn0l7c7j4wd9fmvbqa"; -"euro.source-1.1"="v5w06s1hfni20mg1flnwgpkr5m49vqvf"; -"euro-ce-3.0b"="csi0m4qrppaz6n7pj6kn8ph63d8m24va"; -"euro-ce.doc-3.0b"="dw6qxpnmbr27k6vzv9gx9i06wgc28rhq"; -"eurosym-1.4-subrfix"="rqclyanzsn8f4ylbhvh9garshg0fzf3w"; -"eurosym.doc-1.4-subrfix"="7abbwvvm5riykgm6mq7hhjxd2gz0ljz3"; -"fpl-1.003"="m1b15fm8wc0lm0x9mbryz69x2dkczkmp"; -"fpl.doc-1.003"="bjc01f8vs5f3qj07my033203rn1na269"; -"fpl.source-1.003"="6rv41z6xg652nkli0flj3102na8k7k0d"; -"helvetic-31835"="q4xi3bdpp7195sqlkbfgnnccq879v86f"; -"marvosym-2.2a"="pn8zahcj87ab0rgiz9inp97randgz890"; -"marvosym.doc-2.2a"="wqd4660d0s4kxgasi3gv09fbjnbqmwsq"; -"marvosym.source-2.2a"="zygnnzkxxsfxvhnkvkq4v6gis1k7lc6h"; -"mathpazo-1.003"="d950j9d7ywwx0air9b1awwxr0a7486qz"; -"mathpazo.doc-1.003"="zna30q1bzd255h9yjnf35ldaiql0b142"; -"mathpazo.source-1.003"="0ly3fqq1s2sf0zva0jx3llbwkqjm0jv4"; -"palatino-31835"="xp5kg58y1lzsqba3bv9dz4f8rqi3xysd"; -"ncntrsbk-31835"="r2sgybivplsnj8iqwd62wr0ixhlc8x13"; -"pxfonts-15878"="9lxhr2mzcx8qkbhqgqx3y8a4pyhfad5a"; -"pxfonts.doc-15878"="q0zqikbb5d4d8wma6xspga1k20bjx8dz"; -"rsfs-15878"="c6wq6zd58x1dqi2l6p4ljkj3p30lfh1y"; -"rsfs.doc-15878"="2rq51dizzivym4mjl4x7lhw7mg6xmcgy"; -"tex-gyre-2.501"="bh1inc34f90vb7wh0r9drdjalhwa71cw"; -"tex-gyre.doc-2.501"="8mvblk061marhxqwf21jssgpn9mgvqs2"; -"tex-gyre.source-2.501"="lqv1gkn02k8yr5n4c3h80sq30f9iggxf"; -"tex-gyre-math-41264"="z84v3wzsjwjx7b6wnwnpqmz7xy5v2bic"; -"tex-gyre-math.doc-41264"="41g7sn49g1kxa1dmy5vrv0fzk3rd4915"; -"tex-gyre-math.source-41264"="0wkvmjwxy9ws1h9j1rn0j57dah6z9jvm"; -"times-35058"="jjlr4lksbyjb8z2v21yy9ig0w6x246vk"; -"tipa-1.3"="h92fnvz5cv34vdyrpq52pn79z9lq6s0l"; -"tipa.doc-1.3"="s923q6n8h73f74y77cf171xj9w3mrd69"; -"txfonts-15878"="5fbs9mb86nll7k3j9d37p0bfa08b8nb1"; -"txfonts.doc-15878"="80fli8zzv88yh6rbv99dzsihxbrhmxkp"; -"utopia-15878"="cq5h07i2v6n1d5l4x2gjb0qn7594w5f9"; -"utopia.doc-15878"="sla3qhf9ks0020wq82iv1d3mivpbx79v"; -"wasy-2.5"="04vral6cxg9d9yqvm6b1hypgybrasbpc"; -"wasy.doc-2.5"="04z8v3n1qqsig0yg0qnisbrly6zkf2gw"; -"wasy-type1-001.002"="9nrxjm30l4lw800p9vq7kzw7fiviybsv"; -"wasy-type1.doc-001.002"="zbifgs1xxa0nkggrf3yk25pkyxa82hdf"; -"wasysym-2.4"="s0vrrk3zl383akayli6rnqma3r3xbqih"; -"wasysym.doc-2.4"="pvkpxwgdwjhqilk6lnvkzwhf8srbnyhl"; -"wasysym.source-2.4"="y43dlzdnavkbazaq47hcm1dympkwqiya"; -"zapfchan-31835"="4saylq91v4il4ch3cp3lw7dv8x6sf296"; -"accfonts-0.25"="vnff63f9g4z5bsgrila75lr6lhdl3jhn"; -"accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab"; -"afm2pl-54074"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y"; -"afm2pl.doc-54074"="4kms0bi8801giwdiyk5d0l7q0rdsvqi0"; -"albatross-0.3.0"="r8krwh8gj7d1gri6hqb7llqf99l63yr8"; -"albatross.doc-0.3.0"="mndw3kz8ghb7ld2hx8ac84y4b4zi14q0"; -"albatross.source-0.3.0"="ja07276rkc6zbfj9m88gmvrq4l4gwfpi"; -"dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9"; -"dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x"; -"dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk"; -"dvipsconfig-1.6"="llmyk9rhvxs90j3jbjrqz76dxxvzdyp4"; -"epstopdf-2.28"="45cbq50lfbqnlmfp19v43ipzk8pv1jrg"; -"epstopdf.doc-2.28"="ffp11ppmlcb9ri1jdmfjwnaf226j4icd"; -"fontinst-1.933"="4ybgkvxvi1xy6jyw9cc8w3c51kmsmbd6"; -"fontinst.doc-1.933"="az11s0n9q3s68v02y4h2hx00fx8r5hxd"; -"fontinst.source-1.933"="cvbp2ml5kiq35qjnyzbpi8p7h1n5m2l6"; -"fontware.doc-57972"="r20lpx0dy3lc7lrz7dzdsyid5h40j648"; -"lcdftypetools.doc-52851"="c6agyhm6yaqg7gfnahfy124cdkln32cl"; -"metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq"; -"mf2pt1-2.6"="c0pp9hwb6xn5ka9is576ml3cy7dkliff"; -"mf2pt1.doc-2.6"="ml4dcrc2qy0d6wkdqf0gg60719hcm3a1"; -"ps2eps-1.68"="ja294cdv9aagllqxjbckv50b13swxlvj"; -"ps2eps.doc-1.68"="00q5228fgcsw6rbadprynz6zdjc6y2j6"; -"ps2pk.doc-52851"="k23d42q6071yrh1jnzxdw7yx19nbk5ac"; -"psutils-p17"="g8ci3q98i9cvpw1s7l3mqsv39wqx3gac"; -"psutils.doc-p17"="6zkafw71fx43y9y5ywycmclwldd3skiw"; -"t1utils.doc-57972"="wp2nq73hxfpn17h4m322i0czyxq7616g"; -"ttfutils-57972"="hzj3dljvfr9ypzpjgpwxadxf225yi8zj"; -"ttfutils.doc-57972"="klki66wy23byskpncy19gax2ycsp1h6s"; -"aleph.doc-57972"="lrnjqxzdjxysc9wd9kr62alr4pbz93gx"; -"lambda-45756"="ykxajgkmkbqp7l79c4bcm5qg4xnyilxp"; -"antomega-0.8"="jxriw18jifvf24fz8nqql5izp67p8z5a"; -"antomega.doc-0.8"="q9jb5ks7gfxg5gjhkpng5bl0wwbwp2ph"; -"antomega.source-0.8"="l2gs7sapppwxiy712i8vkwfmmc96ch1s"; -"omega-33046"="0v7wvg0vkrwbarcxfnp8k6w09j86y1pv"; -"omega.doc-33046"="zily3hjd30g14zrvj67hdp8nkxk9l5g2"; -"edmac-3.17"="29h8y4lna3sv0k7wqmbgrb0mvdxwz330"; -"edmac.doc-3.17"="il4k6vswcqp00005n0084nf99bwxp809"; -"edmac.source-3.17"="90wdkd3rhm8ymi2w9hb64acsy2bzqgg6"; -"eplain-3.11"="qn75j5ylrpq7n758wgspr9bgisd8bnlz"; -"eplain.doc-3.11"="81yx3sj0nzw7l8q0xxf2cyqkvipfcg9m"; -"eplain.source-3.11"="fn1f737csi8474xf9dis8azwbh3478sq"; -"jadetex-3.13"="nzij63zrphdvv457fn1b7yl1cghrig5d"; -"jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2"; -"jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9"; -"cyrillic-47350"="zax5fp5a3p2zd3bhbpng70sydjxm9i1p"; -"cyrillic.doc-47350"="3risjsh9kgr6pk9d0f082a5ipq1827f9"; -"cyrillic.source-47350"="cmq6669b4zjhvhxn0lxq35h4b606yhkb"; -"cyrillic-bin-53559"="5mgqkf2kgqwx6fpdcvc8v99y6lc2cc2x"; -"cyrillic-bin.doc-53559"="hc8x4l1yd2cjqzvjdhsg3jbz8xnmq1gc"; -"passivetex-15878"="arr43134jllipw1jl9cbrgnnk1gav4d9"; -"ulem-53365"="d8shv0p8kmjd0rii3qljds7bd4jia6c1"; -"ulem.doc-53365"="3sdwrmm0gj0h8qq3ynarqf6vmk46v623"; -"lollipop-1.07"="c71n12rvjhafkq26bca7q7hxjy5b9xdv"; -"lollipop.doc-1.07"="18wdsl5kq7xwsqhr6v6ldwz66b8xk60z"; -"mltex-2.2"="kkc5ssb6rd3f4kig16sc30npjayw4ab2"; -"mltex.doc-2.2"="qqr7ia4wp66zgasb8sm0bd0qclw6zn7l"; -"mxedruli-3.3c"="f866q8w776cr7k7mxll72va7zb0avsl3"; -"mxedruli.doc-3.3c"="vhcvl3k5lzb1f0g0ghz1rf3cnsy0cp58"; -"omegaware.doc-57972"="xb4bkq29x4n2sv97bkk1kkqm20w7qxcx"; -"otibet-45777"="66pn5bmsfw3d7l1prcr8p5v6w93lqfrm"; -"otibet.doc-45777"="i308lrxhgqi1gpsh5b5961xisbb9i3si"; -"otibet.source-45777"="hspwgiv9bs4ncmy1yi02jw8ghw2lxcpm"; -"psizzl-0.35"="qx0mhll90g0l0aqzfsjqbn43gxfincyp"; -"psizzl.doc-0.35"="pd8v22iq76j5gkkv9k286yz9i71j8xcn"; -"psizzl.source-0.35"="9i1m36bp80bif8k74q7572j311xxbjlq"; -"startex-1.04"="8fn0wix7vb3xqi2b123z0xlxfvszfbfm"; -"startex.doc-1.04"="mp7rx9aha0622yfrpnm1w2f5pij89nim"; -"startex.source-1.04"="x6bhcd76532n0sfy3cs74whhyw6gy3p3"; -"texsis-2.18"="0mlgxg5a7q80hvpigvz6sl2f6lnkfmls"; -"texsis.doc-2.18"="wawynbj4gxlxbcg8wddrwdlicnlhia14"; -"xmltex-0.8"="0i9h1jakwdh439bi4wq5i4mzfcgmyd8p"; -"xmltex.doc-0.8"="7xl5q081558wnfdyb2r225kckb0wd32x"; -"xmltexconfig-45845"="bm9ibaf0skn5g3ykwpn8gyg8hr80v59v"; -"bartel-chess-fonts-20619"="2mdy450109a2lz95qv50y6wxhhif4nr5"; -"bartel-chess-fonts.doc-20619"="xj41i6y3ssxdpqy3j60pdx2scsf3qx35"; -"chess-1.2"="j9hxdp5kz4dv6wwgy6azrw6yjhdq7384"; -"chess.doc-1.2"="n9xxs3zgzz1vhl7y1d8qxk4cj8fglhpx"; -"chess-problem-diagrams-1.15"="yiqgdwhfqypmf5i21s0r48614jzl16gi"; -"chess-problem-diagrams.doc-1.15"="aw911cwfw6nix4s2597w1nxa5sb7gf1j"; -"chess-problem-diagrams.source-1.15"="4jflmd6p2dxlh63dmc4d96c0qga3hcgk"; -"chessboard-1.9"="366wmw6jypbcg0dd3p6blwf1rzja917a"; -"chessboard.doc-1.9"="khnp39nrlnmca5sdy0q2n7f1gr0f3wpj"; -"chessboard.source-1.9"="9hi3xxi5iablrhcpkrc7gwa0axwmbipc"; -"chessfss-1.2a"="is60vi3pamq0qzj8pw0jvj4prvgbzxp2"; -"chessfss.doc-1.2a"="1ia29r7y1ja9d5hx7z17bk0qw7lgz2mf"; -"chessfss.source-1.2a"="r4dzyg9nx44ajf01kbj0qyfg2r4dawc5"; -"crossword-1.10"="468f516bid782g4626jqaiz2f4mjbrba"; -"crossword.doc-1.10"="p13jlddsa4j9mv6vw93hdaf1qswly7l5"; -"crossword.source-1.10"="ya7v7fhf9fykzh3lvl4v0cl1zrjrjyfa"; -"crosswrd-3.0"="66h0iyrwlpkjnasfa6yrc9wsia5cabj6"; -"crosswrd.doc-3.0"="2zik63fs6fqan2z5nxhwz081zpxg04y8"; -"crosswrd.source-3.0"="mi1kqgw3qcy4bj60pz8wl6ym6rf1i8z9"; -"egameps-1.1"="i50d5ijmgapcxf1g1zp7gzv6llx9m68k"; -"egameps.doc-1.1"="8rz7w6n2ip64xgs7i4qrvgc14q1z4p5c"; -"gamebook-1.0"="wnylf38d512bq82hi5jwsf9gxdlb9gai"; -"gamebook.doc-1.0"="f7p5nzs88ps42vwnhcph7vd36s5xfrxg"; -"gamebook.source-1.0"="hgbz9v0wg5kni2lc43yb179b8xqh8mmr"; -"go-28628"="an0cdspxjbbirkz0isbyvknics2pmkmg"; -"go.doc-28628"="17frpsmqhyai4y23xb2zm9qsl18xmynf"; -"go.source-28628"="lw82s14fw0y1yfdhvmmhwy0msyawbcal"; -"hanoi-20120101"="ini1mf0dqm44vabqlqqiw52wpcx3qimh"; -"havannah-36348"="ypcxnwirfyjp28wypyz8gp6zysb26cn7"; -"havannah.doc-36348"="4spiw588y9cw8vvr2b81qp0q61kfbjjf"; -"havannah.source-36348"="jkbnv839cn0i9dnl2v0v9djp630cdzdk"; -"hexgame-1.0"="w9isbb0mqra4kkg0cflryikhm172b7yb"; -"hexgame.doc-1.0"="5xr1vlivrwzhk0zrb2ri8lfc5n1i3zcq"; -"hmtrump-1.2a"="k259b7jj37dzjaavs8f89x26h73sjcgz"; -"hmtrump.doc-1.2a"="5h45jrv7friz8k0nw4s29gmqifnc4q4k"; -"horoscop-1.01"="bmr14l8aq6wrxs3lf5ic3rfxr72krhsn"; -"horoscop.doc-1.01"="s4rhpszv9k8ayg2p734s5xhqi8kj7l9n"; -"horoscop.source-1.01"="1lxpnardb0sagmna2g9yxmkzr51whr5s"; -"jigsaw-0.1a"="vgmyhbyk2w98cw1ib5kfipsvnppmzdfk"; -"jigsaw.doc-0.1a"="wkl0n9cdf2bqamgwk8kw0b7cggfkjkmz"; -"labyrinth-1.0"="yafwn22imcs3827ilqkwh5kggfsvsk0s"; -"labyrinth.doc-1.0"="xm6sjrs773g8l7x04m6k16a8vzb8nfd4"; -"logicpuzzle-2.5"="7ynzg0ycgp17rqxf4wv3vkxbkwwyh9c3"; -"logicpuzzle.doc-2.5"="snzhcidhpnkjwbrb25lb9g18bc13bl5w"; -"musikui-1"="888sbpw1xvg39606w7xl7qy1f32n9vpc"; -"musikui.doc-1"="v9fa4l7bl6d4dcvcqz6nbpmz3js0jbvm"; -"nimsticks-1.1"="7vlx62bxfwrjva5gw3ghli91hk34lfn8"; -"nimsticks.doc-1.1"="ajzb6jb0whvhbdr9xcgd4mzs6x724da1"; -"nimsticks.source-1.1"="yw4h4jrh1flb6bgxv9287ckd01pc60cp"; -"onedown-1.4"="v4434vhkwq56himsgwymcjjm3812cn94"; -"onedown.doc-1.4"="sbz59m5fjy7gbgk8fgp3j2f8pj5dkq4j"; -"onedown.source-1.4"="a57mbsn5qc5qx4swvysy5m82qvnzcdyh"; -"othello-15878"="fp9s19jk73qrplyhjnicv8q066a98jli"; -"othello.doc-15878"="q1dqp0zdi9ixxchxnlk60zwfyszbx0ry"; -"othelloboard-1.2"="ymadc4vpkzc0lkl2ws340jf5vzjiq1i9"; -"othelloboard.doc-1.2"="1vi1lc9c75r9qqrhmjp2j7d7p94asbv6"; -"pas-crosswords-1.03"="90v61cxl5ab12bvgnj4k9dc5q6v3zg72"; -"pas-crosswords.doc-1.03"="pm76nswngl127k5c2vwm9nwscci1dcng"; -"psgo-0.17"="487m1ggdz7a554viflmp4cg2kgdw9ghv"; -"psgo.doc-0.17"="cw2v9zzpbmqqw8k8hdq0la2dhdggip3d"; -"realtranspose-1.1"="pkzqw0yhk215ddxwj6sjdss531vxdi0p"; -"realtranspose.doc-1.1"="cwxhdxg5gc939jifir67vin798qrcvb9"; -"realtranspose.source-1.1"="ynbps4pnm2ll3iqkhbqhsflpx0wsydk6"; -"reverxii.doc-24976"="2w8l7rs761h556il3d875k0sc86xll98"; -"rubik-5.0"="9wi8kxm1rfbqdmgd08bkfmmcrxh6qglv"; -"rubik.doc-5.0"="byp3r482d99yvd7wj0gw7sy8azki6srs"; -"rubik.source-5.0"="p25x3gpqgyq4hsvgksdspy16w6h593kr"; -"schwalbe-chess-2.7"="dp5z6xiwac5gf56wv8f8jiapm8izw3qi"; -"schwalbe-chess.doc-2.7"="dgv1y4nyn5xc01xxkda7g7294sim7xs6"; -"schwalbe-chess.source-2.7"="pbjki3lq6xnn4aw0snggasankh18yi0d"; -"sgame-2.15"="36xmv070y7wzwj8qj24y5q063v2c1l7f"; -"sgame.doc-2.15"="pm7psgqwg5prx0qfj6wh234raqw849wa"; -"skak-1.5.3"="0wa6kcvgwqz6cnjrf64x03hlbd7yppax"; -"skak.doc-1.5.3"="p8p72b9f2jll6hym1fzrymj7c122z42w"; -"skaknew-20031"="8by6yv9rgn4zbzlq0szcm4yvg8pqfaf6"; -"skaknew.doc-20031"="0p383qca6f0f56skhgvjcwprpb04gldj"; -"soup-1.0.2"="6h4bpg774dpkaxg69k7cyr7pwffk490m"; -"soup.doc-1.0.2"="w67szbnb93rzkm2mznmid3cy5rxzghbs"; -"soup.source-1.0.2"="zna9fyn7n1p5rh2a9fqyvbvsj5pdc3vc"; -"sudoku-1.0"="584gyns58jqsm1ya8l1z63a1wifrgnlj"; -"sudoku.doc-1.0"="rsn0w51h0s7j9w988mmh2q455cx7amqw"; -"sudoku.source-1.0"="cpylv1bwk5yjjfzx8kfz3nha8yfjj2x7"; -"sudokubundle-1.0a"="glfg93s63j960dkz46l4piy8bbs6vjsh"; -"sudokubundle.doc-1.0a"="idw39v50081qhj62hd4w3ylgs6hrvvc3"; -"sudokubundle.source-1.0a"="lih9zbgw5l891hmifvpbdjwaqx70r8dj"; -"xq-0.4"="l2fd2aag0av7znzaw56qbwyp024yx9ql"; -"xq.doc-0.4"="rlabrx8297ad8p4sb4pqkv1lzxiihmyv"; -"xskak-1.5"="r0n5kgq1vnbc9kpqbj4i4c0713hhzgvd"; -"xskak.doc-1.5"="zzqkhgfjsbrllhn13qvkx2v0zarqz2l3"; -"xskak.source-1.5"="5z0q23fhwbxrz4jkfpc9ishdjnxn9k4m"; -"adtrees-1.1"="252iwghr89frhrnm3njrz1l0i1qsjq3q"; -"adtrees.doc-1.1"="4x26n2q1pwdxmwd1v15jp6mbrwwl9l7z"; -"bibleref-1.25"="yxh497yp2dqfy79xwsdbra3ajzf3lc16"; -"bibleref.doc-1.25"="dxbjr449ppxpacbj19dmm8jaklz2drdb"; -"bibleref.source-1.25"="0sflmvg5vbhkcc1cipviv1p1w1vy2wjc"; -"bibleref-lds-1.0"="adlzl3qk74vn1z0zdqn9cm6xqbwd8j6x"; -"bibleref-lds.doc-1.0"="cxvgzvgkicpnam43l53vfw9za8gigszv"; -"bibleref-lds.source-1.0"="8ndhf2vnjjii0xywr848janqh7xzdhn3"; -"bibleref-mouth-1.0"="nlxylwgj6nmzf4ky26hamhvsnm3g4h2z"; -"bibleref-mouth.doc-1.0"="by1z7x2h6xmjgnkj302bjgds4jzrjf7y"; -"bibleref-mouth.source-1.0"="drlwpv0xvyrb259ipq71p68929cmp6ka"; -"bibleref-parse-1.1"="ddxzanvw07cnj984ylsmjybwvyl41sg3"; -"bibleref-parse.doc-1.1"="jcsy831ih2d4scdsydj4m9mzlyahqlip"; -"covington-2.5"="qbjrq2akqpc1h5xkqv93hbfp0sjyghym"; -"covington.doc-2.5"="nfif3arnmkhfjnxm9fk1mjgsvm7ccf3q"; -"diadia-1.1"="p95dkjaf17pn4qm3syrd2wm4680qxa86"; -"diadia.doc-1.1"="s8q9nnwajrravg7418bldainfxpm874j"; -"dramatist-1.2e"="r8ldaql5igwpsv1bm35jgcgpnlr817m1"; -"dramatist.doc-1.2e"="15bnkrhgbs4jpsk04y9fib7yvvsb83kq"; -"dramatist.source-1.2e"="h52a16aza42dx50gx6lagzahm1n20xx8"; -"dvgloss-0.1"="57wp58gxcs0hv560zj1g4clhlh0k7ssc"; -"dvgloss.doc-0.1"="kr2ndi6s5i1k7grvwmkxzhdrmqwzrkw4"; -"dvgloss.source-0.1"="j6kcgrvqainc1z88amsl8lnym06kw3lx"; -"ecltree-1.1a"="iphdmz9nnnmyvwvvq5hflvbi0xf50wxd"; -"ecltree.doc-1.1a"="qkdycpbl0616mn6495300qcc50a6w05a"; -"edfnotes-0.6b"="dlhivqz4bniprmv8900wh88piiv58cxw"; -"edfnotes.doc-0.6b"="kfkm4q1zf83gipgzb00r4d5fghy9zq2s"; -"edfnotes.source-0.6b"="n5dyvim1rvv5dmnpl8jsmc1r43nll8vp"; -"ednotes-1.3a"="dmv7mq84rw9y8fcvnyj4jspb3qn74h2y"; -"ednotes.doc-1.3a"="bivfyfj5g56m38z4b8wnzd34q2ks4lxg"; -"ncctools-3.5.3"="9ga7xf3c5k1n0gwiw42bs8zda97596dh"; -"ncctools.doc-3.5.3"="9p2ds66immwv89zxs8kn3z0dar3k2dfb"; -"ncctools.source-3.5.3"="f40j4wcw6x5f6r43bjnxyhfsy9vj623k"; -"eledform-1.1a"="34050azcglr1nl4ppvq8f01dffc3hlpm"; -"eledform.doc-1.1a"="qdp4sms5cf7wzi1kdm49fgifs3845whs"; -"eledform.source-1.1a"="53dda59p3czslircl0a23d1dqfh2r45k"; -"eledmac-1.24.12"="327rpi6mzwx3h2nln4zra3pnyfnmg92a"; -"eledmac.doc-1.24.12"="3hygl6qp9sf8gnn02p78bny40bnnmgc5"; -"eledmac.source-1.24.12"="kiqy5wz8qyzxxszhf6k37ricjh13asca"; -"expex-5.1b"="xl0jyizia4cwch1z399dl0r5xz4anxgy"; -"expex.doc-5.1b"="a903i8yj7kqr49jf3f40rrf74j4bn1cb"; -"gb4e-19216"="bzbpagrikdh6z5pbs416l090s559v7i5"; -"gb4e.doc-19216"="72mcbwb79gj584p24lpxbvvqj3pbr77x"; -"gmverse-0.73"="9cx4zlykh23lwblr7q2hbd8d5dffvw8q"; -"gmverse.doc-0.73"="zbq9drljrrh0ms8k5z7ndldilzgd2l0w"; -"jura-4.3"="bparkzmzy3lj0ddqiaw3696msam3v0b4"; -"jura.doc-4.3"="hzgy1v1yl2yrnvi91j2hbs8jhd1x3djh"; -"jura.source-4.3"="0z6qb08mpblnl0jhjx8cmhk0vrciz0f8"; -"juraabbrev-15878"="mb4ikhwg3fjpdrsf8azzvy964gihs0ja"; -"juraabbrev.doc-15878"="i9w4ykaf8q152pc6zag4wykdlfvnkl0l"; -"juraabbrev.source-15878"="9ixz4m7y6cslk2977n0nh792nhqa6l6s"; -"juramisc-0.91"="w2nzviyg6498v4x8vqqp8kc9p2cr2fyb"; -"juramisc.doc-0.91"="0yczb9jcva6i9wvkdpwfd0l9c522krnc"; -"jurarsp-0.52"="bwldii418vmf3b37gnm56f65bzyjrfhj"; -"jurarsp.doc-0.52"="2rqnnrbk56p5i1bi7r9l5y9q8mbdmiip"; -"jurarsp.source-0.52"="0gwifinaym6yjkimyf2m3dg10pld0i4z"; -"ledmac-0.19.4"="kxh78l0ap8zr2rncqg5j4vl7h2f7ajb1"; -"ledmac.doc-0.19.4"="qqziv44yv5fzpk5dnfhjrzdfi4v63558"; -"ledmac.source-0.19.4"="z6n9h86q7yk9rfq87v6ks03b5kqw7cyg"; -"lexikon-1.0c"="ifdy5rb6ggar6w643y94y729bbn75h41"; -"lexikon.doc-1.0c"="52hidkd52nx6dz7ga1lipv6r9l3kcnnh"; -"lexref-1.1a"="4av5iad393sb2vqplzfra63wl1g3pwpd"; -"lexref.doc-1.1a"="3nzknrs8c80yxhw9hf0qpzgx3lpj4hsg"; -"ling-macros-42268"="166zs29qcy5bs1ml9bl5q4ydvx15yhlz"; -"ling-macros.doc-42268"="7b31g3wp6vks8b3h01pf2ifnqgr1r1rn"; -"linguex-4.3"="srm8cr4dr0s29ydpvwf2mhm5gplgv18q"; -"linguex.doc-4.3"="w7jgr0hkj6m368p6x2l3b37m9px04b4f"; -"liturg-1.0"="73vvqhnk6ll3ibzl2gk7znkfm57k0286"; -"liturg.doc-1.0"="r0i6252kbg724crlphqc9rii0xq45jzx"; -"liturg.source-1.0"="8q74i94hbnswf7iscpdm889w3wqvcbz6"; -"metrix-1.5"="89mkz1xmzm0i24410wdhxc2wpr32as11"; -"metrix.doc-1.5"="vr2gg2hy407cycqa00b4iw6lbmi0l54a"; -"metrix.source-1.5"="x2w7zrjw7nxbdiszypa3fnd4am4hhk8k"; -"nnext-0.0"="iaw7jnqig0pl9kzz2l1hrb1xgyzh1ng5"; -"nnext.doc-0.0"="2jdmhvjl1gl5jv8r4nyf40fjd8y9ha41"; -"nnext.source-0.0"="z5nx3gszv8s8zn1jf37ndb95bw564bmj"; -"parallel-15878"="d8gik6iva6h6l2imix4bxb5w9p8j87ka"; -"parallel.doc-15878"="n3dww00ms1a2m3v6fflm637hiazdrqrs"; -"parallel.source-15878"="vkx4q8liyqx0n70dpq6pqv515x1gbr7f"; -"parrun-15878"="3b2gnwqll6qf6x5f6gzh9ym1vsba6522"; -"parrun.doc-15878"="8v8338i5c6lcdgcdcwhfkb0d5brc3n2z"; -"parrun.source-15878"="2bvqjwsq7ngr7n11vnqnwhqzldrb73ri"; -"phonrule-1.3.2"="7gxkh4k5g2znwdrrdy394iw08khwnkvd"; -"phonrule.doc-1.3.2"="h353x4isnarn0bja89cb7104n4wda95l"; -"plari-15878"="nhdf38fv3h24zqq0bzwax05bfvrzmx5z"; -"plari.doc-15878"="i09il1b9f8cchmhc9pj6ndngyym5vd4w"; -"plari.source-15878"="5n2x3k1mf9palhxxlqpqkffd3ms3zrfz"; -"play-15878"="r6ryb6v6svlfv9i9j6r2a7ciks2k53bv"; -"play.doc-15878"="b5kjgd2gvgz5228m98l3lhaawmdfp40h"; -"play.source-15878"="jk04llsraw9d9gl5grvr019rjnkha1h3"; -"poemscol-3.1415926"="rbzrrl2hp6z6cdh8q1846bpcxpfii7hb"; -"poemscol.doc-3.1415926"="fxgqcxh3pm74jx5fcpn7nd5ng3s7wj2q"; -"poemscol.source-3.1415926"="2821zah2libsq6sm7dca6rqnzv8f9z1n"; -"poetry-2.2"="2wypw6n5s3x2ml6dkk9khlp2672ipn21"; -"poetry.doc-2.2"="fslir5ibkqqdqlk4qsy094w3gz8dgj9j"; -"poetry.source-2.2"="jwly1fzi8kzgkvlnfc23yyy5bajd4rcz"; -"poetrytex-3.0.1"="a7a68naj2vngygl078qcy6qpyvgjqp87"; -"poetrytex.doc-3.0.1"="d7vp6y5vm8sw1vq3j723ksvivdk3v2a2"; -"poetrytex.source-3.0.1"="v4ynl1n0sgg2n5g0ya2ncm7k1fibfmgg"; -"qobitree-15878"="jxxsb3s665887m15a2v9q4ybdzc86x9k"; -"qobitree.doc-15878"="xi15qg62q42sgh4115gp2mcnv7nriwiz"; -"qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp"; -"qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg"; -"reledmac-2.37.2"="1al9yjm90gxnn35y0236mblihivknvix"; -"reledmac.doc-2.37.2"="jir8d789vhd5pnzz514yn53zpicjngkx"; -"reledmac.source-2.37.2"="a4j9013r2z8h0ziis9yfwcsbii0h7axy"; -"rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5"; -"rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq"; -"rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y"; -"rtklage-15878"="j7v1rhi19ly8i5h2j306nvhnhp3wjx8p"; -"rtklage.doc-15878"="02dpc8m2pyxqmpvlls86k2gy0yp8gqyp"; -"screenplay-1.6"="c4jv8c3zrqqjp25nxv1wwp47jy26vdd0"; -"screenplay.doc-1.6"="7vlv28kmw3pag35r1p9q1mhvz005gwv8"; -"screenplay.source-1.6"="88zp5a7raa7ic4474yghk67jj31k3377"; -"screenplay-pkg-1.1"="567syh6jgvm16ch9hhlirgxav4k424ns"; -"screenplay-pkg.doc-1.1"="gvd3ma5bmmcpiq1jpi8081lcvk6zpfgi"; -"sides-15878"="4by0j8k8xj6baip7kdvjr5x3srvz4wbf"; -"sides.doc-15878"="7kcin18x8z42axnrmlqldkzqqbvsjzvl"; -"stage-1.01"="jl9zysnd3ji20yn23nifnqp8db9dcpvk"; -"stage.doc-1.01"="ffsgwdyyz5p24vd5lpb7sz2l8xzn98mk"; -"stage.source-1.01"="qf4hhfzpws1friwg89vq0sg25xp3jfwh"; -"textglos-1.0"="lfdr25rxphjmck47gv10zr6dwiwyczla"; -"textglos.doc-1.0"="k8945zjmlx6n8szzighhs4fa1z8zc340"; -"textglos.source-1.0"="mvxkgnsda7v23v765zh7mzg1fzcn0hdn"; -"thalie-0.10b"="wd2ln0n32rvnr8fl2i57hkd8dgdxfbjp"; -"thalie.doc-0.10b"="9j2rg2fh4gbw7jznl0d5kx49x8fhfsv4"; -"thalie.source-0.10b"="pg0mgikmariaqrpd83mdmsilglz5hcpc"; -"theatre.doc-0.1"="lrajd4fl8ib6kabsjpxjr38pdb2gr83q"; -"tree-dvips-.91"="rh2g20j87hg69iym0in6b1jdg5icgina"; -"tree-dvips.doc-.91"="5lwva5wns5mwp1yq94pd31q165gianwp"; -"verse-2.4b"="ip7glx9gvf1c1ggjvkn1ip1vdxycn7wc"; -"verse.doc-2.4b"="vf7lvv27b351xxi81svdqb8hdzcyn9i1"; -"verse.source-2.4b"="9yx8ry4p1d0nvzwzh360xa8828mhgfwn"; -"xyling-1.1"="rxnynyg4j3xzzh27zb23q4qh3w2gy5r6"; -"xyling.doc-1.1"="k41kmgmzw7358f3nhq2ixbxafiq5kir4"; -"alkalami-1.000"="v7sl553x9mw57qsnh66rf7mba26h6m8x"; -"alkalami.doc-1.000"="kg4kz16hp3sylfwrprr4ilc2y4rzrji6"; -"alpha-persian-1.3"="4ga35s96bmxabf62li3kr625nplk8v4k"; -"alpha-persian.doc-1.3"="jk5d6pb4hk1qbl9pzmqm3b45r6ifdmjf"; -"amiri-0.113"="adni51ibb0ncr4mq0iyw8n7l3i26xc96"; -"amiri.doc-0.113"="ns0vc8azw67pbp4ji5fhnb9cykyv1hkw"; -"arabi-1.1"="rr1si2q0lih2l2qpascr4kyzy313zyba"; -"arabi.doc-1.1"="cpsn1fgrlivbwqb4n9qrpq3q69kdy3nj"; -"arabi-add-1.0"="djln5r1i53rqvih7wp016j8ga2wqc7dn"; -"arabi-add.doc-1.0"="vwbgh52x3yh6yxhfx6p7m0ljmsrmr4qz"; -"arabluatex-1.20"="d4sy69qxbzzvf8bw06sbza3w10kc6j41"; -"arabluatex.doc-1.20"="g79wb4gdmam96xwy99p13zvy85lrclqp"; -"arabluatex.source-1.20"="ccjykbnix38qi79my24y6af95vp90p1d"; -"arabtex-3.17"="fr7avfkwpdbx619kq7h1y31bx4nmkp5v"; -"arabtex.doc-3.17"="b5ng3w5g40m9c3x87nih862msx5nw292"; -"bidi-36.3"="y2ak5p1n7zr5bwf73l27flhmk88z4z6f"; -"bidi.doc-36.3"="rfmpd089lv9ncssl7jz7z7zbc66wakmc"; -"bidi.source-36.3"="zr7wr35cs4byxqad31ayp4jw9pygmj7z"; -"bidihl-0.1c"="kwa5li9yi8wb452g12y2h0ar6lpqdmmr"; -"bidihl.doc-0.1c"="558l7z4b7giwqqzj5496r7nkzv1wrnqq"; -"dad-1.2"="ivwjd7fhzgk4kl0iwzs49jvhqsb44ysr"; -"dad.doc-1.2"="6sy939pdqxsz24lpfqvb5wx1914nc38h"; -"ghab-0.5"="xlrv9p05w3vm0vyzay9q16rzh1x8lk4a"; -"ghab.doc-0.5"="vhpydw0spag5nlqyr36iy2v70db2hmpx"; -"hvarabic-0.01"="66c7491ff4zaq9wg8n6m4k9dmi1lwvn9"; -"hvarabic.doc-0.01"="pqb9h9w5nw001cjpwxmd4pysg5f5z2xd"; -"imsproc-0.1"="ylf3kd1bc5rafzfyil4y7wxp6vd9nsm3"; -"imsproc.doc-0.1"="3kv8qk7pnfg2w7xm3lqcimi8vhx8jwf8"; -"kurdishlipsum-1.1"="8frakqhm5sfw4f9j514zh63la69nwnnr"; -"kurdishlipsum.doc-1.1"="1spiraw1mpli2hyyxdh43r72dkr0446a"; -"lshort-persian.doc-5.01"="hba2q0ni1c873gpg2qp835csinw78yi8"; -"luabidi-0.5"="ni9007yf03ddfzvmab1bp3ki9j4zk1ls"; -"luabidi.doc-0.5"="71wyc3gjz241an8jjavy4q4bsxxjn934"; -"na-box-1.0"="vfrchq5jqb5s18zgngk2qsb0svmnc7p9"; -"na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9"; -"persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm"; -"persian-bib.doc-0.9"="q8vjf93qjdkm6qz099464mwdl4w4gjqi"; -"quran-1.81"="wl9rf9gszbgdkxyw3b5nsvg30n99ghrk"; -"quran.doc-1.81"="inrl5aligv0i1nsdr83xi77d8d7z9nyb"; -"sexam-1"="jlh6d5mzxqbnkn6yy963fnhc6rmggigl"; -"sexam.doc-1"="532l18ix2czx5r80ar4g7mqgdij4r5xx"; -"simurgh-0.01b"="n8bv87n12x5xv3h41487vyqpbigv3qkc"; -"simurgh.doc-0.01b"="z3qq4jx25qyxqmnfbpsdsayi59fkaff6"; -"texnegar-0.1e"="y3p8hjqik59ghy3rmm631q0n8w3kvz3c"; -"texnegar.doc-0.1e"="iid5b6qi935k83m0zx4xk3j77v3s1g70"; -"texnegar.source-0.1e"="d5qmlzswr3lwhncxm5rdwm9jd3a9w1hl"; -"tram-0.2"="7wcas9syxfvm8pc7wnp817zd9y4q941l"; -"tram.doc-0.2"="ppbq1g4k1swjv7y9qkqhcr0m25knssk5"; -"xepersian-23.1"="mh90ip22b6gvwlgzvqjwm627ry1w5qyw"; -"xepersian.doc-23.1"="3h3gpv46vrjbxa8z22dqbs9bj6kqqb1h"; -"xepersian.source-23.1"="rdbcm72pjmdc7jwzy71pbbwj4qyz62i1"; -"xepersian-hm-1.1a"="rk613k655f9qqd6wz45b9ri269m9wqhj"; -"xepersian-hm.doc-1.1a"="r6mjv96j87z6m4hz24lyxgmfdh2ji9gm"; -"xepersian-hm.source-1.1a"="h1jshzla05j2zxpqp9c477vjy6y56cy7"; -"arphic-15878"="zfax00567h7mdlfkpxihy379cwqmy8ng"; -"arphic.doc-15878"="55lcjk7s78qa39dqd0wj0za5f6hcnkxd"; -"arphic-ttf-42675"="s5kckgwzz84bm3px9cmnw2zgvmaq27yh"; -"arphic-ttf.doc-42675"="s7y95hay8ygbb1viv250vkzf0wbm9s3b"; -"asymptote-by-example-zh-cn.doc-15878"="czm77scbklkpdjgk93w1g8ilchpx3vpr"; -"asymptote-faq-zh-cn.doc-15878"="yzyywm1hv1hs9ngddhdgk7frrpnrbsr8"; -"asymptote-manual-zh-cn.doc-15878"="86bz3am5w7xx9si2a09s432xh882ix9a"; -"cns-4.2.0"="3m0fbs91x53iiqvzl0hs68cks7y3m3q7"; -"cns.doc-4.2.0"="1ddyimvshda2zf3mcs6rk1n4py2aglfq"; -"adobemapping-51787"="xcyk94x5n58vxnbw1j1wrkdizmwi6i74"; -"c90-54074"="jfyd605szid7j3a757fihxhlvaqvprdd"; -"c90.doc-54074"="1v14l7vqrdbc6nhg2k2gshq7p7cqzyk7"; -"c90.source-54074"="l4kfmrrqbnq3y6xbs0izdccvikpsw314"; -"cjk-4.8.4"="zdw3lfngj5zg5d118xjndaj5gg7r0wy2"; -"cjk.doc-4.8.4"="rlwcxn7lnyxc28v9gjscp3p7p9mgzwhs"; -"cjk.source-4.8.4"="i9g2nbr71gnvx71a55aj07qrgw67vhs8"; -"garuda-c90-37677"="d9m07vl6glf3zjb44whqb3flsirwwcx1"; -"garuda-c90.source-37677"="rjy95hqlvbds6pn29r26kh8sshxnd21a"; -"fonts-tlwg-0.7.2"="62z2gg973bjm1b8byn4y6dr4s1jx8nf9"; -"fonts-tlwg.doc-0.7.2"="xc4wi0yfws579n2z42wssk8cg7m0ildc"; -"fonts-tlwg.source-0.7.2"="q2cjjk7ayzd38z130qnwqq6kz42n0x0i"; -"norasi-c90-37675"="d0972qmh7nk9isx54d46f7jscg6mwcrz"; -"norasi-c90.source-37675"="f0z1ppqy8szazpnwmg2ml8cgasdf5ivs"; -"uhc-16791"="viphfgiqfb1w9kb8103znmzy09n6i45n"; -"uhc.doc-16791"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z"; -"wadalab-42428"="cpc689ywzaqil8xz78nkzwx30qmqixh5"; -"wadalab.doc-42428"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j"; -"cjk-gs-integrate-20201206.0"="0llgl1xwswii91q704aj23r13xqfdcbf"; -"cjk-gs-integrate.doc-20201206.0"="8z9x8jgv4zw2nvb4v1k3k5cyl0xc337h"; -"cjk-gs-integrate.source-20201206.0"="scgfp18nqkcghsvw99khhw5x11zv693p"; -"cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss"; -"cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9"; -"cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k"; -"cjkutils-4.8.4"="8w069zvnnpkr2qcmsqxh6p64db57b82g"; -"cjkutils.doc-4.8.4"="grwdzh1216qgniky55qv2r62r0rd65jg"; -"dnp-54074"="jf1zsbg60d074ksrz0xk9ihybbabda1f"; -"fixjfm-0.8"="r24s5c53wvxaacm4fmnmp10nl8096nlf"; -"fixjfm.doc-0.8"="inhixa1d1hr6s2473qp0hfchvcn84y45"; -"jfmutil-1.3.1"="jwkdkj88h71dlwrh3rkvai7izbd6vhay"; -"jfmutil.doc-1.3.1"="iyfjshb9mpkvbcl6idb1ig1v1svxiwrk"; -"pxtatescale-0.4"="psd9rlxh4i4rqxgii61r2s43sqy3kibx"; -"pxtatescale.doc-0.4"="bfd49446kr82v3h06mq5hsm1ji2jwzck"; -"xcjk2uni-1.0"="d0p3wv968s8fmphawm91mph641nnb42j"; -"xcjk2uni.doc-1.0"="r25dksqp0cbmvj8912p0b1ydvywn4sz9"; -"xcjk2uni.source-1.0"="r4rlcadgrylpzdds14c0nf5y94yclhm8"; -"zxjafont-1.2"="jpj2xg53gz5k86p1aqc0czgbi2pp8yab"; -"zxjafont.doc-1.2"="8z7k507pgb7g4998rw2l53a1kydmp3xk"; -"ctex-2.5.6"="pj0in9g9hyb9j1ik00k508zpzzqhd9x1"; -"ctex.doc-2.5.6"="xaykgqrkw6pi65mmkhnx1dqp36q7biwq"; -"ctex.source-2.5.6"="6ibbs70r9scz3vmlbcb323jk79fw99js"; -"beamer-3.62"="0dw0xsw0zi6bw8ibc3dyi6afjq8wygfk"; -"beamer.doc-3.62"="qxvvxwic302l46lfc206xh0wm5g2lwds"; -"pgf-3.1.8b"="hs9cw6pfxzc0cb77fyn1gs94l92jbs3l"; -"pgf.doc-3.1.8b"="is2s49v1mshmpwplajvx27mg9pz1z2gp"; -"pgf.source-3.1.8b"="axqhmadpaw4srzqcj65lg69dxjr0m45y"; -"fp-2.1d"="lxyxf8jkbgrkk43qbnr2s3ns19ihgmw5"; -"fp.doc-2.1d"="ih2kq6xp1nd5gs9bc9vhd34qa7jcj093"; -"ms-57473"="hl4w3vlawjyx92px0fp9mx8hs82q76ma"; -"ms.doc-57473"="36489y9m4b1jjbwsnj4222ci0vyy0cmm"; -"ms.source-57473"="zadiyqnszmpcxv29fihby7iks8ff8ndb"; -"xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg"; -"xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6"; -"xcolor.source-2.12"="zgpsq8x4n6m23a9d1m5m06davpxv76id"; -"translator-1.12c"="ssck8ka8cgzvvgzy85ss6nlh51vp0pwc"; -"translator.doc-1.12c"="2zr5cvx3xagazcbgs04246cqaznqk6p9"; -"everyhook-1.2"="ndig4g0nsbqla2i2p1n6skjjxsr3qjhv"; -"everyhook.doc-1.2"="690qpw68wri4cr4ahv1xfqibm3flc5mr"; -"everyhook.source-1.2"="rvh60i8j1gbyal0pjpdgld9l5g20zilf"; -"fandol-0.3"="lxnjp8m4fcj3pv2hnhib6gjdh90q1ncz"; -"fandol.doc-0.3"="fm0ac37apm0dh1073lp1frja9xbsrv4l"; -"fontspec-2.7i"="vhqnyrgqlsg46f6wjpx5q1i4iisfgfnp"; -"fontspec.doc-2.7i"="9wl29gf9zhxp2bq6wvjl7sx4v5vdvfqy"; -"fontspec.source-2.7i"="yrl2big2r8zvflzawy8myggn8ahavz57"; -"euenc-0.1h"="fxp7k516ws4khaccirjxi8xszlif27y0"; -"euenc.doc-0.1h"="28lmb3y1m8dhl0n2r1gprmkrpxfmq134"; -"euenc.source-0.1h"="amsw2lpbcm2grnfch6cag6hyn957acv6"; -"xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4"; -"xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf"; -"luatexja-20210319.0"="vjvd2351hfw4ywaki5cwvzyvimd135ji"; -"luatexja.doc-20210319.0"="75x159pmavxg02f112yrf824ic821xjp"; -"luatexja.source-20210319.0"="yp79bqa3qy5zfzl6hzkk2mlyyk6brqh9"; -"luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4"; -"luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0"; -"luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp"; -"ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh"; -"ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq"; -"ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy"; -"platex-tools-57729"="aa12libw6lj496qbnwr2rczb63243sj9"; -"platex-tools.doc-57729"="8bx09ch2yzl9lbj1qdcdbdji4yk0ngiv"; -"svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i"; -"svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj"; -"svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4"; -"uplatex-57972"="xmk1pk5ck677acr534phb917ndhfxrwm"; -"uplatex.doc-57972"="9xhsqvqlpc1w3a7v70cbngqciypxccsc"; -"uplatex.source-57972"="jafq9dy7s19lhnzlbf13qrkdqdvcbjxs"; -"latex-base-dev-2021-05-01_pre-release_2"="rxrsbiy4j4i7lhfdfxis5wrbp724g6wg"; -"latex-base-dev.doc-2021-05-01_pre-release_2"="y2jqx7a8j5w49lp0fl52chpq7s4fhw5j"; -"latex-base-dev.source-2021-05-01_pre-release_2"="sg6kxfzdg7qk4cbdarbb6nh9wsdxspdq"; -"platex-57972"="6j25hw0pclda0nv6vzxh3h7n5pagljff"; -"platex.doc-57972"="1272xi3rpygxa4p0hmyraamri3n8q7b1"; -"platex.source-57972"="222g5xxj41aq3yn17dwdpb7i4x2dirch"; -"ptex.doc-57972"="bxq3agvnpadiii63nd4mzwz3x97i6z92"; -"ptex-base-56487"="25h63rcankqnc0phq3sr0dkxd57ws9vk"; -"ptex-base.doc-56487"="y0mqw72x8di4z9k0z9mnznw3sqyr34rs"; -"ptex-fonts-46940"="iqch8gk4nianpr01y03nl0zwp49bw1b4"; -"ptex-fonts.doc-46940"="ln071z7k84vqpdf72ngcn7s24hpkhazc"; -"uptex.doc-57972"="ia4psw870n0x76bygg3jsgmxryw4mrya"; -"uptex-base-56832"="ailz7gb71drgy7glh81731lnydbpkmwc"; -"uptex-base.doc-56832"="dsfdb6gnflgz1bdqv4dfm914scr7gxpk"; -"uptex-fonts-54045"="dlh3qw9bz67kldx14fqd7f9fb9gcgcah"; -"uptex-fonts.doc-54045"="fx7gncl6m75n5pi7y00qprwmvgp978n4"; -"xecjk-3.8.6"="3jp1b8rf5ncm0wm7gcwh9n1ccnncyyws"; -"xecjk.doc-3.8.6"="q82p0svfc3m40rg63frhijslapvch7zs"; -"xecjk.source-3.8.6"="h75n0pid7fhjhwl589nzhljya2wck3zn"; -"xpinyin-2.9"="1m2kq41z483px431dxn4w33kjqm50hcc"; -"xpinyin.doc-2.9"="dal70z1n0yv7j7k62rdzyj26ijnfsngj"; -"xpinyin.source-2.9"="13njiqkx26j9q98hcz4aklsr3wwlzj6l"; -"zhmetrics-r206"="2li2anrf74242blfd59cxfyn13iwmfxs"; -"zhmetrics.doc-r206"="njh801caaxkfyw5nsfv3q36gkcql14pj"; -"zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm"; -"zhmetrics-uptex-1.0"="d3r2n6ndjd8zsmlq4hgm1x3gvyvrfnc1"; -"zhmetrics-uptex.doc-1.0"="qqzvr4mf5fg5r8bg6j87yk94nznhrscl"; -"zhnumber-2.8"="s59rjf8x0clsdb8zc8a689bd9fdz199f"; -"zhnumber.doc-2.8"="n51wjppbhl8njhyh28b456gd14507mwl"; -"zhnumber.source-2.8"="fi0gjxssiyvdqib93gyya54jdj3dm3m1"; -"ctex-faq.doc-15878"="vjxcdrg7i6p9fgrgzfvykibjghpigrz3"; -"fduthesis-0.7e"="2fnpghx8zi0g62hkh8rsf1p3yr49rkg8"; -"fduthesis.doc-0.7e"="h0595l673dhl5wxpsnc6yd0ga9cgj4mm"; -"fduthesis.source-0.7e"="40fiw5f3xjz72rmls35aqwyvy58v5q1m"; -"hyphen-chinese-58652"="0y3spz5k8inrr78a2fsqr2g5wcj081fp"; -"impatient-cn.doc-2020"="8k1gcnqs5gghbarikj17ykh4vgahpqbw"; -"install-latex-guide-zh-cn.doc-2021.2.1"="65xcpzjsb2l4rn77x1hvy1v8ly8h8m4p"; -"latex-notes-zh-cn.doc-1.20"="qx777fwi8k06qvknnll3crc1j0yvraxs"; -"lshort-chinese.doc-6.02"="67pcgs0daq1ns0kpk1bml43d5zsgwbl1"; -"nanicolle-2.03y"="5rvjbz93d55qcywbg7dkh231bsc82xzq"; -"nanicolle.doc-2.03y"="mqmmdchqbviyvf9yrldi832wxxwvv8mi"; -"njurepo-1.1.2"="pry1ksmskbm6y5ic43v0hdjkz5mix78h"; -"njurepo.doc-1.1.2"="91clrmlgyja8i7cvi1cbb204dnp76rj2"; -"njurepo.source-1.1.2"="3axj6ar0n3d3lb92z7f33nlxd6qjaa98"; -"pgfornament-han-54191"="906lp285f9mscdc9p40j40zl26ifvbh7"; -"pgfornament-han.doc-54191"="77f050rip24vfjcbylda57chh16n4vfy"; -"qyxf-book-3.1.0"="lik9idqmk4knwcxxcjq7ikk5mlmx04r1"; -"qyxf-book.doc-3.1.0"="hk95p2hadjid72c01l3j22c2ql1zc0pk"; -"texlive-zh-cn.doc-54490"="n9ggsbqa36114fyiwwwxc0g3gjj7hlm0"; -"texproposal.doc-1.4"="8fnrxmyg4wd11kmdh4jw8l1313h0sgqr"; -"upzhkinsoku-0.5"="0yhh0ab2sq4fszra362z9m2md8ycydvk"; -"upzhkinsoku.doc-0.5"="1ijm19cqsdsm9q6a7rknl0zsfa13g28g"; -"xtuthesis-1.0"="0lmkzfvp34aiixjir2l8qs9nfpbjb3gn"; -"xtuthesis.doc-1.0"="vvqmvgjjinj3pm8r3kp48bbxs8kzgs31"; -"zhlineskip-1.0e"="k8myar8fv79b0rkjbwimzm24gag072aa"; -"zhlineskip.doc-1.0e"="whb613dc11kyrhgc26nbyzmd74wi8klc"; -"zhlipsum-1.2.0"="6k0zvvxyd7cl8w9w41sf5fyaw499fk5a"; -"zhlipsum.doc-1.2.0"="w902mfaj6jd9llypk8mpldrqliwp8lb1"; -"zhlipsum.source-1.2.0"="lwr47ka88vcnixpj0s8yi2jcvbcsfhp5"; -"zhspacing-41145"="p7w7cisgid16ndk1mipdmpn5v7nc1kzf"; -"zhspacing.doc-41145"="kjnyalnxmb2f0kj8w52nvm97a9m1dfsa"; -"babel-belarusian-1.5"="dky0w9qw4j6mbsmx6kbcgqn8p9grbbmj"; -"babel-belarusian.doc-1.5"="3mzf3fmiraiac3w6cd45fy3phm5714qf"; -"babel-belarusian.source-1.5"="bisqg51jp7d4f8mjzirzw2v0f6m78yfk"; -"babel-bulgarian-1.2g"="4c5cdn8lijfw1qhkfz69pvlvl2hcg5hz"; -"babel-bulgarian.doc-1.2g"="pyikwcg47yj8nh416g6wdzwk7a7f460p"; -"babel-bulgarian.source-1.2g"="km3vz4iykb1pckz9bgllgd6xxc77k2c9"; -"babel-russian-1.3m"="45wh2zj7i47dlprkf8f3lh70vshggrr6"; -"babel-russian.doc-1.3m"="b8warwk39s2javg6d5jhgkg2bv5d279y"; -"babel-russian.source-1.3m"="31nl55d006ajphcvpb8xkhv80460hxzp"; -"babel-serbian-2.0a"="qz0klmzp380x2sn97v6ca1hjpir9fxmk"; -"babel-serbian.doc-2.0a"="5s29smlmhqrx68ra2k6mqvw5lffclbb7"; -"babel-serbian.source-2.0a"="6gp84lpbncbd2775nfac1zg86034a7i9"; -"babel-serbianc-3.0a"="rxrc15zajz0g5gzczw5k7kid3g3fisxm"; -"babel-serbianc.doc-3.0a"="bid4np071hjbaplxq8pvxggwifky0y8d"; -"babel-serbianc.source-3.0a"="wa836abk9b2z4r5zxfzyj6z3d6wzfvjm"; -"babel-ukrainian-1.4e"="v4xihfkgfn5dr5lncrk0rrchwviakhjr"; -"babel-ukrainian.doc-1.4e"="gdyd3xlx328rpb68mcdvhbdvk9xfv6x1"; -"babel-ukrainian.source-1.4e"="5ir7vrg6inyzrph1za72cdlqml2c0nrs"; -"churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp"; -"churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw"; -"hyphen-churchslavonic-58609"="rqvkjdq3d885w875nmjppgbsjryzm219"; -"cmcyr-39273"="ba4hsn5a22k73rhiaip6dv560wk5sxv1"; -"cmcyr.doc-39273"="1j63xbl85z8izha2jl2klagny3hk5wf3"; -"cyrplain-45692"="dh1vcz2wdwddkjdqihpc2rlsqjzm4cmm"; -"disser-1.5.0"="m0gldqzdx2idh4ivy43jd13fgmgcsr94"; -"disser.doc-1.5.0"="6s5g533qr53rg2ha6a7p7xr4phcn11iy"; -"disser.source-1.5.0"="h4f1z0azxfnbv1cba1f8z5wfy25hfvg0"; -"eskd-15878"="63ack7kfjg5gf6xv76yfla2z0k9cxzv7"; -"eskd.doc-15878"="g3wsmrvwfz2lm30w2fys9md9nqv5k8jq"; -"eskd.source-15878"="q70i7jl8dkf9vakj558fgwqfbn8230q0"; -"eskdx-0.98"="b2dx9jv2rg97hmlf3gx4h4l3ci16chr2"; -"eskdx.doc-0.98"="l1r5bapnlsz61yasg9gyrzp6za8iw0nf"; -"gost-1.2l"="zi0spr9mfkb7614db7sllcdvszp5i1fd"; -"gost.doc-1.2l"="cacamlxjq0cdbf6hsmz7rbjnqprypsj3"; -"gost.source-1.2l"="qrpn9sfsnd29k3ifsz330sdy6466s5i1"; -"hyphen-belarusian-58652"="b68ndw66wjbfzszngfh6ap5w6l5pbx94"; -"hyphen-bulgarian-58685"="ajyx5jdbnv28xyfax1pxkli0zcgrwpw9"; -"hyphen-mongolian-58652"="i8743jhpnls80lpvr5z1b8vrxrwn08vh"; -"hyphen-russian-58609"="rq74qi9km5vnlnw0pkck6w67gv5qqsaw"; -"ruhyphen-1.6"="3d6lyf95cgi2yc8lsy9dz6z5vmvcx1l9"; -"ruhyphen.source-1.6"="i6x3fiidyvl2zkly1p4s7qzgzzza1in7"; -"hyphen-serbian-1.0a"="asv8n6dxr7rinn451qdj3j0hq5pw0515"; -"hyphen-ukrainian-58652"="fzjs5a9ny9wl3bisyxj8pdfqwpi9ggvc"; -"ukrhyph-21081"="l60kvxf1mii3imnl0swqskcrz0bizb5v"; -"ukrhyph.doc-21081"="4mycq4cykkinm5h946xmrng59jghvbp4"; -"lcyw-1.1"="0bxzb7w4z0w04b9c1cvak8i2cp3f4h74"; -"lcyw.doc-1.1"="5kk74h4902f2zjlid26h1rg3fvw0sq9z"; -"lcyw.source-1.1"="3jq3gmm85lr494mm8j61z7shr3c11jg5"; -"lh-3.5g"="h0kq2pb7iay15i1b3sjx3q2yk63pycp7"; -"lh.doc-3.5g"="xzbkgxqjzbr2cx6q5xqqzgynk25jvkvh"; -"lh.source-3.5g"="mh8zzabsf553ml0al618ycym6igh9qyg"; -"lhcyr-31795"="3nj4zxpcahn2ryz47v7nh4k05j1lv6di"; -"lhcyr.source-31795"="kvid1h3vgbzmpn65sdjs0b8dspm5xvyh"; -"lshort-bulgarian.doc-15878"="r2yc6zzq44wddndp762a3hg78ihv013l"; -"lshort-mongol.doc-4.26"="5pj0i8wxlyd35sd3z7npwypicklc0nl3"; -"lshort-russian.doc-55643"="d2sgyyi8aic1j35fqrniim2bcpgk4q0a"; -"lshort-ukr.doc-4.00"="4g85cmgwa4y64rbc51zdw42m2f3m55ps"; -"mongolian-babel-1.2"="2bjw94a6r5wyn2i5gsclrn5fadh60jfg"; -"mongolian-babel.doc-1.2"="darkanaxxhcx7r7nd4mph37m3r29y7gl"; -"mongolian-babel.source-1.2"="cfdxndayfrj10xn000ckxhiaa1qdvypd"; -"montex-IVu.04.092"="ig3y6y6vksci0567g91hkgf8pkn5x56v"; -"montex.doc-IVu.04.092"="phm1049anhqvppklp4cwczfadjmakda3"; -"cbfonts-54080"="bzgl9s6zv9fqpg5m9gicxmpscw7m3z1d"; -"cbfonts.doc-54080"="6cj35wgyk4ss36wc0szhfyqcj3diyd50"; -"cbfonts-fd-1.2"="mybny72ksiflq3lq2y23059lzxidwz70"; -"cbfonts-fd.doc-1.2"="rsxf6gy62snszkcpdzry9gy44falx6ml"; -"cbfonts-fd.source-1.2"="73f27d7a4c2frvvhp1r2z4ia84qrh1cw"; -"mpman-ru.doc-1.004"="6l3vqm4sxcvb5nxy582g2nbr9mwvz1dz"; -"numnameru-44895"="c3fn4n2asbh2lqrn9y44g6yxad9f7469"; -"numnameru.doc-44895"="ibrlw13zibhvhr8mipw7hs2ik1f96z73"; -"pst-eucl-translation-bg.doc-1.3.2"="cqxppyh4546ybhnlk1z4fjkdyw9ij5x7"; -"russ-25209"="981kkq2xmx0r6k095308270hjvmdsm3h"; -"russ.doc-25209"="878fl0cyka7jj5cvdvq19fvlfic3izi9"; -"serbian-apostrophe-23799"="q4n9k2fn70hxcf9chy6a5jw07pq2cllp"; -"serbian-apostrophe.doc-23799"="0yxbbv3xz0jf63g0kvq5dbdv2myc4rks"; -"serbian-date-lat-23446"="3s5yc0xcg6fsaisn7aq0nv16fj69wmws"; -"serbian-date-lat.doc-23446"="pa9rvzpbczmfm4w0977xx05c5sbl6mxg"; -"serbian-def-cyr-23734"="k46ahhqbdg23mx4ld0953dnsws1imhwm"; -"serbian-def-cyr.doc-23734"="zl8x855zmhry6n754l5x9fz8hjn27bls"; -"serbian-lig-53127"="ma7sgiv7vs6hn079dja88y9mxlqvqz3l"; -"serbian-lig.doc-53127"="5g0vzcvnixv1l624fkwny623ylcd1lx5"; -"t2-47870"="ihwn58py69fx1fx2bjqwyg8caiwwlpy6"; -"t2.doc-47870"="gsqrf898i59wsxcm8b06qfrasfw335r4"; -"texlive-ru.doc-58426"="lmadilyvb5n1kqcl3md67jrlbp1j6fkr"; -"texlive-sr.doc-54594"="jrw83yqirmpvyn2mycav8dv82qsp58yj"; -"xecyrmongolian-1.0"="4rvsdnk1gbf9vrchlibyj93dzpdv1idn"; -"xecyrmongolian.doc-1.0"="c7pwfb8v7gv115m3igbsr233ms6cyvp3"; -"xecyrmongolian.source-1.0"="f3wj75g0zwivr3xld918hmpcyl6vs6j8"; -"babel-czech-3.1a"="gdcs2xpcgblb3v0m6jf3ppx643s3cj6r"; -"babel-czech.doc-3.1a"="g2km6r7d90d3f60mfhw4a7m9s0090sg5"; -"babel-czech.source-3.1a"="5s1n9fykrbzppgb36pvybjn9jmj7cxxf"; -"babel-slovak-3.1a"="cl43hp1pnxc1gp4ndrqwv1cv3fh0h47c"; -"babel-slovak.doc-3.1a"="igrg8syk1kd3mq4sm4jrdgsmsr1y9jb1"; -"babel-slovak.source-3.1a"="gvlkvq0zmhdf57a6vpfxlvmvz7ma48af"; -"cnbwp-32550"="whwdam81dc6g8pq664mrmnbxz4f0iwdj"; -"cnbwp.doc-32550"="qv1fxhmq1pig9rq3swhvwlwpm4lmwrjy"; -"cs-41553"="ks76xw08rrkrcxg7rv72w18glx2vncfk"; -"csbulletin-54433"="yc0z0nyy6mmlwrn711j3gkpm5afa6ljx"; -"csbulletin.doc-54433"="andx6r2719a1pfg044bclvha66vrcc1z"; -"cslatex-57972"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; -"cslatex.doc-57972"="dm5igdwbqzbya4p7bjsfsawbl1ywamzv"; -"cslatex.source-57972"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; -"csplain-Mar._2021"="cdwmcx5x38dz526nqaiaqj6lvs74rncw"; -"luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1"; -"luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw"; -"luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8"; -"cstex.doc-58354"="pdlnmgvblcf8kxpjck7pb4wq2r3gdciz"; -"hyphen-czech-58609"="4lmcwq9yfkwn19q1h02cfdks257ayafh"; -"hyphen-slovak-58609"="0f7nnjxmh30rngkqqzfm85m2dmnxm1k0"; -"lshort-czech.doc-4.27"="2z8dygvm9ilvahsx005zb7z5ss8hxbsf"; -"lshort-slovak.doc-15878"="qnj433q5hfg9cpy0z281zq17z7dr5vh9"; -"texlive-cz.doc-54496"="cpk8nbi6hb193lwb1bfmg98qp75khp2d"; -"vlna.doc-54074"="f3wz8jy4vbrb3bhk9ly7fdkipwfqixbc"; -"MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn"; -"Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl"; -"amiweb2c-guide.doc-1.0"="w9jm6mjivcml5swz9v14jrc7amyzkw3p"; -"amscls-doc.doc-46110"="4hsr68pmd3v06fnxiynmp4xpgik6v8g2"; -"amslatex-primer.doc-2.3"="9d9pxr0jbjm6zwqd51f7m2bzysdq5gv7"; -"around-the-bend.doc-15878"="a6jilpw0nw27vlj1shnhxfv92yn86ys2"; -"ascii-chart.doc-20536"="9x2srgi2sjd6zjjz27p6hs1w9sj73bcx"; -"biblatex-cheatsheet.doc-44685"="vcmb6x1w0cfgvyx0hl8fsv1nh2ffhg6g"; -"components-of-TeX.doc-15878"="7sc5ryfj785jifvw9b44yni2ifmssr7f"; -"comprehensive.doc-13.0"="c4y3bgj3r97vy17qbdakmdcmcvm7xbqw"; -"dickimaw.doc-32925"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7"; -"docsurvey.doc-57362"="xdh4p4sw3hdgnik9l76blfczvfda4ws5"; -"dtxtut.doc-2.1"="108k3lyvja5wmg8gxyvqskbz8wwh0cyw"; -"first-latex-doc.doc-15878"="8vcday36pq5hlr075kjk6hb82ypazjd9"; -"forest-quickstart.doc-55688"="g08gcf8sk0kkn6jifvx355slh3lvbr6l"; -"gentle.doc-15878"="mpxhsl7g4za410b65awmbb5zlc58h24n"; -"guide-to-latex.doc-45712"="8lw0kcinfq2yd6vkbd531zakby60k2wf"; -"happy4th.doc-20120102"="svmy37c032cvip73n4b98c8kh4hvnh9g"; -"hyphen-english-58609"="6v8rhjy3pajym7ffgmzq3rfcvhkgllkn"; -"impatient.doc-2020"="k5gz1ihjchagbwmr4g3l0rbdm470nn42"; -"intro-scientific.doc-5th_edition"="qx170vpq4ahipljnmhkvbrxv1xdbbii6"; -"knuth-errata.doc-58682"="j6din2w33ghgz7a10la5w480b3lii31l"; -"knuth-pdf.doc-1.1"="ch4x6j13x8gp37phd1zwp258k2ykag02"; -"l2tabu-english.doc-1.8.5.7"="j7m684bvmpv1jaa6s856dj9aknrwlqiq"; -"latex-brochure.doc-40612"="azp69yf9xkksqan9n096wabgxlk9hgsn"; -"latex-course.doc-2"="km59hhadaad0hlpa07rqmx91036h123r"; -"latex-doc-ptr.doc-57311"="2ckpyrc8nls1jxlpnpg4g9rnw91djc2y"; -"latex-graphics-companion.doc-29235"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2"; -"latex-refsheet.doc-1.2"="9gvmiiqg78xn8348cymz3wfzi45mf8xz"; -"latex-veryshortguide.doc-0.7"="dv3ikj9drgivpsapvl9jpkbww3h839ya"; -"latex-web-companion.doc-29349"="wzj6qw8bhwr82ipsph640ya62mpj6k3r"; -"latex2e-help-texinfo.doc-57213"="jmg3aygadzdj3jvdsd26rvg9ipjbwq7d"; -"latex4wp.doc-1.0.10"="bxffry3cy7vkcjhdm5yzn4hipma74jdp"; -"latexcheat.doc-1.13"="iav6gzdcadndwli0jar6d7i1711ssq41"; -"latexcourse-rug.doc-1.1"="fxz46xn5hazqy707qrf2mkgk121m6ywv"; -"latexfileinfo-pkgs-0.22"="1hjiwxdk07hl42nyb14azh2w8jyyljil"; -"latexfileinfo-pkgs.doc-0.22"="4y6qxvdwzifa0xj1r2xrp2g5xi7q2ssr"; -"latexfileinfo-pkgs.source-0.22"="b7h771sg8f6c8fq8j7vjbq0yhsp836a5"; -"lshort-english.doc-6.4"="yjrqmrmxrzynpadsdaja2shqyivd05cz"; -"macros2e-0.4a"="5kjjl3wkq04kshrlrrz4qqb4m61mz4lf"; -"macros2e.doc-0.4a"="9rgjs3scm8wavsbgljxy7rpgdwy3nsl7"; -"math-into-latex-4.doc-44131"="0k2w8mjvn4h6jplrks9mxj6m1bnfmlz0"; -"maths-symbols.doc-3.4"="xi1pjz6rhyw79b10fpdfaa8vc5sf1wlf"; -"memdesign.doc-48664"="92v86h91snhrnssghhllvr0h05cacpm4"; -"metafont-beginners.doc-29803"="7ql41977dp698l2fjlq2xyf221y6xn2f"; -"metapost-examples.doc-15878"="ljbvw9v7xilmkzmifm1vx18dfvqlw6k6"; -"patgen2-tutorial.doc-16490"="3wv4sk7yw0mpy0rsd1j04m8mqsbi465n"; -"pictexsum.doc-24965"="mcxxxznqh0a94sip9vpdbjv5nv83j66s"; -"plain-doc.doc-28424"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49"; -"short-math-guide.doc-2.0"="34mdd47c63946iz86c2r0g2jx11q4mhc"; -"simplified-latex.doc-20620"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9"; -"startlatex2e.doc-56809"="hd5dhdc0klww7vhrn0q0d77lr3frlcw3"; -"svg-inkscape.doc-32199"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m"; -"tamethebeast.doc-1.4"="14cs89g2l3bn3xhfrhrw9pfdf65c2xcy"; -"tds.doc-1.1"="fmmdgblpf26x9ajn16g024sn5sbwwy0s"; -"tex-font-errors-cheatsheet.doc-0.1"="4a38bjpzdbj91msw8kaxmk3c6qahq1r5"; -"tex-nutshell.doc-0.6"="63x33mvz12vg7srrhcdbq8jbcz611zla"; -"tex-overview.doc-0.2"="bj9pak1z31fwblcv5bj2imd4p33bi79s"; -"tex-refs.doc-0.4.8"="ad80b3r5rgj7n4m2hc5r6ccjczikff3v"; -"texbytopic.doc-15878"="vcr4rwfg8m85mrlsp0hg3ic0gmd0zcdw"; -"texonly.doc-2"="x2h7skds6icw56bg0p8f4aaryn52sz75"; -"titlepages.doc-19457"="g0fvssp703yk3c2icdb8qgalxikm0xq9"; -"tlc2.doc-26096"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s"; -"tlmgrbasics.doc-56221"="cp4cwr8k9sjq58mm67qf23swal2jqaah"; -"undergradmath.doc-57286"="58rd10vaavwf003gq73yk82hlxzmvcva"; -"visualfaq.doc-38647"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m"; -"webguide.doc-25813"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8"; -"xetexref.doc-56291"="4ljbfwhzmwq71nfgqfkijqa27hsd3y2i"; -"armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq"; -"armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz"; -"babel-albanian-1.0d"="yqrwj8mb7773j1svwl5chhxg15rqskxh"; -"babel-albanian.doc-1.0d"="fpsfzmk847y3c6q5jq42dqz4sfm54yvs"; -"babel-albanian.source-1.0d"="xii1mv9hbv4f7xd1c13rxn53v99bjxnw"; -"babel-bosnian-1.1"="l6pdr8hm15swhzxx5ly2rd24jnscsyiz"; -"babel-bosnian.doc-1.1"="gahvgi7r3rs553pi00l1q33k3bz59pqa"; -"babel-bosnian.source-1.1"="idi2fhr3wfq31pz63d3fi0zkjm58gzxi"; -"babel-breton-1.0h"="xx0vkazacywgvv0p8yrngvxwk4pmmhi7"; -"babel-breton.doc-1.0h"="jq8477sjlkv398r3r4w0f1r5f35bq8x7"; -"babel-breton.source-1.0h"="pdrxwqva0cm48qpz6q7g6ajcy5kn6s1r"; -"babel-croatian-1.3l"="phasgq7qfxxhvcprkyc0r6wy68q4yls2"; -"babel-croatian.doc-1.3l"="csmz7g2gzm4nr5zmw3z1s9fwwk2r7fk7"; -"babel-croatian.source-1.3l"="2x239jcr4qky01xf2ddhf9pbj79s8xim"; -"babel-danish-1.3s"="nwah0savjlvkk3q4f20hzw026pfd8rmy"; -"babel-danish.doc-1.3s"="q3mv2kx9b526span0xkmsj2mgqx615lq"; -"babel-danish.source-1.3s"="g0wrjd3n0pfmy4xzqbpv2mjm66wlzbym"; -"babel-dutch-3.8j"="4x9m1a08si80i831sgbgjnaa88bfvafp"; -"babel-dutch.doc-3.8j"="l3pigzhgp2jlb9dir38vnbkgkb0ji1xf"; -"babel-dutch.source-3.8j"="cx1l3xndvpvjins8f1rz4z3pqq86rwi9"; -"babel-estonian-1.1a"="pn52pj8gprmsqf7f7i97vllrkjjm2bbh"; -"babel-estonian.doc-1.1a"="nchqv4ahbhjrh6g49fj8xpjv1ghlqzn9"; -"babel-estonian.source-1.1a"="8d3nvwgv9bvhhxsgdicdlf3gsrscaxsi"; -"babel-finnish-1.3s"="wsh1av6jah69rsdz5pgy1mbfblvlfv3i"; -"babel-finnish.doc-1.3s"="i4fbbjfa0bcb4b7yb2hsk9jr19np7ixk"; -"babel-finnish.source-1.3s"="5ycx90jfzs1y0skk0c9r2qlix87hq0xv"; -"babel-friulan-1.3"="xjbsgl2xyfqfrdyv83c6g5h2qnjzw7vf"; -"babel-friulan.doc-1.3"="m4n4fysx9qxf13c39jm4xq624y6jkagd"; -"babel-friulan.source-1.3"="yf6xqza856qdbxdysw08v707h0pcj7sq"; -"babel-hungarian-1.5c"="5l7i970llxwxzy75dy9an9czkbp9p049"; -"babel-hungarian.doc-1.5c"="czi272jfp95lckd97gkq46lrvz3r63wl"; -"babel-icelandic-1.3"="9rkw2wf3b55cs8d29xzpnh5b7k64hhkf"; -"babel-icelandic.doc-1.3"="gjwyjj570d9vwcq6zvzrsi0x8gz240k1"; -"babel-icelandic.source-1.3"="w3kq7v6nwwc6jqr2jrg9a535hgh0nrgp"; -"babel-irish-1.0h"="1y1j2vrdl4piipf9p57028dkmd05y5rv"; -"babel-irish.doc-1.0h"="3kz3sk14j8kfrym9wlvqkgzvik1xjs4h"; -"babel-irish.source-1.0h"="s1g9x340z49y1kgi8b5b1jql1ri2ckby"; -"babel-kurmanji-1.1"="fj2i35f0i3s7gc1qz6jlx68ygnyd4jrk"; -"babel-kurmanji.doc-1.1"="0ys7iva1xqyk72bz0clk7c822wwxsrbj"; -"babel-kurmanji.source-1.1"="wlnp3c18xhb6n8272jq1pp30h6dfqsfz"; -"babel-latin-3.5"="6y97fgf0ivppj9aq77dd4cfgdgzz0gdw"; -"babel-latin.doc-3.5"="dm7bj4snbnf6vxajv9ayz5x7rp4dc6fl"; -"babel-latin.source-3.5"="8cbyxf31qxs6a0pa0xlc2hdxdqxmhlj5"; -"babel-latvian-2.0b"="7m0a5mr8mwxn3hm88ky0nrv88vzqrfsd"; -"babel-latvian.doc-2.0b"="b5zrhmss194cr40s38rmdh58l7y7zp9k"; -"babel-latvian.source-2.0b"="4k79lcf0rafnkk0qzz4qj15wg3hh46j1"; -"babel-macedonian-39587"="y443c0n5dygb6pf923kwj4fv8y991gg7"; -"babel-macedonian.doc-39587"="gk8d4ijhz5dhnlv9jdc6v48fm9zfcai6"; -"babel-macedonian.source-39587"="jfr605jrv1sywgpkhi05v6n6s96vfyq2"; -"babel-norsk-2.0i"="3a2xqwwyj2pv7ndgaxk11wvb7qanc9qk"; -"babel-norsk.doc-2.0i"="dhi39fgchh0ll1hl2si5qgygi2qsg8bj"; -"babel-norsk.source-2.0i"="qyx1rcxw0zghnc8wrh94yr9i5jkh142k"; -"babel-occitan-0.2"="yzlkm8lf34x1c1q6lvc5shf6fcazz678"; -"babel-occitan.doc-0.2"="ins60sfci09fssxs30mr4kj5c2pj8q02"; -"babel-occitan.source-0.2"="k2s35hvvw47kg5xmqvd63a590y6xhp7c"; -"babel-piedmontese-1.0"="5w9k0d2acxvdsz2p641y5hs96ck0y96w"; -"babel-piedmontese.doc-1.0"="77l935hchidfp11cxwa0zr9wbh3qmbz3"; -"babel-piedmontese.source-1.0"="8pmfjyqsrzxxwqh032dxgs1mdj6siwgj"; -"babel-romanian-1.2m"="3llj7gmcw97x5spxf6j6qnag8xq011qv"; -"babel-romanian.doc-1.2m"="8y24zvykyn1nkdhmx0zw7jvmq09b2vbd"; -"babel-romanian.source-1.2m"="7dygndckqg9a0mk6lm788n1iqnhnh2qm"; -"babel-romansh-30286"="2k6ik89i06j3l29bl8yp7dbm79qgzcb3"; -"babel-romansh.doc-30286"="risjnmxysc7r7va4f3mapz7kvxi01xc9"; -"babel-romansh.source-30286"="hnlwwjxzrv9fsanajh23pr8wirlp87gh"; -"babel-samin-1.0c"="2vg2wrjl0pllgbppkx4bcykcjil8driw"; -"babel-samin.doc-1.0c"="k69nnc0vsw2xhrkqilhqzqv9v4h5fy99"; -"babel-samin.source-1.0c"="p7ywdk038cryll8rr2sy8d8m4qb09k5l"; -"babel-scottish-1.0g"="r9zphrdcdd213xi2sw11mqa1l9hj86c2"; -"babel-scottish.doc-1.0g"="c97pnx5fq4yr02q4ddp7g15h0d5yw838"; -"babel-scottish.source-1.0g"="awb6gq1m0hcya2zfw9dwqddhvwkww1mv"; -"babel-slovenian-1.2n"="k9mwn2rv7dwm6cinhmhgp7xbkjf9c9rg"; -"babel-slovenian.doc-1.2n"="frkal3wzi4svfdfh7hwrfs4j34wfxbnv"; -"babel-slovenian.source-1.2n"="4rqpsks512vp6dkxnxhd0qp8hdsdd4kv"; -"babel-swedish-2.3e"="cm247dcxa00d3fwnfga09pkixp3q69sh"; -"babel-swedish.doc-2.3e"="zj7qbwmxql2v4zy1ax5xrfvwyjwnycpv"; -"babel-swedish.source-2.3e"="wbx3jh5cy31lwjyf4qqb0gryysy88pqg"; -"babel-turkish-1.4"="f9xzk8x8q6gd734xa2kyag3j3lcij81d"; -"babel-turkish.doc-1.4"="43yq2kcxf9gjh1ajnahxia0vbq8sv417"; -"babel-turkish.source-1.4"="yx5ihjbky6ls36nx14lxbvjswasba7vl"; -"babel-welsh-1.1a"="dcjbzz80i41bpzb99wdhb84h60y5qg1r"; -"babel-welsh.doc-1.1a"="5p0mqvs4npnz3g6a08hqkf03n2w4pdc1"; -"babel-welsh.source-1.1a"="9fx2i5lxyf8qc0brlrgas2ajzf013m6j"; -"finbib-15878"="aja1ihjvva3aa86xi1f8d563xvlcj5mb"; -"gloss-occitan.doc-0.1"="8wfn7as272hvm7nxz0i5m48bf94b5m0z"; -"gloss-occitan.source-0.1"="qv9zd6r6rmjbfsndm7qgsz7x6xkr14ms"; -"hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x"; -"hrlatex.doc-0.23"="lrx3m4bg9wlqlrcd08mh90wal16fvilg"; -"hrlatex.source-0.23"="s5ajy6yi6nzivfwafk5ymav4j2dcgif4"; -"hulipsum-1.1"="1glcsnk30qpbxcd522vi4ddnhk3zdqym"; -"hulipsum.doc-1.1"="py5pklwmr7i1w63rhkysxw5s312i22fn"; -"hulipsum.source-1.1"="m7il2x4h4zwivgzxq9zzlc57xdd64m54"; -"hyphen-croatian-58652"="xfaba9fc5nc5d6akg9dbzanhs5ik03j0"; -"hyphen-danish-58652"="cc3hb52djljnrsgvv799hb0iwi4by441"; -"hyphen-dutch-1.1"="6aab3qr3i70ky09w256l8rdpkr1hs40r"; -"hyphen-estonian-58652"="z0z3kj73bc54sbhwnaills2ck8a4grb4"; -"hyphen-finnish-58652"="klp5hh931n7lhh607sh8apdna27rn5vg"; -"hyphen-friulan-58652"="kdi4b0wkraiv1h35ll25lnr5bbqii38i"; -"hyphen-hungarian-58652"="8bl805dn05g0bwkwyh2xcih8nh67vkfc"; -"hyphen-hungarian.doc-58652"="ycdkj87kpnvaxc5szx0vcacy8rg6i7lj"; -"hyphen-icelandic-58652"="35qvciy9gvnsva5iwxvrbwblcbwyr4fa"; -"hyphen-irish-58609"="6xh0w7ch63zrrima22k2gqc28n11wigg"; -"hyphen-kurmanji-58652"="inifz54iax8z7hw7zvalp5zcc31dr3nz"; -"hyphen-latin-3.1"="wvhrxyl61wpl04izij0g7464phxhygic"; -"hyphen-latvian-58652"="livlv0vqfzrppski6i8m437q0fc12scn"; -"hyphen-lithuanian-58652"="bfdnrgdz8cb239apy8136asp6fakcppn"; -"hyphen-macedonian-58652"="2gridvcfsj4l3sdsfcwsjh52qb4hl5mw"; -"hyphen-norwegian-58609"="8zyqcrxlbi88mlw8qjcg8ssng98dzv42"; -"hyphen-occitan-58652"="4bxv588sldpqy12m8b8yzy04pxlw5wpq"; -"hyphen-piedmontese-58652"="6m6d7h8g2dlxv68pqq9d057mz7y8l865"; -"hyphen-romanian-58652"="hp1fdvm0b9rk4lk6cfr0qzilz94vcn0s"; -"hyphen-romansh-58652"="dsskfiivm7191gpl79017x20xrkqmbyy"; -"hyphen-slovenian-58652"="81kfnmpf3mc4wa6fir8dxac6ly3iiwph"; -"hyphen-swedish-58652"="zs6knrma5ngdr03fmhjc9qy25225yryj"; -"hyphen-turkish-58652"="bqwi6m8j33p54dii3i6a7hvs07swlsvs"; -"hyphen-turkish.source-58652"="4xv9azgkq91m4afsp9kvsq0f9ajxqfvl"; -"hyphen-uppersorbian-58609"="vfms8wd9mx5sx0phc8l56k3rmlas9rh9"; -"hyphen-welsh-58652"="r7k8sgvxdd3bnclyprwj3idpf06j09gc"; -"lithuanian-46039"="p7vd2rv8md0a1gnyd9jj1ill09dfxmk1"; -"lithuanian.doc-46039"="x4nf13nhkbrn2cnn9gi06zavch8hjr4r"; -"lshort-dutch.doc-1.3"="rswbmzd9fkb0bwbc054pb0raa8zv2lfx"; -"lshort-estonian.doc-5.05"="2xqk5n14f2lizqdisir199mark4y5v2k"; -"lshort-finnish.doc-15878"="5jp8rkaw7qvrv8mpdnbmhg0m53566n8c"; -"lshort-slovenian.doc-4.20"="1w0g2p1l4p456wsx86ihdpadm8lhhcgn"; -"lshort-turkish.doc-4.20"="py0d16ij5gswbli1bgi4z63vajsahwjp"; -"nevelok-1.03"="v5hds3a09c91d79iac1qsyf0mr6lpaqg"; -"nevelok.doc-1.03"="biq2dbyv6mak992s0cqb834k119xfa0p"; -"nevelok.source-1.03"="5c03z6r25gidf0bncaanw1259n1hcdw0"; -"rojud-1.2"="z3b1grijbh986rpa49fncmfwj3lkjmcs"; -"rojud.doc-1.2"="xv1iy0filv53va4r8f99710ahb8cd0h1"; -"swebib-15878"="5z0719m62712flc3ylrnp5223gbsk98n"; -"swebib.doc-15878"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp"; -"turkmen-0.2"="r8ryr694sxginv96wy2ibwg7mjwckmy0"; -"turkmen.doc-0.2"="ry7di8dm2nk9gbylnm58zrmlpilbch55"; -"turkmen.source-0.2"="jab2389x3cj6hhg0imkfbjcglclqap2s"; -"aeguill-15878"="2qlipazg1v8pj58aym9zwqqzfvprw29f"; -"aeguill.doc-15878"="q4gvvin01hkwmcc2llrkd61pr6dsmwp8"; -"annee-scolaire-1.6"="r0kwlnx1bhflkj35dwz9malgjhjhf3fy"; -"annee-scolaire.doc-1.6"="3rc70b93ciiw5r7mq5rpfd933ccbvh7p"; -"annee-scolaire.source-1.6"="jbl0zrqvrndbvpdn52lm212b95bv9k86"; -"apprendre-a-programmer-en-tex.doc-57179"="x4qrlzv0s9prq4hjb20kn0dcff7xmgzv"; -"apprends-latex.doc-4.02"="fy3lj0gsk1nkcfp2ssyfm26a7ih2ysf5"; -"babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa"; -"babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk"; -"babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33"; -"babel-french-3.5l"="sl1vn19njwbvy86dsx3xcixvc5kx925r"; -"babel-french.doc-3.5l"="mh277xcfj2lql9dpqfwr5ms75fslk290"; -"babel-french.source-3.5l"="rrgl05jg8dsdn292cz2pwr6mm765ca8g"; -"basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj"; -"basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n"; -"basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f"; -"basque-date-1.05"="yj2akqid1c810hqjl3giy4yd6dmcz8jh"; -"basque-date.doc-1.05"="kg7m3skhba5kp2iwf6s687l9r0n4yq8k"; -"basque-date.source-1.05"="j1ad62kaxq7yf7bm1l4vgzzwjswhrxj2"; -"bib-fr-1.5"="d2v9lhayizx8carld94ica03ig34mjsi"; -"bib-fr.doc-1.5"="21c1p7mka1a4y2qc5b8wqj25h4il9pjs"; -"bibleref-french-2.3.3"="2svzj11s46m1hiwfdd2flgyf5yhavc1i"; -"bibleref-french.doc-2.3.3"="2rq73q3xdd9fxpj6nancvh4whbj7c3r6"; -"bibleref-french.source-2.3.3"="93vrfm7va8s917dln2x27j7qqvhf8y7k"; -"booktabs-fr.doc-1.00"="8nmky9zjr4s9s8kikir9l4w6y69yk1vr"; -"droit-fr-1.2"="kqd2m29if8y21y5l72z5k0f6dafm95sj"; -"droit-fr.doc-1.2"="ss2xw9f26frzv9m2xvwbmvgagdhabc69"; -"e-french-6.11"="y1yab7pd915kbnwi20zair37a9haf2is"; -"e-french.doc-6.11"="9dcj407a8vn2j4h3q54s2wrbj5fiawm1"; -"epslatex-fr.doc-19440"="7kqdhx5drijbah1yl3vrwax3cnxg5zdk"; -"expose-expl3-dunkerque-2019.doc-1.2"="bd5qbhbkk8dvbcl434mird26c7dgy3js"; -"facture-1.2.2"="ys1fq6vkml8gnfc6bjkx2lkbdw2w0fsn"; -"facture.doc-1.2.2"="ij99my45fi9m1lcc79rj6kyxggmv4v3r"; -"facture.source-1.2.2"="aywgffiyigrwxv9lipf7a131mycjp839"; -"formation-latex-ul.doc-2020.10"="lwwcc5rjbnqccskh19scmf6zsy85a4ra"; -"formation-latex-ul.source-2020.10"="hc8lyb7812bzqfaps76jk8fjyfsfbfn0"; -"frenchmath-1.5"="9farb3by3rv5q3i791d52aizc1z9h57q"; -"frenchmath.doc-1.5"="z4y6qbx3nc5rnqizjfk3rwsmzia6cgf5"; -"frenchmath.source-1.5"="sz9288008axr9di9bnrkkjcf9pmzm0pi"; -"frletter-15878"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl"; -"frletter.doc-15878"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h"; -"frpseudocode-0.3.0"="d088q642bl3bnaz4lfla7sr73rg916l4"; -"frpseudocode.doc-0.3.0"="f8dypi9jx2yc1xmp4jd0hsjrfg9wpsnp"; -"hyphen-basque-58652"="a4067hkbl5wnwyphjqd9b6gmqdpqy78y"; -"hyphen-basque.source-58652"="vq3bxdrcsgdmiqfjxfcy9w5jihxf78qf"; -"hyphen-french-58652"="vg6420n45z9g8h587j0gg1y7vmm4732v"; -"impatient-fr.doc-2020"="sjzbiaxr5cvnqxn7bylr5zhrkq46l1v8"; -"impnattypo-1.5"="ypvjmb0ys3c5f0mdlcsiljjb94h567wv"; -"impnattypo.doc-1.5"="q72pgsqjgmxrgclh3lziqv83h1r6020j"; -"impnattypo.source-1.5"="z4vzzjjhrxpaj91zqhzg6mx52av49qkq"; -"l2tabu-french.doc-2.3"="ncl8is1rmnk3n9ybrsav882w5qsb1w2k"; -"latex2e-help-texinfo-fr.doc-57275"="7ifzcfqj7hsdliym14msbjvjimh2r2y5"; -"lshort-french.doc-5.01fr-0"="33vkjmz23zk2jrzyw99zri58jm0cpxax"; -"mafr-1.0"="vl6jgzlqqyn70cndvj91nnkmcxas15j8"; -"mafr.doc-1.0"="v44yahqn2gnnfbnf1ayqr96va6y49aij"; -"matapli-1.1"="z7rrjrqpg55jvva8dhflvvq4qxfmkv83"; -"matapli.doc-1.1"="wrc78syycn2i4vpqdlfbyw3l91hym0g5"; -"profcollege-0.98"="mmaksdp7rilyaa36fhq0dvy3827ci3f4"; -"profcollege.doc-0.98"="cfvvspn4s8f3kypgqskax2ybsc4ki267"; -"tabvar-1.7"="2advqwyg0ahn8xfid3639ivz56rpgkq4"; -"tabvar.doc-1.7"="7zcvqmdzaj9cg0nwyns5720g5jsvhr84"; -"tabvar.source-1.7"="wr3y7w9bb7zdjapiv3w3g1bxndrlirfr"; -"tdsfrmath-1.3"="5nz3qrfq13xyhabzww6092mb13014rhj"; -"tdsfrmath.doc-1.3"="8nnvlh3hw79z3k6c6vsvgnvkq814ldsv"; -"tdsfrmath.source-1.3"="3hfid9ih338p675pz6440f3ds5r3s646"; -"texlive-fr.doc-58579"="zl3s2iahkv179vx5r2rpvsklwispayh8"; -"translation-array-fr.doc-24344"="yia92yfpyrwv26vh12kks8arbsda05z4"; -"translation-dcolumn-fr.doc-24345"="acapy2zx06rsxwg810avmphyjjxca6gi"; -"translation-natbib-fr.doc-25105"="8yvcb3s928s5lldgy65idpfw23pb46z2"; -"translation-tabbing-fr.doc-24228"="64ix6i3bvaniiw7xj42bhqqmzv474lfy"; -"variations-0.3"="md5bnc4jaiva00gkdjyd63x67hyd09si"; -"variations.doc-0.3"="pxbpjpnsfz728czc4pjfy2nfr88dzmr8"; -"visualtikz.doc-0.65"="2rc26mlib7xnlpgc2l82ky4fcpyv7013"; -"apalike-german-54080"="hyclqnv85va4qmrr89zz8fhsfyqkqx3z"; -"apalike-german.doc-54080"="gqfzgv3kxzskvw0j6n23vsrs8b70vavv"; -"babel-german-2.13"="49ppqr4pq0cxhfh6slp1hksbb33z4nyd"; -"babel-german.doc-2.13"="4kvyx13cjidacidys46nqypsnhcs1lix"; -"babel-german.source-2.13"="nanhfc2zxlrabv2486yf1flm1gs9lxcf"; -"bibleref-german-1.0a"="wd8gzs1hrjyq9dmsjy6ss1qg0krlrzyd"; -"bibleref-german.doc-1.0a"="yc6vn69gsdsl3vxhg6klip8m6wkffyy0"; -"booktabs-de.doc-1.61803"="wcz4xqg22sijz3rczwk6nfnb0pk074ih"; -"csquotes-de.doc-1.01"="bksp4f2zywwkv5qw4njincxbpgcvz7dg"; -"dehyph-exptl-0.7"="jxsyyxrvgnrp9wh1hs5cpps42lg00mbl"; -"dehyph-exptl.doc-0.7"="7rqw83a7rjdiwav4hvc7l4g618g3yj4p"; -"dhua-0.11"="4n8cvm61marrsbxd7308xw089j0q2wlj"; -"dhua.doc-0.11"="kisr6kymm9v5kk9nfxi0ckdf6k8mhr91"; -"dhua.source-0.11"="a9ap1rwrqqwh394c6hjqx5nlw070iwp6"; -"dtk-bibliography.doc-2021-01"="k5imw7ij0kdicmqipk5f9njhinb8cxr6"; -"etdipa.doc-2.6"="cid5wjvbs4hl5lwczp1s1wbdwxfwr24n"; -"etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx"; -"fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py"; -"fifinddo-info.source-1.1b"="dpl4j9iigb7q8dqi5srykpkr1syvcnpm"; -"german-2.5e"="mwin3zb743v74c97aizyiy86zj1pmdi2"; -"german.doc-2.5e"="invdh78rq8chiirzdlvijssdah8hsyk2"; -"german.source-2.5e"="zs1qxbd8r3bfyq77vaak9srxjxxn213v"; -"germbib-15878"="g11ayb7d5hj8s77kn9zvkvgfhdb0f4nf"; -"germbib.doc-15878"="vskc1hanqpmdm6p0v2np2slblpy8cf70"; -"germkorr-1.0"="szywjh1bj2jqc6zqs5d1y1dwxq9h8540"; -"germkorr.doc-1.0"="bycbcbfrqs1r8l939kdm9f6s395rc5fh"; -"hausarbeit-jura-2.1.0"="8j8q1xphy3dq2iz56p4p686ld2n9hs1s"; -"hausarbeit-jura.doc-2.1.0"="z4jxmrsysgbkdgqnnqw4qkg8al95qgkv"; -"hausarbeit-jura.source-2.1.0"="9666vwqnxpa5yc5z1v949rzwb7z0mdvj"; -"hyphen-german-58652"="4x92isgn5wglmhz2f15gyb3i07gc6iqv"; -"koma-script-examples.doc-47523"="rzy2nsllyfdm00lrllk3k8i8yxgvppfk"; -"l2picfaq.doc-1.50"="35c7cwi94qazkf5351kj5hl58xil9nms"; -"l2tabu.doc-2.4"="4sab9w752r7xr6l9a6sxig4q0sdfvfxr"; -"latexcheat-de.doc-35702"="fjpnrnl8fkv5lnvhg6rmijic0k2yshrf"; -"lshort-german.doc-3.0c"="aplln16lhlxfrck1lgjgsrng7zbgpsqr"; -"lualatex-doc-de.doc-1.0"="9l7ac63knl5cd6lxmrbnmjj8s0nwp5bh"; -"microtype-de.doc-2.4"="22zsps3wqlz58x3x1i3wadbn5jp9mba7"; -"milog-1.0"="lz3w4rhsgbl699hh8431yw6a9si6y9yy"; -"milog.doc-1.0"="zf9qx558g8z5xl906x391c6hylz57x8x"; -"quran-de-0.2"="ff9jx5anj2mzsqkqqjblqzignl01iry3"; -"quran-de.doc-0.2"="zncdmrlmzcnmcw7jnl6vr1cgh5v59cjg"; -"r_und_s-1.3i"="8vn7cjc42dvny30pkgp768yy87z9d2b8"; -"r_und_s.doc-1.3i"="pk63m1jl1yzz2xqiwynpph3nrlri1hkl"; -"schulmathematik-1.1"="80jw085z3w9wchjnwhk180fmn4abgq82"; -"schulmathematik.doc-1.1"="yj5f6phsnrzb2zpy2lf8j77d3kdlfddc"; -"templates-fenn.doc-15878"="yy9rn7m9r0paxvya3icnbqwccpjkkbij"; -"templates-sommer.doc-15878"="6n6saza6xd8mjys1ckfy0362sdya4616"; -"termcal-de-2.0"="pql7q4dqaqgg0arqgg7l8iz4hwxrxd7x"; -"termcal-de.doc-2.0"="fpjnpzi59rrqg44j513w4d6f9cqi7ik0"; -"termcal-de.source-2.0"="myc9fjxig0z3dirj1brla1q70ryrczrr"; -"texlive-de.doc-58648"="g1d98sq8c3s0a9xwh1mpgcnflyjp94j6"; -"tipa-de.doc-1.3"="aa0msh91ynxxigmbxwy72i05g095fwxg"; -"translation-arsclassica-de.doc-23803"="xayn50bvfkyf5fh93426fg2m6mmvpdwc"; -"translation-biblatex-de.doc-3.15a"="7zywqngwjg4k5za1l6v7r3xw4rcvh8yf"; -"translation-chemsym-de.doc-23804"="khd057lr5p42wqz3p6n58d2z25jdknrp"; -"translation-ecv-de.doc-24754"="7yrn8n7071yasf0lpswz8dis0vkjg33g"; -"translation-enumitem-de.doc-24196"="8c46h1y6mpz736w2nh01jkh96n0ar2jx"; -"translation-europecv-de.doc-23840"="541qkhphqn2f3bba6prrf2npqxl022ah"; -"translation-filecontents-de.doc-24010"="9c59fnc6krcsswc3hsd4aimzfvycqp59"; -"translation-moreverb-de.doc-23957"="1j0hyf240k1q27li0dnnw0cs4mi2j86w"; -"udesoftec-1.7.1"="7b8lzicjalp3cgls7lfjav3bpfpxswfb"; -"udesoftec.doc-1.7.1"="5qbbj42a6cq2zjqlk7krzcxmqrxxbifx"; -"udesoftec.source-1.7.1"="9691mzdw7rax33x6mqxrxcb3vvyhawq1"; -"uhrzeit-0.2c"="5fwbnq0kjdcd88bmf0yscqvz1q47rlgx"; -"uhrzeit.doc-0.2c"="22iimwpxs90xz0c6l9v7aq6l4wqm39bl"; -"umlaute-2.1"="097i2xib6dk7g0pbn7h5blv9jnny07b0"; -"umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9"; -"umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w"; -"voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v"; -"babel-greek-1.10"="17bc657ll0aacq85s967yypmalya2krv"; -"babel-greek.doc-1.10"="3h72jkrqpa3jjw1091gix8rvwgwy78j2"; -"babel-greek.source-1.10"="yhx2b0dnjfy591xj1c2qw24hf7npwqii"; -"begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i"; -"begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc"; -"begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5"; -"betababel-0.5"="0sk4kkbjx7swjxgrb3xiy1m7933avcz8"; -"betababel.doc-0.5"="3pd2x8h9mybnwkg71irzkn0n2rd0a8rc"; -"gfsbaskerville-1.0"="vjawsy59q3xnr1hmzpjr1myqyb6f7gzf"; -"gfsbaskerville.doc-1.0"="7sx91lqgpn4w4xgbdbpsk41i5mxixqf2"; -"gfsporson-1.01"="k6gimiba8zfbnf4wc4zjrmwwc7ggnxkg"; -"gfsporson.doc-1.01"="6i47g0k5ys9q394g6q0a3686q4h75gz3"; -"greek-fontenc-2.0"="qcxq329yb8malcjbjc39rdylna76qvy8"; -"greek-fontenc.doc-2.0"="884sj5a8wq4vkjhsr9nnqzjjckhg59ah"; -"greek-fontenc.source-2.0"="2sjrw0m2an6m9gyrzx9dy0zj22yxjnlc"; -"greek-inputenc-1.7"="4fwqx35kx5yqpbg8hy83pgpm45gm1q6d"; -"greek-inputenc.doc-1.7"="1fwpw7k0xwbfgp38dxr9vw4hds93jbhm"; -"greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v"; -"greekdates.doc-1.0"="lyhisq5vmvxpmc1g59dxnpkxnvziddzk"; -"greekdates.source-1.0"="dy4cbvglp6fv0fd13mlm4x5wjfg97889"; -"greektex-28327"="zmms6d4vix6nzw6jc06iir73wj9swvir"; -"greektex.doc-28327"="p5f90xphw0ck7p6iw2gz6anki05v2b9y"; -"greektonoi-39419"="agnjlz6cdb3figh8g8kfnqah4ppzqqci"; -"greektonoi.doc-39419"="8mh04p3y9jizn5zdm63vr50nzk0rjcyv"; -"hyphen-ancientgreek-58652"="byr3wv40xc83pckkrbjgsz5lgpai72l7"; -"hyphen-greek-5"="kfiy4x85sxayg6418fq4xbdxkzaqk3g6"; -"hyphen-greek.doc-5"="r6v8qyqkrvnqn6729i7p3ah3vmgxnzrn"; -"ibycus-babel-3.0"="m0m76cgm1k930h85s6hi9qnlh86gf8z9"; -"ibycus-babel.doc-3.0"="fyc9gdakl47jq7p76pxi9l3ggqsqfwqg"; -"ibycus-babel.source-3.0"="samw380w28p4621z2f9fav06i9dzj3b0"; -"ibygrk-4.5"="3xwia8yqznfai0wjz7rc63dizdfc3n94"; -"ibygrk.doc-4.5"="ydy3swiwjr9r1j40fhkwhd2d7z614ipa"; -"kerkis-1.11"="4fdpjk9w3idk6gnj6m4hwrlqcxgwwl32"; -"kerkis.doc-1.11"="h0vmj6xbqzl50158pn1djgpkpzc2hy59"; -"levy-21750"="isfhykz3fkajjygnpl7psd2n9n9lzfwy"; -"levy.doc-21750"="y92455xr0yq62ppxd650vvxaknkb5qym"; -"lgreek-21818"="64pdy6vj1q7sg23xg31pw0mfznahcvzw"; -"lgreek.doc-21818"="iwa1xfg3sawwblifpgkc3na1r3hld02r"; -"mkgrkindex-2.0"="v5hb36lspx6xyzzpm8ryprr7mwwpcrm5"; -"mkgrkindex.doc-2.0"="mfpkm8mm8n0nqhzgnm70yjy16lzjvvhd"; -"teubner-5.4"="8g3543b6hs7c8nnfvppk9fzskw46mcg9"; -"teubner.doc-5.4"="1630zxsvnhjcfp6jwjpkbq6vv4q1wyzq"; -"teubner.source-5.4"="r1gy61lbnzdrkxwafxhprd4bgb0jbi1f"; -"xgreek-3.0.1"="742vxyljmp433rk26ap2rjqbfd7802ys"; -"xgreek.doc-3.0.1"="qdgh9jnqimis40pf5gj383j01ynx4cqb"; -"xgreek.source-3.0.1"="33imiba9m0sxmjxilflqzsysgr7vdv1q"; -"yannisgr-22613"="0pjpl0qghjh6qdgy7snalxyxw6ca6cwk"; -"yannisgr.doc-22613"="jx7mj6aw24ff9k4qcr51kdlk7xwpiflc"; -"amsldoc-it.doc-45662"="3xqg4bjhsk0r27g7absrq84nwy6zy265"; -"amsmath-it.doc-22930"="mrz7iav2jpify9h3vz703x863km3vb9r"; -"amsthdoc-it.doc-45662"="bpi907wji0gimbc22s86vg3fwv6fkpsq"; -"antanilipsum-0.8.1"="xs57fn5s9vqxy5d4vdnrkahsr2hw7gsk"; -"antanilipsum.doc-0.8.1"="0i3f9szqj3mkwdabl3rv6vlhcmyp760i"; -"antanilipsum.source-0.8.1"="gx0qxfv9x2a61lgskxjhqh2gcbhl0vb9"; -"babel-italian-1.4.04"="kdy10mhrd33inhg65a5n54ails7vgajg"; -"babel-italian.doc-1.4.04"="p3y3vccyihrkr4h1fgdismzxz19y57yw"; -"babel-italian.source-1.4.04"="wldaqvmicvdid53jg4mryg9fsl79yfjv"; -"codicefiscaleitaliano-1.2"="gqzlc6agkwysk75lzdxbkz4azawzyrjh"; -"codicefiscaleitaliano.doc-1.2"="c7spaihgf2fdimihsg5cf7xn5bczkw97"; -"codicefiscaleitaliano.source-1.2"="vxi0halq6yx9gwd0vkcmjx6am7dnjjg1"; -"fancyhdr-it.doc-21912"="nl2xsg3mppyni8ns9zij452dkkw4ayj0"; -"fixltxhyph-0.4"="gkadi0h5794bxkkb809162a1z7aicw78"; -"fixltxhyph.doc-0.4"="l2xq1rsc95fbk3saqnx86l9d73mvm92v"; -"fixltxhyph.source-0.4"="4nhcwfdf5gs7fc5iy5fph8yiq4wavjp3"; -"frontespizio-1.4a"="mqcrdj4b2abhq70zx1alxdm6hs3n4xnz"; -"frontespizio.doc-1.4a"="g6i79280jdkwhp4q9l69h7icm11l78bl"; -"frontespizio.source-1.4a"="gmdqk3hajrn0k5dhcdmyn1a7vxz6f3y7"; -"hyphen-italian-4.8g"="wpzx9zdasrv68604ldnmiz4szkcxkk9k"; -"itnumpar-1.0"="39ydhr855c2sb1xwfd12v61pphzmbc7g"; -"itnumpar.doc-1.0"="2qdpfrsffqfqvd42nn8yhicp8p3vvzk5"; -"itnumpar.source-1.0"="xd2bbq62fn23gbii6147m3n1c16pcgjb"; -"l2tabu-italian.doc-2.3"="p067k2azmr27v0dqbs6vkjl0dbbxywds"; -"latex4wp-it.doc-1.0.10"="7skz5gny3wm7s5h1sxqxjwgk5w5qr45c"; -"layaureo-0.2"="7qqhm139n1afxdpsmikzdyn7pn09hv9x"; -"layaureo.doc-0.2"="pf22ypfazq7hwxpfiidcvkd24zs1gys3"; -"layaureo.source-0.2"="3q0ixl7rw7sz7n2bfd8gyfnglfcq2hcs"; -"lshort-italian.doc-6.2"="r33gvxp6z6qzn1hfl3zcc0356514clmi"; -"psfrag-italian.doc-15878"="xb8qlcz7f0za963yybhjvbyjq37z516f"; -"texlive-it.doc-58653"="157hmx719qrgsy7723wgcmafb013k7h7"; -"verifica-1.3"="dm0n4wlbvx5621ldhj516pvlidqiigkn"; -"verifica.doc-1.3"="2pfdvki7wk8fhah50knvh01yq721yw30"; -"verifica.source-1.3"="n6qmhmpx4f2nhjinfqh1z3h370lx40mj"; -"ascmac-2.1"="5fiwx48hj22yr2f0x9q37jgwpvr7ixrm"; -"ascmac.doc-2.1"="nmfb4d9b21bsr7nqg5bgprxakj82ryy3"; -"ascmac.source-2.1"="9d6l1w7c7g8g88vfxxflrqhvmnf0miad"; -"babel-japanese-57733"="rpvw9g08l38mnmavd9mq9xckmbaky9ah"; -"babel-japanese.doc-57733"="28b08rnpyswdl254fj2xnksrkaapsb21"; -"babel-japanese.source-57733"="4akcq7klpblwll9p7c7d7vhb8r2ra48h"; -"bxbase-1.2"="cmpmcxr25044s63nagvkzb6zv8giyqh7"; -"bxbase.doc-1.2"="na2vh2jak4zvmibrpkis6jr21ly00904"; -"bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z"; -"bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx"; -"bxghost-0.3.0"="fmg8agh5563jny9106kxzn6ac0y9ypcc"; -"bxghost.doc-0.3.0"="ybrg38lhjrc3jfadkn3h9vacy2zwhycb"; -"bxjaholiday-1.1.0"="sqraclljhkpsgq4h9zvy3in7g6j85rrg"; -"bxjaholiday.doc-1.1.0"="d3cgw8izvja5vk7xhdy54rflgcs6n3in"; -"bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c"; -"bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh"; -"bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l"; -"bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc"; -"bxjatoucs-0.2"="hmb6rpwihwgfi7sq1zpf7yw12ibr17kw"; -"bxjatoucs.doc-0.2"="4nkg3si0bwryyyh0wpqnvkrmxmbnlin3"; -"bxjscls-2.5"="029q2i57xzf5vgsa02kks2vic3q6hha7"; -"bxjscls.doc-2.5"="9lq0jf4v2griph2g3km06p27sw7hqz7r"; -"bxjscls.source-2.5"="b4rz2j1i2h60bvygmc28wp3jy9bay238"; -"bxorigcapt-0.3"="lbrfjjqsjm4n5b7byyrhm1akbmxxap6d"; -"bxorigcapt.doc-0.3"="grspvjmbrcjq91wgi6l3a73y5l7nnl4m"; -"bxwareki-0.6"="rgw2day3m4vr0k6d2mbhrpy8anmzklc1"; -"bxwareki.doc-0.6"="5vh5zrnjy6mb8cg0q2zz1sgb2llz2anr"; -"convbkmk-0.30"="0y0b4dana3gnh74j0y43yp3f8ng0fm2v"; -"convbkmk.doc-0.30"="nvi9mfw8iiw923v54fdi5pk7r93y7vsc"; -"endnotesj-3.0"="p1524a2l6zsh2gl28im4rxzr7afy323b"; -"endnotesj.doc-3.0"="ksn1n0s90shsi65kgw4bppanfsbxrq0z"; -"gckanbun-1.2"="ar3jk8jsw8i2hngzp2dyd14l1r0mcjia"; -"gckanbun.doc-1.2"="jn34wm4nhv9367vzrzyag8bfdg2rcpr9"; -"gentombow-56665"="9i576fvl59r1gna7w5b76skw7hvbziv8"; -"gentombow.doc-56665"="qn40cv4xa1ah7khfpk4368sxqhr2yjqn"; -"haranoaji-20210130"="ylf23apm0i8idai95rgnirwdnqfna5hn"; -"haranoaji.doc-20210130"="5h27mpr4wwp1zgqwdyl4h0xb5fnix1av"; -"haranoaji-extra-20210130"="pksx6gjdxd31xy8qp5lkjmi5fkr0hdxh"; -"haranoaji-extra.doc-20210130"="f5511sw37ak58jazxzsd0nczwa254rnp"; -"ifptex-2.0"="vd33lyik4nfippj7dax3k8rbkpacc3c3"; -"ifptex.doc-2.0"="ii033xhz4lx24hwzmkqgff5w13q38fny"; -"ifxptex-0.2"="db7waqqfn8nrn8b3z4dh7dy846f2zxad"; -"ifxptex.doc-0.2"="y1039vpyrh9k2dyi1xws45a1gj3b6dv1"; -"ipaex-52032"="pxy5kyyznzddkci3pzdb7fla8gsfsqm5"; -"ipaex.doc-52032"="bv4h64z9gnd6jf3mx85b45dqxalicjcl"; -"japanese-otf-1.7b8"="lfmgwq314glhgy5pxjnfsnrhw3rxyq89"; -"japanese-otf.doc-1.7b8"="b1j34w3286splmlsshl5w59lsj0fccvq"; -"japanese-otf.source-1.7b8"="913dx9d29szxr89bfmc77kcn3k5wj79x"; -"japanese-otf-uptex-0.26"="3ckjzz5j3xbrkggjszwrw8iqrmb5k4cy"; -"japanese-otf-uptex.doc-0.26"="34404k1jv5ibhc08fqvmxncvclfbwy7a"; -"japanese-otf-uptex.source-0.26"="s71xnfr7py2v1f7xrzlwiw2h8ps7pn7a"; -"jlreq-58472"="g8sa7ki6v76j1wjh4ghdj9jbcdcjrkpd"; -"jlreq.doc-58472"="lcirqbpvfnimmwqamsz22id5qn5snkmd"; -"jlreq.source-58472"="w4gwx9z1h9a8qwsnjnci4xw73v2j18bz"; -"jlreq-deluxe-0.4.0"="5856y49i2vliffb1gwgad1sr331iz925"; -"jlreq-deluxe.doc-0.4.0"="992yssqszsfl0qps7r22wvzcrc51np2b"; -"jsclasses-56608"="bq7m6pjhh3mh3z3mvklgr14wnpixcl21"; -"jsclasses.doc-56608"="jfla9xn8wymcf6m1hf85yqi6l4nmwqwc"; -"jsclasses.source-56608"="skfshlzg14lrx40lhxp5vw21wz5f7m56"; -"lshort-japanese.doc-36207"="5b8svqq4w1ipn3737s73pk969s8yv63d"; -"mendex-doc.doc-50268"="vp31541i0l4rfkijbng5zj0q4cmbdz19"; -"mendex-doc.source-50268"="2w1ibgiylpczrzp9xhl7lidn8y2yhnn6"; -"morisawa-46946"="41dcbs61zpdhqnc6qbzcfkq0nrfgfirl"; -"morisawa.doc-46946"="cy0li43jphfx3x8x2ddf57f040s8ygim"; -"morisawa.source-46946"="jhdr4xfya5m21376a8cmnzz4xfr8qh9i"; -"pbibtex-base-40986"="nix33k8m51bymsgnmfz69mwpllkk9rhq"; -"pbibtex-base.doc-40986"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n"; -"platexcheat.doc-3.1"="khwx5x4r6aydzhd5rkv7h9lf58l27494"; -"plautopatch-0.9n"="v0bd97ln794xvwhq8vdl3hi6cbqks708"; -"plautopatch.doc-0.9n"="n92y48b37w1n0dj07q3lxni0c28q6815"; -"ptex-fontmaps-20201227.0"="vfr2ryj599njmkx4iibb1i6crjcaz1lv"; -"ptex-fontmaps.doc-20201227.0"="ir2hb9xa03wfn6kl06rml0xv9066x2ac"; -"ptex-fontmaps.source-20201227.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq"; -"ptex-manual.doc-57128"="yqn4cbbrdi468hj4s7bl5wycnzcgds1d"; -"ptex2pdf-20200520.0"="n51vdwpxcdyb0w3bxi3d9i2b6gh8j3ij"; -"ptex2pdf.doc-20200520.0"="xy5gdmv5jh3mlabwk74hcj1b2g9qrv8f"; -"pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa"; -"pxbase.doc-1.1b"="n5ns9b3vpa52b78hhgbvg0114faw0dgi"; -"pxchfon-1.7e"="c05axsnaw9n2gghs2l3yvnw4i9b8bj0k"; -"pxchfon.doc-1.7e"="4pimmbvbbjnrpmnh11y75rk0ahj3d7lz"; -"pxcjkcat-1.1"="i368i8r85baiimnwh2rfqd0hfrklw8hs"; -"pxcjkcat.doc-1.1"="hcxxg9rg6d64hwysf6nlvfhv8h360168"; -"pxjahyper-0.7b"="aic3wmr9y2wmbfmq3qz7l90v86jn1qrk"; -"pxjahyper.doc-0.7b"="yl7hbay6yyi4xm4kx8fi3x8lhmw16kd6"; -"pxjodel-0.3"="81408a28dnm6qxf1fvdzl9892bjgw16d"; -"pxjodel.doc-0.3"="9gpcf45l044gd9z8pqvag7apcnfy407c"; -"pxrubrica-1.3d"="hf3yknd05zdmra907l5jciah3qpsw7bp"; -"pxrubrica.doc-1.3d"="129f964d7ya9bybf7f347pph201ps388"; -"pxrubrica.source-1.3d"="bkazka916yi75nj9xgj0ma5xnpxwzib4"; -"pxufont-0.6"="88rvij6qa4d901vnmhahn1dmik47xjr2"; -"pxufont.doc-0.6"="vvrjjns1nfgk36wlywiayk6v02a0h8q0"; -"texlive-ja.doc-58581"="v6d9imh79dghzn7z80lrr5bkvgm5bx6p"; -"zxjafbfont-0.2"="gqmmwcbw81z91mwqf731jk0mgdfiw8d5"; -"zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh"; -"zxjatype-0.7"="8wfcvfci8mj8ikqpfa1s4km4c46i3hb5"; -"zxjatype.doc-0.7"="qp9vrpjyjxma8bi3yhkdbbxv0db2l0mr"; -"baekmuk-2.2.1"="yrs4d6j382fxfn4ncmp27af5xjrv3xs4"; -"baekmuk.doc-2.2.1"="wprw23q0ksga33zysqi5478xpi5izqsr"; -"cjk-ko-1.9"="84cm9zzimh4nplwb35hy7xdbiaxdavnl"; -"cjk-ko.doc-1.9"="3b5kvk4dyirr87j6a1f7lp0q5m5k78q4"; -"kotex-oblivoir-3.0.1"="056bd28dyh0s19634hb0cd86q8q9r5zb"; -"kotex-oblivoir.doc-3.0.1"="6h9x7zkk6wz4i9v5gqbiz75wj9zp6pal"; -"kotex-utf-2.1.2"="x3j8gcy8ylvgpiwyrwrgl8wjj9gdrp63"; -"kotex-utf.doc-2.1.2"="r61iwnwwvwh1999l4ylczvz0d6l9ff1f"; -"memoir-3.7o"="9wk9mabw6yi13xz6dk73cyf7qxcis0b2"; -"memoir.doc-3.7o"="zbncsaqw0lx20348hpmkj4cxr86zhksa"; -"memoir.source-3.7o"="xg01124jnwjsmvj2zng0gj9ynh1vzyvp"; -"kotex-plain-2.1.1a"="wa5ifv962vi96ikyv53b6x7wg1fi67c5"; -"kotex-plain.doc-2.1.1a"="drkcvf3nb3kkvp63mw3xdz80lvn92w0j"; -"kotex-utils-2.1.0"="gvq7vg419f2wqzl6xp9mcffclvh65hs6"; -"kotex-utils.doc-2.1.0"="xl1v4i3j2wlhdp0rkjkn0d9b11bwlf4b"; -"lshort-korean.doc-58468"="l4sjin8iv3445al6kj4qkh3hpc255rgx"; -"nanumtype1-3.0"="b1wscjlknaslwhpaxxfi8w2drxg1m770"; -"nanumtype1.doc-3.0"="4jpi6pmfq42sbcfzl403niskxg6qnxfp"; -"pmhanguljamo-0.3.4"="dzcgp4dkvgnxp6q7w3nh07agr5ayf0d8"; -"pmhanguljamo.doc-0.3.4"="knal9x0irb95h7as9zhki8fscsggh49l"; -"unfonts-core-56291"="grx8hl97r9gx2abhhwlwpa425yww7w0k"; -"unfonts-core.doc-56291"="icc501j6sh5ix6v72v7lpb0him7viih3"; -"unfonts-extra-56291"="ib9sxr60ylsw9vyvr3wxya8xhq6hv0ix"; -"unfonts-extra.doc-56291"="2r7sls3pa7a3fq9q74dlzhp7yjbwdsni"; -"aalok-0.2"="9sz8pdql2ffdba7c12lfdd15aza6qwk8"; -"aalok.doc-0.2"="pdav0mazy94cfpr590pf1ikg9s5l455g"; -"aalok.source-0.2"="p7rc2vj5c4bc7yxvpiwn31h3mzvp5a48"; -"akshar-0.2"="vnkiyx83qd6ykba2mpwbhz2nsdsqdg3g"; -"akshar.doc-0.2"="spz4nshzx9pn3s8vnwv12iabxpx22pdb"; -"akshar.source-0.2"="nfn416llwic635ywd9zyn5w252hsw53g"; -"amsldoc-vn.doc-2.0"="09zv7q83wc6zg9an9b1x1nvsnqx8bpcr"; -"aramaic-serto-1.0"="mcxkjm533zpz4srgqqbd1asax309lhmk"; -"aramaic-serto.doc-1.0"="2717wqsb2bzap0cjgw8d1rsryjyil57n"; -"babel-azerbaijani-1.0a"="hyp5q2f1i53nwc2fpzrvg73sig4cidi3"; -"babel-azerbaijani.doc-1.0a"="hii173fm6g5kdiai6d26f3zfg1p5bay3"; -"babel-azerbaijani.source-1.0a"="x887igvkinyx05lnir925xva5snhmsvf"; -"babel-esperanto-1.4t"="0zwr18503la5x4gw11ic8x2gbhb5ic06"; -"babel-esperanto.doc-1.4t"="vyjxr4qb3w2nj8a0d51n9k0zrdy56brn"; -"babel-esperanto.source-1.4t"="ngrcz6ixvk4mbpg41jgp38py5ynfqssw"; -"babel-georgian-2.2"="slz23swln354rfmjk3qrf3m6gflcqb1y"; -"babel-georgian.doc-2.2"="zknj2vi3b55gdzq66mxjx4q7j4x3v0hz"; -"babel-hebrew-2.3h"="4mbg393m14m3j2i5sxfznnr486jw83b0"; -"babel-hebrew.doc-2.3h"="arlh4cs388rna2cj734yfi4vjrfli6bd"; -"babel-hebrew.source-2.3h"="8g78490s5lnmgi3h4rxw30cprmqv5mkz"; -"babel-indonesian-1.0m"="q9v0zfb6xbw2q4wa0pa0bray3knhxpm4"; -"babel-indonesian.doc-1.0m"="b9f34f8r7nvdby8z00xw1z56kmd92p2m"; -"babel-indonesian.source-1.0m"="rdb6dd4h5qjsgzqwx71g0n1h41ldfh9n"; -"babel-interlingua-1.6"="sq1l1svm80rfm09l1ys2ha7x0cyg4h3v"; -"babel-interlingua.doc-1.6"="q0zmjgrk58m7ivyi952jr3l0hnicpbxa"; -"babel-interlingua.source-1.6"="v04rpx7bwxjvdl8psjhc8w38krsv837c"; -"babel-malay-1.0m"="72z6yjhaxbkvnvs3x98bp3jrkkyk2ihv"; -"babel-malay.doc-1.0m"="8x81zjk3fmbnl5mq1dzxphhk6ap9sfq8"; -"babel-malay.source-1.0m"="npqm8jnnh4i4kjjsz228ccy6mzg1q5mc"; -"babel-sorbian-1.0i"="b4iwsh01n71p4lmhgbxq5kc7ggri2r2m"; -"babel-sorbian.doc-1.0i"="lx17vb84nc80v8f84v049crzswpzfkj2"; -"babel-sorbian.source-1.0i"="dbsyszdm9nfwn29y5yjlzv5dpj722sgc"; -"babel-thai-1.0.0"="s3h479l6qbpm7ymfmg6v2y7d4cyi2ga5"; -"babel-thai.doc-1.0.0"="yk77akss918d2yfn1halnvfa5635ikyg"; -"babel-thai.source-1.0.0"="s0cvg8q806xl02n8m647a7wl4yvspl66"; -"babel-vietnamese-1.4"="pi8gc005y8hn42hyxrn7p23kbashsv1c"; -"babel-vietnamese.doc-1.4"="5l7qyvppvihhdzcszaxskiscp8xm686h"; -"babel-vietnamese.source-1.4"="y9wmbn3j1f614p6dfciwnvig3v5r9q39"; -"bangtex-55475"="cn3ss5r73gr19dbjlrnvb7icfpbb2aig"; -"bangtex.doc-55475"="7dwz3jgliyn649ns4iqmgjnqn80bv3xr"; -"bengali-55475"="xv6b2ya4hn8bhhfwmi7sziq9qwmhx6qb"; -"bengali.doc-55475"="f6c5pyzrih551k2p50vqy9jfx4ar3svx"; -"bengali.source-55475"="s77yi86avqzhp5lin4dwhbavb41g4q0n"; -"burmese-25185"="gymkq1rr5pmwaaid3dpks3f8ngz3525f"; -"burmese.doc-25185"="yirjf8crgj2a89451jh8iv66qhdqdrr7"; -"burmese.source-25185"="ixz9y2ck9awijs6w9rz005nkvl613811"; -"chhaya-0.2"="lxplhiai9bfxqvpcxlcmllgm1ana0fdr"; -"chhaya.doc-0.2"="xx2hs716bv8jpxfrz00c8zqx9r6ik605"; -"chhaya.source-0.2"="0rw2yfhqgfi49zgn37rqf7m6lqyjv0hw"; -"cjhebrew-0.2a"="nkca25dwl8i1li6q63sv4w2n35z28bdn"; -"cjhebrew.doc-0.2a"="w8jqlvv6cm125d68dhfsar5y7xynac7d"; -"ctib-15878"="gdfzyzhwfcwi275xdrvah86459bsfxx7"; -"ctib.doc-15878"="jy7r4mkpncfmy0djcxvpcvkwjaqxv7s5"; -"ctib.source-15878"="3pfn4qglvw3wjjw4f3jlk5vzq3ci4zj6"; -"ebong-55475"="mhlr9r7i2zf3rm905m527hbnydppaiar"; -"ebong.doc-55475"="pqr96lyawpif4fzp0izw8j0506gnf06f"; -"ethiop-0.7"="fd4kynb70wkja5fxhi10n52mff3s2a8q"; -"ethiop.doc-0.7"="cabq6vprpklsmzi68af6nb4qiwbrwmzf"; -"ethiop.source-0.7"="yv6pwmbkvahpy2h4vnijnqag2rv09k5l"; -"ethiop-t1-15878"="f73j35aqlr29gmh9k00d3s0jzkmk6zq3"; -"ethiop-t1.doc-15878"="92ly98mz1iim1gfh4cm8hjwc17j9kjhl"; -"fc-1.4"="iyjlb5q55khnp515n1snhpnfrrmfn1pm"; -"fc.doc-1.4"="wd9bn967d6nzzvdrvim470l711v1jkg6"; -"hindawi-latex-template.doc-1.0"="pkpg5znsws69jrbjypn09ywy4cng16z4"; -"hyphen-afrikaans-58609"="w3h8j43k50xhwwkf656jbrqlc3rx9v43"; -"hyphen-armenian-58652"="q4b008aqp98gl2g2v5by33imzv97w1z0"; -"hyphen-armenian.source-58652"="0b2gny5672fkb5sd8vb2g3fapx9pl7z2"; -"hyphen-coptic-58652"="hd3cc568q639yj5w1gsf2qd78m04pg57"; -"hyphen-esperanto-58652"="1ipyszpd850mwl2xwkp9hp1516azcwjn"; -"hyphen-ethiopic-58652"="zjp5lahyv02w6c5gqw133l84xzbk19nq"; -"hyphen-ethiopic.source-58652"="9gkipr8pk2mb77s168has3sfgrs7cg1i"; -"hyphen-georgian-58652"="498igs0sfjxd8zlcb8k7kb44c54iacra"; -"hyphen-indic-58652"="vifra7d45c7f02jkfyhymgqqlh375grc"; -"hyphen-indonesian-58609"="5f125q2si90bwa7lxlflnpc820vgki3s"; -"hyphen-interlingua-58609"="gajw8lrnij0pys803lr814qk7xy1qx4y"; -"hyphen-sanskrit-58652"="ivvz3rhzgc4ghc4l8biniics69wif8i3"; -"hyphen-sanskrit.doc-58652"="pjfnjwbksv532x7idr41hvs874f5p97h"; -"hyphen-thai-58652"="fpvq523safkjz16s9i9h24f53p0mdpwq"; -"hyphen-turkmen-58652"="lqcsiy4y08ddkawxv28g1iicz37pn6gx"; -"hyphen-turkmen.source-58652"="c7md4qrdh7hms3vzkpcams5hwl8qy953"; -"latex-mr.doc-1.0"="vwb062hbn3371czg99plccbvxw1a7gjh"; -"latexbangla-0.2"="6ix7rfgj51z585jry3i1g68x4wvm4xxz"; -"latexbangla.doc-0.2"="iw79gb4sk4hys6xbc8j86lpzyji8h7r9"; -"latino-sine-flexione-1.2"="ya3fg8hbwiakjw05hymfw704l1nkc01f"; -"latino-sine-flexione.doc-1.2"="hnb3gr9lz8wfqgz3g1shzb9s85r4dn9h"; -"lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2"; -"lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx"; -"marathi-1.6.2"="aqqbkzhf42c8rcb9balmg2i03bybiz52"; -"marathi.doc-1.6.2"="b1p6bv5b6nzy7j4jkrxhicr9vsn79vdd"; -"marathi.source-1.6.2"="mkv3d5dmgz9xh66h6gj8jjmvnl1ld949"; -"ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni"; -"padauk-3.002"="dwdgm603clk71s9gcjx9ghzwlkh6k2gd"; -"padauk.doc-3.002"="zarib60py4ddx2axyrm695pkikxih70z"; -"quran-bn-0.1"="1zmb114h7yx6jfcscjl6axdq0wgsk51k"; -"quran-bn.doc-0.1"="zg3j20ajp1c5frcvbngg24nr0qhnikrj"; -"quran-ur-0.21"="83h5jv6v5rpq5a61ca590fp9nlikps9g"; -"quran-ur.doc-0.21"="1xvyl3mc7rbf37b5fgd6ywmbbxxvm10n"; -"sanskrit-2.2.1"="scnnwa1xsfnpv0w7xp8ry49ps6s5pw8w"; -"sanskrit.doc-2.2.1"="0ps1lrlzdhq7gaagjqb3m4yygpz4g7p0"; -"sanskrit.source-2.2.1"="dp3nk8wbjrvb3hg4xdxl8s8m1wfcwny5"; -"sanskrit-t1-55475"="lwnbgg4flg35ndf7p0iii468sf6avylv"; -"sanskrit-t1.doc-55475"="h7licx4ivjwnvbym7724rdj3vrcaak5i"; -"thaienum-0.2"="acsj56dxkcqi83yajkm4rjxm99p6r10a"; -"thaienum.doc-0.2"="55zcsq659l2wki581xvcdy3ssljgk9s5"; -"thaispec-2021.03.01"="slxmdz2c6xq4z94gyp3iw33iddvd55f5"; -"thaispec.doc-2021.03.01"="gchip0yy0n668s9i9mplzgdicrwvwvid"; -"thaispec.source-2021.03.01"="qx5m53rk752nb2apblgk6v3vabgn8332"; -"unicode-alphabets-54236"="r0ylcchj98nn4vmd6dnxvx20applp72p"; -"unicode-alphabets.doc-54236"="zr075sprvlpddzcaxyb0lg0dg90p089g"; -"velthuis-2.17.1"="x0zig7csm0nnq7m2n1qqdys57jz38b9h"; -"velthuis.doc-2.17.1"="mcclyvyb9d4hrak5naw2d76a8g9lhqak"; -"xetex-devanagari-0.5"="v4gi0agfvxz808s3mapzf2ylxhv5n8a7"; -"xetex-devanagari.doc-0.5"="b3kz558m6h9avjwalwpw1nnr68q47sjr"; -"vntex-3.2"="vzdcn6z7knkzsj8gxwj8zda00dq6w8is"; -"vntex.doc-3.2"="5ix8dldkd2qmmbwn731ii4ffng7d3fgr"; -"vntex.source-3.2"="72m9wqbqrsam0b6a15lqq4yq5hbcx0kj"; -"wnri-22459"="z6010l0pydl50vy5jnrg5fh2xki5fi6a"; -"wnri.doc-22459"="clpx7kcx1hp0qy30v5nlfz10kd5hmqcl"; -"wnri-latex-1.0b"="y9n4dac8cbzm2gwhcfan32rbv3dyhr0s"; -"wnri-latex.doc-1.0b"="f1m11fnp49h90f3djiml0awlxqcnxkdp"; -"wnri-latex.source-1.0b"="zd4smslq18sp693fgay24m503v01v3bk"; -"babel-polish-1.2l"="k73wcwg7ab64nwjyq9rb78pmgkapy4xq"; -"babel-polish.doc-1.2l"="720j9r3c7y7yak2j3qbgx2baanwl6az5"; -"babel-polish.source-1.2l"="65j5b50flchq2kw6wi8g3i4jz9n9h7w3"; -"bredzenie-1.0"="dhjq0ccgxxin5a6fmwb95275d1i11xkh"; -"bredzenie.doc-1.0"="br35cfyn2zq2qb44mss225ylw16sz0jq"; -"cc-pl-1.02.3"="imax9b80sa48n769mgj3warj6c8r0g9n"; -"cc-pl.doc-1.02.3"="mw9069bzf38n43f9ch9qqby0lc5mzvw3"; -"gustlib-54074"="x6dscxji10p04msr31f3vsaf6pfpzhsg"; -"gustlib.doc-54074"="07x28ysinfhv15jlkpyfsv7cjyzwbdg7"; -"gustprog.doc-54074"="v1mb66z2nc7vwhy2yg5rk699mvqkpqs3"; -"hyphen-polish-3.0b"="c3944h2grk64vzp4kk49fn1j38l1s9b1"; -"lshort-polish.doc-55643"="7fr1g9j932xjam26nnf6b6zc47m1i9g8"; -"mex-1.05a"="z7m8kmw19bg4yw3p99fvpvhhclkj5ff2"; -"mex.doc-1.05a"="k9qns3567wxk7j2wvv78067lnlcfq1f8"; -"mex.source-1.05a"="kf6k037zqvlad7sm8z4a2gkg2xlf01j3"; -"pl-1.09a"="i3r76ngymf518pcs8jzx4l6xdgw1afk0"; -"pl.doc-1.09a"="1j9djajr93klh5k8hwz5zigh2qlc12zp"; -"utf8mex-15878"="d8314s7lhlafhspi1qf8hiqzx61n439a"; -"utf8mex.doc-15878"="svpkpbc0caxbynjnjjynng11fdg3dgid"; -"mwcls-0.75"="nldix3j60gjybkg60qdbi1wrdarqggqb"; -"mwcls.doc-0.75"="16cqcaliy99s6dqnb507hcncxbjlhgmq"; -"mwcls.source-0.75"="x6jn9m23ickiy79sk1w1jsgiqpk2jh9v"; -"polski-1.3.4"="j98gsw0v3vf0a9j8bfjbynmrv47fcd34"; -"polski.doc-1.3.4"="zldgln4yhr6qkmay2aqrlv0bbbwqdyyl"; -"polski.source-1.3.4"="a7ig2cy5jamdgk3dxigyz4qa0kjrd36z"; -"przechlewski-book-23552"="qid42vb23l6fzc6dgmx3bflwz7z0mdb5"; -"przechlewski-book.doc-23552"="23zvnv9pcvl5n68js39l4hrcli608qck"; -"qpxqtx-45797"="wxccyd4si0x6338hwmwdaxmjj3brm7p8"; -"qpxqtx.doc-45797"="xvxsnjfajz7zfvgfih7v3mfca5b36qda"; -"tap-0.77"="mgr2m41yv0y4dcf4myk7020hkmqrd5z6"; -"tap.doc-0.77"="mr27kjalpicyv8915p32yyya5imm3m8v"; -"tex-virtual-academy-pl.doc-34177"="rr38v1syb2b4ji3psf47pmwr562zv59n"; -"texlive-pl.doc-58649"="m1j6mzdim3yqxh2dxdmfkxf75bqswlgd"; -"babel-portuges-1.2s"="ar3by0sm5nv2sprdl9dikq4qxv52kfl8"; -"babel-portuges.doc-1.2s"="lnn32yz6wvyvkly2kx8b223mal5kbl1l"; -"babel-portuges.source-1.2s"="dgv5yxnvfr417xz7393bykvcijvyv4ia"; -"beamer-tut-pt.doc-15878"="kxpy2m4hbwm3sfj7ix9x249df3dgmvfm"; -"cursolatex.doc-24139"="arfkwqkjw5kfv2rcfhkvxjq603wdsq3y"; -"feupphdteses-4.0"="696my85w1ngcar81vacyj8nr7m4dn0wd"; -"feupphdteses.doc-4.0"="9nm4793nyfp5v2rjd5297sbyw2b29bqi"; -"hyphen-portuguese-58609"="5shwyqj6inhq7z3lip0zwdygsxmicqlg"; -"latex-via-exemplos.doc-0.5.6"="qv730qmznff38z28bcdpzmirvzngpg3p"; -"latexcheat-ptbr.doc-1.13"="qzgl6v54k07i6lc3ps84s9mj11j1qqqf"; -"lshort-portuguese.doc-5.01.0"="m3r2gbq4v09p9svs0mxsw3s3yc7has5y"; -"numberpt-1.0"="dmp1db9kaskcy2cxxp53sjxr9sl3c7pq"; -"numberpt.doc-1.0"="sgr9zrlf7c6zpqwa89z9pmmdsxbgrzsy"; -"numberpt.source-1.0"="ynlknscylhmrlq30sn5njffmmvmzxkdb"; -"ordinalpt-2.1"="ds49jf4pvghzwn5nqwjbzz6dhp0cdn80"; -"ordinalpt.doc-2.1"="4hg5jx7bnx1j13s1mq8xscr3jfajl6by"; -"ordinalpt.source-2.1"="cc2f6xias35ac0c0kxan2cvcmyjq7l6k"; -"xypic-tut-pt.doc-15878"="2rj58kib26w8jnfzpd9bsm0nf2ladv4i"; -"babel-catalan-2.2p"="18ngggp3v707j48vac5grpqw342jwg3f"; -"babel-catalan.doc-2.2p"="19hc8i6d64n8dfk6hmgpgm03kg5r7wx0"; -"babel-catalan.source-2.2p"="v2750fsyzjlc6iqk44s31idwybz2jvfz"; -"babel-galician-4.3c"="xczl3malfygp6w1fd3rpd26rifcgj3j8"; -"babel-galician.doc-4.3c"="i7r7rp46vmhmf18dgzsac2ay1pwanlxz"; -"babel-galician.source-4.3c"="ix6vzvf936s019948pz5bls7nfca9xng"; -"babel-spanish-5.0p"="lxsy4aq5mwizmif2r3i9h97mccim0ljv"; -"babel-spanish.doc-5.0p"="2aa12l6ndp4r6rdv6v0z405y3hpsmgnx"; -"babel-spanish.source-5.0p"="ad9wxx0qp6kp4r8ri1vwycgf2gpdj6xw"; -"es-tex-faq.doc-1.97"="v9brqkql6xbb1zdk5m6xhff1dxm36nhf"; -"hyphen-catalan-58609"="9k5zkr753b5sfnw88r77ks7vy7wd2rci"; -"hyphen-galician-58652"="46254jg1804xbs9qh6369qp1mj9j44hj"; -"hyphen-galician.source-58652"="jgmyy0n6c4ljqpl5ln9q1vpjq25y9q1p"; -"hyphen-spanish-5.0"="8isaivc77vl2cp5z2nwwwmqj0msgm5c6"; -"hyphen-spanish.doc-5.0"="kznsqnkm7dg2rdpisil38syyvs6fs0j6"; -"hyphen-spanish.source-5.0"="lia19yzmwyz4fsbnrca8al43hfc46i55"; -"l2tabu-spanish.doc-1.1"="rc7058j31za1cg1ik27b6gcgscir9bfk"; -"latex2e-help-texinfo-spanish.doc-57213"="zqfixpmcslcpjzg9f3rxcv6z1j7i5d3w"; -"latexcheat-esmx.doc-2.00"="bzjjilpj8rmp1cc93bs32568dc8dvgic"; -"lshort-spanish.doc-0.5"="3gmql5wpqh3h5mhr0pjcs6v0a5jqc1c8"; -"texlive-es.doc-58221"="j43rpwalh1gjqa8v18qdk2q63l8h1j5r"; -"2up-1.3a"="rsqrw98f4vzfx8vbj35pws9xl2q4gp8s"; -"2up.doc-1.3a"="ir3nkw2344mn9k22d1mi28gjrgld4kkb"; -"ESIEEcv-15878"="w5zhmx6kk19kwf98gdm7rlp7l3i9k93y"; -"ESIEEcv.doc-15878"="4ci8yn36m2fz6v6n7iqb071291rl23zw"; -"ESIEEcv.source-15878"="kvh03awwlhwd8wn69h32sdjxmcpa6lmn"; -"GS1-22"="2fvvg7l5g84vhg88mzaa6x16p13pp34c"; -"GS1.doc-22"="bsdamqnalwikpldq94f035nh849vjb2h"; -"GS1.source-22"="gzg5ynawvwr24sl31f85q7ksinaks3a8"; -"HA-prosper-4.21"="kbj26h7zvc9v5l330s2hp63l44vrn09r"; -"HA-prosper.doc-4.21"="hpj2qljnhi7x2prcwnra1ycfzazhnqsz"; -"HA-prosper.source-4.21"="wlzyr02pardayic4598mc0v6mks9dcx0"; -"Tabbing-17022"="1ffaxfww9l073hvjvgp4vkxzfdmmgb8l"; -"Tabbing.doc-17022"="gyhcdih64zw18s44f5s1h8ccr2ndd0qs"; -"Tabbing.source-17022"="pifazcagjavajck7h6a0kyvnxxk90k8y"; -"a0poster-1.22b"="dkwb9gdxv3jxnw07ji0ydmpqa0fgy6mh"; -"a0poster.doc-1.22b"="bn6j9nsmcri2irby7njhbdlpgqqaic0x"; -"a4wide-20943"="lsss6h32r10x1v8k9wwdp7ind09y6x5h"; -"a4wide.doc-20943"="vb90v0v79l34fr86i7hzx787ndyq271w"; -"a5comb-4"="sc874hfilkfjjv1aw8qnf36v5jkhd6s2"; -"a5comb.doc-4"="gsp7dsbhk6r2q332apbqrx29mna85dhs"; -"abraces-2.0"="yi53lc7hjam1ng9dv38x9wx864r89gnp"; -"abraces.doc-2.0"="vkkvl732ql65gw216smhimjw8xp2qfj3"; -"abstract-1.2a"="qd0czw54z49h3mxnxlk6drblpbl47sln"; -"abstract.doc-1.2a"="qd4dggpq9076j7cma12mkhy238ni4w3z"; -"abstract.source-1.2a"="819fv5rryh634fmqic8fqagdfi9h04wj"; -"accessibility-2.0.3"="j58xnav2fh0rjiyr17y23l6fbqc2l9jp"; -"accessibility.doc-2.0.3"="3gl15pw6k1ssb3q3104xxqaly35qic0q"; -"accessibility.source-2.0.3"="kax6wagw3w7psf3x94h8p7yd01a95rmx"; -"accsupp-0.6"="i0h4pn8qqkckrhmlfhyvk1caz2l68sc6"; -"accsupp.doc-0.6"="2p2rh18j02n4jk2g08fryx42r9kvm2bp"; -"accsupp.source-0.6"="zkcpasgn0nv8i285fwrb1y954s2n1yxv"; -"achemso-3.13c"="d0av0yfq5rhq9b2ckwcaazyyvqk2q2i3"; -"achemso.doc-3.13c"="3g2bjllla7gknijql9238xc0fb00k0df"; -"achemso.source-3.13c"="699zbci0bbqw01ilyca8xxwr7m7180jm"; -"acro-3.5"="5dz3x2f6bm9rl93hswvjy0b74rm1501c"; -"acro.doc-3.5"="1cz3b26z10z4nd4fqq0ssc68djl2iqyi"; -"acronym-1.47"="6471snmy26zvq7gh9lswa4fg0zp94phd"; -"acronym.doc-1.47"="3z4ps2hfi959q7dazpjrj02icpbr69g9"; -"acronym.source-1.47"="2sbaifpka4p220fd9dlbvzbp92vg971w"; -"acroterm-0.1"="04m91cky6cj3jv546mdf6461bdg6sfkk"; -"acroterm.doc-0.1"="jnxcd65y58xrqg0cfg7y0m8yslbj7xi8"; -"acroterm.source-0.1"="w99kkypzq7c73rx4rv4m917c68vnan00"; -"actuarialangle-2.1"="6wp7jms9n930i1x9ni0g531cccdj6c19"; -"actuarialangle.doc-2.1"="dsl6hfqn9hfdy1sil3svzbz5bpvpa8hd"; -"actuarialangle.source-2.1"="r3fw3z5qz765a7jmb0wb0g567grw4v11"; -"actuarialsymbol-1.1"="c4m5inanc59g934zv5hfg26nc4209030"; -"actuarialsymbol.doc-1.1"="a3dbpjygc8033icdlyli8g47vbwx4xc1"; -"actuarialsymbol.source-1.1"="5p6w3cm9h63nxah663y5l4k7p811qxyv"; -"addfont-1.1"="yyngixsqhm4lzzb9psgajj2bkkd2s16m"; -"addfont.doc-1.1"="c157yk6aizpy9lkvsbd0zxm1mi18q9y9"; -"addlines-0.3"="gaai0vyqwnm0k02r5kvnxgd4gx32nkbd"; -"addlines.doc-0.3"="njifyb95qrwhhcgaa250vlq2y1a8pvrg"; -"addlines.source-0.3"="m8lhgdfwarlkrwp2nqpdaad7mpi3rszp"; -"adjmulticol-1.2"="fd21wgsbpv4km7r24529cbja564ha0x0"; -"adjmulticol.doc-1.2"="73sv27k6y42306mfi8rglf53kz8an51d"; -"adjmulticol.source-1.2"="3bqrqpbh7y8k0a9wgib14v0k7pa63qyx"; -"adjustbox-1.3"="6xk50giqn497r2dh88nz6r91fr83b7fz"; -"adjustbox.doc-1.3"="qzzkgppkai6c29n2sdwgg019vy220s7p"; -"adjustbox.source-1.3"="nxaiqbdxwj21v7y53g5l1i8qnd1frxbk"; -"adrconv-1.4"="jm0wy6794p7idv2f1ryhsm2v9wr9d5ar"; -"adrconv.doc-1.4"="jyn0sjir5pp69zvlabyamihnlsav24z4"; -"adrconv.source-1.4"="v31vh22mrhxqq4h88rvj97a9n0wc9bmw"; -"advdate-20538"="f0awsj80hyiv2vkjizidk3na8yvfm6i4"; -"advdate.doc-20538"="0yx83g0jz771kjqq6rf07wlmzs4h68x3"; -"akktex-0.3.2"="6mhzn5d98q6vmxp8vjbmb6i26x9zja3g"; -"akktex.doc-0.3.2"="z43q786v20515sgsp4dh5lii0pfa620r"; -"akletter-1.5i"="7i7x6692i5zicjsrp51cvx8sivm1arpw"; -"akletter.doc-1.5i"="lx2pcnwy9zslh99dvrak5j9lzk7gxmra"; -"alertmessage-1.1"="xczq5v43zbpqkhia8dzk9q6918w6h7y0"; -"alertmessage.doc-1.1"="676ky2mwjrvjkx0bd3pqdgisdfxjzr4l"; -"alertmessage.source-1.1"="g3n5rz7j3ldhkviw267rwwd0lfgbf9a4"; -"alnumsec-0.03"="wmcb661yih7nnlwpshx0ahp45hg2b2qj"; -"alnumsec.doc-0.03"="q89lqn201amhxmpqfznyv7vsp40a8az7"; -"alnumsec.source-0.03"="zin3hkq6fr67rz2df7qqfnki4kar8k1n"; -"alphalph-2.6"="8bavlk3mbi1c7k1nh3hy1j5icrq8chfj"; -"alphalph.doc-2.6"="3lqasr06fpc44cd88c3y7xq9v8fs8p61"; -"alphalph.source-2.6"="1f1c5lq8nhn6liff0iwh4wh9cqi498wb"; -"altfont-1.1"="cickjccw7xjpa3q2hpm1cyzs2jvkx1wy"; -"altfont.doc-1.1"="f8x27hdfap8pz6f96s7jvvaldsjaxwml"; -"altfont.source-1.1"="q75lvhzwgyqxlj9h56i43hwb7v8lq6rl"; -"amsaddr-1.1"="6sf35pmlda97q2dhi5h7cwan25gi9nij"; -"amsaddr.doc-1.1"="m5wxpa9vd09pja40i6lzzrlw62ml5zvm"; -"amsaddr.source-1.1"="b66925k432cw6rqwqapcg1h8gjgnvry7"; -"animate-56583"="nsp8xdb9p3yazcbxvkymjf47j6hjy6s1"; -"animate.doc-56583"="6h4g623xklpyl4j3wsbpv57hqc0l9zvp"; -"animate.source-56583"="9gbzqi8vmy97rczriqwks53dpikk3dz6"; -"anonchap-1.1a"="qpazykls2jy7nqpqkaqvyi35c2ajz0qg"; -"anonchap.doc-1.1a"="3xy9r4p9f22fjdvznba1jjp09gbkvvlr"; -"answers-2.16"="isadn9v17ma5krfq4hm304nrdc8kx7dd"; -"answers.doc-2.16"="3ma0j6diq2zp7k547zp6ilbynsrkw59d"; -"answers.source-2.16"="7w1nvr73ndj7c545xps8h969q4z58gji"; -"anyfontsize-17050"="z7d08jdfvq55ls4va5f5iyixxyp6xjv6"; -"anyfontsize.doc-17050"="fxvax04n8dj9haksiqx0jddi47mb8q1n"; -"appendix-1.2c"="50wvmi5y3wgka55dnb2h9gmr70y48srs"; -"appendix.doc-1.2c"="b2xkv7kzx6vkhhr0figba931ma6q455b"; -"appendix.source-1.2c"="8xs50dfynih6q9zgydgp9p4vr67ad3p5"; -"appendixnumberbeamer-1.2"="zrx31sicdmcv1mvv2jsmqb49ykwgxdgd"; -"appendixnumberbeamer.doc-1.2"="ql9zi0i3r3jcc788qx6zrbgfgmrv4pj6"; -"apptools-1.0"="v2ag8kbf87fm4rf66z1a3z93pfs1j6gj"; -"apptools.doc-1.0"="a8mjxckcrk06xajadqf2124k5k0ra2qi"; -"apptools.source-1.0"="q37a0dpqnw1vbqih6p7lbi70a1f58yl3"; -"arabicfront-1.1"="l49m61nd3wrskbvdh3g3alslp2wbkkms"; -"arabicfront.doc-1.1"="9zr0i11vwsh81vsfgp1a758blyl3rigl"; -"arcs-1"="b0qh2cpybhqd0d0d8a183hhv7xlx13di"; -"arcs.doc-1"="x9xzx0p7wmn5mh61lkmlycfcybzfasz5"; -"arcs.source-1"="jbx1wd4pyp8682lbz3mw00ha114adrad"; -"arraycols-1.1"="cfkhjyajfjgzp4826i0rnxbbc1yfxa20"; -"arraycols.doc-1.1"="m03wdi9flydgvs5f7450hj1i88ynm85i"; -"arraycols.source-1.1"="mh3g35c7dybg3r8npb1zc69vyzs2arva"; -"arrayjobx-1.04"="zxqamnkgiq8c9p1z3w89rlgqv61bp2n6"; -"arrayjobx.doc-1.04"="fyx7869qi432q3g06i3xyg92jqh29fbr"; -"arraysort-1.0"="h5gbw2lvn0zfvhz0s5lmc495yz49bdds"; -"arraysort.doc-1.0"="fx9j9a4nhjlfmxvsnqqcxxh7220s1rsg"; -"arraysort.source-1.0"="0xdix5q42gnib80gi1pbaxx9yixbjm61"; -"arydshln-1.76"="ggmcdw747cybjjfsxfkmqm7ganw103q2"; -"arydshln.doc-1.76"="gn95m775xa6kfdyszwmsdv603wpy2bnp"; -"arydshln.source-1.76"="6y2cbdisg8agvlrwdqp1ldc9n3jx9qv5"; -"asciilist-2.2b"="fvd111ywjyrwy897z4bmcby9ymnxcvcc"; -"asciilist.doc-2.2b"="i501s6jaq79nj93ckccihgkv4ca5pn7i"; -"asciilist.source-2.2b"="zqmygnlbfyz70y446mcdwpd9a3bszhl2"; -"askinclude-2.7"="nbmjzdp012vfp3bacig7s927dv809gfv"; -"askinclude.doc-2.7"="6d5srhwjkdz59qvff285fqfl3v9dlmng"; -"askinclude.source-2.7"="crcq42ba162v61fh3n6bi6rvsa8ap1z8"; -"assignment-20431"="f5a0sprx94bby245g2cfycrrazgp00k7"; -"assignment.doc-20431"="0d0cafwd56gqn5dacsq4fdgzz8jqks19"; -"assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6"; -"assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9"; -"association-matrix-1.0"="ia2sz5pjhb312fpd3wq4h3jlzx6p4mhq"; -"association-matrix.doc-1.0"="7yg14fhaggb07h6zj7wz4a1ml7wkz6im"; -"atenddvi-1.5"="mdd2z14rww1y98y7v1jsyq3hzrg2rf6i"; -"atenddvi.doc-1.5"="sk0j256ab9vz5lnn7v2dj7rwn5a1lnhh"; -"atenddvi.source-1.5"="x07x6lrj3ichjg83nphb044z99583c1c"; -"attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql"; -"attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs"; -"attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4"; -"aurl-41853"="8nnjg9zwrc6p5qy2mq32jirxz29wpa0c"; -"aurl.doc-41853"="13g1jz1510lipg3v2m4zpcz2pzi04fyc"; -"authoraftertitle-1.0"="7wliqivlz6fmz6szddzamm781qgd3r7h"; -"authoraftertitle.doc-1.0"="i7b4wwdfsw0ydra2pvvr4bnsfmwbjkdy"; -"authorarchive-1.1.1"="capg6s6r2w20kazk5dh2dqfbxl6246zh"; -"authorarchive.doc-1.1.1"="bzs7qr0gc2sgmsb39q4d46l4f5d55cp7"; -"authorindex-51757"="khcqpf8rh3cqb9fk2wl35lvp1fs3k2nw"; -"authorindex.doc-51757"="d1k8irgqp5vac8ggq66ivcxxgv8q410x"; -"autofancyhdr-0.1"="mh48zz2m9p97z2d0znxv7myxjkcfg0wg"; -"autofancyhdr.doc-0.1"="czkfsiazwf0ybhgknzabxjwq397pd0fk"; -"autonum-0.3.11"="z0mz6nrw3s9661lc5s983bj7qpfg9ns3"; -"autonum.doc-0.3.11"="ghxpr5ayzxq1w6v3wy0hqvkfy28n9slp"; -"autonum.source-0.3.11"="5fm5vfmi11jqdgqklj6zmc90vw3vqiqp"; -"autopdf-1.1"="01rm3dax4wa3pbj51d8ryvixmdy2rcp7"; -"autopdf.doc-1.1"="dal0kcyj8y2ki3w0cprjalkb4770kyiy"; -"autopdf.source-1.1"="5pja5c4la5zvg8mvv9155y1rmljnk7j2"; -"avremu-0.1"="xk59ssazl5122hy7cw9h8l8ky47ac58m"; -"avremu.doc-0.1"="sp38mldllwslwxq2rvizcx1dcpfaava7"; -"avremu.source-0.1"="inwrrgrds8ympmhzgrk3m82x544x8nhi"; -"axessibility-3.0"="21hz0f1kbq51g3s4s6pcc2wg869m3a39"; -"axessibility.doc-3.0"="9s7zwv0a8y52ddgv5wvyhgp9id55zz9v"; -"axessibility.source-3.0"="g8jxfyvj67bx306vkyryhfml2v535959"; -"background-2.1"="akcsb7n8iyy4zlcgfp0ikwb5awzdnh9d"; -"background.doc-2.1"="inm76hq9brwc39n6bhp9782766mmgwpx"; -"background.source-2.1"="54l8p1yj06wlcwxrrmjqjhgmxai9l9s2"; -"bankstatement-0.9.2"="gz4wcynn22a2bg7hbdfa3j5iab5ak957"; -"bankstatement.doc-0.9.2"="4q9drl2qzrhqn5xg69sc4x6x6d9rk774"; -"bashful-0.93"="4xa5zrj0cfwm628cycqi053irhdybdj6"; -"bashful.doc-0.93"="d9132bwcay35ssw31rsrraq6b15wrzaa"; -"basicarith-1.1"="81hlw6p432i5ln72shhg2k976as1w1l5"; -"basicarith.doc-1.1"="3hskpplbm89xpzx8q0bajn7i3kxncig8"; -"basicarith.source-1.1"="x4qnlbc6v2dfq23ijrjhk5rcfjc1c2a1"; -"bchart-0.1.3"="4xxv8n13igfgl0n89wmxncp8662fx941"; -"bchart.doc-0.1.3"="11b1xlxkxzayb2a96w1svhba4pkchanx"; -"beamer-rl-1.4b"="vp7k73cf2xppajwqaiwxhgbwsacvmd3n"; -"beamer-rl.doc-1.4b"="av5a5ww2xj6adh8lh305dv9y8cy736xl"; -"beamer2thesis-2.2"="64a0v9a7xr9yi4ffsbm98s058hkmq9wg"; -"beamer2thesis.doc-2.2"="5ypn90w572jlw04xi4vzk7pxxsf7ciwy"; -"beamerappendixnote-1.2.0"="vvcnya52knjsyjg7q72y5hck3mn4yayj"; -"beamerappendixnote.doc-1.2.0"="z671llyrbspkd3mhygsb45fhsgcxjy48"; -"beamerappendixnote.source-1.2.0"="fxgc3dhb0af88q84s2947dz58gwbj00s"; -"beameraudience-0.1"="3zc39f4qsyqi4204k4a5n9pksf6gk3xl"; -"beameraudience.doc-0.1"="wkgcr8dyl8ywxwpdc5h8p96dsw9l229y"; -"beamerauxtheme-1.02a"="f6fs70zhyj9hiwpq17h593l71s2r2219"; -"beamerauxtheme.doc-1.02a"="zzja4whim0800pbryihqyqy3xhzwj8is"; -"beamercolorthemeowl-0.1.1"="7b8qfnqjliwvms89bn4mxhjqf8sppadi"; -"beamercolorthemeowl.doc-0.1.1"="dh55h6vzmjlxlwn7wz2b6c2c27c4qjki"; -"beamercolorthemeowl.source-0.1.1"="ppxb50mii9mgch0rzm26npxl99a93c42"; -"beamerdarkthemes-0.5.1"="kksw37ml5mq90c3nrl2fk1jn84ynizxz"; -"beamerdarkthemes.doc-0.5.1"="z3ijc965ygx8a2wqpizphjhmbxkvz1m0"; -"beamerposter-1.13"="cd6wdcxrci6lc2kj195bwsi5yfddk3zw"; -"beamerposter.doc-1.13"="1hp6dbynh3gbrn6gsz54rihdzzr8pjii"; -"beamersubframe-0.2"="m8capqp9nc8mbi9xdzkz89nnz41972v4"; -"beamersubframe.doc-0.2"="y5m8y5zkbzi553hp8maav6g6a42iklfr"; -"beamersubframe.source-0.2"="kw2rnly2zyqw1ap5g9gkv2xchpvbk7gr"; -"beamertheme-cuerna-42161"="vrgqfiwzbf1082zbj8pvn53dmx77qi4f"; -"beamertheme-cuerna.doc-42161"="jcxa5vs5g4nwgck7913jb2jnxccx2y3f"; -"beamertheme-cuerna.source-42161"="lrn8am3h8x2ic39ghpkdl9bxsp07pdf6"; -"beamertheme-detlevcm-1.02"="25f0c66nnhq9r0qrqf186rwqvifzi4nj"; -"beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047"; -"beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b"; -"beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy"; -"beamertheme-focus-2.8.1"="rsyiviz20m0f8v699yv80rw4k4drbl3m"; -"beamertheme-focus.doc-2.8.1"="idhc1g1ja4y43gdnk3bd1387v6fw14d2"; -"beamertheme-light-1.0"="9vz0g593s4ykwasfky58jqq6h7a95p12"; -"beamertheme-light.doc-1.0"="dvyzvi4hl69xvvgbhdbp5ax2l3z68nck"; -"beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk"; -"beamertheme-metropolis.doc-1.2"="xvapcphzmylh2s3551bglqw712q82bxn"; -"beamertheme-metropolis.source-1.2"="5gmm1q6xagbavzzxhc9750yb3bhxf3zv"; -"beamertheme-npbt-4.1"="7f7y7bijlp1p9pzdw9vv64qb03256zqx"; -"beamertheme-npbt.doc-4.1"="dzjby8rnpsgll6gvab9cslziqszhd4zf"; -"beamertheme-phnompenh-1.0"="01nbk38jh4hxk8vykf37x6bhnb55ijdb"; -"beamertheme-phnompenh.doc-1.0"="p0nj4cqg4vaaq6wlycicz0xbl7391lwp"; -"beamertheme-pure-minimalistic-2.0.0"="5wsvlda1yasnisw6zx61g2qq63106a7a"; -"beamertheme-pure-minimalistic.doc-2.0.0"="a33m9xa1jqc650zrv6mrz9xdyfs14nyc"; -"beamertheme-saintpetersburg-45877"="jkhmvyc96zm66cmfjl1fvrnz86a81zbp"; -"beamertheme-saintpetersburg.doc-45877"="9msrd7ylkwfg6ijdx3rddcl143p17383"; -"beamertheme-saintpetersburg.source-45877"="16hmcal8wb74z1qdi5r46w36w3n87n6z"; -"beamertheme-upenn-bc-1.0"="i535al38gpn0j6mhixm5g6vnlj7gi957"; -"beamertheme-upenn-bc.doc-1.0"="s7wxbnlgqxwpabb06jc5nawxm40bnia7"; -"beamerthemejltree-1.1"="iqjiwv4v9vp84a3cjjmv5gxygyclw5c5"; -"beamerthemelalic-1.0"="qn1qm2cy585x1js22mns5kfav9a4d67m"; -"beamerthemelalic.doc-1.0"="rq3x8gm2w1bs4ci9blxsj0zbxlwp8hvm"; -"beamerthemenirma-0.1"="jix18byykz4n2mqcipf60pskfjlj3ini"; -"beamerthemenirma.doc-0.1"="llvppchvbd0zz9cl3lpswghs8hjm78rq"; -"beamerthemenord-0.2.0"="5yf01l6cjhjsjd6a7cr7fgb06q0zsam4"; -"beamerthemenord.doc-0.2.0"="g9zz702frvpvfsd4gsdrsmy7zmcmdnp5"; -"bearwear-0.2"="qhsma9q7ijwa5f044f2j3ycqf142yy5b"; -"bearwear.doc-0.2"="nw04s1cxs952521d77iw69lvjsgbz2pr"; -"bearwear.source-0.2"="g52pgqfvx9argj6pdigp3hq8ymxivnah"; -"beaulivre-58503"="2qb3mpxm0j03cwz53glcksj2ax78w84b"; -"beaulivre.doc-58503"="xv7aibyvfvcbmx8jpgnkhj2gzbbvghj3"; -"colorist-58434"="p3wm7g1rxillh9y6p9ll2df3f1h33w0g"; -"colorist.doc-58434"="71sys4ac5khgmkswqspyb78mjmby7v7w"; -"beton-15878"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j"; -"beton.doc-15878"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5"; -"beton.source-15878"="znwrdd877gdwmsiaxc9v8pczdw21wrb8"; -"bewerbung-1.2"="4zrcxx73cyavv3wm4dm50hvrmjw02s3f"; -"bewerbung.doc-1.2"="m6668z3ds3sgdvpr409jbyshsznqs4qp"; -"bewerbung.source-1.2"="5kmfflgw9nnl5gsigh08ww7f9k9zhmh9"; -"bez123-1.1b"="9lx6fqcskk9lj28vcfhfnkmjb9dhlqdh"; -"bez123.doc-1.1b"="s5s834dhxqlqc5i8dswvayhf62chrqbh"; -"bez123.source-1.1b"="fsc7gqwcbpfjlhn0bljq7l0jd8g6zapd"; -"bhcexam-0.4"="1px8zypnmrvi26ysrplj54pdz67ajcs5"; -"bhcexam.doc-0.4"="ksq01g78a489prh8lrrs0nn9k5jqasvr"; -"bhcexam.source-0.4"="ra3418l0mjj31jrkss9fysd4q1h3bdqn"; -"bibletext-0.1.2"="l1xjz1y65n8788jhskhb7z74fs8azjxr"; -"bibletext.doc-0.1.2"="z37aix7i7hm3rg581np1mi67dn5agl7x"; -"bigfoot-2.1"="i4hdv09y0blcrbhk554ilzc70fv19242"; -"bigfoot.doc-2.1"="ixi0hkjrzg740q3pkp9lwrq43ab1f006"; -"bigfoot.source-2.1"="jp9h2p1j46ha7ksxvh3d6rmxr0832r1w"; -"bigints-29803"="6ig6fmxy6wj6k3yc4x9s7b18xbfxj4kp"; -"bigints.doc-29803"="jyxj3risms61j5aazx9hkxxfwbg6nyzr"; -"biochemistry-colors-1.00"="fvz3nlqi6y12g5pcyh118l6vjbw5kz2i"; -"biochemistry-colors.doc-1.00"="r7n07xkk4ixxk9zhz3ffkg7kqsz0i8fc"; -"bithesis-1.0.1"="8wam0lyfcr3na06bsic1137si7pdk61y"; -"bithesis.doc-1.0.1"="wck5b80wr5nxiqdg3fy9j9vqlrrxg0vv"; -"bithesis.source-1.0.1"="iqkpvidqv1pkirh49g1is5a4bwmpkjf9"; -"bizcard-1.1"="l59w5wy3djx28g5yw2ywagi5am258bry"; -"bizcard.doc-1.1"="yallp1mh43m9224sqhzg85ylymiib9v2"; -"bizcard.source-1.1"="z70q003l3pmi9p0z0a99f2bz0lxkq2y9"; -"blindtext-2.0"="5xyi3x46b5mvl2zr925m0dz7z9qqgvn8"; -"blindtext.doc-2.0"="h3p5d9pr9h362d8jqq4lv3dahcfs2rnq"; -"blindtext.source-2.0"="dr68k54p44vgwp3rw9d1khc733k4apah"; -"blkarray-0.07"="djcla33mmskp42qbf8qg053p34515x1a"; -"blkarray.doc-0.07"="7iy0ssb4spk30f5janvknnhl91csvmyk"; -"block-17209"="b75bd0f6imd8svp869g4j3q2q02pilpp"; -"block.doc-17209"="gza7j45w5qixk19px05wr4q67m4lzhkl"; -"blowup-1.0"="zhslxr7v04yhkdssranpiwpql9z7xsrf"; -"blowup.doc-1.0"="paw88yvcal35rq5wpfxm5s9hlsyz6z86"; -"blowup.source-1.0"="kmbxfjca3pwppfhklyhg8k5ddkxg8r43"; -"bnumexpr-1.2d"="vl4qb1q4y3s894hi9i6s5b8r56zdxx7p"; -"bnumexpr.doc-1.2d"="n4kq212mmqrq2bfdf5n6zcykpfigjqhk"; -"bnumexpr.source-1.2d"="74c56vrq91q0ycsypdh04ssy5v0jp6lz"; -"boites-1.1"="nccwd0yxdm5cr6razvwlkrrb5wxxj1i2"; -"boites.doc-1.1"="q3mcdfg2afqm3w1zhbcb1bxzwqgp4s3n"; -"boites.source-1.1"="vcfgm806kvw3z466j5kimj5wzgaywv0f"; -"bold-extra-0.1"="0kr4p0z1bfng2sindvkk7rkfzm863qmx"; -"bold-extra.doc-0.1"="czal2y2szfldrzkn4h0aj6iwjk7gpifk"; -"bookcover-3.3"="8jzphigwp2xys5h1hq3vgk8xx8hbl8bw"; -"bookcover.doc-3.3"="caki4lv0vkwnl12in3i2xa78avsba80l"; -"bookcover.source-3.3"="pr9g2yp4vqi3fgqwa7hgy3zmb3vr1f76"; -"bookest-1.1"="70j4zrqfn4cr0qg7dhdqainy3pxxilg0"; -"bookest.doc-1.1"="3cbqgyzvm6zvzib6jhgdyy7mcw5p75nc"; -"booklet-0.7b"="fkicb41vlz1m3spn6jf9g1dk28f22v7i"; -"booklet.doc-0.7b"="c8y8mxy7hv7qmp7a8bib37vi3xy2pfxx"; -"booklet.source-0.7b"="h46d62nvn4gnnj26bkd5h8m22s0jld8s"; -"bookshelf-0.5"="3dnqq00xpzl0w5ivggqx14a931gbrs7x"; -"bookshelf.doc-0.5"="jdbx79b2c0mcnjz7126lb4w2zpxx9ck8"; -"bookshelf.source-0.5"="6814jnc7bsk40fj46mn7i72i2p1wgpdk"; -"boolexpr-3.14"="acxia88jpd7222wvkr2fwxr48vl33nzz"; -"boolexpr.doc-3.14"="n6rs3hgfaz36fblsz28pshnlhvj6l51r"; -"boolexpr.source-3.14"="gbggikjrx8p47w9zs921k16qx8jq6gd8"; -"bophook-0.02"="l3ljpnwkgsrb646j19kxb3qk51azvzz5"; -"bophook.doc-0.02"="nkpvwq471wzz69vlrwhpvsfcz6w9fbbc"; -"bophook.source-0.02"="s9ybhy14wz90vlffn96y0bzh9f9202p0"; -"boxedminipage-1.1"="94amgb6anrixzngmc6iz4752nihjxq7b"; -"boxedminipage.doc-1.1"="vwifjz4ndsc3vw7hzfcib0wrjjgq977s"; -"boxedminipage.source-1.1"="zik88vcqpmddr0nscymcf669j0bwkk34"; -"boxhandler-1.30"="j2q8bm858c8qm335w67g0kr82vnigjjl"; -"boxhandler.doc-1.30"="08260asli77clnhfnj1fxff5bbgicac7"; -"boxhandler.source-1.30"="0s647gs05wi22qcrv2zsb8x1713yhf1w"; -"bracketkey-1.0"="4l5l8s1xcwhlkaq50spccp2z90lm161f"; -"bracketkey.doc-1.0"="500h9kzvrkkqj22622hr4a78d6mz94jm"; -"braket-17127"="ck5gh00qn839wsxy2qili0184vswy0br"; -"braket.doc-17127"="mqckibrwr123hhda3fnbf8wrh1d16bxy"; -"breakurl-1.40"="lsl2j1iflzhwwapb03s5hg137rynjjhl"; -"breakurl.doc-1.40"="rjyrmhd32w912qg9wd4qxc9q46kg8qc3"; -"breakurl.source-1.40"="lpxb827p465qc14c38rk14jrzag7jfq6"; -"bubblesort-1.0"="i2z21xh8cmsldiv9cs6xr6shwlyqb48i"; -"bubblesort.doc-1.0"="s849r13af8zz7m6h12qdcj72j24wqbcv"; -"bubblesort.source-1.0"="ps2dm6k0y8k66gxsw97wp7saplgs7raa"; -"bullcntr-0.04"="w4fxp9fvpbg882yb855sl4b6w8fypiyy"; -"bullcntr.doc-0.04"="l1p8zz226qbnzmx4n78xhjsrc26z7jxw"; -"bullcntr.source-0.04"="6lw02qi8iyp3qph7yaycfm5p1q6l71r3"; -"bxcalc-1.1"="zmqgp92kdip1cbs43hq1rwpfdflr7c68"; -"bxcalc.doc-1.1"="1zlvw9fd7zibh9cmnpk8l9ziwar6ns0l"; -"bxdpx-beamer-0.3"="q07kpnmln2v70w83z91vsk53c0i63x02"; -"bxdpx-beamer.doc-0.3"="8ynjsgbyifkvz27qp8j4nrfk3pryphdf"; -"bxdvidriver-0.2a"="f6ndmagn10ax4hpmlia649f7c14hjkgx"; -"bxdvidriver.doc-0.2a"="lg3m3lw08iizdhdfjqkh91wk5ma43825"; -"bxenclose-0.2"="h4cay0x5nq4xwqpaihbvyzhjxgsp5fwn"; -"bxenclose.doc-0.2"="9i72bmx63c76m7gc7qavv228g1afrnq7"; -"bxnewfont-0.2b"="42kvrm0ag8zrxavfijin59k9sg3akhhp"; -"bxnewfont.doc-0.2b"="wxkcv5hklkzxs3xsw28z0bknq0sjjhsy"; -"bxpapersize-0.5"="a39v65wwyrz0wfl845cvk1sbnki84l61"; -"bxpapersize.doc-0.5"="z915b4vspqsbzdvihvkppcmrc8j3758w"; -"bxpdfver-0.5a"="wzkn89ly0cham8r9lcsrcr45zpvwa8d0"; -"bxpdfver.doc-0.5a"="4b3kzzmc8n6pwcf1qlnzczpxw57a5ips"; -"bxtexlogo-0.4"="5czz5b638x3h3gpyb2n5si8py53gwl9v"; -"bxtexlogo.doc-0.4"="51msprgb7p49x3lhk4cr65ay7dpzq5d6"; -"calcage-0.90"="4yzr1l7jhng80xs4n1vavaks3d8cjr49"; -"calcage.doc-0.90"="b4vjy0d8rz4jhhw4vimfdfwhpqx7sgck"; -"calcage.source-0.90"="x42rcz3r7lphziii9v8vgv0lm43ymj8z"; -"calctab-0.6.1"="vmm4595955mrf96s3i77mk120yj527y6"; -"calctab.doc-0.6.1"="98qbw092f77rrsk5w8vbzm4hln0klzvk"; -"calculator-2.0"="z44sdp5jlkqywi01c1x7ly2yvzkx1h9w"; -"calculator.doc-2.0"="dwb0bhngsn0xk56gnil8wbaj5dv7v0yr"; -"calculator.source-2.0"="3m4b364wkgfvxyc8y20rg8c7rh22rhyd"; -"calrsfs-17125"="cq6j9glbxrl31xwx7k5s8ayispn82vfx"; -"calrsfs.doc-17125"="avw2hw984yx1vsxayn96nzhgqcfpz90r"; -"cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188"; -"cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd"; -"cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86"; -"calxxxx-yyyy-20.21a"="hx11kvbi5kph8himmnr7cygyxrs92h6y"; -"calxxxx-yyyy.doc-20.21a"="rc1cp1b4mxrq8pbva644wgra1cvs45dn"; -"cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn"; -"cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf"; -"canoniclayout-0.5"="vg54aawlapxdw0dp8s7jinkl16jd8n6h"; -"canoniclayout.doc-0.5"="cnf6kxlminyfh3k6qyj0lfgxrvxa19j5"; -"canoniclayout.source-0.5"="dhqxmnl78zscvl2wgyr9y5qr1fhmqajv"; -"capt-of-29803"="qmph3ai6555l904xk4q6sy4jml5l6nqb"; -"capt-of.doc-29803"="bpa4ll7afaz43ysz8m7q8fs8klvv4h4k"; -"capt-of.source-29803"="9rjjpf1v8qg3v8j27rn8x3b495lddicd"; -"captcont-2.0"="5s81zvby8iq2l0j4bkz99s56w0kvc5pf"; -"captcont.doc-2.0"="ivp30a2jxrnp8zivmdm61nn0i25kiarz"; -"captcont.source-2.0"="bgy7jzbckqnajp42hy4x31dvb01cjm7s"; -"captdef-17353"="gx42x6flbn7jdbrbqzsn8csgi07ij4k0"; -"captdef.doc-17353"="fykmdpzxx24x66iph3rrzj0sc755y4nh"; -"carbohydrates-0.1"="x4rj3x70sfcdgq8sd8yv2486khxip4wz"; -"carbohydrates.doc-0.1"="lp5y1sx5s74px1x03366lpn676vhl6c9"; -"cases-3.2"="qnmps08pjcipmj0fghr6sjmkm5r6gx6s"; -"cases.doc-3.2"="kg8k67grlxq0cipm3mc3sj1k12pl5qy0"; -"casyl-2.0"="4px818jfrl4q6fs2p7sabq1pihzvnsw9"; -"casyl.doc-2.0"="dcw7gljkwgkgsv1l6g6680mawm0x8sby"; -"catchfile-1.8"="d5yb62s7q2pbznla8nifhaih623myzrs"; -"catchfile.doc-1.8"="fhnirlpgckkkdc3705hrw4j62dmlvsgr"; -"catchfile.source-1.8"="h5jpwqvz3schhwfa4ds0v8icpy4yhiin"; -"catchfilebetweentags-1.1"="4yhcz4rv10s3si8vrbn4ac1yikmvgamk"; -"catchfilebetweentags.doc-1.1"="w4zpyb3a2gwlws0as6ifmi0wcnladgi4"; -"catchfilebetweentags.source-1.1"="819f4z3q4hnbng7hbifk1kd4m88xgfnj"; -"catechis-2.5"="lmc08shlf5vy2v8czk8fs05g4shpijv0"; -"catechis.doc-2.5"="n5qpnb03g5533f698jsgs3fd1dlydvr6"; -"catechis.source-2.5"="9j8fqms4ag6jnkcr44300hgp4dg6ma9b"; -"catoptions-0.2.7h"="40b95bmcg7bw5ndk3pmqqxjq5j8gy1fp"; -"catoptions.doc-0.2.7h"="3yvgf5pzh121hwzlfqjqmylassr8h6cb"; -"cbcoptic-0.2"="rqw0wq5w1hxq7241skb9b26ixnr67aff"; -"cbcoptic.doc-0.2"="b818cvyjz7x0a05b5k36815w4n5ij43r"; -"ccaption-3.2c"="4l3kxgc46z9i4lrm479ghpv7d0077l07"; -"ccaption.doc-3.2c"="qm6lh4nrdndp4vivy815ajpj9jj4w433"; -"ccaption.source-3.2c"="fdfpz99x7z4avqx1q4nrydg3r4csq4fr"; -"cclicenses-15878"="scxyv1a4lh05mfgbs55rcg40vbfyvvij"; -"cclicenses.doc-15878"="17zr0mgalzfnpayvzym8hri1yfz8c6xa"; -"cclicenses.source-15878"="hgm5y1054596k129p6j4s86kv0m0ky76"; -"cd-1.4"="34nj75mgz2mzxjbmpik2kvqhmwdmbw71"; -"cd.doc-1.4"="i7230mqkczs0b3nczmf3gkv8z0bx61mc"; -"cd.source-1.4"="h5plih2dk6kk9klc7lwv5gpx88apljlj"; -"cd-cover-1.0"="vl1q321ziyyiybwjsvaq9h11b69xxi72"; -"cd-cover.doc-1.0"="06rjy67nvlvlnlz9dr9xa3cg22ndgm3j"; -"cd-cover.source-1.0"="kyc8pdbwj8r1dzri0wwqss5fmqkci6cf"; -"cdpbundl-0.36d"="hf7h2yz4c0nydnrhdwl5jwxbzhqxv7mk"; -"cdpbundl.doc-0.36d"="5csmnns276bpm80l1iipvanggljgjq6m"; -"cdpbundl.source-0.36d"="hzg9ax2jn65b0rq2afqfxh1pk1rcvlg9"; -"cellprops-2.0"="i00p0s598n0m8840zy9lxs116na6plc6"; -"cellprops.doc-2.0"="4n052xl78fl4yb5f19i64zhrkl6v1n4n"; -"cellprops.source-2.0"="nbna05ay9zyxixiiqiyln2gy8lcyhcm6"; -"cellspace-1.8.1"="kngz1r2b59j5437zpz0kl5xpjwci8xra"; -"cellspace.doc-1.8.1"="jn3r4y6idf7ml45vp3q1hd2rn58rbvld"; -"censor-3.22"="6125pgg2a5pj48w6md4vzyi3cnzns4yx"; -"censor.doc-3.22"="rcvd45yfghlg5yc3jcfzgj506zfnbmpz"; -"centeredline-1.1"="cqrj6vf1p84c5sqz09an9dixy4mkvbx5"; -"centeredline.doc-1.1"="k0yjy3jia8qsxh1zzgsdvm5a7xj58ni1"; -"centerlastline-1.0"="svlrrvv2sa6534pkbr8rzqiaw4jiz6av"; -"centerlastline.doc-1.0"="6b213204s814gvfsf40rmcfhcx14ncpa"; -"centerlastline.source-1.0"="35f4f2b8ccvz9k04c7n0nss2i9s1a3ll"; -"changebar-3.6c"="76f70hw5065zfzmvbkrkia3ih5jhhkjq"; -"changebar.doc-3.6c"="310sfxf3nzqrrkcp2n794kpn4bzv9b3b"; -"changebar.source-3.6c"="xi3ldcm33mq6aa4jad2sfv7g58kwg0p3"; -"changelayout-1.0"="sx1afd6zrrl7jk40van0mwbf1ks7z6fk"; -"changelayout.doc-1.0"="lw4yjf3h1r2qr24b3s98rkm0r3ybdwgi"; -"changelog-2.4.0"="gxr8r8g0vzk509sqvxllh0zflba5fbni"; -"changelog.doc-2.4.0"="w1is1zgnbs7y7xa6qcmaf5rgc1w5bz0a"; -"changepage-1.0c"="s3dd0v3z0g8v74i6cnasyaa70wnqiimk"; -"changepage.doc-1.0c"="g63jqnyrkc74dd9ksi0s7pbxq7s4dzwb"; -"changepage.source-1.0c"="0ck3lyl2kzvm1182hmw88ni48paff7aq"; -"changes-4.0.2"="zgzcy1cphdvibrj11dd31m5k1gfhcfwb"; -"changes.doc-4.0.2"="qbnh8gsgwcqsx81vzl7px699v8x4vkh8"; -"changes.source-4.0.2"="pw0msqw9p18z33vnn0wagg0f4ssd2k5z"; -"chappg-2.1b"="231kpsvxwdnmakq4mkca0nisqdl622n2"; -"chappg.doc-2.1b"="nhh2f6k2z5gh449b91fmxnvh359n9adw"; -"chappg.source-2.1b"="74f8nr6m6ssdqxynrxl2y4za3rmj9sd2"; -"chapterfolder-2.0.1"="n1iyz86gz5mb7ixn2kd48i0rgj28d7sr"; -"chapterfolder.doc-2.0.1"="cq3fgi89g5j3l8pjmgb9f76ly6ykdviz"; -"chapterfolder.source-2.0.1"="v9hlnak7v7s4bi4942gc43hh03zy33d7"; -"cheatsheet-0.8"="dbp6g9c967pc45wn345qm95zns815kl0"; -"cheatsheet.doc-0.8"="s3h23qpv0l6hn9bqnrzyiqx2mv4bzxch"; -"cheatsheet.source-0.8"="4x8njfgq1scmiqnkx4xvgxinc133a4vf"; -"checkend-1.0"="7ggrrfbxxr2y2idilmjalw6c0av7qypf"; -"checkend.doc-1.0"="qsvc0vq9mgcryqa2dfgh243mh893xzyn"; -"chet-2.2"="g654s58dhkxsnzbg59zydmncldn3qklv"; -"chet.doc-2.2"="4wc8nmj6lprpqhm5a067nsm00y56pzmi"; -"chextras-1.01"="mc1ymd3wfbwash00ly9gxk6hcx9rl4lk"; -"chextras.doc-1.01"="9rl2yhjmafyp430avjf0dmdmmgb45x01"; -"chextras.source-1.01"="5a4dqp8jyaq0bi98q26mskbpmp1avb35"; -"childdoc-2.0"="pq3pyrsns4672z06makyhs3dlq9yxnq6"; -"childdoc.doc-2.0"="35s7fq214rgxvxr5qvn79c46y82zkvqs"; -"childdoc.source-2.0"="hbll1cd9cf76kx3m0s0lb7d490y471sr"; -"chkfloat-0.1"="m48shpd6qvgscba8rz3dpkx0blzfiw13"; -"chkfloat.doc-0.1"="1l3anr2pkpq0h4wpshscrxmcdj80q6i4"; -"chletter-2.0"="9nvpbffnfn080w6pkf4xv18vwsvrc2z6"; -"chletter.doc-2.0"="h2qv6i4cc4yss3iv9jxwfa3w08h9gsk2"; -"chletter.source-2.0"="q76hqgvq8mjc9zqnxjxlk379gqlm0jgr"; -"chngcntr-1.1a"="pn9hpnfznijphqk5qb064ksyxabhhcqp"; -"chngcntr.doc-1.1a"="7612bvrx1f1ai3q5pwgmkpc33ip4adhh"; -"chronology-1.1.1"="jsrsagv2imvc5hz7mgbqdkdqjih66rd4"; -"chronology.doc-1.1.1"="m8psr1bcvmmi1qyyw0j8pyhy0bsgsvdj"; -"circ-1.1"="i0wnc7sxhx96v3jnnsv5l6i5nzvp94jv"; -"circ.doc-1.1"="v5g8hhvdn9xhqp9r1k9xahrnc0yd2a3l"; -"circ.source-1.1"="j3hksz3r2pa1y4m7kw2qwzm11j7a4za3"; -"circledsteps-1.3"="4li81ffd5m91k5sk741x4alkwbj1i45c"; -"circledsteps.doc-1.3"="b4q2r072dkzgfd75mj7av60a5v6fah1v"; -"classics-0.1a"="as59hrjhv6vnw9dr4pghhx8w7kmab8kf"; -"classics.doc-0.1a"="2gbi1lmx3chdd848ib2wbsx8bcmzg44a"; -"classpack-1.19"="hdmx3wk4ji1l2rzyhrvsl4waiy3bmlpg"; -"classpack.doc-1.19"="dl6zzq4cqjc3xhc8m2y7fmz2jdgzl7pl"; -"classpack.source-1.19"="drsgpzskdxa2rjy94sx75sdkcvnwpwk2"; -"clefval-0.1"="kxn3k2szmgvw773f2x826f8vmf8zdrl1"; -"clefval.doc-0.1"="xgnkici53d8mlg38k7b0izwvx0xkn82s"; -"clefval.source-0.1"="qkjh9803i88540p477379yl95b1wyhgx"; -"cleveref-0.21.4"="cl7sns14fh7jw87sz45rf4v2yrwqyh2g"; -"cleveref.doc-0.21.4"="9bz4rlbh25z2csnngs9ij9mrqazfq2wr"; -"cleveref.source-0.21.4"="7kvgpyz07knv09q52aplizs5zk455csy"; -"clipboard-0.3"="flll7lf5hy4hysxg3ppaq8ygzqsan82y"; -"clipboard.doc-0.3"="n4lc7mbwwxahicb51214fzgh5j2iyqhs"; -"clock-15878"="bcsbr112z4np0wszh3dwv9h5l8w11bvd"; -"clock.doc-15878"="prj65yh580yg74pckacsr432rki2nsl6"; -"clrdblpg-1.0"="rw9bphdh47x4kpwzil4pxvlpks1s4hz0"; -"clrdblpg.doc-1.0"="0brjv2dy10l0gy3sx6vjw3f5xq9h67bw"; -"clrdblpg.source-1.0"="7pcjrddv97fdsljj752n5gh9mygyl1ph"; -"clrstrip-53537"="pi8803gja6wyaq33syigff4s9zgrszph"; -"clrstrip.doc-53537"="y5j0z26acrhmfbrl2xln47zfynqvrfck"; -"clrstrip.source-53537"="whsy1grs9pgfbz2glsl4hb7vda69cnib"; -"cmdstring-1.1"="mzw3hf7xhy01j9irvvlba90hb0065p1r"; -"cmdstring.doc-1.1"="l2hjd47d6wmd07rnciadrbir01887nd0"; -"cmdtrack-28910"="1jw2c4hx9xmalis8lkz7lr4b38h6srlq"; -"cmdtrack.doc-28910"="0fniwn5zccpkypjn9v5hjl0baxscpc8a"; -"cmdtrack.source-28910"="hlqnd8ar2w2wyjr7rxi6qbi3mw2ppgsn"; -"cmsd-18787"="4b40ccv8788hg71xh6sv12gnzyy2q4rb"; -"cmsd.doc-18787"="j3bvhldqzjqf1snv9pbg7k39sbwl2ccj"; -"cnltx-0.15"="adx1n60b5dg15r60pr87nj8i979l23sy"; -"cnltx.doc-0.15"="603b8mxzm4cwj03wxgx5j1byhydv96qp"; -"cntformats-0.7"="v6xl1mkldlf6265h96m2q0bylifxhl33"; -"cntformats.doc-0.7"="rdam48ljhih6v72gaa3394zlg8cwsb50"; -"cntperchap-0.3"="xgdrhbyll67dbw0xabqmrl2livxcfsbx"; -"cntperchap.doc-0.3"="y2jdwmpp6r1w17svqw9iww07pi3blbah"; -"codedoc-0.3"="gva56ykkkr58q9gxkff6ng0wd5bk9by7"; -"codedoc.doc-0.3"="8w9r3z61w026a0zqmbsilmf4q382bvd2"; -"codepage-51502"="y9xv0i4lq1nh9nav86b5j34rws8lln53"; -"codepage.doc-51502"="sv2vn5f4kcgzbg52233drja6705lcgcl"; -"codepage.source-51502"="4955x5b5ddysnx8bksmwsqhj1jy83991"; -"codesection-0.1"="mnsfhjy6j2ypxiwmwx85w2k2zyw928pi"; -"codesection.doc-0.1"="s2kwd6brlwa42pvhpjasx84s87vmbz8j"; -"codesection.source-0.1"="j94xngba5c8r55idfqgy7ra3imzkmg8x"; -"collcell-0.5"="vw1ir7qzfyc8pc1z89y8zfhj7cs5yxz4"; -"collcell.doc-0.5"="86mkb3wz8zjsgpqgrn4azls054j27rcy"; -"collcell.source-0.5"="vv91p9mc1ig82bjw4cfd96ir1ndjx82x"; -"collectbox-0.4b"="2kxzzkgkgcjw80ff9n2mjnnfpxaxcdhj"; -"collectbox.doc-0.4b"="2xgqgni67w7q4ad0jqy4vr9wki08kn1g"; -"collectbox.source-0.4b"="szy9gprjqnkx357dca60120lvaiyyy8f"; -"anysize-15878"="0phqi21d8qz3ifadzfzyfb04v10xc46n"; -"anysize.doc-15878"="4as0n5cw5g21j1wy094gdrbw8pzdm460"; -"attachfile2-2.11"="fz9x75fk340ffzvsg4ishk0hjvgil8p3"; -"attachfile2.doc-2.11"="wcw202snsfgf6g607h8xga4lsq41gg1y"; -"attachfile2.source-2.11"="0cp1pzdkn692vyav1p969v2snpc3dsw0"; -"booktabs-1.61803398"="4hkipcli3lx2rfz6nyk95vzhrli76nfx"; -"booktabs.doc-1.61803398"="41kkvglc6cpp7rkyrc4957rw9viwwlc9"; -"booktabs.source-1.61803398"="fn9dc22vsdrrw19a8p47h0ysla6j6w22"; -"breqn-0.98k"="zxlvpm3140isqldavaiq93i62wx9fvd5"; -"breqn.doc-0.98k"="rq5wmm3nkf8dn5ai2fc9vbrnahb1aym9"; -"breqn.source-0.98k"="d6zijlq7xzciyk3xn1v5pbly5wxhd63m"; -"caption-56771"="bjmm0mpsrkwvz5mzk9n6dqpn6smfcbya"; -"caption.doc-56771"="ck3gbg8qcdfji56xksflhl5664fdrvkb"; -"caption.source-56771"="lg7lv6j2mwfzxd04sgcvs62f762jimp3"; -"cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj"; -"cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx"; -"cmap-1.0j"="576i3k2kyz947vm9yfwcl13pid3vdla2"; -"cmap.doc-1.0j"="93qcyi11nlxbqaycsv59b0b0x50i7k4v"; -"crop-1.10.2"="8g4mwi6zyw5pxcyza5jwpyh41xyvc6hs"; -"crop.doc-1.10.2"="77dh3wm92skq9s778fvn9wdc9x33xi4m"; -"crop.source-1.10.2"="6xhzr3a69yyqiff20sm393h6n7821v2m"; -"ctable-1.31"="wd1f4k8s98g3lcfn825snbj9pvsr6s2j"; -"ctable.doc-1.31"="sjikmhs468fpx52r50s7qyjc4rkfb9r0"; -"ctable.source-1.31"="a3danbgiabx2z87nxkkcbvdb0l7fs0s8"; -"eso-pic-3.0a"="5hkndcg8z7mq3hjd710hdm05sy15gpmn"; -"eso-pic.doc-3.0a"="5ls3fcmrl5v6dpi9qzympyvhdwqfiahi"; -"eso-pic.source-3.0a"="xz2ybhj1aw80mafgbn7lrj7g6mssr5g4"; -"euler-2.5"="32y9kxnr7zw4byr1zxsd2iqcfyzjvn42"; -"euler.doc-2.5"="g4bxh88pzc2872qk0w0sgapcaglal808"; -"euler.source-2.5"="8h1ahs9sbijdsc3xiv1rwv6k0vm9m858"; -"everysel-2.1"="3cckrnsvf7gk0f10zlpm0drsdnvbrh8n"; -"everysel.doc-2.1"="m6db8s78ndcb77q49g7fdwfyv4f74dlj"; -"everysel.source-2.1"="yxbk36ppzqqv507g0q0l4v0xzfy4z454"; -"extsizes-1.4a"="g3j8wf0886xf7ww65zi6h8gmc6x4mk3v"; -"extsizes.doc-1.4a"="xb8w2wf5i3lvcmppbklpp1hxc12acj5m"; -"fancybox-1.4"="xlk6adym8ans599d0hrs0x5nbaadkls3"; -"fancybox.doc-1.4"="iwsrzmm34bfmddlg33mrmnwjy88rbcfj"; -"fancyref-0.9c"="0417hndq96cnldfbpc3hc1f7pyfqlscw"; -"fancyref.doc-0.9c"="wr3q5g6hjznnfcr9l5lvl8z07ixm1m8i"; -"fancyref.source-0.9c"="54cyla9pjr00km1djk4jc0h8ly50c8d0"; -"fancyvrb-3.7"="8r16m2y70jzxim4ng30fvggkqsidysr2"; -"fancyvrb.doc-3.7"="rmfx84m7rapskdcn4mp205gcvm60n8q1"; -"filehook-0.8a"="yr1aaa45l23lavng9vnqk0bcqqyks5m7"; -"filehook.doc-0.8a"="mcz3zb712g7fgiqf9n7dh63rvca5nw0r"; -"filehook.source-0.8a"="d3dd5han0ncvs888ymamqvg2cnizm5v5"; -"float-1.3d"="dqksfsgqpc0vprkhfc6c9vfxlbrnn8sw"; -"float.doc-1.3d"="88hpzqh1011kwvwwm5bppb2gx6c9qqrv"; -"float.source-1.3d"="j1vp24g1lvwniahnd9vlw32c61cjswn9"; -"footnotehyper-1.1d"="vwi1wcxxxjxh66wmjviyfc8cizv2h48p"; -"footnotehyper.doc-1.1d"="pfcggq6810cvlgknlpdxwpvvy22j6csk"; -"footnotehyper.source-1.1d"="sz8bpag3amv7n9nyirv80jrfpvziih7c"; -"hologo-1.14"="3sz5m55pgy5adawf1qsnihw0mqf94hbk"; -"hologo.doc-1.14"="h7szzyb4hsbsa1inbyinazfvg87kn1da"; -"hologo.source-1.14"="8ijn8yd831dvsff40ksd8ak7fas85mgq"; -"index-4.1beta"="qbh9vs69mrp2czw492icb71wbx4nzshx"; -"index.doc-4.1beta"="l3476by3qz0r0cn3lcbw006ay5p11naz"; -"index.source-4.1beta"="0i38dyjh6278hxgkdzy0wvlcbn2w0k7n"; -"jknapltx-19440"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp"; -"jknapltx.doc-19440"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3"; -"koma-script-3.33"="s96ab2rc9483sa0axvd3v4q6z17xaa0x"; -"l3experimental-57789"="g8hk8qs5my4g6ci6hz0sa0ibr7n19hgl"; -"l3experimental.doc-57789"="g3gs9jfh2a9l7v378kanz3mshd3jhs3q"; -"l3experimental.source-57789"="kaxhwk53xz5y6h8q52pi3ivbnqyq6wfq"; -"latexbug-1.0j"="2hvzz7cxyq24mscylmxn8y2dqsdcbgv2"; -"latexbug.doc-1.0j"="kiz30ji995p7nzbi4g1xfr1621jm1h5q"; -"latexbug.source-1.0j"="rjxgrbk8nx0dcf1srw2jcz55c6qwr7k6"; -"lineno-4.41"="kvbdigwxw4db752kssgdb8rlxhljkkpm"; -"lineno.doc-4.41"="cfnil0v0isahd65d1sly2kr29w38h535"; -"lineno.source-4.41"="w30n8z3rnrvzpfa1d1s7mn3rcj03s892"; -"listings-1.8d"="ci87vjqba9nnwsgm8412749fg7fid33v"; -"listings.doc-1.8d"="jq29kbrz6bxs58iqhp76ail0kiy5s53r"; -"listings.source-1.8d"="0cz06d1v08369wgfnkddmzqi7258rsx0"; -"lwarp-0.895"="4aa4ky75hwrrqkqmk1l4rngriym8vdax"; -"lwarp.doc-0.895"="zpcz0sp4jvxr06bn70v5wi5hi3wjwhz3"; -"lwarp.source-0.895"="p98yd0hijyvsz6ij19kxkhrb11n1gm0r"; -"mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0"; -"mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh"; -"mathtools-1.26"="kms9438gym0n18hl31z7d6vix90napc3"; -"mathtools.doc-1.26"="dwjs0ps1md1b9b8mylqk63hgdmna0civ"; -"mathtools.source-1.26"="14z54fblj7d3cbav1xx4ijx8gy27y83s"; -"mdwtools-1.05.4"="fbp8vrgdzc2g4i27m9f4qcsr8yjlbzg3"; -"mdwtools.doc-1.05.4"="jb5r95gmlqj1bx19gbkvcm372ina3bdy"; -"mdwtools.source-1.05.4"="kcm853bwwv69vb5zcmikd1gmpcnhz9pw"; -"metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv"; -"metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh"; -"metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm"; -"microtype-2.8c"="lfl6mk4gzgz24qg078g2f1crc8w54i49"; -"microtype.doc-2.8c"="5176dwsvbxlazfnpnni7dx9l8b3n9zzj"; -"microtype.source-2.8c"="hkhb00d3yy7588fdnvrspz0i93jizn24"; -"newfloat-1.1l"="lbxyrzkqg5j3hgwjaw9gdm2h1cf381vz"; -"newfloat.doc-1.1l"="fkbi9h381inng5z9qdgnig25z0fxsb4p"; -"newfloat.source-1.1l"="p8lpx95dawyhvyd36nkppgilrflb79v1"; -"ntgclass-2.1e"="zkss2080gby0mqd685h9ff8421j3nq21"; -"ntgclass.doc-2.1e"="d3ns0gma0fivb3phssvzx9b1c6zwfzpl"; -"ntgclass.source-2.1e"="i9d2yfcz7blz7c5gakqhycmmwhwykzgw"; -"parskip-2.0h"="mpszhyaf9p4wjjvvnr5l7xzjs2r51x1j"; -"parskip.doc-2.0h"="r5z89pafrb0h4g13ynjmkwinmdqipy2f"; -"parskip.source-2.0h"="3i9s9mgcz42qdcwhdsajlxjz4yv7xi1i"; -"pdflscape-0.12"="xhyfdrzcx5agnsmlgrr1hibq0pkzmmsz"; -"pdflscape.doc-0.12"="7z59wsjf9k7m6d47bclgf6iimhrhlrfl"; -"pdflscape.source-0.12"="9dmgmza1qbbr95mdi9k27vkr772g2w2s"; -"pdfmanagement-testphase-0.95c"="d10sf3di22akhqgamsdxahlr85hjxp8p"; -"pdfmanagement-testphase.doc-0.95c"="fnw5c33z7s0nnl907wsjcvadryfl3hs1"; -"pdfmanagement-testphase.source-0.95c"="wza6nvsaix43qljy4wdaw8affrpc9n85"; -"pdfpages-0.5t"="xvarpi4qrn25ia7h8mdkv0xn8nx68b71"; -"pdfpages.doc-0.5t"="5xigwnsba1xgl3yyan2xwfysxpz0ybsy"; -"pdfpages.source-0.5t"="90qnhk3sy88rr2rrvh2qagqrx8b4g071"; -"polyglossia-1.52"="n9g5zqm9mp17iyn29lvz27p11sn68mb7"; -"polyglossia.doc-1.52"="6dx3w1vyx3p0gbw712wyl0n5cn77f3xa"; -"polyglossia.source-1.52"="797hklcq9f3915g8lngn0bc9mjcpnacc"; -"makecmds-15878"="anpaqglvl5rmcy8r2q0ap8m117nsx89q"; -"makecmds.doc-15878"="39zxaxxqlmps1wd4rjy42a1hk027n06v"; -"makecmds.source-15878"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6"; -"psfrag-3.04"="k8qyr0l3fsc4insyy1r6q596dq4gf23a"; -"psfrag.doc-3.04"="ybb4r3w20w1pcjwzaw0srpkx5c19rqg7"; -"psfrag.source-3.04"="xk135sb77fk6l9wz6fzifsjvchcqyj0f"; -"ragged2e-3.0"="m0xrzzg743b60bzfw38y0s8c9p9jr2vg"; -"ragged2e.doc-3.0"="6yx2gi3mmwq1cskwlh8ydpa8yaw0x51m"; -"ragged2e.source-3.0"="if09g3gjifv77mdd45w65rq12547mkp3"; -"rcs-15878"="4lkd02hz1x9zkxnh247wmwy6n9pg4pyw"; -"rcs.doc-15878"="m1lw85b793n2nxywdi39fg438i6kif7x"; -"rcs.source-15878"="iw4nn20q54s2d4wdyby7n03ljcqrjmig"; -"sansmath-1.1"="yxyny4949h4hm4ajn673nzzw8wn8cba8"; -"sansmath.doc-1.1"="b8vzdmm1l2x7cyc15xzhmwjkszlsp2j3"; -"section-20180"="69anwmylbk95jbgr8645abp07ygv9f9g"; -"section.doc-20180"="ri1gsrpfp94rp0dc90djj1kgpka2p5gl"; -"seminar-1.62"="z9nzymppz6hz3lxy0nliqvy5szq6jk4c"; -"seminar.doc-1.62"="23fz6p4ybl42rmr1m3fllg7qn1zbmfki"; -"sepnum-2.0"="x64bd0f3g1x0bcpdgd2lfspr13jyxvcf"; -"sepnum.doc-2.0"="l26xmi7n5vabfpn0lfn3cjzn1wj6lj5n"; -"setspace-6.7a"="jyy54q9bmx158j0cnpwqa43rzvkm4wq6"; -"setspace.doc-6.7a"="xzz3kqsp4ywxmjdnchkmdv2jy4mkbfvc"; -"subfig-1.3"="sbdadp9ya32w2h8f484zwpmpln2zi4l0"; -"subfig.doc-1.3"="y5g4iadgvkfi144zk37fww79r0smsfk4"; -"subfig.source-1.3"="3xn4yhi29m77001w2hy0s04svik5z5xx"; -"textcase-1.00"="bx5a8yyv2wz1y2rj4sjm2psw3x1j3c43"; -"textcase.doc-1.00"="lx43w8yqkg66bg1b2gslsakj97jr7far"; -"textcase.source-1.00"="vjlmjci0821c4cnbh8bq2x3nkiwaji0k"; -"thumbpdf-3.17"="m4b0akrn0sq4ngalczdq287avr5mrpc2"; -"thumbpdf.doc-3.17"="9759lhx69f2406pc4ggg4q2hjws5nnr4"; -"typehtml-17134"="rk5lpbaikavkp0shg38cdk5b209wx3kh"; -"typehtml.doc-17134"="292x26pw24azh4zdwpy6sh3f1ksk8r2x"; -"typehtml.source-17134"="96p79dyy553b4mc01ihk7qgr11396drn"; -"ucharcat-0.03"="d445ic6gwl7d5d31s691vr63f4hn76dz"; -"ucharcat.doc-0.03"="ma6rz3djr9v3q5p8ffqyznjb91gjj5li"; -"ucharcat.source-0.03"="kh9cnzg1pn8c51bbph2amp5y1j85q38h"; -"underscore-18261"="b7kwk1zddr5a19mcw3yxrp9pffc604x0"; -"underscore.doc-18261"="gwqnbwqn6vjizs1xqnmbv8fmcrs274fr"; -"unicode-math-0.8q"="p35257s5ldld4ya0xkvsxx11jrwxhg66"; -"unicode-math.doc-0.8q"="m9sy94l2v9qq966wlphf2ic8xfxdx81k"; -"unicode-math.source-0.8q"="1sydxxbljd69ds018c5hr8rk3cvb22qd"; -"xltxtra-0.7"="k32hfwrcbhp144n8rplwjgxmz89pw9zm"; -"xltxtra.doc-0.7"="vkw5vjdd8n7qxi8plhjb4xygh97pfj5d"; -"xltxtra.source-0.7"="y27f01j6zgm06nmsgcp5kl05p637wvj9"; -"adigraph-1.7.1"="rd6185ri0shknkd4ixsmlm7229q94sgk"; -"adigraph.doc-1.7.1"="20bk54g9516h3h83pdz74zpknamxj3pn"; -"aobs-tikz-1.0"="klfbwfabfx6lv1pk6kz3vayabsnphvrh"; -"aobs-tikz.doc-1.0"="qh43c30d1xpyl4rbazp4kj8p850rdxwb"; -"aobs-tikz.source-1.0"="xgmck3vrplx5q6blkm6yg2njgkk4k5bz"; -"askmaps-0.2"="h7gsxw1m64s9ci55nf4c8xwr709jfcg6"; -"askmaps.doc-0.2"="06v8bsahhf9mmi3ln2zg8rj9nd0kpnbp"; -"asyfig-0.1c"="61q9dbbmirr3q1fncz10fpvqr68kj3zb"; -"asyfig.doc-0.1c"="1ynfgvq1hvwl8dflmf5vchv2xhmr8511"; -"asyfig.source-0.1c"="2403n3a1pa3gbrrs919rj56jcy4klyz0"; -"asypictureb-0.3"="gl1hc876saxilin18y249r7zz496yk6l"; -"asypictureb.doc-0.3"="9fn9i5plddqx2gxpjhx2m5n7jrwrk9x2"; -"asypictureb.source-0.3"="mskj52di031bhfjir3f7cd5aqwwz7cn4"; -"autoarea-0.3a"="navp9i0m8kf8zqhk4x1avirazzrsgf83"; -"autoarea.doc-0.3a"="zh69glasmj251qwrw6pjrshprd6x4hsh"; -"bardiag-0.4a"="vh54valkzncvzlx8y58gzs3k5jq66s69"; -"bardiag.doc-0.4a"="576s5nnqvq13rjnnn4l2d1g1rnd64vvn"; -"beamerswitch-1.7"="wa6xv124q0qnpx4a7i8slbbhvvad38i4"; -"beamerswitch.doc-1.7"="i191731mqn4ds48rmqg688afxa9b70am"; -"beamerswitch.source-1.7"="xwdacngvm25n0q3hyy5whxxrfyanmhnc"; -"binarytree-1.01"="xl1rqgn286y7hpv69bwja6c5rrbx29g9"; -"binarytree.doc-1.01"="7ihijqc33m3ydk77aw0qqqhf94yyrz21"; -"binarytree.source-1.01"="lk7v0gr502ck4z0d605z6mwkswqpmfyk"; -"blochsphere-1.1"="8sagm09ymgd1b2ls78rzrcbn6k0m63rr"; -"blochsphere.doc-1.1"="sj294bshvzlc77wi6mwv4pl0y73j311p"; -"blochsphere.source-1.1"="4kr6ra2cp6fm7r6xfrln38v06iwxqzaf"; -"bloques-1.0"="azx9imhipx08s8zyky9hzkwandvxwyya"; -"bloques.doc-1.0"="8jb9hv62wj4hi9scr78szdm990cqprvs"; -"blox-2.51"="gy0crpqqx51xsqg48qj6w2zn03q16yrd"; -"blox.doc-2.51"="gd9ylc6j2smbi7bxnpfc3lr2ykb1apd3"; -"blox.source-2.51"="ckxfb299w0mqsbizvq04s65akfzsxjmm"; -"bodegraph-1.4"="h09jfqdgsgfbhakfxqbwz9wa9sdrwkip"; -"bodegraph.doc-1.4"="hwwfy0n7b2a54kywm1jq5nrs6fxbk1xd"; -"bondgraph-1.0"="xaviazf8k9kn6qckni79kxksf7r7mr00"; -"bondgraph.doc-1.0"="f0089d1jj935472sxdjkbnmz4inydkng"; -"bondgraphs-1.0.1"="grfahi07937nnb8nm3b14csxv6bf3w7w"; -"bondgraphs.doc-1.0.1"="dky0vgbx6hfik4xjavvpvvm269hgsqcv"; -"bondgraphs.source-1.0.1"="zmcw2pr67zm6my8021slkbg8zvmbkxic"; -"braids-2.0"="lhgf3jlskfcv3iwsyrnwd8amlr3f0kwq"; -"braids.doc-2.0"="jnj2mqbrrw89wia4vrc24ifg9rv3bzw9"; -"braids.source-2.0"="ny8xkjwdqbx115liw708q6bdyyqzcqil"; -"bxeepic-0.2"="dwf6rg63vzmlcyaxjzwjr8haihfxwv6f"; -"bxeepic.doc-0.2"="qkfwmg27v6ygkp3d9d1l18zrpribbx3q"; -"cachepic-1.0"="hr0pnmjxny590gzhqbwq9qiqd1vcpwrq"; -"cachepic.doc-1.0"="myyjxkc21qrwmvx2nvbg2smvzfzi5f5l"; -"callouts-44899"="i91ky84hjizrxkhb5k6281iq3fkifrsg"; -"callouts.doc-44899"="k4rca9nia095sgskhv0kzp1qqw0ydf8l"; -"celtic-1.1"="mr86xyd6md9n5b17a6wga40k8z98dq7b"; -"celtic.doc-1.1"="3mwjjxnv079m8ginlv5my50jj1cmpjv0"; -"celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd"; -"chemfig-1.6a"="yq65mjrbkcb7di3h3gidwja30kbrvg32"; -"chemfig.doc-1.6a"="1dsdgdbcvwbhvx7dslb3zj3hn24n1j3a"; -"circuit-macros-9.5"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj"; -"circuit-macros.doc-9.5"="a7ipgax8cs0bg1nwd5yzzhd9y5ffm8ag"; -"circuitikz-1.3.3"="nljcz0x08y4c2hb75k6lwpw2a40csakz"; -"circuitikz.doc-1.3.3"="gav2rmhidxv5b0i4rdhn250iyd3q35yr"; -"combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a"; -"combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg"; -"combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q"; -"curve-1.16"="w4a3qv419x68y5ydvi1dk6pnm6ni82ci"; -"curve.doc-1.16"="f4n85j7dlkp12vm17vqac8d4hzm1jvd9"; -"curve.source-1.16"="gkfbyzhsaknlrhm3ni81jxswdjv5z9ij"; -"curve2e-2.2.15"="47c76v0kykh74p6rypbvxzl29s1x58d7"; -"curve2e.doc-2.2.15"="xpng023wb86w2yzibizdf8sjabhmal6i"; -"curve2e.source-2.2.15"="0fyg1gjxb21sa15ym0fipriwapdi9j9d"; -"curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b"; -"curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv"; -"curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw"; -"dcpic-5.0.0"="vw8yp87w2arykklgfbi4sjpqq68nkxl4"; -"dcpic.doc-5.0.0"="0shw5fqn8pmzs2s98yxa12jp6lf23c4b"; -"diagmac2-2.1"="4q9fi0lsnriy4szlgdlg0w302q1gmbrs"; -"diagmac2.doc-2.1"="dfp1br71r19b0pzjzln61wjdn30qy0n7"; -"ditaa-0.9"="pbrv5kj46v258vy3dzlp1js4m0sp8wjj"; -"ditaa.doc-0.9"="db8d34zf2n19xlzljydai7vyz3p11wi2"; -"doc-pictex.doc-24927"="770vj0w7dzrw6n4jf1dfds5ngk11cf6m"; -"dot2texi-3.0"="igh08hai8lpcr0pn4lcfx5b6kgymw4sp"; -"dot2texi.doc-3.0"="r038r86xd4csibgk9n3h76qc5ak1zpl5"; -"dottex-0.6"="yvd132700sxd7hnngskg6w30r1cpx3m3"; -"dottex.doc-0.6"="67dpg655j83k809rs0ybc3cxpy2lvvqb"; -"dottex.source-0.6"="fz625gq3shyvx3wk5jk4hvr33wls038a"; -"dpcircling-1.0"="x7l784dw5d37jlws64l9x3ya6hgp9w1h"; -"dpcircling.doc-1.0"="fj0jxkgqs0n66z0rlyak490bddcbw6nw"; -"dratex-15878"="ydbymdy490gw405n0gn3amd771knss83"; -"dratex.doc-15878"="7z5sxm5li3by76x7sw9hq83gl34f6gkr"; -"drs-1.1b"="h9fz09xdgwgnbif1vxa1k7rxj8v9ri5h"; -"drs.doc-1.1b"="aq84i4xdklf4wcripj60cc9fd4w3zhhc"; -"duotenzor-1.00"="fx9ljkzzp09x8iajbwjlrzcjxf382k9x"; -"duotenzor.doc-1.00"="x6y62df7hjrp64r4w1qvdikqdg6ph8l2"; -"dynkin-diagrams-3.1415926535897932"="d07y65n2wrkpi2fkk5vk9dpghyw0vqnl"; -"dynkin-diagrams.doc-3.1415926535897932"="zf20f1ibnxrg06g2w29l56ansa8mi7ab"; -"ecgdraw-0.1"="py3xjb8hz3mdsh42hnjww7i4ndxgkwnc"; -"ecgdraw.doc-0.1"="a9ggi8ivc4wcnqv9gd28lhdw56w4zg8a"; -"ecgdraw.source-0.1"="77vlnnhs178s19gaa4n7wa82lcvyp0s1"; -"eepic-1.1e"="vdbwj455076cwr4fwmx0lmf00nzka9vs"; -"eepic.doc-1.1e"="ngcq5bdryv79z4wazbzibf8fybc2mhb0"; -"ellipse-1.0"="8whg820p9jrqn4nfb7lc3w8d1a2cyfvn"; -"ellipse.doc-1.0"="i9njlr8m3jb9pcrwqsbcjbsb26993p8n"; -"ellipse.source-1.0"="25xhi22s1cvkyzbjwchd50ixsx6awfk5"; -"endofproofwd-55643"="ylgnygd6w1p658j90vqdgl5a9i95brxp"; -"endofproofwd.doc-55643"="jm7dscwzp5wwyw335jl293m10yszxxs5"; -"epspdf-0.6.5"="06n9z5fw1f71x4kb07na5bkr48fd5s5x"; -"epspdf.doc-0.6.5"="xc2psspim5kmyzwr4sksf81g16pcslq2"; -"epspdfconversion-0.61"="4dsfb50v8zqbx8nqlzlj712jiq9hchwz"; -"epspdfconversion.doc-0.61"="bxc42asj3as5dx1qq4axdvfs30lfm24b"; -"esk-1.0"="1hsqxgyh6nbwdw4fl5lsivg6wh1v2s1r"; -"esk.doc-1.0"="14qzisxfrysqh66dn3irf2c39jjazl1j"; -"esk.source-1.0"="yaq1hdjjgl4j06rvz25liay9p054n1sr"; -"euflag-0.8"="ddwdd62zjqapy5hfcc7aa9x82zzmva41"; -"euflag.doc-0.8"="9al82d8f73w4gfbj2p4zg32w1vkwkkkr"; -"euflag.source-0.8"="djgx9f4b3c43g8gk66wsmhlf4bsszff5"; -"fast-diagram-1.1"="sdzr4ya21gayk528rk4zli01l8ywnqm6"; -"fast-diagram.doc-1.1"="anbp06v1p1bczyiij9d2z0li6yski394"; -"fig4latex-0.2"="mwf75sk2i52q6j3gb4pjmw5rlyyihq5g"; -"fig4latex.doc-0.2"="c6qz809776x0rblq5d6l7xcy35bz540v"; -"figchild-1.0.0"="0mbxfg6z2abis6q7zb4n1q8l64jsdh2d"; -"figchild.doc-1.0.0"="xwszpncgw8phlbxvzv75s94v5rgar5lf"; -"fitbox-1.02"="1xc0jmbwwwx5qz9n1kdb7ckwqfp69624"; -"fitbox.doc-1.02"="w9pj3arymsl3p2yyis76xiyq8m5v47sd"; -"fitbox.source-1.02"="1vhaxc5s13fkpqgymjlfmp88m41hpm0x"; -"flowchart-3.3"="63krabbf5sfqxf0rjb2h4mjksvb9vgcd"; -"flowchart.doc-3.3"="697hizfchfd691kx07sl1y84p8l6196d"; -"flowchart.source-3.3"="zgn96fhr4z67gpz85717hwwfvkfz2hlx"; -"forest-2.1.5"="zl86yn0am5c7v9c471ai0g4spp3lfc4k"; -"forest.doc-2.1.5"="9sfpasybcfbs0v2afcmhxwpcmdxjpv42"; -"forest.source-2.1.5"="n53yzm6p3nwbxrjj999yvcic58p4iv6z"; -"elocalloc-0.03"="mk2cs80z0gh4dx409y2n3h9cr8ls1la8"; -"elocalloc.doc-0.03"="0p4f0hwr11xvn57adggbbssn9iiynsyf"; -"elocalloc.source-0.03"="spa5lrwk7nikx08v1pgp0xrx4c2gbahk"; -"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; -"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; -"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; -"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r"; -"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q"; -"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g"; -"inlinedef-1.0"="x9ayxzl60mwgv8w3ispv1xc3qxwylij4"; -"inlinedef.doc-1.0"="g5fqhrp1vf6pky2wq3bq1hd2h0jrml8w"; -"inlinedef.source-1.0"="c5qr2b5029bkpgqhahv4licfp89l0k9v"; -"pgfopts-2.1a"="r3hmv29kc7hfcmx1j2kirk27q4y2r5a9"; -"pgfopts.doc-2.1a"="qb2q273gcqw9p1wjzw8hq7z13f689zkg"; -"pgfopts.source-2.1a"="g9ya18k22lcd5f8aq3anl152d98h6b7z"; -"genealogytree-2.01"="q8fba5j3rwbxhvmxliaycxv2v79nyyla"; -"genealogytree.doc-2.01"="ahvajyv1yxgga47lv3px7s6xlajqri6s"; -"getmap-1.11"="b3iws7x0vfqj4jcrz2y8m77l9v1ywwk1"; -"getmap.doc-1.11"="291rnf2x2nnyhf2wc82hv77jndrx6ckg"; -"gincltex-0.3"="sqimpp1pb3c7mqcm4jnd40jlahpcnr30"; -"gincltex.doc-0.3"="mpr0nv6ldvvc7wgq35qh34csxhxnknmf"; -"gincltex.source-0.3"="s0dq3s33c04fqmzi9q9wp09vgfm7qh9h"; -"gnuplottex-0.9.5"="zk6v716qmddad8da5dl1d8nm5xsli2a3"; -"gnuplottex.doc-0.9.5"="i7gzafn4a0cqpn7hav462lhbwgpmxkcg"; -"gnuplottex.source-0.9.5"="x8f5ik2wy273vxgmbykqhlx2yp5wpnga"; -"gradientframe-0.2"="x80zlqzx72n55qpazclikrafwzny8ss5"; -"gradientframe.doc-0.2"="pgy0vrx4nvys3wki3202r377nryd0r1h"; -"gradientframe.source-0.2"="10dx55zpi0j7xzdkry3dh41ax873mmmk"; -"grafcet-1.3.5"="9yyjgwccj41q284v8cxfhj2l80x95ygs"; -"grafcet.doc-1.3.5"="6k9w774q9japk0n05f45wdqm95n9n71r"; -"graph35-0.1.1"="x18xxd2x7yb5ckpild1s64w9f9rpi5n7"; -"graph35.doc-0.1.1"="qza5xy7xdsncal55gyqs8ay9z1h5rp49"; -"graph35.source-0.1.1"="gaabqpc5jr86g3jbd4sm6df0633c65y3"; -"graphicxpsd-1.2"="wzg5nivinnigm98anjkpqkzxy5yy7g9s"; -"graphicxpsd.doc-1.2"="41hyvv7makf7nhamhwgjdvark6ydkdfk"; -"graphviz-0.94"="gicmf9qslgbamr7qkac4y3x0wajkbhw1"; -"graphviz.doc-0.94"="xxyyxpgr81jv00v48zv7vxkm9sa4hjsn"; -"graphviz.source-0.94"="kqv26abzy2ff31a3f0aval7lskvk5nql"; -"gtrlib-largetrees-1.2b"="5vpf61cml2gsbvciynamwvv1arq8hrm7"; -"gtrlib-largetrees.doc-1.2b"="fxh9rvq76l19zjv3lbgman4gfcqw34i0"; -"gtrlib-largetrees.source-1.2b"="knfqk3b14idsc57fj80ngw26xi7pcnwk"; -"harveyballs-1.1"="axddj0mvqck1gmg0b7s43q7gi9hm1327"; -"harveyballs.doc-1.1"="rpsz7hqyyp9h5sa0hxmxnlrs6na0imbn"; -"here-16135"="3jh68lc8arqbg7kb8ixc87i12qlrnh23"; -"here.doc-16135"="445zak4q5zdlbhvkb8gvkg20wpmwjmgs"; -"hf-tikz-0.3a"="hfdmzpnpak33573ldllk90rywqz3ngqi"; -"hf-tikz.doc-0.3a"="dy6jw7rgbclhb6c94rm3c1bxz0gznqn4"; -"hf-tikz.source-0.3a"="jn1iy5nysj2y94ar0s2491l97m1y2rw8"; -"hobby-1.8"="kmk2l2ik0anclivgqk6alx1v44j6g8pk"; -"hobby.doc-1.8"="8bdi0hrpyxyczql8rhqfiqlrza5y2g56"; -"hobby.source-1.8"="99k7q3r58r1v7vqh3hv08qbb5s1r552p"; -"hvfloat-2.19"="9dda1g87vmjw1mhckd425kbf0a491b0x"; -"hvfloat.doc-2.19"="rcbk3szwymcn660qfjgfavba0k8bw2bl"; -"istgame-2.0"="il4ycc7pxqvpyals4cvc2bkgvzc29vmc"; -"istgame.doc-2.0"="rr6wnw1csla45zv7kmcfizj72rfcgx05"; -"kblocks-2.0"="r1c2xqw9lfycgsc36iisprcas2vr5w24"; -"kblocks.doc-2.0"="sbbprirkbdrfs10fbyv84dqjqxbsjsg7"; -"knitting-3.0"="zggfcjvr02xigbnrhnz1cdlz9hqkcv5j"; -"knitting.doc-3.0"="40gp4l967is4ljnbh4k03w1a87r4n0py"; -"knittingpattern-17205"="8xvccf07iwn71kfnj9f3pnni3imwd9kb"; -"knittingpattern.doc-17205"="bq96pr4hd9mg70qqfwjynhix7ljabbk8"; -"ladder-44394"="wgw0drkb53daslzwsvg48dfznndrz6dp"; -"ladder.doc-44394"="32b2x9zydsp7b2zncs2lg6ldz5cs7gpa"; -"lapdf-1.1"="g5x8axkiscl5796b82is201vcbdxvc3f"; -"lapdf.doc-1.1"="3lpf17r6yqaa7ld8742cp8a7crafpc9x"; -"latex-make-2.4.2"="nazmg5gjqni54i0rk3giq13jnzn9w5ql"; -"latex-make.doc-2.4.2"="rz0xp76krcxvy654ji1f003c37g1pkmf"; -"latex-make.source-2.4.2"="bfddkj3bcb11lff9ypiswkcyaa2dbcf7"; -"lpic-0.8"="74wchk7ljfacnfqy6wn0j9ns5bqzhkv1"; -"lpic.doc-0.8"="yqsjlvnfzgj180kssqhp1i11gq8d9c9q"; -"lroundrect-1.0"="x8g1sz9w4xaj9da4y1xy58hrdblmdx4g"; -"lroundrect.doc-1.0"="2pw71ykcm2w7ki2xx5fvhlfk5xgi410a"; -"lroundrect.source-1.0"="4ad9gr28lqir9g0a15pa31wybbc9m935"; -"luamesh-0.6"="71l0qbnglfb0rvzrbk4m1m1m15lrfa67"; -"luamesh.doc-0.6"="idnacgwmyfk7chfwbfz236744xf9kc60"; -"luasseq-37877"="k07ymsxywmasi0nkdd2ldk164lf36z9d"; -"luasseq.doc-37877"="vnqisa721w2nx11wxb3zsk070b3dzm1b"; -"luasseq.source-37877"="341ldjdwdvjin4rq8ica4f69hb5kbwr1"; -"maker-1.0"="88vzniwk6x9fqhp4y3g32a1cj6nb57g3"; -"maker.doc-1.0"="5w3rag10kbzp8whk0hjrl1ic7iqrna8f"; -"makeshape-2.1"="y9d0868x2s8950zphcf6sdz3l7a1sw9s"; -"makeshape.doc-2.1"="wdhhbk50rqxnm4iqd0gvnfzgy17knvqd"; -"makeshape.source-2.1"="5ddzsj9xakk5hwhg54snvv7bp0vlmjd1"; -"mathspic-1.13"="x4m5r6mv0y3cc4vx1qb6anrparbgdvlq"; -"mathspic.doc-1.13"="qh2ycvh04kxfihxnri5fr5zxdkk04ppa"; -"mercatormap-1.02"="yfwmkx0xzyak9lw6gcwsz6by37pfa7rg"; -"mercatormap.doc-1.02"="mkkdvrwryxwm3p2xynmfilxm9xfv2nsh"; -"milsymb-1.02"="0kn7fxbn0magyklkqw0zph4ns4lv0c1s"; -"milsymb.doc-1.02"="5s65vp27mzshck2ral9r7grhsi7v70p7"; -"miniplot-17483"="3myl55b3q359l0aillyxg7pisii3llpj"; -"miniplot.doc-17483"="hi57wciv475ix91zl4rh30lv5pffns1p"; -"mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b"; -"mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3"; -"modiagram-0.3a"="zn4c83sdrwn9vkv6m1q15bsvwp01ycjm"; -"modiagram.doc-0.3a"="qy9zyvkyvs6r8jhchndbprhszbj69ycf"; -"neuralnetwork-1.0"="3scaqj2kvqri7x23chqymfkg534298ik"; -"neuralnetwork.doc-1.0"="xxsvv8bh5174ihqmaxgy5072z92glvhd"; -"nl-interval-1.0"="mxvk6j3l7cy7pd6z6v7802a2rkjfwifl"; -"nl-interval.doc-1.0"="m0hanp7zdpd770q90f97xbki0dlbi9p6"; -"numericplots-2.0.2"="c6kqacnf4qlhx7lkbnrp4xji5xg9nzib"; -"numericplots.doc-2.0.2"="9dlfmdqslpzhsf8zyfnsqy41qmcgzf1x"; -"pb-diagram-5.0"="34vlhfdhm7glvpzprr99v7z7lc8rc8pd"; -"pb-diagram.doc-5.0"="8a36mfpszgjyzddfmmz2qrg9fv03r9vh"; -"penrose-1.4"="s5qwx0ad5bavic2qrs63jx22y433pnf7"; -"penrose.doc-1.4"="d82pns7ycyg81qv6i61jyfnabwxmgqgl"; -"penrose.source-1.4"="fda5csd5xm2n13jcixcaz6r41shzzc05"; -"petri-nets-39165"="0yny9mc10syfx1a716sjw3768bf1a51z"; -"petri-nets.doc-39165"="3m0f4r65jhnq3la2qyp0xa7ra66iyahs"; -"pgf-blur-1.02"="30lr14qkrz1ah9kvgadknb9a7yyhv625"; -"pgf-blur.doc-1.02"="x4phrny12czndwvsrml45i6a5ymfncf0"; -"pgf-blur.source-1.02"="hdg79rv84byqmnyahvi65v3ca3h3j14r"; -"pgf-cmykshadings-1.2"="jpaxyzfgw5vgjhfpgqy7v4ddpq6nhks8"; -"pgf-cmykshadings.doc-1.2"="mk9nyxpnv0bbcg84i7ngz2vvf88dib77"; -"pgf-cmykshadings.source-1.2"="zd27bjqz9rxg1sdrzbbky56z2fdhhgv8"; -"pgf-pie-0.3"="l3lv4iydk6xi3x6krz4aqmly0y1949yk"; -"pgf-pie.doc-0.3"="v85y3l097agvjvmd71f6kxsa2wwd73gf"; -"pgf-soroban-1.1"="1l6ifq09crmg68d174y2ms66jjhgklql"; -"pgf-soroban.doc-1.1"="ajlhmwd0fgmamsgnnzr3s15z6irx579s"; -"pgf-spectra-2.0.0"="6jn99k98c310r0n50migknaxdhjr6zxm"; -"pgf-spectra.doc-2.0.0"="y1pzg5rhvnqpjla0fzizv99mpff1x55h"; -"pgf-umlcd-0.2.1.1"="h2syv4fn0svppahm66gpwb4jnrl7jdl8"; -"pgf-umlcd.doc-0.2.1.1"="yn8vn90qgh34r1i91cg7k5n81v47i6ni"; -"pgf-umlsd-0.7"="f6lyf7ph9a6ayc082h8bd1hrwjx1jw2y"; -"pgf-umlsd.doc-0.7"="6x7xzfz7zcd43fscprh7s4gniya05nbs"; -"pgfgantt-5.0"="vbi8jb5870r16w4dd7zdw26arrcbbv6x"; -"pgfgantt.doc-5.0"="62rp2q84amm7kgvan2jw00si5fdkq226"; -"pgfgantt.source-5.0"="6r8nhidc0kwxra3p3aywh9y2kcv7zwiq"; -"pgfkeyx-0.0.1"="z2s0v4qmhqbbw3v7bx27i1i454zvzidz"; -"pgfkeyx.doc-0.0.1"="znjsk9dvxksykikfmm69z1kizgpqnpl8"; -"pgfmolbio-0.21"="987pnzviy9l6fbqgkbq8xhjn18w4dpqi"; -"pgfmolbio.doc-0.21"="ckwm7mnw5qhp47vfxmbc5xjvnysp8jxq"; -"pgfmolbio.source-0.21"="l3rs43l6g8bg4l4y7gbf8ji8vpj9pwca"; -"pgfmorepages-1.20"="kvnwv6rsijb2if9wal7a71ggxn3sh8q8"; -"pgfmorepages.doc-1.20"="fdzbkrwfy9cbhirhyvb2yfdb38z5jb4q"; -"pgfornament-1.2"="y4s27bm5bllkpvlqsd2v8i753jjzhlyx"; -"pgfornament.doc-1.2"="l2l2qmphza7jr6hqgbbp11ms19ssinh3"; -"pgfplots-1.17"="f5x1w97rgj20w1649cynsz2viyd5l9g1"; -"pgfplots.doc-1.17"="x6fpmdj6hgjzyykgz2cv05sk57z1zvxl"; -"pgfplots.source-1.17"="9jdvnlallwaimm0sydy79q1jrpwqm97s"; -"picinpar-1.2a"="wvxa8vjglc2v1k8dcszj32wx5jgmsm3w"; -"picinpar.doc-1.2a"="ix8d6091agdxivkq3pj0xv5afksr16xj"; -"pict2e-0.4b"="zbvvgxa6s4wp3kji320n7xrss0qabd99"; -"pict2e.doc-0.4b"="nc4yi0yly80s0lcq9a3cimlwyvwisnac"; -"pict2e.source-0.4b"="zl1v9f75nkd7dsrch6yfp21y9pahv879"; -"pictex-1.1"="3wr03wxjs0nbpncsyzzz2flz5h383a30"; -"pictex.doc-1.1"="d96f4qc758wqc5pifjspr2cfhkj3j44q"; -"pictex2-15878"="fmvr7pqdpq2lnigzzbshgwmrjf03kj6h"; -"pinlabel-1.2"="5bshz2446a2c3mgc79b1znaw07n54cck"; -"pinlabel.doc-1.2"="a23kw5gn0cwsg5fzldlq5a9rj03wg1la"; -"pixelart-0.2.0"="hq6wmp9dgfzzqxwn11a3isf2jnzm2b7v"; -"pixelart.doc-0.2.0"="xk2xnxmgcb2i26qnim31dvq7qm209715"; -"pixelart.source-0.2.0"="64lb31p15a52jvprjk61dfg5a9njjkim"; -"pmgraph-1.0"="hp6991d3dq131lsjr5675igjkgnp1hr6"; -"pmgraph.doc-1.0"="yi2b6kiybj2mivsjp7jw0zy895zj7731"; -"postage-1.0"="7n4w4vhx3ck8pvfp69l95yn45f7qbmpp"; -"postage.doc-1.0"="h40jv63ikgmcd83xmvkz3vdc700j5myy"; -"postage.source-1.0"="x0f20a02h113a5z6cppvhrqcq2lmlh8c"; -"prerex-54512"="3m8z29a8bizcdk7k3xipr9x7bzac9ybn"; -"prerex.doc-54512"="d176668n20nwvh0i5r6y37zjlg0k6ic6"; -"productbox-1.1"="7l9nqp2nxybrl35q1slpz9jhn70las0b"; -"productbox.doc-1.1"="j713za0sjbr7plb4xdis6zwvi7bg1n1q"; -"productbox.source-1.1"="aqhyalz52l2nz9v46bi0jn21vqw68w6g"; -"ptolemaicastronomy-1.0"="09a5aimp6j8yxwfhsdb7kf574jcy2p6g"; -"ptolemaicastronomy.doc-1.0"="7ijjcz9y4ah07pwb30b6r0wpg87fxij4"; -"ptolemaicastronomy.source-1.0"="xv9cql2pkkiczvgf3v7sa80p22pbz3h9"; -"puyotikz-1.0.1"="qx2rv06l811c34pni8rgkffirpc09fw8"; -"puyotikz.doc-1.0.1"="969cy9jzd8rfrm9sb5gcr9gsc1qxn23g"; -"pxpgfmark-0.2"="sy9cs1y4gf9xr7jfiyp8zkr1r8di00hc"; -"pxpgfmark.doc-0.2"="25vgpjc0zr0wjny4snksr3yzk908s2mq"; -"pxpic-1.2"="0rlp0ppw3q32i3c98705v91k0wg4bcbr"; -"pxpic.doc-1.2"="c4q4ddcrl28zdy1sny8q4458igvfa5vg"; -"pxpic.source-1.2"="j6h6y0if1ckpsb9bvf5p9mrghf32v5rz"; -"qcircuit-2.6.0"="va7w4d1n5djxqa4fis7m409aapx7hqa4"; -"qcircuit.doc-2.6.0"="vibn2wypk17d73k72ab6grqaw1irck68"; -"qrcode-1.51"="x2mibdysf003dgl6i1zq3h68a1km3j2a"; -"qrcode.doc-1.51"="y97sa2ha89kmhfj5kq55qk57sf6yf3h8"; -"qrcode.source-1.51"="f4mxn89cz4f6wvnvxqfxdq411nnz4z44"; -"quantikz-0.9.6"="86jvb52l8qr6p2zpha4qx1ncndza95q8"; -"quantikz.doc-0.9.6"="z5si2v60izbqix364z8xvhs3gz6s83vp"; -"randbild-0.2"="bkb9mlnckwhxirdsck7pzqki670mgns4"; -"randbild.doc-0.2"="v89kxn1iiw9spvinn8xcazp81w9a0nb3"; -"randbild.source-0.2"="la433aq038bqyjdv40rvdkinsiq7bf07"; -"randomwalk-0.6"="91mjhj7f7d66khry7iy6y3v5wawg4y0b"; -"randomwalk.doc-0.6"="j5n0mc0grinrafdzb5cvqk3g1m9ir44r"; -"randomwalk.source-0.6"="ksq2jax3pbyqhkg5nk1jdhbzwgynhnyd"; -"realhats-5.0"="hd7xxhd92vczk8qdq05v1q6bv16gifj2"; -"realhats.doc-5.0"="c82j1vakdfa87w0vjfp9jfs5x17m3738"; -"realhats.source-5.0"="c1df016h7zxjfizqdqjvfpvns0ap8sqh"; -"reotex-1.1"="yzydkc30vf6csv388xyf4lm9mn894781"; -"reotex.doc-1.1"="63p2w1vjpannypp8izsn8qis0f7zcngg"; -"rviewport-1.0"="c1flf8nck97sgi4994izzh0vwh8np9z2"; -"rviewport.doc-1.0"="jmr9vbj9690mrw18gg9nkilrkld8r4kj"; -"rviewport.source-1.0"="czi8b9lr7ldxh657jirgsvcy3l5m9ybp"; -"sa-tikz-0.7a"="dcl4gm1658qdh6bs082bijsd0fq2p2wv"; -"sa-tikz.doc-0.7a"="27fh1xd288pwk62lngyy91f97rl4ag7h"; -"schemabloc-1.5"="7pm30f9wazndg4cnxv31m616di90d0p4"; -"schemabloc.doc-1.5"="2020d2ivq6qccq1s7fk161pmarznn6ss"; -"scratch-0.41"="r2i8n81lhrl9420xwj61v3rmv98f64fb"; -"scratch.doc-0.41"="rgs8yb5va24k7cl8h6f2813ff0ydkia7"; -"scratch3-0.18"="44zwdns5yssyglqr62nifmdnrp20y32z"; -"scratch3.doc-0.18"="0pix9ik5f8b8lydicf9yibcpg0fjy7w2"; -"scsnowman-1.2d"="vmlm0ilz9v7hxsz6111w8596xajzg2ly"; -"scsnowman.doc-1.2d"="l1svi3nmdzpfnad0w8dzxxzh8c4n2v9j"; -"setdeck-0.1"="jhxxygy339baxmfl252kjjyhw2zbhf8n"; -"setdeck.doc-0.1"="0h0bv2ywm46jj8g1r26scn8r3pc0a2k5"; -"signchart-1.01"="y2yc5dcfwbpicxf3w7kp6lxjgwxz4dsx"; -"signchart.doc-1.01"="r2zsa7zazg4l0z4x18hwzkisqaympv1f"; -"signchart.source-1.01"="81p9ykfplbsb51lnx3wb00zrsrmsd9qr"; -"simpleoptics-1.1.1"="hd3442mvndh1y9qmk4g1c6jgy189927v"; -"simpleoptics.doc-1.1.1"="ivyl8pm0sxqglg6m7qiqyga8cnh8ac47"; -"smartdiagram-0.3b"="2ap0zqyxnbs2lkdgx70rrpm2b6d9gslr"; -"smartdiagram.doc-0.3b"="p0q92dnkzxz2i5zb8837353j4ainabxb"; -"smartdiagram.source-0.3b"="lqy3sqf14w7fxzrfim7mb1y7rmsbln1f"; -"spath3-2.4"="akif7y4qva1virp0cy3wnr5jvkklkl9a"; -"spath3.doc-2.4"="lisab3dnwyq9vqsl5rqfh4c6zkpydfpl"; -"spath3.source-2.4"="nv3j5wwwb6cynprvxm8wxvpbk1n00vlz"; -"spectralsequences-1.2.2"="yahjlarc3vgpzcmb2abr6nwyhqqj5c1j"; -"spectralsequences.doc-1.2.2"="by1zrk0y8nq05qf8csa2gvwl316zc1j4"; -"swimgraf-25446"="x77prbkrnadhj57fbh68hqsmrbk2qsis"; -"swimgraf.doc-25446"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi"; -"syntaxdi-0.8.2"="hkrwysi8yl9741hkdqjhhmhhwsjqji9q"; -"syntaxdi.doc-0.8.2"="zdnlrpza0hrf4pacrabdmv4n3xx16rb1"; -"table-fct-1.1"="b7wz94n1h3wpq9mi40zdl3v4m9hi1wxk"; -"table-fct.doc-1.1"="1k2sa9bsygbw1ib85x7yqda1jbzbg05f"; -"texdraw-v2r3"="rkzarniigb4a454964qbfdiaj1z124xi"; -"texdraw.doc-v2r3"="2wq6scv4jygmaam3ywddf8spizq9fi0m"; -"ticollege-1.0"="bznj0maq6a1b7m6p18dhq0fnssx06bwj"; -"ticollege.doc-1.0"="7n7nyn8zrp9za6l355797gq96vxp2d78"; -"tikz-3dplot-25087"="kl827mar9jlbjpwxl90z3fml8i3zabb9"; -"tikz-3dplot.doc-25087"="y736rbqkbjg7nnly25d0jl72z9gyx17w"; -"tikz-among-us-1.1.0"="d9n1f1a617n59l6h5790mzkv5arkrwzw"; -"tikz-among-us.doc-1.1.0"="m25gkpfpna507ij74x2x9fbxvw0frc3a"; -"tikz-bayesnet-0.1"="w9x9vf5hgmv18ljz0kx7rby1dig63539"; -"tikz-bayesnet.doc-0.1"="g7dkg4gg6729jbscb7cf3fsay2dfqv42"; -"tikz-bbox-0.1"="5raf1a9s9z0cddrrjx7wfgxzdlq0sb41"; -"tikz-bbox.doc-0.1"="km6msphm2zw1rynbvzi3gbmxhvsbzsw8"; -"tikz-cd-0.9f"="h74wx5r1jclma4zqd78wb3f5bmpfc2pw"; -"tikz-cd.doc-0.9f"="ig04n4ja9ajw1jf0bfv481agc71hjsv3"; -"tikz-dependency-1.2"="yqnd9843awmwy61pd310krnfhyf3867k"; -"tikz-dependency.doc-1.2"="n3rk72ln03anvylh5pc5gyajkvgm6cff"; -"tikz-dimline-1.0"="q2wyvka6vafwaj58iawrrl3capkzvvfj"; -"tikz-dimline.doc-1.0"="gbfqnslkm9piq4jmhcivpyb9y2cjra2j"; -"tikz-feynhand-1.1.0"="06m7r0jzmsblixlp7r67dmpn68j2y9sm"; -"tikz-feynhand.doc-1.1.0"="0w41029zvh26r54ma77l27dkh81mqvxk"; -"tikz-feynman-1.1.0"="icrxa2hwmgnrah6x7br5sqsky8r47v38"; -"tikz-feynman.doc-1.1.0"="afnpl0m1fkwp7cip0ia10z0lgq2vnpwj"; -"tikz-imagelabels-0.2"="16ifa9cz1wy7savmdfdrv8myx01zx4i6"; -"tikz-imagelabels.doc-0.2"="f17aq0xki5f7bbsjzp88q3d0vpmraf88"; -"tikz-imagelabels.source-0.2"="rvmig94wa47dlj17d6qvwvdyp57blxff"; -"tikz-inet-0.1"="mkhy91a9633a5hbqcckgppy43ri13wy0"; -"tikz-inet.doc-0.1"="c62lz4nmz4cw48rjmfl3vn913smpxzcb"; -"tikz-kalender-0.4f"="x4mkhmbx5ccdhsyvw2qks74p0b0md7bn"; -"tikz-kalender.doc-0.4f"="ivn3jic885c1132lg7qmrxnspkn2rfwv"; -"tikz-karnaugh-1.2"="szdj3jvq9704zzzrmmm7kr67f9scc5vs"; -"tikz-karnaugh.doc-1.2"="4v7jmjk6kczigziblmaphpxl1xkr2ylp"; -"tikz-ladder-1.1"="ika5n5wsldxr4fk6qfjr6p9i94iydplp"; -"tikz-ladder.doc-1.1"="33yyhiz2knjssmpvz90n63n3dgh3g57g"; -"tikz-lake-fig-1.0"="xcf8mfj9jkcb8ixhqpvwlm815j55k2qr"; -"tikz-lake-fig.doc-1.0"="h7l2b1kx53il87miyamjw0x0k54df5bw"; -"tikz-layers-0.9"="fbjyhacy9k7yhpyfg8viqdfb9z5d4dy3"; -"tikz-layers.doc-0.9"="d3q51sfsprqfa0m0plhghgcb3j63fn60"; -"tikz-nef-0.1"="88fk1n97w3dpajkw85ww9mw93p3wmv3q"; -"tikz-nef.doc-0.1"="xf8xsf1qxy0493zwx9nr2rsxnxavyzy9"; -"tikz-network-1.1"="8cdkbdi646835h133djv5vs3d7w87x4f"; -"tikz-network.doc-1.1"="xxy33lp7nk9h2a52qifxvqg5vqsynpr7"; -"tikz-opm-0.1.1"="5hgjh2kg1ynxp4vn8x47wfkcxz27ahra"; -"tikz-opm.doc-0.1.1"="4jqackkzg26vkvrkwflljvxx6ikx1jbf"; -"tikz-optics-0.2.3"="lc3znr18mmhw9v5d7wc8s5hs83bm20bv"; -"tikz-optics.doc-0.2.3"="9fhp84w25nsi4hxq2rys1y6vc03f4nlf"; -"tikz-page-1.0"="zv2wzvv8xzs4s5cf5vs8w9ffsz8sq4rf"; -"tikz-page.doc-1.0"="vgszrg09v23lc7yj3j0h9hwnyvdhsck0"; -"tikz-page.source-1.0"="2x6hmyi5739qskj8wf1k1636kbzns9b7"; -"tikz-palattice-2.3"="l8q247mbkx3qyywwb6sif0if3jv5ykjk"; -"tikz-palattice.doc-2.3"="j7y3y3r0mgm8limkgfljmn3i8dcnj0m3"; -"tikz-planets-1.0.2"="ka4p4kxaxmzlk0pvik7sl09zwxw0sj6v"; -"tikz-planets.doc-1.0.2"="zw4aa62pfdl5h3mai4ndjqmmb2v56zs5"; -"tikz-qtree-1.2"="vl2jq8b492p7dznrx63mi2zxcpax8a1l"; -"tikz-qtree.doc-1.2"="01bkpz1f0pm7plpkh6a2kx3c93iwcfwa"; -"tikz-relay-1.2"="p4gb81p3j2226g1d7qiclv6d2cj52fq1"; -"tikz-relay.doc-1.2"="q694hq9r39mashph8za9yqf9rs3ixk00"; -"tikz-sfc-1.0.1"="2snmpyh0v493k4jpj29nb8pnad6hcz7k"; -"tikz-sfc.doc-1.0.1"="bx6nm96f145iv6r6250scs4myx6z2sw5"; -"tikz-timing-0.7f"="phaw9fm5dzq5xr4klpnw2dhnrq3lcam0"; -"tikz-timing.doc-0.7f"="cc5mlz7linvwb3ki8bnhhs6qz9xmkkb4"; -"tikz-timing.source-0.7f"="8lpjas5dgvpl8dcxf1549m8nh0vn20fw"; -"tikz-trackschematic-0.6"="0dpci10miikxhmb9k3vkzzq30mmf9dxk"; -"tikz-trackschematic.doc-0.6"="4xiw69h4jb3xggwyak9l4387kfga7bhn"; -"tikz-truchet-50020"="h8p45wr3xhjslajpyyzr8zha6x52jyci"; -"tikz-truchet.doc-50020"="6nyandwvh9qj5z6pzh20417kl3gd3q68"; -"tikz-truchet.source-50020"="r5gpj9cmqj4njzzx820v7ka0v7chxy24"; -"tikzcodeblocks-0.13"="j0lqf17ys7miqzfy3f13vpkjk19j7vzy"; -"tikzcodeblocks.doc-0.13"="8m630gycw97jd889kzadiqmab6h1ngzg"; -"tikzducks-1.5"="gikyjz3fcj48az20ksklc1q8dw7v2zzs"; -"tikzducks.doc-1.5"="cyfi8a8hrmwfvk2vc3cnrbzl000mjw3r"; -"tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a"; -"tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9"; -"tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf"; -"tikzlings-0.5"="gw96ml7017p8m03ascn9m7fayhqs104k"; -"tikzlings.doc-0.5"="2ww0iq1hibgy2wl6ijq853bqfmyhvwr9"; -"tikzmark-1.10"="67hkmm2ijkqhvh4j78gwnfg10inzcdca"; -"tikzmark.doc-1.10"="r3333ggg3n75kyp34g17vgmh8gq33f19"; -"tikzmark.source-1.10"="7p7wb4l4pym4mg59xs54qzdsxi09a7id"; -"tikzmarmots-1.0"="d4603hm1maqsp6s2mpr3d9czb040x96q"; -"tikzmarmots.doc-1.0"="yqa28x78pg3513ni6xd11511pyqivkia"; -"tikzorbital-36439"="0jand3q2rnj1l71kiqc5wx9br6iqa8h6"; -"tikzorbital.doc-36439"="8w7za38r9lqh6hjyrx51mhxljlwbr13d"; -"tikzpackets-1.0"="i3009cdw6jnd3s71ywvf09yjns3zh9w2"; -"tikzpackets.doc-1.0"="nn65q1jhygbaq5karp9msk27fiqc7gn0"; -"tikzpagenodes-1.1"="bbppcjhxjza1vhld9n9kjdm5jf03by5f"; -"tikzpagenodes.doc-1.1"="qds77qax9drbdmnw93lsg9lzkd7kjmnj"; -"tikzpagenodes.source-1.1"="bm54xhdx003f6j5j2csj6272d6pqxbmd"; -"tikzpeople-0.4"="9cjdrp8gw59kkklf92fmpq8wlflaavxg"; -"tikzpeople.doc-0.4"="fpwfczmdq8qad1c637rcxjzqy2r6gi7f"; -"tikzpfeile-1.0"="ay059ccg53rz4q39dy1cls80g1yi2mq2"; -"tikzpfeile.doc-1.0"="f97bldn28br9f6dfr88b81w8g683xvgq"; -"tikzpfeile.source-1.0"="hcsmvxfza3qg128nsj2n48v7fr12viqg"; -"tikzposter-2.0"="ir2kg1wfppny43rywlc1z8fbc9gnwpp1"; -"tikzposter.doc-2.0"="8bjc46kfilm5jv3z87kpzq5fk1rs1ihr"; -"tikzposter.source-2.0"="s0nhs6jvz6zn6kn7kr8srvwynh8vvfaf"; -"tikzscale-0.2.6"="7cc4pbv23n95rb1b80p1y7w8m55z59yl"; -"tikzscale.doc-0.2.6"="qb6yk80pbipaq95cgasija63px2v836w"; -"tikzscale.source-0.2.6"="2spzfhaff1wn11brhjcx881jmql261ad"; -"tikzsymbols-4.10c"="x1wdz62q9x6idd6893pbcm0d0k55b3j1"; -"tikzsymbols.doc-4.10c"="97p2haamz7kk8i970pa01x5gx1xmcrzh"; -"tikzsymbols.source-4.10c"="wllywv4fs2xfv3xvd92qkgm905yssplw"; -"tikztosvg-0.2.0"="sqrd3iby30siip1whdin2k74r1il8078"; -"tikztosvg.doc-0.2.0"="k4mphf728hc7cl3s7rzwmcgza4vhq5w3"; -"tile-graphic-55325"="4b69a5fzrw3d7p41hbs3wb6z2xjbjwd2"; -"tile-graphic.doc-55325"="6rf8g43yhshj957h5hpgvqdwlg6gl4pw"; -"tile-graphic.source-55325"="ykbr7wimacjsgnplspan1i4xx8jz01a6"; -"timing-diagrams-31491"="89d8m3lh174y7p3xx2iqdkxnq71s7fzq"; -"timing-diagrams.doc-31491"="r8xz0yb362glmkcaadipa5v8jsf3w5py"; -"tipfr-1.5"="dd5jgd6y7rzspj6shr5mbqcbbzyncv2b"; -"tipfr.doc-1.5"="w5mslbn2d53wzdkaynxigaw4344psp9j"; -"tkz-base-3.06c"="yddvv01pj1mpbzja1ind90dg1rzv01m3"; -"tkz-base.doc-3.06c"="daf1mpqgdp05qz0s4fnn6c073xy1ad3p"; -"tkz-berge-2.0"="jzv81k3fm5smg38sqhpqz7l8zqv34j25"; -"tkz-berge.doc-2.0"="ln936v6v5bapxhqs5vzcf88flqm849gy"; -"tkz-doc.doc-1.43c"="2fwqrhjbl0iwsk4z1mrkycbpgbiszzry"; -"tkz-euclide-3.06c"="cnrg4nv9ijhvy43qmalakq9162i733rp"; -"tkz-euclide.doc-3.06c"="2d7cqmngwrnk0pryfb0wq95v6wsahjbr"; -"tkz-fct-1.3c"="v0r886rf3b1yxc1dkbr2isf6ykqkya2g"; -"tkz-fct.doc-1.3c"="p79yk6b8h2f7pzxyh2547d2ax8np2vcb"; -"tkz-graph-2.0"="r0m2vnh14q5zfb7hxngwqvlgiajjv1il"; -"tkz-graph.doc-2.0"="4sb1mashz4j4d7q80qssh5yjw1bk4f9x"; -"tkz-orm-0.1.4"="kvjkkbbapnd2f03g4h48ic729s8yvn5z"; -"tkz-orm.doc-0.1.4"="20ccyjaxz59v4yvbrz18ql5dz05nqxj8"; -"tkz-tab-2.12c"="039n2xx1sxi5570vq84dpbp1a9crmzqc"; -"tkz-tab.doc-2.12c"="q8qbxz33cyhly0ghrrrkskc5rzmvbh3w"; -"tqft-2.1"="jg1k2p45j027wivwykric03v8vgfgaaw"; -"tqft.doc-2.1"="0qc7pjywc0dwxkw750xsqb67f6cpzka2"; -"tqft.source-2.1"="2kasg0q4bb70r80kaxm5hykahynk7vbf"; -"tsemlines-1.0"="qd021jr57lay3xa2hwms13x49y9f3q7v"; -"tufte-latex-3.5.2"="fagszla48gaakgcvvynmhcmk8c2qvbf8"; -"tufte-latex.doc-3.5.2"="nqqzq6qbgcq8w5ih3fns8wibvfdn5df0"; -"ifmtarg-1.2b"="7sq7fspjvzn5f3yvsmwxm9h9xb4y8dkw"; -"ifmtarg.doc-1.2b"="3azjs21rb4iyw6qp6vikgjb5an4b2pam"; -"ifmtarg.source-1.2b"="89na1sf5dvfxw6ajyx2xrh4wmlyymxyb"; -"paralist-2.7"="9x62lrvmw3pkvlrkhrcpm2mk90s23a1p"; -"paralist.doc-2.7"="8jww1j8k4rf6jfnal0dlqv4abcjyz5n5"; -"paralist.source-2.7"="vs1jw2rijrnym49vd3w1nxswq52lvf9g"; -"placeins-2.2"="ac0ckzyrg9k2akv26dg4hck4q3w3z141"; -"placeins.doc-2.2"="ab3faqlwqspnnrvigdsljl9ykqyi2gfm"; -"sauerj-15878"="9x0hghvh5wh6jljwpyf61c6pc4rl9jaa"; -"sauerj.doc-15878"="zk8dghf07j3ijvnr3zxw2bajqx49nbaj"; -"sauerj.source-15878"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh"; -"xifthen-1.4.0"="4d6x7yb6hdr4xg2dn572gwpfnykppsph"; -"xifthen.doc-1.4.0"="364kifdxmk5ak2flyqcfzjgv0dbsykax"; -"tzplot-1.0.1"="y6p1h8kx6ykr97gg4afgx9j3bgs9d9cj"; -"tzplot.doc-1.0.1"="2va8ca6g0f76hxm43v7iqk6nw9x8ka28"; -"utfsym-0.8.3"="xh468icpjaggal7grvpwsl4maaclihan"; -"utfsym.doc-0.8.3"="glys9xfrh02f7przb9bbcn3k29wa0why"; -"venndiagram-1.2"="pxwyrzjwbkkyhfm22v13p2mm5l9s2bqp"; -"venndiagram.doc-1.2"="xn6lk2l6vjwjirm9s0vmcsqna9q096zv"; -"venndiagram.source-1.2"="aj2hp4pyi0jhirjbsrv8cpajh42q64ai"; -"visualpstricks.doc-2.3"="qml7ki3mr0fj18gxz20j88il4i0d4fbx"; -"xpicture-1.2a"="b3daw2s1dzkvrpa1lywjgqnrahnn539g"; -"xpicture.doc-1.2a"="h5xg50jzdi44vigcgqpc61hmxa8q8ggy"; -"xpicture.source-1.2a"="a0bq9s39fb1askk6bb5yy69bmv3ii59l"; -"xypic-3.8.9"="rh7ahdwsnxzsk42imv3qqa0q2cb15ng1"; -"xypic.doc-3.8.9"="9vnm1j6g180slvahaq3mgdlsjnnllhnh"; -"colophon-1.1"="7naibja70d1kb637ydb5jbj3xbgxa4l5"; -"colophon.doc-1.1"="m0y1dcw2ymnr8a09a8wzj6vw00ns055g"; -"colophon.source-1.1"="xfrkdkkk54q9zbhv9jzwm2bf43czj0na"; -"color-edits-1.1"="p36qzdisyklnxg7qxfpfdqp157sifg8x"; -"color-edits.doc-1.1"="jmlvf1izvr4gaj32mfkgrwv6xmfvgw7q"; -"color-edits.source-1.1"="mlm9y14rzw6a7lpw6bbv62jnh1l8qrzp"; -"colordoc-18270"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx"; -"colordoc.doc-18270"="2sw71l3579qkh4z3hqirvv0y3d79sssh"; -"colordoc.source-18270"="3p7baf59n87p34sxwdm9lf761dmh8w0b"; -"colorinfo-0.3c"="x5wwpzhcm3ppfg6hh0dcr3rl7cjs23zn"; -"colorinfo.doc-0.3c"="ppz8wrqzph8cq5dggikgi0gphmg0y1hj"; -"coloring-0.2"="qdjj8va77wpin0pw6izv2lhjj0cm8zfd"; -"coloring.doc-0.2"="v7z4bnnpghfi39b8jmzpwq496swhwndh"; -"colorspace-1.3"="fvlhzz9q6cyaxgs9yzlajaldvnfx7kx8"; -"colorspace.doc-1.3"="jlyv19xlx618ajj3g0mja99w5c68gbj3"; -"colortab-1.0"="4bqbx02c34g7271mg6y1gw1nyqmj6vwq"; -"colortab.doc-1.0"="qm51gjkcfq5gjimr5pp3svfj1xaqshbd"; -"colorwav-1.0"="ilrircjl70f9pv8g89d8dzjdsipjfbmj"; -"colorwav.doc-1.0"="jzgmaadlkkbb8f94kfzxdkywh1pbviif"; -"colorwav.source-1.0"="m488q2p0lkrf6rs6vy7nfi86778zi66k"; -"colorweb-1.3"="4b0qbipxl6if0adrfblqzpzs48aa2fsb"; -"colorweb.doc-1.3"="9qi2i5x35aq0ks14c1pbvn11b91pdqm1"; -"colorweb.source-1.3"="c207mjpwnn9dwd9yc4wlq414sl2gjbz2"; -"colourchange-1.22"="gy8kllnhrg7i10yl0nrhvyyik5j13vkc"; -"colourchange.doc-1.22"="vjvp7zji8zc7bv2yghvy2zv2d1y2nz2p"; -"combelow-0.99f"="2gm5s37dfs6h0gxjpa221sv38vdpvzs2"; -"combelow.doc-0.99f"="r2dmygqgwcx9ma8frgm3ragqrb198c8x"; -"combine-0.7a"="mnzy6xk1nxfsybm2nxy9qb4k7shrwank"; -"combine.doc-0.7a"="b54dmdzcnpffyws5sbhwrm46hh7gj5wj"; -"combine.source-0.7a"="j9i3psfzvamyz2imf8mmcf4970j9k9gf"; -"comma-1.2"="ai1p7vnnzvazd950aav3xnjggmzh5xac"; -"comma.doc-1.2"="3dkfkh89fy2jy02amwg7kh18hyh7v396"; -"commado-r0.11a"="7jd82pb66a5hapcrqk19bvnszkgs649j"; -"commado.doc-r0.11a"="rg7zy4zsbmvan3vln93y2crrmc11c5dd"; -"commado.source-r0.11a"="2z09138429p7bxlq4392bd8psznnsyib"; -"commedit-1.02"="rixggc6616xjdnlhl4nmzzrw4p4rda5m"; -"commedit.doc-1.02"="h31fx0amimgh9dsh6a4qik65q9v36zd5"; -"commedit.source-1.02"="i142h4pi5v51k5rilxhz1zfybxf78xmw"; -"comment-3.8"="dalw0d3w4mg1i8pg530ji0c5nmyrjvcb"; -"comment.doc-3.8"="hsk8kvj5arq1xznsmv8p6iglrj5f95kh"; -"competences-1.0"="kqk5mzm2c12dydifc1naxhfz0kpykkfk"; -"competences.doc-1.0"="kxhlvgv62b2sqf36qpq45pfab730l43y"; -"competences.source-1.0"="hlmzbgb3fd33miycrryvs4pb3sglrgis"; -"concepts-0.0.5-r1"="n6f2szv53cszq0ybd93wcggz3jl0wf00"; -"concepts.doc-0.0.5-r1"="xww0baz5rff17j0c56d1d0j1mh2zfpqs"; -"concprog-18791"="fy8virjhfw7d1y1l0vg6fgzmxkc4f7gb"; -"concprog.doc-18791"="sm3fl60ymv5z649frky6xck3hd9rr8yb"; -"conditext-1.5"="d20ybvbjsp9w3wrkyib8i7axc7kfd0vc"; -"conditext.doc-1.5"="3glal9zw8s5cdz7am17g7ngsj6dfhbh8"; -"constants-1.0"="p22vxmnw3a68jgrwxzvs90x1ads7vy08"; -"constants.doc-1.0"="0d8avlpp7ra6jin7rq92vrpa6c97q5g4"; -"constants.source-1.0"="44ajza7nr171n3nlbj0lqqq7bld53i1a"; -"continue-0.2"="8ra5l58pg997c1p19piyqz6rmsmx2d41"; -"continue.doc-0.2"="pzp20wvyq2ksgnf533jcfwv5gjn9bm1k"; -"continue.source-0.2"="jf0dkkyhnaqhds4a6jxmr4xw03fjy6kl"; -"contour-2.14"="nqc3i7nqzk5svszlgb0glkr9m9n3sgvg"; -"contour.doc-2.14"="8kjg0zsy2i6nkvxq4xjcaaqd2by1wq5s"; -"contour.source-2.14"="jx3fc5lngqrdhcwy2dga2ynw64pfvwk2"; -"contracard-2.0.0"="h90hv3p5azhik6lc2xqz2g2n2rq4ab3f"; -"contracard.doc-2.0.0"="ki3pizq78ili2p4d3az97zf3cm5mxldx"; -"contracard.source-2.0.0"="jk3nj5mm4xqvyzzw2g2gva945sjpxl78"; -"conv-xkv-43558"="irm1jvqddc4a7jfl1qraxkii8gmmmh63"; -"conv-xkv.doc-43558"="vs1dc6np4zd01fkq95a0kqwm72h9snli"; -"conv-xkv.source-43558"="8gj6sqrsbxknfpvrfalflkrnhncjhbfz"; -"cooking-0.9b"="sp0gxpgc190gn2wngw7nqzay88hykl4x"; -"cooking.doc-0.9b"="15mncbdsswn8q6914ijlhzlg5ch6schl"; -"cooking.source-0.9b"="n6pvjf2lx012s5y29qc5mjkiz8dinkjr"; -"cooking-units-1.46"="lfac22p0a7f92v51zkh01mqvh58s85c0"; -"cooking-units.doc-1.46"="l15n9dvykpw95rai682ql7cv1h7z6xg4"; -"cooking-units.source-1.46"="kjmc2xbnmsdm0xxpbk1k7vavhy9im6q9"; -"cool-1.35"="djbl4kj33wlqqnj6sl31f57viw5sacvf"; -"cool.doc-1.35"="3l8iy5landcaybfhvb1inj773r55k7hw"; -"cool.source-1.35"="hfd759pc6m30sxnmchmv59nl8xr3hwrm"; -"coollist-1.4"="zvmxdr2hvnis0p8asjqsw67m6j0gv0wy"; -"coollist.doc-1.4"="z2lv3naa383vdbhyccpzs9khbbdzg8fc"; -"coollist.source-1.4"="2p080664dwgg1623jx2x8hd3b8m1k9wv"; -"coolstr-2.2"="7rsqq7nbw6c1z5shk0zcmkhnhqh6mcdq"; -"coolstr.doc-2.2"="sgbapr8y7xrh41ppzhkw9s91npbnnnll"; -"coolstr.source-2.2"="mh1biqrlg5f1gkpy5q9ml82xh0jb4bxa"; -"coolthms-1.2"="bkbjhkhdh1d0zbwz7kn2gx98jp0i1wfd"; -"coolthms.doc-1.2"="xvzlcxf0iijhqshnf10ll3pw1hki8qyb"; -"coolthms.source-1.2"="abpv22k723v32mjxzzfil36yd37p945n"; -"cooltooltips-1.0"="dyya1q998zi4g33qmgkcrzin8d31lmw5"; -"cooltooltips.doc-1.0"="z7fsfbm4rc0amfkw5ry8j2svcmv1q2lh"; -"cooltooltips.source-1.0"="cpan4qfa969dihkaa28rcg8ka9s63xa6"; -"coordsys-1.4"="6x2zn29g7p90x4cgwyclza1xphqfb3lg"; -"coordsys.doc-1.4"="2j52rr9hwa03wsdg21dnn7q56sp265da"; -"coordsys.source-1.4"="is64wqbszsrl7lnzwpgv2z6mjpz99n7v"; -"copyedit-1.6"="dyalfcbrp1wdxym0d31s3ijrbhq6qz7i"; -"copyedit.doc-1.6"="knh4a1w8vapj27rs7b0d703ph3vp94av"; -"copyedit.source-1.6"="b3kpsi78z2rja51lbj3fby031kjr08w5"; -"copyrightbox-0.1"="90am6yc3v6a2syw9q97qgll8dhpl9v8y"; -"copyrightbox.doc-0.1"="6133545797rkbwspbd7c91dbc0mds4wn"; -"coseoul-1.1"="qf1knif80pc43y8qjymya8ry3564gcc9"; -"coseoul.doc-1.1"="3zfkpycv6hz8jhvlfycjn20g2jbddars"; -"counttexruns-1.00a"="chaflhn60my7x9ijf2dj4ja8i3xdpcac"; -"counttexruns.doc-1.00a"="24wzb89912cb3f3gbfhcdz2p1w7gqns0"; -"counttexruns.source-1.00a"="9asga1rjq6c6sd7407f43p3w4d2hwkfy"; -"courseoutline-1.0"="r8syx9ag00aszr89zibwl760ml5fc40h"; -"courseoutline.doc-1.0"="jhrk85cgmca0vhk99l4xq6yhhw2kkpw7"; -"coursepaper-2.0"="222rs2hqsri87xi4zd87m0bi314g76br"; -"coursepaper.doc-2.0"="y7ml6w9cnxy78dld8m24m2p4xvv2in71"; -"coverpage-1.01"="j946qwgfdzx2y6myvj2zb927i04n29vn"; -"coverpage.doc-1.01"="h7krnkyf2nixh2227hfz5ibhjig2d9cs"; -"coverpage.source-1.01"="hxdqs2wzbsb5yjpj15fva764n1qgy19c"; -"cprotect-1.0e"="gsd9ndg4b5fb9s0435ly9pnlvwp5rvwg"; -"cprotect.doc-1.0e"="4q4rzd43yirs522861kk825v8d3avm4v"; -"cprotect.source-1.0e"="lzyx2nvma23d6ds8cl52zfxhsdjjshnc"; -"crbox-0.1"="y7zkz2wszr0iv7y3bhcgcaddsw3d54hp"; -"crbox.doc-0.1"="64zk4z35xzpxa2dmb4am67dnilqs8mqa"; -"crossreference-15878"="rghmvk4vfk0la5kygcm5wmnrrzxag6ff"; -"crossreference.doc-15878"="p589qj9h7vi563dgh5lp2l1gmpzfkyrm"; -"crossreference.source-15878"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6"; -"crossreftools-1.0"="ajn6w7b0nk4i3jhppd2ikmkmjj85c12p"; -"crossreftools.doc-1.0"="2khdwzgrmdnpidnf8qqhnw31mf208sp0"; -"csquotes-5.2l"="41vl5hp0bard1x2jaw3wnlcsa50d705m"; -"csquotes.doc-5.2l"="1mabf8g1p6lbmgkijynsrrpxqlawqk7i"; -"css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x"; -"css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b"; -"csvmerge-1.0"="r2srdy1zz8m0dkbpg1gaml9ln23q9rgy"; -"csvmerge.doc-1.0"="iv4f2b07k8c9cnw245xgbjzw27d4a5z6"; -"csvmerge.source-1.0"="vgiy7245r2lmkq9r38sbablnvambri1f"; -"csvsimple-1.21"="758dqg2cmy93dfndd3z61pgmkl0pvwil"; -"csvsimple.doc-1.21"="m7nhpkqj87k3pwiz9ib5lck7v4vv945z"; -"cuisine-0.7"="nj3ryfmy997y6llg5b3l1lp84jw3vg54"; -"cuisine.doc-0.7"="50wqmjcv6v117qxi0dkgyzs293y6jx1v"; -"cuisine.source-0.7"="n6zv4r2yz1fcgswbshvyfzji7jga7m3r"; -"currency-0.4"="fqjh128rxjxdrqy84xvsa3wq00r5j0dg"; -"currency.doc-0.4"="2k9w5bdkp4h7gq9ln3x36h0jxpaq5w2b"; -"currency.source-0.4"="43f9s81xgzgcc49wvwv7n6pzn2jzbzd7"; -"currfile-0.7d"="msb94fkjy9acdkgdana9hrhz3l260nvp"; -"currfile.doc-0.7d"="l03cswk0j2z12hy8g8icbl4hzpzplsi6"; -"currfile.source-0.7d"="92mcrpc45584cdnzpfg9awzp19ni2s7n"; -"currvita-15878"="119xrbrr7d5i8xlvzf15azymj8znxy2r"; -"currvita.doc-15878"="fc8s69xdfiir0a8g7594l7y0m7b5qsiq"; -"currvita.source-15878"="2m1krjlgi5ihm32cfr3ayxmz324zpsxp"; -"cutwin-0.1"="q1c752nzdf2jw9agyb3aj6ishnk3yy7c"; -"cutwin.doc-0.1"="pawz3k75s1nws5nd0ilhgvy3g5ndfwvp"; -"cutwin.source-0.1"="c9aw3vjaxldf082z61m61d7p7rsaynfb"; -"cv-15878"="xpyr31xcphpydv1iyqaalwxfqhs99cg6"; -"cv.doc-15878"="f3xak6320ql3rmbj3fvjsgcsq4mp1vql"; -"cv4tw-0.2"="zw6g6n1l4mcnjdbpfx36h1l7ix8gj6sv"; -"cv4tw.doc-0.2"="49ghjsydw5i13nwglc69xmm1z0ypxlyd"; -"cweb-latex-28878"="w87x1irky7jm1ixvs8m2ig97pk07m19m"; -"cweb-latex.doc-28878"="r4xzcb98w8khj070k9q23ygmq84pxqd5"; -"cyber-2.2"="qw2kap0b32i1zm67s9lz70mxc8v8smrs"; -"cyber.doc-2.2"="9fqzmqyaiclmpl947xwj5kjcp6fic9md"; -"cyber.source-2.2"="jkylpl3n1m87qch68sqm7njxgp8wv86p"; -"cybercic-2.1"="4j6x3ncl6dhbjmbsr75fp28k9p87lj48"; -"cybercic.doc-2.1"="6qzfny1ilk48mhh67pa12rn30v7r8b10"; -"cybercic.source-2.1"="9gxkmwvrrjg0h9jvj1g46hxd79i2pkka"; -"dashbox-1.14"="k72p9zmp5197sh13x688gaaxynj6ra3b"; -"dashbox.doc-1.14"="1igq59rchfjkn3clgbycq3q5h6ablwvv"; -"dashbox.source-1.14"="kh2n6zrij6b14rilncsp9xjnbcd73l7a"; -"dashrule-1.3"="bqc33kv2bljifdybb0qn7wvx48rb9xgs"; -"dashrule.doc-1.3"="vxa8hx7khicjjdjd8p5frwrv4b41fv1x"; -"dashrule.source-1.3"="94ga7n7xpk7wm3j37gp8innc0c0irdz5"; -"dashundergaps-2.0h"="nlq1j7n1lrrx2wags0grzrr8pqzs2h6n"; -"dashundergaps.doc-2.0h"="pc74ml09vkyns4shpiiyhpvxrm8wh4c2"; -"dashundergaps.source-2.0h"="fwxf78dbp01m6kgx8rmdjwnsy6ak803y"; -"dataref-0.6"="s46my6g3mkk7d5g7fm90xxpn2d1h4gmv"; -"dataref.doc-0.6"="ap8c1b9ljp1zg3wpzfbp827kwqcjdp0j"; -"datatool-2.32"="hdkdqrf0g5jbi0ryk0bgiv71k3x98kl3"; -"datatool.doc-2.32"="9garxgrw5k7lxf0c7m5d70wwl3zf76ny"; -"datatool.source-2.32"="1cpr7jgy98fpqjaw58pla1nwgywfyqq7"; -"substr-1.2"="qahdkj07s8nl7fnbqgwhsni6w8bn69ch"; -"substr.doc-1.2"="nvjl7r3a8r697gn8p3n81yaamr8jrfs5"; -"xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms"; -"xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar"; -"xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm"; -"datax-1.1.1"="mb0p3kqk4c4brqmf42zhkj1kv5y71fmq"; -"datax.doc-1.1.1"="79vryqqph1k46k0429ldinwjdd1lcs9d"; -"datax.source-1.1.1"="3r08b1n40fww69p4yxn9li9bi67iqal3"; -"dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6"; -"dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx"; -"dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy"; -"datenumber-0.02"="byp175cz7kzl8rpg8yyfxlcqfgqr2yfk"; -"datenumber.doc-0.02"="qp66n8ppip85lg6lfmmah86ilxygb5f9"; -"datenumber.source-0.02"="pfirq4wg801vxmbp24s059l8ip1w01r3"; -"datetime-2.60"="59y83sl151h396xz62kp975q9vplg195"; -"datetime.doc-2.60"="dzj8ihkcdv1hcxxi5vrqbv8ga05mx6l1"; -"datetime.source-2.60"="b5x1cfqxg3rlbmdzc1g18i76rk7m1323"; -"datetime2-1.5.7"="yiwddqw00q7jyi82yf74izzfnlcjarq3"; -"datetime2.doc-1.5.7"="y8j71f4vbsjsbgy1c3lqw7c9djq585vh"; -"datetime2.source-1.5.7"="yb3ni1kvq6k63l56v7il393jz33mk26b"; -"datetime2-bahasai-1.01"="avsk4v66gfbscliygrhgk7jvfrv5vyrq"; -"datetime2-bahasai.doc-1.01"="km12sq45cjy831csfq3j0gvy6458j86h"; -"datetime2-bahasai.source-1.01"="y87vz4sib2zw70643lm50cfsknzxnydm"; -"datetime2-basque-1.2a"="hd28pvhxgxxdv9swsnkxvk0d0kmaklxp"; -"datetime2-basque.doc-1.2a"="4ad1pps70dfj98vara5i40fxhk7wsdbc"; -"datetime2-basque.source-1.2a"="8k9957zfg160fs11y3in9js5sabnv0nv"; -"datetime2-breton-1.2"="b1yidszps95zz5kdkqnm64rd707n6vjs"; -"datetime2-breton.doc-1.2"="6vv1srxl0r9isl3wkr4hfix09bqwrc7g"; -"datetime2-breton.source-1.2"="jxa7cwmnmb8c6w0qa3vp4zqhlc00f0y1"; -"datetime2-bulgarian-1.1"="2mlgshnfxai3cpyfy841gm5r07549b9n"; -"datetime2-bulgarian.doc-1.1"="9bnrpw5xshwk7ab59i6argivzd6rnajs"; -"datetime2-bulgarian.source-1.1"="q3jlh85lc1gvp5bxrgh157q88qd56dz1"; -"datetime2-catalan-1.1"="08ckh0hp6lfnm6qvzabn0vfmvpyl8vm0"; -"datetime2-catalan.doc-1.1"="d48asmv26bwgj3zrmp3qdd1z3mld36rr"; -"datetime2-catalan.source-1.1"="mhqp7hh372ngmqv2crrwbhgkkbff7phi"; -"datetime2-croatian-1.0"="7mgjrg95fhf0ymsd2qh68vqqpnw7zpsb"; -"datetime2-croatian.doc-1.0"="x1iac95ydc1sfl5pyy43rrcq9kfa0x29"; -"datetime2-croatian.source-1.0"="sjxvyxph076ciplf0x4274cs6v25z1p3"; -"datetime2-czech-1.1"="481xwx5sfb639j02pz7q3fyzlw4h1xyr"; -"datetime2-czech.doc-1.1"="r9vmd6q4gpm64bglx5n8s6ihl0vm4k02"; -"datetime2-czech.source-1.1"="r8r5q7xy77b0q3krh6rdnc8kq98nwgiw"; -"datetime2-danish-1.1"="maqjjmvq99nxzs36an7fsym8wx884ra5"; -"datetime2-danish.doc-1.1"="qlbz9mfg4z54k9q3qx8xjq3wlz2adczn"; -"datetime2-danish.source-1.1"="zby5mapa0jrx7jhcci00c5p7bqr6crn0"; -"datetime2-dutch-1.1"="rfaajlb5k6y5fk5sphbqkyym5pfqmykm"; -"datetime2-dutch.doc-1.1"="fy3a9l5gk06dm0l5qfq2bm7djl6n6a23"; -"datetime2-dutch.source-1.1"="hfy19bpgiszqawykzqk15724ixlbs9ks"; -"datetime2-en-fulltext-1.0"="j2vw6akprfz3kwsjy5rnb6qnlnmxp9ws"; -"datetime2-en-fulltext.doc-1.0"="q954riws1f9b7ij9c8h0kg3n8zqdhgk8"; -"datetime2-en-fulltext.source-1.0"="54ky0fywkli0nld3ydyqm4k2nnvzl280"; -"datetime2-english-1.05"="49xamcmmpgkf06k87wifshsm6yxj4lwv"; -"datetime2-english.doc-1.05"="4argq3r0d0pshr8nj5ssfljzz9ympky8"; -"datetime2-english.source-1.05"="gdl6ac2ikwga7h6il5638z4c4vnhxvnv"; -"datetime2-esperanto-1.1"="sf619gxrxm602kjrlslmzd271v5aynw2"; -"datetime2-esperanto.doc-1.1"="pn0jcv342fvczyn2lq6kyi1pbvk689d4"; -"datetime2-esperanto.source-1.1"="91kz15x4skcwsis3c0qjr751vyvdsmpd"; -"datetime2-estonian-1.1"="3x0q23w9xzh48brrkyriqah92488m03v"; -"datetime2-estonian.doc-1.1"="pq4p7wkvmq1z815nk92dcphmya6cska2"; -"datetime2-estonian.source-1.1"="a3dmirap9z4b3cw83y2z7y1dxjlxkibs"; -"datetime2-finnish-1.2"="xsrppqvhgv3agc5d1vgsql812rzfc7m7"; -"datetime2-finnish.doc-1.2"="058m3p472vmra4r5i5f3yjyvrga1f63k"; -"datetime2-finnish.source-1.2"="kxcfwal2hw8hh1niyj0zsghihx3cinpa"; -"datetime2-french-1.03"="2nlq5rv292gl8gzwi9g2v3r8yvr3602w"; -"datetime2-french.doc-1.03"="94adprfzvln7xxv49gcdcng2ma28lm6r"; -"datetime2-french.source-1.03"="sfzsp07jb5ahflwrdy0fbhsapbbc9awx"; -"datetime2-galician-1.0"="jdzbi8dkc958r8fvpb5xqjmz7i5iiffz"; -"datetime2-galician.doc-1.0"="kanyn2kcrxp309crnj0wg3v34w93jndg"; -"datetime2-galician.source-1.0"="qjnph2vad7hl5d3jzzn58mz90jyvpgw2"; -"datetime2-german-3.0"="qsk640z3jsi7hq1h6hfz3b6xic20sn37"; -"datetime2-german.doc-3.0"="86lpy6y6svzx89mc162iqba6gz1aj63w"; -"datetime2-german.source-3.0"="2501fydmjp8wybz0sr6ri4vplvigp1m3"; -"datetime2-greek-1.1"="0yigs9ycc8ncyyjwzs1vhxgmvzr93rqk"; -"datetime2-greek.doc-1.1"="4w2gjy95fh4m73w46fm86gq8iqrrxwxn"; -"datetime2-greek.source-1.1"="fclkgy9d60pz0m6pfmirgrw0bdb2dwqk"; -"datetime2-hebrew-1.1"="w1dcd2wy5bdgcrchmwiqbwr9rpbabkcs"; -"datetime2-hebrew.doc-1.1"="xyvnscz0f83bzdk274acf4zqp74pdhm6"; -"datetime2-hebrew.source-1.1"="yx2kaxa35r99whh2yrzhiydmis89c5wv"; -"datetime2-icelandic-1.1"="p1qxpalqhyvs0gvwk55y0gz6f2q9sw4m"; -"datetime2-icelandic.doc-1.1"="za1d739glm25a6vm9yyyqsbhjc59lb5v"; -"datetime2-icelandic.source-1.1"="ngqx44p3nr2pw4awwwd9sdpjd3jwr0ai"; -"datetime2-irish-1.1"="c2rxvcqppd332k261a466wsbabfkklml"; -"datetime2-irish.doc-1.1"="yi5v86mssgpf4bvajvmf6l0hmahkcm36"; -"datetime2-irish.source-1.1"="g2q4nz3xrviqzzq88q7jljcv1dl8cjil"; -"datetime2-it-fulltext-1.6"="36m93xw965mj6dn75iwlls9nwzilr3bj"; -"datetime2-it-fulltext.doc-1.6"="7m7hh8w9cl1amldgbh9nkxxadvnvrdkw"; -"datetime2-it-fulltext.source-1.6"="x6ycnnq13kqphgfiihrhcjmg9ij4adl3"; -"datetime2-italian-1.3"="q26yh7zchpfg5gb8xraflh4vp7sa09k3"; -"datetime2-italian.doc-1.3"="rg34p52lxgj6s6cvi8r168psyknkgdb0"; -"datetime2-italian.source-1.3"="lryqdqsg9yk1d9xj866xf8fj0dpwyh3c"; -"datetime2-latin-1.0"="sriib5ngxy04w6xm5ii13a1l6safqsa7"; -"datetime2-latin.doc-1.0"="kls2lc68c3j7f2si0pdx1rsw24rgga42"; -"datetime2-latin.source-1.0"="07cw09layjkvklwy1ndvkai1aglbplz0"; -"datetime2-lsorbian-1.1"="ggcqlpw3b3rvb3blyw9p39gyj3n9ixki"; -"datetime2-lsorbian.doc-1.1"="nqkh7fk0l7zkgi07n7q9x0wl3mcqcf40"; -"datetime2-lsorbian.source-1.1"="q7bj5qd85b4nwgz3gfypsln5x0rj467c"; -"datetime2-magyar-1.1"="da1qjb06hcwmp0qw9hrrhiwl4rfxji5a"; -"datetime2-magyar.doc-1.1"="v2gzjv7nj4sgzym8bar1gz9rpjwbnf3y"; -"datetime2-magyar.source-1.1"="l052vx4a1zsdkbfwqmixi7ad6rz6277g"; -"datetime2-norsk-1.1"="9x884mr1av0xa2acb44cl38arn274z8i"; -"datetime2-norsk.doc-1.1"="4w6bjaid66pf5bnx7ya5vr023mi0bc3x"; -"datetime2-norsk.source-1.1"="r8bbhi1n1k6i635nwrs7hgglgf4sdwal"; -"datetime2-polish-1.1"="i8b07wq5ki25wh7j75gvimwdkd4psipi"; -"datetime2-polish.doc-1.1"="aqarbr89imdgdvqgnw5ggvp09r2dvmc3"; -"datetime2-polish.source-1.1"="hhvb5n65n0n8jv6anqmxrps42p00cvd8"; -"datetime2-portuges-1.1"="pbj76lwnghjjw5vglf9s05jqzkfc4gsf"; -"datetime2-portuges.doc-1.1"="mpg9vz4wd4b3vb3ksyxl21j0wsr2n6dh"; -"datetime2-portuges.source-1.1"="fcjicqpvz5cbshrq1w9y2a19sz0hqifq"; -"datetime2-romanian-1.02"="qag8c3rf1mjb0s7sqdri548ixd9rb1hj"; -"datetime2-romanian.doc-1.02"="dd80f68mbdd455s8njq5046z7slh47xa"; -"datetime2-romanian.source-1.02"="2fzqjvhdqh2fzl1fbskrahs0pjyfyw1p"; -"datetime2-russian-1.1"="hmdzwgxk166nibagd4c1qsxi7y0404zn"; -"datetime2-russian.doc-1.1"="mhv8b0716ihi3lxgyzd481dyv6gkf303"; -"datetime2-russian.source-1.1"="8749wgrkq93h4z7lasrwb3b03z2nfzq1"; -"datetime2-samin-1.1"="hf0cfq9j1681pp4575bwgxhxfrbmlav4"; -"datetime2-samin.doc-1.1"="wznr20pqd6ffkjzgihkjfxq6byms95bq"; -"datetime2-samin.source-1.1"="rszlr5zy6zw52cv6mvh7sfdfnh4y3krq"; -"datetime2-scottish-1.1"="0fw3v8db79rxc1363h70fgaswhzwhm4j"; -"datetime2-scottish.doc-1.1"="078mzhk1a0pd4qvvznp9aqjzhk1419j1"; -"datetime2-scottish.source-1.1"="mfw7dpm3mgh3wdmk4in6ysnnd6awij6w"; -"datetime2-serbian-2.1.0"="4g4ih0c1yrk5a39gkdb7r4wsxnfhyjlj"; -"datetime2-serbian.doc-2.1.0"="s8rf7s640n219a6phy64jidmf04y715b"; -"datetime2-serbian.source-2.1.0"="c85jqss5f5wcbsjy9b6lah1vq7xyr10s"; -"datetime2-slovak-1.1"="s6drl7indhw6r88bpzzva2jhxrpmjg70"; -"datetime2-slovak.doc-1.1"="z5navvjmgvgxjihffyx9p43p4y3plg8k"; -"datetime2-slovak.source-1.1"="2g2jfgg91mfh572l3bh78sin351788k3"; -"datetime2-slovene-1.1"="jbfcfj6rwjdadwxf80qhbxwphfrz0frb"; -"datetime2-slovene.doc-1.1"="dkf9zsiaqkxk83m14pym8ryciwsg0xzl"; -"datetime2-slovene.source-1.1"="zvxwxqmhzh9fbbwcdsk6vm3y6lxjd4lp"; -"datetime2-spanish-1.1"="x6mlabgqr35m0dw6zkgj7czgxs3kqj01"; -"datetime2-spanish.doc-1.1"="8szzfhyvgppifac3m38s2r57w4dkajdq"; -"datetime2-spanish.source-1.1"="h287bxi9k4xx909qvkrsywyr86nh1qjx"; -"datetime2-swedish-1.0"="kmnrfgqk01ygpd1m25q8s6da0wm39bdy"; -"datetime2-swedish.doc-1.0"="r2scfwnn257vximpv7a88qbmrj2v2554"; -"datetime2-swedish.source-1.0"="swif8xn3c7p4w00cyxxlwvwjh4k82789"; -"datetime2-turkish-1.1"="zz9fgafk07x5z63zkwa029yz6cf6xp57"; -"datetime2-turkish.doc-1.1"="zgh8zd14giw69lpn72gfpgdqc9v2qszs"; -"datetime2-turkish.source-1.1"="c39y1p039rbyp6s8cy7hs32va9904l7p"; -"datetime2-ukrainian-1.2a"="wmslcc8x7xkdzfd31psz7l7mfdpg5r14"; -"datetime2-ukrainian.doc-1.2a"="cyjjb5bmdwqp5by504r3s9s9h29r1bnq"; -"datetime2-ukrainian.source-1.2a"="3lj7rpa4qvljhvwgy6nlb0abmydgvqyy"; -"datetime2-usorbian-1.1"="pm6w3h37qzfbca1p3j5hxrfdn02l84qp"; -"datetime2-usorbian.doc-1.1"="zn6pc9djwh8jjhf1p97ah3n5kiyzidyk"; -"datetime2-usorbian.source-1.1"="qy8g9fi20q25cl1nd0v057bvyp8mi6fn"; -"datetime2-welsh-1.1"="jpj8dg205zh62h4cy1ccnh4j2p5cdpcd"; -"datetime2-welsh.doc-1.1"="994x84jlypdbnlnx0jf5zg6x0np88s7k"; -"datetime2-welsh.source-1.1"="95qmsn3rm7bsavz4kg4xf0ygdmf70kqg"; -"dblfloatfix-1.0a"="d1796nn206cs1jsas8kc05p0bfcb80rm"; -"dblfloatfix.doc-1.0a"="2rgw8lakmgyv5abzbpcngs9g1lrfdps1"; -"decimal-23374"="a7xks9vjp0pa09i5dbwz78n28a8fg83d"; -"decimal.doc-23374"="ib5j82aqc5l2rkggx5s3i7h0vz81sw01"; -"decimal.source-23374"="znw0p5x4xyg8nbaa0840lw7i27bczkf8"; -"decorule-0.7"="h52pi0lxysb91xdpx1dkybv3k0y7gybh"; -"decorule.doc-0.7"="3ba4y00y09a16py659yg2wmba7bxxc83"; -"decorule.source-0.7"="sdm70by35wc4jbjwq1d2f1jq2njdgk41"; -"delimtxt-16549"="akp06kcf04g4dx2ph7bs5cg4byld136r"; -"delimtxt.doc-16549"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n"; -"delimtxt.source-16549"="j788dpwxgryml7ny68nzab9c3dy0322z"; -"denisbdoc-0.9.1"="5xkpr9mh5607qp6vvx2a5xnw35xn07h5"; -"denisbdoc.doc-0.9.1"="8xqm0s7gp4znh4b7c0c9xgs23nwj899y"; -"denisbdoc.source-0.9.1"="bkr6b5hiymlmpm2brdy2vdjjzz48kc4p"; -"diabetes-logbook-54810"="x5s8rl10s8fg10xwa8s972zay7ximns5"; -"diabetes-logbook.doc-54810"="kcpszp5n9np9v31iha2yhz31h5b5snnx"; -"diagbox-2.4"="2d44gh8w38gdb44amp3c5vj4calw00bh"; -"diagbox.doc-2.4"="847q422hmpar0wv6whir9j170s96wd05"; -"diagbox.source-2.4"="z5zh8cacxrxglwb8hsakr6did136nb4r"; -"diagnose-0.2"="dbkvix4h3jhwq9pd2g9ydknc87z3zlr3"; -"diagnose.doc-0.2"="0b0ajzf5gvv3901szcwnkb7938sgqqr9"; -"dialogl-28946"="qn4qmw5yrhvim6fdl2gff1vl0ca4dfs2"; -"dialogl.doc-28946"="bh2vp79kq5adw6smmn0kbkhgk27qqq71"; -"dialogl.source-28946"="zqjq4a7kp63s0m7aq57ragybmigrf05z"; -"dichokey-17192"="0gjqadln2d38gclhy9ggf3i8vcnf2bfm"; -"dichokey.doc-17192"="af0pz0ixx95k8abfhximgla5jjly9ddf"; -"dimnum-1.0.1"="rm8crnajl5cbzxs7i399rn4y5d6kkg44"; -"dimnum.doc-1.0.1"="vzg71a7hjmkkdzcnflg1zaxp7v5dj06d"; -"dimnum.source-1.0.1"="g7qhpkzz1fy1ymxkiibk00a7hkmhr8i0"; -"dinbrief-15878"="49584j24lg6vxazw8rqbhzcf0c7anbqy"; -"dinbrief.doc-15878"="i1dwsv81v87ll6wipvd7idsg8vym61k6"; -"dinbrief.source-15878"="b3hcmv6mjq48yhjl7g32yv9s1p3d0hkw"; -"directory-1.20"="7r6n8s393idf94madvzpfz70qvmy9n5z"; -"directory.doc-1.20"="shvbxhb02d3lw1sn3ayvx5xs6qayxjkh"; -"dirtytalk-1.0"="1a6r7pzqjy14f4f7vnlqgqdb6r0yfm1g"; -"dirtytalk.doc-1.0"="h383wrcj7pxb3mnqnssb48qx0zzw61gx"; -"dirtytalk.source-1.0"="dzvypzk6yrjli5zmr06xc2mqyajrvz1j"; -"dlfltxb-17337"="ms6423aqc91c34fmxw8l47d5kbk9yc6b"; -"dlfltxb.doc-17337"="kb0p5vzgr45gzbmwzc9mrk8hpg1z6x0h"; -"dnaseq-0.01"="719cl1bfw7c1psv115pmrn7bijd0kxsr"; -"dnaseq.doc-0.01"="f8yw32bkw0chrk221qga668jpfnb3rk0"; -"dnaseq.source-0.01"="7aw7332aklsigpg8fazvv7ips2a236x6"; -"doclicense-2.3.0"="6r8lr2qyx9z98x1p9dlym8i1nwy6kvd3"; -"doclicense.doc-2.3.0"="0z6y5vb2j8h6lx7515hhpz7j5gxl8zij"; -"doclicense.source-2.3.0"="dgiry6mlr4lpk6zs3mmk64l2f400frvj"; -"docmfp-1.2d"="5az4cgljj1gmc28z6kwy9g4h49gzkplf"; -"docmfp.doc-1.2d"="rn7s95z09ijvddynz2dda2lpqidzbbnw"; -"docmfp.source-1.2d"="c6swy2dkxzrprrl0zjbphcf15x6my5l2"; -"docmute-1.4"="ijpgwid57874xk9w7p4g4m14j770awwi"; -"docmute.doc-1.4"="w8i5cy5mp1780bglwn08kcywk3q1qqfp"; -"docmute.source-1.4"="qqarpddqxfb4lk6cjsz4d68wvkvqrdn9"; -"doctools-0.1"="xddfhcsq7f0la61bmdv474avf8vm7pgg"; -"doctools.doc-0.1"="zhwqm1k0dl068scr7sfypcii7nkjp01p"; -"doctools.source-0.1"="sfrjlg9h1icqa2wa9m3z2ciqc8j4fzc2"; -"documentation-0.1"="kji3s9vf00jpl198nm49dxfxw8yh3xkh"; -"documentation.doc-0.1"="ir7a948d9yliinmb3y55vx8wa2zi4ada"; -"documentation.source-0.1"="gjlkrc2a087589g9lrk9sh8g4q0l03vq"; -"docutils-56594"="3ylh872bbn7bjwdm9zw1w7iffjbygm9c"; -"docutils.doc-56594"="gf2wpavh0fipnib447z8zjyssm88s9r9"; -"doi-48634"="x7wlmyfrj7vh3wmf1zjgpyraf2crh7q4"; -"doi.doc-48634"="h1si59g4nhzwixqsi11dzz1x9p8jv265"; -"dotarrow-0.01a"="an0dsydrk9bfcahzi356nrfq9fw0i9fs"; -"dotarrow.doc-0.01a"="ay137znk96s545wq4sligy3q832m4g91"; -"dotarrow.source-0.01a"="g5krgdbp4bdfhk40s759qw2j6f7n6ss7"; -"dotlessi-1.1"="y3g1v1d5q2lxmghfc58msm75421pm2yf"; -"dotlessi.doc-1.1"="hniafmk6wys4p2mlik5v3gfsvmpkshqc"; -"dotseqn-1.1"="pvfjw24r81j8403qav5bfd3i6xfk3xr1"; -"dotseqn.doc-1.1"="7iq10vxjnn14rvlpy10clnrq0kcs0a5q"; -"dotseqn.source-1.1"="fpkmmkp37gnl7cg75i820ry92s13vkx2"; -"download-1.2"="7iyriccjgkp5kr1wf1xbpg5kx44g85f0"; -"download.doc-1.2"="vsrhz791rril9vb50laapa668pc92ixz"; -"download.source-1.2"="ihygdvqagb74hzcbb35673bapx1a3j0p"; -"dox-2.4"="vmv0sf0gjb0hgimhyyxah2n9z7kfc60r"; -"dox.doc-2.4"="mjc4chfbw9nnq06h6sr9v5q7mx0yf3w5"; -"dox.source-2.4"="6pwhbz64rwylp60nhay1ij6bls33aqcx"; -"dpfloat-17196"="lad2kjr2qljjmnrygdlhgqbhpj8cxqb2"; -"dpfloat.doc-17196"="j3mxi39ar6vsyz51w7dj3nsnrrcsqjpy"; -"dprogress-0.1"="6bz0iy8fa34famjb67k3q1xhsca311k3"; -"dprogress.doc-0.1"="9x4n68z2vp63dvhc4g30yar4z70xkxbb"; -"dprogress.source-0.1"="g0d00q6x7wagml9hphd9b2ddg7zn887a"; -"drac-1"="kswhsywlysyj2k87dxad6wyjl2zxj584"; -"drac.doc-1"="23j8r0v8wyivwydi9ij6783d91nd6r00"; -"drac.source-1"="hi0yz77sqs9lj3dqvj2h0zgkmwac3r16"; -"draftcopy-2.16"="jpi5kv4l4r74ahxh9m4nw338hlx9qjxc"; -"draftcopy.doc-2.16"="x49fj5rzavabrdw8c8j05nnqxkdjlhpp"; -"draftcopy.source-2.16"="b6319hjnccfx3xxfrxz1kmx9813aik0a"; -"draftfigure-0.2"="w154bzgm94wzqs4shyi3vir6vzfd7324"; -"draftfigure.doc-0.2"="n3cvgb3mn0a0asrk5wng4f5pnr36k337"; -"draftwatermark-3.0"="3rnp6myad4ij6ikq9wwfdknjkxyqd04g"; -"draftwatermark.doc-3.0"="df3zzpkq6ixspdzpql1zmif2y78k5glf"; -"draftwatermark.source-3.0"="b7ngzwvmc8g8w3hc6ymk8r8h6kn1a4x5"; -"dtk-2.08h"="x0hk8li42r2m26kmmn5fz5kxjy4xi09c"; -"dtk.doc-2.08h"="6yxf7x6a5d8r7dnwipcxa87w2sgs8xz9"; -"dtxdescribe-1.02"="2bhwnkb5id2raigd4iywhf7da7c772zr"; -"dtxdescribe.doc-1.02"="2ygyzgrllyq4fa2xbf8fyrfk810w2ja9"; -"dtxdescribe.source-1.02"="39inl1ksgzd28sszdfjyyq80gscdc6xs"; -"dtxgallery.doc-1"="bpsakwyq6ihcw2ziqpjv8qh2a90s5mw9"; -"ducksay-2.5a"="sg9xk4jc4ngsan1f0806w9ph5372qihk"; -"ducksay.doc-2.5a"="khw153wkf91llm5n87wkq5wqr3mgazy6"; -"ducksay.source-2.5a"="xsyz67f6rm0561r1lc128xn8091vxyva"; -"duckuments-0.5"="vdc247rsaliycjf37gn8lwihycrpgksp"; -"duckuments.doc-0.5"="7ia6rdsdhhnvf2jdxynz780virwl48p7"; -"duckuments.source-0.5"="ndcajqs2y2vmk0fzd25ayc4i9yq03qz2"; -"dvdcoll-1.1a"="x9xdlwqrbq8wflwbwkabwyi9bg8rakqz"; -"dvdcoll.doc-1.1a"="m88326jypnn2i1bqgv458cyjdzdn320i"; -"dynamicnumber-0.1.3"="p6s0hyavqqz8hsfca8ymfqd63ajpbgam"; -"dynamicnumber.doc-0.1.3"="28i12f55m00ma06xi4575m9mxlzlk5j5"; -"dynamicnumber.source-0.1.3"="1s5p8px5hk951cifga7as2cys5p9v9g8"; -"dynblocks-0.2b"="svrn2iyvz97vsdz7zf2npfjjmj1hiiwd"; -"dynblocks.doc-0.2b"="vbfwn0p5rpddhfbj5dzzg8y777i69s62"; -"ean13isbn-57514"="bw8467r85cglxc63sqjzkyfr1yhwa318"; -"ean13isbn.doc-57514"="7qpp7zyc1l29pficyg78629y85z6w197"; -"easy-0.99"="jb9dranvwd0ngzigpq8kla53wnd99fiz"; -"easy.doc-0.99"="m4hx4j5snaiip3mzz1hnakcqjdmhmy4z"; -"easy-todo-32677"="303p58si7jhry6gzkiqjcdhkgdxdj8yn"; -"easy-todo.doc-32677"="19xs0lb6swakg1f9ci5gfmmfbddcirvp"; -"easybook-1.24g"="r2a3c446jydh15ir8d3h948dgip6kkdp"; -"easybook.doc-1.24g"="6y2hd2v20wy7nh9fj0i380x421nia50m"; -"easybook.source-1.24g"="zvsk8amph0yp1hmgv054gps4nc6zyf5v"; -"easyfig-1.2a"="l6pbmvwsjjnrpxl6d9v6askvk0fvqpyn"; -"easyfig.doc-1.2a"="glg4115m5lkacjxdq29my9a01xn5mj13"; -"easyfig.source-1.2a"="szidzjjq2h8aiqh995xcd37460xx5lbz"; -"easyfloats-1.0.0"="v2v3sm7d9dga3kpmr43jvi8p5s3xlbiw"; -"easyfloats.doc-1.0.0"="s385w8a59a9xncvv6rqclbiac11bsksk"; -"easyfloats.source-1.0.0"="08b3pa30hllhxb884hgmpby1zkz1n7bj"; -"easyformat-1.4.0"="x6ad1pxvbj09q2kypdg6z5js8q11a7k4"; -"easyformat.doc-1.4.0"="1g0wbnrc4snik4hbzldn9c015ry80n50"; -"easylist-1.3"="3mri8pvv7jc5lkqkmzh8h5a4x8agh702"; -"easylist.doc-1.3"="7ak9lbazspcv1k8yi2j3shf106v4spjx"; -"easyreview-1.0"="gc6ml3qw7j723r20jxc9lvrfm5ll2ljl"; -"easyreview.doc-1.0"="j2jxwz2fimhqyd5j6hzrgamn5cjs4azf"; -"easyreview.source-1.0"="8x8h7c1lldi9mzmwrgcvi3114gh8y3s6"; -"ebezier-4"="m8m99zabbk55zn8l16z2qjpaw2vilfy8"; -"ebezier.doc-4"="mybqgr1ksi07qkwjgr014nbgx47q6rvy"; -"ebezier.source-4"="rpwm8s3jxc47d28595qx4gdgipc9aj45"; -"ecclesiastic-0.3"="mw0n2vbpdvh26xpjh29avdz7lf2jhhx5"; -"ecclesiastic.doc-0.3"="2qblfhxs7h9p9wnrx6m73drlgvwnk6ql"; -"ecclesiastic.source-0.3"="0cv2d5838jv4ra4slgvfp2fkl1v2kv7j"; -"econlipsum-0.8.2"="ipxvwmfm4z615j0fw84mwlarq9h77zjh"; -"econlipsum.doc-0.8.2"="c7k1nc8vnvn84wbzcm0qayy8rc3g7sss"; -"econlipsum.source-0.8.2"="alz8zs8874cmpbxrnk6h992pmrg9vx3i"; -"ecv-0.3"="hb27xhgd224h3rwx0bmrkrf3fyjgcsc9"; -"ecv.doc-0.3"="dmf8p191d4s0dvsdyiv1850dzxxg86n4"; -"ecv.source-0.3"="wn8c1zrx28k418cmj93b7ngbg6mrg0q8"; -"ed-1.8"="i6pnwa7a3fvvlsc6cfdzm73c8zh2wjf2"; -"ed.doc-1.8"="bxhdx8i27bjbxybz2lfwk4wjl597mgdk"; -"ed.source-1.8"="3lq35kmqyxqrrj9rznwlj922iwbxr6qc"; -"edichokey-2.01y"="fba596rhvgbccbrmdjzdqhx3a3k8fd20"; -"edichokey.doc-2.01y"="8hir9vw34lrizkxivznzbwcypvxjssk4"; -"edmargin-1.2"="crg5k7p997nxfxjhlrv2wcmvb673g0ry"; -"edmargin.doc-1.2"="wfdkbmlhvmwcba9jkg3p83vsqj4k3dxh"; -"edmargin.source-1.2"="j439fzcg8r3rcwr9kadrlx9rp4wvxs9r"; -"eemeir-1.1b"="3d02h2i8l1dz6rljyx5my514qhw1w35p"; -"eemeir.doc-1.1b"="y315ys2zhrnrpfdw1yz0ciay8wsncmvb"; -"eemeir.source-1.1b"="0v0yqby3x8cgldrz67qlkqd5hp4xfh97"; -"efbox-1.0"="lc1r9y6znpl59qq6j0dwksxgnkrwh985"; -"efbox.doc-1.0"="jgi7nzhs6x37syhlpizfc8nnnwqamnqf"; -"efbox.source-1.0"="94p7n1nxcpax59q64i4hygr4gz6z7qjg"; -"egplot-1.02a"="wjw51hmdhl76wqrgj9ylhyb656rfqmg9"; -"egplot.doc-1.02a"="3ybfma3qjwnmd9djk0ckr22kvln7ksgi"; -"egplot.source-1.02a"="lpd8c8hpz0vpln7hq4ck2xm896hhkjz5"; -"ehhline-1.1"="zvpll3g8lwzzc6pna6yz84g4vmchvr2p"; -"ehhline.doc-1.1"="in9l558n65w88wipl7rijrlz7m14ygdi"; -"einfart-58414"="wynf55xmjvnn0hsy4l6rfxfjvys905r4"; -"einfart.doc-58414"="cpzr04fnqljp1k85vc7z35b2p7903fcz"; -"minimalist-58395"="l855p35wwvmbnzhb8ws4ycds31jvyy1s"; -"minimalist.doc-58395"="wff8fp73ygsfp9dk1djpgad8i5rjgfkr"; -"elegantbook-3.11"="8b5ph3pghzqw6w87r3j7syv8wvbwi693"; -"elegantbook.doc-3.11"="4vpyymvj9yn902bz7rizay726icsrpx7"; -"elegantnote-2.30"="2j2whlfmm5nydbm7rinsrxpj7sxxf5nk"; -"elegantnote.doc-2.30"="b807hfa7p6zybw2mxrnc8ic2xpplq3p4"; -"elegantpaper-0.09"="r8jqan4yc8rcsxpi6lnxc4sfprijnh50"; -"elegantpaper.doc-0.09"="d3ax4aghz14cbkw2a9nc22if598r9fhr"; -"elements-0.3"="5jhgr3w0l71k6yyah71sns2cyib3w6rs"; -"elements.doc-0.3"="64ad2wwg0s9s56416gdw3y2k19qj3isl"; -"ellipsis-1.8"="r0sz3fsnxpphg5jrwpqr06l9j9qci49h"; -"ellipsis.doc-1.8"="wx7z1wwcsgqhs1gpgjy90mj3m0j4w47h"; -"ellipsis.source-1.8"="ics0hg4wsp162y5abmwdgv30fj67sjms"; -"elmath-1.2"="pljnyyb5wp8n5f7g5wp2hb0f7aizxwyd"; -"elmath.doc-1.2"="9rrybpg3pziqa42bkhblp14jjz6zgm2v"; -"elmath.source-1.2"="fnw5k3ck3nbphv71xqlyq6yisgq04xjc"; -"elpres-0.8"="sdk8wfvfm49xk250gv1bjsgl3r400kw1"; -"elpres.doc-0.8"="c6xzbksr0wacp0nriw1ws5jrb1db91sg"; -"elzcards-1.60"="nyzh9ppq7rch8s38spiddbvgbc3jlav3"; -"elzcards.doc-1.60"="xf2cc42ypl06p2kardrq1nf3bkr0xziv"; -"elzcards.source-1.60"="k346vzql960by6gqi3fcpfjdiq6ncc26"; -"emarks-1.0"="98dkcqyxwjzmy7r7piap7kmf3di5xjqg"; -"emarks.doc-1.0"="caipsh0fic83rak0dbdjfmgkvppj5ini"; -"emarks.source-1.0"="06wmqv5p4nhaqhcb0i8byf6s600bq7in"; -"embedall-2.0"="bkkkbm42s039l4hsy7a06fba7y76pcdh"; -"embedall.doc-2.0"="xifjdsbhrdr372svi21sq1wwl6jin2as"; -"embedall.source-2.0"="kmanpw0yvlllsc52f4wfhh7dpby80bnc"; -"embedfile-2.11"="lmyii6clmd884g9f6205j11hps9ckw4p"; -"embedfile.doc-2.11"="9dr0hdvpp5g5cvq8q449cslixn0yzr4f"; -"embedfile.source-2.11"="4rz19s91zj46l9hmzgn8xkimwpjizxbs"; -"embrac-0.9a"="xgrpqldk849vwzs8bb0zprjba4vr5hgl"; -"embrac.doc-0.9a"="nyp3yczjp39bh3d7ngrvyn268jhfk2ng"; -"emptypage-1.2"="lbjvj1gf2jiy15yj86d6jxlhrk66zmrm"; -"emptypage.doc-1.2"="07fnrxjidk9b42610wx6696cah8p1zdi"; -"emptypage.source-1.2"="svha86185zhrvab827x8nbn02vlp027l"; -"emulateapj-28469"="2ywrmmrvlkygp6a86i56rn9bm6wzqqki"; -"emulateapj.doc-28469"="ij4q6ixvmmh8xwq7kgb0hzvhz5pcsy68"; -"endfloat-2.7"="4fc93l83sg85k19wjriw7703zn70hz7b"; -"endfloat.doc-2.7"="85zhqgxpdbwzlr0c6dkkxnf15dx4qh3n"; -"endfloat.source-2.7"="6q86lh5x6df037hkk26rc02ypqfjk1nz"; -"endheads-1.6"="0gjn1xldvixl6lh9n2g9gyly9va84sp4"; -"endheads.doc-1.6"="y0phz9mfklcq56h6mwkx2jd535v94r72"; -"endheads.source-1.6"="x01kj0pd2b1ljs3457l1b7880vp8amdx"; -"endnotes-53319"="h3pqrcr0w5lgxgyw0glmjshyz4jpi08k"; -"endnotes.doc-53319"="fdkg195aiaccnys9dnjyiklrsvkvmx4m"; -"endnotes-hy-54758"="3l046f4h8qjd9vc8d6s20d2bn8fjhb9d"; -"endnotes-hy.doc-54758"="4yxl7kqaz73j6inrlrb15p6b9mpkda0j"; -"endnotes-hy.source-54758"="15h17rhifyp0yxqysjvhwks8183rskk1"; -"engpron-2"="d0k5j6bdrzm418x90n8858cyw85i439m"; -"engpron.doc-2"="4mhw0220r7x85dshmar87b3jydn2jxdd"; -"engpron.source-2"="3rdxi48m3h33kn1z81md9izji6my7sdk"; -"engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy"; -"engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk"; -"engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp"; -"enotez-0.10c"="qgbri1hhaq4yh7mnxcdwky11rww0ab6y"; -"enotez.doc-0.10c"="nmqm91i52qry6rm0rzlzqjxl18wmfpaj"; -"enumitem-3.9"="cddx7nd076jvg59bdkqaxnmk4rdlg94a"; -"enumitem.doc-3.9"="nraf0fvdrdn61w2dxiaqcd6xzlywq9pc"; -"enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4"; -"enumitem-zref.doc-1.8"="nq73212kl36wimf8k4m37xzb5pr6qqdh"; -"enumitem-zref.source-1.8"="3l875sm2v3c2frxhr17rv80q36n19a9h"; -"envbig-15878"="9jl4id16g9bmsqwwdbcdp2925m5c381k"; -"envbig.doc-15878"="5302z09wsidh1fvnfs5d7zf3fzd9z967"; -"envlab-1.2"="iqf24bqqcnpp7kiysfb5dy4ksw2ni0pn"; -"envlab.doc-1.2"="5xscix7j6x6fbscw6hk22r4qz864y654"; -"envlab.source-1.2"="ndl09cfzl24rbp7rw71lcv2q6dn9pdih"; -"epigraph-1.5e"="hhz8zdnr7k77gpqvk82mbq7v1gmcq6ig"; -"epigraph.doc-1.5e"="xkmp3p36yicjy9f8ywy7s39i5spwwf78"; -"epigraph.source-1.5e"="s20xxdnwi3pc9d6sl5md0fyh7w8vnhbd"; -"epigraph-keys-1.0"="dz1105qmdapxazcvjwmli1hp8wc3vrsp"; -"epigraph-keys.doc-1.0"="gvycf0wi4kjcld2sic2j09nwpm4vhcxr"; -"epiolmec-15878"="hpmg6yy63c52078mqmp861418xi07rgk"; -"epiolmec.doc-15878"="vl11cbnw0avwvjf8ad01fziya1dzrbh8"; -"epiolmec.source-15878"="1b7as37h0ncqjvsypwc9wdzzjhs0sfhs"; -"eq-pin2corr-1.0"="lcjcz5waz5n4l52052mm4xcmw8gjqa1n"; -"eq-pin2corr.doc-1.0"="k5pyaiw0a6gl3941bcr78ll9m5104fas"; -"eq-pin2corr.source-1.0"="9hi9zmpb70arkdf8sgdyr3fkr7abc6pr"; -"eqell-22931"="24n6gsirzxiyv3avcm27hll6nwrybkk5"; -"eqell.doc-22931"="xwz1qv3l0345p2al1p02dc5k3f77k48h"; -"eqlist-2.1"="jajr72vgjddrwagibq1nmhf9lqqsk66n"; -"eqlist.doc-2.1"="ln486bm8phd0pmdfa75rjy6p1bwqzgmd"; -"eqlist.source-2.1"="r07gp9r0wb57knv1gy35kwkvksz9bxd2"; -"eqnalign-1.0a"="lcg6zvxcnzmljvqfv6lh1majiywkwnyq"; -"eqnalign.doc-1.0a"="h21nzl5g0hqh3513gbipm4fr79i6pljk"; -"eqnalign.source-1.0a"="m8i3vxkn3ciab2p86shkzzzx2ckp9d7v"; -"eqname-20678"="mjcyi6q46c5jd44m8m9wzx12lhqir4a2"; -"eqparbox-4.1"="c3v8vdwcjfhn85751995viymlfgwpwr1"; -"eqparbox.doc-4.1"="9mn192afkzc3pzxp5xxsm7kxpaa3yis1"; -"eqparbox.source-4.1"="s206q1m2wkjsvjz23xlsx1yy603jjisa"; -"errata-0.3"="kgx1zy8j3g12czpg8hhnjq6dwa3m8xqn"; -"errata.doc-0.3"="518rdbnh3w5jsk4vlfp93cnag3kaiwmy"; -"errata.source-0.3"="p27pa3b4plzwhxl8vpr7qigbnr8aqv11"; -"erw-l3-3.1"="s7sivxpp0j267gxma49pbrxdmbs4f7pk"; -"erw-l3.doc-3.1"="7g7nahk60jdkzxa79fks5dxmynwqimh2"; -"erw-l3.source-3.1"="qhvqgnasnpiin8fms37rhcjyxf0hcd6w"; -"esami-2.5"="8b9bvz0jsn56nq9d27l05kfmwhggm6sw"; -"esami.doc-2.5"="y2n8zs9pk1a3zn1ag5sw4sm0kbaclqr2"; -"esdiff-1.2"="q26sgf5s4ans9qv984p9s04pginqby9z"; -"esdiff.doc-1.2"="67vh3nycsw9h9vv7k25agixsmrdg0068"; -"esdiff.source-1.2"="xy6y4za3k53myl7dxbjxm21rcskb1mqz"; -"esindex-1.7"="4cphr245spz228hg23dgvffry10hqi9q"; -"esindex.doc-1.7"="0aspp9mpf60hxnqyj26jpznsj0xmb7g3"; -"esint-1.2d"="74szrggzvcprs68hisb87p7nvj0i081h"; -"esint.doc-1.2d"="hjpca8jbf1aipkzs30al948hpclk6jy2"; -"esint.source-1.2d"="1mpxmf7kkdmglnz0l6nkcpbyy4k3kbqp"; -"esint-type1-15878"="0fwcq5cpsqzajzlp2rc9ffmcwg5fb5ja"; -"esint-type1.doc-15878"="vmamlk0v1w4ffks6cp9f0gg09rkr37vf"; -"etaremune-1.2"="1x3604jqbswjza4ryv49l2cs63iqcv3r"; -"etaremune.doc-1.2"="6k8qah3w1ksn77is2i8kh1nilr6qgm34"; -"etaremune.source-1.2"="5a4n5d9l39nb0v3affwx0sswnp6sv2yf"; -"etextools-3.1415926"="w78v5hb43si3j8p38simfzscyh6lglsm"; -"etextools.doc-3.1415926"="16fq8y3c226wsf57dkny9484440i61zv"; -"etextools.source-3.1415926"="ch6lsyh0nlzkdrwzsxgf87srsb40x56k"; -"etoc-1.09c"="bhd2fhjy5m6j8k0xb3hiirys8csvmwyg"; -"etoc.doc-1.09c"="5rl8ibswi4p9a8d9jmlavx5zwih05mkm"; -"etoc.source-1.09c"="18w9wy70s61yggkcxfrhfxsvjmbpr7hl"; -"eukdate-1.04"="5lql99zq8izsri87dhqf28nnchrjkyhq"; -"eukdate.doc-1.04"="f3xl3nllsr8299rjnxnhpksv7rz8pdq0"; -"eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis"; -"eulerpx-0.2.1"="1kvqcqfjh77lg1d1jzwj6mr2rchjpnyb"; -"eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93"; -"europasscv-56829"="5sjzgabngp49v4ghn8sv6dahbnnka7sd"; -"europasscv.doc-56829"="8racsqj1y0rr6r8x9hb0khb4k2g4dgw7"; -"europecv-57641"="51gzlqk28vhg99i196pdkvax366z4m56"; -"europecv.doc-57641"="9ra58061c14fabaifdg216h4xjcgv24z"; -"everypage-2.0b"="az5nzriphfs7imw4zi1g7m02qy14d0j7"; -"everypage.doc-2.0b"="fvd7wnl16rgkkkl95z24k7057np0jh54"; -"everypage.source-2.0b"="6q8da7fiji3x0wli9dncncg2kgx4wwkj"; -"exam-2.7"="51k4l25g664px41y845m9f1gcy0id8lz"; -"exam.doc-2.7"="a5w0cfmfz19icr3qhqfs502x5b7j688y"; -"exam-n-1.1.4"="nhyripks5spkljgi7js9mva03lgam717"; -"exam-n.doc-1.1.4"="s5zg21xsdrxmyr4v4fj9gjp5gkcm27wj"; -"exam-n.source-1.1.4"="yfj6g9n8q1i7x9037cmvghzyhm4i28rl"; -"exam-randomizechoices-0.1"="76kpdcd91398dmjcs94270ji9y1hs6n1"; -"exam-randomizechoices.doc-0.1"="m69nv8j74xz3i3wv0byg3x64d6924338"; -"examdesign-1.101"="58mxkjnnwz8z68lvxdc43gn14v6i9ysx"; -"examdesign.doc-1.101"="vr8j3mhp28h6d9zvcg6akfx9sx756zh0"; -"examdesign.source-1.101"="51c9vyfhwcp9vmhsrsvzd47q93ckw2f1"; -"example-33398"="rpbgsy66fj5nxcf2j2kg6mmkb46hq4ir"; -"examplep-0.04"="jnd218glfcwkbz8qprkac3nykm86lhsx"; -"examplep.doc-0.04"="lgm123fsn5wpdgbfx3kqm9h5q92qss83"; -"exceltex-0.5.1"="2zx6110fa87f5f3fabp4a163ybxd8mpv"; -"exceltex.doc-0.5.1"="b1ga5yh8hj9zqzm9axzdmryairv6avs1"; -"excludeonly-1.0"="i8iyqw7gylk4jh4xkrvlycpy554iinyn"; -"excludeonly.doc-1.0"="4i3z8xj3prbb8wmb469wp54pal0y545a"; -"exercise-1.6"="x4m7z83dk9yg068fgv9580gpg32fin6y"; -"exercise.doc-1.6"="bcrzrs23c8rrkax8w03yhlmr9sgqw3kq"; -"exercise.source-1.6"="fw34bm9v1gqh9x7vgih6axanakwj523h"; -"exercisebank-0.3.0"="lxmd3p0fn30bkvvh29jlajdilif7c6h4"; -"exercisebank.doc-0.3.0"="qys4wvwrjjxnphcadazvgz6wxxqk98jc"; -"exercisepoints-1.2.3"="givs6qpl3x2lc45lhxp2xa6wfznawp23"; -"exercisepoints.doc-1.2.3"="ad8kxig8in0cc1xdl2rn7yyhfxhcx868"; -"exercises-1.1"="rkvmgr7ahzvi3hdskg4m3hxghxa9mzkh"; -"exercises.doc-1.1"="fz84yp1ykv7b2sspfp562305xdjz28hg"; -"exercises.source-1.1"="rdwlqw0b69q92rl6qn2k3pm8bg3mch7f"; -"exesheet-1.0"="9yvchdd3qmlr2dp30k8d4gbx8bkgnwm3"; -"exesheet.doc-1.0"="mgibzk9pksylasb5g35j73r7ydzzk37z"; -"exesheet.source-1.0"="6b6g6ijdakwvk0zscvq18h6n2wrbrabq"; -"exframe-3.4"="4ylpslzc9xy1anmf3955qv9c2qf6a2j8"; -"exframe.doc-3.4"="nnvszhbdyp6xc6kscdlsdrr1xzp60pjw"; -"exframe.source-3.4"="01lnli0q7sbbax9kzz5wil7gx6578h6d"; -"exp-testopt-0.3"="rz188mfdr0hfnrcndv0ncany2g20hv34"; -"exp-testopt.doc-0.3"="icxvqjnip0g92k1hngpvas7f7ii895pa"; -"exp-testopt.source-0.3"="9gq43v996qrrrxjgi28fqf9c8qval8ln"; -"expdlist-2.4"="3l7s7wynbhvmmxlpsvzma7k0fmsrgha0"; -"expdlist.doc-2.4"="pv6g612sac208kk4il3v43ir008916lg"; -"expdlist.source-2.4"="nfs4val465iw3h4x5ggg8606k2nl4n88"; -"export-1.8"="c2cd44yhfphk0wnyaq0db2y5rfjmcvfv"; -"export.doc-1.8"="ijjjprbcnjwwj5hf13b61165mx8xdqn5"; -"export.source-1.8"="0wz3raz7mf5cqz0j0g977b7ghznxgxxs"; -"exsheets-0.21k"="5mzmvibvngsrzbgp4db25w2iwk3s4rrx"; -"exsheets.doc-0.21k"="np244067l6dgsdhfn7dniy21dkzsdqxm"; -"exsol-1.4"="wwghsm9x9vmac2i0nxgjqg8cpwlhzqwa"; -"exsol.doc-1.4"="f2wy6r88019491r16x5kqbfrhvj4np78"; -"exsol.source-1.4"="g428plzbmq561mmilbyizjp5ycpr1v8q"; -"extract-1.9a"="dmilnfy1hx4wr7rxx9422m2m95ksx64r"; -"extract.doc-1.9a"="ngsls0lldkxag0n9iyj97w8bn281xm77"; -"extract.source-1.9a"="hkgq7qf52m44dk9n9mj6xllwqdqz9s90"; -"facsimile-1.0"="mhx5jbh4rwv10z6hd3b2w5haj02bjz0y"; -"facsimile.doc-1.0"="pb8sj68gxph376h1ph6yb65ncyblxbdw"; -"facsimile.source-1.0"="dvjli6r3pr4w74n9mnm2ix30jva6yysc"; -"factura-4.00"="3rn2gc3d7861614g9p38jkj4zdkaga1g"; -"factura.doc-4.00"="i9l8lg739x2y4cq91hq4x7smy3m64cjh"; -"factura.source-4.00"="0a47dflwg4xq6vswm89jyvb2ms0316jl"; -"fancyhandout-46411"="d1l30rd3z334px9zyw74l4x5vjyki6zi"; -"fancyhandout.doc-46411"="y4vl6xw99i4q8j9nr369isqzs9vl39z1"; -"fancylabel-1.1"="fvnw8s5y8rr4sfpff9ay2y1yqqgrwysk"; -"fancylabel.doc-1.1"="xsq1b17afxx971wfyrdgwnq2fkyqsxc7"; -"fancylabel.source-1.1"="rwq6gd28j5m49xv2h91sav2b5pf9cyvn"; -"fancynum-0.92"="5asi7143x3h151vhxxjjyy73nd39zj2s"; -"fancynum.doc-0.92"="54f1hxykwv7k34dpsvg0l6mlz9jia60z"; -"fancynum.source-0.92"="hfgqgx52wiqfw9h4440hwha1zagvw45p"; -"fancypar-1.2"="268b27l8yvn8rcb7770xq9rpaf3w9d3x"; -"fancypar.doc-1.2"="ikjja1g55vxfa2pjivkf1wgyzihikghk"; -"fancypar.source-1.2"="yjzx9b97l97ii96d0wvd6whbq9gkas5d"; -"fancyslides-1.0"="1rm0ay1lphh034nxw2ww5w4jkyz0a8vg"; -"fancyslides.doc-1.0"="h8cl20k630ccmwjxvnkns9yqzv2gx6i6"; -"fancytabs-1.9"="198b3fl0x7n2mghw2f667pxr4dzsyq0h"; -"fancytabs.doc-1.9"="m0fyacjfsm4rc2shbar55bwi6nrf5f12"; -"fancytabs.source-1.9"="4a3il9l6rj6wkxd489q9vxdjihk9c79s"; -"fancytooltips-1.8"="92mbrk8gn6np54fx90qzcgkps3v6k54y"; -"fancytooltips.doc-1.8"="v90g2vxn8yqy9lvibqhldwm23cpvv53j"; -"fancytooltips.source-1.8"="cgj7harpp7wxh1fvh1wfx3pc0c34nhd5"; -"fbox-0.05"="kbmlphchd664izvm0frraylr6rr31rkk"; -"fbox.doc-0.05"="yc0kh1lbmwa6281m6mwb6vbk5bvis6ay"; -"fcolumn-1.3"="33ajwdb7hmvbmb27qbrdb0h8jk9pskdi"; -"fcolumn.doc-1.3"="0di4myl6vdrb7c7lh012zpd26kvs9lxp"; -"fcolumn.source-1.3"="zjkdy0hs3i348liqyf7r8h3wj3zv9a93"; -"fetchcls-1.0"="hjmchh00z9pl5bhdxdb491f4grb4hvri"; -"fetchcls.doc-1.0"="2p0k1bx3y1b9b8lw2j25ybcaz1gwyyfa"; -"fetchcls.source-1.0"="xzc8psnl98xfsj7hy37f1qgln8hx25pn"; -"fewerfloatpages-1.0b"="dj3wj1sgnqgmkma8mdfnar5yggnl0ygs"; -"fewerfloatpages.doc-1.0b"="6q4r04r60d92k9s3g0f7warakjrivg61"; -"fewerfloatpages.source-1.0b"="r5bv4ial8kng8xlasm48sgdc5jfdf5zh"; -"ffslides-38895"="v88vqphgndyc8bznnkpc17pcgc4f429f"; -"ffslides.doc-38895"="1378bj25gqxr8mhdwf99rw2q61kbakqd"; -"fgruler-1.3"="8cb0sximw14vln08pdri479bgqz072na"; -"fgruler.doc-1.3"="qzp1jn7pxsx90zszck96412hv7g2bbhy"; -"fgruler.source-1.3"="salx2na2qh9srcyzy4pxm95hzmby9vcx"; -"fibeamer-1.1.8"="9vdqi8fyrg6ixnia4qh18dyzbg1y0pdd"; -"fibeamer.doc-1.1.8"="blp94av9rfbpawsvgrlwq5p2ycgwz3bm"; -"fibeamer.source-1.1.8"="6s017bq2ca3g3ml50br5dwn14i9q3986"; -"fifo-stack-1.0"="dfyb5qmw70jy72ass9iy0k89criyybwh"; -"fifo-stack.doc-1.0"="a5qh0b6zcxnfplc2xf0dy4384rvb8ggf"; -"fifo-stack.source-1.0"="67n2h94p29l1j6dar7s1q8gz1cxg1zxh"; -"figsize-0.1"="hmj352dqpk23wfjhvs58r5rj47gcixj3"; -"figsize.doc-0.1"="sxblgd4i3mklznz336yy925l7xgdnb82"; -"filecontents-1.5"="d22c8airrb5g6gg1v4bym4ai1v6g3bk3"; -"filecontents.doc-1.5"="sqsf9s1517qnxry8shr2mjhpw5d3a91j"; -"filecontents.source-1.5"="gm2b5r5ziyg72fwp6mmxbiqhvlc1viba"; -"filecontentsdef-1.5"="gjx57g35wh6ay7vynnj8wsf14zvs4cnm"; -"filecontentsdef.doc-1.5"="mnmx299zm8cs3l4i13f1y5mz9i67mpbf"; -"filecontentsdef.source-1.5"="42ndk5l7qydnpiaa184r08d4sc2jg71s"; -"filedate-29529"="krqs9ry6gpmk5xi9a2ijkrd90y7v6q5h"; -"filedate.doc-29529"="dq7487rvj7vai1j80j9sgi7hsldg433m"; -"filedate.source-29529"="qq7zspqhd6zl4w5lyy9gxw927ph31sp4"; -"fileinfo-0.81a"="gbv2pynx74765fc966q0l4wpflxyi0cz"; -"fileinfo.doc-0.81a"="5y2xniw8nwg8iw11g49w04xl9fp4zyv3"; -"fileinfo.source-0.81a"="lgcw481ya8a6ag2gzd0g589sm3ndsqys"; -"filemod-1.2"="kgjfr4lx9rpw39aqp3w72hkj9kyfbx8p"; -"filemod.doc-1.2"="cid89p79bmmyb8hp230g9zfl5wxl3gwq"; -"fink-2.2.1"="l8xgqw4b1pc40z8zvhj4x5vd3arirrss"; -"fink.doc-2.2.1"="d78cggifb9b0y730zx116mv90xlcl47w"; -"fink.source-2.2.1"="mb1qfcb5ils48npb6zn10d3dd9781abh"; -"finstrut-0.5"="adqypjvkvnkydw403q2wab9xzpvavhzz"; -"finstrut.doc-0.5"="lcyklm3jkz5nq6j956dv55n0nfyaprkx"; -"finstrut.source-0.5"="54slgzkfps6q4z7x49a5jqpc1j3p98hw"; -"fithesis-0.3.51"="gcxrl7vq8zfs19kj35j2dlchmfy8gr80"; -"fithesis.doc-0.3.51"="nil8x9yx68ji17b1xw9lc8ig8m8dsvga"; -"fithesis.source-0.3.51"="q6mx4dlif4sp21xzsy9clyl8ci7pryp2"; -"fixcmex-1.1"="p0y657r350dcr3nnwq3i0ypw3vxb4ja8"; -"fixcmex.doc-1.1"="hi9qnwgbssbkxl45ni29zlkjysn0qmnj"; -"fixcmex.source-1.1"="7b3yc3sn3pqgfzkamp4rkgfman5wy28l"; -"fixfoot-0.3a"="ci2h09kyh2k0w0d8mbmcw57i4cqirz2i"; -"fixfoot.doc-0.3a"="5510blbn341f70ic646ad9jay6sfiilq"; -"fixme-4.5"="7qdkrgbk2nnkdyzdl467mi8wwzhlrwn1"; -"fixme.doc-4.5"="knh1kg97mfy8clms5mwa168d6zw79glk"; -"fixme.source-4.5"="id4lxnr799xmdvfp7796v5gm3118ijmx"; -"fixmetodonotes-0.2.2"="8bzda1486sb6l1miw9fwc4gag8l86pld"; -"fixmetodonotes.doc-0.2.2"="kwvshr4l5r8zgjia62ac04bpc7cy5n8w"; -"fixmetodonotes.source-0.2.2"="c3v82mnqbxnz0b2yy1g5l9yfxh1y41vd"; -"fjodor-53207"="c6ya1a7zfddfil9y5f30af7d0jm8ikij"; -"fjodor.doc-53207"="2d9qhg8icr3q3ljp18wpy0wphq2rhdsi"; -"flabels-1.0"="pphsynfbbj4vxl9g3rklfj0igp6pzliy"; -"flabels.doc-1.0"="hpsnqln41r0ybmv2vjycd0zrxi6mwrcx"; -"flabels.source-1.0"="2x4jjggfjxvqby3yv13k0y1cgcrd0jcq"; -"flacards-0.1.1b"="mysbkp5ascapm70fcnb08ldmskay3c7g"; -"flacards.doc-0.1.1b"="ipa0bk1dr9hlhj5sbfkm1fgyddzrchd5"; -"flagderiv-0.10"="xcwh87j3789v5pbs65xw4kld1k6mwk3a"; -"flagderiv.doc-0.10"="g9zz7g3kqa2jfcwnj1c61fvzfxxkf9lz"; -"flagderiv.source-0.10"="2r4c1f141xqnfav3klxfdh3i5xx4mc2p"; -"flashcards-1.0.1"="wlkf4s8qqhbql2b7jv0h2g6mming75b5"; -"flashcards.doc-1.0.1"="c6j54a7zjc24m6wv71rq43xjxklwgj0g"; -"flashcards.source-1.0.1"="0nwdgq4r431r55k8aa7k46fkxz3c4c0n"; -"flashmovie-0.4"="jb3lv2gg2w8krqzqypkipq4rsygddkv3"; -"flashmovie.doc-0.4"="n1iz704bdaxj2k26m4125h6aqna0g25i"; -"flipbook-0.2"="6mlbadxnf64k383jr2b2phh2ybkk1m81"; -"flipbook.doc-0.2"="j9a1rvi85n2hmhr7233zzz9a5qylb6pl"; -"flippdf-2.0b"="pff26pmbw5sgmgdm20schik2fvx2qch6"; -"flippdf.doc-2.0b"="kpkjnx6iwwjdg62s7nn0sz1kn6ph23ma"; -"flippdf.source-2.0b"="50zpnpjcak8bcaq09q49d5wai1pwrsng"; -"floatflt-1.31"="ppv98lki1x3s6xklksd69n5cr8vrd6pd"; -"floatflt.doc-1.31"="7n9r2sl31qx9jnw802mhykidjldhx4hl"; -"floatflt.source-1.31"="byz5ymxby208lx8am35lz229dibcn4ic"; -"floatrow-0.3b"="mk0srwmdcdm8g9i0ncmndkxavsknm2jr"; -"floatrow.doc-0.3b"="xw3x5mm1vlq877jdm537h2cc69q403c8"; -"floatrow.source-0.3b"="qqa4j2hidyh6bb8y5y9hz4mmb4j1i732"; -"flowfram-1.17"="lr7jldig88wv8gsvp8aphxsvc6sv4cax"; -"flowfram.doc-1.17"="3f550irxijq1vdvyxs6fyhpj5w1lw4jq"; -"flowfram.source-1.17"="66z844imyrl7bsi22vrff1f05dqlmr8p"; -"fmp-15878"="3m6zqb7jl5rn5zgy0dbys5r8y1sp20x5"; -"fmp.doc-15878"="3hvfiw6yizjkxnx5h7xlzfig11diglpm"; -"fmp.source-15878"="44cqcijnqc5235rjqsmkj4vhmrs9j7hq"; -"fmtcount-3.07"="zhm87ydajmphfm6hp2acvf0dbknldyvr"; -"fmtcount.doc-3.07"="9md72p30182mf6yp6x8c1jjrar73j9cg"; -"fmtcount.source-3.07"="hwq1ghmccx21k6f3sv5vyv8ikv6bxl4a"; -"fn2end-1.1"="qw34b3ki30fqs4dj4fkj6f46aygw0ylw"; -"fn2end.doc-1.1"="anwhkba91c48wl5p1ch35iplw974sdiq"; -"fnbreak-1.30"="aiwqr078mw2127lbphc0lhmh90m5ddgg"; -"fnbreak.doc-1.30"="5v0ijwzjxmll7ayaihqhgk1dnk2rzp76"; -"fnbreak.source-1.30"="jwyh3gnmafpdr53xg4jy4hz6x8y7vhm2"; -"fncychap-1.34"="pg593a0zc9ycpg6cc3d7bjz92r7grwix"; -"fncychap.doc-1.34"="rncjjlyrjy916hn3ka9yaydjq6pdvn09"; -"fncylab-1.1"="lnd1s9pijjp9fnhp88fhlbz99d3lvp1m"; -"fncylab.doc-1.1"="psv8fimys5h1ps5cvhnjmwfmcwnsim5m"; -"fnpara-25607"="bwgyxjk2k7p76mw5ahsf2b0nm464rvi6"; -"fnpara.doc-25607"="h92c0g634x7n1qcdv6vqp5pnw9ykba0y"; -"fnpct-1.0"="lhjh889ybv4z8azwljdpz76zvbsxvncn"; -"fnpct.doc-1.0"="98d65w8nik3655gva5jjl5gxwansywkj"; -"fnumprint-1.1a"="vhhc4n3xvlkb2a31kjpkxbwrwc30r62y"; -"fnumprint.doc-1.1a"="gyllsixn381a8p0rpr90n31h3qb0ganp"; -"fnumprint.source-1.1a"="kp99n8b3y30ilnih7bk867bf3d93xf3m"; -"foilhtml-1.2"="78dmna552hnh9i11v9zgg6l68hmla7bc"; -"foilhtml.doc-1.2"="a2bsh99xh1lfpssggzxhiz9ipwz6bijd"; -"foilhtml.source-1.2"="lrjc6lj49c8knfh4bh9jx7vzpddxsh71"; -"fontsetup-1.009"="kjapn7b0jqg0965pyqwf1r4k4br3srgv"; -"fontsetup.doc-1.009"="n6fac1daq1mvrbgifja9l0q9pdxbc6w1"; -"fontsize-0.8.1"="10na0w0zc5lmlygflpzzl2c8rzakgrl8"; -"fontsize.doc-0.8.1"="g4p6dp4jj0scs48v3ag8n9kqy09y2ypq"; -"fontsize.source-0.8.1"="2y7d9wypdgkk8xjhx5ivyrsccpha35il"; -"fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d"; -"fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan"; -"fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y"; -"footmisc-5.5b"="ha2palj23dq2c3j4fb1j5s6cjjzisilv"; -"footmisc.doc-5.5b"="22bx6glng885275x22z99lwwhwd3g5xq"; -"footmisc.source-5.5b"="ii8ra20y2k8fzklf2cld2z6hjv8i1fha"; -"footmisx-20161201"="5pcwf6k39ybd84nnhzpc4py1sn3bsch4"; -"footmisx.doc-20161201"="0qniys4b74hs2d420k0xafys1578l2wj"; -"footmisx.source-20161201"="m3510nfdmbc96v66r54ikzkfcfffrxfg"; -"footnotebackref-1.0"="8c8gdjzn36nfxjmpn521548334gbn86h"; -"footnotebackref.doc-1.0"="fzjm17j06la934js2q0sn92l5d8g5z1i"; -"footnoterange-1.0c"="488i0ahfgp8myja7i0z7cxn61wlqdb52"; -"footnoterange.doc-1.0c"="lvi0razyvdr1cll474cb4mkdyk62nz91"; -"footnoterange.source-1.0c"="6z89fiq5iffpdapn50jqagmcrgl10jby"; -"footnpag-15878"="ym18m0gmmk7800dd1c4vrar53q66hm7g"; -"footnpag.doc-15878"="8kar3xxxjlrsjascd28122y5rckyv5lf"; -"footnpag.source-15878"="51nmvyy96mjbr46ar058jb7jhpsqz17q"; -"forarray-1.01"="682slfwbrz58fhqj0c07lv1xwab861ks"; -"forarray.doc-1.01"="i7v5q2pjc3sjmcv3mcpdi3sffm4qs4kb"; -"forarray.source-1.01"="q23rvw19x2rk8nv6yhgg76jxfs30qfys"; -"foreign-2.7"="lm3i89k3l6yjajvihjc98kcix3fsa3bb"; -"foreign.doc-2.7"="lbi21kkbscf91yswn2v3jam11615jhpb"; -"foreign.source-2.7"="imrc9f5zvkqj5acfqbzpdvxgvdcf9q51"; -"forloop-3.0"="28l30q6cdvwand7yyg04xzb49kl21zm8"; -"forloop.doc-3.0"="k6pmk3ligld7hxal5vsq8ccjw6d1k1ax"; -"forloop.source-3.0"="9rq5r8x9wv473bw97hyh21ihqzxd1w18"; -"formlett-2.3"="ccr4iqh9ii22b0xkdl0j2rhp6q6cisd6"; -"formlett.doc-2.3"="cwpzl5rhracg51x0lvqxxkbz4id1plml"; -"forms16be-1.3"="wd1qw6m8b290ilqqsqfxdliihj3rhv4y"; -"forms16be.doc-1.3"="5bq4kd42czdg29a9rjsickrq1p7g1m4v"; -"forms16be.source-1.3"="a73kdkw9dn8pjgdszxjlqcxjgxz4v5bx"; -"formular-1.0a"="1ccyslvhjbzqyqyk4m3zh761kw2v45xk"; -"formular.doc-1.0a"="lap9j51p3dsh02ym644576gnzm3a845i"; -"formular.source-1.0a"="v80wnhg3xsl24a6bbsj4xfn82cv7ajd8"; -"fragments-15878"="jjblkk9dj72nvr2gday7p509pnlpwy16"; -"fragments.doc-15878"="z8rmyhlpsv68qbnr6h3sy08gcy6shiac"; -"frame-1.0"="9bdydjkb9dsdvryibfq2p1q071zhhpxb"; -"frame.doc-1.0"="fnv3ssnby17l7zmbgkc1rf4b5hysw7a1"; -"framed-0.96"="n9an7cs91wwfnkalc4j9ccd0p0dg485w"; -"framed.doc-0.96"="bwmgdv9r6rffibrm0wabw95vqdkiryfh"; -"frankenstein-15878"="ldv1sc8j6nxhd9cd95jf934pyz6s8lxs"; -"frankenstein.doc-15878"="j03cxxv0hw0c1j4afrfprgc2ia6nc5c9"; -"frankenstein.source-15878"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb"; -"frege-1.3"="vczq96wx0icl69c5xqcqmfsy2wdw1ncn"; -"frege.doc-1.3"="h07nnplqxq2fyh6f0wh03jpism89ji0d"; -"froufrou-1.2"="7v7g5xw3q550wyg4ls80fflyl1lcx6q3"; -"froufrou.doc-1.2"="1vmkmq9nbgn6786zj027zlmy9lxx008h"; -"froufrou.source-1.2"="9n2ns02cqqkharia3bj3lk9pdkv5i74a"; -"ftcap-1.4"="7srhgl4z3zpicxv7aakm970xy2yxnpns"; -"ftcap.doc-1.4"="1y7r73w8r779pdchcgwmlvcd2sq8hyfj"; -"ftnxtra-0.1"="8iicyf847h3xf4jvn1y8nzyjk3dw7jng"; -"ftnxtra.doc-0.1"="sna4k84xb01ikgp5aivxlrf8qzbp0gcc"; -"ftnxtra.source-0.1"="60xpxaqbgyzrfxb97zrhdb9rihy2cc6f"; -"fullblck-1.03"="3dzz4aiajr3i1ns3xhh9vl1s5ins4s1h"; -"fullblck.doc-1.03"="xczvd1gvp5s5rvf4n4bxrj7l7c3pxhg9"; -"fullblck.source-1.03"="y7clrinyakc2zm8933j7b6ng7lsl0f7z"; -"fullminipage-0.1.1"="s3rajpd52w578wrvd1rq4dqgp4b1kh36"; -"fullminipage.doc-0.1.1"="ls3zg7gw0lmncmy096f5vzpqi9l9linb"; -"fullminipage.source-0.1.1"="2j6l66kmb8bg04h60001kskyfbbclcnz"; -"fullwidth-0.1"="0m9q9s3ng1gqji2vjs9z14vzri24sap0"; -"fullwidth.doc-0.1"="qyswh8vcacvp9nmhvviq4xm9ariq2aq8"; -"fundus-calligra-1.2"="5jn0qbj8zgi1c0166c2vdwzs1a5i8qm1"; -"fundus-calligra.doc-1.2"="dd87040kysj4av2sq7grslyjv0gx4rmd"; -"fundus-calligra.source-1.2"="s4s97ga289ncgv0rpd90b8i7qh4n7jfj"; -"fundus-cyr-26019"="fjyzn069q34z3ypaj0qwjq3f5zjm7y8k"; -"fundus-sueterlin-1.2"="4xlq7i6k1pqmq8vc6aq8h50gs1f02l3d"; -"fundus-sueterlin.doc-1.2"="i8q42q2rzmby64v4il8jkpk7azfcrrip"; -"fundus-sueterlin.source-1.2"="rl5n5rh9akf41ls7m2gi5l9hqq6wv8j5"; -"fvextra-1.4"="pah47ygjsmqpfiq42448kyz9fahgxs04"; -"fvextra.doc-1.4"="xwl3fw21ywkf6jwchx1axwn5sxr7xwj5"; -"fvextra.source-1.4"="8jnz82fc1n2mm00f32p6sr9gijmz2v5w"; -"fwlw-29803"="887p12xhlcgydw4pddr0npyvp4xr1azf"; -"fwlw.doc-29803"="2di5y3hhm865frn42j1sh87hflxlpc1n"; -"g-brief-4.0.3"="dnx0f0d7qvfrvjczz6zfrkr7dprmgnr3"; -"g-brief.doc-4.0.3"="9z095prb74z0q8b4a7wppdkmmc0c34k5"; -"g-brief.source-4.0.3"="v6210yn1lfk3wkr6y2b2fq9vl0n8cpsz"; -"gatherenum-1.8"="ki18pb9dgca5cpjg723prb0kh2kin6qm"; -"gatherenum.doc-1.8"="w3s6z3566877vg2jshbvcqb8v757v1di"; -"gatherenum.source-1.8"="s37a7faiilrfxyr4iq77j2r3i27l9w98"; -"gauss-32934"="rm0hzy2h1msxkfp2lxm2k881y4iaw773"; -"gauss.doc-32934"="1d71g6781ar41gk3rjjy48bbkdkxx4id"; -"gcard-15878"="vrmrds4xh35bqjq4qaqj8rrvfd7fdykm"; -"gcard.doc-15878"="lxpbgqbbcldhlpwjkj531yh2bm3l2n3v"; -"gcite-1.0.1"="z7ha969s3ry7g9ibv521f2d6vr9lcxx7"; -"gcite.doc-1.0.1"="3bb2z8jbygadc7qzmjz024dqzphncy4f"; -"gcite.source-1.0.1"="v3fbj2j823jh4gy1vrc4f74qsdbfqnpa"; -"gender-1.0"="v985mqnxvb7ymdlzs1j4y3pvbygrkizz"; -"gender.doc-1.0"="d8ickvclnl5647xpq7jz3qh2i9l9hw97"; -"gender.source-1.0"="iiq2vb35q3lqvd49f5gzsz6fa52s0nlj"; -"genmpage-0.3.1"="r91a3wqjc9w7l3dh98j429ja8ymvbb34"; -"genmpage.doc-0.3.1"="midc310i26fannfywf0cl7kp014y9ax4"; -"genmpage.source-0.3.1"="riqs209lh1jip1dypvdhzq05i7n1kh7h"; -"getfiledate-1.2"="jxr6fwmy8lc03cqchndg1dps8vjjfqz8"; -"getfiledate.doc-1.2"="k0r2fr1q7cq0x7lrbk38ik8bqdngsq71"; -"getitems-1.0"="8qdph1kdihdkqyd8rkn4n2i3wd5kfq0g"; -"getitems.doc-1.0"="yhr7vskgqfhij12vrcyl7a9v60nipd32"; -"getitems.source-1.0"="89vcxsad2qxdl0kw2crb0r1ibn4acwpc"; -"gindex-0.2"="128d07f9rns69pxnp02hy0bdv2ylmap1"; -"gindex.doc-0.2"="n1b75gq6nyspvyg0c6ry2287rsj3r9hb"; -"ginpenc-1.0"="gy74qjz23cw3lbmb0nc205qfp1a0ggib"; -"ginpenc.doc-1.0"="9iln48gnlcshrhkk3mbpgqk06sj4bl39"; -"ginpenc.source-1.0"="dkkxzw412c81hrhwnmjw1jgvhz5rrjhk"; -"gitfile-info-0.5"="z9c9f770h40rsxi4cchzka914gzhfv5w"; -"gitfile-info.doc-0.5"="bhbyazh055g7ga0gapv9kywhsrxjynwh"; -"gitfile-info.source-0.5"="ncmilrcdd5bk3563fnh91n149bp83avm"; -"gitinfo-1.0"="a7mcfsqzwi88fsrdbqkwh8p3rd7w51ri"; -"gitinfo.doc-1.0"="5dh5bifav6w87hq29ph7ls65yxjhk7c3"; -"gitinfo2-2.0.7"="dsxgwrlg9j367wxxisxm2wv595xny8x0"; -"gitinfo2.doc-2.0.7"="l2rsxd08m2y44wg53q2adl7d084r14cf"; -"gitlog-0.0.beta"="q64k3v3pwcvg8abw382rijglrgllfvwx"; -"gitlog.doc-0.0.beta"="29ysf5jz8cvwanmhad4ka66jcwxn9a1i"; -"gitver-1.3"="g29l771yh6kcwqmb719ilba7d4d2pk84"; -"gitver.doc-1.3"="yljhjx0nrp3vvh55i3zaswl5mwzdil5s"; -"globalvals-1.1"="cjs44i0mivi683bifs5icf9nk3jr7v8k"; -"globalvals.doc-1.1"="2pdq5ik88cr3z5x9j5jvqz1k6abkllm4"; -"gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs"; -"gloss.doc-1.5.2"="4qial5a0p7ip784xgpqgkl6cmabd9hlq"; -"glossaries-4.46"="98jz6vs432yzrl7p9xxxg82mlvan3kqd"; -"glossaries.doc-4.46"="45hwssk4gbgbk0i21mpx6i9vqphniy2w"; -"glossaries.source-4.46"="xgcfsn8k1daf8db39zgflzg0il0hp132"; -"glossaries-danish-1.0"="hmaay0viwacnrz7bfz6xlpb03cmsphcc"; -"glossaries-danish.doc-1.0"="mxgh9b6vc63llhmfildmhkhjxd1s9kbq"; -"glossaries-danish.source-1.0"="s5ayfh10z40cpi9amn2d1wwpnby0qgaw"; -"glossaries-dutch-1.1"="diqdj2nm0yzvdkkxv243pgrwhk4nxayx"; -"glossaries-dutch.doc-1.1"="irbpwmyxxm13fas8fg1kdn5x6assgf75"; -"glossaries-dutch.source-1.1"="hlj6vbl82r5h0ngvr5b7h33k1q54b29f"; -"glossaries-english-1.0"="ydbz6ls58gnxf3wmay4157516ggzsc1f"; -"glossaries-english.doc-1.0"="53w4fzz52hh9jyik6384limy6633l8aa"; -"glossaries-english.source-1.0"="dpc58cbb3snzsjxkz0c82yksx6c60h6h"; -"glossaries-estonian-1.0"="3flqr7abc4hqy63p0bdl0bz0y04mq07s"; -"glossaries-estonian.doc-1.0"="dd2rrp43ix2hcwnrgcidfr8z0shsgdds"; -"glossaries-estonian.source-1.0"="8y8x5qqydmnvjf8nbbj8qj550kbvddg5"; -"glossaries-extra-1.45"="mn40bwpsg1bl26jdlgl3v5cbp3240s8f"; -"glossaries-extra.doc-1.45"="ic32lsr85iyw5yxpsgwdg019yjv0b8ay"; -"glossaries-extra.source-1.45"="dqa4kk128s7z6vfv71zf1910lp33fhbv"; -"glossaries-finnish-1.0"="rq7ymhc4ispv4j1zpv5iy6mbn66wr3j4"; -"glossaries-finnish.doc-1.0"="f8rj41dbpqrdxbl7h94rxnbiqm77xcj4"; -"glossaries-finnish.source-1.0"="gnj8dlxpzapvi9yvzy04rhmrs5z7hmid"; -"glossaries-french-1.1"="zkndbp5cq242l196fc6s35yib6ay4mnf"; -"glossaries-french.doc-1.1"="0bj95z10psabgwi3gg65jbmjfjr5jn36"; -"glossaries-french.source-1.1"="87wiw0b01wpqikz8r7wfrkmq8lylviq6"; -"glossaries-german-1.0"="dhfan1gzz50rlg7q2y9x5lg1dgl2cacr"; -"glossaries-german.doc-1.0"="8kajajbjllgcz3h1q6nhs0jh25pv9xdm"; -"glossaries-german.source-1.0"="254c5j11d1xigfcfn5s89bv2i6si8cfr"; -"glossaries-irish-1.0"="ahbzvng9phrhcfiwiam6n2rf76p9i7kl"; -"glossaries-irish.doc-1.0"="4ffcaqrn4a7w66wghvl5vghyn2v5gvzd"; -"glossaries-irish.source-1.0"="qfl7ngfb7cjiif21q38d1r9lwj9nddjw"; -"glossaries-italian-1.0"="sss93i9s603bsmx18w06lpvgk9ldclcz"; -"glossaries-italian.doc-1.0"="8k3ys38zjig011j7xgnhxk7yr2vabrs0"; -"glossaries-italian.source-1.0"="bhz5xknfcddwc6wan5d01hq33v4ilh8r"; -"glossaries-magyar-1.0"="fqbsz09snqw5j0zlail5bh3a13nmnhy1"; -"glossaries-magyar.doc-1.0"="zd4idxawfa6rm2j353dhyak90bq2jd5y"; -"glossaries-magyar.source-1.0"="s8xxg7bh6zgxq6rvzp5lv6sp6h8ywvr3"; -"glossaries-nynorsk-1.0"="vln36xzdfqnj5dpz4x9kqqfmgspajk7k"; -"glossaries-nynorsk.doc-1.0"="7qnj0sk8vbgi8sj3kkal7m39ibfs5fsf"; -"glossaries-nynorsk.source-1.0"="p5ybin8hdvpvd4mx7xpnd622m7c7y8aa"; -"glossaries-polish-1.0"="7alkf3zirdbg0mgv66grfaa6szhjy806"; -"glossaries-polish.doc-1.0"="hhzkv01s7m4f1cyib722liyaqchxs31r"; -"glossaries-polish.source-1.0"="6pkd4wg9srcd5m92mlaa1vniyh67ahvr"; -"glossaries-portuges-1.1"="z5qc3w9n0fv2x5afsv5k7nl2652byx0v"; -"glossaries-portuges.doc-1.1"="ywr0afkdqfmk6r867pghf07wpwc8sq92"; -"glossaries-portuges.source-1.1"="zzd6nlfq11zc152af3p62bshnh0j8rwh"; -"glossaries-serbian-1.0"="b4p3iy3d6ziqh38r27b0lcqm9clcf8gb"; -"glossaries-serbian.doc-1.0"="h36h8811dfndykwh6q24haghsgy4jl2s"; -"glossaries-serbian.source-1.0"="wf3wbvbaim0w86695crqc0l1dv006ydc"; -"glossaries-slovene-1.0"="4xxwy7xrk64b3s8maw57m7p7zkn9knqc"; -"glossaries-slovene.doc-1.0"="9sjkj3ksgfpkjd7bg4dkp3bq6bmsghap"; -"glossaries-slovene.source-1.0"="03gi4x6kh5rypqq4ssi24qizzr5q37mc"; -"glossaries-spanish-1.0"="aygzxhw0cr8prirvcbsrc1xr11ac6fpz"; -"glossaries-spanish.doc-1.0"="da0ysgd3c6k336sc52pg4w76bj8lamgm"; -"glossaries-spanish.source-1.0"="cij28c7mhivbkwa5lwg7pvmr8h4ymrcd"; -"gmdoc-0.993"="7acw3iajf16bq7vmddr2j7z5apizxj3x"; -"gmdoc.doc-0.993"="zn90pbf45d4fz5d4k8q545fp3jshn0cf"; -"gmdoc-enhance-0.2"="0gc7975jin3dszblbn2zgzm22blk5y3z"; -"gmdoc-enhance.doc-0.2"="gyv8r700rhfigpl57xsj5dmzwb1in6rm"; -"gmdoc-enhance.source-0.2"="vkbi6ys95j5v7nyv3il8mrxins0z743x"; -"gmiflink-0.97"="rxnvc039bqhcq7qna523c2s1hyp7khya"; -"gmiflink.doc-0.97"="59n276lia63cb5n3aicqvwv0njcml1fi"; -"gmutils-0.996"="56895j8b4i9nghfc5w2b2ysgk838dp9j"; -"gmutils.doc-0.996"="2w4257wz5vjp1lwzf3gzhbyyaki5d4x7"; -"gmverb-0.98"="z9il1jbnblh5vqzjz13xkfjsva6xqa1v"; -"gmverb.doc-0.98"="bh1ckqnp1vkqj9qb3fwfk1xszfphvma6"; -"grabbox-1.4"="hxv37a6c6abr0l7p5jca1xq85l8z5a4z"; -"grabbox.doc-1.4"="dx7fw5a3k0fjhfalpzp8nlv1s6m981aq"; -"grabbox.source-1.4"="agll92a3wn1mhbzaym750wpji2wxsb8j"; -"graphbox-1.1"="x0ckk1yx2f9ks1g70g32f4a683rpf4nx"; -"graphbox.doc-1.1"="b4m3rss283l9gfk0vc0apg05biifhpfj"; -"graphbox.source-1.1"="p7vnvaxz5a2grh651f3gld07pj7lcxp9"; -"graphicx-psmin-1.2"="j5n5gycsp7vqnqgqsx5p47hg27yj16s6"; -"graphicx-psmin.doc-1.2"="my9qg42ilqhfzwcirmsmf8mjj1ck0j8h"; -"graphicx-psmin.source-1.2"="hxdpbsrnh9zd9aqg3l6vxbqy4iz8nw3y"; -"graphicxbox-1.0"="6grrmcmr2wlpx8dbj1k1nggs2b6z7qh4"; -"graphicxbox.doc-1.0"="2blrwzsralqjrvlx6xjvyaqvsi764nmx"; -"graphicxbox.source-1.0"="1vl41sp02d8byjrapj58v5pg6i2g989l"; -"graphpaper-1.0"="rgmcqd72bykipk8py9rpwffxjag3ci9b"; -"graphpaper.doc-1.0"="ca0qq1zsjfnx1c9ma42lw4iik0j19yqg"; -"graphpaper.source-1.0"="7w9rbx215ssxjv6291qazx61p9csz735"; -"grayhints-49052"="g0g3914m4qsplnykwnbfy3ik6svxbifq"; -"grayhints.doc-49052"="gayl01rd21rc9i5x6xnd376wm907qlz5"; -"grayhints.source-49052"="jimxcmdqgjndw6dqmwzb0ry84lwr59cy"; -"grfpaste-0.2"="wi95wbrs7k37di2dkqnix5h21p84cb1c"; -"grfpaste.doc-0.2"="7hn9vs80ksnpaa0aqdmbv7qzhrdxwr88"; -"grid-1.0"="hf1jfkwc5j27mhxi2skf3wjwq2y1ca0w"; -"grid.doc-1.0"="39h5w3sw4yi3jb35018rd2r847zzf4yr"; -"grid.source-1.0"="pr4xl73p825jibzhj2h8i4f6f0lbrv2y"; -"grid-system-0.3.0"="a2b7690j7d03zk4d4yzdr2nwjm6bm7sw"; -"grid-system.doc-0.3.0"="qddlxnpnyjjjv1z1irzch3ypv2amlb9y"; -"gridpapers-1.0.2"="is89sm33vbklzjah2xq2mkadg4qsc8c3"; -"gridpapers.doc-1.0.2"="kfwzdl5y0gw3kanrkf3zram97xhlscgv"; -"gridpapers.source-1.0.2"="vi0r4mq2j9ria8s3gfppajqfys74cssy"; -"gridset-0.3"="9rs8ssnws7hv6ppyizsqgxip36yj3yp9"; -"gridset.doc-0.3"="l8z8l00qhabaxbrq979yrrkkvy5dxnwv"; -"gridset.source-0.3"="8rwfg7mylrv2cq277769k5h4al2mqz8l"; -"gridslides-0.1.1"="r9lxxzf51dpfaprn6kvv3n1j9hf54xa8"; -"gridslides.doc-0.1.1"="jkri2k8k8nzvchpk11pgig98kw327c3m"; -"guitlogo-1.0.0-alpha.4"="ymqlz298jrwsfq7l1j4ayisg0gcjd3ki"; -"guitlogo.doc-1.0.0-alpha.4"="mpzyviawaizp5aspkwr6kpnnjpl4qxxc"; -"guitlogo.source-1.0.0-alpha.4"="jb56079xdr5qnzpcasv9knhgpd5javab"; -"hackthefootline-46494"="kih3c9nczylrh74x0vc4m7g4bzahps5v"; -"hackthefootline.doc-46494"="vp6qn8s2g5d34v44anyr2jd5c0l5b4nb"; -"halloweenmath-0.11"="mz0f21y810b3vfcpm6z8fwcjbqwdapha"; -"halloweenmath.doc-0.11"="124kqyc9ls79pm11w1cjp1705p84l4pn"; -"halloweenmath.source-0.11"="j0ld7v0za7pvrl5qwarilnjwa8lw9r2b"; -"handin-0.1.1"="gdn6by4gg87043wdz597h9mxr9rzj4jn"; -"handin.doc-0.1.1"="xybg0ai1im3595s07039sklcjbqjdfnz"; -"handout-1.6.0"="jz5qp5n1dij11nyrgmb3x4rl41mnggyl"; -"handout.doc-1.6.0"="xsc8qd00v663bgbpfp4kwjd1ndc47q8y"; -"hang-2.1"="ncymr7c9lsbbxm6z2q3210k185bkkxq0"; -"hang.doc-2.1"="rqlq0rkbqj3vcfpm93m46w40b7llalvg"; -"hanging-1.2b"="48vqvdis9l05842lr3wp64x14qacr9ag"; -"hanging.doc-1.2b"="sicdi70h8j7nnw4p7bj4j3wj2bxzrwhx"; -"hanging.source-1.2b"="hhzby1cywgn7vdcn0b50lhpq0lkxpf53"; -"hardwrap-0.2"="sgzpnlk5kmxxmz5ilipmnns9bi4cd8m3"; -"hardwrap.doc-0.2"="zxy2s0j0lwl7mrl7xpcfw78j77zfz179"; -"hardwrap.source-0.2"="522jg055dil0qq23wd6z8rsf4dxcjzyp"; -"harnon-cv-1.0"="53gnsi8hs4wf9xzdmn3p3n1rfl0xy7z2"; -"harnon-cv.doc-1.0"="a7012x0ckxnym7cpbj8m12ak993bz7nc"; -"harpoon-1.0"="88cndn21h4fshiq6yvd8p68gwl2d2nd9"; -"harpoon.doc-1.0"="z21q49fw0a7wwwr6chwdd73ypkwqz1x3"; -"hc-15878"="vibhz5h2dnzdkwrxgadrwy8crfaa505s"; -"hc.doc-15878"="mhva92gfr4jn40d4sdnh0331iy19a4vi"; -"hc.source-15878"="dfmq6gax4mfq8z074sm76b6k7385d2nc"; -"he-she-1.3"="6rnp8qmascvlz9p0hgacblpx8svapf65"; -"he-she.doc-1.3"="xl7nf17g73pn4jc3z6nc6fknr11lsf3l"; -"hhtensor-0.61"="vnl54f4l78n4x9pllg95fr5dm79qs0jg"; -"hhtensor.doc-0.61"="nlrhij6qgl3y0zq2ija0m1gj4xxhyr06"; -"hhtensor.source-0.61"="kpmhfisxrh5n1j7l5qns4m51fr8vs6as"; -"highlightlatex-58392"="3kj48yh32h6pgpspj7087ir9rasqp8p3"; -"highlightlatex.doc-58392"="hjr1021fck2cjr1y9p32c9i0rcvvbgaz"; -"histogr-1.01"="lykdh22sggl9qgnr3shki4dpp6716iss"; -"histogr.doc-1.01"="dnc1n1fpnhyyah7gkkbzphbxkv7rbwcv"; -"histogr.source-1.01"="k1n6vsnwpayx81ygapkccaw8g3n2yb7c"; -"hitec-0.0beta"="c6fqbzcgn7hlaxpwfcz08c11j6a8i32r"; -"hitec.doc-0.0beta"="c635j2194izgji0aqily4ha7slkzghkl"; -"hitreport-1.0.0"="c9d7pgwx7nwd537hwhlqkz3q6rkgadc7"; -"hitreport.doc-1.0.0"="myrg5zm7szyg85kk79wq6czmxvz7ndgw"; -"hitreport.source-1.0.0"="2hlcm4g98zv46ycxc5a4b2iws28zs9az"; -"hletter-4.2"="mq30k7g1v6cwmcfyizfzy3hmbxa74p5g"; -"hletter.doc-4.2"="rz2hrha5xf10050hfnm05r6f4b3mx53z"; -"hobsub-52810"="cx2wdj7vb13012mibaxf3f9q8vxws8n5"; -"hobsub.doc-52810"="2fc3l968q2awmd9974h07c98f9r5hkdk"; -"hpsdiss-1.0"="9hca9lq9r7zs3frqj6lk6hybkpgcdfmb"; -"hpsdiss.doc-1.0"="2mxarcx6cm2v2bsab8gr7ks1mj5danvl"; -"hpsdiss.source-1.0"="k3k828ddx8vv2sr8lw644ny3z5kcl59h"; -"hrefhide-1.0f"="1pr0sfiwb8hdby12fsj59gqi6s05j0sm"; -"hrefhide.doc-1.0f"="ldsnb62r12628qsnwssndmf39b39zf5d"; -"hrefhide.source-1.0f"="42s1cx0nwj58cfhb2d22nsdqzidknwpv"; -"hvindex-0.04"="90sdf5j0a5qr2xp8qzryrvhnsvaz4fs7"; -"hvindex.doc-0.04"="9r6a8mfj7y9kyc2dbc79vf86aw73n6l0"; -"hvqrurl-0.01a"="sjv5nl58p4f2dmcgrfdlka2z64ddljwd"; -"hvqrurl.doc-0.01a"="1hyqmdrglg2m72285vpszfx2v5mg4zby"; -"hypdestopt-2.7"="mpz4vxvr7ba0p2jlq5ginc5srzcv04mv"; -"hypdestopt.doc-2.7"="5r7xhnkas3fmc22843bpbk640l1rd95h"; -"hypdvips-3.03"="vpmmrcrilqybs4ifvd927jlkn5ip28c2"; -"hypdvips.doc-3.03"="flvlp7a268z3pzwh0jpl185k3yifzap0"; -"hyper-4.2d"="xpwylfxrx74x9aw96ridad40im7xanw1"; -"hyper.doc-4.2d"="fcllxx04lprzhbna8rk4ycwbw0w6xnq1"; -"hyper.source-4.2d"="v03bmxbg7hqjpl8vfp0l8z81mi2db2hz"; -"hyperbar-0.1"="7mydsb4p7mdy3dd16fdgh7ln5dlia00h"; -"hyperbar.doc-0.1"="5cd4zznxxi8arkdzzkh17yfm1ghmpybf"; -"hyperbar.source-0.1"="iydbmx9cvsd986n970lvc3k6m28ix2rk"; -"hypernat-1.0b"="25v0a423yhy68vf125ys0n6p0qhvr088"; -"hypernat.doc-1.0b"="0n4qzpmvhks66d0g9gnyizpl44jbh4pf"; -"hyperxmp-5.9"="9h79wa3bsc5p7ch7a42idsjdmskyzqgy"; -"hyperxmp.doc-5.9"="7hmrn0hhsi4s5p216hvrgdm3v7imc9j8"; -"hyperxmp.source-5.9"="20fwjc1fhgrfq70ihcqg2sms40jq5046"; -"hyphenat-2.3c"="wr2lhsafb13b0zira7190bx5s68fak45"; -"hyphenat.doc-2.3c"="z1sj3r1ny1lgixr2fcmsglz55b23f5lm"; -"hyphenat.source-2.3c"="x70g8xiz9ss4pw775lz82yncq0x7lxf1"; -"identkey-0.1.0"="bk05b433id0rfqw1yzcqrc156snzd6lg"; -"identkey.doc-0.1.0"="dfw1x4sgvqa7rc3h3jxyz2c08vn2mxqd"; -"idxcmds-0.2c"="gh879f4j62vmymyiag89if5k6slra032"; -"idxcmds.doc-0.2c"="040nd6hmrhvhw3nkwikr2s1b2wzw9a8x"; -"idxlayout-0.4d"="klk75b8291j9b1j1irbn1xai2m9712vv"; -"idxlayout.doc-0.4d"="a8i9vf4rlscys8ig0gls0kllahrf7f9m"; -"idxlayout.source-0.4d"="nn6h2msgyj85inpa4gz3qx4da741hi7y"; -"iffont-1.0.0"="xr9jmyz2563jc2nwrr9ykh040dxjad2l"; -"iffont.doc-1.0.0"="4jm8bvp06wm88695jhggd5rhjfv7qk0q"; -"iffont.source-1.0.0"="rrjx3hqrjff5bc8hk99ddxxpbhqqfy3b"; -"ifmslide-0.47"="i0psadvk32l38kx0i47avl03cg76bx8z"; -"ifmslide.doc-0.47"="d44i3i8nx1if9h04xjv0mb781ybyryc8"; -"ifnextok-0.3"="1nss6fp77hcggpr87drfbmggs6fg0riq"; -"ifnextok.doc-0.3"="mwvvllpwbmdhqiwp684hkdk5aw24pgyd"; -"ifnextok.source-0.3"="kcv0c25ga9bls8bpf3qccb8fsarwics3"; -"ifoddpage-1.1"="6f52apknfsjpswzikk3nfi9by5iip7gy"; -"ifoddpage.doc-1.1"="7l75021f0gk7nrpiq2axr88pbnzjq50g"; -"ifoddpage.source-1.1"="njqd27ax6313q2w063xbmw3mnfiajx98"; -"ifthenx-0.1a"="2ah86wn9m3zc1f7hf1yzwyv26xbay35s"; -"ifthenx.doc-0.1a"="2zrlnl6s8fbs3ndyfi21bdqsfx7n6fc6"; -"iitem-1.0"="k0gdz2py6spiqrj4djhwbys9vkar3p88"; -"iitem.doc-1.0"="19wnj2spnjlvhb09y4i52wzix4wwyz6m"; -"iitem.source-1.0"="8xp0919wakx5r9xd21mbm4qwvd0l66fv"; -"image-gallery-1.0j"="3skl1kln38c9g31pa8sbx370kw4jp23r"; -"image-gallery.doc-1.0j"="gq0ngnivnwh35m29qimn54l0gigv79fx"; -"imakeidx-1.3e"="vgspaw7w4kjbm38vzdga08j12aaqf3ad"; -"imakeidx.doc-1.3e"="p39pl4z0xkr2029czqq9nkaxz3dwdypx"; -"imakeidx.source-1.3e"="cn51y6d129cc0kzw3yx3ybziwmxy9mbs"; -"import-6.2"="y8dqd8lzb9my7qqrcilkd4aqc378y3wj"; -"import.doc-6.2"="8ckdw8i3p8g8svz47czhxzxhcdygxpcf"; -"incgraph-1.12"="n14gyn5g1am9dyfqvxyxrqsfxdkg39xv"; -"incgraph.doc-1.12"="sp235w68gh5k1d4xg2cxv7dadyjwqyiv"; -"indextools-1.5.1"="sb2fdlrh7xlfhd61g9n3h3s9if9n6wm0"; -"indextools.doc-1.5.1"="1cfxahy568ikv2iwp5kk1dh9ffsi32r2"; -"indextools.source-1.5.1"="dj4fjqppc6d1qnz11p20dgbs258gj25c"; -"inline-images-1.0"="7g2ci2kiwk28qcj7qmphxs93fpmk9jyp"; -"inline-images.doc-1.0"="043q0hshgzprif0a5pvlmxnmidk8zp9g"; -"inputenx-1.12"="8whv0r3zbj4ay09z2xr2dvcam8lm64x1"; -"inputenx.doc-1.12"="3pmxvaqzq3hgl7fr8m5g04lsjnrzkl47"; -"inputenx.source-1.12"="r7k27qlwzr1mnbirkgih5x4rcbyyi4fd"; -"inputtrc-0.3"="vmk80jzg9sllpw28csmhsyjd13amp567"; -"inputtrc.doc-0.3"="dl0qs37bjj4aam7ijfdg64fpl135k7b4"; -"inputtrc.source-0.3"="1nx2jv4m63gc83iy3qp46gxr3v6wyw6h"; -"interactiveworkbook-15878"="4a6mi66i2z1sjzxjddvwajpvxl6i2c6m"; -"interactiveworkbook.doc-15878"="ldph57php6irhdbj9w497xk31n5ggxbz"; -"interfaces-3.1"="pja00rv19b492fv0d1afkj1cmmi09wm4"; -"interfaces.doc-3.1"="bj6l95whavxkrsa5rb8791d2ib4n5gal"; -"interfaces.source-3.1"="f7gxq1s477zab7wh212nyad94kcdacqn"; -"intopdf-0.4.0"="dg4nkx5hkv127pm20mb71kaqbn75vpwl"; -"intopdf.doc-0.4.0"="1pwkd0jpncayabw6y2zfcvq9mgb5l0r8"; -"intopdf.source-0.4.0"="3jnk8z67gqy7phipanga31y5fim380qf"; -"inversepath-0.2"="8csfwygw95dd5wrawwj7hs4gmpxhdwd8"; -"inversepath.doc-0.2"="b3z6dkfmk19n96dklslzszn7vfrnlcn4"; -"inversepath.source-0.2"="zpg2i1sqr76xvi6jn5vrgxvs44dlfx9z"; -"invoice-48359"="bjzw59mdvxqc2fyc5mpqg964a041zi2m"; -"invoice.doc-48359"="4g5fd3ry648n0i7nbkrl4c8ln7rdbpp0"; -"invoice-class-1.0"="0hyhlrisqlng2zcs0l62d84r9i4g1hv1"; -"invoice-class.doc-1.0"="psxy04bnhh1y2v63pz89j5p4bl6b1q0c"; -"invoice2-46364"="x6kdjp7i7rgy4qqs8q0f7hv8bdnbs3h7"; -"invoice2.doc-46364"="cjarambfqlfz664z498dpi142ik5l12l"; -"invoice2.source-46364"="km7fcfxzdd9y5lvwyg4m729asqm04pcp"; -"iso-2.4"="p6yl8v4jyvzq5fh3qw31kgalhrv1qv22"; -"iso.doc-2.4"="xs5sw6aw59hr3xlk187dhwkg223vycsl"; -"iso.source-2.4"="vrgvl97kvsb6n82w4acm2wfjsqq00cxr"; -"iso10303-1.5"="0y5mrx8f05gl2brzky6gdgf0rzamfsxg"; -"iso10303.doc-1.5"="l6x3gviwqf8jkp2lwdy10ycp3577fk5f"; -"iso10303.source-1.5"="1ljgzik0791d8qdix5nd2151ahm67w1n"; -"isodate-2.28"="chng6rcfh1gy25mwsg30ynxkb87lxv0i"; -"isodate.doc-2.28"="mh1wrizl78fgn2xzqd5brm9hwb8zldhl"; -"isodate.source-2.28"="81a6l211jzdxbf84x0haybl0w0pifjag"; -"isodoc-1.12"="rah5kajws18hhdf5ym1d862f3vsrglv1"; -"isodoc.doc-1.12"="cvfdjwayraqs9v5hhprrqylc4qspyq9b"; -"isodoc.source-1.12"="pycpzpz115nw5a2majf566prrfjxpfkj"; -"isonums-1.0"="50diljpihfk6390ak54ml6gxg6h3qarr"; -"isonums.doc-1.0"="qbnvabarywnwbfaxqjr1afkic152hhsf"; -"isopt-0.01"="0gyj9ri30pid0xymfv457g9r0nycy6qm"; -"isopt.doc-0.01"="q8srwcqk4w0mblrqzpy70wbqqrds2k9c"; -"isorot-15878"="pzs5xd3c9n1m3r4m5g82702s0slq0kl8"; -"isorot.doc-15878"="760dh5j78kcgn2zxp6jhghmzxhyplavx"; -"isorot.source-15878"="35mi9l5bcbqmrixngyvb7g780ns0vjg5"; -"isotope-0.3"="paqbsfz0w4sl82imkw2zqsdwg3nlzd9c"; -"isotope.doc-0.3"="f5mylfd5fga3jy0fsdvw1z5kya7kcg6b"; -"isotope.source-0.3"="sc8npgj5397qvqwvfrz2bq51xj5840l4"; -"issuulinks-1.1"="lw4b111230hkhdif9xfvdrryks1cp8k0"; -"issuulinks.doc-1.1"="lcm1rfc9mcx3k7cn1ia3ldfwbv5r36kl"; -"issuulinks.source-1.1"="hmn5nsszd3vf27863sbk647fgfh5gxmd"; -"iwhdp-0.50"="j4m15vz6ky21yk2m95kjz1is1z91vxxy"; -"iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l"; -"jlabels-24858"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d"; -"jlabels.doc-24858"="fndgg419y1rp47d5qifv0k304b5iymab"; -"jslectureplanner-1.12"="1g82c7aw484p3iqy1c9yw8d39g26q04r"; -"jslectureplanner.doc-1.12"="lx9m14da0gm8nlp6p6cx84ib5fxqi040"; -"jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr"; -"jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil"; -"jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl"; -"jvlisting.doc-0.7"="gfsf50mnhfqjcqb8bmkfig0n86cmhngz"; -"jvlisting.source-0.7"="dj1g56jiw22kabhhvcdrrjipjnf17k4v"; -"kalendarium-1.0"="bspimin9i6nh58ywvqnyv6r72clzfkk1"; -"kalendarium.doc-1.0"="01figqd8r369s9mg4xbvc3kxl5xj3573"; -"kalendarium.source-1.0"="2fmwxzki8sxbf9a11zvb7sc31hmd2bjh"; -"kantlipsum-0.8a"="ss2zmvwx5537qf5vaagp2qgfmykzhwvr"; -"kantlipsum.doc-0.8a"="1xqs1p3ziyxd0snsgkda6kh23lynf28b"; -"kantlipsum.source-0.8a"="92ydj9wclk56jb03704gxqli8yl5i1rn"; -"kerntest-1.32"="r64kkdp6nnkv7qk07lm2p1943q0a92ci"; -"kerntest.doc-1.32"="2py5b3pyrnddfs5cmfp4fgbqd8wc9iag"; -"kerntest.source-1.32"="nfs63gz8wfhdslfiswngxdrdk2rpzijq"; -"keycommand-3.1415"="sq6188m8lc3wl201phjx2qh3vwxf2mrs"; -"keycommand.doc-3.1415"="q9lkdcggi17v7gl8hibk2qn5dm6h07f8"; -"keycommand.source-3.1415"="k1fa9w6r1n1qhz428ipwflj6d6m5ap7k"; -"keyfloat-2.01"="i54c7nljj82qg23f658l0il9xhhihs7r"; -"keyfloat.doc-2.01"="mgn9lp76baj3wl3dzfnpxibgr5ijb8z7"; -"keyfloat.source-2.01"="a5ch4v9hk9brflps5s5c0wxnqwka5rsv"; -"keyindex-1.0"="sirfzfwd3hv4flbwjkwp5ryf04mq916f"; -"keyindex.doc-1.0"="gcpzy4a5ga8k0jzymgrsl3j74q7cv1g5"; -"keyindex.source-1.0"="2ff7jyh03kkm38vsismhfcrawk29iwgk"; -"keyreader-0.5b"="wk5kgrrx4c8682j6a01n57ab33ww2j23"; -"keyreader.doc-0.5b"="fy37315azfr09wzl71wdby8ry1dd40yn"; -"keystroke-1.6"="vi7r9aac2w8jggbxpk5593nsapasmm18"; -"keystroke.doc-1.6"="rlm1i14lgk00yj7hn6mp2njdmjanh1q0"; -"keyval2e-0.0.2"="cbm4pby81d33ldf01h348daihf05hwd6"; -"keyval2e.doc-0.0.2"="7d1mpnzh474k9pc293lh8v94fmy5x6gv"; -"keyvaltable-2.2"="j29dmcw44wl8anbpw9inhwa32vnq7kn8"; -"keyvaltable.doc-2.2"="jxcs978k59f5j5v50115xyrl6q17xj0c"; -"keyvaltable.source-2.2"="whlw4ask4ny1navpryjslgiv3cis7nxb"; -"kix-21606"="lzdrca007a0r5rsm8f14ljx6v8yyg8xz"; -"kix.doc-21606"="jallvk311vqcjc3wrkxqv03ckbc9k1gi"; -"knowledge-1.25"="760vv8bwxp39ls3qzj2mq7gjqaahr9ir"; -"knowledge.doc-1.25"="8zzm7scr4hxr5ygp1s34db8qn4s1lrr8"; -"knowledge.source-1.25"="nq93xzwr4d6cg8wkr9h6mavsq6x5zvm3"; -"koma-moderncvclassic-0.5"="s33qvgji09s9glq93mdxzs3smnzlamv5"; -"koma-moderncvclassic.doc-0.5"="dvzcb032fmh5xs804d9mbx6q0afm25r0"; -"koma-script-sfs-1.0"="s9dryf4f0zgcij3v5v93zppqs876p2nq"; -"koma-script-sfs.doc-1.0"="dxm4lfz50b0635g2dg24lzp3fgnlvkgn"; -"komacv-1.1.2"="aqpgslf7gl1hjqh0x88mj8a3zjqdf4k7"; -"komacv.doc-1.1.2"="2y5ldpx86rkvfg36w0hxy0dglymmgfyj"; -"komacv.source-1.1.2"="jrbnvv271a94lfnpj303598piaqqiih9"; -"komacv-rg-0.9.2"="s43v41by7cw43381iawl42i7513xq7pw"; -"komacv-rg.doc-0.9.2"="qpqxvjp39fdy972w045kk3kv1b3glxpq"; -"komacv-rg.source-0.9.2"="zbnh158n30miz9kj39sp44jn4hmdrabf"; -"ktv-texdata-05.34"="fdwnms9v43cjsjypsnlq6rw1j3c6zz93"; -"ktv-texdata.doc-05.34"="896wnbqpxncc640x8rsi6gia2wh5njxg"; -"ktv-texdata.source-05.34"="7wq3pi1mm3r1g209vq31im4n4ib21zv2"; -"l3build-55426"="nayrp3fmcq8bz7by996g26g4jjlmc2ny"; -"l3build.doc-55426"="32j497j0gh0ds1hd3f4ld08iq3sa3cyp"; -"l3build.source-55426"="pdpplhwpd7g0c4wn26hz0qys4qqjds6v"; -"labbook-15878"="x7i28cyfski7ssm9hv28zrlac3inky0c"; -"labbook.doc-15878"="5qs95wc8ms4162nwd7q4lvh7rc62s2h4"; -"labbook.source-15878"="rrybnds4laxyariqq5c2sh1zm9jzvk7f"; -"labels-.13"="rxcv9zw5jal0kr4kw0vlswjc87clgh8p"; -"labels.doc-.13"="70hfinn9fsd8r14bk23fmdc0px7n4x5w"; -"labels.source-.13"="7hps59wlxkqqjm9432dg15ml63n44x3g"; -"labels4easylist-1.0"="xwh50hw724p6mkm7fb061dacids7g0sw"; -"labels4easylist.doc-1.0"="pkwghiybi57r0kdiyzcml7fas0izi1lm"; -"labelschanged-1.0"="k8z64p2cxhizszln06g5736zvf3m4d6z"; -"labelschanged.doc-1.0"="f1g5fxmi61q5an38k6g63gwc93znisyb"; -"labelschanged.source-1.0"="208xinzlpnpsqb3yvh98p02kmn34ai6x"; -"lastpackage-0.1"="mxy23m1fcp4gsypc3mj9327zcvpa36r6"; -"lastpackage.doc-0.1"="940qvlc9v5kaj9s7w6xyjh87l9rqc22q"; -"lastpackage.source-0.1"="g1zqchhc12fw8ja7a8raqrwcyjc1y10z"; -"lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4"; -"lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr"; -"lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8"; -"latex-amsmath-dev-2021-05-01_pre-release_0"="p6q4apm28gg02j85lhh3dp8ppwdc3sv3"; -"latex-amsmath-dev.doc-2021-05-01_pre-release_0"="81mlxa3lyggmff4zi0wb7lbhjlswhj07"; -"latex-amsmath-dev.source-2021-05-01_pre-release_0"="03r21wxncnrhm3jswd48x3mqva1caswg"; -"latex-bin-dev.doc-57981"="xwjjh57sqp9f2d6n8yy5gim24w6444b7"; -"latex-firstaid-dev-1.0k"="1p4rx2vzm04axd3hwp953prh23bp4rx6"; -"latex-firstaid-dev.doc-1.0k"="pg2iq8m7jw9yhz5874s5y09sa4i95z42"; -"latex-firstaid-dev.source-1.0k"="76dilvx77wrjndacgdl18y3yvx97rlv5"; -"latex-graphics-dev-2021-05-01_pre-release_0"="qvr5rcvddfgbsx4f2sxw8p0hc4ik7gv2"; -"latex-graphics-dev.doc-2021-05-01_pre-release_0"="m70dchwqxmhnd46jb2czvlgb1z9xqvx9"; -"latex-graphics-dev.source-2021-05-01_pre-release_0"="kym0hbfd9zjnk8xrd2xyy71waysyfs1y"; -"latex-tools-dev-2021-05-01_pre-release_1"="pbbzh0dx4a2v2r26ydcsf1dl752ymczy"; -"latex-tools-dev.doc-2021-05-01_pre-release_1"="g425mh6zp959m0mwl6wzfxbfi49nkzk4"; -"latex-tools-dev.source-2021-05-01_pre-release_1"="7imscv0gcblyq1gillf9pf7shzcb0zqi"; -"latex-uni8-0.03"="kh4gfpkynq6f2aqg9r3wfp4b75wd3zaz"; -"latex-uni8.doc-0.03"="qany361f2byfy4p1jsbwr4za45x5j74a"; -"latexcolors-0.1a"="0izwkzw8h2rqlgnl9dsn2zwm0z2wczch"; -"latexcolors.doc-0.1a"="3z4r2mn88jvwrj6rvicgzclizjk3g12n"; -"latexcolors.source-0.1a"="2wmjahbpsyfq2fgnx6aixpg9a4dvd41c"; -"latexdemo-0.1"="qjb630j87mqsczjbhvjgr4a187rg6wzy"; -"latexdemo.doc-0.1"="p14qs32q48w1f8fq0xmwz1maiijhw44z"; -"latexdemo.source-0.1"="vldkpqrsdaa84s356w6nd5a0q0gv40ki"; -"latexgit-54811"="3yisqszxc6ss52ddbkjkq9d118f9l4z4"; -"latexgit.doc-54811"="smzhzypnyjwjrkxlhdghwmdvh8r3bka6"; -"latexgit.source-54811"="lmcfb2lgj8qrijjxa921z06hn9999251"; -"layouts-2.6d"="j5bph4p5drbgidk6k74k72n6ckzin1qq"; -"layouts.doc-2.6d"="4440l4n1kwphf99pkms09mk8ilbyd416"; -"layouts.source-2.6d"="hay5rjr1crxj98zqj1qm841dkxx55azg"; -"lazylist-1.0a"="324xcbk0vwjfa3950djx17shj5n6xfw5"; -"lazylist.doc-1.0a"="mkdn2aw3hnqpp82l0jdl1jrhca2206ff"; -"lccaps-1.0"="i30xx77l0zxdx1md96pjk4dxpgngj85a"; -"lccaps.doc-1.0"="xibcr632dg2910y05bcl4ysvwgqy7s6g"; -"lccaps.source-1.0"="nni2x4jc8dkmrwa7avbdjjlbabp460hp"; -"lcd-0.3"="y4w0h69pzqkm3wjglzy7qmsg9rrpnx2w"; -"lcd.doc-0.3"="m0l7k241a9i8ny8gky3d3v3b1srlccx0"; -"lcd.source-0.3"="xgvspw8xx0020zl9pl44sbg7fk2ifvsc"; -"lcg-1.3"="idrfim5pvwkppfnrz7mla3m0k1raw0il"; -"lcg.doc-1.3"="wscv34jlkglix6yr8c8c52j6v8qx0wi0"; -"lcg.source-1.3"="9k1mwlgj1bxhbpz75lh4vbhjmxs51qai"; -"leading-0.3"="m10kyvg2pjysh33gajn8a8hisfc74ii1"; -"leading.doc-0.3"="5bc58zdia3qp0742p1hwmxaw13qdgnxw"; -"leading.source-0.3"="ks8sv07mg6n12g60aj3s33siha865chp"; -"leaflet-2.1a"="zlw7vvglq35pqcgydpzi70lw5p2k3bik"; -"leaflet.doc-2.1a"="jizzawdg24dcb08c1q0k8pffkrfql9gc"; -"leaflet.source-2.1a"="70m92az0j37y5yk5ci4z6ni4vlr8xxmz"; -"lebhart-58503"="xqk6l18kvvf0ybx3l4ps92z7jlf48rgc"; -"lebhart.doc-58503"="i2c3nkr9jny6f5gl3lnw7p4r9wdaslaz"; -"lectures-1.0.5"="vxrkqjn0y0lqgxp2c2ms8xxwhv8y7dmw"; -"lectures.doc-1.0.5"="93h48qv5h0c9g3v4ga95d3cmcml595qr"; -"lectureslides-0.1"="4nvmm5mqynac4rfrhi966gpzdx9gll82"; -"lectureslides.doc-0.1"="6h0xir1hpq15p6aglrfm9b1abmiwgpjb"; -"leftidx-15878"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh"; -"leftidx.doc-15878"="db75s45b0v3lqkw9dx09m7zs7zhmng7y"; -"leftidx.source-15878"="whmdclngd2dpahpsmz5s3rahk1bvf7sq"; -"leftindex-0.1beta"="ih107j31yrnfc9xkbvmrg36dg5dy88hx"; -"leftindex.doc-0.1beta"="nsjdjdh45lr519mj0bm152ld28d09hda"; -"leipzig-2.3"="id8f54infbs9shqwa8hskvy7ddlhih4m"; -"leipzig.doc-2.3"="qgavhs4pkjnqngv80fap4kla1bn4jlvc"; -"leipzig.source-2.3"="9byfkxnccdl5yab8p64f72b16gyqi2vx"; -"lengthconvert-1.0a"="7rfvx4n625g3rwinbxci25b0xpxrb2sk"; -"lengthconvert.doc-1.0a"="ngl9jfvcplmd9z7kwzfd90m45jp9lbpc"; -"lengthconvert.source-1.0a"="r2lh184znd42l741g816y2ljrsrbncha"; -"lettre-3.002"="f316v4xbin7m5bl72vmmj990ph9avd92"; -"lettre.doc-3.002"="ca6f1xfwz97c2k1291wc4wln9dk4bl1q"; -"lettrine-2.23"="94xvgqrb2xqp2vp9ingzcnzhsj1i1wjw"; -"lettrine.doc-2.23"="4a5z9v2nf7zbkprhnnvcqmn2ymdcd4nx"; -"lettrine.source-2.23"="7m5h453r7h8ksz1kg8mq8fmz386yqqj0"; -"lewis-0.1"="dc7cw320gc531z7m47z3pgby0zl5l6nj"; -"lewis.doc-0.1"="di515hv7q93g3mb76d9i4xdm7v35qabs"; -"lhelp-2.0"="47yixr326p1aaxdfbc8y8f051yk4blfs"; -"lhelp.doc-2.0"="drv0y9qml4fw44zmyx91gddbsrlv9x5l"; -"lhelp.source-2.0"="5z2hrf88v8ydgl2savdn68ial9zy6i4b"; -"libgreek-1.0"="dsf5z1fq4y0agzyyv6yi0vjwl233d8d4"; -"libgreek.doc-1.0"="g2bs55qw4b3caw4paxrnapy67n0ha9ri"; -"libgreek.source-1.0"="1fzq025r679gwbakqw9av95ycxj5zlmp"; -"limap-2.2"="kv5hncahb5nmmvrk1rn9j6ikj5i0qvs3"; -"limap.doc-2.2"="531jnlrzb50nsqzbm0amybf98crl0l7f"; -"limap.source-2.2"="djbm84g3cwpypc44slyscyacm1wmpl7n"; -"linegoal-2.9"="amvia15hibyyc6n80wx6lzsdg3rk8h4p"; -"linegoal.doc-2.9"="inrrzzhlascib9kbyjxs4f34xkj6djcg"; -"linegoal.source-2.9"="9207gnjmj07pywp2ikhjhnk6am2i2r1l"; -"linop-0.1"="jspi9l83p1rpndkj55ypbqc1g2myf220"; -"linop.doc-0.1"="l4gampl4ib7ld5pcys9sdw5v5r5x4zfy"; -"lipsum-2.3"="m66whrdhffwba6cbi832fp0r7ni2x3ri"; -"lipsum.doc-2.3"="rshqgsq40z24hglx85s97yw0h3sr6057"; -"lipsum.source-2.3"="hqfckvzxqgs6xxz3xklc3fjpn0fn509f"; -"lisp-on-tex-2.0"="8a4xfpnjajjpck9c9i6qp72r08priknp"; -"lisp-on-tex.doc-2.0"="ppwjpd8djndd49xh2faspmpial9qy8b9"; -"listing-1.2"="y8ymrx2bxzhz1l0lkjb2nhk6j97q9v09"; -"listing.doc-1.2"="i5bgnc303kwqnzkxr7yn0938y0h2nwpl"; -"listingsutf8-1.5"="6ayxygaxw5vyifsbcgraq4mrnv76nznr"; -"listingsutf8.doc-1.5"="m3qzlkyaswr9pkc5p63is3f7ipncdrq2"; -"listingsutf8.source-1.5"="cf2xbkbjpryr1bljm761g7ppy2bb90kg"; -"listlbls-1.03"="hmdaqr5466rlpkkrq78d4p5rfzm4fyxa"; -"listlbls.doc-1.03"="gmdiwdbadf66b6cchmxv1swlngdw6y5g"; -"listlbls.source-1.03"="8l3lzr022qmx9pw4jgp1n2fkacyl94vb"; -"listliketab-15878"="8d6nwla5nj3m47r2nw7pqhv5kpc9dlmf"; -"listliketab.doc-15878"="7j02b3ng311y78pw6k0q4zjya5gs7zhz"; -"listliketab.source-15878"="vk9ar9i94brrf3csjh9ncp2r5z48glwc"; -"listofsymbols-0.2"="9xg173d0qs233kqf04vm7qdl7ajha3w2"; -"listofsymbols.doc-0.2"="4vhmgkz6wrk2ad9bnzdv3sv3ii1np14p"; -"listofsymbols.source-0.2"="4g49piirj1spdl9hg02n9m1c8b5ql1k5"; -"lkproof-3.1"="ai3j1kpzr6ywlw9hfi3q3ld529kkzbkj"; -"lkproof.doc-3.1"="4h957l6vwp6v4x84ail94w3bfm8yc83l"; -"lmake-1.0"="hwb5nrisk72922zx1v5nqy8kcdqlgg0w"; -"lmake.doc-1.0"="hgdq7lwfi842pcpbk9dvxah687hawzj0"; -"lmake.source-1.0"="0cxjrqd9rysw8s4x0qk34yf1bczg8hj9"; -"locality-0.2"="mr4032njdjyscsy5p9xax5lw5kdbhnnq"; -"locality.doc-0.2"="98r82nbryc9zf5xyhwfnbkgrcybf7fr5"; -"locality.source-0.2"="4g29gqbn9n7kp36x0s44211p8bbmcfi6"; -"logbox-1.0"="6hm79ady9adc3i3c4p0jzmx7fwavbzqj"; -"logbox.doc-1.0"="mxpkm6s6x6zngdy8jgj801vhq3h7mlxr"; -"logbox.source-1.0"="a1q1w9s8pj9aqshkyla8cc1p3g2z9w8z"; -"logical-markup-utils-15878"="zbnw20yl4fjaj4vfmqa5zp4146yq2a84"; -"logical-markup-utils.doc-15878"="gwklf7w5nqlxiwy7avg5nwx514l2ryaz"; -"logpap-0.6"="dhd61y6riva220cjnb193v9cjbjz33bi"; -"logpap.doc-0.6"="pps9ipn239h1vw0d8p2jlzbkmcd12czb"; -"logpap.source-0.6"="6y6gv7qgh503f3n8zrpqddyghkdvzngh"; -"longfbox-1.0"="vdrqzc7ja3xh9hskvq6wby57ijnh8lhb"; -"longfbox.doc-1.0"="z165w26x5hp514f8pgb0v6cm5q1dxaz7"; -"longfigure-1.0"="1s3wdjf4wsjyp8a532a5nnaj2mkdrlsj"; -"longfigure.doc-1.0"="n4m39wdyv2i8lhgwd5756c9yv6hi33xv"; -"longfigure.source-1.0"="9rc80adbzmk2jiw5si7arqfshwg7a74p"; -"longnamefilelist-0.2"="dlicjdpj09c3dhzxv5pvfgw1029rxdrw"; -"longnamefilelist.doc-0.2"="46hypvsg0xpnil02lk942lnp3d22rvdw"; -"longnamefilelist.source-0.2"="3ph503yw35mliqir4k60hv3i8lah3q7v"; -"loops-1.3"="0f0xz58wdvx6cvkynx3xmyxm08x823jh"; -"loops.doc-1.3"="6v1ghg77l3nrab23by4cwqwr014jjwq6"; -"lsc-15878"="m875c3d6lpgh92sym2hav1n0lll6f7nz"; -"lsc.doc-15878"="ajdphikngmbihczhfyarwa94i9r3mg6p"; -"lstaddons-0.1"="n797dx657x03zpkhb1fc2ygd0ppb023g"; -"lstaddons.doc-0.1"="w57l66903jqsb827q96f05as16fr5wf2"; -"lstaddons.source-0.1"="35c9b9n0qi3rjl2gg9dr158v21rh5cq6"; -"lstfiracode-0.1c"="a9nrlvnis7an4vp9jj832x1ipd9khx85"; -"lstfiracode.doc-0.1c"="v72i91x2f5snvhavl0mqcad2v30xgdka"; -"lt3graph-0.1.9"="j25yxznhs8n6c6yl1bf24mvx202av5vy"; -"lt3graph.doc-0.1.9"="zj5lqwnd7mm5rv3ply8l4y8jabfcq41g"; -"ltablex-1.1"="a9hh7jiwaw9k0zkmb5yy7halay61g1x9"; -"ltablex.doc-1.1"="40lyll74mnj18w4fn69a2gnan846v4s6"; -"ltabptch-1.74d"="z6ikfwfzq7wsnnr6acv0fnqmvq37cbnn"; -"ltabptch.doc-1.74d"="aa6psxhjpb4n2cn73asiqnycv9g5gnis"; -"ltxdockit-1.2d"="md2zz844hk8w5jirc633l6jzix82dlwd"; -"ltxdockit.doc-1.2d"="v442rbm6y5ncm6ijzx9b7xwdf0dx28pg"; -"ltxguidex-0.2.0"="jzi1r13lc3pbhbls5h7gy05qa8g5jndi"; -"ltxguidex.doc-0.2.0"="qkxvrhpcm2p78bh4qbp6aik46d1ribgr"; -"ltxkeys-0.0.3c"="kg0228ksc3vh9js3bgknkciga0dgip2c"; -"ltxkeys.doc-0.0.3c"="27k3rl3wvxk8a7qys8lmk2vzsgck80a9"; -"ltxnew-1.3"="xap2rn5bk0pjdrpyvfi47zad1i2r0jf6"; -"ltxnew.doc-1.3"="2j8nvnzdjxan23jrky53h6aj3bcn34z2"; -"ltxnew.source-1.3"="30hsnd2yrpqdqxczsza02v4rkqa4fiwa"; -"ltxtools-0.0.1a"="xml1xbh8w9gqi8gim7wps9vmadhmrf3r"; -"ltxtools.doc-0.0.1a"="hdmpfrkdycgs0qh3mcxgydcscilacfr0"; -"lua-check-hyphen-0.7a"="9lmqby4bc5pcfbfib7f45742x7jcxjmx"; -"lua-check-hyphen.doc-0.7a"="36n5ni2jzkydxwi4x4akv21109y0qmsy"; -"lua-physical-1.0.3"="47dm3cg17dziyiapaxhk4x75nhafsjcg"; -"lua-physical.doc-1.0.3"="i672n86lsxfy4dnf297j0i7f19m18nx4"; -"luatodonotes-0.5"="wxsysgg9ss4jqddkxbff6apfbd2840i1"; -"luatodonotes.doc-0.5"="w6d1nala52b88rhchzay618gd64nf2jf"; -"luatodonotes.source-0.5"="0i7332g3mmg7cpk3g6i6432xpq2jcivz"; -"macroswap-1.1"="19xdcyrfd1z77ld3isdzxjhvsijifmk3"; -"macroswap.doc-1.1"="dkpw0kw0a0d8cwp237xy5c1a9ab0s0p3"; -"macroswap.source-1.1"="wirvpfkv8zjyqghlabclnvnmb4w8i2rh"; -"magaz-0.4"="zd02izsnb56wz1wcfqfj6p9p7pycwd3g"; -"magaz.doc-0.4"="cdylbzidxq2abda3np8ia16m3lbga9w3"; -"magicnum-1.7"="9i8z8xih80aipni912f8ya9xsd52br84"; -"magicnum.doc-1.7"="q6m07x41lq3agmgb16y0q4kz8bx015l2"; -"magicnum.source-1.7"="gy4vhdgvbz1cwgxj8frx2zf825avg3sq"; -"mailing-15878"="4v4vxr5i84yphwj7ff6s3vi0n2wx1jaj"; -"mailing.doc-15878"="fw87jd6gkc88g5a5z17gm7fw3nk6pana"; -"mailing.source-15878"="1zmcm4sg1p3vlgb76yf7gz0ds1958s6b"; -"mailmerge-1.0"="6zixn5f5rjq4fd65bbhkzwgijfhw262i"; -"mailmerge.doc-1.0"="wpim80lnxbf01an1ds6ksasm2271f54w"; -"mailmerge.source-1.0"="00r71m4cliyz9870yfxd5nl0b7b2px0r"; -"makebarcode-1.0"="m3wi7hglpq3ajgldkjipnddl56z1cp09"; -"makebarcode.doc-1.0"="29bd2af0rk7bdy7yiphxjy2x4ixpy9wh"; -"makebase-0.2"="hzw2dp6xmjzjblgbzm1j6qqmbayvzzlw"; -"makebase.doc-0.2"="0nnwh21wv9zl6cvf8a8h123ssys0p9ih"; -"makebase.source-0.2"="nrvlr5z3iwf8w7hy0fja6vki9l1xknby"; -"makebox-0.1"="iqvm1iwwrpnrdyjam0ca2wl6s2n02sx6"; -"makebox.doc-0.1"="i5bdjmv81skcvjjzy4yq8p2cim2vnmm8"; -"makebox.source-0.1"="v8lsifwcglwjacxij0kak54028h7gqrh"; -"makecell-0.1e"="073c9wfpc83jhcbkmjlkpfbpmy082xyv"; -"makecell.doc-0.1e"="irl3sf564yjdnx538vbqbw6ji0x65m56"; -"makecell.source-0.1e"="qaw6f6hmvj4125v30wr0drnlq0piim3k"; -"makecirc-15878"="m4xbci3109krv6agm0nhvry9kd7wjs43"; -"makecirc.doc-15878"="w7jd6g686b8iqqbmyipml4c1rjry4bax"; -"makecookbook.doc-0.85"="jd6jxdslcigvj3gyxs8yy1wihycxq3hc"; -"makedtx-1.2"="1k3yp8ylmvcfx4xcf1kgmpnnrrin2nsk"; -"makedtx.doc-1.2"="shcl10mxk7f7g0i4y2n6fppjjs33g5i0"; -"makedtx.source-1.2"="blsivri3lnfa4grmk46wxlr2yz87djb4"; -"makeglos-15878"="6bgdfjbhxvfj2my954iinjp1xcxnyq4s"; -"makeglos.doc-15878"="g4w2560v1pxm38dj5dsb3irgijzh221g"; -"makerobust-2.0"="hx1305cr58cjaasg8l3z9p9d3pc49wv1"; -"makerobust.doc-2.0"="p6bmljy05xlknijnbfbyqz8v0af7m1wv"; -"mandi-2.7.5"="bgfn2zpydmyjpm0n2j78szn4nkkqnksh"; -"mandi.doc-2.7.5"="72r085a0f5nrashgm2xjf5p6ba35c9cd"; -"mandi.source-2.7.5"="baa7wn0s0z61x610jb45s48l31bf49cv"; -"manfnt-54684"="1nl2yh0i4qbxg0js1q4h566vbhh9szlr"; -"manfnt.doc-54684"="vb7h8hwf2snbrmzsj1p517ark2by87ks"; -"manfnt.source-54684"="3vzdqcfcmcmi75xgy4787fqacrsa12ay"; -"manuscript-1.7"="h6a06qa8wdg942c9l85xk2drlc07k340"; -"manuscript.doc-1.7"="9lfydjsxnci0b6nfdmayjigm8gfvbiaf"; -"manuscript.source-1.7"="7s5sj7f198rxkggz1j96kk6fgr5s88ci"; -"manyind-49874"="2akaqcybgc3ia3f3cq8p54yhrj7krlfx"; -"manyind.doc-49874"="398kgdbdflmwqi38qcnbf3zgp08vskg3"; -"marginfit-1.1"="a1cpx8n1camjfznxf5lqcjfaaji46gq8"; -"marginfit.doc-1.1"="c5rk8f7ac1xi00rz2xkh708s242wzfq8"; -"marginfit.source-1.1"="r5a53yzalhc6gmbsxk9z7bba5ns0552k"; -"marginfix-1.2"="1cki548vhl8rdcsxpq7593fdmfmmlixh"; -"marginfix.doc-1.2"="2q8fw435qmgh3jqdrlisbgjk5m6yvsda"; -"marginfix.source-1.2"="0n923rs9k1skamk8n0w0573j8l69zm0f"; -"marginnote-1.4b"="98qa9kfiaiw6lbm0jsblq68vxla8a3z2"; -"marginnote.doc-1.4b"="k5mxj5j1ws3q1a71fj9k4f06n7vrj49h"; -"marginnote.source-1.4b"="i33692nz19pddmvmqw20xx3i04grxn7l"; -"markdown-2.9.0"="4v8mxa4746s8v3bv3siaw793vanym9np"; -"markdown.doc-2.9.0"="i98agf42k5fa81sis2mkq5bh4lrixbdv"; -"markdown.source-2.9.0"="hrkj7ajdmii0vvd1y49cd6a3q1rxwmq6"; -"mathalpha-1.13"="wig82v4kfp76z48x8ipcl3i6p97j41j4"; -"mathalpha.doc-1.13"="8zibbm7ga8nk6dcbdvgp3f4xw13r19ml"; -"mathastext-1.3w"="ni9zvlwrjncws3485ix1qpdiywnnqmpr"; -"mathastext.doc-1.3w"="1afwhd8wyzxs9i0w6n2vzwx1ahfkxkdk"; -"mathastext.source-1.3w"="91l6mmy7hhlf79zc4bq69vgsrlm7wf4m"; -"mathexam-1.00"="4rhl11na8mqzbl9l7wjk53fdhdpzbgih"; -"mathexam.doc-1.00"="7bhcdnalaakml3rx50sgb0799b9883cp"; -"mathexam.source-1.00"="mcs3csvr3ayvjijs6sh67mk0mrp5zawc"; -"mathfam256-0.5"="r9fkq651jjvlx222cpdhfz6p8a6vw959"; -"mathfam256.doc-0.5"="19v892aw7w93x0fcbnirvg3d3z35p51y"; -"mathfont-1.6"="nyjwlfahrkds5qlvgvmvr5xljhd0m6zc"; -"mathfont.doc-1.6"="4rx7sqkjhp31hysc8bz9nmiah1a4bsc5"; -"mathfont.source-1.6"="cw0bm3f3ykacs3mcxhdwnl6dj13qyaps"; -"maybemath-15878"="b7n8bgmz0vizghas19svaf1asi7633ck"; -"maybemath.doc-15878"="7scmh5q3xpjd6gdlq07kf59sn5bbflxc"; -"mcaption-3.0"="bxgcc1lkr9p5ghd80mh2ixnc1g4g49f5"; -"mcaption.doc-3.0"="mzbfyspjjjq3mhm2m06jmf9fic78i6bm"; -"mcaption.source-3.0"="ix6v7ldrgqw2kyb8mxppiw47p1fsxj29"; -"mceinleger-15878"="n5kag86y4a1q3m4d2kgc1k4xbbchv1hk"; -"mceinleger.doc-15878"="g3ldzbnb7jl4ii7pvc518va6x8ahlrh1"; -"mcexam-0.4"="3r3kn0mpzsx4p8scl2zf57sj54q6q6n8"; -"mcexam.doc-0.4"="c2hpirn5sl7m6cdf7mw66l7nrpcmz1i9"; -"mcite-1.6"="q16a807pfbxbcqyw1s5f3vrj0yym2z86"; -"mcite.doc-1.6"="6ak2czh685l6gxam0p0vdl8blq8z260r"; -"mcite.source-1.6"="pjqx07klaqvpxxf8xqqgad92h8rgvkb5"; -"mciteplus-1.2"="gxg0f6vk8c4bqcr5zczmwhymnp2hj4md"; -"mciteplus.doc-1.2"="wjdym32052k8qm02dr13qhclbry9r3py"; -"mdframed-1.9b"="kc60c77k0qwqhdmpbk3r777k4q857jx1"; -"mdframed.doc-1.9b"="pr5d7iqc4akn0arxjl7ynqsl6dlh64sy"; -"mdframed.source-1.9b"="xnqih0l0zng5bmrjfrprr43k6l645kvi"; -"media4svg-0.5"="2i5hs44v6zrx3l5jf6n8jvqhgyk25w2v"; -"media4svg.doc-0.5"="bss7aw8krydbannjv75phhn7x9jv2wbi"; -"media9-1.15"="z3x9hsfdyshasg0v2nk30kb7958ykmd9"; -"media9.doc-1.15"="qxj7bsjk832irbhz9zs6x370gxny10i5"; -"media9.source-1.15"="7xd138dvnp9k9wzd13mjgdzivypfhcri"; -"medstarbeamer-38828"="vplzcqcrgag8dvin3yj0prlcm9gsb2yh"; -"medstarbeamer.doc-38828"="7i4skhq9pj4k3aswbzbpjqqgdj0s69gd"; -"meetingmins-1.6"="d5x8znpkqcghi9lv4gby2l97smw6kddb"; -"meetingmins.doc-1.6"="mkxz4zi4a7rgq8sgwaqsc35n888gzs4g"; -"meetingmins.source-1.6"="5xridwnlmxkws7h293a1pg373mcb3gwv"; -"memexsupp-0.1"="7i8inx1l5wmljf6jil3zjiyfs6p4hqpg"; -"memexsupp.doc-0.1"="2rkln5mprxhm81v54jhd8a777h1n1bzz"; -"memory-1.2"="xbyqh88hgszrma77r32dzly4k928vwpd"; -"memory.doc-1.2"="97n5y37w8k1b1dghkjmdny2lgc2b0z4b"; -"memory.source-1.2"="xj785y1h8zncgikinri52ri4sp7av9cr"; -"mensa-tex-45997"="k0v2gr8sk5lxj658b62h6rnr3iwik4kk"; -"mensa-tex.doc-45997"="cbym06lj2jif90dpqddc2sl36glwlm6k"; -"menu-0.994"="601vvx1mrqc5l4ig4j65bq88yjzcc08g"; -"menu.doc-0.994"="s9wj7viflx78y49dbs3scapk5vslf5xg"; -"menu.source-0.994"="n1pq98wjrfr476cwy442c8l99n1k9f6s"; -"menucard-0.1"="7k5mxiwycgzqq8ais9d99ss9dhir44x6"; -"menucard.doc-0.1"="lv3amrvqjpl36rc3wmrf6yg8dw9w7lw8"; -"menucard.source-0.1"="p3sy5yj4gljpasmsyjbi8ndlnjvm69jl"; -"menukeys-1.6.1"="wxn5c57h8z5aj5q2d6v5kv9fbk902g1w"; -"menukeys.doc-1.6.1"="8ijrwc0zfhv0cwvy3vk6cqlbd0yxwcmg"; -"menukeys.source-1.6.1"="1gm1gpzj7lply9qfyf00aralircg6gw0"; -"metalogox-1.00"="4xl37x2ng2chj7ds59rjkapvmk3fza5q"; -"metalogox.doc-1.00"="wk7qd75laf3wm5wqil70vsrcg1ch6q4n"; -"metalogox.source-1.00"="8yal3yny31s95vd72p10mybmkx7n11xy"; -"metanorma-0.5.0"="lxfxrm0gny75rhwafmgim8g9gh3ihij5"; -"metanorma.doc-0.5.0"="cl9n1iq27ka2k556arggkl5dy6i8jrz9"; -"metastr-1.1.2"="mhbnzxgyzic8b12s99h1gfa8sivdc14m"; -"metastr.doc-1.1.2"="j3ilclww10wqrrm978q3yq5z3r5s9b4m"; -"metastr.source-1.1.2"="id0ha10mcax8rzrq1jrsqyw53g37wzam"; -"method-2.0b"="6lpy1619i1m75cvsi9c2vzjxbcs9ia5a"; -"method.doc-2.0b"="c54snw0hl1agj2fs4r3jqnk9gblxpvhp"; -"method.source-2.0b"="y3rnwdcn8d1zs9s74nsza1zscmfbskq5"; -"metre-1.0"="mf4m9vxkjfkwhv1fqjw051kfb5rz44ml"; -"metre.doc-1.0"="bd500sp1di947i1rll56h80k0pm6312x"; -"metre.source-1.0"="44qm1832z64vxp1kmj3fg5zyv1jvjpb7"; -"mfirstuc-2.06"="rlg93z5nq69rfqjka4r35zn2w20x7d6f"; -"mfirstuc.doc-2.06"="y1j1a3qry6bq4lyfji70sx5jca5kk7fh"; -"mfirstuc.source-2.06"="0w7yc9h4091i7h6ihm5h14ay0hvx5smm"; -"mftinc-1.0a"="ckn9lv76yrkzpbi965rl9zvgcqg8alzg"; -"mftinc.doc-1.0a"="2qb409wrm8pf6nj53fbf16pwjrp7h3n2"; -"mftinc.source-1.0a"="s4kaysarmk404dx4pf1xlanckix06jgg"; -"mi-solns-0.6"="m241psyf1fwkk0m99q9rnh37g08334wy"; -"mi-solns.doc-0.6"="wc29z0jqrzrln9g9lb3aqpbyf5nnf9c0"; -"mi-solns.source-0.6"="3jlnn2himx44zdaw0pb0zks3gxmqfhqn"; -"midpage-1.1a"="k6zlxyg3y73s0npss5d14nizzzf6bl27"; -"midpage.doc-1.1a"="7rbxbq2sy6h6lk25kl4sn2hfr87kjhcx"; -"mindflow-58475"="86c49mnw9a8g77ha3qdzlq9pq7nxb75n"; -"mindflow.doc-58475"="clyqrw7pbvv5bsm7flc5gib4lglpij53"; -"mindflow.source-58475"="paxcshqj39mdp2lmikn3skq7xfgapx7n"; -"minibox-0.2a"="4fhpgzi7wc6jh7n8rf2n9s0cpvljwwc9"; -"minibox.doc-0.2a"="sviimirqdwfgk14my3w0zr2qycccckf4"; -"minibox.source-0.2a"="q704gpig53qmnbsvy9kcwl6nm161nak7"; -"minidocument-1.0"="q06hnvnkj19habs189lgsx35srq63g3b"; -"minidocument.doc-1.0"="lccwy6b0j7z28w8zp9gsvassa240xc1p"; -"minidocument.source-1.0"="ksir0ia0gyc7qzr4pfjxzx2hcnzpc0b0"; -"minifp-0.96"="28njw4zhz6fagd3wwk7ybah5c6nx4lrc"; -"minifp.doc-0.96"="xci52b9lqvfx748z6y3a5f6spwqnc9qz"; -"minifp.source-0.96"="y3lmhlpkdcrix3kk3kv7rpqmnb9hlz56"; -"minipage-marginpar-0.2"="39mkfjhflkvby43487kqpwagi8mfb1dr"; -"minipage-marginpar.doc-0.2"="ca67m5ikd0ka529wbi2s22zq5r5cr648"; -"minipage-marginpar.source-0.2"="db4g8ckwnbk7pspwfz9jbvndnzqbmfdf"; -"minitoc-62"="nm22vk0d9n4qsxg30qdg670q2ary85qh"; -"minitoc.doc-62"="i5pyp0xwkd9601vjmmnmsdzhm23bpkfs"; -"minorrevision-1.1"="svc8nrmpcahd95mzyggc6vmpfhmd9917"; -"minorrevision.doc-1.1"="x12xlc4ja8ksnd9rpnic0c0hymj1sdwn"; -"minted-2.5"="4d3kkhjjlhqb1nmp43wwsrw3z0mv94xy"; -"minted.doc-2.5"="pf8yy80fj73nibdnljhlisc18cs1x1cw"; -"minted.source-2.5"="wl128ack6c90ij18fmvf27hnxm6y9gf6"; -"minutes-1.8f"="c864pfgi1a853n93jddnndgsp325sr1i"; -"minutes.doc-1.8f"="z3z8rxzrkwz7k6756b654v6wclx4f6rb"; -"minutes.source-1.8f"="w4skq6nprvgxhvqrf4xa2afccr1hsz6g"; -"mla-paper-54080"="7rh7dh7mzybc5wzzbibh1lc10kyc99p8"; -"mla-paper.doc-54080"="3csgrsb6bh3sbqdzfx6y84i7ph8lwnhc"; -"mleftright-1.2"="djj8n1rrxi3iyj5zxm4y5lwnbrzq3vb9"; -"mleftright.doc-1.2"="krkpm7kc85q5hgb0vzvvx8gxznpr79d5"; -"mleftright.source-1.2"="mfllc0rhh6x67pg9qxr5wpbhazzg75l9"; -"mlist-0.6a"="5yh180f4d4dsrfzin6cjmshad8w7fi6g"; -"mlist.doc-0.6a"="wqscsdlyx7zqyq1g5hcfcp0cs5w5dxxc"; -"mlist.source-0.6a"="hlnmvms7n3csa2v0ixwz82wp2dlc7jy1"; -"mmap-1.03"="3yv1ma0qa2qw6lnaq3q98g4blg5s287p"; -"mmap.doc-1.03"="w9894wmjjay6c52wks4i80cvk0baba2l"; -"mnotes-0.8"="n7d22a7hh42vdiy9j2mn0x3dw86s81gs"; -"mnotes.doc-0.8"="lk3cmdx93g8vl58b32qc9zdwl6c3mh2y"; -"mnotes.source-0.8"="cz8303fpgl3h17lvncqbpj1xz490waax"; -"moderncv-2.1.0"="cmjc8xaz3w2n3nqh3nwk0pkrgdqyard5"; -"moderncv.doc-2.1.0"="x2i8cz8q6hfyzcvnvybsc6m0vwxnsmfb"; -"modernposter-1.03.1"="hlb03arz5iv98iakvimihvcnb50zdf0k"; -"modernposter.doc-1.03.1"="qb4pglm91r4w85lbp7jdvgr8b9nqkmh4"; -"moderntimeline-0.11"="r8siv13syzymkgi776xkpd15cjck7d9z"; -"moderntimeline.doc-0.11"="3w6bq6jlai07bv7g2l8iaal13h00n82p"; -"moderntimeline.source-0.11"="hbfh2pm3hmjm701k25hfbk83zh2dzjzc"; -"modref-1.0"="66l3h642swhw1maq3gd0l3bc59dlb9f3"; -"modref.doc-1.0"="qywhydcrg4qw4lkxa2gkdqdzjzsjc0j0"; -"modref.source-1.0"="a362js5xq7a69k1zawmyfj9f4p6254v0"; -"modroman-1"="yvhwr314ymch4fhvr9zq8l1rsp3jfinn"; -"modroman.doc-1"="2is4g9r40gr23cy469q2vk2kjj2jbkm6"; -"modroman.source-1"="1kddwifbglz7hlhxndcrr28dfgd0bdy5"; -"modular-44142"="gp555cnfp2izjp81bg1l1aij466vcfxr"; -"modular.doc-44142"="5yxpl169qqnh3p4zhwx6glnagv6a210y"; -"monofill-0.2"="jnv36mj3w2vihnq2f17pbm1yzrz2176w"; -"monofill.doc-0.2"="gr0mhc8f2w3dnd9r6flqvq5yyb388h4p"; -"monofill.source-0.2"="gmdpp4qn9x5bxk24afqs4xg7vzvaqkp4"; -"moodle-0.9"="fx6h5w1yyhb867rsbaj7gc1ziy6qmb8p"; -"moodle.doc-0.9"="kcb3zacaswgyqqyqywybwv08qy90cm9g"; -"moodle.source-0.9"="182zigli9migk0dzl1v011aj2vj0qfbc"; -"moreenum-1.03"="q6a3sxik7whl9zif8j5bs1bgxcp611rr"; -"moreenum.doc-1.03"="f0vzqhha6bbsvwnsgq3ng5v4qg3vkbgr"; -"morefloats-1.0h"="dzx390854qkxvhcas8krahqfg2pkg93y"; -"morefloats.doc-1.0h"="fwyzwvgdmwqdsgl2lwyqxdq0mlbrhxsm"; -"morefloats.source-1.0h"="hvakfpqk8j2r6r4fmrrhx3lrncpb35l1"; -"morehype-r0.83"="7wdy8cw7wk428yy79ca20jlikk3q06ap"; -"morehype.doc-r0.83"="nbm1bmcdi42xn7nyf4p0nlgy5qsrx4iv"; -"morehype.source-r0.83"="wafhphln91wfmqcn7zz0gcpaan0lbz9n"; -"moresize-1.9"="mrny3a5x1zkhbxrfqi4px8izf62axxxv"; -"moresize.doc-1.9"="jgc4rbzb7qyx91k9k7m4mp05m0nhrvkr"; -"moresize.source-1.9"="pglcf851fgiqzx76kihws0c5r8c9gmhb"; -"moreverb-2.3a"="w1rxv8g11dkpi1zyfq7xblgjjwi2dkw6"; -"moreverb.doc-2.3a"="70m0wiik9lqc2r4pi4nrdmm0rsx9d8cp"; -"moreverb.source-2.3a"="zxqcx8a12s33gklfq4zv3mci70nimpir"; -"morewrites-49531"="phc3742cpyisr8i8b9r30w7x28kaydx5"; -"morewrites.doc-49531"="x9cccfv21238zfsfikbnap6a2fj2aymg"; -"morewrites.source-49531"="gg8427vc6r2im1y5n541imkgq909ds99"; -"movie15-26473"="c2vppl6yv82s4n3kqjfp75qby2rwfxkv"; -"movie15.doc-26473"="1kn8iwx5x1gc978p0gjj2rwy4ablkdvg"; -"mparhack-1.4"="5sq75r9p6laimfxiz9kl1j5cgplkzin7"; -"mparhack.doc-1.4"="6i835nghib094n03i095dc0p7zq30znm"; -"mparhack.source-1.4"="07xwzd4pvppkb7ywwzdrip3yk41d5wl0"; -"mpostinl-1.5"="vfsmfj1knm8zxs6nc42c7w82ja9mxx19"; -"mpostinl.doc-1.5"="zh5pgghk7s2m7ygn86zjdb08c26pabf8"; -"mpostinl.source-1.5"="jnx6qz5gxx4v0c93yb7f8n5lq2dj41hd"; -"msc-1.16"="fa7ja4f7a2qpc08q656711qdxlgsjqdq"; -"msc.doc-1.16"="b6mcb2izb71p267zcfhj3l0x7rc2sihf"; -"msg-0.51"="d74m4mhh3k9hmc4py38izy3n075f019r"; -"msg.doc-0.51"="3v872isrjh68l3j4i0bm86l2vk60vi7f"; -"msg.source-0.51"="gcmdjhil29pwakk8jdrf6zaxcp3w5ykw"; -"mslapa-54080"="xmci0mddxivrp23hxp50wnlyvl9kir04"; -"mslapa.doc-54080"="dpvra8ngic2ydqxs8y59zd0jffy2q4ai"; -"mtgreek-1.1+"="afbh9ydcsnf1k0c714ypmqrf0qjcas6a"; -"mtgreek.doc-1.1+"="pq9303jyrj7nq8rwgi5d7njbc2x3jn58"; -"mtgreek.source-1.1+"="6whrwjvzz5jrhirhgr7kymc3jczn2zmf"; -"multenum-21775"="f1d7s8hafvsk4dic8ss1cqdjqvn8dlih"; -"multenum.doc-21775"="w65nsjanh13fxbkwhiinwzyhq0ra2m54"; -"multiaudience-1.03"="dcqxnkwsqd6vyk9wnwmac5b832dzb4ns"; -"multiaudience.doc-1.03"="8z6mbzi6yyv5cmp6pn2fsg5vlagyrlwn"; -"multiaudience.source-1.03"="5v4r06mydnjvq7hksjgdqd17m47b0g1z"; -"multibbl-1.1"="7nvyshlsgfcmlxc0gdn8b353sc6g3qw2"; -"multibbl.doc-1.1"="isxh2fz1yaz86acvpcv8k1hmwnazck6m"; -"multibbl.source-1.1"="z6wbxacy1rzz1l7wx6ppi8dsbipvc5s0"; -"multicap-15878"="9ja1cljsr31lw6rjvph8gi154z8bpl8j"; -"multicap.doc-15878"="z17yw0id2vdhckvirlrq3npkdpxk5hrf"; -"multicap.source-15878"="yv4rw5hjfj5fj0xyh2p3glmz0887x105"; -"multicolrule-1.3a"="i3cfrfyyj0xjvk27dmrakzlh5baz9jyg"; -"multicolrule.doc-1.3a"="f9s3709g2mi3il3g1ddg5px0d41aifbq"; -"multicolrule.source-1.3a"="sks1vf0hd08gni9s5fl3an5zln2gpakz"; -"multidef-1.10"="5wsklk9lvznmwisl7jyhiai2zz8iizhb"; -"multidef.doc-1.10"="sq7a72nhiyd5384dx9y6k1c72gl8ia2n"; -"multidef.source-1.10"="hx6fbjirp5gmpn9bglp0hcmmhdjn1rsb"; -"multienv-1.0"="r4q7rsyn58q4scrv790dn1jwy2l0w0c7"; -"multienv.doc-1.0"="jpvk0s1crqx5y739hr40ajzkc960mjr0"; -"multienv.source-1.0"="x75lc8vbar75g490rdpjplwi4fr41ff3"; -"multiexpand-1.5"="q49fs09lmw9s8bz91k2iis3q1sa5qnln"; -"multiexpand.doc-1.5"="98kgaaxbfnbhc7rvagk2w2qjscaymaji"; -"multiexpand.source-1.5"="88gj4rql48wvni5la1xbzrpyxcrm2dx4"; -"multilang-0.9b"="56lbpndclbci7ihkidrjqg1i1rb5d540"; -"multilang.doc-0.9b"="k2fcrbwx48nwwmwjb5sln2xfyv7ac03p"; -"multilang.source-0.9b"="26rcwx14xbk0zfwazm40ab76pkv6b1g1"; -"multirow-2.8"="qzw0gw70s0gay2mid6g01vlx92iixcrc"; -"multirow.doc-2.8"="wbkp1z90fsh3fdpjp1qldhn5cbkysz26"; -"multirow.source-2.8"="gsafi052rxsv2bbcz3325wynbwrzyvl6"; -"mversion-1.0.1"="7vpmmb88cjk92m2a2hz10cijkxf44bmy"; -"mversion.doc-1.0.1"="a2fx7phvl0i1nyhb5h0w6ld1n9kvcgcv"; -"mversion.source-1.0.1"="zhbd3j6kxsdyznx9haqqh4vk7b8nrl09"; -"mwe-0.5"="dx1fdq96hyssx4pssbww55fqwcx71nys"; -"mwe.doc-0.5"="777ybf035b85yxs1iliv0vs4rd1nzqrb"; -"mwe.source-0.5"="gbqq17i9rnxwh0r2wjg2pcp9x3jzwyql"; -"mycv-1.5.6"="am1khnlv1w5w9732q2azpsjqjp7xd96b"; -"mycv.doc-1.5.6"="gd3fqxrg0y28fw4093g50a9fl5qpb0l8"; -"mycv.source-1.5.6"="9jvb2232smja8fb39hlxnh813vlvs47v"; -"mylatex-56751"="yv3rfndf7x4cd2a9gx5fsg82v3gm0qy5"; -"mylatex.doc-56751"="sar6czcxp6cksy74rjnjxdycwwxlhgnf"; -"mylatexformat-3.4"="j9yz4p89ln68ra05iyl46vnsia9c2m83"; -"mylatexformat.doc-3.4"="jv51r001b567qdpj04srhpinqza2cbrx"; -"mylatexformat.source-3.4"="27n04f9m812jsgwpr47sk2k39anbk264"; -"nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0"; -"nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip"; -"nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d"; -"nameauth-3.6"="ks6jn6v63n41bvjn85qxvhzwz071r6c8"; -"nameauth.doc-3.6"="chla1jhfww0ja8mr88mwiyqzpn0c57ch"; -"nameauth.source-3.6"="qnhib1mpd6d0dvfafa2lbz6niylf3zn8"; -"namespc-15878"="6f7x6ldx008l8w5ziahgwl42hb5bws4k"; -"namespc.doc-15878"="6aqpn007i8s488j4qi8xhbx9zsyvafbs"; -"namespc.source-15878"="s5ws2rny22j23bqy5cn2mz23qn91ssfj"; -"ncclatex-1.5"="vyc62gppwksnghphh3fch8ac3wji38qv"; -"ncclatex.doc-1.5"="i5klzg6hjqk8gq73g7ck9za6arh58rwx"; -"needspace-1.3d"="n3bhzw4qj1q1pml8yw40q3p8nzncygia"; -"needspace.doc-1.3d"="p8ahld3my116ynhgip3xfgxd58n4w36v"; -"needspace.source-1.3d"="2i7mdcxrdh8p54l31qqcfsdbrwjfiw87"; -"nestquot-27323"="f9rwiwxi2xksi75wfwmsq9gmrj78scg4"; -"newcommand.doc-2.0"="cdy7kzxpazx56gc6a0s62nx1bq3x1kz3"; -"newenviron-1.0"="s27wb3f7q3qk5lv6ficrjs6kkxqal7hi"; -"newenviron.doc-1.0"="j20cd7xar8jxbx17dv9sqpsrck6cydd9"; -"newfile-1.0c"="fc360fhzp2yxcpssdvgwp1fi20w91k2b"; -"newfile.doc-1.0c"="4d3gk4w2jbh96d98qpjh7r329hb11c0l"; -"newfile.source-1.0c"="1dyv1z8dl3hlwd0x3d9jy6kvfyag3klx"; -"newlfm-9.4"="74aqk6qvmq6c226n5m6s0jgf1rb91712"; -"newlfm.doc-9.4"="snw60agnpwxi52h20anf911x3qx0509n"; -"newlfm.source-9.4"="kywnhr9air3kqjqa0hj0ij7605a50qbd"; -"newspaper-1.0"="sp89yvm13f900xrbsn6p097b4dspyxb2"; -"newspaper.doc-1.0"="7gjmij59wric29v4kbwyi0hxlhgkbnm9"; -"newspaper.source-1.0"="r8918czada36fb9bgzddaq9c4vaak5i5"; -"newunicodechar-1.2"="8wfz9yyzv5zphqrwp92i9cci08chh9gr"; -"newunicodechar.doc-1.2"="bj9wp3x1hqj0yfqa13yf7f21svm9sxmy"; -"newunicodechar.source-1.2"="mmv56hgbrkwxca2l3a4kxhpzmrjjm68m"; -"newvbtm-1.1"="2khz8c8b8a5946h97w2rf2gmp6z8wvh0"; -"newvbtm.doc-1.1"="y1rlqvpv8y77ns1a35q6raksa88qqdnd"; -"newvbtm.source-1.1"="1ws90wkmj308mz4qa3hham4mxm3lrl5i"; -"newverbs-1.6"="86kd0swkcac72304rrpv0addnd84gzxn"; -"newverbs.doc-1.6"="pqd2v0q56lisk99ninwx5r1d848ql0x7"; -"newverbs.source-1.6"="b4ysw67g6mp6wwc1r685qi23p9dh0c03"; -"nextpage-1.1a"="b7b41bpr8zk2z6m5il51q9vxb3c8h67j"; -"nfssext-cfr-43640"="isp9rw94ck4a9ckl4b5hd8ma3cmlkdwd"; -"nfssext-cfr.doc-43640"="si6j8b4314s0gbnjxwymqbzcajclqn2w"; -"nicefilelist-0.7a"="crqgn906x51nq1d3z0s15f9kl29lbg3b"; -"nicefilelist.doc-0.7a"="a77wbb5ajkj4ab3dy1zzs3hchac77cwh"; -"nicefilelist.source-0.7a"="ng7drfgz7w69za7hmfzm4cv0m2awdx7l"; -"niceframe-1.1c"="dvds5bwfmca1phblf3jzzgj8rxq6va5g"; -"niceframe.doc-1.1c"="lkhliswdxfq68asjbrxal2k38311h9ld"; -"niceframe.source-1.1c"="qyrv98xhjmv852cmzrzrban7dj742n19"; -"nicetext-r0.67"="i3lvy4awa0igc272xv8mn7n4dfaxm9iq"; -"nicetext.doc-r0.67"="iacnv3pa0a676wy34s3s261ypjpcl9gd"; -"nicetext.source-r0.67"="6d0mm3ghwivk44g63875mpq6pafbll8b"; -"nidanfloat-48295"="f9691yflmmv0ziyfj4a65b186gj0ppn3"; -"nidanfloat.doc-48295"="h468vsrcmc06awhvkg8f3bgmc7dwsgy1"; -"nidanfloat.source-48295"="x92x0jk3ab50yd3gyjgqyb21iq0v7g6h"; -"nlctdoc-1.07"="z0azj8lyhdf45sa4vy172qlzck58vvic"; -"nlctdoc.doc-1.07"="3axalhgmiz8f9rikjwbkhckw0hshnpyk"; -"noconflict-1.0"="df9gs1xx7gymaadn2ji4dzir36z6r897"; -"noconflict.doc-1.0"="irvdqh1iyghgs73l3lv2jnrs2gj9jxcd"; -"noindentafter-0.2.2"="w1kg4gv0dpfak1s7xshs04ariccpnx0q"; -"noindentafter.doc-0.2.2"="d94gk5jrfmhpz7b1qha13wi8kmb73nf7"; -"noitcrul-0.2"="y2kmn4b9b37y79c739afhyhk7mindzih"; -"noitcrul.doc-0.2"="fz1jhgv1apc206vwzf1hc25pr5fhklhs"; -"noitcrul.source-0.2"="b8s8g15qwdsxm7ywvgj9g6307ws3hg0d"; -"nolbreaks-1.2"="1603r89wi8sninjv541na8k2islfk4sc"; -"nolbreaks.doc-1.2"="g0nm3i09kzxqqcrycrz2cak05d8qlvqs"; -"nomencl-5.5"="zxky0yrdmhjg6qs5l5l6wi36h3mszdpc"; -"nomencl.doc-5.5"="3rmvqb2q57mzdiydj7ggqnm62a2rhgnw"; -"nomencl.source-5.5"="dkyq9n1wb5cf9k331mfjd3n6hbz7l3rg"; -"nomentbl-0.4"="k74vk3a9kl3sbrkmpyav1snh0cd16np9"; -"nomentbl.doc-0.4"="k2ggwchfqa253i96whp2lh4s3p8vbysk"; -"nomentbl.source-0.4"="al9s24x1ivpw91bbnn9sqrjp3rb5h0ni"; -"nonfloat-1.0"="yry0kys2irxfx7ril0qv6l7is7nm0fji"; -"nonfloat.doc-1.0"="yr85gza4l0wcybg4zwi004ndkl50p2ki"; -"nonfloat.source-1.0"="2zwd1bxb5niyr8higb5y2bipyqa7f3zn"; -"nonumonpart-1"="a121f2i1n005xp51qn642vx30ij74zgs"; -"nonumonpart.doc-1"="wcbvd9c2cv5ydbma4xxb6g2b2bihi0lh"; -"nonumonpart.source-1"="j2jy48jw8hgcs830h187s9rg85kd3rfa"; -"nopageno-18128"="59l05x89jv7q4mm7k73i06rmv467iimz"; -"nopageno.doc-18128"="bn5vq6kzp69p03pfjx9s34ckf4h3q6iq"; -"normalcolor-r11"="jfpqlz85fphm063mb51q9q2s61fcbnmh"; -"normalcolor.doc-r11"="vz9557sxw9c6l8m66aaagcv39x1vkfzz"; -"normalcolor.source-r11"="vs4y1p0zarr6nppqadcdcp03lc6nd2zd"; -"notes-1.0.1"="w3rp5aas5n6sks7d5j7b27s11zi4lx3v"; -"notes.doc-1.0.1"="hn20w72lj73didm46kkay056msa4cr8h"; -"notes.source-1.0.1"="23qrfsbbmyds189kcnq09jbmd23mi50f"; -"notespages-0.8.1"="3cx726w1pbmdiammpbzp0rmcahhza7p8"; -"notespages.doc-0.8.1"="rql7rmn1c85r1rb2jpmwd2h29m7b4gmx"; -"notespages.source-0.8.1"="sskq21wj4vhqyq8xzhrbsh7p8c701r7x"; -"notestex-1.0"="innwzn87vplj094lxw9w48ck6s5hmb5v"; -"notestex.doc-1.0"="p4lyxlar4125y9x3pb6sd5ysdn7w3vqr"; -"notoccite-18129"="ifpkassfd9j5926gsnq00954clc52sbv"; -"notoccite.doc-18129"="5ggqh1mvc03xgyipc6c49ssmlaywh83f"; -"nowidow-1.0"="hf3wjpkn1j2yksdl8mryssv6cxqjn3si"; -"nowidow.doc-1.0"="w1an9iayppa59h2iprjr515w8g72qkg5"; -"nowidow.source-1.0"="b6i3ypchipa228x0s6i66vrvf7zc3hgc"; -"nox-1.0"="dg0znk2gi1j87il21s7gnjpm79xv4plj"; -"nox.doc-1.0"="alyzx228zmwgpcrinv3xy6v569pcmq1r"; -"ntheorem-1.33"="2hhpj2gkad3jbmh0df7hhfy1nr39hkxs"; -"ntheorem.doc-1.33"="1ac6yj6f3c4brkgzy9xkwqmzhy2q2qy9"; -"ntheorem.source-1.33"="fc0wyfgjnckzqrd7lf3a4n6yvbhwaal8"; -"numberedblock-1.10"="x1wlbk0d8xbl0b3mx0bxgymc9jd3vv5y"; -"numberedblock.doc-1.10"="866z5if0xryr7mmi70any7p9l93f0d38"; -"numname-18130"="7gl7dp9c1wj7phv8ys39kxnarifbqfd2"; -"numname.doc-18130"="pfp7zzapdvlfbs9jd5vc2x977nxs3yfw"; -"numprint-1.39"="7fd6ja6vw3c7yg824y30xrqrmrk3qkwx"; -"numprint.doc-1.39"="bbfg2cyh8cykgl3zk9c53wk3q3vbb8pn"; -"numprint.source-1.39"="cr7xjw77r8h4bcjihxc68iraxd760gh2"; -"numspell-1.4"="y1gvvz28ix791pp51bc2z4403bn9c1c0"; -"numspell.doc-1.4"="85l7d5arf6ss67lhzjj72fldlyz6isc4"; -"ocg-p-0.4"="lxy3nprj8j37b2c7aylxzgm17221wscx"; -"ocg-p.doc-0.4"="qg16xjfjp36s3jxm1m75ln2nrl1rlama"; -"ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5"; -"ocgx.doc-0.5"="6vx8iiz0zfipwj45xrk1gv9cvifv4y1r"; -"ocgx.source-0.5"="5bm25s1rgsky2qc14nrgg6v3n0ywwcb6"; -"ocgx2-0.50"="882gc1lnwwqxawl84zl6db6v04qiwvcm"; -"ocgx2.doc-0.50"="9349xdahrqaz2riwqmfcz1s6zaf33bp2"; -"ocr-latex-15878"="7mi6izsnwk6dksgmscyn45w72n1bgk2h"; -"ocr-latex.doc-15878"="9cz06542a64k4ns92qgkx1hzm5sd275w"; -"octavo-1.2"="fpv1fcrym9gplxjs0zsrrv4iziizqzxy"; -"octavo.doc-1.2"="wcd4cj4ihgmm1d0i36l66bf8dpw5cm58"; -"octavo.source-1.2"="30dsp7266fzc2l2kn98pqwwv6sdb75hr"; -"oldstyle-0.2"="3910vncyk04awikr4g0afgyfqa6dqxa3"; -"oldstyle.doc-0.2"="picdnpvv6c53j0mg8gn3l89c4ydph9s8"; -"oldstyle.source-0.2"="dwsgqd631bncikps4m9fvr7l7y428w5b"; -"onlyamsmath-0.20"="z12vjq71xjihl30fwfhqqm4wimb1dkwr"; -"onlyamsmath.doc-0.20"="h2whk4751icqb332z3h346vcjqrbgjiq"; -"onlyamsmath.source-0.20"="w3yqdsdbhx5m6briw33a0mh8jhyx25kr"; -"opcit-1.1"="59ykfp525lby8p0y5y1b5wk8ab9dvznz"; -"opcit.doc-1.1"="h74vnsw6lf4iaca46r07x0i05rhrq4m8"; -"opcit.source-1.1"="xsw3nb19li1hxnfpr4xhkb2s8qg3ap1w"; -"optidef-3.1"="s39b2v2hbac946vpqvbp0wxmw7kf8rrj"; -"optidef.doc-3.1"="bi8453aa4xxkmjs630hnwm8ci1k6zfbq"; -"optional-2.2b"="akjbm6gzli451ll82zbrwhpcajdn1b15"; -"optional.doc-2.2b"="jg81vzayz3a2pvlxhvyrx8j3w1sw65xg"; -"options-1.0"="5xy1cf8yq8awm7bspjj23nywhbs7ww67"; -"options.doc-1.0"="gy13y93wl0im19p5jc011fjnr49afgsp"; -"orcidlink-1.0.3"="6dbw14c5hbwg7i81cwhcizhxqvj1y60c"; -"orcidlink.doc-1.0.3"="4bfjh8idb66hdq7k6sar6k59vl7nhdsm"; -"orcidlink.source-1.0.3"="7l1vki8k1l05zi81aavr0jk2f37xcbn7"; -"orientation-1.0"="lh00icyx7hxclgk9i252rh3xzcni9yrm"; -"orientation.doc-1.0"="zy79k6hyw6b6iqmf475vzx6m6ymghvwz"; -"outline-18360"="m192v07lmcfzq3zbv87cbckz8jwanbha"; -"outline.doc-18360"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1"; -"outliner-0.94"="24bsa0d5zxz2i50i4bz0b3zsc5v7hp8d"; -"outliner.doc-0.94"="qgvvmjxq75fq907z1ya4vkir6iq7sbmq"; -"outlines-1.1"="0yh26641p29qj71w6zsx1z6hsr663q1k"; -"outlines.doc-1.1"="zg8b8617kq2vbf6inn2ms6x4a27j8yf5"; -"outlining-0.1"="c5xzw92b42pfbxmzmwrbiy4r879d3ja2"; -"outlining.doc-0.1"="rgikl4vfy01hgv90nip0iwx808iazvfx"; -"outlining.source-0.1"="miidkl85jpy5y6a7n71vilxaissip8c0"; -"overlays-2.12"="mq6pdz8mkg2k68z73x5y37qd3741s2bz"; -"overlays.doc-2.12"="kmmi2q3v1c8xjxcp425ca7ns2pg71lfy"; -"overpic-1.3"="jh264pgfn17jgbmy06g3wb6vhqgifqik"; -"overpic.doc-1.3"="0158l132my7sn1nmgwxnzfkp2gxpnzm7"; -"overpic.source-1.3"="v5d34dvqfy5s3m77q444rc5naav55rig"; -"padcount-1.0"="am7s242sajkic0xz62kd1blgvbssgymr"; -"padcount.doc-1.0"="790smfw5i39mn1i8kfgd1dq14mgc3v7w"; -"padcount.source-1.0"="1p1pl9s3cdjjd519w8djbx7wnnl6sszd"; -"pagecolor-1.0i"="sllb6vybrngchz5k569b7pl3w13h6qfn"; -"pagecolor.doc-1.0i"="gm3l4g745mp6910pfv5201k63v44yr83"; -"pagecolor.source-1.0i"="ycqzawzck2jisybmxs7yfrr8v2h3vhy0"; -"pagecont-1.0"="8n68c03h2ckbvv11jj3cdv771ih60s4c"; -"pagecont.doc-1.0"="xkbrxr2gk65wgg5zf4cklsyzlgb03fz3"; -"pagecont.source-1.0"="74vmzb28in78lnkb7gjb8pg626vff0za"; -"pagenote-1.1a"="qnzjzijqrg65slkh5963cl1mxy8zr3b0"; -"pagenote.doc-1.1a"="pscbm0bglyryz5y4ghqgh0kkkyqw20ln"; -"pagenote.source-1.1a"="wkgw90mb45sq6baprpygc3qm5acnqrjj"; -"pagerange-0.5"="8w6mqbd385ma3m67h7v1h71mrlgkhqli"; -"pagerange.doc-0.5"="2kz3fnznp92cjp7b1lwpxvggn1q6hs05"; -"pageslts-1.2f"="axyv179gvcnvr6kv8hddpbyzj9prg0aj"; -"pageslts.doc-1.2f"="g0pir7bhi5dy6v1h2l3fzaskyba6kqrp"; -"pageslts.source-1.2f"="6a1az2z2h17z71k1bd8ziawn9ay9nrvb"; -"paper-1.0l"="wxk3akaqvdbc0q5whlwd2jpw0nvccwmn"; -"paper.doc-1.0l"="pppdcafd1gw0y9d5j91b2smzdssvvwyi"; -"paper.source-1.0l"="g5np7r4ncm9pyzpqm3f0h60cihmfbfsf"; -"papercdcase-15878"="dncf3im483zf3ix2ycp8d07bdpdqnfqd"; -"papercdcase.doc-15878"="cv4gkmg3rljv2j0pb0xjw6xzbqdii5cj"; -"papercdcase.source-15878"="qlbxx0dxb9vj7939sr3pl8cam98bc619"; -"papermas-1.0h"="xrl9ldvps0ffrygpgj501bvi4yb6cz2w"; -"papermas.doc-1.0h"="1p87yvwnn29mi2n2q4z1jsxfnq8gd73p"; -"papermas.source-1.0h"="6i3yx6ygswgf7yp1c0grv7gr6qc77r1l"; -"papertex-1.2b"="qq8m5fiyahg69aw4ajb01jg9k8x67kx8"; -"papertex.doc-1.2b"="x0s08fx3x24s5rgbsana1q0k06khczhc"; -"papertex.source-1.2b"="pzlnd4a3gkkdir8il99pkn6iw11w6bjx"; -"paracol-1.35"="nlp7hsfirg9x091qd1yjrpg2d9vanh2g"; -"paracol.doc-1.35"="mn2n3z3656wwk7rqii271778v9ca4yf9"; -"paracol.source-1.35"="zw0z1fnlqd1h9hgxgc6pqnj99rsbn679"; -"parades-40042"="bkr92ffb7s3zzl845jjkj1777517dwk1"; -"parades.doc-40042"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58"; -"paresse-5.0.1"="jigr743az2xjrw1qsb15w2hcvi78xjl1"; -"paresse.doc-5.0.1"="r3k4iifg67gm7sxac4l4qzlx94sj5ai1"; -"paresse.source-5.0.1"="9kcjbh6pzglp4h72dxih81xkn0ah7102"; -"parnotes-3b"="42sal99phkqbw05k2d9x6by27iy7sc7j"; -"parnotes.doc-3b"="3hlfpf75qjahy1qzc8l3dl1n8pj323pm"; -"parsa-1.3"="iawcalgm3zpppbclhzn63i33bmnxk47c"; -"parsa.doc-1.3"="322amnin34r5p1r0rmg1phmgqbx4yj6h"; -"parselines-1.4"="krgfsp0vcnpgwgw70aw8iwbi9r9fnwsm"; -"parselines.doc-1.4"="ahspn4rw6wdwlk9sgd8f2jajb2cbm33n"; -"parselines.source-1.4"="n652xalrpp0s7yy0dvcdz24khybsm1cw"; -"pas-cours-1.9"="1kqwk3hwllkrlajh6l3k0y1xxpql7jp2"; -"pas-cours.doc-1.9"="6anwqql5pn34njc0ysqr408d34vvxalj"; -"pas-cv-2.01"="zdvf8flk3kjln11sn5rs3cb265q8fgzv"; -"pas-cv.doc-2.01"="am16i8cjhh2jadlhqsmfx8vb2jyrj8fn"; -"pas-tableur-2.01"="ggwlvzkwdv3qhljir7c8v8fwivi9h7lp"; -"pas-tableur.doc-2.01"="942prkpjhj4zpvdg2d2k27ibvchw2mbz"; -"patch.source-42428"="6k92ah4ka1ljyxwgg9n91m5aj6nwvnq8"; -"patchcmd-1.05"="asi7jsa5gwd1i2k0arh2p24wprnqfb2h"; -"patchcmd.doc-1.05"="8nxwjfkxc3nbj39wfvqm8bkxm4qs1y66"; -"patchcmd.source-1.05"="bpb3vc5kdmhiwh0s6sjvxjshvmgr7hrs"; -"pauldoc-0.5"="jmvlwadvci0ha513vxih3myaq6fzz5q0"; -"pauldoc.doc-0.5"="3zflmnljccqsla1ng0rjkgnmiys81r44"; -"pauldoc.source-0.5"="7q1bzfpfrxq3mfmk4p0w58ri9w1iymks"; -"pawpict-1.0"="spbcprlcpyxh9yd98rfd8vy7ydxyk552"; -"pawpict.doc-1.0"="wrpl43c4g89pgnrpcjky42h1ckhc4dgr"; -"pawpict.source-1.0"="qfmjx2x9vrlm3zq8msph0c30py1n2x96"; -"pax-0.1l"="iqmsy6p191p8bn2bs642zclq3q42n89p"; -"pax.doc-0.1l"="cjppdms9xlc6hsj0mk324ndpjqg2px93"; -"pax.source-0.1l"="harabcx553nchhf8hh9m3wqwic4l80fc"; -"pbalance-1.0.1"="fa64xh9irys681nlh0gn2fn4qgq2jwbw"; -"pbalance.doc-1.0.1"="75v4ijv45pzqrzwr1cm9bhgbmcw21824"; -"pbalance.source-1.0.1"="mb458ddplvcqcbsz916nxy5crd2i0ach"; -"pbox-1.2"="9y4p69w5nskv8j5i8a2pxmhswxz8nc50"; -"pbox.doc-1.2"="hjv8mqhlfa9ggqypr7nwzzf03rgm7cry"; -"pbox.source-1.2"="pk6hx6w8szi4dbb7irkr0wy3xwjjdpxg"; -"pbsheet-0.1"="ph2vnjalj2imlyb1nj1rq5cv84x5a4gp"; -"pbsheet.doc-0.1"="kc5rypxy3ksbhcyh3rkxv572z8r1rmp9"; -"pbsheet.source-0.1"="3lqxvqw0cm5ibnlq16zq2drbd4gcjwmk"; -"pdf14-0.1"="nc5xwg94y7na253fjpk9wv8n9qvsk7b0"; -"pdf14.doc-0.1"="lr3ls4m5rz8fwf37j5zw6prrn5kd4dkf"; -"pdf14.source-0.1"="0y28fgs01xpfadwxc3bfq8y42vh87jkf"; -"pdfcolmk-2.0"="6m1aap8lggxx6116q606mbs6frlghycp"; -"pdfcolmk.doc-2.0"="zp4v32b6s8g1myj9kkh0iz2h8j1pb8zc"; -"pdfcomment-2.4a"="g8bnzph5s7ihl4h1y5s9bkrkgj82yi96"; -"pdfcomment.doc-2.4a"="9x3yh17abc7inrf6nb45gk1cvg78gw5m"; -"pdfcprot-1.7a"="qsbfyac2h2qqbk805q72v4v8vpzn3myp"; -"pdfcprot.doc-1.7a"="ri7rfypz9240jkmvfvlza821k9m2ana8"; -"pdfcprot.source-1.7a"="95cr49yywd59mcyj7qvqkfc9bhj63hxh"; -"pdfmarginpar-0.92"="pra0y1df005b6br3n93zpi7wrvgk2h6d"; -"pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4"; -"pdfoverlay-1.2a"="zajhpdd1vdmf72f7ch5122n98jn8f312"; -"pdfoverlay.doc-1.2a"="5x67ws2bacl9vl3lnvcamjibwwigkimv"; -"pdfoverlay.source-1.2a"="q4pag6s005bs4b5hykf4by4j46skc516"; -"pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5"; -"pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h"; -"pdfpc-0.6.0"="a1x8k67pkznhg0v9x9nsvvmyjxzfmsrk"; -"pdfpc.doc-0.6.0"="affrj9iz28cpkk6gsjiczs02qwwg58ln"; -"pdfpc-movie-1.0"="la1blfvhk9kwfy2q0sp6x1ybw5c2i7jh"; -"pdfpc-movie.doc-1.0"="5qc0gdmlgspl5696zvng96nbhgr0j0m4"; -"pdfpc-movie.source-1.0"="2d4v3bwnsws65w57arhbs2j5gvm3w5f4"; -"pdfprivacy-1.0"="0nsgnfid0rp2xkmfvfxnjp7v7dikkxbv"; -"pdfprivacy.doc-1.0"="1wr2s6qkmp8knplyvqwx0micqgal3sw7"; -"pdfprivacy.source-1.0"="jr4iilr7yiknx21fapgzkkgy4mc15r6a"; -"pdfreview-1.2"="fs356zp97y8h48560c0fyjw0aymj8dwr"; -"pdfreview.doc-1.2"="xkd8140x13sfs5krj1l1p3zvj4vwjjf2"; -"pdfscreen-1.5"="5lwdmn4lxkq9hgn6fmr4rc2gdk3ms583"; -"pdfscreen.doc-1.5"="bcg3kviqc0jr3s5h5xa3in5g1hj46zkv"; -"pdfslide-15878"="78wynlp5vyc14zn93gwy73yyykk0yh0i"; -"pdfslide.doc-15878"="j8krgspjlvn4ja9dww3mc0g3zg7qhlmb"; -"pdfsync-20373"="xqg7my569gq36snly1kpii240byrpx7s"; -"pdfsync.doc-20373"="y6am07gh7iwgmgkwq7sg9z704waxgqai"; -"pdfwin-54074"="yfdlssqwsa253r0qzvy5xbgbgwpmmxpm"; -"pdfwin.doc-54074"="7k1kqy2rpr93q4nvdvwcrspqjbzz1h4i"; -"pdfx-1.6.3"="1inx9kkwqj831ikgplqvffk8f0a8s6gc"; -"pdfx.doc-1.6.3"="c1grn1ahiddzp95biymw47x04fv3y23k"; -"pdfx.source-1.6.3"="6jj6972hpnhn46bzfzp1r201pmfnx87i"; -"pecha-0.1"="8bir75jmi5y33ids3wixm0sr7zjd66zq"; -"pecha.doc-0.1"="lhdivjzja3syzm6ksfcckx4a9q3pp8ph"; -"perltex-2.2"="wshi5f5mkd59ncnw7xwp9pfw3mwgv5x5"; -"perltex.doc-2.2"="inj1sx8rkkdxq2sqnqgs0hc9ziybhcvb"; -"perltex.source-2.2"="a8lsqd2ls33rdgjy5fny1jz84gb1z8b3"; -"permute-15878"="anxvxdpnmr31a50r7anwj21vci3dxvg0"; -"permute.doc-15878"="rz1569972rz72laqrxnkphxr3bdx1pxl"; -"permute.source-15878"="va01wn3pv0j0cxqmgh8cjricj4m2vjxv"; -"petiteannonce-1.0001"="xv2yjs519vz0inbcy7m2a201ysjl3gwj"; -"petiteannonce.doc-1.0001"="9xvfy2ivdmlamj4fr1q5i1mfh6diys8s"; -"phffullpagefigure-1.0"="hp51s42ycsary7n2qngls1bm6j6mi5ab"; -"phffullpagefigure.doc-1.0"="wvbhkw4axm3bkx3jyi32iy0g3bbbfc6w"; -"phffullpagefigure.source-1.0"="z0wwcy1cjs0kv9lwxdl7waidccaa9w2x"; -"phfnote-1.0"="77if36imrvp4g43h3vfd6j9qzsd7gv3c"; -"phfnote.doc-1.0"="i0vc3q353aa2f1xjhmddlq273x9jngp9"; -"phfnote.source-1.0"="0c893r2vi32kp5cx0ncwa23zryyy6j3m"; -"phfparen-1.0"="jj8lpyhs4h7li0dmc70xhf2h17vgqrwm"; -"phfparen.doc-1.0"="73rcrl7hp843q2fjgis48raf9hh4yaqg"; -"phfparen.source-1.0"="zqdkqbjn75g379gsw0jvlzbyz5qpr1xp"; -"phfqit-2.0"="yln8ifsblmbsp34na3jfi2j5z9az00y1"; -"phfqit.doc-2.0"="ll95cj7p15xx79q024p6xdf3wsjzlamv"; -"phfqit.source-2.0"="xqiygbddiwvl3l1x9xdqcd6zqdbc4xj3"; -"phfquotetext-1.0"="52h9qw8xvldzr7smwbg7njr8acxf4hp3"; -"phfquotetext.doc-1.0"="gk5008b5k8qbi3q2i7bjk57ipwz0vyhg"; -"phfquotetext.source-1.0"="wl18lww4jvg1k8361ra2jqc5z3drs4vf"; -"phfsvnwatermark-1.0"="11rqnm8ag7p0iv2bziy89w66j9cjv4vk"; -"phfsvnwatermark.doc-1.0"="rd3y1kns876788nmbkm7r95wml31yvg8"; -"phfsvnwatermark.source-1.0"="666y9zym40h351a9fbnwy24aangwswkd"; -"phfthm-1.0"="a1g65ldp21rjb5nk19ygpijbs0xfriqq"; -"phfthm.doc-1.0"="ad1m16cjb9kyi6jk6jnvgxcm2ci8pxqg"; -"phfthm.source-1.0"="lbd9qwdv67spq7v1dy78012a874wg9mv"; -"philex-1.3"="766zmr2yzy48mmdakjhvvy56ck2g5zhf"; -"philex.doc-1.3"="r94769rncbhw6cdvzwm0s9fhwa57z7xx"; -"phonenumbers-2.2"="82hwh6yj11vqrskchkvgnimiyxhzcf7m"; -"phonenumbers.doc-2.2"="ac4b8860hyqw8pjpbcc58bbjzx1pzm4c"; -"photo-18739"="d2rv82rm7jyd2fvgzs545kz32nb7fn6l"; -"photo.doc-18739"="1gn03gddjcbfmidsn9snhbr9nsmlbsmq"; -"photo.source-18739"="70n1vi9qla3kl592hgay45af9m078l58"; -"picture-1.6"="z9r12wc2iwp7basv33kdpkg114cwhxww"; -"picture.doc-1.6"="iy3lwfdgbqkhqfgx49h5978qbgwkfhv5"; -"picture.source-1.6"="0vd0z8k0mwa8zibwf6llarqj4j3f379x"; -"piff-21894"="xz2idyqgwg5y7r9ac0bykvfx533rd29p"; -"piff.doc-21894"="xwlsyrk4mczbchklsx5x8ip08zc5jk6a"; -"pkgloader-0.7.0"="15p6m1152qc334ljqhnzdagic2ylvpgs"; -"pkgloader.doc-0.7.0"="k6qdk7x5pr11qspbx9ggabp18n88hlmx"; -"plantslabels-1.0"="yi1s2470aj75chj1f5mi9961w9if1mpd"; -"plantslabels.doc-1.0"="m9h0zjyk3jf0ksc6dz4zgw9niha0qkm4"; -"plates-0.1"="chankj3114snam38fsi9nc4zap0b86sh"; -"plates.doc-0.1"="wz1xqxldn325p4c87b16ns4xxx7l5bcz"; -"plweb-3.0"="9d5dh5afrcjlcx279s7hkrsi0xja0fg0"; -"plweb.doc-3.0"="519cpfwspp2kxprill50lqhzimdi26jc"; -"plweb.source-3.0"="2ikq5nka9npdkr8gqkj8lyi1hqmxihzr"; -"pmboxdraw-1.4"="nq604ycr2pv9c1wyv271rzyc0jjchjhj"; -"pmboxdraw.doc-1.4"="h3pskixylkzqf692514rd7p4k69z97g4"; -"pmboxdraw.source-1.4"="lz2chby0wx4yxl7lz5qhavzjmgshp760"; -"polynom-0.19"="lhl6cw071xb7ivyzhdylq48ja6dqq377"; -"polynom.doc-0.19"="6sj89ph1gnbd0xa2f8sp457ip6v8sadb"; -"polynom.source-0.19"="9z3hzyf19ksy521v28p47h1dxh3c9n67"; -"polynomial-1.0"="k11f7cmzycx5q6ww5vnrxfp7xf3238r1"; -"polynomial.doc-1.0"="ffr0i9z96w9ahr8k1jx8klk1kddd1zm0"; -"polynomial.source-1.0"="m844kmijznga9r259cm2h977w4zdmi3d"; -"polytable-0.8.6"="ccn1r0s2nwbpxp5mmbasvnmbivcswhdj"; -"polytable.doc-0.8.6"="sy8gz8n84qky60r7kqpxariw0mj0nvbz"; -"polytable.source-0.8.6"="qiakbb7083n8cjzhp9dnnbx7d3ccp906"; -"postcards-21641"="zvcijbngj8m505fcx22y1hs7y5jmn1kc"; -"postcards.doc-21641"="d1v423a7xl8pi8nqqzbr9y5ag8d2pkkj"; -"poster-mac-1.1"="vjpg0bc2f1qv0hr0kcxasymrchpwzn05"; -"poster-mac.doc-1.1"="8m0bk06l7y5bps6hn3xd40s6yb0m8c19"; -"powerdot-1.6"="2ff609v2nwjjxfs7jb1imb4p7i39xf8g"; -"powerdot.doc-1.6"="l7c0y574ykjjw5c2mrbrg1cb2v4y1kc2"; -"powerdot.source-1.6"="ag13n15yh4vvlnsljrkdcp4p1g5x8jrj"; -"ppr-prv-0.13c"="8znyclbgzli74aiciayqn88dp4p7mvsl"; -"ppr-prv.doc-0.13c"="x2mvhsnrb56nm2s431xlb7fi9g8irbzx"; -"ppr-prv.source-0.13c"="g4r673h9bqfxkh1ih2qp9shhf40cbz95"; -"practicalreports-2.0.3"="z0zj7cw6zrywmjxwh1kv9qh4340a8729"; -"practicalreports.doc-2.0.3"="qnag6zn4rn2l8gwwrmrm2vminwrz8w4f"; -"prelim2e-2.00"="sbggpshfqbnkx6vxl8gldgswsnf0g7sa"; -"prelim2e.doc-2.00"="hjzx94h91zal4xqpdhvgq03in9pqxzzl"; -"prelim2e.source-2.00"="4979f2wp30xgi311nfvkivlcdkj2h0wb"; -"preprint-2011"="z8qdsshgjd3dav562qnyx4vh9gdyga27"; -"preprint.doc-2011"="78x9z1vyl7vpcv39nj167bawb4z8fsnf"; -"preprint.source-2011"="i09zkvcpvapyf2jj7yhabmyrpxyf0gp0"; -"pressrelease-1.0"="7bxy141i0a7n3r2z4qnx309ijsi14dka"; -"pressrelease.doc-1.0"="y5pnw0xv53mp7skrjrjrcsr3r7hvwylz"; -"pressrelease.source-1.0"="bqj7qnacxv8mnjqjwdspm5zi5xg10im7"; -"prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2"; -"prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7"; -"prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0"; -"preview-12.3"="6nij1k7lml3fwzl8qmwx8515cnsk53pd"; -"preview.doc-12.3"="9rgwn57grqwvw45jdca07k7jcj898aag"; -"preview.source-12.3"="xyak9iszf9hvfyiggz1gvl96ki862cw2"; -"printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim"; -"printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv"; -"probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl"; -"probsoln.doc-3.05"="n81pf053v27m4xj6cjnjmd8r0sb8lv5k"; -"probsoln.source-3.05"="k8gwixn5ssp97d05ml01k8f9z6ijspq5"; -"program-3.3.14"="fxq3hls6cibrc92g1dyavcr8s2qjxsr8"; -"program.doc-3.3.14"="qvhjjfq3msq1i9h5jf2nx54cp87b3bl8"; -"progress-1.10"="zf7iqvmc357pfg7phrc9gggwyb8rb0hw"; -"progress.doc-1.10"="2pylrgmyscf4p6ndba4jf87vfglxydrd"; -"progressbar-1.0b-4"="6zvflmdsm1vxkm3sjgmxpvl6jsw6vy82"; -"progressbar.doc-1.0b-4"="ahkr6nf44xv8czg4ffpx2qbxzwn7b24f"; -"proofread-1.04"="910z66xdhwfcs7nja83ys89alq7blh8i"; -"proofread.doc-1.04"="8mk3ch8mi8b1xqcyhcpqqhzp917j8hva"; -"proofread.source-1.04"="q62jds90qpypw0hmi9lzdl72whniqp3r"; -"properties-0.2"="is4zxlnpayim96h9vifb3wazi4hcl018"; -"properties.doc-0.2"="pdpdn0rbg28dq9qgry9w9j2wvzrl9sxx"; -"prosper-1.0h"="kwjg42wqipj8w4rmilmrpsl5spr8hzmp"; -"prosper.doc-1.0h"="9bfspx1labf3y4hhy7a7sv8ccfmqw4mx"; -"protex-41633"="ajf4lsibbzcr2ynvfpx2n4pnazfkng2k"; -"protex.doc-41633"="j9v7mdk5dnlhdrj5sl3afbvgqgpk0bbq"; -"protocol-1.13"="2mpbqs6r1sl8x79dbkzgg0vh0xxs89pi"; -"protocol.doc-1.13"="fzvldl69vw5kxljg5jm4qwcar1k2zg8q"; -"protocol.source-1.13"="x52qwan5dahs53bdm8dm450h2ljr7lsp"; -"psfragx-1.1"="pb5q4bhhn2zxm0vni6xwcyxq76wj85l1"; -"psfragx.doc-1.1"="bfx58if7s6z0sb5faslismic7jbx4ycf"; -"psfragx.source-1.1"="6ikq1jhicgf6109gdnd3ldng0ycy920w"; -"pstool-1.5e"="1niq51k7cvq7kqlxymixhrhrg811rs3q"; -"pstool.doc-1.5e"="y68jbyp1rzd3wkpwvg17kiz5fsfczmi0"; -"pstring-42857"="whkbcsicbqlvz1pwjfypnvwwbbwqpwfr"; -"pstring.doc-42857"="gf1pmfhczjrkjgpawxbk6zqrwindadnr"; -"pxgreeks-1.0"="hdqmxzcwyd5llq80fakhjvx8whjxs8mr"; -"pxgreeks.doc-1.0"="hdm2s76j6vya85lid9lrkzhaj6bkvlda"; -"pxgreeks.source-1.0"="1i5jmxhyphz2mdhl742ydrzam336ix5w"; -"pygmentex-0.10"="v0g38cn50ybp08jqycwkj3gfb482mzx2"; -"pygmentex.doc-0.10"="3fsj110x7rzgmwrmv3g70y84g50c848n"; -"python-0.21"="a7v60025926j1nf783w765d773zla60r"; -"python.doc-0.21"="901hkhiwnx89si1rx242wa3gx2mx5kkg"; -"qcm-2.1"="d9xas7ra5n0hzkc22s6ky3qr752i1i2k"; -"qcm.doc-2.1"="ljb5bhy71jscf6hdw6xmxxyy3jyfa8py"; -"qcm.source-2.1"="zywcw16m4hk75ialbg92bx98snk64hpf"; -"qstest-15878"="girz5x7dqmr96mqyviwld4i06s1h4ldd"; -"qstest.doc-15878"="0w3r2f745k9kj4ig8yrq1w1l1dhdblcs"; -"qstest.source-15878"="z067nizm6rcjm6yz1141pxa7gm5yyfs1"; -"qsymbols-15878"="w1c7ni9qmy255nyg3hb0yf94p1b924n7"; -"qsymbols.doc-15878"="pfhp65iz5ybxccd7yjxg2rww0j9z2xhf"; -"qsymbols.source-15878"="mk7daalfvk3wyyhnlvbhb5144g6qm8xs"; -"quicktype-0.1"="40znnh6yxbhx1i7gsr0icvy5avhm68nk"; -"quicktype.doc-0.1"="ljcdha8k0ngr0ymwqbqbblgyslybvcgp"; -"quiz2socrative-1.0"="8wpvm4ysp513gkigsymd0d0sg3708m4r"; -"quiz2socrative.doc-1.0"="xpz8wilnlh12lf0dfjvmzcprjd7pmr4k"; -"quotchap-1.3"="jn2r0lm9ky6k8y38p60fls6lvfqh8crl"; -"quotchap.doc-1.3"="9qibsdfc8gr5f56wk9lzfyj7si7mlcq0"; -"quotchap.source-1.3"="7h3yh4i3gfd48hzzrf0xj2adjb5hmb9n"; -"quoting-0.1c"="jmw5a88k3r137dxxrvznxx9xqwh9yvlw"; -"quoting.doc-0.1c"="2a4d2w7b4jshz79hhz57fpq6vzgdvb34"; -"quoting.source-0.1c"="g238v3pr075wgknaj82ivn70z6fbf0gp"; -"quotmark-1.0"="8inn8x79cps7g1iw3pfmc7lyky20vyxx"; -"quotmark.doc-1.0"="nkjdi0xl5yvvscs63kjdy7pk3dcvgvxs"; -"quotmark.source-1.0"="nhinvh37dw0n8wk1gvpqnp5l3fmaq3v5"; -"ran_toks-57520"="48w8b30295c0kmj16lxqqssclzwa9p6i"; -"ran_toks.doc-57520"="hgp0ba6w40zh0frwn1z6h3rdl1lgy22a"; -"ran_toks.source-57520"="g74zm3wg52imnsrxqzhfdpgcl565ni41"; -"randtext-15878"="bnb1sk549kzmljwjyb9gc45xr2ndckcz"; -"randtext.doc-15878"="9mpim50akqiqp54x6kpz8w4wdv9d12dp"; -"rccol-1.2c"="31w19kr365k8wkvkx91qqcw46fnl0sbk"; -"rccol.doc-1.2c"="80zx3h1b0wjw8qgv81kb4la3zd9hh9m6"; -"rccol.source-1.2c"="sqkkyhka856h4iirnvy4s8bdqlailgxa"; -"rcs-multi-0.1a"="ynh0m6il06lpc6cldc47hvk13n0jhpjy"; -"rcs-multi.doc-0.1a"="p5gwxj7airn6302zk05j32lhhnaxxy0p"; -"rcs-multi.source-0.1a"="6pc8wyv9fgazi1a240fxffwmyslir86p"; -"rcsinfo-1.11"="y7cymhiac6wvahhzkmsrkchrp2i5i9fn"; -"rcsinfo.doc-1.11"="v6wc6q5xv5rwbcgcvfrlkbk8lw3h4qz0"; -"rcsinfo.source-1.11"="86ss0sk5rzss6m4b5n96dwfd0vjh2acs"; -"readablecv-3.0"="dp6r4cyyn4i6gvq9x10id9c9mb6463jz"; -"readablecv.doc-3.0"="gz5af92whgks47bp8k8bif7hqx4mlr7p"; -"readarray-2.0"="6f0daia3lp0ipi8swprpgl1pzh44hwc9"; -"readarray.doc-2.0"="bgfhvri7xh8kq5y1qykhzhjrv0vcss2m"; -"realboxes-0.2"="frdrijzjm4yi20fddhxb6gp314qg6bsx"; -"realboxes.doc-0.2"="95b3g7v3hnns9n8l1gv69a9b1jnl4za0"; -"realboxes.source-0.2"="2sj5y6k08cwcp8fs0ay7z7ik02is7vly"; -"recipe-0.9"="ya2zz3axlaax8f7qkz3rwkfwl6kc7hqw"; -"recipe.doc-0.9"="nrgg002rpx1gw16yx9pl4xfiyjg2lk16"; -"recipebook-37026"="z2m105warknssz9d0b5f0fg13mdjrwqv"; -"recipebook.doc-37026"="1w359b6rbd8cfvfa3z140hzsk7515m9m"; -"recipecard-2.0"="ywrn03f3hy5hyzszpghn9rnjkj9a3kqr"; -"recipecard.doc-2.0"="1g67mikrdxmhpn4xgpnlriapp4als1wx"; -"recipecard.source-2.0"="7g35xa8kbcsrxxmp9xxk3rgvas158m9h"; -"rectopma-19980"="j8pxsc46j0m799x9srd74d7q4jjxjdwv"; -"rectopma.doc-19980"="7h3v5rpkvxcmv1nj0wzxpgn4whs1gk4b"; -"refcheck-1.9.1"="llb529mc4gj9wf4zzs7jz9p2qgngwxy6"; -"refcheck.doc-1.9.1"="hvcfjpx9g9wiaqr70vmrpkgqy4i7xikg"; -"refenums-1.1.2"="8zxc6yyp3c597ydikw4zc36ri5xhlpid"; -"refenums.doc-1.1.2"="jqqqwvr0bd163njgkfgz2aj1jlgmlnxk"; -"reflectgraphics-0.2c"="bbpagcn17kwhp9jzp3r6kp23qbr3gqs0"; -"reflectgraphics.doc-0.2c"="klwad1c3lbcf9dga240cipdhf8vm4q0h"; -"reflectgraphics.source-0.2c"="1pwn5m9mclwsmwalal0bcfvi5sq1jh37"; -"refman-2.0e"="32g63hz11bkfsdh6n6jcl84wyjjpq6nj"; -"refman.doc-2.0e"="scp335xnhndrhgfvpd5l1372jn3qashm"; -"refman.source-2.0e"="c1d1va229zsmx2xi1gka45haqc2714s0"; -"refstyle-0.5"="5k4yj6qqvg0xph423q8cfq9yp3m57c11"; -"refstyle.doc-0.5"="w5jaccslhd2ksxq421q6zxj8lddrad45"; -"refstyle.source-0.5"="g5sfid23vsvy6b99hi1jkwcshgcgv5wi"; -"regcount-1.0"="bxa9jg03phjn6ibwfils5jkl9p6r427x"; -"regcount.doc-1.0"="knh85nxr5m3g1ljcmp7z58q0xi4rc46g"; -"regcount.source-1.0"="gr39ifiwslrh971xgq7lz5r81cx4vh6h"; -"regexpatch-0.2f"="hhcywfsc4sp7vpv1ikncaphax7y47684"; -"regexpatch.doc-0.2f"="ama62fjpxjivrqb1crzyvac2q5vakkbd"; -"regexpatch.source-0.2f"="n8khaw6h3m6karhw5l394nvmijz26i30"; -"register-2.0"="1jaiqnzqsvdqg9mdbqw1z5hbm8crb65r"; -"register.doc-2.0"="p9j8dlw9jmvsph1b6z8m941rmj52w5wa"; -"register.source-2.0"="7hcssqiflls84k2596qs26m3w3jl3c0x"; -"regstats-1.0h"="zkxc3cbq3fr5rpwv3lw3znrs9sn1ajmc"; -"regstats.doc-1.0h"="5ddawlcn7rqzs7i7mjjj8zi3q60qpal9"; -"regstats.source-1.0h"="kafv0h7yl5qhzgq4j4ay54cm9lqgd1w3"; -"relenc-22050"="0ksy9dhzxf7dh2sgnais817krjdrnyip"; -"relenc.doc-22050"="w2s26knmf0pfnbvxbj3f2xmcvjf8mgkl"; -"relenc.source-22050"="vhwmn0hxlv5njl4v2ljz5z4kbi5n4a8g"; -"relsize-4.1"="l9n0cv3vjwqlhxw58bnj4gh1qr0mbkh9"; -"relsize.doc-4.1"="bmv72xvd2n40rclz0a5cw128a4m1khl2"; -"repeatindex-0.01"="6zzlr3miqb7p0q3h1kyaly6ykzwjlq0k"; -"repeatindex.doc-0.01"="gjkm3why0hf1269kqbpg70bwwmcagdwb"; -"repltext-1.1"="mzzqdjgmzzal0yizvdncqim8b80rlhll"; -"repltext.doc-1.1"="j81qiaara7zdxi5dyxfqcmkf3cycc43n"; -"repltext.source-1.1"="wxy0rsiihw5f9xzaix6rlnqkiij3cggp"; -"returntogrid-0.2"="qvyji03hqf95f50pkv4jj773a8ryv694"; -"returntogrid.doc-0.2"="8s3dy7s20sl37qhayb7vz949k3nsz2k4"; -"rgltxdoc-1.3"="li2cq0q31dicm59lrnz5vkgxd4m2lksx"; -"rgltxdoc.doc-1.3"="58sky0650lfq667lgfcb6cpyn966rn99"; -"rgltxdoc.source-1.3"="in8bvs6alfwi0ah6pdigvpflp7aggl6f"; -"rjlparshap-1.0"="584zbnkzrqjydg9hz42ayl9r806sd4cw"; -"rjlparshap.doc-1.0"="g4bkg84j236faakga1kl593bjw1p9wq6"; -"rjlparshap.source-1.0"="gys3kddji7j89c63a2kzz7z8xjdakpg5"; -"rlepsf-19082"="zvgnjwbrznazfy89cwbk9injrg0hk19b"; -"rlepsf.doc-19082"="q4jpki613c0b9kx9bxzqw3v7m5ggj4w9"; -"rmpage-0.92"="iqvgmj8ygy8mcqffj9wl5xr3l4g19w7f"; -"rmpage.doc-0.92"="nzm10y262ql87jqmlvbx8s5izflz8nk7"; -"robustcommand-0.1"="pclwgpigb6jf5myrirrgb35jdsrc1r54"; -"robustcommand.doc-0.1"="8236m9s2klnlvii7733r9vkr28ma0758"; -"robustcommand.source-0.1"="a6wczmjbnvfqfqg0cxbnq7srr71w3l6c"; -"robustindex-49877"="sw1cp3wc1z9il2ysrxcyhwp47siik8lz"; -"robustindex.doc-49877"="ga57j7ky0ifk33lmf0ai6xpr8cav2xh1"; -"romanbar-1.0f"="77m3d5fv4abc2xx6nx5cvzpkshnbkmr8"; -"romanbar.doc-1.0f"="7ha3ybbzivbkc7fllhfjv1mlvq20k6i0"; -"romanbar.source-1.0f"="3jn06jd260yipslvs8xjflwd49pzrcqb"; -"romanbarpagenumber-1.0"="x8gs1z6nn976praar888l74avfd1ha6q"; -"romanbarpagenumber.doc-1.0"="cyfpy1g5g14jlxl83a7ngcl631297a58"; -"romanbarpagenumber.source-1.0"="qs1ia3flkqsd1psbha7bfms1anfg336v"; -"romanneg-20087"="7w6wmvkyzy4jzs8akhaswqjpv1lh9lxz"; -"romanneg.doc-20087"="m7rc0j7xbkly1zh63lrym8pzgp1g3ivh"; -"romannum-1.0b"="8l5hrx8svnn1pv9qd3c7y6gxy25fr5r8"; -"romannum.doc-1.0b"="1wlc0m18vg6vl8sgxvj4i3ca4kyfl9c0"; -"romannum.source-1.0b"="h9rkrds6v7b0pvgap090ja271k5jnc7h"; -"rotfloat-1.2"="v9iaw0lv3vc6chkic1dracvgksxrsgqs"; -"rotfloat.doc-1.2"="dmfn4f6nkq621adf18xqy9vdgqn5c68p"; -"rotfloat.source-1.2"="0c3i14195xq03r4nzk58yrdxybk2yl8l"; -"rotpages-3.0"="rzayzgap6j40817pn95w8pmryqi4a3kb"; -"rotpages.doc-3.0"="fh2a3xcl4f5mq95d2ibsgmml6pq95cd1"; -"roundbox-0.2"="g1k35s2jqgfm0ih16zf59w470kzv450f"; -"roundbox.doc-0.2"="97dr0pg7689mm504pld75cmnd3vq61rb"; -"rterface-30084"="l7szd2dbrky3idmzkx724b1ks8d9crwm"; -"rterface.doc-30084"="3hkrf5qycaq84dawxyv5a829bv8vz0qg"; -"rtkinenc-1.0"="bgvb6v03sbayxss84awkaa98i1hza4rm"; -"rtkinenc.doc-1.0"="ggkmbwp3kxa1zs4c5f7v3r5lk5v8pdjr"; -"rtkinenc.source-1.0"="iavp7gzq742v267gf3hjq8vwi1ywqfbj"; -"rulerbox-1.01"="6mg6d4nwip0qmcz10ykpl4rd204xdj5s"; -"rulerbox.doc-1.01"="y5wpxgc3m84kkxi1xip7l3jjcf8b36xw"; -"rulercompass-1"="bhgf5s2zj8xdxg5jhh3c4wdfyv87p9j4"; -"rulercompass.doc-1"="bc9m9y239rjdnmbrj6s6rmqadmd32mvd"; -"rulercompass.source-1"="9l57jpav5vpsvsg42gw79mym778q7623"; -"runcode-1.0"="javlwy36s82j5dlr63zrnx790cgn5qwf"; -"runcode.doc-1.0"="f8n5d05jbkq4h0vfma2wl6gwj52lxfjr"; -"rvwrite-1.2"="fmxfnps659r2swx7gr9bdxcij2s7vdn5"; -"rvwrite.doc-1.2"="c1wrdxjnjn345siv4xivjxcw8gd5fi8p"; -"sanitize-umlaut-1.10"="nfavxvmfn7klbszd9zxvlbma32dmvmym"; -"sanitize-umlaut.doc-1.10"="wfqd5y198r0gcl38fqnwi758cqyp3dck"; -"savefnmark-1.0"="jb8wz370wj5gci7mp809d60qwn441cb8"; -"savefnmark.doc-1.0"="lzip7g8z26c8vgfni9n058dk9jvskkck"; -"savefnmark.source-1.0"="sv58x02n2rd7gv7mkd6hjym7sqbxlfsx"; -"savesym-1.2"="gl0rbarz94wa6qqzgza73mdmz7058zlf"; -"savetrees-2.4"="w0mxfybvqjbrqinqc8r3xhapxq80s4mg"; -"savetrees.doc-2.4"="g0zk0ijym5m753jss68ijanks42201wi"; -"savetrees.source-2.4"="8y15qzcspmi19sskifg53agnacylid1d"; -"scale-1.1.2"="v8s6izx8nzpnjd6x39yfz11l7f9rrnwv"; -"scale.doc-1.1.2"="ifyf91yd8avqh90jxa6ih9xg5bzy6a3v"; -"scale.source-1.1.2"="6r1dvrbkdkw418pwagkn2djrzswd28r5"; -"scalebar-1.0"="107wyhbx5wzliqmncsqlaykg7qw5ldwa"; -"scalebar.doc-1.0"="a4krk1zpi2yiyri88r96363l5k5kcjf5"; -"scalebar.source-1.0"="5f555kz7b0rbxh4vsmqa8hfqlv7790cf"; -"scalerel-1.8"="bnzdi8d0mf0ppkvwypxvb6wl2lyw4mpq"; -"scalerel.doc-1.8"="bpamgzs7nr8gfam69mad8qmgjs6hy909"; -"scanpages-1.05a"="vl8kzqsj7dlc21h9148c4cgbrwg92k2w"; -"scanpages.doc-1.05a"="8rc3sz2jw47xz3rz25dfw7g3gssndz7b"; -"schedule-1.20"="h730zhbkd5wwb6jmvjwaaifdn4sia6bj"; -"schedule.doc-1.20"="m45jrx0nks1q26j75h9s9f3zacdc433q"; -"schedule.source-1.20"="gsclgm1vyfv8gnb5lcrgjz35ipvi4wv8"; -"schooldocs-1.0"="78kvxzxhp8lq2pxhcbdzy3jydq7dj05f"; -"schooldocs.doc-1.0"="zsa4c28bnhyz5n1gnhp35fvpc9886qci"; -"schooldocs.source-1.0"="s2vbjcsgjg3zrdrs5r645lz1hgfm4q55"; -"scontents-1.9"="hh97r1s523a6v2ay9b704cqv744iny10"; -"scontents.doc-1.9"="34jdskkym5x8vmhwjkbfnvwdvk7x98pv"; -"scontents.source-1.9"="jx3mw5l964zggyczpxl8x30g8xcbbg21"; -"scrlayer-fancyhdr-0.2.1"="ia120za7k0rwq8qydlljdb2bklpiahh2"; -"scrlayer-fancyhdr.doc-0.2.1"="6zq9mxlll4v0yascd1izclvn33ryw9ws"; -"scrlayer-fancyhdr.source-0.2.1"="xkci6f36yhhif8p0i25h6z4khaifysrk"; -"scrlttr2copy-0.3a"="kgi950bw7jijqn93vzlvrdx9mkrv1sg8"; -"scrlttr2copy.doc-0.3a"="daf3y1bx8187h9270y4c13wrnxac23rj"; -"sdaps-1.9.8"="swij4rm5szzjh3pwqi7a2b3jzzmnxkwp"; -"sdaps.doc-1.9.8"="a6aif8szw295jihhn782lygi1k6sx1i4"; -"sdaps.source-1.9.8"="4h7km9vs0m0va5k8msmjwhxnqcl2lyca"; -"sdrt-1.0"="2pcbwfywj14n08187899xjdhrjr3zzlr"; -"sdrt.doc-1.0"="85y00dj8k3xd2dkd42rzwscq70rhhxny"; -"secdot-1.0"="xb2kkwqh8dwdly3pcd20k3w2y68avkg9"; -"secdot.doc-1.0"="ngfan1hhwcnppgfpvkm0y0a3bjab1fz3"; -"secnum-53657"="v0d0340lzkywygf6p9sfl31cyczf6dcd"; -"secnum.doc-53657"="4zxhvxfwiihagwp6pjg9mmim8k1n772h"; -"secnum.source-53657"="1kadpq20yaj2l8pljjy42scsj5hn1mpx"; -"sectionbox-1.01"="mxhi294c4y7knbwiz1i0h4akmlgi0v6d"; -"sectionbox.doc-1.01"="2gapb7fvm8l7m021gp281j5vdq61s1if"; -"sectionbreak-0.1d"="gpda9n0rg3clldz9yck9fqxhz7gkcvjj"; -"sectionbreak.doc-0.1d"="rvb6d4l8zblpcacs19pchyj1b56g0587"; -"sectsty-2.0.2"="7677w338qg7wxalski08070328f4yjcc"; -"sectsty.doc-2.0.2"="plwwncg7vkhqrkkh2b1a6wpp57h6x64q"; -"sectsty.source-2.0.2"="r3z90f7w1nw4hpn61fcrn8iy5m1867jk"; -"seealso-1.2"="2ndffdja6sdc1zgi9ayhfgcfa4ihrqjs"; -"seealso.doc-1.2"="95n5alxkf7brg6dcad5jz0mfnn7w42fy"; -"seealso.source-1.2"="511kb0ka070b9q0973c1khain6yslqmq"; -"selectp-1.0"="fp7iiqkb6xqw55v28rs80in6p47li70c"; -"selectp.doc-1.0"="wy83q63fdm33il8rvia43y1kq51rkc07"; -"selinput-1.6"="f4xcvq61azvc95rvijmiij8mhjq2ams8"; -"selinput.doc-1.6"="6pwfj1pn035vm2jb19sz1qjc523zirqm"; -"selinput.source-1.6"="hv4gdy52gpza79867li3img657779zq9"; -"semantex-0.463"="cg41r6nzzax6wpybk98syvhq86g54wl2"; -"semantex.doc-0.463"="3m1h2gc8h9ridydis9v6lnh1zq6cwffv"; -"semtex-0.45"="mb7w1wbpfwpjv9dcnzyfacw4p9612n76"; -"semtex.doc-0.45"="f0cwzvv4bsfn1jgvbyavr6455w5r684v"; -"semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp"; -"semantic.doc-2.0"="b1hyb592d0xx35p5dqppyfgykg37xx4s"; -"semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p"; -"semantic-markup-53607"="8x44h8x0qlwz95gh7wmgcq59ldwx59s3"; -"semantic-markup.doc-53607"="24d8xyxdibsx9k7jqdcsidpssfbvi7qn"; -"semesterplanner-1.0"="wcqxq4w4shlj7r87jn6ivjwa5nyj8wbm"; -"semesterplanner.doc-1.0"="ndfk7h5nxr18yamb5m0z8d1n5sd05xcj"; -"semesterplanner.source-1.0"="ininzdhnah46n0b5xi78lc3qq8bwy62k"; -"semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn"; -"semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a"; -"semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv"; -"semproc-0.1"="gsf23afimbq3nhqka6vdbxjdasqc9f5j"; -"semproc.doc-0.1"="iki2yxxxmq90xn2bbvxv942rl3lbfi0c"; -"semproc.source-0.1"="rdzjw86dk757ddhwzw3z163zjigjnd9b"; -"sepfootnotes-0.3c"="chdd6rfn5v91c7sc3anf8rq1w7i49g47"; -"sepfootnotes.doc-0.3c"="h9k1nlwdgxynifqcllbplw29hhakzsfx"; -"seqsplit-0.1"="zc3fmzgnaxlx4jvbmqr4g22xqqr46qm5"; -"seqsplit.doc-0.1"="ans9jwdygk6j84fiwxjwr4z07rsswsw4"; -"seqsplit.source-0.1"="syxc6bkp4i55zvrs8sxg8ncq5gmq74xh"; -"sesstime-1.12"="ilsqh79rlc12ayvkwwpnbbcj033ksmid"; -"sesstime.doc-1.12"="67zpm2bqngwd9hpl5y8bvfr7iln31j2c"; -"sesstime.source-1.12"="w2aia0hdnsmhz35g0r1jjcfwwh2h61cr"; -"sf298-1.3"="nvb0bxh78nzvjk3x4d69mmcdbhfxnm03"; -"sf298.doc-1.3"="hdnvzghnkkgy79q6r2b9qqx9gda162mc"; -"sf298.source-1.3"="ixwa6c8c44ph14b5a0rz0js00jac9kpv"; -"sffms-2.0"="jaarxw1lmdgsac04fzdggq0pkaqp0y8f"; -"sffms.doc-2.0"="kqfjz0yn615f068v6349lgdp72gw2wkk"; -"sffms.source-2.0"="h5sazi91347l3qdkn6ghw6ywyp5ddryh"; -"sfmath-0.8"="mkmjhc5jg8ylbjdzx3yal2r3spxv3npz"; -"shadethm-53350"="6d2vr8xkis6ah0032nrbpbh3rs29xh2r"; -"shadethm.doc-53350"="iv5jbkrj3gc4iajykq4bm6g1lvpvjk76"; -"shadow-20312"="xifs7y18wdkg1kj656swlvx7cpswmgma"; -"shadow.doc-20312"="ppc90h7d8qm8382lp2vzn5piy0mb7d4x"; -"shadowtext-0.3"="m2qsn137ij2l4lq4h0s5mpw1vvic0k4l"; -"shadowtext.doc-0.3"="894a2s4awyxc0vc7d94fp0dfahjq4021"; -"shapepar-2.2"="hps8xx8z0vviywd61vhkh8l758c0gndd"; -"shapepar.doc-2.2"="6i0vwmvrphkjrqphk7vmxphhcvj89f0n"; -"shdoc-2.1b"="grva4fsbp32pq2x7g4wb415y5cmf4cnx"; -"shdoc.doc-2.1b"="ba16nzmjm53zjq81w2zb6npd21wjfg31"; -"shdoc.source-2.1b"="mqn7081yqr3l1yhv3cxxrq6jwnd2h6sq"; -"shipunov-1.2"="y2wk01lmmvjgcfakrn8299qxdg01k0lb"; -"shipunov.doc-1.2"="2j0rf5g6w08szbw6w5wnh45sa9x6hlw2"; -"shorttoc-1.3"="win5ajcivg0ipf38dx85vhhmfjfl1scq"; -"shorttoc.doc-1.3"="9msyjwld245v4a3qvl87q9wxl33rdyg4"; -"shorttoc.source-1.3"="frmzabjdlmlg6n8ds6g45wcm1qackwxw"; -"show2e-1.0"="4gp9cvjx4s9zvsg6ygvpggy35f2qpgxk"; -"show2e.doc-1.0"="zbffqf6nvy9r3ghn718xz2w5piyjqvxy"; -"show2e.source-1.0"="ikfkd1bw7v2s1jv2lzcv5cpbxx72w0f1"; -"showcharinbox-0.1"="282ndmd5991sj7s7znbp3w6sfrl42dmy"; -"showcharinbox.doc-0.1"="xc0lm97nc2j5qs6qa45gh12g4866pdzh"; -"showcharinbox.source-0.1"="v0mn2l95n4mhmxglwrqzwcs9h31hb99j"; -"showdim-1.2"="8pk9x9rwpa46lxxxcrdrj8qvifs30x19"; -"showdim.doc-1.2"="g9zbjc1awcan45gik1czyz2ggnygzzpy"; -"showexpl-0.3s"="66sf5pdjbp43k69vwz2c5pmiibz7m420"; -"showexpl.doc-0.3s"="jyykmsmxbcf0bmrr26mm2179l2nxj1n5"; -"showexpl.source-0.3s"="mz2z0a4crkf98lm0c585g51135cfj8pd"; -"showhyphens-0.5c"="fcmfcmzkv9k6k2d6l2brhwwvffzz3bcd"; -"showhyphens.doc-0.5c"="451qz6c2k3mvnr488s138m8wmgsf1zvs"; -"showlabels-1.8"="qpsrz097whnqv7phnrpff1j4spc0ccrx"; -"showlabels.doc-1.8"="7pi69s9qfv69piak041lxa0vy3swg91b"; -"showlabels.source-1.8"="raf4jncf7q4i31g7pswqriafllv6rw3c"; -"sidecap-1.6f"="2fcmjz54dxmvynqhmyp5wjlim72rmd7h"; -"sidecap.doc-1.6f"="c4j5qlprbhhki237x3ribn1hhwjiznz5"; -"sidecap.source-1.6f"="22q6s65b782lb9pxqi5iplf6nmf5ni8y"; -"sidenotes-1.00a"="h7vx68dxv5l7g8yzkx64zbp53jcv5fp0"; -"sidenotes.doc-1.00a"="nhdavdiw3am7jy49kyqwiwawk7xyxnkj"; -"sidenotes.source-1.00a"="b7qjs3cp62w3mya7sg1l2z6gsmp0hp26"; -"silence-1.5b"="nabq9i9ix7b42zkk5zq38bl47fhc46vi"; -"silence.doc-1.5b"="9rb3mgnavsarwar2i58s9fp4m13pckrs"; -"silence.source-1.5b"="i3siq83ph2lkjfrvc2zbmn5l2i5ssxkc"; -"simplecd-1.4"="i1cpvz6cd0jp6jw2r10s9qlyqig991h9"; -"simplecd.doc-1.4"="5q6wvnkcx16vpfpzngc194f107fjmbnv"; -"simplecd.source-1.4"="vwb34fhkimk2zsz5cqg8hslvqwsi53s7"; -"simplecv-1.6a"="yif1v302airw953py87hf8xw4vdvcrh1"; -"simplecv.doc-1.6a"="172h9r26s8zjpla2g0ah86z1r9k06cy7"; -"simplecv.source-1.6a"="rqyp3gq1k6mbbfmvxi437dxh50qrp7n2"; -"simpleinvoice-45673"="kib8y509s61mzcg5rzcc7s30ii39f88y"; -"simpleinvoice.doc-45673"="47f3zyl0g351p2xihryq6p21qrphi62i"; -"simplivre-58414"="z08sdwb5i8clwvslj4iwdkj1spz435wz"; -"simplivre.doc-58414"="p4qfl4rvf941igw422pqak6c4als7833"; -"sitem-1.0"="vkdrrirvcya04rdwr05q5ah2r8qz68d9"; -"sitem.doc-1.0"="asga3xfkxjg1f7zc6jlnmra2bjaxw00k"; -"sitem.source-1.0"="9i52d6r144z0067v8skq23774dg8fk1c"; -"skb-0.52"="4abwsdqy977aj45v4frjhf5p4kqi08aa"; -"skb.doc-0.52"="hgwacvlqab84b3nv6rnmd79irl1ilzkn"; -"skb.source-0.52"="v3b3ggy38vp9z5b9n802dg0xi22yjpwz"; -"skdoc-1.5d"="bg0yb5d0bgmnqy12y2irpxn7zfqhin3l"; -"skdoc.doc-1.5d"="9k842q2wjblz991x81554dqn9lshskd0"; -"skdoc.source-1.5d"="991wi8q2b3fhnzddnr0wwbnwis39mczd"; -"skeldoc-0.1.2"="azvskj8dhpk3sprm4z7628siy7plgyw4"; -"skeldoc.doc-0.1.2"="hw8lla7r2kwkppf28xzp1bjkp6gy1nf0"; -"skeycommand-0.4"="w3sqnw1xyx8l1qb9h7j8jg8z3f6xsnvi"; -"skeycommand.doc-0.4"="y8kcbdpydw0an53vfw75nvs8f5rhp5f9"; -"skeyval-1.3"="r39dajvb7hh6437jbq3gly44i22im66z"; -"skeyval.doc-1.3"="g9gr3bwzslymzx3a5kja4n4s1n0ns5lm"; -"skills-1.0.0"="yhi1ypj4yqg38rg7zwmh1cr1h9r1cdsk"; -"skills.doc-1.0.0"="xlsk7bhrbn5974wjpxdjsm45iab3hh8q"; -"skrapport-0.12k"="3hili1y9sl6x37pixcsz33a0r1aqqvg4"; -"skrapport.doc-0.12k"="0w6nri4jmaqv9vi8rpg7wd9b68jk58fd"; -"skrapport.source-0.12k"="11fvh9n4pr8xsgg3zwvdxly3z9qrk87v"; -"slantsc-2.11"="mnqakna7b6f0pygw4c66jmxy2r2srpyq"; -"slantsc.doc-2.11"="p4z9p7p33xchy1vqjqpiyw38is5irja2"; -"slantsc.source-2.11"="8c2vrhsrgfpqb47wxik1inq8xpa5r50g"; -"smalltableof-20333"="a0sx95bj2ampjw3b7g4p56ji7fqwmdiq"; -"smalltableof.doc-20333"="1qrbnkki1in5kv142d0qzl3rxmrclm69"; -"smartref-1.9"="7pvgdpjcdvdxbkb1ag4dal46c1hg4d53"; -"smartref.doc-1.9"="hj0c7i3climwjy64h98ddab5skczf3mh"; -"smartunits-1.2"="z3kj39xpdk8pa7bzqdjd6g6qlhwx2vhx"; -"smartunits.doc-1.2"="r72h43bvig293769q6s8glhdlrcg9836"; -"snapshot-2.14"="6x5ifdy780sy1kps29xh2k833cqlm295"; -"snapshot.doc-2.14"="bb748sr7gilrsw9s7q0bvc14pqj2aypa"; -"snapshot.source-2.14"="d9y194pxkkb90gbigwp9kcc84zy4gbqr"; -"snotez-0.5a"="f4w7klr766ll5gwvib5rwvviqaqap9cy"; -"snotez.doc-0.5a"="9siiyz7x76rh3jrlrrpkr9wgn4ca2b2s"; -"soulpos-1.1"="908fbjhq1zkq0p3qg4ihs62zxd18988i"; -"soulpos.doc-1.1"="7l3pl7mbjmkpr9fwkrdcyjkhqvw2jfdn"; -"soul-2.4"="krkmw15blkx20x947657pddl5kda59il"; -"soul.doc-2.4"="9p399dgxvrfrlcsqbv9sknia9sb68xm3"; -"soul.source-2.4"="hk83yzxa8d8nqg0jyx8wzxwvydhvwf7v"; -"soulutf8-1.2"="90gd4zgr0nsq5ccx27cj32b84rnbk7vf"; -"soulutf8.doc-1.2"="0hlg0wmni0qswpm7l3yzga6lc6wl2pkr"; -"soulutf8.source-1.2"="pspazx53c9dn73absjhpv43wiycncbgb"; -"spacingtricks-1.3"="lb2y9dmbizq70hihhh4l11z7kghgw1g9"; -"spacingtricks.doc-1.3"="i4kfvvpia2sl2b0nrr3m4s692nn9197y"; -"spacingtricks.source-1.3"="9d74zwmlr5r7g9d2332jmzd2qcpv8xjw"; -"spark-otf-0.05"="9siivrc6cbck4p4vg4ly0r1b37h7lw28"; -"spark-otf.doc-0.05"="y4v051bqbhwc91ipzdfqc1yqrzd5hg0x"; -"sparklines-1.7"="swn54z70rhmbk917dpl37mfr3sx21525"; -"sparklines.doc-1.7"="mjpd57symvhnv6jjzynalmpqy3l4szfa"; -"sphack-20842"="gdrva3zalq63d7j737247ja9a22abdxq"; -"sphack.doc-20842"="3rzyc3sxq2bnlx5pw5xz1kb2gb36brgy"; -"splitindex-1.2c"="72wrcsz1vmka4qal90la093asf12hs6j"; -"splitindex.doc-1.2c"="gf9j1mi46ih0xanr4lzl43gpfjpjws14"; -"splitindex.source-1.2c"="1y60d6s6ws70dgjhn239h4x8c77hjmdz"; -"spot-1.1"="bfwxb7c1lmbvy4g1q7k6syz7yk8wq0zl"; -"spot.doc-1.1"="68spn95gq3irq4rk4p0aw6z7kghriyw1"; -"spot.source-1.1"="hgsxqd8czj5vmy43g4mvvc3954vsmdi9"; -"spotcolor-1.2"="rz2zax5g35slfai6rqmnqslib7wsi14m"; -"spotcolor.doc-1.2"="yhcw8r48q7vi0iryn18d1z746ij1wpkp"; -"spreadtab-0.5"="9hd8rpqawnk531m802dzwf9bgq2h6zbx"; -"spreadtab.doc-0.5"="xcwr817pa38amnm8agrbwgh3c4bb2fnm"; -"spverbatim-1.0"="cpn7cc2f4ila3xfq8yrr5456y2p5navw"; -"spverbatim.doc-1.0"="bnw2p20z8ga1zynk3v8khpgfgbjb5jpx"; -"spverbatim.source-1.0"="ivjx22khzgn0xgzbkb5y8q36i9wh3n49"; -"srbook-mem-45818"="30fmldc7ygh6c4a64z9cb5qcr1z400vs"; -"srbook-mem.doc-45818"="mfn2i8vs1h646gn5fcs3zh7lrn6gj2si"; -"srcltx-1.6"="pamgi7alvxixzd4dy68p502ifdlnz7fa"; -"srcltx.doc-1.6"="1lja1az3vfzxkf2d7pl4cyxbliqml0hc"; -"srcltx.source-1.6"="wk74304mhb77p653l52gmhc990ic0dfh"; -"sseq-2.01"="rypda83sq8zgcnd6fmip2nw85dpqkb2h"; -"sseq.doc-2.01"="2zw94ka78zap6914m7r3xc9slzjr0vig"; -"sseq.source-2.01"="1fw0mc1crac3fps3s62rskzhn946zffb"; -"sslides-32293"="5j8zx3q4f3cm4c78q4vn8cbvp33frz1q"; -"sslides.doc-32293"="xsh6d0caydlgs3kfc0zgw4m79j1vkrxs"; -"stack-1.00"="p32bbliciimyyfpizvi0cdrw7nzkmlx6"; -"stack.source-1.00"="x3hkdwa9hip4zp8paipd8yjjz10pysn6"; -"stackengine-4.01"="nivan4carz07sqpiymvlkjxswkqa9mjd"; -"stackengine.doc-4.01"="1xfhqhhl578sbpgp0s3d2nhddv85dlwl"; -"listofitems-1.63"="kjbscx4fcjbfc502w6k03s466y7xnz34"; -"listofitems.doc-1.63"="h85gl0r28ig6fzm0rh972bxfs48ali56"; -"standalone-1.3a"="clgfqy3aqzn2pcalpfpmi70awz221pbl"; -"standalone.doc-1.3a"="q20i0dkgyfksm7npkiflphr7h2apzqc9"; -"standalone.source-1.3a"="lmqvfd3km9l0gbk05inz2ap09k5v8g0w"; -"stdclsdv-1.1a"="8dj2rvbpc7jbmn7bbxyvwpwmwpv9i1y7"; -"stdclsdv.doc-1.1a"="7rm7mkigckvag58agc7swy3yrg3jgpkg"; -"stdclsdv.source-1.1a"="3pkb3241arg1hl2gwh7ijr7wjy6naszs"; -"stdpage-0.6"="1vx4hlfyz6s89qxqk8kssq2z4j4bv7x4"; -"stdpage.doc-0.6"="qqh8y677jzbamylbm9jyx679sykp21ar"; -"stdpage.source-0.6"="asizav9m4vbfcrgl6c2qhnzsvl4ngmzv"; -"stealcaps-1.0"="8q97ghfyfnsmjp2jw2brp925hr82sprn"; -"stealcaps.doc-1.0"="3sdy3dqpi4axamhvshixk7hdqmspv446"; -"stealcaps.source-1.0"="xzysv6jy1bzcp1dww6imz9358id28lqf"; -"stex-50489"="gaf5gfk5kwfy1m8m4wwfkhx0cppxj58b"; -"stex.doc-50489"="rga6abj8kqig904y3wm4lmzi7lw9jccy"; -"stex.source-50489"="x7x55ags2g5ks59zpcphv1m37dc91192"; -"storebox-1.3a"="kc1a9kwyd31s1376b16hidk21cz2q2zv"; -"storebox.doc-1.3a"="qhjcw6fzxlkzpgnk0ra7l6fqp10byiv6"; -"storebox.source-1.3a"="6zzmya7fcjajy73i8iys9584bldh18z2"; -"storecmd-0.0.2"="k2y4zjx31k7014wpb0kvg3ivm3ssp1kv"; -"storecmd.doc-0.0.2"="8iskfkck7dgqj3i0knwhzqfvhmv1pr74"; -"stringstrings-1.24"="wnzqsj6nmivadhqqi5hi646hvp3cbzyh"; -"stringstrings.doc-1.24"="k0gm4v75xs9lzgpgqvks7pxbkr5jvian"; -"stringstrings.source-1.24"="j632ahc5hwr2pjazfyql1lxl4x7znr3b"; -"sttools-2.1"="8286phhm1l1sp2pk8smmrmw3wn30ab9q"; -"sttools.doc-2.1"="mszlb4py9kz4gfsgpr6y4qbbzdayrwsd"; -"sttools.source-2.1"="z8dgrhfjc0qwj7vn0qcs98dw7maysmbp"; -"stubs-0.1.1"="5ia769ndpi4pcrbg6cljdbpxsx353qlj"; -"stubs.doc-0.1.1"="apc0wxqj03fhbab6nwwh5rvzc6i9la8y"; -"studenthandouts-1.0"="3gss3z8gv8fyyj3qygmwmbp1jxs7k7dn"; -"studenthandouts.doc-1.0"="qjih5qdi7861v2mafv4bga62i0lmss3z"; -"subdepth-0.1"="p59zl1bmd52xsf51l1qf4ij5j7qj9f8w"; -"subdepth.doc-0.1"="973874d1ri46l5ixgzrlqxf09lxbhq3x"; -"subdepth.source-0.1"="sdij1y3j4dy8y19pb4aw2azb48i5rssi"; -"subdocs-0.1"="hab4i435srvd4mxbbd6jvg2dpcdcrxri"; -"subdocs.doc-0.1"="knk6a3wn83r8dnqigzx71rr2zn78v25k"; -"subeqn-2.0b"="26vzla83zaqnkwf1llwly1jnmb9dvgnp"; -"subeqn.doc-2.0b"="121c3hsq5lnfx05k85kkgym9a6554ilx"; -"subeqn.source-2.0b"="17dmj6k881xy7cjmx62ranh04x1j946b"; -"subeqnarray-2.1c"="6gn9rmk6b4ssblawa0q1ghhc0pj3d75y"; -"subeqnarray.doc-2.1c"="jx8qb5fyfv0dvkrxiw3dvc2x3hq2ik7g"; -"subeqnarray.source-2.1c"="17950bjzifqhmq4nbm0b3p1dva50nwjs"; -"subfigmat-1.0"="gzki9wj6fvc1rlq1izvbcrmbqqr7w78h"; -"subfigmat.doc-1.0"="kmrf6v742z4wvbrvnjxkzh0kvqnw356y"; -"subfigure-2.1.5"="rnd1mc9gr078d2vna7vwnhv420mnndch"; -"subfigure.doc-2.1.5"="zpsn8d5b6h8s9cwbl4fd9iv6w7hypmc4"; -"subfigure.source-2.1.5"="10lv7vivb3hggcyv8hkygjhhly6ixxlf"; -"subfiles-2.2"="l5p3id4vzmik187fsbx10l9789prfqsy"; -"subfiles.doc-2.2"="4c1bv5yyynn7wq4cy7m58sdnd31498mr"; -"subfiles.source-2.2"="lmgliaxdhrb2wx49fc5p2ws0w5wqanvq"; -"subfloat-2.14"="l7d8iz54q7zfi5764jfl8v786wihisw3"; -"subfloat.doc-2.14"="rx97nj1mh981n89pby4prni2wfmqisj9"; -"subfloat.source-2.14"="3a8hj83wyvwrsfk0v6ibzmz4ahzvbkv7"; -"substitutefont-0.1.4"="rga587cq7pkf8b6w35pz76ifpb9h674i"; -"substitutefont.doc-0.1.4"="scmkff0sh6wypcq03sz2prsj7qx362ak"; -"supertabular-4.1g"="2rh3aa8ch5jm9yc4iaj349cd339wabw6"; -"supertabular.doc-4.1g"="5n3nyqcxgn9fszv2njl59rgadnbg2n45"; -"supertabular.source-4.1g"="vi7q7isd5xw019q888apkp0rdqjzzi76"; -"suppose-1.2"="1kw1z2haha6j3795q6lwd0a1qclgpf0n"; -"suppose.doc-1.2"="zbng9h4dghvba86mm94a01mbb0hqa5vr"; -"svg-2.02k"="64rbl8z8f2h4y0nald9alxq81dqkriyy"; -"svg.doc-2.02k"="z863fd7lspbpdmzym8bx95csfdjnc6yg"; -"svg.source-2.02k"="6sq41726hirllwfkk0x9h6hl804cdmv2"; -"svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2"; -"svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r"; -"svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic"; -"svn.doc-43"="94872fxawm8m49wk0maxvgxzhy000v90"; -"svn.source-43"="08x25isf3p3ixrmc3vy7bdq7kzx72v7k"; -"svn-multi-2.4d"="44fslkzz4ivgq4j3svwhyh1hy7vrzciw"; -"svn-multi.doc-2.4d"="8yayqnji00qcgjah49ffbvwhhdiy9b15"; -"svn-multi.source-2.4d"="4pacxngn9zj7p0hynj1nd3dync6cgaaf"; -"svninfo-0.7.4"="761kpr460h6nfczsf1vakdj9r947in1s"; -"svninfo.doc-0.7.4"="qlhr7rj98m7g55kgrms1jjw3wp3k7z4v"; -"svninfo.source-0.7.4"="xsf1rs0ar8ris0dh8qbslxwx5i0ci6ck"; -"swfigure-0.9.18"="i8j5r40svsl99znl7dwbz6b6fvk6i0lx"; -"swfigure.doc-0.9.18"="3c383j9lc6751zffvylh0xlqy9irph78"; -"swfigure.source-0.9.18"="2vcw78dyrpyplf5fap9vsv9wmplg4wyj"; -"syntax-15878"="1bvja2hjsw8p68202f84sbzcrs0f7d27"; -"syntax.doc-15878"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr"; -"syntrace-1.1"="02njfsdqh7ssnjcsnpmzi3iwxz2yfj9f"; -"syntrace.doc-1.1"="v5q7643l6spib4kf6mma67pl7xm8aaqc"; -"syntrace.source-1.1"="qqmfivdpilm8qp26v7kf3lcvfp582jv0"; -"synttree-1.4.2"="h94gmy3p4vdg2w1qffsdj02yc0zf04hr"; -"synttree.doc-1.4.2"="vcvl56r20md61vdwphvwncp0mn1105sw"; -"synttree.source-1.4.2"="wc8sjvp0fkvsw9ayybf68ka7c7pz7gj1"; -"tabfigures-1.1"="spwphj1m563rip8gq09fb97mz85yqwiw"; -"tabfigures.doc-1.1"="l68l551i2skm8yns6r2f1ji0kgxhx56a"; -"tabfigures.source-1.1"="6r4li6abzpgpv008xhy0x3lyywpy2w5d"; -"tableaux-42413"="b4zz5qhahr3kxwi68l2hh92w3v29gdry"; -"tableaux.doc-42413"="g4v3wbms4yw4wmzkm6v9aj3l46l4fcxy"; -"tablefootnote-1.1c"="axmzyplpbyfmhfx7jsijk3aaqcyc7c9k"; -"tablefootnote.doc-1.1c"="z65aphzdy953r1r3a5lzpvizmhs638g7"; -"tablefootnote.source-1.1c"="a1qbk028v26pld26654hsl3j3fc90js3"; -"tableof-1.4b"="q6bcg5m4s018c4fihhar660yr63nviqm"; -"tableof.doc-1.4b"="h5vaph5ql8h4rzk9g9zh5ysg7hia54fq"; -"tableof.source-1.4b"="68iil4aymv6wq7pm7kfszrq928gmv5g4"; -"tablestyles-0.1"="91l6ysgskdcijj4zh756956i9s4cmlhp"; -"tablestyles.doc-0.1"="8j8dyc0fxj53xi6jq8vabn7hzrd8krsf"; -"tablestyles.source-0.1"="5kdg1v2s60j7cmrr0w0q2qv58jznkxk4"; -"tablists-0.0e"="5f0qad58xlf65y5204jsg3ajlrmgga3y"; -"tablists.doc-0.0e"="2p6b5b3b693cicbsid4zfr4lqvyiw0z0"; -"tablists.source-0.0e"="jwabyps9hwly3s2xx4l0vs3xwkhg0a33"; -"tabls-3.5"="gdkxv2mfqga5w7pmc8dszx9csma95imb"; -"tabls.doc-3.5"="dg078n18gai6glbgwh0p45560s4zjs4y"; -"tablvar-1.2"="ap3wf7pg37i4cg5cyjzmns9kk4hig3gr"; -"tablvar.doc-1.2"="yvbnydls66gsbdmigljznnf9qf2h53j5"; -"tablvar.source-1.2"="9hjw3agsihfc7lwapgbmwrl9sa03l9zv"; -"tabstackengine-2.10"="df71gwvw34lf6xmarwwmpl897zyar75j"; -"tabstackengine.doc-2.10"="yi5yn8dj15sihk5hdwrjj8vmh3kgkgz1"; -"tabto-ltx-1.4"="9wp6kwifrrzi7xf9m8zgws5ym0vmln5g"; -"tabto-ltx.doc-1.4"="09g64mbplmfgkxhsgqk1rwqw2b8p36yq"; -"tabu-2.9"="pvg42mixn7f8vvz4ll8a5y927hhzh82s"; -"tabu.doc-2.9"="zsybb13fpnbffljq4w7vcpl3nmvg5xk8"; -"tabu.source-2.9"="88pnpips4j95nj427mydnjzqa5nmb2f0"; -"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; -"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; -"tabularborder-1.0a"="cfbcq6f60xjzsdwdcxnf9alsgdwcgi25"; -"tabularborder.doc-1.0a"="wgd2b7s6bc3349rbhhafcg9iz3wwky33"; -"tabularborder.source-1.0a"="7dchkfap6l9ff49i0xwlpxd04yvh672a"; -"tabularcalc-0.2"="6yz4wvk7638prhnwiwc8bs6fm860ck9x"; -"tabularcalc.doc-0.2"="clkpjkck0zxy4mw71hmm1alysdxjbrl9"; -"tabularew-0.1"="jzndhmbh4fnsksf70wbn4cylp935csa5"; -"tabularew.doc-0.1"="m1jnxhfd882nzayknxwmxl8n535j3by5"; -"tabularew.source-0.1"="1438gnd88289q786gddq2i5jf1gbagxa"; -"tabulary-0.10"="4lnwhfr4bnawqgc5hvmp9m5gi6dmw679"; -"tabulary.doc-0.10"="439yc9m6b5na2i8kg8axqgx2pwhlv2aa"; -"tabulary.source-0.10"="x6a4q2rfm6z97ylwh2skqcpjlf7kap5s"; -"tagging-1.1.0.1"="x89sfr6zw3szcw463a7hyydjancfr14k"; -"tagging.doc-1.1.0.1"="svs9ig2xs2c76mmyalsfsgvzw7x1x6zz"; -"tagpair-1.1"="cw696a7ccw159f38sa6av7f2cr2w5mcl"; -"tagpair.doc-1.1"="n06xlqq579by3hq5rwsmh0l6x1damdrs"; -"tagpdf-0.80"="dgi43k32aah5lnfcr5i8i701qpbaqyf6"; -"tagpdf.doc-0.80"="9chng34kaly6xp784xzkb9svkhn95hw5"; -"tagpdf.source-0.80"="140cfh7gvcy56287q8xazcsz9iyjzj75"; -"talk-1.1"="w3vffx02kp18gxkk2khsnhcpzhd6kvjq"; -"talk.doc-1.1"="1hcv41gh3rcxncfqv75w92a2hdnb55nq"; -"talk.source-1.1"="mvqbaz1vwya42g0idhhp948dxmb5z0q8"; -"tamefloats-0.42"="biipxghplzwd03drjpiisijhdzr4i04i"; -"tamefloats.doc-0.42"="mnmrchq7k8n04dx35r1plzxcw46hx4cj"; -"tasks-1.3a"="xy8c97wzbidfvw0q2q9wr2ww9c0wmwbv"; -"tasks.doc-1.3a"="grn381m3sb1lak3y78b2sjyb51nq7n5k"; -"tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr"; -"tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40"; -"tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9"; -"tcolorbox-4.42"="030q9hss3ldncsz2kypwrcvvjj69rhjz"; -"tcolorbox.doc-4.42"="m1grvl7n974qqrnz9y7bsgnmgy052vdm"; -"tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8"; -"tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg"; -"technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh"; -"technics.doc-1.0"="ljp1qfv5zl1mzgyg5cxb5bgsdm2bdbnl"; -"ted-1.06"="2rd9qzrp0i0yk9qzz4g2zsjafswd6m91"; -"ted.doc-1.06"="02zyzvjncgpgm4iy2nxkx209l8dhgkm2"; -"ted.source-1.06"="isk5yz52jxsdqq8vzcvr99xjcg5sy7pz"; -"templatetools-34495"="byxkf3ad6nbxsjvmqda6iv4qxwh9r66z"; -"templatetools.doc-34495"="yv7q44lxn02yn1fawm3rkcdia11hq99s"; -"templatetools.source-34495"="4cvfpn19a3cqhx9sx2jin35ycakq4wi8"; -"termcal-1.8"="brb1gf3h9zaa07s0ppbvgjiava0yh9k9"; -"termcal.doc-1.8"="3k8kgf7fy8b24n2jbx79a55awzs54far"; -"termcal.source-1.8"="k680hlhzp03wfxnxld82sgsnaggfw38g"; -"termlist-1.1"="150mm3428j9yxvl6jf2y6l66wcymnx1h"; -"termlist.doc-1.1"="b8kdav6vj2hxhfas9s69njvg61263qla"; -"termlist.source-1.1"="c3bvnl6srxclx3fwhrkn9kk1wb08g1p5"; -"testhyphens-0.7"="xn9idcggd15gxl0iaphmlafpwq8ywilj"; -"testhyphens.doc-0.7"="fpkvgpd63hz8zyra7l22rgb9cr4yiz3a"; -"testhyphens.source-0.7"="fg7vps18xgf21gknlbcdikxn1yswafx1"; -"testidx-1.2"="r8p1fcwygn1i6qay7bj0g3qsh1xbshyp"; -"testidx.doc-1.2"="42qb4bpx6fiqg785ij9nsxm23mj291yz"; -"testidx.source-1.2"="kigppvv8csnxmspyd74928qz4r829ghy"; -"tex-label-16372"="wc2rqwp08adm869xmk7a6wkyzhfkbv6n"; -"tex-label.doc-16372"="lf9ff6q6n9rqng6akvbds9f1c6xiq5m4"; -"tex-label.source-16372"="vg5180hyadc0bl0hci4wzx90fvpxa2h9"; -"tex-locale-1.0"="l1ivcvf81xx7g4qm4jr778ssnyzf6m92"; -"tex-locale.doc-1.0"="01d792zq1yc408zzs3lpx3zffv7bi85f"; -"tex-locale.source-1.0"="ak4a3mf5q29g02rx6iy7yv2kp51gdqjm"; -"texlogos-1.3.1"="la6b3lzn1c4gw025npmz5xdm5rnq9n0c"; -"texmate-2"="0i38p40p8maw2v0lypaph7fad88dar56"; -"texmate.doc-2"="vaq40vr5526ic3fjdb2n1fr1q9s58wkv"; -"texmate.source-2"="ngmx2xsnp23cb9qg9n9vh9bl15jgyc3m"; -"texments-0.2.0"="sxnhbqflb88xcmnikjnp1g06zirwc5yz"; -"texments.doc-0.2.0"="lrf50hzpikrzd42q3ihrr1j7sv5prlzq"; -"texments.source-0.2.0"="hb7da3zhw9gs8kr50r6afq7jzs1ybqp3"; -"texpower-0.2"="i05qrli5978ydqd8hax9p81disb96n22"; -"texpower.doc-0.2"="qhdk9dhzlb9kb7ns98c6k5p105kdi4pb"; -"texpower.source-0.2"="4f9jhvif763mqkmkazzalwxilnvgw7mg"; -"texshade-1.26"="hxrldxzv6ij5m6qk9vsw6vrf1hp6l3cb"; -"texshade.doc-1.26"="mb4dwz87c8idg9gf0vhk1h38mbwpjlxb"; -"texshade.source-1.26"="ab64skf5iygxdiw32sifh8781k8wm3b0"; -"textfit-5"="cik0z02pjb3a4xsbrfqjzva9m8cyab91"; -"textfit.doc-5"="qzr9w01bk6ia7hv5r21m2nbfz2hldc4q"; -"textfit.source-5"="g7ij0x5yghxq9jfr5vxq7vf5h8py3jx0"; -"textmerg-2.01"="k9zrf9l5a75pzf1c30fxx48kly07m2rj"; -"textmerg.doc-2.01"="bjgcbyn95fi8kpq91kkhhxbarw5dn526"; -"textmerg.source-2.01"="4kws4jyfmh7w7z258clr3dd4x7k98iqj"; -"textpos-1.10"="m4i81jmy2p4ggyp0s5csr76bk73i5wnr"; -"textpos.doc-1.10"="9nx53mmh965w20qg5mkijvsihqzby1w9"; -"textpos.source-1.10"="465vdydvrrmphq1qyyqnwnw5xq8dvgzq"; -"textualicomma-1.1"="99h4pfsjnfy89xpwh4djj8fnhkwwxi3z"; -"textualicomma.doc-1.1"="10pyym40s0jszs7632hqxna94x3czwrm"; -"textualicomma.source-1.1"="14fqq28b54pw4b65kv1kwxif9fcr175p"; -"texvc-1.1"="x48959hg957jqqqf4ijb6wiifbrm71sj"; -"texvc.doc-1.1"="pxgl51bvjh0dq9mbs3p65v8giqz5p4zd"; -"texvc.source-1.1"="snic6z1hg65qvljsg4c5faqrjy7hk9qg"; -"theoremref-54512"="1md9iqkfgbhg6v64sgm94lp66x085rwr"; -"theoremref.doc-54512"="846wd88w325ganigw2g9rvhcs9is6ziv"; -"thinsp-0.2"="flil5f3fr9ghxa0bffvqy7wackrg7q27"; -"thinsp.doc-0.2"="pk93sirkywa7hmqggnapklyz0bqy04c2"; -"thmtools-72"="3pkj810asyqi7da0lfg5kbaidvcs4kmw"; -"thmtools.doc-72"="bqgckfjp266gi9vi6cbqx9525ifisf6l"; -"thmtools.source-72"="kica26al0rd71l3isdl4hv5hwizh2faj"; -"threadcol-1.0"="jwbi62xbc0cmzv65spvx1i6dijg34w6n"; -"threadcol.doc-1.0"="j6v3gi6c2cnhs8z5pm0j1cwg7ayi4hxj"; -"threadcol.source-1.0"="0irgk3ajakrjf1bgbfd71qvpy35fklmb"; -"threeparttable-17383"="1fmr9sbssycx23ql343hvvk4k0n90bgj"; -"threeparttable.doc-17383"="4y119m8549dk5kv4sbhh614nijlv0vx5"; -"threeparttablex-0.3"="7slkq5cfxlah9ckr408l1wqxxc9x5hkh"; -"threeparttablex.doc-0.3"="46r8874q74dgja9ivs4i3wcg35lwlv0b"; -"thumb-1.0"="knz4ixhqam9i803vpaq6qmghx6n7h9hq"; -"thumb.doc-1.0"="mk0751c3mjb5fmw2yxjjk7az8d4ay6qh"; -"thumb.source-1.0"="nqdrk52fc7yrzqfk3bjxxrfyffxa3pjj"; -"thumbs-1.0q"="5ygdz2db68fdz929bqdj60yi8wnnb48k"; -"thumbs.doc-1.0q"="28cswirpmah87x2ll9bld2q95hyn9af1"; -"thumbs.source-1.0q"="pqgs9730gibbg66f9cspb9qlkqraic52"; -"thumby-0.1"="15knwd9cgdmai53kdckgwap67qz0fmn5"; -"thumby.doc-0.1"="6k49q0bwkajwd7wf5wkr0028a7c6p4h7"; -"ticket-0.4d"="skfs956s0lzbxac4ydds9ynam475zk1y"; -"ticket.doc-0.4d"="c6d6arnzv37pczxs39h99s1isldk36fi"; -"titlecaps-1.2"="lf0q66qrj3kw5hs90fbhr93dz7ik1gx8"; -"titlecaps.doc-1.2"="qb1mj8p7srqz37f77wqs1igfcpl8wsg8"; -"titlefoot-15878"="1ggjs95rzvlmznqb8s67f7f3cjid5ynb"; -"titlepic-1.2"="psapnhni7mhwd94s2qmki4hdlpbq3dbs"; -"titlepic.doc-1.2"="c363symm32mhjg8cxw9j4xsmyhdl58kg"; -"titleref-3.1"="1ai0w05ipy1dlxm0n78jzvpdgp42j19j"; -"titleref.doc-3.1"="6rgspvqn51kiw9gpp9bc59jxlyk654f6"; -"titlesec-2.13"="69aqh5wsyycjczrw250kgp2ay0bv0qm8"; -"titlesec.doc-2.13"="g7s6fj2s3g0mj2kh69q0c72y5xak8i12"; -"titling-2.1d"="hzs20qk476wwff6ammqfv863zc50qnib"; -"titling.doc-2.1d"="m84ffgjikqkxfa4x86g7gljhpq1snxva"; -"titling.source-2.1d"="kr5gx6mfggxyxyh0c2pv1y9fzhzw6dq7"; -"tocbibind-1.5k"="f5kf8lxqhg6hn7qjnxxmrwphi11ndgk6"; -"tocbibind.doc-1.5k"="v5vwh1sm8bzqky6lbabvk6j3gjp8bxx6"; -"tocbibind.source-1.5k"="xq2f0iby2zafyghn0a9pjbvv1hw6z6fb"; -"tocdata-2.04"="yal5m2rnbhhv5b327qqwcbfqyqkvycdl"; -"tocdata.doc-2.04"="h0k923201mgxy4cd30m5476v5cm216fw"; -"tocdata.source-2.04"="dkj8b681ynkird2j5jwnmjxwcadcm4fl"; -"tocloft-2.3j"="i855nlns30831ls5lgzc0blbnjg3v4rh"; -"tocloft.doc-2.3j"="svwwfcyppadikp7jq1mfp5f24nrpv3m4"; -"tocloft.source-2.3j"="pqry1z1zpr1309fnah8frcz1mkx2iqk7"; -"tocvsec2-1.3a"="xwl43cb8m7y9vf9bbkc1lb198mh0yg9k"; -"tocvsec2.doc-1.3a"="pqvg5ky3w445h7i4hf1v1mcq5mpl3znm"; -"tocvsec2.source-1.3a"="8q0df51x5bbj1xphln6skb4cjdicfynm"; -"todo-2.142"="2ydakqj3py3dsviz4npq41s593blhag2"; -"todo.doc-2.142"="hs7ghig9yh4xhyr1y6n570vkiwmimv8r"; -"todo.source-2.142"="3gwsvfv1rhr1c6jb1xdgm9ycws6q8m2r"; -"todonotes-1.1.3"="z59z4qq59ysrycwcykda58y9rpz9l0zs"; -"todonotes.doc-1.1.3"="rnyl5f5jhaqc9xarwr9fqri1kk44j15q"; -"todonotes.source-1.1.3"="0dhfvw53zzk56z66r8pj75psqllc4g1b"; -"tokcycle-1.3"="nnqf9as1s205l96pc32qhg6ahmyb9285"; -"tokcycle.doc-1.3"="y0r6mfawkm4xiqw30an5xyxic1jn9454"; -"tokenizer-1.1.0"="k1ixh9ndc7r9cna3q86cccz4ibja32cs"; -"tokenizer.doc-1.1.0"="yvz9x41xdnf5449k2ixpbwrpgyhwpr5y"; -"toolbox-5.1"="czvh3swrgna1q4bf7dvbi6vqvaaja1z4"; -"toolbox.doc-5.1"="xl7w44azdaxsr34cz9fpy63pzfgz1pm6"; -"toolbox.source-5.1"="72cwzx2fbbqb0q7n8s2r8rwckfrfc8vj"; -"topfloat-19084"="a6wpasrna61fbpcb35m1gighj3xshfrp"; -"topfloat.doc-19084"="1gqq1kwkhj4s99vrqc3hys2pzr691k0d"; -"topiclongtable-1.3.2"="q985hj47w7zsf523mm9nx95lzj2sx7lh"; -"topiclongtable.doc-1.3.2"="b49ssbcvgqdl066vzsj62p6n2aj4kwjg"; -"totalcount-1.0a"="2xwhxznqfj62vnp9crpxs9nv89l578j7"; -"totalcount.doc-1.0a"="ylkzk9saf2h0yzv698slhqrw3kasi4pm"; -"totalcount.source-1.0a"="j1mblnmswzlvw6pfd8lla7i6hrnb52k6"; -"totcount-1.2"="mjp1wrksnwg89cj9si72fj1zjyrw9szn"; -"totcount.doc-1.2"="q1j4ja1xiqc4aahh7d02cnm8pvb356r6"; -"totcount.source-1.2"="g56d6lcx4g79iqg8af4nazv3lf3973ic"; -"totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f"; -"totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj"; -"totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj"; -"translations-1.10a"="9bvxmkzx0f7sk2yw8vyslr5bdq09j7rs"; -"translations.doc-1.10a"="75mzpk36b88bl7zl9jcbxhqi83j0rp23"; -"transparent-1.4"="dmcm4nfjmkxj8ycc0y7lgzklbfafm5cg"; -"transparent.doc-1.4"="w7vkf495ybi15ir7vpdv9n85wlarlfl3"; -"transparent.source-1.4"="hxayqrkm3ann09p5ffqq8i7vhn89k86z"; -"trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa"; -"trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f"; -"trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8"; -"trivfloat-1.3b"="vwnj2bh21crx1dkyhq36g4bxpiyjwany"; -"trivfloat.doc-1.3b"="dg12fam23s6510jskihm7hbwvf22p442"; -"trivfloat.source-1.3b"="dr1x8k6sx8rzfglz91clqwfyzl202sai"; -"trsym-1.0"="cxghw734kqq91crnbdrjx6dva71n13zq"; -"trsym.doc-1.0"="c9sygxys9bmz0j9a4w5lalhzggalayax"; -"trsym.source-1.0"="ybdjpd5m7l20jbzf3bxg302fh0r0g6sc"; -"truncate-3.6"="lxlfhy1bngnws701wa0c6zm10fi6b4d0"; -"truncate.doc-3.6"="1bgd0gxv4dhd4syr5cylb2gi2z4wcplv"; -"tucv-1.0"="74q08ki5qlbm4pvc5x9237sz648xy7b4"; -"tucv.doc-1.0"="vnqr21nhz99w92hwc2mjkr8618f1xk24"; -"tucv.source-1.0"="85rsysj0whl6f07njaxigyk14ij204gc"; -"turnthepage-1.3a"="kiaa5nrr0q0zdgbl22349ilfl23hlzvl"; -"turnthepage.doc-1.3a"="akqb1g5iyf9f7shvsm0v5wqzi43w8974"; -"twoinone-17024"="mg0zc3lsfzqfcj9w6qgqiynjkqki9h92"; -"twoinone.doc-17024"="8shpm77vq1ir8f18ix6ddz80jn0qg0ni"; -"twoup-1.3"="9zz59lr969ia2fr0kawfiibwfvjz8803"; -"twoup.doc-1.3"="scznf4yfaq02nd7yq3fkjxn2cnzhd0s8"; -"twoup.source-1.3"="rksz35jmn56sd5s5m3fmsp7a33rgk0c0"; -"txgreeks-1.0"="6g3vnp9prv91yjr054dshpgdl2f62w2x"; -"txgreeks.doc-1.0"="rvca7hs2rrssy46nd855knh10jkav8s0"; -"txgreeks.source-1.0"="aifnmmsvmda0vs6xvw2xrl3dyvr6sxkn"; -"type1cm-21820"="fnxv8a4anvnhl4a2hm1fx45hpdns24mh"; -"type1cm.doc-21820"="fly8yjqm52klwal3cpiw5c3c8pmy75n1"; -"type1cm.source-21820"="735jsqhiaa26wlbbwq764rl18s3j1s7v"; -"typed-checklist-2.0"="nb46bydygh6n37z3w9rcl4vdlgd0jlyj"; -"typed-checklist.doc-2.0"="wpqkpzji27rp6zvrhy988fgjf1mf9hn1"; -"typed-checklist.source-2.0"="yp6qcgrbhlggv7c7n5g40gmiz6azflz8"; -"typeface-0.1"="cfgy9wb6gcjvx6ki1paf42l8qwsh7glc"; -"typeface.doc-0.1"="60y2dvas00811spzl8bjwjzm6hz1plvj"; -"typeface.source-0.1"="v0i8v4sgr0df953cfp39d20shiyk69c5"; -"typoaid-0.4.7"="ab2akk0hicpkgis255a91bqzn67awvba"; -"typoaid.doc-0.4.7"="ab6c2n162jl25cmynkks5z0978ki0myn"; -"typogrid-0.21"="av412ig7qlf5bq7rdwvsg4ik5rsx94dm"; -"typogrid.doc-0.21"="assax9xx3pfnb27qal4q5g2wgxa87mwn"; -"typogrid.source-0.21"="nqrxi01vw8mia4pswp68yvj1rxnya86v"; -"uassign-1.01"="ik7140q4g30a15p6pk9lr09xzvpk9wr8"; -"uassign.doc-1.01"="774bv0pld1aswbmfddl40bxh55x2llk4"; -"ucs-2.2"="7czg37dhlnzl686gaf2fzl0khkl9cca8"; -"ucs.doc-2.2"="z3jxd58nlj0lkch4gc3jg4nwc2aqgzwr"; -"uebungsblatt-1.5.0"="9z0cwx5jfib1mfyq49bq2yl0yfacwg89"; -"uebungsblatt.doc-1.5.0"="vps5ya9a8z6hv7lynd0fwizwxdxyb52j"; -"umoline-19085"="2vm0z3pykwnz31pyxxpmgdl3bbpzxi0x"; -"umoline.doc-19085"="i3rs7g3iqdqnkhicadrnfr981fwkmw8x"; -"umoline.source-19085"="rsd9s0gqx20dvf6sk91gwzlsx4mq6299"; -"underlin-1.01"="vp1wvsy871d28x0z1rw4pgxw9abkr8yg"; -"underlin.doc-1.01"="8cbapdd7sbqfxs6s2fx6pv0d8x6b0sjs"; -"underlin.source-1.01"="52j0xlhajihpgw5mp5zgpnsaiqkyfr62"; -"underoverlap-0.0.1-r1"="k0if1va0b85k80mksnr14lrrgwbsjwf8"; -"underoverlap.doc-0.0.1-r1"="yb4cdch2c1n2hgcs552cjzpp2kiyk2r2"; -"undolabl-1.0l"="d93inn1bzkj056nz3syf6zplallmmjy5"; -"undolabl.doc-1.0l"="qjjvwf6sn52vcnsdqz8my9ahbvv6h26j"; -"undolabl.source-1.0l"="1cjwgz2bwq3rwmqq1q23jbk6dzzawfl1"; -"unitconv-0.01"="sda97fa30kkspqkcgcsiffsr2wik5z2y"; -"unitconv.doc-0.01"="1a5fiy50i32255z85pzvc1p2glfcqj4n"; -"unitipa-0.3"="q54x9b032qwzfmx5dx0bjs0qq22bb01n"; -"unitipa.doc-0.3"="ly9fbbzdzqjc6ipvr5zd6mqn7s0d9lgb"; -"unitipa.source-0.3"="jqh712827vacjsysklhsdgm330szza5y"; -"units-0.9b"="b92vh3z7cr8q1lp5cqzkiw2dhfbla7cg"; -"units.doc-0.9b"="3c1a9x0y99lb2qw8scb0x70jzbh5kjkl"; -"units.source-0.9b"="ha3bz0p0xanqznz0nyfsa02j32wjdl88"; -"unravel-0.2h"="6ngqd1mpj3akcrf6r25g5y32w18r4cym"; -"unravel.doc-0.2h"="l75wvabv32isssh3lsma3h3ziir74yay"; -"unravel.source-0.2h"="lzscffmk9ychmzcbwqanqzv7qr2rzxwn"; -"upmethodology-20200406"="z03ic80fkbnnsg5j9xk3ipp8j6102w64"; -"upmethodology.doc-20200406"="ama62wdhmsalan1y77ii0gzb6pnppgwn"; -"upquote-1.3"="3pr0j9wkyd8fzk026qk6vzsv5hlyccy7"; -"upquote.doc-1.3"="ilclzgj5m6nxhnz4398f5nwypf4jp2gh"; -"upquote.source-1.3"="4j1q8nck1g1cg4paz65l2zpvyimkf31r"; -"uri-2.0b"="4zxgavx9zjqqqvavpan2dlqkqjs3aqck"; -"uri.doc-2.0b"="dsfg7yx56y278kl5s5wwmnndiakn002m"; -"uri.source-2.0b"="samjvi571k41k0rv2scbnb6d8gnnamj3"; -"ushort-2.2"="p1yyh90qr3whijp18yjv9d6aqxp519k3"; -"ushort.doc-2.2"="p7n00vh408fnmq7j619v8dnj08fw5x18"; -"ushort.source-2.2"="jhn6sxdjyff94x69jhax021qfx39dca7"; -"uspace-0.04"="mc9j21cj64djdxspryc0knx00xm2krvm"; -"uspace.doc-0.04"="72420339xc9l7a1xaz1pdkn7clkdrm7w"; -"utf8add-55291"="37ai49lg3vmkark7jwyvjbcs165awqh8"; -"utf8add.doc-55291"="1s7a52r5qjrzkvrhymf6ksjl9k8n8vph"; -"uwmslide-27354"="zf5gky1nzsjd1jp5kq843in2prllnk36"; -"uwmslide.doc-27354"="m67bshz8bpzw4vcsj1klgh8sz3mnbx8n"; -"variablelm-1.1.2"="gmqg9y7mmqmzl04n1zh8gfxzglhh4afx"; -"variablelm.doc-1.1.2"="d12x54ynkf2lq50m97p9s3wh2jr1y5jr"; -"varindex-2.3"="isp8j60q76fms3g4nlgf6d6da6f2y0xg"; -"varindex.doc-2.3"="k6f0ji2kbz2slr8cbsbyifb4j19wpx0s"; -"varindex.source-2.3"="g260r972d5dicmhzdch9kp77fxxakpqd"; -"varsfromjobname-1.0"="hy3mbsrrdd55ky6ilrmqfgc5dsx3kdl8"; -"varsfromjobname.doc-1.0"="inwn7n9dn0lym3nfh2szc3vfszhns7vn"; -"vcell-1.0.1"="g4z68vrb7qslxdq1f31nawlpv5cma6za"; -"vcell.doc-1.0.1"="vfsfz1lzpcaqbrdcyrpjc99xylk5inss"; -"vdmlisting-1.1"="n25b8bdw43shzlsn97rk4f0x31k0i2ip"; -"vdmlisting.doc-1.1"="rjcgx3yigj8w0085q0cdk8yir2728f2s"; -"verbasef-1.1"="i92bhi5drkn26s6lc8kwdm2z5f2qr0y0"; -"verbasef.doc-1.1"="qnn12d8793pgj92wfi0254n1kgi96r4x"; -"verbatimbox-3.13"="zb6kvwdpd9a4s4d7wcax8j6c43f3dy7d"; -"verbatimbox.doc-3.13"="sjns6967xicryfcpg4jhwfplsw1sl6nb"; -"verbatimcopy-0.06"="jf7rbdzhqlssq6nk5pnn79dr7a1gjxjh"; -"verbatimcopy.doc-0.06"="2rgg2n7mb1gywp8npzrz8qvc3kfw02f6"; -"verbdef-0.2"="pc0nq3s0vzl7jdw8ncp0fgbs7fps6257"; -"verbdef.doc-0.2"="dak1qyfi1gpb4j16nklvyjh7gldb4b2g"; -"verbments-1.2"="wvi7plkxcf920mdw7qrhbi2fjph1fxa4"; -"verbments.doc-1.2"="3zc8bfvz8a707jzh7zdbmb3rkxwfv2yq"; -"verifiche-4.1"="yir67gi5wyhcnqn7yr8yz0sv6mhmmd3v"; -"verifiche.doc-4.1"="ycjy64j6r9lxdgjnm5fxh9i65cjh7kk2"; -"verifiche.source-4.1"="3abpr2xa5adqrsml13dybcv6zn8802p0"; -"version-2.0"="q06mavcr844zm0dlnk2fm43np58nvjlj"; -"version.doc-2.0"="7hcfbpwhb2ifxy3y84g6rgw2f7465hgj"; -"versions-0.55"="c1vn4pw5im1a93xpp59i3xcf5az1n326"; -"versions.doc-0.55"="l4znzf6z7qwpskdsdnhsdx264a07wvmg"; -"versonotes-0.4"="9k0hj47jjkdgnhhxbw87m5xnqyfpb7jm"; -"versonotes.doc-0.4"="mgp76qfszyhmq2fv5d93y6cs6113nxl6"; -"versonotes.source-0.4"="0zxi7ly18j94kbwq7ipd6ydbgvskc6m8"; -"vertbars-1.0c"="65mc3s841k2j2b02g5qvii5pysjim8pq"; -"vertbars.doc-1.0c"="w04gw5yg7wl8y8882g4brm1ny6hwq3f5"; -"vgrid-0.1"="5qfb52ndm5lf20ya2w4vrhivn7p6vkaf"; -"vgrid.doc-0.1"="s0rr15ll7fy2s03va6kxlgf4ng0dmdrp"; -"vgrid.source-0.1"="2fql0w1qmni7dii9qdn976j6xnypj8yk"; -"vhistory-1.6.1"="mdp8h17cxsj1pvi8q18m4lqn7109q26p"; -"vhistory.doc-1.6.1"="dfvbnfvrfz2k6fgyqdlvh4g8dzz5lq1j"; -"vmargin-2.5"="9zh2l4idqdwpzanfd1z47g6561pfznh5"; -"vmargin.doc-2.5"="3ngc0z34mhrpsv73yw9bm065msqllqwz"; -"vmargin.source-2.5"="yj7f5bq4wlrbynfbcq19534wlh06g6hc"; -"volumes-1.0"="vid094d44cn1lwq7l72718pcz71l60b6"; -"volumes.doc-1.0"="3xgxlj53yay13gxbrx7l5i8rfxn6391p"; -"volumes.source-1.0"="r5ks99pb362xrxfvafl35s1v2n1kj36w"; -"vpe-0.2"="pzaqk160w9401v9vw3zs9kg2kjpmcynf"; -"vpe.doc-0.2"="yr38k5mpbpd8jxvcycvpj0zhl1f75lv1"; -"vruler-2.3"="bw7zccv90946wxjbms3hclxahpxkcpfp"; -"vruler.doc-2.3"="kffmrjhmahvd1pyk1ha5slz34y8g5j9d"; -"vtable-1.0"="3yh1145v9bcj739qrlb685j25rk088n9"; -"vtable.doc-1.0"="w7yq9sbb3jw6k7wxbq2pdqc3gcivvqxp"; -"vwcol-0.2"="hff0d1za1i8jqaa5bd7r94g4zvsxrmcf"; -"vwcol.doc-0.2"="68p9iv66i4mx5l8s90ivl3w1pdmx9fim"; -"vwcol.source-0.2"="x7qa2d5f1hxxbiabgym4g1n1n0g92x1w"; -"wallcalendar-1.3.1"="9ydbcsxj9n0nmrkr4drlbqwarpsa3lsq"; -"wallcalendar.doc-1.3.1"="cpsswrvazx036hyj0b2mfakfhziplm70"; -"wallpaper-1.10"="hj7n1ajpapmwk51fnrhxawmgq6k9cxdv"; -"wallpaper.doc-1.10"="751a0gq1m6px853zvyvbxv8migdm1pkb"; -"warning-0.01"="a4agj71acw6kc20ikk8in8m27fcq7rld"; -"warning.doc-0.01"="pph8n9h9mqgh0qqcv3jb1v89ds8f1qf5"; -"warpcol-1.0c"="91kcbm5m59ym7kfjbhzdq20p9rhi7ci4"; -"warpcol.doc-1.0c"="q72m3zkgkm7fxfq1453jsmqidgacb2bh"; -"warpcol.source-1.0c"="lmr3rlbqz9q7j05glz4s8fyfrlm6ah43"; -"was-21439"="gw9043kq2ai4mkbcca20x5f10wnv8czz"; -"was.doc-21439"="y83pwhhkxlh92cr9b0hmps0izg2cjhmg"; -"was.source-21439"="cwqcmdh86sm58073zm929dxibw3flc02"; -"webquiz-5.2"="9qq4an9pcpirgzrfa7jx1mc74zz5y55q"; -"webquiz.doc-5.2"="36ykfxg7dqx2wzn5k15f85s9wm99c4xd"; -"widetable-2.1"="sv2di7hvsz6ivzb6a0s7dccrqwi2d0xz"; -"widetable.doc-2.1"="ilp88f761vxixsa37agrqbmqhbfyynq9"; -"widetable.source-2.1"="qwjaf2v8bgpgfir6vy5j87hwrkr4jcw7"; -"widows-and-orphans-1.0d"="dza9czq3b8r0ww0xlrmc20b6s2xaz2hy"; -"widows-and-orphans.doc-1.0d"="ciih7xrr7rhg5rhd2gmmby3ghxszb50h"; -"widows-and-orphans.source-1.0d"="cpv7db64y4r4r5w0hg8gjabbq7gp1bss"; -"williams-15878"="9xzcvf4nblyp6vl0vhnwi6lbbmp4lagm"; -"williams.doc-15878"="0fr8h1zsj1h1cf3qpjvdkg3yz4fcjdsk"; -"willowtreebook-1.01"="619dav4z2qv4llwbn8md0zh7kd7xchnc"; -"willowtreebook.doc-1.01"="13ipsdh703cr8ivw4slg5ddfqpdxddnr"; -"withargs-0.3.1"="scpyc35ch6zjsdi10iqajg7fs2i9g4gz"; -"withargs.doc-0.3.1"="wsagxy5bb8psai9zilrqxvw1hdbvkn94"; -"wordcount-1.7"="wn4d84kxf5phfn6f5imv91draca4wxap"; -"wordcount.doc-1.7"="hsddvb5521vmj65yns8f9d69nnwhh6iq"; -"wordlike-1.2b"="l4ma5j7ga4b3r6f627vf1vwcb872n3jr"; -"wordlike.doc-1.2b"="wywmq3nr85c130ag5vqi0hpcgq8vh2f6"; -"wordlike.source-1.2b"="3zrpdarw3brnc5w1c5bgvxj37qlpc9cd"; -"worksheet-1.1"="1ll03k444qn8zvji2h9xd75ywik46prm"; -"worksheet.doc-1.1"="dwab8sjshckkcm8vmrxr80rmrd31jih6"; -"wrapfig-3.6"="0r2wm95j00mxbiqgyk2d5vsb4l013zdw"; -"wrapfig.doc-3.6"="bb3z98p5kkhh2cw6qm0as75xv914l84d"; -"wtref-0.4.0"="p5kwcxjfwpcdr847651c129jjqj5vvlj"; -"wtref.doc-0.4.0"="zn0kkfbz04w28b0ybaqxyg8w6gw9x64c"; -"xargs-1.1"="s6g70azr1g9mg42k7lgii1ngmyjad657"; -"xargs.doc-1.1"="d8y9n347qlv5ybr4ahfqf51yb4g9wjzy"; -"xargs.source-1.1"="zvlns27k99jmi1iy7nyc03kyyy8kaycs"; -"xassoccnt-1.8"="8zs4hif0l7mw7xllcwg78zk4m8yrsvaw"; -"xassoccnt.doc-1.8"="pmsjqv3b0ap1j4ax0lc0q5lhsv3sql6z"; -"xbmks-53448"="apn51ljhxljrg6m2wrx9fgq9cvw7plh3"; -"xbmks.doc-53448"="pw86h72c5alcqi96l6i3f04yzv8m040h"; -"xbmks.source-53448"="1gqf2i24lbvbnbyybyqmmm4zx103xw8f"; -"xcntperchap-0.5"="qbrmbcwfdhy1as9i732naj5xnqd8zl7r"; -"xcntperchap.doc-0.5"="ql3z0qizhd2nxxjb5i4hhxvb43951rs1"; -"xcolor-material-0.1"="08zazp49lpmm92ang9i2q34kvx7v4rli"; -"xcolor-material.doc-0.1"="r646x6g0hwsi91hrxzz6b8l6nbbh3gig"; -"xcolor-material.source-0.1"="98z6j5l2iw9j1pyxmglm6b0gjdjyb2l8"; -"xcolor-solarized-0.4"="zwng9y8319hj7khamri46ppb0bcybpwz"; -"xcolor-solarized.doc-0.4"="c83zvv123bjwr6z10dgfih1k6b9wk4k8"; -"xcolor-solarized.source-0.4"="5p141gbzdasinppirw4wyb0mm9875bcw"; -"xcomment-1.3"="qnmk0vpj33sszbi3hfndscjwcmg1gf5h"; -"xcomment.doc-1.3"="m5a8wm984ff59mg0jsf4f402zbjqf0b8"; -"xcookybooky-1.5"="00gb5f064lmiwlhqz979cx5n8d2rxkad"; -"xcookybooky.doc-1.5"="02wq92szswqj8mj94drhgcpqw8px6j8a"; -"xcookybooky.source-1.5"="cky4lpad42pkh175nfddkz76nhl3q0bl"; -"xcpdftips-1.1"="qc6v9ab20hjwg3mb6w5mmzm3rzmavxd0"; -"xcpdftips.doc-1.1"="kr1fr1l8mp7zaj7hfwz0dddzchy2ld73"; -"xcpdftips.source-1.1"="5fxv00bzsn1hpb7qhxn2wl7gqgy4cmdg"; -"xdoc-prot2.5"="awz55rah1196cknc1qsy0dc8ra91dvjn"; -"xdoc.doc-prot2.5"="zx0nabzias47jm6270rmw9wqr117mb75"; -"xdoc.source-prot2.5"="51sid2ab4iwhybxhkwf5wwxflabqy4v9"; -"xellipsis-2.0"="x7m9da1658cxs5896bhn8cjdj0va03xr"; -"xellipsis.doc-2.0"="332vcqlqjbpm5hsqbcfq23avmmgjl837"; -"xellipsis.source-2.0"="3r007qgvxxcfvnd7942yafsznza0jdk0"; -"xfakebold-0.08"="yr38vnjrqgxnlzdrv0vjk0wkcpbn96g8"; -"xfakebold.doc-0.08"="pw6zlgy6qmlmi6gxb5p9fji5drzkhvr6"; -"xhfill-1.01"="6c09h61nlwbviwc1vfvmr4jhbrw2fs24"; -"xhfill.doc-1.01"="cw2rx4v66138fsh1vwxhq9smyai1xlr4"; -"xint-1.4d"="20qzgrnfkfd82gd5bzgmlkvyzyiz41fg"; -"xint.doc-1.4d"="6p5sw9crz6sxqnqz6xngjh8mflmbrzmk"; -"xint.source-1.4d"="50fbzfd1x7xj5kgcjqw2f4lv63ky6pp6"; -"xkcdcolors-1.0.1"="2g1glnkhcq4709y8hkkn3f6b3a4wh5dl"; -"xkcdcolors.doc-1.0.1"="ni52wb9gdcxdwzwdl78988anxhj5ay61"; -"xltabular-0.2e"="ll0q138s9xm3kapjmcl2iz260xgwiya7"; -"xltabular.doc-0.2e"="1qf8125m1hxzpf98w7jkfymbhcbsv003"; -"xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6"; -"xmpincl.doc-2.2"="dczhfj7g5h3gf3vg7wncvccn1q3xavqp"; -"xmpincl.source-2.2"="0pfma5c8agil5jamikja0qh5fnyd9wn0"; -"xnewcommand-1.2"="gc7n5467awcrcwyals55mclkx2ighp3b"; -"xnewcommand.doc-1.2"="i6hx2x96hwjs712zzrp5h8l020b7j0yh"; -"xoptarg-1.0"="dpvgxh3j4vz7k25vbi1a6936pxsg901p"; -"xoptarg.doc-1.0"="hlx9h66iaychpvzkxnwldkffj7fdn45m"; -"xpatch-0.3"="0qkzj03rh652wh954p3fjnh6jldph1xm"; -"xpatch.doc-0.3"="89fvzh1q664qilll13jgd8lf2753dbhk"; -"xpatch.source-0.3"="cqisb4m9n98yns96j1iglqdjjxhn0h26"; -"xpeek-0.2"="3dbw2vm05dirfvskchrmgdlv7l3n46nw"; -"xpeek.doc-0.2"="vr8bhx79vb9d4nb8ik4aa5xgiyr8sfp8"; -"xpeek.source-0.2"="cr6cxj638iwax50pkn60az0mawpx7m86"; -"xprintlen-1.0"="icyd4h8hs5yap04snj442adcw8kiknjm"; -"xprintlen.doc-1.0"="lrz20zfh7j4px543jqxy3ljm803mnlf0"; -"xpunctuate-1.0"="n3mxrha0440l5ngic93idrqw2agmisah"; -"xpunctuate.doc-1.0"="lrvqrndq151vfz34ycvjnh3sw77v58lz"; -"xpunctuate.source-1.0"="cmmzrijia2ir3mrhcq4s531la5kx18fj"; -"xsavebox-0.16"="myx02rad0qanxfvg93k228jagaw6fjg4"; -"xsavebox.doc-0.16"="0mkzdmjphmqlfh6kpjab1mg7ws7iysff"; -"xsavebox.source-0.16"="1z7sspx03mj51vshqhhpbfxm5ysj91am"; -"xsim-0.20c"="nz7kdw0g7w78pmqbwlbmsapzddpq648n"; -"xsim.doc-0.20c"="vdc6vcqq3fff653gpkki2sh266bpspyr"; -"xstring-1.83"="imwhw4cc68bs6q4f9a00sp7f4y6kvg6v"; -"xstring.doc-1.83"="5ad5zk5vvbk6wpgssvzs905b6nq6x8fx"; -"xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm"; -"xtab.doc-2.3f"="pmhfig6nmfimb0didacw2sja2kc1nik7"; -"xtab.source-2.3f"="78m8pqm3r7jhxy1p5cvqy7p0clpzwi6q"; -"xurl-0.09a"="2h8qp6r2i4rdd6f7lq34g40w2wfbhwv3"; -"xurl.doc-0.09a"="mnwhvjinhwwxxxcqyydpnnb9lz887q56"; -"xwatermark-1.5.2d"="5c0z0yvlrs562482lkz70w6n7i80mkqi"; -"xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj"; -"xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf"; -"xytree.doc-1.5"="05af0l0bbcbr5gav843zs69p917cx3xy"; -"yafoot-1.1"="j3li8wngwn6ljnjr44rykppzw9dlhf83"; -"yafoot.doc-1.1"="8p4wf74rmhl1xzyp11m3c8wrps38gv3c"; -"yafoot.source-1.1"="zjg8qb79hajfvanp58hzlms21gaipiqh"; -"yagusylo-1.2"="rbhp05f6y6zw687pdw1mbjvaf99v7qy3"; -"yagusylo.doc-1.2"="av3jf7zqa6rprfip5lm173xj2f1rffb4"; -"yagusylo.source-1.2"="6z69ljv1xpv2cn81l63d8xrbwrk8am5m"; -"yaletter-1.1"="br7r3x3n8h5nlfy36csx8a5ji3cf12wl"; -"yaletter.doc-1.1"="x5mhsm4pxjc2klcnwqyrz10gbq4kzw0x"; -"yaletter.source-1.1"="c1la5n24hxfi3paxwxd8m7lxpd083k0h"; -"ycbook-46201"="62sm9jbqxgqdwwm4w39kh5lax93lycc4"; -"ycbook.doc-46201"="piy9cpdcikzknnrdp27dfrciidcjspzz"; -"ydoc-0.6alpha"="4di93jv5wpv4bdng1ibkf0ma6m0bknz9"; -"ydoc.doc-0.6alpha"="80hq2xznj76kgj0zb6zv6li578kc3r2i"; -"ydoc.source-0.6alpha"="39128wyw2py0j8f334r7drff849ad2sv"; -"yplan-34398"="rm8ln7pvl6i672107i8hxic85s994g6g"; -"yplan.doc-34398"="0h0wa59ackd645spdqk9vqy0gzzp8f8y"; -"zebra-goodies-0.8.0"="p6f693z5cywmpln2i6qqxy0g4c0wv78l"; -"zebra-goodies.doc-0.8.0"="0d9dcng2qivm4p2h8112ii3pjrwl1f38"; -"zebra-goodies.source-0.8.0"="dgvli6fpzrs7jgalqvm8m4a8fqldkfnh"; -"zed-csp-17258"="ggjqzwn3zi9x8ziddkh7xizgw80qqlrv"; -"zed-csp.doc-17258"="5p8s701yk431qyngw010qws6b9shx588"; -"ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04"; -"ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm"; -"zref-2.32"="17gs2db0nrwc4hvrh5ha3lpvbnvzaxic"; -"zref.doc-2.32"="krs6a5w6n269rbr6qipmbhma2nbcirkv"; -"zref.source-2.32"="jgjibzgh4bzhxwdic53f8iw2f9f9400v"; -"zwgetfdate-15878"="ibagqadgb3nbq8y72lzhrbamv5xcipk1"; -"zwgetfdate.doc-15878"="idw9limrda31c7h0xd3j6v23xqbd2nn3"; -"zwpagelayout-1.4d"="h3kdf67z95ghbzw3fjm7rq9jra2qwnkg"; -"zwpagelayout.doc-1.4d"="12l7jzz3ab176z5rgrjv69fsmli003ii"; -"addliga-1.0"="v46mqcn3yabd6lliclwabya62hvmvpgs"; -"addliga.doc-1.0"="lrmkg7awc61rkjf6n8xn1hhcvrsiz12n"; -"auto-pst-pdf-lua-0.03"="s0l3pyb7y4pr3l67yp3yksd0j2fc212p"; -"auto-pst-pdf-lua.doc-0.03"="784dxagzkrphn2nby5lk4b79s074824y"; -"barracuda-0.0.10"="wk371cfiiy15swgvci0nqwi6493ggfa4"; -"barracuda.doc-0.0.10"="njyqsbr5sbihpm6392a3alh26alxd67s"; -"bezierplot-1.4"="y1vm9s8h8v75k0q73q8089gnr0647ir2"; -"bezierplot.doc-1.4"="crzlgln3g39kmqdba5dffqdx3p9fffzh"; -"checkcites-2.4"="2vzqckrpid1lxi5awbc3s1179j0yw9rm"; -"checkcites.doc-2.4"="5dfipwxsrf3jn446z9ar0caa8bsmw4al"; -"chickenize-0.3"="lmc9ia08np6k06m6fm4lkzp2x8ilng33"; -"chickenize.doc-0.3"="v5b1an4wzrgbp07lh1y0ccsqm4c2xqqf"; -"chickenize.source-0.3"="8mzsm3jdxa8ii448wg4i83fjxisihz4j"; -"chinese-jfm-1.1.1"="rx1518yjy9kdl5dk3bfd24sfhzd9nszb"; -"chinese-jfm.doc-1.1.1"="jf784y3vv9196bf2zf3p0149asmq64mm"; -"cloze-1.6"="6fnj9fvkd2969p095lrsk2rxvp3bqzx5"; -"cloze.doc-1.6"="sp2jppmdhd3w1z6ivi3kga393bhwqw6m"; -"cloze.source-1.6"="5b31196q2dpj278h0wjbwr193q96p0fk"; -"combofont-0.3"="kqlh6sp2y5ssbp38jy6svzgdva4m4sh5"; -"combofont.doc-0.3"="99h3xmx3jv5il99g6wc10csqkmpm5mg6"; -"cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp"; -"cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9"; -"ekdosis-1.2"="n727jiqjlv7qqnjrfp2jw4nm6s9yd1x0"; -"ekdosis.doc-1.2"="88ggl3assc8q8xqsr80gaqydrh7mjz20"; -"ekdosis.source-1.2"="vzk2bq9f5jz1znv2l5dbjakp2ajcbx7h"; -"emoji-0.2.1"="v664b6kkikc2bclfv4c2p4bh4l4fwjan"; -"emoji.doc-0.2.1"="51iq1l5488652ns99wl3irf3d9qsgwzl"; -"emojicite-0.3"="ycvzy0rk6ilmzv8jlbn0a6502j6n0085"; -"emojicite.doc-0.3"="52pdr7097pj8grg2m0y4h09cgdd626sb"; -"enigma-0.1"="1d9g45cwjgz5imk677zrza79fhwvz3cz"; -"enigma.doc-0.1"="57pmvf7xx9hp23jxaj4sfam0526y652q"; -"innerscript-1.1"="bbv052zvrvzrjxj04iyc1lyh7srnvj7d"; -"innerscript.doc-1.1"="864nlxd9pqi3kmmba7ckhnja40yg67y4"; -"innerscript.source-1.1"="1llgzhkvjh2zwyl639bbpsmjdmfaz4s7"; -"interpreter-1.2"="pk1rbxzpaf3gida3dcshcgl5c12rgxzi"; -"interpreter.doc-1.2"="p249plg4a7qmq65rm84qfs5xvjwywnw4"; -"kanaparser-1.0"="klyk8bqv233cxpg18q10nyzkhql9pqiw"; -"kanaparser.doc-1.0"="kvcxqykqyjdvca2zcga0p6hxiv17vhhj"; -"lua-typo-0.32"="9y1yvnv6mm0ka7d583dr0pm49jmv7aa7"; -"lua-typo.doc-0.32"="bzw7pnp7mksnqlmpdp861923jnwdqds7"; -"lua-typo.source-0.32"="8bf9cn68z4wsav8f9clsyfwbmlsfkxg6"; -"lua-uca-0.1"="wklxkis107v86c1zlyd5siqz7pjnykj6"; -"lua-uca.doc-0.1"="wbij33n1h6i7xc0rxbwdmbpxgpfjq2r1"; -"lua-ul-0.1.2"="r9dp61f1jny7mjxgpc0vrm326j8andbm"; -"lua-ul.doc-0.1.2"="hbyfh4rr2m6fgx0s0kfamiky96any2f7"; -"lua-ul.source-0.1.2"="4mnmgyzf1iwg3xxgwm3yb2cnfm6pn2wx"; -"lua-uni-algos-0.2"="52pjhipq7788hbldi78i78y5pk90v0l4"; -"lua-uni-algos.doc-0.2"="pkw96m767bgcms4k8hypfbzm1xb872fi"; -"lua-visual-debug-0.8"="q9v0clrwznlv66r3i4dq1srbz6a3nqd6"; -"lua-visual-debug.doc-0.8"="5ka8px5n50n5ghfi8k86svs347cahvpz"; -"luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl"; -"luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f"; -"luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7"; -"luacolor-1.17"="ndh87f7myddliqxxhgypg4sbb7852mf2"; -"luacolor.doc-1.17"="6dkfl0j6yv6f9rj4z7c15f19s4w00qxm"; -"luacolor.source-1.17"="0lafyqyqvmvl4ka21dkcy4zk04rzmkjy"; -"luahyphenrules-1.1"="5arrxlvdlvh3njfllkvdsd6w2a6yhbqd"; -"luahyphenrules.doc-1.1"="3zg4gjpik75ri2f8rbvjapydfzkahsc1"; -"luaimageembed-0.1"="0cc3hfkj5jqldnv95ifz4j6ls9vj44dj"; -"luaimageembed.doc-0.1"="66vlh8a2w7q9ng1na9sraibw5ixxlyc2"; -"luaindex-0.1b"="hlzsr82cp5vs41bvnp22f8jc3kkwyk4y"; -"luaindex.doc-0.1b"="k1nz25w1nrxbfcg8g9lrb4gm22i3m7ih"; -"luaindex.source-0.1b"="7pg6v1phdz96x5nmwsnf5bd976s2magv"; -"luainputenc-0.973"="a1q2xrryvsn271605s6ir0iymym4qjd7"; -"luainputenc.doc-0.973"="jyiy6f96v5nvrr4lp765vpvhrl96j67q"; -"luainputenc.source-0.973"="5v1n89k8wg4g43fnx0wz53gdxp7cvgji"; -"luaintro.doc-0.03"="gcz5ihcqinbpnqza158xsgw65h17lgi5"; -"luakeys-0.1"="zija2bpmxjw8jpwvvbr4lsb8zx9pjgy4"; -"luakeys.doc-0.1"="vbb1j73ja2xlq5wfg5lg2a2d9hs7fg5n"; -"lualatex-doc.doc-30473"="9vq4qxdsf4gfskrqpb45wj9m0jdkcykh"; -"lualatex-doc.source-30473"="jnrcirfvz7w28pcq3cvwb8g8khd3gzh2"; -"lualatex-math-1.9"="4cgzpjyrs5ndbs3b3x5sxn68pbyykcvd"; -"lualatex-math.doc-1.9"="dagvjsxx05430vhk8lqp3lbp4nxq6xss"; -"lualatex-math.source-1.9"="53dads0ml8318r00g8xk22ig3491b587"; -"lualatex-truncate-1.1"="imd10qn2sh19fdz4zp8qz57rqs0kh2n9"; -"lualatex-truncate.doc-1.1"="xfanw53qhm8qhqg45ykvvf213j3q5dy9"; -"lualatex-truncate.source-1.1"="sv3j09xlab2gfqn670wd41xgdk3rjc84"; -"luamplib-2.20.7"="arzrgg7v2dvywyqvzp95qb0psl4gxmz9"; -"luamplib.doc-2.20.7"="2lmz0sy7m4h4ljyaf1iysx0cbylhyn52"; -"luamplib.source-2.20.7"="2niyz4251vsn3zba6ylw3bd5x9bvcv08"; -"luapackageloader-0.2"="gmc8hizbl18cka1iq0xhy8bp65yrl4gw"; -"luapackageloader.doc-0.2"="ilsqrigd8gvczbfkcbr0ci54qlryhyhg"; -"luaprogtable-1.0"="cyzviwzjdg10rh7xizm90d9vbsqjscir"; -"luaprogtable.doc-1.0"="gc199zsnqkiy7dzb6x28frjf5xmmfkwv"; -"luarandom-0.01"="cj3pzwmgrh4d477fv551rlp7afxrsj0a"; -"luarandom.doc-0.01"="zfvmr0649ca85n06y0rdxx7plxrsk6q0"; -"luatexko-3.0"="k4rrf6lmqg9pyszi7rqd2z58134cdmfd"; -"luatexko.doc-3.0"="ykrj25ib6ww855g1c8vk7xdz2n7qsbrq"; -"luatextra-1.0.1"="xb3dbgfnm7ww87n60ydpilkwqczj77lz"; -"luatextra.doc-1.0.1"="4pfnnxaynvw166pp1ivb5pjp061n2bvi"; -"luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd"; -"luavlna-0.1i"="aw5n7z0xl8g1haxbm7iihpri3nnhrsjx"; -"luavlna.doc-0.1i"="hic4zrh893fyc0nmx4p5r8i9n7ddfbzg"; -"luaxml-0.1n"="mfc6hrdlf4kq0xfickj9p894av9hljm0"; -"luaxml.doc-0.1n"="xdbvbd6qy265j4ck813ycr5yi3v1655w"; -"newpax-0.51"="zfp2vysv2c6n31wgr0dw9zxpc1ns6qsj"; -"newpax.doc-0.51"="sc61h486xaxvdr3vndns9ag881v30p46"; -"newpax.source-0.51"="46p0hbild3d4b4x69qwxjj38bjf34vk9"; -"nodetree-2.2"="r5kgj9y7caj0npi1z70yvyfdsgmbf124"; -"nodetree.doc-2.2"="0q6c5yfwcsbfrdj1r2435kar1q4bj1wr"; -"nodetree.source-2.2"="dsccgf77bz156m8kj7hxcg8yylg3701m"; -"odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl"; -"odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp"; -"optex-1.01"="zb5yxw2lxflrb9kw1ipr9qxmdaiiybj7"; -"optex.doc-1.01"="hwd72yjcqxqjviwd4fjwmjmkd8n78krn"; -"pdfarticle-1.0"="gp3238h9g1kcamcamvhndgs1h9wav9ld"; -"pdfarticle.doc-1.0"="zh97mill1idcik9zhb8cp6wyq32lm7i4"; -"placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy"; -"placeat.doc-0.1d1"="x954mm7qhyffqbh9hrgrxa5khh5h70p3"; -"placeat.source-0.1d1"="l19sqs0ipd1pgpl6kzggfizxvc1cb1p3"; -"plantuml-0.3.1"="76bdwic6y2h4hprqnfxkp7pnsyf603vr"; -"plantuml.doc-0.3.1"="mirs5886m6i4z34r0rjzh1hgbxif684a"; -"selnolig-0.302"="gw2nwscxyg2p83bs90nnbg47wddkh0i1"; -"selnolig.doc-0.302"="d73jxs6xck7m5y95hx6nfls1572za6qh"; -"spelling-0.41"="kajpixvypcfl8ivqqnscfcd1fb1vv78x"; -"spelling.doc-0.41"="r0sqb4qz4n2w8n0092qik847f3dziq0a"; -"stricttex-0.2beta"="v46yv1014blp25l6zard4i6wdkbnsfzk"; -"stricttex.doc-0.2beta"="a4hz60n22504k60j2hj2ip3fc5pn874z"; -"typewriter-1.1"="4xbzb4igw0cd0p9ry0xxii4p8gj7y8w3"; -"typewriter.doc-1.1"="vk3rzpx4vpgs5mwq8hmys9m0vv6gmmdj"; -"uninormalize-0.1"="a9qjz4wd45prkb54v5fnrji5y1fi3r4r"; -"uninormalize.doc-0.1"="ab1z4pxac91p1ywijfipjclzdn7hbq1x"; -"12many-0.3"="kzixh8p9qmbz0hxczir6pixx8k6zc1an"; -"12many.doc-0.3"="v5qw194xha1w7mr6x3zcwp9a0gpi4w4n"; -"12many.source-0.3"="wqc3q5hqwg09g0sz7l5va9xazvmqbbrv"; -"SIstyle-2.3a"="35jza92m3n8nhfnqxpi4yx5xi90hf5mb"; -"SIstyle.doc-2.3a"="7y6y0ks7aa4yvqcw4jzh7rrrajm5lyfz"; -"SIstyle.source-2.3a"="i5kmfn2pan7a6bvl7saij0wbfq7xsx8g"; -"SIunits-1.36"="jpghwsag31g9f2lnzdzmfg1rg1vjxihs"; -"SIunits.doc-1.36"="1qalyh0q4lvlxxmwykaq3bp3sw76sscg"; -"SIunits.source-1.36"="6v2lr8gjm3f2kyqh7pc06ay5iswbi7p2"; -"accents-1.4"="8vq1cj9iyijb5lcz28w4d09j3gaw598x"; -"accents.doc-1.4"="qqgb9nrldq4bss1b90qn080zb278vxb6"; -"alg-15878"="2z4gi58401dsjwivwji0b169ihz3assx"; -"alg.doc-15878"="43bcrdwkqnx6rharxz9l106cxycm408z"; -"alg.source-15878"="yq6bvw0bwwqq8c367ml9p9cbimqhkr1v"; -"algobox-1.3"="7skblnz1s8jzz079j3cn4igaldvrbvxd"; -"algobox.doc-1.3"="f9dyljs5j5f19wf4zxn0aw76yfda6gy2"; -"algobox.source-1.3"="jkwrxj0z1j2gyd1322qadqzfrw86f8m2"; -"algorithm2e-5.2"="w36nldd3zkmg3v74jzg22kwkw0vhja5b"; -"algorithm2e.doc-5.2"="b2g0vk8jb1yqqi9fnkvxizpdhlaqjn04"; -"algorithmicx-15878"="8hvwf9c6b51yc623g8ivxqzwd10c1j7s"; -"algorithmicx.doc-15878"="1xcga5bk7fgqq2dad5mzv2v2x0m6hqrd"; -"algorithms-0.1"="s07h59vabig8jdk2d7r98hdnxpyq52sm"; -"algorithms.doc-0.1"="vwq0lnznxpwi4zpp4hjaljdfc3c2h6yw"; -"algorithms.source-0.1"="cskf3mpv2rk435przyidljaijx46fiy9"; -"algpseudocodex-1.0"="i0mj0y496zmm7x9ry0qzaww2z2aaf46g"; -"algpseudocodex.doc-1.0"="qz16lkffljsiwsv0062vly9rq5cz9hmv"; -"algxpar-0.91"="017p08grkzqagvbv99kj72rnddb6grah"; -"algxpar.doc-0.91"="ap7d7x4siyizyavia6lcavbni1132znq"; -"algxpar.source-0.91"="nm2dlsxkp0j07agz4dy3cbh2b2ixr548"; -"aligned-overset-0.1.0"="ghkj6baw3sppp8vi9msny8ffaf3f0mb9"; -"aligned-overset.doc-0.1.0"="falszy2yd14yzy1gzscp7d3arsb02pv1"; -"aligned-overset.source-0.1.0"="gcapvfxcx8s1qgzcf8f52l4w0dd33b5q"; -"amscdx-2.2x"="73dyfrnv14jh8gavjgivx0ldyczqlazc"; -"amscdx.doc-2.2x"="ya3ljfxmirpyaz7kj29mkyrwrhvz61y5"; -"amscdx.source-2.2x"="da89in5nc7m37m5padb246ra9gl6cjrq"; -"amstex-57972"="lpqwc8f3c8iv9691yxqs6r00dkjp9mh2"; -"amstex.doc-57972"="niz2zwkdpxcs0mpj2xpn704py545gbvz"; -"apxproof-1.2.1"="rv12vr5m8iw2fw6rp07l3srnbirz3ibr"; -"apxproof.doc-1.2.1"="4cfsxj3d8f2gnvrqkqsx2i4jarmpkvc4"; -"apxproof.source-1.2.1"="4vnna3hyyqrmq1i4fvkpdyg8isvcarx5"; -"autobreak-0.3"="61yyi2p6gf0sjydn5kr8h8qvpxgmvbin"; -"autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv"; -"autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la"; -"axodraw2-2.1.1c"="g9vd6wfm1v77c7rsl2y7cpa9rl1921zn"; -"axodraw2.doc-2.1.1c"="9lzv8lbcqay9szyzw2rg7dhglaf9qigk"; -"axodraw2.source-2.1.1c"="0qvxcvilb9v0k568f4chlmf6wviagyz4"; -"backnaur-3.1"="y970wq88dx80mbdsaadw18lckbiwgrx4"; -"backnaur.doc-3.1"="426dp81fwq04wqhng79sy1zj4d8igpgh"; -"backnaur.source-3.1"="pflnxz44r4vwhv8yhcdqkfcl5n0y0zfg"; -"begriff-1.6"="w5mcpc6qsm8np9n4lzqbq642frp73szn"; -"begriff.doc-1.6"="wwsqgp4ah07a8z28l8ji33mvj0w16l3g"; -"binomexp-1.0"="5jlh0g22c7b1i94n2qicn0j6k4zmami9"; -"binomexp.doc-1.0"="vh653aqsqkvcsmrvzhw1h4sqvirxg3yv"; -"binomexp.source-1.0"="jairxsdavf3ll4160dlbc39hriyyyrdr"; -"biocon-15878"="d5164k5f9rh092j3yd5vysfzcp6qbvc7"; -"biocon.doc-15878"="w3c6g9qr6s5pm76jq7v0fk4fs90p5d20"; -"bitpattern-39073"="s1gn3l5lfz24xgg768032s318gzx96zy"; -"bitpattern.doc-39073"="8nq9nd4qsrixnnw32saxp6272d26w040"; -"bitpattern.source-39073"="1xa4jib8aihzccs6lrijw5x0cvhlrkcl"; -"bohr-1.0"="5r65jri672mlqzhd26dmys54sj19c8kz"; -"bohr.doc-1.0"="8gsrm5xrxfqqgpljlyizlcdz4lw3xk9h"; -"boldtensors-15878"="ivpsy3mgqghbw4qv325j9rc6nwwmh9ya"; -"boldtensors.doc-15878"="nbg1ilwbjn61g6g93bnqhfm5xgrgqzgk"; -"bosisio-16989"="dinsh8vlzgch7mvajkqmikbpgmzryqld"; -"bosisio.doc-16989"="asd7h31zda58mwykhc4jfp5nwv21y7b2"; -"bosisio.source-16989"="m2y96hhgypgcsli8v19w6jn7y39d23vy"; -"bpchem-1.1"="c1qr5s3jp7zg06sis026ll5b38axvni2"; -"bpchem.doc-1.1"="54qyy00y03jbbhg00az5as1bc5h9i2fr"; -"bpchem.source-1.1"="r4bya1mqkjjnmzc14jlbv676ls312ynl"; -"bropd-1.2"="zhrvx29z8y1gs88y8lx7wvi0dlhamkmq"; -"bropd.doc-1.2"="1k5254jbhikwqrx5wv61qmznkhp41mqw"; -"bropd.source-1.2"="8hny5cxa57186p4brdriyp3hrmmqr9ww"; -"bussproofs-1.1"="v0s3q29bdab23xi07f123bq7gzc2i185"; -"bussproofs.doc-1.1"="6cnd5akpxdcq2q82n7ph5lvmb94ql8sa"; -"bussproofs-extra-0.4"="v5xhwycppwm0mpn11589shbys65hplx5"; -"bussproofs-extra.doc-0.4"="29pwpr7yfc7n2nflvzfpm39gdwx0qis5"; -"bussproofs-extra.source-0.4"="mi485ji1m4vvbd82xavgv05kbd3j96q6"; -"bytefield-2.6"="ns0c255yr22gvypcpgyvn7yan52yjvwc"; -"bytefield.doc-2.6"="y537gi9040798qyg6z3vjsz9g5i8px4p"; -"bytefield.source-2.6"="asvjyk82y4x267vq2srkxq5dk0vr0jmx"; -"calculation-1.0"="sss6l897zlki1lidr2s5vp60rv1jfm0f"; -"calculation.doc-1.0"="zwcix1a11s0s1hh7ccy28gbdxylz1n3k"; -"calculation.source-1.0"="asdip95ln7gna99vk7hjiq8n1hfcqg1x"; -"cascade-1.1"="xl13i2yr1fy3awaihp637h4lz7g5d7gj"; -"cascade.doc-1.1"="3jivxwvfqdwlc240ks4q52q07zrp06m2"; -"cascade.source-1.1"="ggqhq9cl5ia7l54kws9yqvz20s46y3dq"; -"causets-1.1"="rqqybjv2cbfk6wbl0ffmn66ijrasc6ny"; -"causets.doc-1.1"="ywnqh68ciqxv5q0mqzplra7496vdqvvi"; -"ccfonts-1.2"="im7vh7a3c8ja312745mlndwmndg1jvh3"; -"ccfonts.doc-1.2"="4ayp0gvbvmf0jxnfw8ciwz1jfmvbf3ds"; -"ccfonts.source-1.2"="8sfbbqrr9fq9jqbvapgrx0ghhh6r1hkc"; -"ccool-3.1"="chdi79g5j28xq27pbqk0nk9ccbcq11py"; -"ccool.doc-3.1"="q495yyd79mczqqn957jnn2ykp49xk6a5"; -"ccool.source-3.1"="lwic4fdqlcnqp6yplmrmq2zwr8h4dn5i"; -"chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72"; -"chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg"; -"chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506"; -"chemcompounds-15878"="7m2snwdxnachamq617zap92fsgdqhay3"; -"chemcompounds.doc-15878"="imzf21bm33j290wmy96hx88ahf5zgbff"; -"chemcompounds.source-15878"="nwcxbn1ivdiswdqyr319y93l76527amj"; -"chemcono-1.3"="kppxwgnwc7f62n7bwi2gnb6zndxv4bag"; -"chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp"; -"chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck"; -"chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1"; -"chemformula-4.16"="9a0qa89xd6mhzwl6l0g5mn6263igqdhs"; -"chemformula.doc-4.16"="451y52ic67j0i289gzgrl25dpb5lzrb7"; -"chemgreek-1.1a"="9jhyby4636bybvzq4ppvrjp7md499vp3"; -"chemgreek.doc-1.1a"="1v4wdq6k5yjcyi8v976la6ldskmh061a"; -"chemmacros-5.11a"="fwkab5q7nkn3khh2p71qrdwsxfbwnk7i"; -"chemmacros.doc-5.11a"="55b2w1ka0n5v402h5p1m7gm840jj6q4p"; -"chemnum-1.3a"="17r3lbprr5l6f3y2z81sqy6inxqp6q1x"; -"chemnum.doc-1.3a"="kzci0qnhw3g2d97q620ci1wmr8v3k2cz"; -"chemplants-0.9.8"="mnsmsmh4gsllxqd8a8590sggv7844k03"; -"chemplants.doc-0.9.8"="j6zlbg0gpb3360953q726g008br0zs7b"; -"chemschemex-1.2"="w3v5w049p0g28v8wx70ah804wp3map2v"; -"chemschemex.doc-1.2"="gg19d9gs2fc97f7rh9vs586v6i744a6n"; -"chemschemex.source-1.2"="czw2fh4251yhq1i703zf1nnkd0pjr74x"; -"chemsec-1.12a"="ikf1jvrivixpi5cf51pgryxrlnyh79p6"; -"chemsec.doc-1.12a"="9z5r91ghrdvaq6rsiyccs4g2a484kms5"; -"chemsec.source-1.12a"="m92vrndcyyj3sz7rag3jg6zwjl47jvh0"; -"chemstyle-2.0m"="lzbqwhh58y559q5lbxnbbz21rfxp1rcn"; -"chemstyle.doc-2.0m"="zv454b37y12fspkcphm6qs0yy7x7768s"; -"chemstyle.source-2.0m"="v52wrccz5gh3pswpfilm4qs48bplws5s"; -"clrscode-1.7"="6w0y1xknbskhhahx05688943y4pqr22s"; -"clrscode.doc-1.7"="hwrsnwvcd7yabwdz6qgy52c06hcz65y7"; -"clrscode3e-51137"="0fz3frh68k47pdn3way6fbpiagyillgk"; -"clrscode3e.doc-51137"="ql7vbwbr3z87rb0bnks5z3r1a53jhfmi"; -"codeanatomy-0.4-Alpha"="lnz0qqi52i7rnbsdw5k7s5bspm8i5ysl"; -"codeanatomy.doc-0.4-Alpha"="bzj63h79ral4caiqbx48vrmkgmpd9wph"; -"codeanatomy.source-0.4-Alpha"="4n9lrpl635drmnjbv0clv5xby8p51pwh"; -"commath-0.3"="qgkl9s5w0dadgirg3aqg0si0zm8swxss"; -"commath.doc-0.3"="ririan3s31h8cwcamjlwglbj4fyvc8b9"; -"commutative-diagrams-1.0.1"="w7b0kq60d7nwmp0s90jzszcc73dx74ay"; -"commutative-diagrams.doc-1.0.1"="9g20z3xalhz029cakmn8dqgg5caaqrly"; -"complexity-0.81a"="id7q2in24z1r6mi47jdh98r7d9gkxdxh"; -"complexity.doc-0.81a"="jppdvfvs5wy2vbkzvizzirgrhf9k6sy5"; -"computational-complexity-2.25f"="hs6ja0ghmdhvkm2m5zk4bsyhr0z0z8b0"; -"computational-complexity.doc-2.25f"="nr5kmmq6nd2ppdyy3pygb2fj6ilz9gfr"; -"computational-complexity.source-2.25f"="br0rz33ycmvpsn5fdhvcjlpffhssnw08"; -"concmath-17219"="7qqfg14ka9d6j0ccb3bswg0jhzg8gvjv"; -"concmath.doc-17219"="rw4q8bbj0jyv9fs9vvxv9iksi39mrjm3"; -"concmath.source-17219"="h0akd4lxynf1anylxfv0dibvpkkgb0f0"; -"concrete-57963"="slvd128n47v9z75w92miicd275i27jvm"; -"concrete.doc-57963"="xddpal4gfl1km582kqvn79q925mixskv"; -"conteq-0.1.1"="r5vmidbf2afm771ijgph43qc66safd3r"; -"conteq.doc-0.1.1"="6ki2nz31r0b86kd2p9w9a5ph8g5dnj8f"; -"conteq.source-0.1.1"="6sd4m9i6zv68gr0b8r80r477qcj6cbpx"; -"correctmathalign-1.1"="vip10w09k4kq9a67pfp73r64mk75095h"; -"correctmathalign.doc-1.1"="51qjv6v507ahi1jhxd9sp406bd93vkdz"; -"cryptocode-0.40"="2v0vwspdr8xvy4s1hx41abssrgl6lpyr"; -"cryptocode.doc-0.40"="q56g76fx90pyi6qc2kq7mnccnl96l4n7"; -"cryptocode.source-0.40"="y27wial5c2si94j1alf6zrssghvykmlv"; -"decision-table-0.0.3"="sj1ivppcdkh5rqcvmrh0bbzxvwfjms0k"; -"decision-table.doc-0.0.3"="7lday4lz5xah837ljynxmmwbxyjrkl36"; -"decision-table.source-0.0.3"="ldvmfif7p2n6hrf4ax6hv6bswk5l2hly"; -"delim-1.0"="q2f4p0f8bg1nwim31i272i5rpnjibxks"; -"delim.doc-1.0"="5k874svcycyk4y5qalbs4h0x4zkviwc4"; -"delim.source-1.0"="bglajqs1gdzhpjayh5d4afw7h09wln22"; -"delimseasy-2.0"="nv8vysx58m3cgljms4fzrbpqms5wsb7h"; -"delimseasy.doc-2.0"="jgsz6apzs5flbf717bmfgc9p07mfn16p"; -"delimset-1.1"="ag5z8f5h7gf5c824v8rj2xxfz6fbm3lz"; -"delimset.doc-1.1"="40vxv4mmpij621v80ly8mb4rz71r98n8"; -"delimset.source-1.1"="r4j60mdx3nivydxja9mnacqh1s071l93"; -"derivative-0.98"="if6y0qgylpw26alcd44dykb3apk29laq"; -"derivative.doc-0.98"="qi4nfzw0acqnjf1fdyqkfgr6hwmqgl8h"; -"diffcoeff-3.2"="s6hqlww5wgs4y66ibvy476hf3cgl6day"; -"diffcoeff.doc-3.2"="mkg33h04jif3fzpyikfi6gymdj2cb1zz"; -"digiconfigs-0.5"="r2ph2xkdaslj50qk54n7a1xx37n8pq19"; -"digiconfigs.doc-0.5"="vignfzc0zrhrx0jgybwmfcgyfcgaqhim"; -"dijkstra-0.12"="1knmbz9g8ifi4wyjjr09rhjshzdsiw21"; -"dijkstra.doc-0.12"="10wyqgpb3znwnnk4smxqbmsyd8ncvxm6"; -"drawmatrix-1.5.0"="pl0mscrd3i4h9m8zq947ajh45apms3fj"; -"drawmatrix.doc-1.5.0"="qxljjk2vh5cc7l9xxn6kicknw2csdk4p"; -"drawmatrix.source-1.5.0"="89lglkdc257iwip9aiwnshzqwhvcqz5b"; -"drawstack-28582"="kdcvc0kd9lm3zxd2zszwriab31p26wrv"; -"drawstack.doc-28582"="plmy162h6z23pzimj4i5wjpih0m21z3p"; -"dyntree-1.0"="820wp3d1dcdm5vxihmk93wqc8qw4rqf4"; -"dyntree.doc-1.0"="j334vdgmzrhlv3x0ihzpa9j2rbbd9xhz"; -"dyntree.source-1.0"="ha5c29s0f6j3r5f3b2v7v7bgxaks28b2"; -"ebproof-2.1.1"="wmq1crk5nnz7y8d5nk16xsblp7rxvah5"; -"ebproof.doc-2.1.1"="s3m1y6pgx7q224m6nmg5zhp2s25zg4z3"; -"ebproof.source-2.1.1"="xk568kr38d6xls292079f66mygpg8jk5"; -"econometrics-1.0"="4b5wmgy2zn8mflr9zdfhyc0pcw707h9j"; -"econometrics.doc-1.0"="5rm8ml9qmmq9nnyx9b5x7cfm54qdmqpz"; -"eltex-2.0"="n3kq7kl8i0b1k89i94i4k30qcy31lhfz"; -"eltex.doc-2.0"="pnvsk55d11vh82nn0a77lskyma1mqmpw"; -"emf-1"="l7l1rzphl87qvgldxpdal5pjvlxx834f"; -"emf.doc-1"="sbp51vc20b7m91r43ck9f4czblqa6gfy"; -"endiagram-0.1d"="lvncrih9fmmsd6571dklnq2vzh7jdxv5"; -"endiagram.doc-0.1d"="7nqf9zgjslck0853xy6r6i938k9pd76z"; -"engtlc-3.2"="dc257zhqmzl7yymbv9prpiam1mvznhnm"; -"engtlc.doc-3.2"="d6mmmsi3kr2dlz2g6iwynabjlw1jyp46"; -"eqexpl-1.1"="caz1prans93309xrm4dfhrl5whfj75jz"; -"eqexpl.doc-1.1"="vfkwis39yxrvvwd3nxbknpi4jh4lvqa8"; -"eqnarray-1.3"="iprdk3kp9cbmi01r29rmnjrfzifhiw5m"; -"eqnarray.doc-1.3"="v7l4q95sjrh3kd92xgbqazd7dgq8kaq4"; -"eqnarray.source-1.3"="bwkjz77mw47z33bwbgsx81wbw9i4n2n5"; -"eqnnumwarn-1.0"="vz6kiciv5zhrh16ddisfrik5y9g2qr8h"; -"eqnnumwarn.doc-1.0"="py5m5187p7i643k6wgsm7zyznh6awp4s"; -"euclideangeometry-0.1.8"="86vp8pn1467dqaxd7gvc9ffl6n3jp0mw"; -"euclideangeometry.doc-0.1.8"="f5ll9a02fbfkczcy58q5w3is4hbb6piw"; -"euclideangeometry.source-0.1.8"="zamjpkc9mb9pcm372vw5qv2zf3y49an6"; -"extarrows-1.2.0"="pb0rm456xq2s929nn9dwjzlmqlfwhacc"; -"extarrows.doc-1.2.0"="i9b8z46rn96n83904flai1wjvdgz395l"; -"extpfeil-0.4"="0yaa2siwn8yvcsd1xy6q3shswdzfzq8j"; -"extpfeil.doc-0.4"="1c0q3h8z0vfy05gmgvi5gbk628xw2pwm"; -"extpfeil.source-0.4"="fly5cib65ppxgrbgq1h8vcxx7m6340bb"; -"faktor-0.1b"="bjbmkxvqgl81pnq0v7hm0a1ija9vwgyi"; -"faktor.doc-0.1b"="mf571k3a23bdizhirzmkr1xwvm5y3fxw"; -"faktor.source-0.1b"="l1lqrdj9dr1waq7dymzij0m1vvhzvw7b"; -"fascicules-1"="68cn721dkmdvz6ff2s0bcpj18f7wvzsd"; -"fascicules.doc-1"="6yc2dc3s7p6yzqidzm15awhkl2qnk84i"; -"fascicules.source-1"="s7l1v4cwz5cwkk5qqk4891034qbvpjkx"; -"fnspe-1.2a"="firv6p5c69ljcf2bw8bqpjd6jjsgy8fq"; -"fnspe.doc-1.2a"="kq29lk89jw7wi84h5dgwvpi5vwqj69c2"; -"fouridx-2.00"="lxj3924da4bfn7605g2akgd3ccynizqc"; -"fouridx.doc-2.00"="ic4hkzvwc05qm91h90cx645gpskcm8f4"; -"fouridx.source-2.00"="zgb2xfg0wl5ld4b5v8rn72mxmfy3qy38"; -"functan-15878"="68wga1s4yiamylxfjma76hirgk867yym"; -"functan.doc-15878"="h6jwmv7wp2a8whhi34r62xvi1qll0vb7"; -"functan.source-15878"="rk42vz9n59n31xx5my1ahlnxmagzap7a"; -"galois-1.5"="b8khw120ihwg30l5wiyrpigb0n76j4pg"; -"galois.doc-1.5"="pl6jyfxfim7igp5lhhsdghiz6awrsf42"; -"galois.source-1.5"="pf7dxm40jcipslw88sqascls74wnvhyn"; -"gastex-3.0"="y4x4q9cyhjjj27cn2cgzc0wjpyvlbg1y"; -"gastex.doc-3.0"="pqgwn4lrammg3ksxlishb12wpmd41z8j"; -"gene-logic-1.4"="w7b16bvypbh9l3kiwbgha3dyh4dlqpq4"; -"gene-logic.doc-1.4"="nzraabszgvj8b0j503f7h892grbqjjrp"; -"ghsystem-4.8c"="dmzs6zybhwyirv48xcj7k34f5zx1n0jz"; -"ghsystem.doc-4.8c"="rzhffv3xxgyyb8rcl1ibqa6zw8zjk9s6"; -"glosmathtools-1.0.0"="9ncr117yxkad5rfad9bgsr9rlc9jscfy"; -"glosmathtools.doc-1.0.0"="bc8xj31ffw5x6w5bs9q82nmvmqkjpyav"; -"gotoh-1.1"="lmsc2xb42i0w7ysmq1b7v69798xz6061"; -"gotoh.doc-1.1"="2nh9cbc9jvlwxlg3rhayjx63xyjcq0c9"; -"gotoh.source-1.1"="mbdzb4047z6wzr4gam5dfs5199hq02c6"; -"grundgesetze-1.02"="cd0rxykb2favdbw1f945aalhy0shxcih"; -"grundgesetze.doc-1.02"="7h4rhzzj2jak20jrgv9nnjri35iiyvdb"; -"grundgesetze.source-1.02"="dqxmkagx54l3zhsqm2iixizzqmcwqabv"; -"gu-15878"="4m173j1ac2aiji1xjpxccd5bnasv68hd"; -"gu.doc-15878"="vkm8qnzqcdqh4xv4axh9sfy65bx2jji2"; -"helmholtz-ellis-ji-notation-1.1"="7py9xih6irxxqc6fw4yi8rmjbcjcawi6"; -"helmholtz-ellis-ji-notation.doc-1.1"="qspb7iwxmsjkf6lxy5n5s0hhivy3zs79"; -"helmholtz-ellis-ji-notation.source-1.1"="mkpv3j5zy3wngww37ajjc6rl8mabwwyf"; -"hep-1.0"="f70qsf585a6rw0lzizd5ps7lcv2qqsl9"; -"hep.doc-1.0"="aqaxn42inmw854cm1qps4fkcijc11fm8"; -"hepnames-2.0"="3f4dycnxwd41da8gh67gs89xcb3l7zl7"; -"hepnames.doc-2.0"="99jvklmwjkmrlmr9jfgdax0j9ikr7b60"; -"hepparticles-2.0"="m5541j0ip82ygflxc174k8xzr2kx4fh1"; -"hepparticles.doc-2.0"="34viq0myldrs90f8y0dflrjxhimnzkq7"; -"hepthesis-1.5.2"="2r81h1qwl4g5gh8xbmkqycmxcsaralmd"; -"hepthesis.doc-1.5.2"="l6il72x8l8c3jj81yjaci4fbbi080aj9"; -"hepunits-2.0.0"="xfl2120y4vv8bc8sdp9ijbili4vl0pcm"; -"hepunits.doc-2.0.0"="9sprxl76nl39nyrxicy814y54ds8pqqc"; -"includernw-0.1.0"="wdc8hhcr4fciy57k7sg28rkli26ybbq7"; -"includernw.doc-0.1.0"="xl68qyik71z5mhzvv2wzh8k6shk4mzbd"; -"interval-0.4"="ihq8vx6xlxsa3nbyx62l072y79s88wnc"; -"interval.doc-0.4"="cyx47j6d57xvjl92cqs9aiv3q6vg0g03"; -"ionumbers-0.3.3"="rcar5imwp2v1vbkx3vxbq4zika5q8psm"; -"ionumbers.doc-0.3.3"="gsy4yhir7i0gwr0v1x46csqfyxa845r8"; -"ionumbers.source-0.3.3"="vd55vb8qai0kfy0mijzwzgdr52sa5a6v"; -"isomath-0.6.1"="s9cgjw007kx4vcz5f8b51hbiqjmi68w7"; -"isomath.doc-0.6.1"="nhpi08b738hs457jqv7139b44z35xy5j"; -"jkmath-0.1"="l4nykjpkg2p19fdvy4a6h32ik4hcimdq"; -"jkmath.doc-0.1"="79bfybh585f88gcyc82b3ds7nx92jng6"; -"jupynotex-0.1"="ri5pp81vxiwa2m3dxk23pz1ahxl9w6yf"; -"jupynotex.doc-0.1"="hpka37bcy98c0cpm09m9gwf4j6dfm80c"; -"karnaugh-21338"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2"; -"karnaugh.doc-21338"="85z4avy6yfziaqd7b4w077ys394a3y4z"; -"karnaugh-map-1.1"="mryi5vdfqia142b35n97pwzvh267y6bh"; -"karnaugh-map.doc-1.1"="3zmcy9jclc8q01d3jz642w6j96ksrpx7"; -"karnaugh-map.source-1.1"="8zpvpcrxb35311nynqsxdpz4iqjai964"; -"karnaughmap-2.0"="52mx0flzri3z9y5fc1rgg665z2rpk01n"; -"karnaughmap.doc-2.0"="8m2xi7580kgrxq9v5dkcfcxhn757i7zm"; -"karnaughmap.source-2.0"="47f879r3821kwn8pwpyhh5874adx6f3i"; -"kvmap-0.3.5"="81wbq2ivxqnyy6mm8dn24rxqxhm6ls1i"; -"kvmap.doc-0.3.5"="g61zawm9xaq09835fskxvwqprs8h5gm0"; -"kvmap.source-0.3.5"="qf3a56ilm3b60x8pnmzyr4z53d5688yn"; -"letterswitharrows-53709"="x7210si2h45zzxpdlgnlwhb73chi3n8s"; -"letterswitharrows.doc-53709"="gbb4284mb5q7nyavj0azf9ac8bbjk71g"; -"letterswitharrows.source-53709"="ai6h99xsyx7519rx4zqfyvf2hgb7h0rc"; -"lie-hasse-1.0"="qdqlw1r3r8dvzlm38bg09gvwfqwskrk7"; -"lie-hasse.doc-1.0"="6w441bchfvv1ga31aikz881qj97845jk"; -"logicproof-33254"="24sbq01252ij7ldzb8achg4m73fakhas"; -"logicproof.doc-33254"="ldn1c2fdmnikc8fzklp5vzwkx73d91jc"; -"logicproof.source-33254"="745pxgmypzv7a1vf8gjm6r28khxk0s3k"; -"longdivision-1.2.0"="47csxxlz8niy7pnxd2nbmp36irc9ywf4"; -"longdivision.doc-1.2.0"="3pz21q6q3gp86q7ggm1s76mi1va0fbqb"; -"lpform-36918"="ga25ijvkw3cvzkag08jj7w8pv8d8mdj2"; -"lpform.doc-36918"="2pq3d2fni3nc4paaijygb6k5plky9wx5"; -"lplfitch-0.9"="wxiv9ihwv4jdmr4ij0kvggbbnhbkh19c"; -"lplfitch.doc-0.9"="lzz01n3w8zq7p9bn7lpb6rp6zkgmmxjs"; -"lplfitch.source-0.9"="4lxhwsf7366gs7dkq9qk4pyphjv13ya7"; -"lstbayes-48160"="7lfk7lrqr07my6v1qqni2rz39j5wwgpm"; -"lstbayes.doc-48160"="y00fm320wqy608v16idmzc27n8z4q4p0"; -"lstbayes.source-48160"="kzi9c2z11zpwb4lgy87vwyi0qjlmbyr3"; -"mathcommand-1.03"="6i9g221942874w40gb7wy3h86qmwnjns"; -"mathcommand.doc-1.03"="zkx78ghaz6kf1b4w1h1j63spijrlsshz"; -"mathcommand.source-1.03"="0ypyz0612ys99ig6g2c93zs86awfiib3"; -"mathcomp-0.1f"="rjxadz6409wc6g4ffb2jw40rw52rpwml"; -"mathcomp.doc-0.1f"="098xybrmriwyh7dl5vsxxxy4v7nf4bdj"; -"mathcomp.source-0.1f"="m3y8gisljqfy405d7cffqkda0mlz8rkc"; -"mathfixs-1.01"="8iskcy7ibbkfqq63ri2r65x6q7bq99zp"; -"mathfixs.doc-1.01"="ql7y723mdci6cz9qjnfpk6ck71kqb0w4"; -"mathfixs.source-1.01"="62f1zvd1s17arrg42ba9ydr9yyv3znhh"; -"mathlig-1.0"="hzc0bwnfhjbp5qqk4kkm9wp1hl5wlj60"; -"mathpartir-1.3.2"="ka1crqmcwlidnxb6n91dlfnf16hir45r"; -"mathpartir.doc-1.3.2"="0qn7ym4gl6m9g7vvx0mjnwyq2fjvy9cj"; -"mathpartir.source-1.3.2"="vx38w09k1cfrprj4yr0vy1gkwkssw6yw"; -"mathpunctspace-1.1"="b3cksmp6rs8rf09qvab3fxs525mf9gbh"; -"mathpunctspace.doc-1.1"="9bnslk1yyrab13x6sn6sklkmlpd5q417"; -"matlab-prettifier-0.3"="j5p21f3rgbx8hyf7rdjbpn845mw8fgih"; -"matlab-prettifier.doc-0.3"="zssm3k92kxa3mjja3r4sq2574f7byspr"; -"matlab-prettifier.source-0.3"="nkp80iyfa519dkk8gh7pk7fxbj4yn1lj"; -"matrix-skeleton-1.0"="wydb62byj1nkyfqizq3zajif1bs3ag2j"; -"matrix-skeleton.doc-1.0"="nq18wlaib4r99xga8rjidvq4dfmw3c3x"; -"mattens-1.3"="v9rf7qmiardpzq3zzqzz0p3qnh4lp1ck"; -"mattens.doc-1.3"="dnnzxlvc6vrfy4rrm4vw5w0g85fr886d"; -"mattens.source-1.3"="dw4c26cwsg1hz3wvldlyi8q4f60h3szk"; -"membranecomputing-0.1"="bqxhzm00kp19sknfqbnq735d2jmcyl0y"; -"membranecomputing.doc-0.1"="n0p0kfvcyr2n1wm5hh5ax3krcwpiqhn3"; -"memorygraphs-0.1.1"="8cg3g5pasqglsxnhx6q1bl3jbp2hr8di"; -"memorygraphs.doc-0.1.1"="00j88plcg7qrjwjzhjlmpcwwjn19l6h0"; -"mgltex-4.2"="99vi0f32fla2hmsabmf0d2d3c93kay29"; -"mgltex.doc-4.2"="m4m59xlcjgnd6pbsjsa36da37b61ydlx"; -"mgltex.source-4.2"="k3yw9bfjgkqha34712n3mplxsaqg6j79"; -"mhchem-52662"="1jdqxhaq185m8lpk48mkdmd5yf0msw43"; -"mhchem.doc-52662"="4pw8z3lcy6wgx0lmyb9wwi46zhby3hng"; -"mhequ-1.7"="a6dc7zsnfim8vbrwy8jzbhqhphwzh29j"; -"mhequ.doc-1.7"="im348hlavjvbkg67akz24kcx6hxa8w2h"; -"miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb"; -"miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51"; -"miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3"; -"mismath-1.8"="qgcm8svg1sdxnwjnkhimjq7w8gqpqyp2"; -"mismath.doc-1.8"="aflrdaxjvq20v57jmsvmnpj05dmj53r2"; -"mismath.source-1.8"="7f2gdkc4n5177zm0r9q42qpcphdhnb43"; -"multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz"; -"multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731"; -"multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6"; -"natded-0.1"="q4nx9b58zsmfmpap3h2qs8pr28vap5v0"; -"natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk"; -"nath-15878"="7x3cdih5q3i8dg25h6737vaphmrdxvbp"; -"nath.doc-15878"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg"; -"nicematrix-5.13"="yax4zrp4rjnir9djq2ij8cfn7z92pxfb"; -"nicematrix.doc-5.13"="mjf6caf246lpw333hafc57s46r245b3s"; -"nicematrix.source-5.13"="6164vnx2g1nbszz5n95wn3xhcyl2mk7z"; -"nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma"; -"nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30"; -"nucleardata-1.1"="b76hnd5fpl3f1hfh8pwgrsnqkadqi2zn"; -"nucleardata.doc-1.1"="vm4jq8b5fs0jx5k2vb8pii7dk548r4vs"; -"nucleardata.source-1.1"="0zzzwn1vrb841l2264mz4cip65va3lha"; -"numerica-1.0.0"="igf7ksyh8igm93w30k1qaaj5cb8w6di1"; -"numerica.doc-1.0.0"="5ps97l254yf54bzw98v2cnvgg5dxk1w3"; -"objectz-19389"="jxzqzh7y1nihr8m7jrsnbw7jh187031h"; -"objectz.doc-19389"="d8rk9nql7l67xn6hyvwg4x3xxkpb407i"; -"objectz.source-19389"="62cr53ff66gqjf6y2i01gr70bblhn18z"; -"oplotsymbl-1.4"="xzbszdakjgy7svbksd8w1csc7akwbg8p"; -"oplotsymbl.doc-1.4"="g6zpsvgp1kar3i9rmig6g7y60a5mmk0g"; -"ot-tableau-44889"="mdvqwhal8vq8bqxqi73p4fyc6qpaskkn"; -"ot-tableau.doc-44889"="gcfni2sp25f6qswns4bfl585gfi36vy8"; -"oubraces-21833"="sm7cbapl8cv51d41dgc46gjckv3icx3z"; -"oubraces.doc-21833"="yfvkv4vgc6ycvsd2sixyph039nm4gzvl"; -"perfectcut-2.3"="ca48sxakrgh4g53i30xa7n9288r9wr51"; -"perfectcut.doc-2.3"="iry7v9xajbzxyn4bbq0pr7qah8a1iy8n"; -"physconst-1.1.2"="5s61r6342v1sck3n9dk164mshxd1gxcq"; -"physconst.doc-1.1.2"="nb408z0hllvm3qgaqhfvbyy1vxlfh23z"; -"physconst.source-1.1.2"="abxr67fnizbrhsjhf0ln517fvdm4ff79"; -"physics-1.3"="y7b93d3qrc6674j33cy58v5c6fhlg3dy"; -"physics.doc-1.3"="ksf5jd2gfrq4dj2p1x2iwpgik5vb4pl6"; -"physunits-1.2.0"="slz5zydl3kpnk8fx3c18q6pc9chaaf3r"; -"physunits.doc-1.2.0"="i78b3cwjpiv6icwl64lgy6n6wzh6sjq5"; -"physunits.source-1.2.0"="13s4mvnmm4ka2dz4ma406vhlkmqjf95n"; -"pinoutikz-1.1.2"="dzb6wpz2hywq4i4cxi49s3yssxhxkm3v"; -"pinoutikz.doc-1.1.2"="9iyyk8vp4yfnc7jy990gh6z449mxqll6"; -"pm-isomath-1.0.07"="4bhf0nkw5wsmj7r26j1cwhgdxpy62pzb"; -"pm-isomath.doc-1.0.07"="92djvbz5x4c0rdpjk1z1kbhf374pi9mm"; -"pm-isomath.source-1.0.07"="vfmjgjks3i5hs6gxp6nhzvhlbfsm6qsa"; -"polexpr-0.7.5"="20yvnhmb8dy7p1jwlimayaflwm3sw2q6"; -"polexpr.doc-0.7.5"="3zbnfkrlxphvikk3w1jrd21dzrsnkad7"; -"prftree-1.6"="jwghbxhmr9lnai4rh4gnrrd5i98vqi1j"; -"prftree.doc-1.6"="7a0lrs2rak9c45ayjfmn8ghx89zab2pg"; -"principia-1.2"="84290dcczfl331sk2knn215q7km9r2m0"; -"principia.doc-1.2"="391qxwqahr62h30pq1jww6wg4cjxj7s5"; -"proba-15878"="k6j2r5kacbcl25i7zwb71a2mlyn17dap"; -"proba.doc-15878"="a30lrji3wrd9rb8aa7hzflch7cwlybdq"; -"proba.source-15878"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id"; -"proof-at-the-end-51194"="w5hmk64hm538mzqal4i9gxzadqpxp30a"; -"proof-at-the-end.doc-51194"="q8jniylvknscicjp5m5pd1z3751b06m7"; -"proof-at-the-end.source-51194"="nk3sbcnk3176zk76yf9nzj05q94ab006"; -"prooftrees-0.7_svn_8641"="rfmxpnzn1lkxx7b9ylvpnwmk1rag2nda"; -"prooftrees.doc-0.7_svn_8641"="zx19hnafp63xl2vas9frf6blm8974b94"; -"pseudo-1.1.3"="cxzf3j22aj491bs9k23rqlfbia9r15b7"; -"pseudo.doc-1.1.3"="scpzmw6ssq40wmxm9fmyybjxwc31kxjr"; -"pseudocode-54080"="bmn68g4pm7wga21yf97mrnmwc588gn6h"; -"pseudocode.doc-54080"="1hm6d3af5zjrpvx9h5ihd6qqyg2384xl"; -"pythonhighlight-43191"="wyvy6ms2blns0nffsf2lzjs4gwivgh97"; -"pythonhighlight.doc-43191"="9g7wy34pzzhdwsaa4rvn41iblnynvxz4"; -"qsharp-0.3.1901.1401"="fq2s3z8j8fy6y3sm07p4rqmxk0zkq6ky"; -"qsharp.doc-0.3.1901.1401"="kh8kj39fd45k25zli0w26kl2j0fvvxiv"; -"qsharp.source-0.3.1901.1401"="fz446cncrzdyjyxi0zvxnr9aizanr8v0"; -"rank-2-roots-1.0"="7nm53w0h83yyzgg9087bblnz55f3xjq7"; -"rank-2-roots.doc-1.0"="x84hhyxp10nhqk3vh5zwsxdqmkifwc10"; -"rec-thy-3.7"="23dn3adxmjfbk07cjal4xfcvymbzygyj"; -"rec-thy.doc-3.7"="0yn984pwcxn299v738kb94nkx3hynxcn"; -"rest-api-1.4"="4nq3lciglb70rr49v7w9an1bj2ymq0kc"; -"rest-api.doc-1.4"="ipic9f43478jakkdigfaw0zpaq9apq32"; -"rest-api.source-1.4"="d4868ncchm5byvnbfw25mydlf27ncgl2"; -"revquantum-0.11"="ciws2fb27v2jkmvacgxx5f5rjypxwhxj"; -"revquantum.doc-0.11"="3yx0fd96b5sxmf0950wy2yfswfn5k5j2"; -"revquantum.source-0.11"="a3lxg56ihykvv3wy0az60hbd3n721grf"; -"ribbonproofs-1.0"="7r52zy2n48hichyvyxnhvzcn10v6bm3l"; -"ribbonproofs.doc-1.0"="15wcmvid4xbflmy4lv1njbnvbz5svk41"; -"rmathbr-1.1.1"="i61vd0n322pbpqia1ymizwkqzz31g7vz"; -"rmathbr.doc-1.1.1"="4h44kiz0z8bzxp75zfpc3jb2haxylqxq"; -"rmathbr.source-1.1.1"="z41y0xrn0amgmjmgbqhxl9fz441fd5jx"; -"sankey-3.0"="i2v8n6wn1zphiahi13xx7lvpwafba0zq"; -"sankey.doc-3.0"="wsk6h314mqw3g3nr46nfp8s7zdbrpdyv"; -"sankey.source-3.0"="xql4zhi01irpmkn594g7g3pdpm0jhbk7"; -"sasnrdisplay-0.95"="9yvwv7a6iw8a7g58w0zlgmfaz2zy8nxj"; -"sasnrdisplay.doc-0.95"="0dc8ai8f6b0dn05ljdlnx2dykbhil5xh"; -"sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh"; -"sciposter.doc-1.18"="wan5jxr0084sid3zv4cdhr5kmdv1rjh6"; -"sclang-prettifier-0.1"="594wn96i6q9wgshyqmy7211c2x4j1fih"; -"sclang-prettifier.doc-0.1"="zy33dy1dq1lh9zzqvxh3zwqv53yw2xn6"; -"sclang-prettifier.source-0.1"="0k4nc1bkrw4l66wr47pd6dgigdgs5i0s"; -"scratchx-1.1"="fwylqfph2bpwqd8rl4jq8hi682cd1cw0"; -"scratchx.doc-1.1"="w1x4cg20frqfs889sk91xd5j822ja27x"; -"sesamanuel-0.6"="zivl33hp7zrzz0996fs4822xsbd5pb0g"; -"sesamanuel.doc-0.6"="h4dlbjwcrjk13lnvqxxjmm94pk083zv4"; -"sesamanuel.source-0.6"="fjp5657m4v2qzf4bxzrms7v42ghl861m"; -"sfg-0.91"="5j8965gkq0p9s9ryvy8ym22qz206igqh"; -"sfg.doc-0.91"="ydamww1x4qxpg5bsrcacmfwkkv9c876p"; -"shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a"; -"shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld"; -"shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm"; -"simplebnf-0.2.0"="rsyph0dhpy3yz1yqvr5wa7gmcn1zyg6i"; -"simplebnf.doc-0.2.0"="3k3pb1cylrcnr3bs0vz278xkizf11048"; -"simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3"; -"simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z"; -"simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67"; -"simplewick.doc-1.2a"="kxfipc2w97479is7sdd9fmahrbwfk2l7"; -"simplewick.source-1.2a"="48db2ywp9dg6nd5xbclw2w85id3mf97r"; -"siunitx-2.8c"="727sfrfi2cr5wrwch1rygvj84hl5l9m0"; -"siunitx.doc-2.8c"="0r5y9fzzdnxv4xryvqzdgapi11l2ab75"; -"siunitx.source-2.8c"="6f0hsw113mvf92g35x4ysbklqxwjbsza"; -"skmath-0.5a"="b9bxkvgrx8566jfqh62vxl9912llffqv"; -"skmath.doc-0.5a"="kpdr4vz3z7k8my710n5772vkbd7jwisb"; -"skmath.source-0.5a"="iks3azv4hmv59laiywdsqjqdsln0a1kc"; -"spalign-42225"="if8r1d1xwq1as1147m3ixkxgyni8yb9q"; -"spalign.doc-42225"="s49kpxsa940l85yc6wzmb71i789874qw"; -"spalign.source-42225"="ahwv44vd19kn8vzbx7ya6275ysnp3q25"; -"stanli-3.0"="6ws3b75qs69jhag24aki76ndgryb9f9s"; -"stanli.doc-3.0"="iygalq6h7fdik4cfjyv5i62mid9gdr1k"; -"statex-1.6"="h8y1sw298ilqajy8vmi00yl9wpklf5fa"; -"statex.doc-1.6"="ksf4vra9673l5ycl8np7l55rxpj1xazg"; -"statex2-2.1"="a7h5agdmh5xw1646faxxwd1n1ajci53h"; -"statex2.doc-2.1"="cpiw77bl9p7y9vd6dwg4lnlk2n8lmmcj"; -"statistics-2.2"="gnv5s73wz2qh8yldvh7y21f2v8gyipxh"; -"statistics.doc-2.2"="hf10bfp5f60am8rhwiq4k18jdx1lyma4"; -"statistics.source-2.2"="k9bm1zgki9d1h1qhwfi0723n1zvdb4fx"; -"statistik-0.03"="2kynwfkkx5b782l4znp1f3vml1lwiihh"; -"statistik.doc-0.03"="m8749zwgm8vz29d24idrsimd6dizdjlf"; -"statistik.source-0.03"="bjfb31dxs4jylym9qc03rp9qjvmm6dn6"; -"statmath-0.1"="464gz51kwvfyy8fp1l69khkgdnbfvl5p"; -"statmath.doc-0.1"="6kdz4g7w763fc6zs1g4xqjvbxlvi4sv0"; -"statmath.source-0.1"="71y6fd8bid5zymcsc8c8j9ik2jyrbpki"; -"steinmetz-1.0"="v8vskhmyjdhc7yi21b9i11j4lfzmhypm"; -"steinmetz.doc-1.0"="5y0xh86b75lm16kjjl4cjs7vvylr6wn3"; -"steinmetz.source-1.0"="m31y5wd20vck85yj3zps711zi6bpcdym"; -"structmech.doc-1.0"="76ngar60cl37ya107zrp1cgbim7zsxgp"; -"struktex-2.3c-0-g7d3fc5b"="22jc8j377rqradvm23ymvmxnsxwnrwqb"; -"struktex.doc-2.3c-0-g7d3fc5b"="bs9vx2xk7yd88v4h22r0v0i7b2cb06ri"; -"struktex.source-2.3c-0-g7d3fc5b"="r4nqs4y6gspbx1yizl4pmarb672x96ph"; -"substances-0.2a"="wwjn0lkspnwgla7j46j2iwlvdrsvdyzs"; -"substances.doc-0.2a"="apg59a7fh980vddnfzjspsyq1jfnvsn7"; -"subsupscripts-1.0"="1nyf4q1szg0q649jmqlzd5p8j9h1fjkh"; -"subsupscripts.doc-1.0"="9yhhgbj7i83v21flfr3gkr35vkdxpx6m"; -"subtext-1.1"="dz6mm9cy33qhlw46fkirvzlqhsknjnak"; -"subtext.doc-1.1"="bllr8v8mflvi6ih3z3r73b5y6vmprafl"; -"susy-19440"="xiv8s7m8lahyc17qdp7vhdnriqcz2gzl"; -"susy.doc-19440"="51apv9rzw9q1aa390a7p6w0d4y5amkms"; -"syllogism-1.2"="gx6hjs32rq3d1sk28cs8ng8m2i1xwgrf"; -"syllogism.doc-1.2"="m6nv4hcwmh5qa7m411vwm8c6s1xbdbx4"; -"sympytexpackage-0.3"="x7b456c7l5nkwaf19g29rpc4m6qz27h2"; -"sympytexpackage.doc-0.3"="klh09byy7h38j068d9qrgyhawcfjknji"; -"sympytexpackage.source-0.3"="lzsz5ly9rnzph5nxnaqbf9nf5abm302c"; -"synproof-1.0"="bv32jflr6n3jdm93xxpbvhz1lrhc3i9v"; -"synproof.doc-1.0"="i74i5km7n20hglq2icb62xcc2pl1fawc"; -"t-angles-15878"="an3w3nw07gc6hyzfjk4bd0j4swj8qr4p"; -"t-angles.doc-15878"="68ylwxvywabhyfqzlb7d642cmhdj3g2j"; -"tablor-4.07-g"="fs9vl9gi63j8bqgiv06dbhbgs2vl1c8r"; -"tablor.doc-4.07-g"="k3d87x83igkq78j1yvav6b08y818qgz9"; -"tensind-1.1"="f76zwp7giabai57l4ryzin9s4b412g93"; -"tensind.doc-1.1"="pq5ahxwn442zc4xc7yilip4ciz2gvhx0"; -"tensor-2.1"="4gzhhxr2w1bbwb0yf799siazn5d6538j"; -"tensor.doc-2.1"="j4hxlj9f804ffrdp8pf06mj79yb8j6qy"; -"tensor.source-2.1"="89fmh96xlj21pm07c80q9cgiaj2a3c3r"; -"tex-ewd-15878"="725h0x4azacxb6pi7bnrvb5gb2b6rb8l"; -"tex-ewd.doc-15878"="npk74dnjx7jy9392pz0m4fzxcxqqsqq5"; -"textgreek-0.7"="m1b05a740x322la70k6ib44sk6cky167"; -"textgreek.doc-0.7"="vah190cds1677yv86nfcyriccln296yd"; -"textgreek.source-0.7"="cqc5zj4ck54rayydvml5m3n4hfnykglx"; -"textopo-1.5"="rvcbhsz8win1g08s6az11ji6ryd9b1fl"; -"textopo.doc-1.5"="3f9w8nbyyjismgdxb5daijc88hfp8m8k"; -"textopo.source-1.5"="4h2x01rkf91dha2yxqpdfgv5qsmz34sx"; -"thmbox-15878"="5b8zyq68dw8c7cylg28k9bmx261k8d5p"; -"thmbox.doc-15878"="rpd99zkmrb85kgldsyi2iwr70q9n8y35"; -"thmbox.source-15878"="hnjviz4vyw78mg6lbcdyv88qajhjdh6w"; -"turnstile-1.0"="c4nm39zwakha4bk75092371db2n0nx4m"; -"turnstile.doc-1.0"="w2hv466gzdsc7vp0al5xk7bwa83szvr2"; -"turnstile.source-1.0"="8p5g2w1pcaxhg2a54rq2h23zd7cbj60h"; -"ulqda-1.1"="llh5ji3r34m637hzb9qi4z0d6hap8fcy"; -"ulqda.doc-1.1"="w5anmbpapkg5r1bi0gvh1wqrqjivgmz1"; -"ulqda.source-1.1"="pl71x58ifcpllalxfw1snj2r464qvx3w"; -"unitsdef-0.2"="j5dhzwnaizymvvj0cvvn8hcjgpiaw3xj"; -"unitsdef.doc-0.2"="m3n8c9wpk9m0il8yn3ip4kwvlbyzfndw"; -"unitsdef.source-0.2"="rpwd7p723jsqcmcl28kkfg3fg9dmyfxa"; -"venn-15878"="vxgbc1jmchjsq3aq1wklgla50p1smqnz"; -"venn.doc-15878"="3z1kgbyilhajm6przv2a1rbdl55fzhqj"; -"witharrows-2.6c"="sp11d634nsll40s638mj7bqyighw78ij"; -"witharrows.doc-2.6c"="w0xd5ki72g0xc8a105dkv3csdf5dj5dj"; -"witharrows.source-2.6c"="7kpl4j20j3w3wdjv9f2wm3v4nmv2xlhb"; -"xymtex-5.06"="lh5pr87m1xhyaj74pmwc8vx3an7gppxw"; -"xymtex.doc-5.06"="bbknma6166kqvxhj3523p85lq7qn1ydc"; -"xymtex.source-5.06"="is60w9mjif26y9s3vv8c0v26z16m97g3"; -"yhmath-1.6"="n885plj280iqd602vlwq2zfca3s2ijsv"; -"yhmath.doc-1.6"="ibxf0fn1wpahfjmz7q7jl0afi36qxwzg"; -"yhmath.source-1.6"="pg1hx02jxyjly4i5la4lip29kkpf4pf2"; -"youngtab-1.1"="0pni2w43573rjhi2lygsg7547n3fi3ic"; -"youngtab.doc-1.1"="1svxp5r9wmqszr860w9nx6b60nv1qiq8"; -"youngtab.source-1.1"="3f54467ky4ban6xkqcldajyr4gfy7mm1"; -"yquant-0.4"="rn4h82i7j2lp0mrqz3xxya57w6hcxqlb"; -"yquant.doc-0.4"="8wh9xpj7x2b2g6asvvjharbs1l5fawmf"; -"ytableau-1.3"="37wsbj7an7fvsrh4w5kvjiibhq0abn9j"; -"ytableau.doc-1.3"="wbgandbbk6zgms4jz2ird33kyg9yg19b"; -"ytableau.source-1.3"="2rblxwykvkrljn1xqz7zw9dz1wyib686"; -"automata-0.3"="7v2smy8hlz3yyqwcw11mjgh35z81n22w"; -"automata.doc-0.3"="49q82z2aa5xqgz3wsgcyix4a9hqfh5q6"; -"bbcard-19440"="b26d8663qv8x23sp8q04c8jzdw49f2i5"; -"bbcard.doc-19440"="99jqw22g1xcqdn4q5f408gvlzwnl7wbm"; -"blockdraw_mp-15878"="al2d83amvpz7z19a14zxn4ib8ayc7b9y"; -"blockdraw_mp.doc-15878"="n0a85bchn27q09771kx4idy7hic8iq42"; -"bpolynomial-0.5"="rwijp2lyphgyixi6l1d4j9vrwchr2m8k"; -"bpolynomial.doc-0.5"="1561z658ar885xsbg15psi82qjzc4zbn"; -"cmarrows-0.9"="03hcqmzx16n3y4vvh8aj6vrvpn6minmk"; -"cmarrows.doc-0.9"="vhdy6d8cpv29xp8qc72fr678qh9yi01x"; -"drv-0.97"="ry5vbwf27bm31byj37d34shzrdaf8hjg"; -"drv.doc-0.97"="3sw31jvb9l0n124h9kq9byzmy3ay1wxd"; -"dviincl-1.00"="gf980a6jm4ar28h7464qx1nayjqvi1xx"; -"dviincl.doc-1.00"="sxmj8rcvwj2q4g3c8ha9a84avsn4w1aq"; -"emp-23483"="brxc803kbnrd6qa1jfag6qxgb7f5j39g"; -"emp.doc-23483"="x8lkwbk13jq48h8ml7a0fzlyn4m8qlxl"; -"emp.source-23483"="ir1ng5an1jbffb2pd5rv412dcfzv84r1"; -"epsincl-0.2"="srznlzss5ag3br4pmwny7aqq7gjmqv98"; -"epsincl.doc-0.2"="993m24spzl4jymn69sczm7a8d1ix0zcc"; -"expressg-1.5"="yd8jja79lbjibls84q1r2iqls9hgfp3d"; -"expressg.doc-1.5"="ly3cj040ng9ahdl24yw3fgxfix2vimhc"; -"expressg.source-1.5"="fbdj06ca74j5cabgr1v0x7f15z53fr3c"; -"exteps-0.41"="q3nkzx07ckc0ydw909gliknkmm992lpd"; -"exteps.doc-0.41"="2y57ba9glchpbyyr2xy7kk1y3pvicj72"; -"featpost-0.8.8"="8dafiyq66jwcg8aq919aia13nlyyp73a"; -"featpost.doc-0.8.8"="jankbccig4n7c32970l0p4y9dnvapxvx"; -"feynmf-1.08"="22lldffd38r661ziq9p6fp43xc6595yg"; -"feynmf.doc-1.08"="1wif6ik3s9b4z7h75jxixyakgxf402kj"; -"feynmf.source-1.08"="2zf6gfg0vzz5k51d0aqlb2yg3w4lax1n"; -"feynmp-auto-1.1"="ps9nijgd6kcnsgvg3gq9gn53mf42xdwk"; -"feynmp-auto.doc-1.1"="a1i2ay1mvkpdicyzmcapvpv3fkz6pk3c"; -"feynmp-auto.source-1.1"="2iirzys42l2k5fmpjxxsn31wpfzv02d8"; -"fiziko-0.1.3"="v4nq87d4dahjnskkgvgjf1sh65m9gvkl"; -"fiziko.doc-0.1.3"="djw7v20xazg82gkrh6wxw05vmih1d2jg"; -"garrigues-15878"="b6kfrr0zhmbnb1rh93wy5pxq31kspbmf"; -"garrigues.doc-15878"="zk53ay759rgd40fmf7byqpqmibw7rrza"; -"gmp-1.0"="pzdcapvcjvbn48n6jnl1hs9mbycrccyx"; -"gmp.doc-1.0"="6ir5fj3s209rk3k9r2wbsz46kij8kw9q"; -"gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg"; -"latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb"; -"latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf"; -"mcf2graph-4.62"="6j532ny1wgf84c4q86kcjwmlipnkmz5r"; -"mcf2graph.doc-4.62"="l2klmc6c8sqn1y2d6ggrcb6xrqmvc096"; -"metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z"; -"metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g"; -"metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb"; -"metaobj.doc-0.93"="cqzsavf652pmgg7v3isv80szkc3s162z"; -"metaplot-0.91"="jmp99vj4w825s9qx6m8bb7q62l3jp5bk"; -"metaplot.doc-0.91"="jzdw7b2kh7a49vngbwb0xm69kwfl288z"; -"metapost-colorbrewer-48753"="09l2rf2kja80lsajz4vfp9ngb3z442m7"; -"metapost-colorbrewer.doc-48753"="y3vivxgdjykacm90arls8hhk6k8rkv6n"; -"metauml-0.2.6"="15p3yrkws6by8w8wmrnnxij1kp71sbvq"; -"metauml.doc-0.2.6"="mcgmrgsh7x21ci4n8d0yqy9clx7jp1ls"; -"mfpic-1.10"="lslzdy39sbfb1xa5rv3j0whpg1c8vkj6"; -"mfpic.doc-1.10"="cpqqf9cdd3wcd36zjdps0692439zywqr"; -"mfpic.source-1.10"="fwlv0my4cgmbvbv62l8nkzaqz5p7br8q"; -"mfpic4ode-0.4"="83bv2qprp0cankrd54v8vgz58m1xbjdc"; -"mfpic4ode.doc-0.4"="5pjmcvwhz2j8zppx1d98a3lh9fcpa4d9"; -"mfpic4ode.source-0.4"="phmq4zdgz3ikz4ind46w2j0d8jvv4k0k"; -"mp3d-1.34"="sd36lsc5b38ahnf4i1b8a8a5bgw854p7"; -"mp3d.doc-1.34"="gkjwsbz7sgdj5k6vzvswb4k4yb8xkhld"; -"mparrows-0.1"="d1v4j0hrr4cxm42vwlclvccp1wmvbbyh"; -"mparrows.doc-0.1"="jcf975s8ianx9dmiqa9lvv9ywj62rmap"; -"mpattern-15878"="9ym77kwd2kgw46lck4vbfrbbiwps8g6x"; -"mpattern.doc-15878"="vknyl0b4d4sx2c6l7qhwr4rdmx0ncpja"; -"mpcolornames-0.20"="j7qagfiggfwjqapdrh1z23n0paj54bgc"; -"mpcolornames.doc-0.20"="jd5ai6f2ask0pbhrw46bdw8cfsrfpmps"; -"mpcolornames.source-0.20"="1f0wy1lrg0733vnq5mjwcgdi5rnprbis"; -"mpgraphics-0.3"="jad28la9l7z0jwiml56x849d8zwgsh3r"; -"mpgraphics.doc-0.3"="51y5shq3bamhqhpm2hbdki09b9xil2dr"; -"mpgraphics.source-0.3"="2gb71444b968ap0wvw461xskcgxgy519"; -"mptrees-17.06"="lqn20z9inh6qylgljn9k6z398b0vicws"; -"mptrees.doc-17.06"="50ggxw3jc63clpnz0fnxv2p2h4cgwjhl"; -"piechartmp-0.3.0"="k15blq7m78skmi2q46gnazh4qhpfhggs"; -"piechartmp.doc-0.3.0"="xcn16bgnyi4h8pqaisjivmywg234shgm"; -"repere-19.06"="4lbpfqmnvdw93pmabf34bpj69ww2jd4z"; -"repere.doc-19.06"="fjwv88ysck07zlpclf1fyjs4jyzm4mhx"; -"roex-45818"="3dp1ank88mbkx9zd4gl8v6nxa7hjvck6"; -"roex.source-45818"="fbyyci2hg9bvdbxxv09q9h37q98gzzxb"; -"roundrect-2.2"="zihpsds4r0v44h4bbmmpjgx28y3knqc8"; -"roundrect.doc-2.2"="g6kih4vjqjg4v4qxlxkkxgwhqv0x0pdx"; -"roundrect.source-2.2"="rdydd5cwvnbzjlhdd4kcfjq54rzw9k81"; -"shapes-1.1"="cd8q8cgz2c62jla12q136j6wq153k6qn"; -"shapes.doc-1.1"="9w1flaybygr8spm0a104cpwn4bzvg9nq"; -"shapes.source-1.1"="1p66bnb05fsk5fwzj6dd6ykn0229g7hq"; -"slideshow-1.0"="qjdwj7288b4rk5lqj6sxq6cznkaylpd0"; -"slideshow.doc-1.0"="fqp6p6xsw4r87r4vi0j2pani3rx1jbmf"; -"splines-0.2"="bn6gc1n3vbzrns1pzdjc4hf647g6pgj5"; -"splines.doc-0.2"="91g13liz4sfn16vzcvlpqhm388wwvs02"; -"splines.source-0.2"="p527173paps7gqz8wq02jkl6nbx8vw6z"; -"suanpan-15878"="vnglmgbg19g42b79q34fzqr4hjzy7dmc"; -"suanpan.doc-15878"="lvbx0yizc42hgqymw9yscja667h4mz1a"; -"textpath-1.6"="97b12i6v4bz6095z7i7yjf7c3fqg232d"; -"textpath.doc-1.6"="zliwrx3n2r3xjhdi0c80rncxwk5whg76"; -"threeddice-1.0"="91chpiy1n4mg3vcabcm8li91q9lnkcvc"; -"threeddice.doc-1.0"="f9anwvpf5qy57b6g4d71cdjjkkrsc1ky"; -"abc-2.0b"="pmaw58frrdbnj81n21mg15yiz7sp0rci"; -"abc.doc-2.0b"="gild9nm8zph2kr6mj9w0sans8r1jz114"; -"abc.source-2.0b"="g8a921yi51lvw6mqj1hxmkwqqh9fkl03"; -"autosp.doc-58211"="wl80hffrqss94gyl25myw72wib1slz2w"; -"bagpipe-3.02"="z9akwcd2fdwzps3bws9vamik64pyyl73"; -"bagpipe.doc-3.02"="6ssnq5756qnhlbyn08pncriz5la8hpzy"; -"chordbars-1.1"="vdmircid5yrvvywih6m0nf5c6b59mz5r"; -"chordbars.doc-1.1"="bld0fmrhhzf1dd6wm4qc790an3hayiip"; -"chordbox-1.0"="0w69pjdnqx79i77jwyjwqhnwm1zss6c4"; -"chordbox.doc-1.0"="9lhbmb35cckxa9bmr4p0vj47mprmskac"; -"ddphonism-0.2"="fsmrgvm95n65brnlslmnyf354b5139bk"; -"ddphonism.doc-0.2"="kav924pxscx87d6qp6hr92h7zy3zip23"; -"figbas-1.0.3"="xkm3zvkdi7512qnk4kfrb875c3q2gfr0"; -"figbas.doc-1.0.3"="pal9rb3bmrypdk6icdv7fyhdfn48qfsy"; -"gchords-1.20"="06q4p9d1j06dz7sqmjyka4k6r2x3l7nd"; -"gchords.doc-1.20"="icn914698j8gkir78wqnjqw08n2zhsdx"; -"gregoriotex-6.0.0"="ccxcrwsw00hgs68l3ac16dz4ax2753d1"; -"gregoriotex.doc-6.0.0"="bn2wdi7g2xvqckavna6pkywynaspbfbn"; -"gregoriotex.source-6.0.0"="bsrzlxzsnqwwxzy1wy61md9raspr00c8"; -"gtrcrd-1.1"="mqaamg8ick2z265cwl1yd6n81f76y8b8"; -"gtrcrd.doc-1.1"="scx1xk6y85zfbn82aqf3cw1sx0prfmgh"; -"guitar-1.6"="xw88497a60kkbh8pribpsi80bj2wdvw2"; -"guitar.doc-1.6"="5y7s8gbahfqzm50z6dgr667f1rgswvzh"; -"guitar.source-1.6"="7i8ma18fm6piiwsccj8lq6nn446mvqrw"; -"guitarchordschemes-0.7"="snccmsq130kvjn2ly56cjck56df5mdzx"; -"guitarchordschemes.doc-0.7"="p74vljfafyj0ap707aydgpf4xs2pabr8"; -"guitartabs-48102"="zl4w2llxyb1173b4asgk93bh70rxil42"; -"guitartabs.doc-48102"="a9rmk3gr37pp0p4fbfasndjglbbwsgck"; -"harmony-15878"="isfyzam48q2f90vyh78rp5df93wzdfq4"; -"harmony.doc-15878"="5zy2cf5afrxlmmxlsycqg3crcl5irkb1"; -"latex4musicians.doc-1.0.1"="aph09gf5cfxm7prwbg5v9y3jz03vpdif"; -"leadsheets-0.6"="371j5dnksvxxm6hz1cia15ll3w2mx17p"; -"leadsheets.doc-0.6"="7nbq4zi22pgsidfknddw8a5iqnfsxhnz"; -"lilyglyphs-0.2.4"="phvx76h2sah66knx7lxdld5p6q1rshmf"; -"lilyglyphs.doc-0.2.4"="n9rk2zin1c4zm08181ly5yrja4zbhri7"; -"lilyglyphs.source-0.2.4"="6j01hgnkjxfjszhdfynq93zlccqj0z7h"; -"lyluatex-1.0f"="zgh2b7q3w9p0dic23cwddhhx5cqsdqm7"; -"lyluatex.doc-1.0f"="c8739z6r5mpk001ra6if93kfw799rphi"; -"m-tx-0.63c"="jjs536dwc3qbi72s4d7qr8v3b0rxd41g"; -"m-tx.doc-0.63c"="ji5fl4sdm5mdhkkg4qf33gzaaqnw8yg1"; -"musical-3.1"="cam79g75i6blbgd4m7syi432dn4zar9g"; -"musical.doc-3.1"="xi1lz7w68jab89ihx1j1kv1dv8z2nlmd"; -"musicography-53596"="95nsr792xkvyq2kp95yw9z99j40c9dsv"; -"musicography.doc-53596"="z63rsy6v54c4p1l844ck0b6hc9fwr96x"; -"musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1"; -"musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf"; -"musixtex-1.31"="2cl7fw84mii0n2v2rvmrprbr2yinvpqv"; -"musixtex.doc-1.31"="0anlk9gnbpgzasrdbv0685mgi0zfkr5l"; -"musixtex.source-1.31"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; -"musixtex-fonts-37762"="a8kdi135xis6qcwy90yisg4wafklmw2y"; -"musixtex-fonts.doc-37762"="91fl3b700pvjqkwsl6h29f0z5i5781s3"; -"musixtnt-40307"="6412y8lh8awml9xs7ybcnhkgyjrc08vx"; -"musixtnt.doc-40307"="44c1fndj5grvw5q4jxyk0dgqxr56lzvd"; -"octave-45674"="6yb1bajc26k0pbr0a02zx2zqg7y0rnj8"; -"octave.doc-45674"="152jq3brzf99xwq983k2afrdlq5lhazb"; -"piano-1.0"="vbbcddqx5sk4gg9w1882g4a8lrnnqn2d"; -"piano.doc-1.0"="bn1c29lffw62jsyiygh3i0biaaz0asmv"; -"pmx-2.94a"="rcpl81h8ysm1v188gw3gnwvqhr29w8ii"; -"pmx.doc-2.94a"="wrkr9pnwci0852bs60whifpmj432rq97"; -"pmxchords-2.0.2"="wwn3da9f9br7dpfhq7yg9j2f64bb9183"; -"pmxchords.doc-2.0.2"="f33mk2mv8pjl4ikg3kvig5lr94iwrm4m"; -"songbook-4.5"="jimhdkxsiqzkwnsjsw1rynkrfhhh5n0d"; -"songbook.doc-4.5"="62n794w3gxyivisl16xrz9lg2r0a0s38"; -"songbook.source-4.5"="nyn7mkdylkpywca50izj2czf485s8sm5"; -"songs-3.1"="1air4zpymnrajglbvp8yyfd3z4a72d8g"; -"songs.doc-3.1"="xcfy7all4n141r55c17gsnxj8x40dlqx"; -"songs.source-3.1"="2wx7qd5hzairbrb0qcs6mnkk10l81jh3"; -"xml2pmx.doc-57972"="3i460bimzfapdyy9j1rvm4yv1cwzkjgw"; -"xpiano-1.0"="ha9dpa3kpmhbzy3f16d7s6mlvh563mgj"; -"xpiano.doc-1.0"="x579hyy5sibzsn9ldrkwsqrjjrji0xak"; -"xpiano.source-1.0"="77wwb6wxd7c9cqmjlq9cij6p4ibr3r3r"; -"abbr-15878"="n55llxl7fjmx6p1z3ckjfj94dxkg1n0v"; -"abbr.doc-15878"="9lgcwpp4fw2zjx2rsp9w5szi6v2pdsn4"; -"abstyles-15878"="2zmzwsgwh4rv6ysnjjk35cihbifs0jir"; -"abstyles.doc-15878"="xba8x95rimsa16xhr7nziglk7djzv6w8"; -"apnum-1.7"="hvw4fwjm3n7hfj08ik7nkg5w51zg9mbx"; -"apnum.doc-1.7"="isai4pdly4pkhhjnh3afijlrm9mw2i0q"; -"autoaligne-1.5"="1ycql6wzhqayd90wkd62n5bqymwr0z9h"; -"autoaligne.doc-1.5"="72b0nqh19zipzzv46z2hhkkv8fg93ca7"; -"barr-38479"="rsgsgzki68jgx8d4r05qj1awvi02rm33"; -"barr.doc-38479"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr"; -"bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b"; -"bitelist.doc-0.1"="n00mlj88l6djwcxzj0l6pxiiba94kpl3"; -"bitelist.source-0.1"="w38ccrprx1rn0pc34mr29bnx7gaxa7k8"; -"borceux-21047"="ls6xjxrggjzphr4pl71m2va9mndh1r7v"; -"borceux.doc-21047"="zdg5n9rxc2sfkyi1am8jka05avi7hyng"; -"c-pascal-1.2"="m4x5kfq1vm6vzv0ic910fqi1qijn7g34"; -"c-pascal.doc-1.2"="v6wqph0gaibfv4cwph5w0axp5sf70m6w"; -"catcodes-r0.2"="haljpnhhzvyhmnda9vgk77md5zm88773"; -"catcodes.doc-r0.2"="4227wyg04xryg33b39d81nlh6aaja1lq"; -"catcodes.source-r0.2"="6ljn2lwg4bzr9c02d01vh0saja9sz9yf"; -"chronosys-1.2"="qswnnwyghvsbjf3ddvbl7nl00qxwhs6h"; -"chronosys.doc-1.2"="m11jpa7crg095qf03qx7gcrvcb41f83a"; -"colorsep-13293"="il1sig8hzmvq8q0hlbh6fir15rrl5zc7"; -"compare-54265"="3y2gpllzn6bdrpgyg32vswiz66dzi1rq"; -"cweb-old-49271"="vqf99h9w57jmd9r6l9k8bydqxmm2d9i6"; -"dinat-2.5"="a1gcgwkj0pd1lqdm20356fbjram3wpa0"; -"dinat.doc-2.5"="6dzss5231fdqjzs8j7z4gfx5iga4m895"; -"dirtree-0.32"="xgxmz79hj1q6qyfkdvgj5nm26865dfmm"; -"dirtree.doc-0.32"="im2rhm2fmqk1snrhvrsm112jw1hwcyw8"; -"dirtree.source-0.32"="pyfcid8hir7vvm6fpwimlfgs65dgzfm1"; -"docbytex-34294"="m4jkx2gf05q3ffwfkrk4x9bcwf9f3dmw"; -"docbytex.doc-34294"="01w9mkddxm1l9i12i5n5i5ar81xfn9b5"; -"dowith-r0.32"="vdgkjxphpmycfcsimxih7gnhv58hd9vs"; -"dowith.doc-r0.32"="ql8hdyxcgss7rvlp1913rp52wn4wjvxn"; -"dowith.source-r0.32"="xq0r5c58clz8qzbhz01gv2ph1rs9wg1n"; -"eijkhout-15878"="hdb3ag2knc67ksx39hmax8x83l0d41kl"; -"encxvlna-1.1"="kz3nvz29czk573cxbi5a5l3mbjs3vfkh"; -"encxvlna.doc-1.1"="gv5k36s89g2zslq75s2j7ffvwdiz4lkb"; -"epigram-20513"="0mg36ybg934n4jxgpf88lnvvc0za59ya"; -"epsf-2.7.4"="55vrh3nmvb5p1nkkpwhrq9glsf64bc3k"; -"epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg"; -"epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p"; -"epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a"; -"expkv-1.6"="x19fg4al6xjan41l07dkf7lgp6akgw6l"; -"expkv.doc-1.6"="16ny94yijql35j0klhdbpvvb7l2rv8bf"; -"expkv.source-1.6"="92z0fwgv9jf2v47cvrw3j1zz9mjzwymj"; -"expkv-cs-0.6"="r6f8mb6qxasa09kz9l1lbbs3r0dzbr10"; -"expkv-cs.doc-0.6"="d708jfhsdxzpgbp6p2i1176yd0fpaskm"; -"expkv-cs.source-0.6"="daw8zwynx2xhxbph8r4cbnwb5drcvmxg"; -"expkv-def-0.7"="j4w7rgirhfl57mz938fbm512z394ycgv"; -"expkv-def.doc-0.7"="8n4pxgxg9hpn4zajr5f2w5cj58bcxm4d"; -"expkv-def.source-0.7"="iv5pzka6a93yg9k6ry0kcfzkafzkdvv8"; -"expkv-opt-0.2"="hsgf1g43vldqxasfckr4phhs53habwgy"; -"expkv-opt.doc-0.2"="hvpm4vw4kz9h72h0g0mnvmfal3giy04q"; -"expkv-opt.source-0.2"="g37rzfdqm8pkzhp89ni3fgbbbja0dk4i"; -"fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96"; -"fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb"; -"figflow-21462"="166qngk7yy25v0rbjavi53m0sazk90gn"; -"figflow.doc-21462"="l92iyzsg4fwkc3nalswwpnz99kfcm1q9"; -"fixpdfmag-15878"="8djdk0baqcg84v6qrmdzckq7k97h4nkv"; -"fltpoint-1.1b"="q48n0d38d8y8m4z6lgmfza4gh1mrzkjn"; -"fltpoint.doc-1.1b"="6ljc5c3g53ig6yj7blcfqy43yvlw5fqf"; -"fltpoint.source-1.1b"="l5ybd1xn6abfhq5kjhvig8zsp721ldzg"; -"fntproof-20638"="bkh1b1j8zlbzmhpif5ji82gwmvg0aprj"; -"fntproof.doc-20638"="hhhxpfkwqpdj0wz78pzg4nbfyzh3j82f"; -"font-change-2015.2"="rvxfsxkwag1pzhh448n737b6ngadrlyg"; -"font-change.doc-2015.2"="14ck6s61lx6gyqmf6i9659lvwd3zh6hs"; -"fontch-2.2"="0h81qy37h3jb2m6g18969189a1jbi73a"; -"fontch.doc-2.2"="csygimfjbm36zfm403jz4kw39zv23zzb"; -"fontname-53228"="mgggfwq9ds3bc2mblkx5rday7dgmq1i7"; -"fontname.doc-53228"="vg79z64v459vl42ba50sar4dhafwr1f0"; -"gates-0.2"="awaxppd6dhv239x03vpwy2hn2zwldmna"; -"gates.doc-0.2"="qqmjk1276kdv0rvsv86gi7ysl3warg95"; -"getoptk-1.0"="2crphpdvd2wcnqrxm180im84ask9hcq3"; -"getoptk.doc-1.0"="vcj36dsv4y0k8czii5fb5b51c57c7rsd"; -"gfnotation-2.9"="3gkmqmawpzqvqsqcmrfc50261mqv8nmm"; -"gfnotation.doc-2.9"="rwivp94nr9a35q0ram2d4wmwj8gzbhk6"; -"gobble-0.2"="r1knqlpg1ndgkvkmi038jy9g450qm2k4"; -"gobble.doc-0.2"="kpgjg6n4p17fvw93qyih0xslid4x7w66"; -"gobble.source-0.2"="i8dh8xayn1a2lsslnr8wygj0qr168wpx"; -"graphics-pln-56823"="ny2glbxpiyxv0b9nf254h3fs08cqb7dg"; -"graphics-pln.doc-56823"="c9rd01qyp0bcngq6cv997zkqdzsgbb8d"; -"gtl-0.5"="bypkgzwx7y2srhdxv94a9zvbyxkbwgqh"; -"gtl.doc-0.5"="777isinskwws7m2b47a0w26w9dsp01qd"; -"gtl.source-0.5"="di1lh2gf5xc3wk34q247zvgvgnmnwdh4"; -"hlist-0.11"="zxglyva456i86zmawizc4scm5cjgw89n"; -"hlist.doc-0.11"="0k1ysa58wbhw02564py59gcwzhlaiffr"; -"hyplain-1.0"="cdn3m5p0va7v16wfr2hxi7sbbkvai0h4"; -"hyplain.doc-1.0"="37fvn4xi8ibli2622n1adyzgnnhrs05n"; -"insbox-2.2"="n1wbssqq7h2g00jmvy1g9cx2pb8lp8n3"; -"insbox.doc-2.2"="i5c06kh17g5ghsjivlxsipgkd0ab05x9"; -"js-misc-16211"="shwn2dwi83plybk71sjp3i1drw7xxd18"; -"js-misc.doc-16211"="ppwwslknxds8l1spalpgj950n9amsinz"; -"lambda-lists-31402"="kpvnf57b1s1whhrrrng7j0zvf0cka90v"; -"lambda-lists.doc-31402"="ai0gzwilj0cm1129pl5nlwc9ddsgpchk"; -"langcode-0.2"="6fwjx029l2nalfz81qfn1k7yp0z7iycb"; -"langcode.doc-0.2"="vq8m73ckjicm53q7v8q5k0rhldq55hkc"; -"langcode.source-0.2"="nk07pqb0mfq3vzpdddhb8w3w85svpbq9"; -"lecturer-23916"="4014kfbhxnf4wb9ndfh0qfwbbrvz0wwa"; -"lecturer.doc-23916"="avsvzihsa6jn0abvd4122k358w5sf4y0"; -"letterspacing-54266"="w55cy2xlk67hnnkiy52yphhs0872ziaw"; -"librarian-1.0"="5siy7c2xclp1c305vqiayp0n5dzil1gh"; -"librarian.doc-1.0"="8nxz7ac5hdp9820nsfkvhvv0bn55idq2"; -"localloc-56496"="hcdniqi3g6imzllxn25y7haqhm08skqd"; -"localloc.doc-56496"="yjhl0zlaw7kirncw6gsddk4zq6zj6468"; -"localloc.source-56496"="ivj8kyznfxsx7afgy8qdwd8p2q8rga73"; -"mathdots-0.9"="6avfq6dlhbqw1i3jrjgcdbdzx2a0w5nq"; -"mathdots.doc-0.9"="syy0i8rjssr81sy26xcx43jbripqx9d9"; -"mathdots.source-0.9"="zpl4xjhcq4hs18hqiyljy3lfyx9xbng3"; -"metatex-1.1"="jidirfi30wf0b4aq279lim2pylirmv3r"; -"metatex.doc-1.1"="b0rgim8d9dns88zvf283czk4zgsvvi3b"; -"midnight-15878"="5zah5lcyxgq6zxdpazqy3lqv7vxl9dcr"; -"midnight.doc-15878"="cl4ff07jfflwqpmbi7d1phc65hvhaif7"; -"mkpattern-1.2"="q3wl8iaijlhsg5qx35f5gcmz6gwj543g"; -"mkpattern.doc-1.2"="8hx2z63klm8dmyiyfg069qy4vf5qzc4f"; -"modulus-1.0"="ia3l2fxzy8dvm42nil9c3c3hgpg65kj7"; -"modulus.doc-1.0"="mls645yi6yafadq1fbv0qx8smj5sm1cq"; -"modulus.source-1.0"="rw91xw2dsgzphvq3sjxx507kfx7x3qkp"; -"multido-1.42"="xvw8537j730srqyigrb1q367g73zh29q"; -"multido.doc-1.42"="qp7jdx0jca995df559f1ji2l32jz2h12"; -"multido.source-1.42"="qc1473wf17ppqxy11xgz226w4d8zrxk8"; -"namedef-1.0"="131apf57396fjyfmx4cvp3hg8gsa1jrm"; -"namedef.doc-1.0"="g7mljk50xxvvvfqgk239p12vmx92n2w3"; -"namedef.source-1.0"="kydzzz750a76fisf14l48d691n0hkhd5"; -"navigator-1.1"="0q23aqjf31y78hxmlhx4mf04c95rwdn3"; -"navigator.doc-1.1"="vxgrfimg900qa0ibwpbwcbv63rbaplp3"; -"newsletr-15878"="1hrni43c6y624w9nryc8q8rd4w6jjap3"; -"newsletr.doc-15878"="p8jfq33i8ah2a35a7d1rb0s3dz0nicvd"; -"nth-54252"="p28w9qvwvvmi4v6gz5dp0hzv3pdp1qrm"; -"ofs-16991"="1vqjznrdyjqn6ygq61h8rnwjymkx5kpj"; -"ofs.doc-16991"="8i8acpk75frksj5wshpjpcazbd93whzy"; -"olsak-misc-May_2019"="4ymwq2jcmf4gs1hrdj93sgi2wibicw61"; -"olsak-misc.doc-May_2019"="dxc35x4yc0y4xk6488awgkc5qb32kl6p"; -"outerhbox-1.2"="q01b3lhx53dbrm55n915crjmkgks4xj9"; -"path-3.05"="gxlifrd0kfxajy8viylk3wsfkycd96xv"; -"path.doc-3.05"="0pbd67di200vghv2a4bp7vwss7bsbkjv"; -"pdf-trans-2.4"="f2qw1mx9qql6xqsnnwcvqx59baz3gzyl"; -"pdf-trans.doc-2.4"="vbg7kp37w1p727nia0p1imyvxhqgzgna"; -"pitex-24731"="6hpvvpnw3bp3sa442b33xsphhyx0vk4b"; -"pitex.doc-24731"="b1y9bprx9harpgqmbchh33gwnc8khzsa"; -"placeins-plain-2.0"="b0dxmvbqfwm4cycyqm9ir7dl7dbgq37x"; -"plainpkg-0.4a"="xsvwz9z9f2jirfyzggiv49y0rfmhmnaj"; -"plainpkg.doc-0.4a"="b0c8mi4mr6bjdhrwbcplwjw920l4zmbc"; -"plainpkg.source-0.4a"="lcrm6734c3dv44wqcf4sp1c1aic0vqqw"; -"plipsum-4.3"="8jq9bahjflimbxs6vmwz2nl50jsy6ygh"; -"plipsum.doc-4.3"="9jp6ipn24yrl486b96ln2nk8i15h9fjs"; -"plnfss-1.1"="wkcli3ca9m6grq1ccbc5jjychw9sdrzx"; -"plnfss.doc-1.1"="smry2whkwygg9v4vgf4xfvpnfxc76b93"; -"plstmary-0.5c"="5qs8clnk15735j0r9id1vxyqabskbxcg"; -"plstmary.doc-0.5c"="jp2lgn5yq10g0jj5hihbcl77hpy2ryfr"; -"poormanlog-0.05"="q3sn08yj1xw45gk0w0na1bca4y6fr8p4"; -"poormanlog.doc-0.05"="30li13ybjpmzh5v9x504061shapvmqq4"; -"present-2.2.1"="nll2w203n4a3ka9dqmsl3bvfz4ypsvdm"; -"present.doc-2.2.1"="m39zcb5c59hd26kz8zcnbljh91hjxjqw"; -"pwebmac-4.6.2"="gv4ynbdynbl954ydb4kv2w528f34h456"; -"pwebmac.doc-4.6.2"="bv6ycd7mg887ld51509sc1rvdz5r5vsd"; -"random-0.2"="cg4jqxpqs7nk3a1j8424bjin08xl493m"; -"random.doc-0.2"="kwqbw15h1iwgr4ljcr7qsppi7n7c28j9"; -"randomlist-1.3"="nfdsmsl3s1wj8p236s3hmwhwfdx289wb"; -"randomlist.doc-1.3"="c6zlhgw9k14wrqffy277jwj3nqp8vsl2"; -"randomlist.source-1.3"="w61n9d30k1gjjrykxps0ssap7xncdfh2"; -"resumemac-15878"="8kydfyx795317240qryrp7zjvpbcd43r"; -"resumemac.doc-15878"="avh8y1vj230yn8bq0mb0mngrki4h0czy"; -"ruler-1.1"="48pdi6yxiiwdnmpy6822p0baymfgf38z"; -"schemata-1.4"="5zm2s4sph1wb999x39nrwkzaxjrjzyk0"; -"schemata.doc-1.4"="z0lmd61rh0nfqkgrw9q8dldlgq3c6ybm"; -"schemata.source-1.4"="jpdj8bs2fi7jpmc6vd2p9x4yc8sflrn7"; -"shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2"; -"shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf"; -"simplekv-0.2"="xwzqwbgqinc13n4zxjr3wxx1d4z2yfp1"; -"simplekv.doc-0.2"="s1s13jm04rzx60fhvgmqavbplbdhv4fy"; -"swrule-54267"="383zr34k9mhk605cni6fb74lkr144zw1"; -"systeme-0.34"="wnhkgq4fkwrx6hd250ak25pv0ywl8f6w"; -"systeme.doc-0.34"="h0nnqih07bbhw22ph3nd0qprdgl55ppi"; -"tabto-generic-15878"="libhmc3f9mcs93xzi22qhk8nyy0vzv4x"; -"termmenu-37700"="b9z1s2xibg6vcrd5qv1n1zlparqlwf3h"; -"termmenu.doc-37700"="0fqaygp9h3wr9x8ghfkxnsi9w1wfjis6"; -"termmenu.source-37700"="xygav2l9gll238dyqa8126sn9hc1n1w2"; -"tex-ps-15878"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp"; -"tex-ps.doc-15878"="g377qq7n63mqil18vlfgimfd589pa1qm"; -"tex4ht-58348"="s88qpzr645059ldj0vwl78qbzj69lvdv"; -"tex4ht.doc-58348"="zp3gcglcmbs85qcfdy1x0rq1nwnfggvj"; -"texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd"; -"texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx"; -"texdate-2.0"="vi2h6c5c56i63vhzn64x7qvn11733z70"; -"texdate.doc-2.0"="3yzkfs7q2v20ykcz7754r48p0hb2l09s"; -"texdate.source-2.0"="zwkrw8y0m074w5fpjnaabbv7kk293g80"; -"texinfo-5.1"="gkg2klh5wz5kbih7pmqacmwv21fzcchh"; -"timetable-15878"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb"; -"tracklang-1.4"="dla1jqizbjlb31drs8bnc09vxqilalys"; -"tracklang.doc-1.4"="nm0wsmwrl78ikmfzn63gl3mp0nh6af72"; -"tracklang.source-1.4"="bd547xxzlhjkj84f40lb3fb5y95q2fwl"; -"treetex-28176"="gkvpkgqggl2s86h7rmad9z3ax6wrq3hk"; -"treetex.doc-28176"="5r9rz97y0r280vn642x65xgcffb073gx"; -"trigonometry-43006"="ji2axcciqhac3aaly221w3bja28yb2nw"; -"trigonometry.doc-43006"="drmmcz6w0mvdzmf10dpikm8iagq3hjyf"; -"upca-22511"="hfay60269pv5n1r64q1r9d0lqljih70w"; -"upca.doc-22511"="czzbjifd9bdw0g9c8s2b76sq1cmw3hjp"; -"varisize-15878"="h0jdsw1dapsq7ml9hibgg9571da7lipy"; -"varisize.doc-15878"="af8xf6nzd3h9fm52gn6xpa886lzdpz8h"; -"xdvi-54338"="g5irfc0gf7bra3vngv6kdbkhbyicdz84"; -"xdvi.doc-54338"="dz4q0d643a261kll9fci78dmgwjkjhbb"; -"xii.doc-45804"="p1ijdgk0mch86gs858rvkjzjh2yn35d8"; -"xii-lat.doc-45805"="8ilsp524wb5anl3shmdhbnn1nl2c8sav"; -"xlop-0.28"="23yzc7hmvhc5dya994k7z6w40w3y8cxf"; -"xlop.doc-0.28"="4xf1rn0g79ykd4yllawjqxlayh5mlhr5"; -"yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl"; -"yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h"; -"zztex-17.7"="kack2q2qi130rm6x49sqlkrv4q31qzv4"; -"zztex.doc-17.7"="x1z2i1zs3xzhcic93amhz4niz3aj44vy"; -"auto-pst-pdf-0.7"="zbmd4qc7wq0s7r3cp1qj4rhv9fn7c0l9"; -"auto-pst-pdf.doc-0.7"="sc37ybh0adfwvzzi8wb8jkhg2z42q2rm"; -"auto-pst-pdf.source-0.7"="wvmqgck46b8qjfq8mjs7s0vfi6ci4rfc"; -"bclogo-3.1"="2j9mb9p1n575pvisvpy7zxhsw8940n2b"; -"bclogo.doc-3.1"="rjmzjjww5vmdzz5qfbsxjmnzz4fmn1gp"; -"dsptricks-1.0"="jrn51r2zwccvvy2dasq0zbf4cls15vy8"; -"dsptricks.doc-1.0"="m018nyxpwvxina15zyhwalzfiqb3ryxx"; -"makeplot-1.0.6"="2l1i1z41gpxaisbcp5qqazff2ff8nyfm"; -"makeplot.doc-1.0.6"="r0cb4v76cf0kcjc8hbik9wv3rkrpxznn"; -"makeplot.source-1.0.6"="f2y39dvyj8i8j7jfgqd8hf52v44k8rwb"; -"pdftricks-1.16"="5886wczqinvi86gby90fwbp36chikia3"; -"pdftricks.doc-1.16"="0q95d84knvpyp44pyv6hpp827m9cw5k8"; -"pdftricks2-1.01"="lqjpqma2f0zc9bvf8hgp73yhf2pgkwc5"; -"pdftricks2.doc-1.01"="311ws9zf7fpc91407lm28mjcckvz4mmg"; -"pedigree-perl-1.0"="2wwngnzbxbdypw4mg5wqr4vlmz770llg"; -"pedigree-perl.doc-1.0"="l3v4vhrvkkiz8av3l0abb4w5v0fizbpn"; -"psbao-1.0"="f1rij947zxm5pm52fyv5q77hl50m7m5g"; -"psbao.doc-1.0"="4km2d67wdfgs010xfx706l9ywkb2wvyh"; -"pst-2dplot-1.5"="krwawa7h5jd8sdsq3axq5wvn1im8k1zq"; -"pst-2dplot.doc-1.5"="gbmabgk6i8q9mi397ny0r8kqzk0hyc0y"; -"pst-3d-1.10"="pg6n52kv7lk6i6rfqyzijfrxdbv7ym5x"; -"pst-3d.doc-1.10"="x7bl3prki06ki517r33ab7pz72n0ycz0"; -"pst-3d.source-1.10"="xchbmh6g5zwja9xgxlkdb04qx4kplclx"; -"pst-3dplot-2.06"="k15iab4rzyfcq8c02fnbyl0gwzc5aib2"; -"pst-3dplot.doc-2.06"="j1b2dfmfkhhdm0rvc1zppc19w5mnql3s"; -"pst-abspos-0.2"="bbag5d5l1pad71rrc51lbd8k11jm7nn2"; -"pst-abspos.doc-0.2"="70m0f6dbxy9j9iwxx92kj2k4vwqsbrc8"; -"pst-abspos.source-0.2"="3bnsfp2rj4rviirll63zljd7wady41q5"; -"pst-am-1.02"="pydkanpjfkw4s25m2rnxxmx2nq94rsk9"; -"pst-am.doc-1.02"="5sy24k5ivs70h1zg0knnfxyw0k0244nr"; -"pst-am.source-1.02"="ay1y6q7kmpib5bslmylx5xag413a425z"; -"pst-antiprism-0.02"="d79wzkbpk9q3n15qw83svf850x2y08wa"; -"pst-antiprism.doc-0.02"="sgb8fs7xl1szmnlmdpjbp7b8pnd02xln"; -"pst-arrow-0.01"="13pfic6an180whl8c9flfsw83ldrgj39"; -"pst-arrow.doc-0.01"="60rhkqwp0mbrn1ddp4n5akj3b6w03pjs"; -"pst-asr-1.3"="78h56zzm2yq7nv40l2aql6ihrx7da5gk"; -"pst-asr.doc-1.3"="qx4jpg74zpjjjh01bwxmw7lyip0nwxfc"; -"pst-bar-0.92"="a5456vc3299z2n5di8kfv5q07bnp7fvz"; -"pst-bar.doc-0.92"="6p7ag1iq37p5rkvd3a6b32cxnj8jqkz0"; -"pst-bar.source-0.92"="grywxwwpmwyf94rwa8pmcxvbf0r0xanz"; -"pst-barcode-0.18"="mvdpfn6iwpyycb8sfa91jw0mxyq6ai5d"; -"pst-barcode.doc-0.18"="xbyg4yj85i4pj46b8bxha5w8268j1k7f"; -"pst-bezier-0.03"="7gw43wmghlvfv0vmbxb9m75wki7k90ij"; -"pst-bezier.doc-0.03"="1dldcqv70p1iscmp22jh0gkvg9c2z112"; -"pst-blur-2.0"="xlvdgcpxbaqdw7qfp36xx9brl93gknak"; -"pst-blur.doc-2.0"="s2nqfv19ihhsx64hixcj74b9314q0r4v"; -"pst-blur.source-2.0"="km82lbn5chcrqzg19kyyczzzrladh5yy"; -"pst-bspline-1.62"="3l0nwn486w6wfac9g6rjf1rn7bf7cxgj"; -"pst-bspline.doc-1.62"="vk4iq1imd58w0f8a93c7zf56yb0hkr91"; -"pst-calculate-0.02"="gbvmsni943m47k6fqdrpsvscd93h5j2i"; -"pst-calculate.doc-0.02"="c3f57y1x2274abqbvp34q15gf625d1pw"; -"pst-calendar-0.47"="nsnyxxld6q4jzvc8kwysbwn9y6fxi9g1"; -"pst-calendar.doc-0.47"="jvwhyiz2cfzcx6mpwkahmpcb3fyl6yqq"; -"pst-cie-1.06a"="x0vq8n8l6xsiy6xmwfnlsnp59sp2n9rr"; -"pst-cie.doc-1.06a"="bxvays03xan0mw627zwai7ja07kqpf75"; -"pst-circ-2.17"="69rmijifv9f9kjvcwj1b7l77lv6h400i"; -"pst-circ.doc-2.17"="d9jk38iinh9nnyy8g1sdi8va82s83zn0"; -"pst-coil-1.07"="2ai64805vflnfx112c8p0jqf1ad477wn"; -"pst-coil.doc-1.07"="209y878cmqrykmakyy38075dkdfff6nb"; -"pst-contourplot-0.6"="8giwlz62qcmrl9mddfwk9yqp51c01r0k"; -"pst-contourplot.doc-0.6"="4agf1dx03x2jkxjh3v55nj4bns22563m"; -"pst-cox-0.98_Beta"="c03maichp45vxcy6n3p210gpvypr5v2p"; -"pst-cox.doc-0.98_Beta"="8x10b6xh12f1fssbyf8aggprnn7cm6i9"; -"pst-dart-0.02"="q9b7prnysx2xzw6i643ihjyn5ds1ds30"; -"pst-dart.doc-0.02"="hnwnh7aw3rjq1ny6fz4q0cp98j5lk59s"; -"pst-dbicons-0.16"="il8pxplbwqjhr3714g7n3476dyav3sby"; -"pst-dbicons.doc-0.16"="isaxq5v1rnnllahq6zzcd420yzfzc5j3"; -"pst-dbicons.source-0.16"="q70fjninffvwslibi5rwwsnay6jpi14c"; -"pst-diffraction-2.03"="amf1cak741kvz4a2ddz7hxlna2137akz"; -"pst-diffraction.doc-2.03"="iz4aizfbck2z3lgna1lxl3dagvmbnm1b"; -"pst-diffraction.source-2.03"="5v7nl5sf2fsja46jh36w48prx0l5cnsi"; -"pst-electricfield-0.14"="yq6r4m5q162j5y62vbrzgg0ilnk5blym"; -"pst-electricfield.doc-0.14"="7k6gx1q68lzsh4jayxhh1shvrj1ci81m"; -"pst-electricfield.source-0.14"="js2bqzmv8fkyd4j1pj8yzb6x7xlj2fvm"; -"pst-eps-1.0"="djkk1cq45fzh2q1pvl23aiqi8b2znqrk"; -"pst-eps.doc-1.0"="i903x3p9wwb1jjf5al8azqr3iasmxkyk"; -"pst-eps.source-1.0"="r6jcjqy0f5mnkkahzqf9qnfrgwqh52h8"; -"pst-eucl-1.75"="r692b03azj39wcfd50ig1jz08mg8np1c"; -"pst-eucl.doc-1.75"="lql2a421v71snavwrsvrx4p4fpnxnn29"; -"pst-exa-0.06"="1jqv019148d2s5n7cmlclldqd3mzk08w"; -"pst-exa.doc-0.06"="v45ljmsk7y4p256vikzyk7w0z1vnybqz"; -"pst-feyn-0.01"="k5fpn50px7b2i9bq48qd2xwcdqdfwrnp"; -"pst-feyn.doc-0.01"="5kgzlqhig4ma9zhxj5ncmyc3qcp6acn1"; -"pst-fill-1.01"="llnpvgwf57n20wh4p9xfbwcxzlwky62z"; -"pst-fill.doc-1.01"="2wyyhm91dszgjzpvfsyyz7wk3z8k345w"; -"pst-fill.source-1.01"="yg27p6nlmkzbkjrygc2kc6bxj6hm9fdk"; -"pst-fit-0.02"="glmix9zjghzn0pa092yf6qppyax0grf3"; -"pst-fit.doc-0.02"="d2ilipqghmv5i4jmjh63199kn78i4brk"; -"pst-fr3d-1.10"="wcwbrmyh4mn9af5skqaj9pljkc79chwq"; -"pst-fr3d.doc-1.10"="hcf0909wnb4qdhrcy5bsgi7bjhkd3rs3"; -"pst-fr3d.source-1.10"="fyqkqk6p5m83q133ngw9a3j6gpzy8aii"; -"pst-fractal-0.11a"="ihilgmdfalqmq1q57md183ymms6xadvl"; -"pst-fractal.doc-0.11a"="ncmn8bijlbc00y5zzs99gn15bbvwfyls"; -"pst-fun-0.04"="klmswb8gqb538ghlay62dwg1asiq8l13"; -"pst-fun.doc-0.04"="xafzv4wa5hzqmclbv7s7xh0ba2kaay69"; -"pst-fun.source-0.04"="s7173q9a44aqd43d8bwcrskc9bsh1c1r"; -"pst-func-0.96"="1aqk5ndm8gw3xynxqw6ki6cmwqw5ylmn"; -"pst-func.doc-0.96"="chw5jzcl3xh0y7rsma6pqpi6rp6bwvxm"; -"pst-gantt-0.22a"="ghji2bp2wz4xgkmh2vrfyxh933r8dr3q"; -"pst-gantt.doc-0.22a"="zvdlzyll48hrl970ms6j7pgwp2f2vmy3"; -"pst-geo-0.06"="p2q2w8rl3z8xvdylc8inm2i4zbh8jxc8"; -"pst-geo.doc-0.06"="q8fwd5i5fvxchs8hz9l7zml2xqv337sd"; -"pst-geometrictools-1.1"="rx8v1nyhqrny92sqsrwzsra4mhrh7xnh"; -"pst-geometrictools.doc-1.1"="20k0sg2qkfzkcpq1qa42195dw9swjx3h"; -"pst-ghsb-54074"="rzy3vznyr6jd0b0vr9h6ajlqc11bp9rz"; -"pst-ghsb.doc-54074"="5w079f1q4w8yxs4546qzx2c21vrhm2ym"; -"pst-gr3d-1.34"="wpbib4n4j2fmgbirhq8xha4di6f3w1xa"; -"pst-gr3d.doc-1.34"="ipap5gil3j6hkdcl1l1y0a6fnj754zq9"; -"pst-gr3d.source-1.34"="l6i8dnqgpl8iwsmbhiw3a043pbxb3k7m"; -"pst-grad-1.06"="7yprfjpsyszw1wndfkwingz1vncvy1ng"; -"pst-grad.doc-1.06"="da27kdibqih9pbbj4366bin38zznfsis"; -"pst-graphicx-0.02"="pq6a58d7i0bpbzq0wrh54vlyz5hwjb2r"; -"pst-graphicx.doc-0.02"="xq7j614zxh5m9mr5zbfbr7q1ds0f528g"; -"pst-infixplot-0.11"="cpck9sg68imi2ddiaafw7k89hhz8i4ar"; -"pst-infixplot.doc-0.11"="xa4vw2bzwdqm4y46ljqpx3d6n2ff02yq"; -"pst-intersect-0.4"="az34g553vdj45pa35s8ymk0901njq262"; -"pst-intersect.doc-0.4"="756ih3z05zxw0igclcmx7l8r7n6c9n85"; -"pst-intersect.source-0.4"="2fbzddwq4bib97214qq0cqrhraxvc5dp"; -"pst-jtree-2.6"="pcgjwxpmr4356pysfc4jgn5f7wvif4n2"; -"pst-jtree.doc-2.6"="i9qmlbn7apzimcsmxls2vwh5gniizyrc"; -"pst-knot-0.2"="y69z6hv29f73scygpzg5qr0p3yf8cvlp"; -"pst-knot.doc-0.2"="7jbx6gjfjglggmnfgpj0rzf67wp0s549"; -"pst-labo-2.04"="h5lyw06d0i2r5ghn4ljymyy3s9bglmcz"; -"pst-labo.doc-2.04"="8diz0gbmd09is6w4qyicizjbq4gf7lxs"; -"pst-layout-.95"="vwhvczg3rwlvz8r7x4y4n537bwb3x6f3"; -"pst-layout.doc-.95"="y5pl5paib75knak0gamgp31mph6dnpkb"; -"pst-lens-1.02"="y5a0bhzbyh4ncg26rh3k3w7xc2mmw2df"; -"pst-lens.doc-1.02"="f8qa04lxfwy1ic6dl6s4bc3k66b2sjy2"; -"pst-lens.source-1.02"="371k1kh1ryb46asc37r40vbi5i35icfz"; -"pst-light3d-0.12"="p4nppgfa4qw8l2gj23k1rhhfb7vdkq2s"; -"pst-light3d.doc-0.12"="p688y0b5pc29l63dpmrx342m4hmpilxs"; -"pst-light3d.source-0.12"="ic2f2b81hsyhh8pp57ywda8pngw9g0m6"; -"pst-lsystem-0.02"="4wp3nih38lv59313ch6asys1kj1qa27z"; -"pst-lsystem.doc-0.02"="x4k17vgrb4dcm09qrcx4v6lcxlx8h9n5"; -"pst-magneticfield-1.16"="c2m1qvcclbx5gx0jqnq6ps2ypfn2xvn6"; -"pst-magneticfield.doc-1.16"="pdlhzrh670g5hnr7di40mdcsjyjhx6nl"; -"pst-marble-1.6"="qairi5smsg637lgv56g247df3fmxf4wg"; -"pst-marble.doc-1.6"="g32ayxvgck3yfrikkqhw1njgxjsjp0wc"; -"pst-math-0.65"="i4s6m928yxdpxadv4wz0h8vfpw69l31r"; -"pst-math.doc-0.65"="s34g8psqhy9hb0927kbb62cd1fipm972"; -"pst-mirror-1.01"="l1qs4938r324dv9w1ij2xfwk16nslyhk"; -"pst-mirror.doc-1.01"="varxk1wyh1lc7yv5n3ad1yp583rchj3l"; -"pst-moire-2.1"="87fgw7g36l5yhh7wajhcz4fndls21d29"; -"pst-moire.doc-2.1"="j9hx5m27rs1by4igc5nn31wgxb4v0yz4"; -"pst-node-1.42a"="5kp8akd3xr2gfdynjilxk3igzlmc7drk"; -"pst-node.doc-1.42a"="0xfbfzhl2zkcdbnh5xxkchy981f9zizn"; -"pst-ob3d-0.22"="nymkccb9nwfqiiphmci238qxj9lk58w7"; -"pst-ob3d.doc-0.22"="sji0zdf3ylh4kj0vlgl0s7xqimiwh29i"; -"pst-ob3d.source-0.22"="jq2d3wiy1sgx8xm8izg0yd443aqps44j"; -"pst-ode-0.15"="h9xbq9v6cczaj80mmxic5vq4x2xclns8"; -"pst-ode.doc-0.15"="kfbn4ix8w9dkwn3ii3ciz2x20gz7acxp"; -"pst-optexp-6.0"="yld4g9b8cyxawzwgfavq3fzbm2j2qk14"; -"pst-optexp.doc-6.0"="gd54dvmww7gkdng7p1by02ab5ji9m3dl"; -"pst-optexp.source-6.0"="zhad57ws53m6h348smnbajpm6jz1rfv5"; -"pst-optic-1.02"="fmp70zsr3gfcxc9d7mik8y7fdq9bhv9z"; -"pst-optic.doc-1.02"="bw2k4jbxfdwyn7pfn708wd3ff8nr14ww"; -"pst-osci-2.82"="5rwmmzwp7jwfv40cg66gi0n75mlvn851"; -"pst-osci.doc-2.82"="nmgp00q4xifasnxnckw04kmd8qxxdd7k"; -"pst-ovl-0.07b"="9p419xds14qnxz308fk8872vrc25gfy0"; -"pst-ovl.doc-0.07b"="sqfllifxpng72ycciw8y46wqx74lfcq1"; -"pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k"; -"pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg"; -"pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av"; -"pst-pdf-1.2f"="b6y40i1cavghj4c5q1n71g6m7ncpw40h"; -"pst-pdf.doc-1.2f"="hhii0z91g0wbcqi3xsa6y0g1sk2sa0md"; -"pst-pdf.source-1.2f"="vdbn9r619v5ww220igdv9v844720ypkw"; -"pst-pdgr-0.4"="cijfx5hq5ygnchsgdw7ly5a43a5v6cqb"; -"pst-pdgr.doc-0.4"="s94gqhws251skwh2ap0b3hlvpp818y0z"; -"pst-pdgr.source-0.4"="s2zbikk5v94207zmrmnlpr5bx3jjzc5i"; -"pst-perspective-1.05"="iaq5j9cbgyr5p4np1fn5dqv8m8mv29qc"; -"pst-perspective.doc-1.05"="kvvjyfxnxvzxgjrfv3ysw2qd3bafh5jk"; -"pst-platon-0.01"="c1crbkzj0vvblf8n894g91q7qig185w5"; -"pst-platon.doc-0.01"="54icmvjwsbljdbq03j3npmwr9j85cdpg"; -"pst-platon.source-0.01"="bs136jlsz9yxiw062dlck6km6fsapgjv"; -"pst-plot-1.92"="nb5pbj56m205njaj6xx36fmpnjl2clj0"; -"pst-plot.doc-1.92"="9zns6nss0wbc30dbf42gm3gzkvddgrr3"; -"pst-poker-0.03a"="n0v39sbb0i18kdpkdg0c8yhjzyyk7sr8"; -"pst-poker.doc-0.03a"="b8na7nwvm3mx2rca78pb9xkna32agak2"; -"pst-poly-1.63"="caj343wmgfxzbzchalw7w14jazj3xb3n"; -"pst-poly.doc-1.63"="gq61g8l852k4m8n69kzqdx1sii0jr41n"; -"pst-pulley-0.02"="d7y0xspcv55vq4xhhpwhl9a3q33fpyga"; -"pst-pulley.doc-0.02"="6g5jnm4i5lrxqb45mn60g7nlc9xq13cg"; -"pst-qtree-15878"="6slxqgzm8pzscdf79x1y4zp3rav425g3"; -"pst-qtree.doc-15878"="9bp342h5rimv9wyjncj9m9bb3x2pb77p"; -"pst-rputover-1.0"="39c8h8wq8rcby34dnpq8f9d87zlfd0p8"; -"pst-rputover.doc-1.0"="apm70lr0xn7hgj16acpcll9wd3jcxqbn"; -"pst-rubans-1.2"="akzd33l39b9gh53hkqzaznb6j6rrbif5"; -"pst-rubans.doc-1.2"="sa01cv2q19w3rxlib2j2wppvbjcbn6z8"; -"pst-rubans.source-1.2"="vanr4y960njpckxcy8i10jh8fxmdd94m"; -"pst-shell-0.03"="kllra0m3v64wiw4mg1wjqwcwapgbqw34"; -"pst-shell.doc-0.03"="j8j9vfqbw1bzbncflx0wk7awr599pp2m"; -"pst-shell.source-0.03"="4zzi02gy69lscpmwmsy5i6dzck63ql10"; -"pst-sigsys-1.4"="89mhw4a91vxvm6jr2806w7sdgm0sldzq"; -"pst-sigsys.doc-1.4"="1x1s3l6z4rr8s1s8smck8x8vkg9sb7k5"; -"pst-slpe-1.31"="i8wqm7c5rr1gvrcqdhzgc3wjsnvhxnaq"; -"pst-slpe.doc-1.31"="d63x21a81b3chx59ygn3niagb12lq0vq"; -"pst-slpe.source-1.31"="b8pbhx17ad49g92il07bx2347lim9kr7"; -"pst-solarsystem-0.13"="k3gvgdnwv5054qph6ljijgwlr4mhrsmy"; -"pst-solarsystem.doc-0.13"="sh4if86rr6p8bmjrfndh8lfsibjmlj8l"; -"pst-solides3d-4.34a"="ja56phln33vfw2nih7kmvw6kr5s77400"; -"pst-solides3d.doc-4.34a"="82zcnj9a0sfy42hx7mihhgvrnj4xzg1p"; -"pst-soroban-1.0"="q71r7bilwmgxxvcqngmn9w63cqwh526i"; -"pst-soroban.doc-1.0"="ds57w9f3d4dy5c17xsvrmzs09iccanh7"; -"pst-soroban.source-1.0"="sj27j1n05dfq3szxyifzd24i44c4ls40"; -"pst-spectra-0.91"="7h48zv55xaxbgccdp7710lh3y2s334sn"; -"pst-spectra.doc-0.91"="sc2zbs93vbzp4jqgwwxh7pga2ngrwxnz"; -"pst-spinner-1.02"="c25gya6x35s07ki87x3f8jm85a0hsdqb"; -"pst-spinner.doc-1.02"="b15zdksxzk1dr3rmgi5qfkqwq131qnv2"; -"pst-stru-0.13"="9xzgq9yp4wh3939dxg4wvkzsvq8za3vw"; -"pst-stru.doc-0.13"="pm4nj6rck0s7gjhkfjg3i4xa8qd1dihi"; -"pst-support.doc-15878"="z97cka1jrk6jji8lczqfxc09cqj7f34x"; -"pst-text-1.02"="sn30bjp59awsdx31kii7a429wjin0zp0"; -"pst-text.doc-1.02"="3v66zv4kjb8rh3fpbx2wzvg1rn5iicaj"; -"pst-thick-1.0"="b2dnjagm4kkgxfjilahizzyq6mb1cx5f"; -"pst-thick.doc-1.0"="jkybjsqnnavyazal3bf4z54ldqnw1gw5"; -"pst-thick.source-1.0"="1kjjkqgz4fwghaialrqvgnfq57vl13k5"; -"pst-tools-0.10"="459qcdqz4aaidc51k1yb4d2avbi2s2pl"; -"pst-tools.doc-0.10"="s3qcq12jq563x97qk9b3adv9wqra5h69"; -"pst-tree-1.13"="l1m6c66jv4v02n4mjv9ddgh84qbyllqw"; -"pst-tree.doc-1.13"="jgcx73vrpiwvlq9rg1iszm57bj1qsr73"; -"pst-turtle-0.02"="m4g2qpqvzb71ax94sqcvzzpjzyxs4bzb"; -"pst-turtle.doc-0.02"="rnps80z7lni58fnlfqdx9pf4iw5s1f22"; -"pst-tvz-1.01"="0xky3nd1q8kv7vbs73dcbwgjqbysrwi8"; -"pst-tvz.doc-1.01"="hrigaq1rz3hd5l4969913apdwayy1ifr"; -"pst-tvz.source-1.01"="zs1dh6kiphzy0p7nj7i1faldamjsc1j0"; -"pst-uml-0.83"="0rfbyzqd6xk0aiwrmavfnkr6bmawkrdg"; -"pst-uml.doc-0.83"="jvyfkj9r0zknfbpway8zwl5l81zwfq6n"; -"pst-uml.source-0.83"="50n69kfybcg2qlxjy9d0f330rxy23sv6"; -"pst-vectorian-0.4"="45j3kc2ma7yvpk73724419zxzajyyc0p"; -"pst-vectorian.doc-0.4"="kr9cw6fs2rra7ymmza9mf3winvj17c0j"; -"pst-vehicle-1.2"="fzkkfjzb0s227y1942p89g2s3qn5bgdr"; -"pst-vehicle.doc-1.2"="152w1jskf5ninr660a9cjbyh9q4bhphj"; -"pst-venn-0.01"="a5bibsz9q8lm2yqz7wrmarn54qc134y6"; -"pst-venn.doc-0.01"="vfdaqpl5fr5nh08a4cg4gkl55nxwv5gl"; -"pst-vowel-1.0"="aq45bsp7d1rdflxvs1aga0kqmn9b3zd8"; -"pst-vowel.doc-1.0"="zm075772viyjnm1akx6ixk61gb33nq8m"; -"pst2pdf-0.20"="0j8jdmyyglah1883y8m84c7qxymc8g1f"; -"pst2pdf.doc-0.20"="vl6kda2lb2nhwhp1cfbgn4zhbfi1gz5s"; -"pstricks-3.01a"="59bjzfqwbl5hi2inpzyk683wwjmk24nx"; -"pstricks.doc-3.01a"="kswpg5w2v9cqfgjbzslk8dys2kzjm33g"; -"pstricks-add-3.89a"="96y4vwq9y08a0ydk06v808ixsikg0hb6"; -"pstricks-add.doc-3.89a"="kaw6qyrdi6ci1hr7vpfsbgfzqjrvmldv"; -"pstricks_calcnotes.doc-1.2"="4q48najl98h9lb1866avfw6c5ir7p4bj"; -"uml-0.11"="ggl1iw3qhzysy0fza2dbl3igwlcq3i0n"; -"uml.doc-0.11"="rhj5ivlvx43d8c700117lklmgardm76a"; -"uml.source-0.11"="nfmc770r8bp35av4n0x1nml5h23y3whd"; -"vaucanson-g-0.4"="qvnklg80m4p0235g3wx2ln1gk5myd1i9"; -"vaucanson-g.doc-0.4"="iwldpyzbgygg73gyidpj3vgw60jdid9l"; -"vocaltract-1"="dzjd6v5mhb2mcdgrk66dc0wc4hdihsnw"; -"vocaltract.doc-1"="kgb45nb45fmc2hnyg31m92cg74mybnvq"; -"IEEEconf-1.4"="y7pcvgybgsj94x4r1b3p79w2bwrja38s"; -"IEEEconf.doc-1.4"="6pyp532mjalspmalr2ia8nm58fjj5fwj"; -"IEEEconf.source-1.4"="h16jq4q6bvb1wpwjxnyhhp43frcjmnym"; -"IEEEtran-1.8b"="96gd4zxcmg6c2mma4d8z0wganf9ml7d9"; -"IEEEtran.doc-1.8b"="ms8cp0i51knhhbp2fckkmr2cwlvyx4b0"; -"aastex-6.3.1"="hr2pdgvn6nj5lpy98kmzd9w5wphhlrd8"; -"aastex.doc-6.3.1"="m7c2djbqiial9g32q043ycxaxfafaf2f"; -"abnt-55471"="gc6hz7sglzshmq5dlm0qzgg10vn3pncs"; -"abnt.doc-55471"="jk11kdy4pqbqxhscx0bqkb46r0z15lh0"; -"abntex2-1.9.7"="zxahr9mb1vq0yfcj35znym4qx2jh4p53"; -"abntex2.doc-1.9.7"="hs3g3ji0knhsh0gmjcz49dvc547wh0cc"; -"acmart-1.75"="76831qm9apd7fgwa45x4wr213snk0pca"; -"acmart.doc-1.75"="4s30kgw83xqzcn9xvrwyb79x1zqb0234"; -"acmart.source-1.75"="1146n4qfma5ysgkzk53rcyla8mf3d8bw"; -"acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5"; -"acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23"; -"acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik"; -"active-conf-0.3a"="k1b3ykxr34j6mz7qnhl442kiw5mi044k"; -"active-conf.doc-0.3a"="smq9rd7vgsdm8q0mkgrvwifrdjirsi3n"; -"active-conf.source-0.3a"="j59z6864ndi1pvrfdcj1g7h28bb0zs59"; -"adfathesis-2.42"="kipd97l80csijf6nwf4qh9dqs7481gpv"; -"adfathesis.doc-2.42"="1a45imkqk01xwsn8w0sgi04kq9lkjfsm"; -"adfathesis.source-2.42"="wsyrxaljzn15z0mg9fkv7qqbcxfgv7ri"; -"afparticle-1.3"="a47yf3q2kr9imhrr9520gm0xzrbxijpl"; -"afparticle.doc-1.3"="jwrcq8p5jlda9bs8xq364748p9xr3hyk"; -"afparticle.source-1.3"="3j3wg5g8qbrm1lycdd5g49sva0rshjqc"; -"afthesis-2.7"="s423mnyllrn49bbhas0r4nmks9nk4nrh"; -"afthesis.doc-2.7"="8cac60kzq0srba12qa1sdk4fkqxvwjvi"; -"aguplus-1.6b"="92nfqnrbjsfcw7aym6qahl2rsl75kl55"; -"aguplus.doc-1.6b"="8nams9f6dwbv45ad46lxh7c4wspl0hcl"; -"aiaa-3.6"="x8hag1q2jh49y6ad5k774y573zas97c4"; -"aiaa.doc-3.6"="ipldvi4g05v26gzvp2wp71n0xv5mkdd1"; -"aiaa.source-3.6"="wllq5qv20bc4f7m098yn1f5slyrdxazz"; -"ametsoc-4.3.2"="4v5ya7z7mbbxqxkjp5madwpn3m456gpp"; -"ametsoc.doc-4.3.2"="nzphxaasrrgxhiwixz6k6qikbg6z45gi"; -"anonymous-acm-1.0"="h141yi757rprhkm316naq870szcpnm2j"; -"anonymous-acm.doc-1.0"="g57swlg0lqfibb3zp09jbx71fkbx6mh5"; -"anufinalexam.doc-26053"="qb1dvx5ryz6p5dia1z13aa0h0822f814"; -"aomart-1.24"="y442d2i6ss4zm83pcmg35lh2yf628z94"; -"aomart.doc-1.24"="s48yvb9pilz11n6ljsxsjf1iw4jmfblp"; -"aomart.source-1.24"="6435dkc918aiq8g3lnvj0a58c26vll8k"; -"apa-1.3.4"="g7ywm2jp0b70qdwmm59m4rr8glx3wc66"; -"apa.doc-1.3.4"="vjg7gj1wi6mb9b1qyfsznhgcbvivdn1c"; -"apa6-2.34"="gq1rkj5hq03b1sp0a1gikw2vbi4a1z7l"; -"apa6.doc-2.34"="4nmwwb5z010k64p74f033myg7kcy9g35"; -"apa6.source-2.34"="149j7rpcbzy97nidnyw3z9b9jndh7797"; -"apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z"; -"apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw"; -"apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk"; -"apa7-2.11"="8b7z10rsc2mxmwh64gi985aam7lf80y0"; -"apa7.doc-2.11"="d794jnpnh1b7x0bcqajmxnakcrjw2nbx"; -"apa7.source-2.11"="rkvqs391j1kmhfgi76j3bgsin03jkdlj"; -"arsclassica-45656"="pk5gn6ifrhj5c33f78d619hq4j3d7nmg"; -"arsclassica.doc-45656"="z21lmz2x0sc7g6gc50j1x0hhzz96ra7b"; -"articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l"; -"articleingud.doc-0.3"="00653rqfzjv2f4wl77vznk2p1pi6f2fd"; -"articleingud.source-0.3"="24wwfplzs8477i5kl1ks5fvkd8w1lv76"; -"asaetr-1.0a"="wkch5k1hxw65dfdkyghyzpcibmnj0zyj"; -"asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1"; -"ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3"; -"ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623"; -"asmeconf-1.26"="bp2mgyvlzwna1n2kkg8rz3wavfa7vpk6"; -"asmeconf.doc-1.26"="f5yps90iyl7bh7cnqal2h0pwpf997b59"; -"asmejour-1.15"="nilwrvcl7jzvzgv3gz66hqqrhfarfhx5"; -"asmejour.doc-1.15"="yz4n2hjjdh6173a581b8ncvaai3yrzxw"; -"aucklandthesis-51323"="gqqynyfp4l80jc7a90by84wjmn22s0br"; -"aucklandthesis.doc-51323"="mqasialmycia8nzmrc2m3d9pwf1a39r9"; -"bangorcsthesis-1.5.3"="h92q93ga8029hvd79hywxq73kaszm5a1"; -"bangorcsthesis.doc-1.5.3"="ax2czj8r6am7m2r2inrlsvnfl2rmja4h"; -"bangorcsthesis.source-1.5.3"="hc67sbajczfjxpwkvpl38ss355pziwg2"; -"bangorexam-1.4.0"="6s8rc4pgza915qgldk95ykqmxhf2czxf"; -"bangorexam.doc-1.4.0"="kxjxdnfljg1pracpx514adjp7ynbvvll"; -"bangorexam.source-1.4.0"="rf9s69qaaw2qrbyljcsj9pmg5qw4m18b"; -"bath-bst-4.0"="n0l3wi2cbx89zc0p4slqydrp9brqsqpf"; -"bath-bst.doc-4.0"="fi61fvr0sv1191qvm1xslr1ppr0md792"; -"bath-bst.source-4.0"="vc8ipiy9ha9j4yzc5k4xghmwfbh0fz9p"; -"beamer-FUBerlin.doc-0.02b"="k09b82znxfk7gi7cxpkffs65v3q5siph"; -"beamer-verona-0.2"="jgqm1267x276xsdikvc586h946xfzhcv"; -"beamer-verona.doc-0.2"="skxiv6nxw4vk3c7ppl2bripmlkada52x"; -"beilstein-2.1"="05srjjkprhg26zyi8i0wxdazsi1ldayz"; -"beilstein.doc-2.1"="8w2iba8h9nmi7jl4wbpw5jd008x2nlrh"; -"beilstein.source-2.1"="i5zvzazc6zlkl0pyqvjqi2br5k6j1ahc"; -"bgteubner-2.11"="kjykk4kfr7iig49zpd26kga2p4kki4gq"; -"bgteubner.doc-2.11"="wi654djqdqp0hff6cshv1hfkhmgcacs7"; -"bgteubner.source-2.11"="jhqhmr6bb4ldma4dscl9l4csan3qrv6q"; -"br-lex-44939"="ipw7gwrsdv691vnv257w9i15f465irnv"; -"br-lex.doc-44939"="kai74ysi41iw5bc9rjv8saj7qh7n0s12"; -"brandeis-dissertation-3.11"="x6gg26rlwcvaaqpwrp0vjm0abg82aa7z"; -"brandeis-dissertation.doc-3.11"="y0fh6a9qjcfwvn4pa4rxiz904890vzap"; -"brandeis-dissertation.source-3.11"="20gj99chfclhsr997abdvmg7v79cwmix"; -"brandeis-problemset-0.5.5"="x7ivk7r7qvi08kb7jmdajym04hxyhzk8"; -"brandeis-problemset.doc-0.5.5"="zsa3r4xc2kfp00r3jj7mfzdxaphj7505"; -"brandeis-thesis-3.1"="4amlxbgx7ajpqx9lhyiq19ha6cijz6yz"; -"brandeis-thesis.doc-3.1"="ycmbg34x1raw7l3z5f90z37p7i50yigz"; -"brandeis-thesis.source-3.1"="j7b85x32ikjdca33gx4iqrnjxg4dhbbz"; -"cascadilla-1.8.2"="03g1znhjzcvxvclzwb33lrm6703j1xxw"; -"cascadilla.doc-1.8.2"="njy3lpaw3lch5x3p1mm07zis50z38ps1"; -"cesenaexam-0.2"="0n58an00m7xywgjxd4mk4jvr3wkla1sg"; -"cesenaexam.doc-0.2"="1cq9yg0f3j9s40jrkzgxnpk2ya88jgiv"; -"cesenaexam.source-0.2"="213fs3j3x9f0330jy9hfxmq3dhpl1lgf"; -"chem-journal-15878"="8rsrybpvzqr389ip3lfkjna1vy6lclv1"; -"chifoot-1.0"="k9iv6mr24x0fxdylmzma4rcip0dd7lry"; -"chifoot.doc-1.0"="kwyxpsww86h23gs0zlin4niykgjiiqal"; -"chs-physics-report-54512"="ci2816gvc1ds20gh2jiiyyrc061n0ncz"; -"chs-physics-report.doc-54512"="ipzvx9zkpnnzbdkmbzzk6g4wz4qaql17"; -"cje-1.06"="s4l2hjnfw2s0l19hbzf5249igprbhw7a"; -"cje.doc-1.06"="hyw2lcxsbm0v95l1161v2sh2bprsg421"; -"classicthesis-4.6"="1mdqrwxmh218ni62g9bfgq7v1jx20ilc"; -"classicthesis.doc-4.6"="d0nd57qpb4ya46ipz6c2jwark5sdghfl"; -"cleanthesis-0.4.0"="z2wcfxgawx5pdbw7bfisn89qyl2jlyd9"; -"cleanthesis.doc-0.4.0"="w4wjl5szng8zg0vvjr32914rdzyxcffd"; -"cmpj-3.03"="7jvi0lm13xy84p05g5cvdxlvbap821gq"; -"cmpj.doc-3.03"="b2sqxga8rnn5q6k7sz0ijm05jkwggsdg"; -"confproc-0.8"="6anwdx64g1yfr109jrnqfml6bqj8l98a"; -"confproc.doc-0.8"="qczsp87rylnxkd8nsi14kjahnkh57i6m"; -"confproc.source-0.8"="f8yczf6glbb74hvfga786qvamllnza9c"; -"cquthesis-1.50"="6fxwcf7pk35b3brdybcdrj8hds82xyry"; -"cquthesis.doc-1.50"="vw5y17h64nsd337wyaciprxdhfm55sgh"; -"cquthesis.source-1.50"="yxsgl39sk05rh5sz149n17nmilbgkhcf"; -"dccpaper-2.1"="zw5mqpshkvv3xm18jy9cpxggr64mgv2i"; -"dccpaper.doc-2.1"="ld4fpnbbxnl9bbf7v43qr20nn5vvf29j"; -"dccpaper.source-2.1"="h381xhs9isqv3nrxldhjqc460rysx658"; -"dithesis-0.2"="y0xrpjxnblvgahdwyfhm2hag5hss6qzv"; -"dithesis.doc-0.2"="b7ka35ywbrn2m3a6b8cyzyvajwxyvdkl"; -"ebook-29466"="08y1g19fvjskwm55g1av1x8bs95vmc6y"; -"ebook.doc-29466"="kw04pn3a7pbkgxjrn1p12z65j8k4n3fk"; -"ebsthesis-1.0"="3f8i1srqx6hh10rrjshsispqr3wdhm0m"; -"ebsthesis.doc-1.0"="wic4wfgihf2yyk40937hr2g59933cyy5"; -"ebsthesis.source-1.0"="q1lhixwgkc6zis1sgsnwzsd0p7spp0zz"; -"ecothesis.doc-1.2"="92jxgiddwpj5g62zwg50wm681h2z1ixf"; -"ejpecp-1.9.0"="6z822g8sqvwndh8gdcaii3f8pdnk0pmi"; -"ejpecp.doc-1.9.0"="a5kin866l57fzcgp5i3flqialzn94ghd"; -"ejpecp.source-1.9.0"="9jmfaci8rmnmz8lgbc7syd3lsp5f61k5"; -"ekaia-1.06"="r87yx6q2rzrcp150gny82070fk0a8a9i"; -"ekaia.doc-1.06"="lnjkk17sysdnj4l9vpx0qwkr1w185iq7"; -"ekaia.source-1.06"="jvjhgfg1hvj60lcwa7k34zfl9v17bw5h"; -"elbioimp-1.2"="wp7pv78ijjgb48majhg8pjqcmkq29jbl"; -"elbioimp.doc-1.2"="0515vzg1miiljb8grlb8idsb2y9gfcdc"; -"elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4"; -"els-cas-templates-2.1"="128x9ixs3cpv1nh2pwx2kp6bhn64kxpw"; -"els-cas-templates.doc-2.1"="188ypaihn3x9p3951vybzl0i725j22nd"; -"elsarticle-3.3"="0hii9fd4wnh10b1scaclvbsq1471fni6"; -"elsarticle.doc-3.3"="wnvrk9yhf2bv69bcrvcfhcfnjb3wv1bs"; -"elsarticle.source-3.3"="ffcj8f3r4p4wwy6aj5c0sk9k9bqp3nbc"; -"elteikthesis-2.1"="mivcwfrlyxmxsrc94vg0ji7sgl1c5a33"; -"elteikthesis.doc-2.1"="20a9fq7yb4xyfnk5x4c1isd3afc4s69p"; -"emisa-2.3.0"="25kpkvf03crgwps8fk5gm6jhi2lvmgff"; -"emisa.doc-2.3.0"="yx0k9dab0wappz1sbfdkl7aciy84qb2s"; -"emisa.source-2.3.0"="j95fvqf1p9ad4ck02nhil1vqwliwhp1b"; -"erdc-1.1"="pmxparxijq91mlqb2z2ci0mk9as4r1nz"; -"erdc.doc-1.1"="a7f0jw1j2l0md2s4hdzv6gb1v867nk8n"; -"erdc.source-1.1"="5rf897hybsib6915bvyp0nai8j7bszgb"; -"estcpmm-0.4"="30s2wysjnicdxnfwliinz0s3xgjz65an"; -"estcpmm.doc-0.4"="kmrdd36g036c2rd86i9lc9n73rcfhwy7"; -"estcpmm.source-0.4"="7pn247fkf44679vcgbf62ishd70sgr8p"; -"etsvthor-1.0"="i9p7vf52g9pxrczw1sfvipk71xjbw2pa"; -"etsvthor.doc-1.0"="jp6bpcx2mwjzs07p16w0ncjfw1kb9kzd"; -"facture-belge-simple-sans-tva-2.1"="v9wdhpc6kjgc3w8dwnscbygspwl07s9l"; -"facture-belge-simple-sans-tva.doc-2.1"="ysil9y0b6ff47yjxhn60q1pbpz03bsm6"; -"fbithesis-1.2m"="1fdf0shkpyjfwikv3raz4a27wssg7j8q"; -"fbithesis.doc-1.2m"="wjh25w45lkz3dg1900qvpvn3r137dw8m"; -"fbithesis.source-1.2m"="qa99zpjzb2q48x55nq9cfsv7gf6ggyjb"; -"fcavtex-1.1"="kh7y3795flgarmi9izzzgq6g7z294jj4"; -"fcavtex.doc-1.1"="qr05ymcfxx8vwm572rd0pa6yq0fam2n2"; -"fcltxdoc-1.0"="gr5vxdra4lcsljhm591xs1b6z4ci2ddc"; -"fcltxdoc.doc-1.0"="mibli0mi846flzm0id9z0cr8x90rivgw"; -"fcltxdoc.source-1.0"="yn567l5sbbrrdbcmiqdpyq8kq5y1ni1v"; -"fei-4.10.1"="kmpplq5f0kjyxgpm0qdv8as1dlvn7q56"; -"fei.doc-4.10.1"="f9mk8z9y3fcr0w0c84g0d9k4wm8c9jqa"; -"fei.source-4.10.1"="ffcrmng6846ww2z01hr9bb25qmc0qsqa"; -"ftc-notebook-1.1"="rmxxga464shdkh4v9c4kk1ihxy9vsl49"; -"ftc-notebook.doc-1.1"="l3a2q406sj7pvfhgw2zsxfyk5qyq0dsp"; -"gaceta-1.06"="gkwy4pkpzmykxm2rqldpjfh5q5m87ca1"; -"gaceta.doc-1.06"="zbxs7kz33kbvx4g5zykh33zn2g9z2cp1"; -"gammas-1.1"="40731ddy53sm4w57jw24xq0hj6qklqsi"; -"gammas.doc-1.1"="vfqbbxpql32gkxjspmrqkny7rsxw7hqg"; -"gatech-thesis-1.8"="q85fv2ikl3ikw9ja5j7sgygyi6v1x2kp"; -"gatech-thesis.doc-1.8"="q97libi0drg6plfjps8p9fd7fxbxg34n"; -"gradstudentresume-38832"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b"; -"gradstudentresume.doc-38832"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk"; -"grant-0.0.5"="n25rm5asji0fx6kkj9n730v1i89ki97a"; -"grant.doc-0.0.5"="fw57a585095x7iszbwblzxb3zkjbxdns"; -"grant.source-0.0.5"="r7hk7fmqdm91xd2g94jzgv5cp1c09y7b"; -"gsemthesis-0.9.4"="jhw29zl7f93xh641ws6ydqh62cv1kbbj"; -"gsemthesis.doc-0.9.4"="3nw8q8pxsfdbd4gmly0bg8ig15ccpy1q"; -"gsemthesis.source-0.9.4"="w1k5h97pgahsar4r1sbg6i2dj4npr6y0"; -"gzt-1.0.1"="ijkp9ccl773y3idx94k36d9p1c3fmdhq"; -"gzt.doc-1.0.1"="lq06nyg8s12aksb2br4mggpim9sp6zhm"; -"gzt.source-1.0.1"="36gbqmrzlmsapigvjkgzgd372wq7pm6x"; -"h2020proposal-1.0"="sdm13gcvhga8q32ai16mnz2rfsnwb7bz"; -"h2020proposal.doc-1.0"="8nsjvgzyw9137ncq9v48dhlncb10snyn"; -"hagenberg-thesis-56798"="q22ijqqwcxl09k2b7p3hqmn1dxk8h5yk"; -"hagenberg-thesis.doc-56798"="i1nfmw31ssxmn5s0dyybymlvm14ij7hg"; -"har2nat-1.0"="yn5d36r1lnx5xhrk46laka9crikcd5yl"; -"har2nat.doc-1.0"="8gh35w4a8j117z6dzy9p7mmbxsh789zf"; -"hecthese-1.4"="8ipql2rwzwaaqc9az5syb4ny89c75d3z"; -"hecthese.doc-1.4"="aily0d12b24n16ah6d4chb96vvh2ppwb"; -"hecthese.source-1.4"="2m08qjacg4y5rvk16pfyyya1yiik7sry"; -"hep-paper-1.6"="dil9g6bmnpsdfhvxk57gc1z19sdxlqwi"; -"hep-paper.doc-1.6"="nciggxz3kbil9vka01npln99bdcc7yhh"; -"hep-paper.source-1.6"="mppyxf3mm5wdaxzr6zlzw0f9i7nw9vdh"; -"hithesis-2.0.11"="drsv1qaj1wnzsnl1kqzq5k8c4g00xi0m"; -"hithesis.doc-2.0.11"="anqnh1ra6l9fhi0xmgks1yj46zp58irp"; -"hithesis.source-2.0.11"="a7nrjypxwi5m6l49paqc182jz5yh96f1"; -"hitszbeamer-1.0.0"="d0wbfsacf7bddq6h4hk1d9pgm108bsdh"; -"hitszbeamer.doc-1.0.0"="pnv5g2xwjnlb9v1h9a2q1iqpbyi6rjb3"; -"hitszbeamer.source-1.0.0"="7hfpypq95z6cj5jxvmhnmwsclw6qmvmk"; -"hitszthesis-3.2"="q9kd5k3yfv9wxzwawqm73fvpxb9q1nbx"; -"hitszthesis.doc-3.2"="hna1361zmxcxv579whhkidgq3ydqnzqn"; -"hitszthesis.source-3.2"="wxvimwcr2wjmqr4f53pkz9mfwjabx25h"; -"hobete-27036"="k2agw9n4s8imsfi399r1n3v80sdxc41s"; -"hobete.doc-27036"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g"; -"hu-berlin-bundle-1.1.1"="2fdlh1pngcac1bmllvbmw83dqmc1i50s"; -"hu-berlin-bundle.doc-1.1.1"="y3yczz5dk5k9mibs1530934sgh5argwb"; -"hu-berlin-bundle.source-1.1.1"="4cim2cvm6jplzj8k1caiqyhjsqvq5wqq"; -"hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs"; -"hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w"; -"hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2"; -"icsv-0.2"="3k7if2nxgb8zcyr7j29v3pxcqcyygg3k"; -"icsv.doc-0.2"="n714ksda39kc8zsqd1x7lnq3crg2w6fi"; -"icsv.source-0.2"="h08pzrpgwn88gz0d6kyrvnyjrra6f3vz"; -"ieeepes-4.0"="xljj9w5kx7mxhv9q6dgmn23wkijvjyqg"; -"ieeepes.doc-4.0"="n7wpz8946kfcd7a4dnx901y40vjbynxi"; -"ijmart-1.7"="nh0kksmb0z5k95s15bwxrbqxxnlq81l2"; -"ijmart.doc-1.7"="b88j6a249p8f9bp35a8p019l02s7lbfc"; -"ijmart.source-1.7"="y5wyzz6jr5lp0syjywlvdpb3s02cb7ks"; -"ijsra-1.1"="zj3pf34flbmdy98fzmshxdwhsm9gypb3"; -"ijsra.doc-1.1"="pmw844flk212zpdvcp026c63snmasbsf"; -"imac-17347"="w4g9hwgh6wvbhf5v8xfjcba6chqlp32z"; -"imac.doc-17347"="5qid3adma0486l4li4mmrgxl9lykzfz3"; -"imtekda-1.7"="rm2w2mx8mxzxjwgsw6gk0i64c2wb0yxa"; -"imtekda.doc-1.7"="m50cfbqcjz4ylda5myzz4idaqfv40nay"; -"imtekda.source-1.7"="wrx5ndn59k0rlz19iq8r4fzb4yly9hr2"; -"inkpaper-1.0"="iabllzkp6m8p3hvic3ajv5b3d6l511g9"; -"inkpaper.doc-1.0"="2hn02y78bnp1w2czqxfrsi2wrmpjn11w"; -"iodhbwm-1.2.2"="2161ysz3fr6ipycjag3zz7rr6ip4pny8"; -"iodhbwm.doc-1.2.2"="4ncbw0vcaxf3bic32ih1znlf3rljbvhz"; -"iscram-1.1"="2pywqaa72mb216nmzl0w8cr74vf200cg"; -"iscram.doc-1.1"="0bd1j3dqs4kgsdaag5wkv7n9zci8qgda"; -"jacow-2.4"="z7ag0qa8hzbihrqij6dha0hm4nkp14vp"; -"jacow.doc-2.4"="c08j0j2lc0awnk2l9bcx022wcxzswala"; -"jmlr-1.28"="d4dsidg0avjbflvc2gdx6rr48bhrbw51"; -"jmlr.doc-1.28"="w52w3cf4n9dbchs8br6xlfnwjyrjbm6a"; -"jmlr.source-1.28"="2q4bm66ql7grambkhcjsy7qifk1hpz98"; -"jnuexam-1.0"="i5nabjrqbv9q7cf167wvqs2f3c1sla26"; -"jnuexam.doc-1.0"="h7qal4ph3b0fwmasah44ihws53zqjih0"; -"jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x"; -"jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b"; -"kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr"; -"kdgdocs.doc-1.0"="0gfi3rfrsjaw25g7mxk7mai8mxy968m1"; -"kdgdocs.source-1.0"="dcafx36f7id055kdwvfsci6wq2ya50c8"; -"kluwer-54074"="y63q5nz0rhxlj362cbj5a4x3wm8imiri"; -"kluwer.doc-54074"="q85mq4id3y04wwq7f8is8lwh7gbzyxxn"; -"kluwer.source-54074"="q4k0f4qgzcxgnxblw1776dhk57i2zq6d"; -"ksp-thesis-1.0.2"="244sggimcsxbqkh6g9nndxvdvr6agqvv"; -"ksp-thesis.doc-1.0.2"="jngi4gfc4r6dkp6xggyg2s05zj38s1vz"; -"ku-template-0.02"="9b1vsd98aqc0b5s33r3z6ayj7ph0lcj3"; -"ku-template.doc-0.02"="067zqymqvljm9ras3a48glc0clfkfwkk"; -"langsci-58476"="463r1jikan2ybp34cjsidb65v7wlpw1l"; -"langsci.doc-58476"="83d8m3pr774kq5x43d2yc8h85j4r6jc8"; -"langsci-avm-0.2.1"="asl3mj4jznkw9zx0qbh73jxxgilkc1s7"; -"langsci-avm.doc-0.2.1"="l5p3s2falcipv9i8zlq3ycsrz6awnf77"; -"langsci-avm.source-0.2.1"="g4dk1j1bcr9nfdq5y719hxaqjh4qq3ph"; -"limecv-0.1.8"="glh4vcp98llwl6ll250wrgkxcw3pa9jb"; -"limecv.doc-0.1.8"="ipr8igc8h0bqm6i884w4nbprhsx5fr9k"; -"limecv.source-0.1.8"="zi78lvpf0qylhawynlzvhdcyq8bx7sg4"; -"lion-msc-0.30"="pyi5ib4528wkrj6hz3w2yv8n7fyjrb9k"; -"lion-msc.doc-0.30"="z6i11awv7drrf7absxkichwc0crzc9c6"; -"llncsconf-1.1.0"="jjhv89zzq8gyc275vj2r8k2slgyh94r4"; -"llncsconf.doc-1.1.0"="pfh5rgaqmiz589sim212gxq3bh1b7hfx"; -"lni-1.7"="hq9s9czcw4avqf8s23gqri397qaqvwl5"; -"lni.doc-1.7"="f8b3fg67ihlam3vr1m853yd5yq3vq2sw"; -"lni.source-1.7"="ns083clbixw9aj57z9zl2qwbgfvy64lr"; -"lps-0.7"="njaym8455i99rr0vplxlpn95cbp8sv9h"; -"lps.doc-0.7"="9qg688yrg4lfkb284shpgan08vfi5sxn"; -"lps.source-0.7"="d2jid2g08c51lpixvbqp13hkvmbhw2f2"; -"matc3-1.0.1"="1r8svk9xpxv518j58xxrkfpy3lzh3gs6"; -"matc3.doc-1.0.1"="9kwpm6ah02zhwgd5gfhqkk0csba5h401"; -"matc3.source-1.0.1"="cnlk2ffrjczw23mssgwv7i63dg7w3j19"; -"matc3mem-1.1"="1w8m977ngbqivnhlaqsf6bvn7yngg3hg"; -"matc3mem.doc-1.1"="y6b8v00dhz5xg56kz04jql3rdrl0v5n1"; -"matc3mem.source-1.1"="3n9x1jfgrc8jigj8w2bmngk7pxqz9v29"; -"mcmthesis-6.3.1"="yx590n1qwxski5c3ha5a0p1zhl5nz8zz"; -"mcmthesis.doc-6.3.1"="hpbx9mn6df9nkhcr7066qqr3cf5xglb9"; -"mcmthesis.source-6.3.1"="g47kbm3y491m8m16hnlh5mpibmy9s8zq"; -"mentis-1.5"="nfpcmyxlg0gadqj33jnxji3nvs5fni9l"; -"mentis.doc-1.5"="vnj4lk1vxc0c0710jb21x3vskppk9c86"; -"mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g"; -"mlacls-0.9"="2fkxkj9cwy2j2c3fsmrx9a7rj8idjbx8"; -"mlacls.doc-0.9"="qarilny8mbhr93jkhishz96ly84154m2"; -"mlacls.source-0.9"="5v52krplb9sqsk83zilcdp2gnf9kn25m"; -"mluexercise-2.0"="55nqdha684dmm0f8360zvz4wby202h12"; -"mluexercise.doc-2.0"="7ha9qpaz3xrq3q7c7d8lbz0xf0vklw87"; -"mluexercise.source-2.0"="9q1spi4fzz2yfzjr6q32ypr4ghr9lip9"; -"mnras-3.1"="782c0f5jafxl0xys89wp8f0pw00b7rh5"; -"mnras.doc-3.1"="cb0rhnjpawgc9i4hamgriy746xx4v42g"; -"modeles-factures-belges-assocs-1.0.1"="yildlnjq5szbsvis65ph02bvvzydgldv"; -"modeles-factures-belges-assocs.doc-1.0.1"="ni0ac0babnajp9dlxqgdvazmrx8aixaa"; -"msu-thesis-2.8"="0d0607nv2nq2s2cw64pmkmkhkmnglv8k"; -"msu-thesis.doc-2.8"="lq84fa70s7gpvnllfwrn4w9cgxmgzcpw"; -"mucproc-1.02"="d1xzqp0nvkk4zdf1zcrhngvlc0q412gp"; -"mucproc.doc-1.02"="zpky6iahkhynyv72lg94ankg9wn7gwd7"; -"mucproc.source-1.02"="pxysp457kvf603nz6lwaj55cmlc41n0m"; -"mugsthesis-34878"="cfkw21f3xy6pchbq7ryw2df8bdssilc5"; -"mugsthesis.doc-34878"="xqm757zbzxi9ag50dd22274bk5n1897h"; -"mugsthesis.source-34878"="6awfcfhsqggxvxxxmfbi77pa6bwchg79"; -"muling-0.2"="0isshjwygamwvdgx9lqz7wjrrcq9wk5a"; -"muling.doc-0.2"="qivxsrjaiyizrk21g7kn77lkzx87wjxb"; -"muling.source-0.2"="qyvgpl8wxl6rbwl245mc8parwq1h9cd1"; -"musuos-1.1d"="v0bx55bnw5lcpq1w0zxfkf1hlxahxj0x"; -"musuos.doc-1.1d"="iqviyy26inh9bw04maby457bvxip69xw"; -"musuos.source-1.1d"="rx3zcmp2mw88f3jxa0igajz4dzvx135m"; -"muthesis-23861"="w6llbyp3d615mpjazf9i746acl0hqvpb"; -"muthesis.doc-23861"="776dszqb0k9nffhnln310dg20n4z0dlr"; -"mynsfc-1.01"="j3jb9xyv9javnbk9r6fb11ygnd9ygpfx"; -"mynsfc.doc-1.01"="5zlf94gdmkxg37zdwq04w4pzfgransf1"; -"mynsfc.source-1.01"="zzmxbw2xfk91lv6isc6raqnqmvk4da6x"; -"nature-1.0"="147ghy9qhv5w2p0rh84wrpdgk5cwrd1y"; -"nature.doc-1.0"="lvavrpl6wrkxpsidgbzil8g117kkwdf6"; -"navydocs-1.1"="kn549s2m1h0i9ir8q01il9ww3yw05wx0"; -"navydocs.doc-1.1"="72l419vyq79lrhlflxnivg66b9vkbx5m"; -"navydocs.source-1.1"="xcwc5yyvhjhrdjrj9w9prp72mpqlvq3r"; -"nddiss-3.2017.2"="gsqqnmrgc27i78c6s4y1zy7i5yi66yix"; -"nddiss.doc-3.2017.2"="p28y66qyk1zkhmp6f11rkidfjmvpnlgx"; -"nddiss.source-3.2017.2"="7kbka2v5nsdg4wfrv69zsx92rrlax0zw"; -"ndsu-thesis-46639"="l4dsamss5kpl272pbmj720jc6zlb4lij"; -"ndsu-thesis.doc-46639"="6hbh7hl0nwsijq545vym7il5wvrzlbr1"; -"nih-15878"="cv6rcwrnq8rpwmmxva32233isckys2md"; -"nih.doc-15878"="n3j1f7kbygyh0ljz1796b0ywkifvykbh"; -"nihbiosketch-54191"="da0kk90h0paw6wp0x43cqcfm18bh9ajz"; -"nihbiosketch.doc-54191"="l6nx5x7lb8sqfbmac215xbrn36ifx6fc"; -"nostarch-1.3"="5ir7wwqflr7ac9wdz3qq50232lrxk79r"; -"nostarch.doc-1.3"="l4v9sg6lhii6m7z83ap9fghjkzhc1d6k"; -"nostarch.source-1.3"="sn4i3aqmh4r4yfj1dq5ipqyy4424kns6"; -"novel-1.52"="pg1ib5l593diyyb06v6wwvhqny32qm7z"; -"novel.doc-1.52"="1dz1pcpd89kkcbzdqacyk8ck0ik75qra"; -"nrc-2.01a"="pwgmkqwj9nh6c5ibhgz0gx4fha8y4mfa"; -"nrc.doc-2.01a"="y8ga6db77g42jblz5hpvk3vhcsj6zczs"; -"nrc.source-2.01a"="14br9wclpq3sfj0gcb8q3ws6nz3ws7jw"; -"nwejm-1.0.1"="3fknv24xiya3zh0hw1g11pdsmrj0sh2z"; -"nwejm.doc-1.0.1"="v165fvbi89psybcyn5mljypipajbjvyf"; -"nwejm.source-1.0.1"="f9ipn4afbi8gw1l0wybmjrhzr82wrk2y"; -"onrannual-1.1"="zfqaz0fi36py1y5izbphl677ny5mcrl6"; -"onrannual.doc-1.1"="hxdcfp7y4lcpc2j1d25sx3p0nga1435h"; -"opteng-1.0"="fnx8hnwcpahlkw6h2q1hbnkwa3kfr477"; -"opteng.doc-1.0"="24dy7xc4wlz223svmhsv4k05bw6b12af"; -"oup-authoring-template-1.0"="2wa7y11p3lzyq911n8ybd893mwcl2w61"; -"oup-authoring-template.doc-1.0"="lr5ckdwfcnh1if3myqirjpk4yjij25yi"; -"philosophersimprint-1.5"="4xvmqn3dbqra0mxkhpgagsgzrkmczqpm"; -"philosophersimprint.doc-1.5"="hxcldbndvc7biy3fh16f4s6ka093n7sl"; -"philosophersimprint.source-1.5"="kq0i9n14zcvj7cvxfr2nxqspx86585wg"; -"pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5"; -"pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4"; -"pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469"; -"pkuthss-1.9.0"="2311vivn0k3r9ff07dpw62g4310amsbl"; -"pkuthss.doc-1.9.0"="k6ak8r0wqlyll8laqwwz9yhs1jf44pvw"; -"powerdot-fuberlin-0.02a"="2wv4gd2gi1xvzmy83cp701hd7971xdsa"; -"powerdot-fuberlin.doc-0.02a"="jzdfhb0xjlx0cffp8ma18r99lvr26l2z"; -"powerdot-tuliplab-1.0.0"="x7ygn34dsmvncmaps2skxfqdakqkp4rz"; -"powerdot-tuliplab.doc-1.0.0"="s41i6f75xbl8wmnsblyrpvdbf1awbanr"; -"pracjourn-0.4n"="iv8vll5az565ki1vcjpacrcb369z2g4c"; -"pracjourn.doc-0.4n"="kvvb2vn1z5phqxy9jiwgj9rgc1fpabhj"; -"pracjourn.source-0.4n"="vl8rarvx6whc3ph6pw892ldwiwzvc78x"; -"procIAGssymp-51771"="ni8xr0fdn9skkadcn1ipadbxs388vl3w"; -"procIAGssymp.doc-51771"="q662hfdf9br5pdya5676ddxqg8dnaw0r"; -"proposal-40538"="3nnzzlv4rcr3v671fipw679yq7ndbw9j"; -"proposal.doc-40538"="hx9nsm0fidsia9v6iki5l4cb500kjm2k"; -"proposal.source-40538"="3md53b23cqzdhjyzk2hw4gsjr5flngfw"; -"prtec-1.06"="b6kj4hm66hp9hgpvjq9mpd3a0f1a53qm"; -"prtec.doc-1.06"="g166iaq7ifcqa9qg4f3010vzv0j06j6f"; -"ptptex-0.91"="w61zrgirw5as67kcbi3yrx5pzpw7dj36"; -"ptptex.doc-0.91"="h0fi9wq2asps1aiwkvrwj93dkzzhclsy"; -"qrbill-1.02"="q9j60z5d39s257n5lxgphddh4z97gy9k"; -"qrbill.doc-1.02"="4c5j18c0xbcgfc6l5ca3w82kvgkbn6l9"; -"qrbill.source-1.02"="m0bdpkmpqaqlpmbvycw0ksh5jzfjj4av"; -"quantumarticle-5.1"="5azgk8assb2szsbfhb8sn30qmn6b788q"; -"quantumarticle.doc-5.1"="y5mfn12rhzl40l3cqgsry3d1m20vspwa"; -"resphilosophica-1.35"="vaxdd2gghalbbbikxsyw92fhnx3wn8d9"; -"resphilosophica.doc-1.35"="xwkcpdm9bn3vhfazhbx7fxibz5shrild"; -"resphilosophica.source-1.35"="7wysrjs5ynmpadf39vkj2asysjvchqmz"; -"resumecls-0.4.1"="v8mlhz9k24hmg3adc5cm36q0r6w27djd"; -"resumecls.doc-0.4.1"="b7rrqz2wiqk1p6j5z98zv5fx9l0fx553"; -"resumecls.source-0.4.1"="6s1lp1r2rj7s09zn0mv0q7km5hg2k7ki"; -"revtex-4.2e"="gvycjcrz1mwk90nwvjcxh4v9ns47h86a"; -"revtex.doc-4.2e"="6yxfb4rnc1l4w5df87jy4brg6k3sl9cl"; -"revtex.source-4.2e"="a63dzy06kgm7yx7hn0mskgg5mi2rq9ng"; -"revtex4-4.0a"="rhwqsl7592dlq4v6358czl1snpniklza"; -"revtex4.doc-4.0a"="lxy7zd4psfb13cwanc27hzxn25m63g36"; -"revtex4.source-4.0a"="3k4pl2zhp02mzxg40rlyl9vn6g6hfy76"; -"revtex4-1-4.1s"="bnfssyj79dpmf2fmn6c1kdliss77fbd5"; -"revtex4-1.doc-4.1s"="wpdqka456ns2cgw4ys4gfza2kxbhxyc3"; -"revtex4-1.source-4.1s"="71g5nhzjhqx0k81kwkz2dglfgcsdvqa7"; -"rutitlepage-2.3"="66nf7llsknm6xx2m7yi8hhqp31x3l5ls"; -"rutitlepage.doc-2.3"="c01773xskk6bzvkf5yyjhzvb4b0s2vsd"; -"rutitlepage.source-2.3"="f5cb6hkdi9zw91gil1hph1ksc14l6nma"; -"ryersonsgsthesis-1.0.3"="r85jm6nwl0b859778cxgpl7sycd6b7kj"; -"ryersonsgsthesis.doc-1.0.3"="h7cq92kjyqpsbbaqc25rnmw861xrb6rl"; -"ryethesis-1.36"="vvsqlw02q3ivwlzw3rp0x6vhfdqvfhda"; -"ryethesis.doc-1.36"="xpba1bqp48y0q99kn8w504pzj3176nf7"; -"ryethesis.source-1.36"="4dddvz7f28pbzyymssgsilsyig9rzp45"; -"sageep-1.0"="3jzsiq3wj7wwhlhzyqmi78lv6vin2kk8"; -"sageep.doc-1.0"="px3f2qx88xijb5jyd75v3sxkss671ppa"; -"sageep.source-1.0"="j5qj2vr800891ccgbvgdqbnfa0mxj4n3"; -"sapthesis-4.1"="63dcp1gxf0dhdrlzljj5267j83q97pd5"; -"sapthesis.doc-4.1"="mra57v29ah4bjcmngl3h1vyg5c2z9imd"; -"schule-0.8.2"="k0jnqi4zavamy5fxr41ah8jlfva3xcvz"; -"schule.doc-0.8.2"="6q4yghqfys34pvns8gc1k1nxaln4zn4m"; -"scientific-thesis-cover-4.0.2"="g3c3y6l5nb34vmla06bry9nipwjwcxcs"; -"scientific-thesis-cover.doc-4.0.2"="zzlsbapfhvlfgry78cc63a1l9d6gf66c"; -"scientific-thesis-cover.source-4.0.2"="29sksgy5611i9gwmckxmyypkkk1r0vpv"; -"scrjrnl-0.1"="q5rd79j19g0jgafhxj3wc62x6y16378w"; -"scrjrnl.doc-0.1"="s45malh0680ffbg9x0gwfah9c930036w"; -"scrjrnl.source-0.1"="kif8v92z8sn21h0ddw05rm16q7dbz5iq"; -"sduthesis-1.2.1"="dj4596idsn0am4yjhvknm7n70hzdyzqi"; -"sduthesis.doc-1.2.1"="xmznlf85vkps6cwk7sfc4g5arkcs6iaj"; -"sduthesis.source-1.2.1"="bz1cx41qazpy7bfpcgb5xnhk4wzhkcif"; -"seuthesis-2.1.2"="f8djm6sdhwky5kk6vmfrc647rvl3vd70"; -"seuthesis.doc-2.1.2"="kbn5zb8qx89sp8m2q99caf1qn8v29hd3"; -"seuthesis.source-2.1.2"="8r9akmgz64d70bf1mdpq856xw6w9h8jn"; -"seuthesix-1.0.1"="mh346k6d64d1bhhznzsrww66sppysbrh"; -"seuthesix.doc-1.0.1"="a2mghdhdxd7l2rsd5midfibcwsrn7n4z"; -"seuthesix.source-1.0.1"="skmm8a9h0jvgdwn0bsx9fnvwmyf94mz3"; -"shortmathj-0.5.0"="cp2lz1q0ixls61gl73gms3sph283jfbj"; -"shortmathj.doc-0.5.0"="s1q3wc3ff6aj9rfs7qylv31rv7mwriw6"; -"shtthesis-0.3.2"="6qfiimmgbhv0081f0ych2kfrdzrqg64k"; -"shtthesis.doc-0.3.2"="3zw2nvl5i2xsrx7fanwvajj0xgwjg1rc"; -"soton-0.1"="25iyg10d05ahygjbhfc6g6ydiij3isw9"; -"soton.doc-0.1"="5irwl7khvqcx0siw7wcasicpxzj94cgb"; -"sphdthesis-1.0"="i5i9nf7bky3095bhxvmmvxwca4mf7ai7"; -"sphdthesis.doc-1.0"="nx5kpi9s03jwv5g8adqrn5l55lyqc9hd"; -"spie-3.25"="fj1biarxwagah3b4l5r9p498qwd70yar"; -"spie.doc-3.25"="dgp3in09igj011041akydwgnsw10m927"; -"sr-vorl-1.1"="aspxka23zd8rlwxlvjvw6wlwkg38rj66"; -"sr-vorl.doc-1.1"="y9m89lwhx9rwd1k0w2bgwh5ip64awx41"; -"sr-vorl.source-1.1"="5zsgq5m3fkjip7qr4zkx51j54j4q5qpq"; -"srdp-mathematik-1.9.0"="01agxwklq4nxl0s9b5xy4i0x9zpslayj"; -"srdp-mathematik.doc-1.9.0"="3cxd8dp8xjm4xhqlsg2qfckl4laasmca"; -"stellenbosch-11a"="s0wddhmfp77y6v54qq4jsmqidjq3bkqh"; -"stellenbosch.doc-11a"="97wbyj0mg7phb66ngkf82ziiy8v624b1"; -"stellenbosch.source-11a"="0raanzzc5qjay7gz94himx8np0437pgb"; -"suftesi-3.0.2"="w0vaky8717l4q3xh4nx1xm7v7pj13kv1"; -"suftesi.doc-3.0.2"="bdkyxrmqnj564mm52k8nh78c0sbsa2i1"; -"suftesi.source-3.0.2"="nyh8fqb1989q149qf5swn9s5l26ivn47"; -"sugconf-58752"="mky5jzdc0y7w2miadq2gfyp1q6vlwq1h"; -"sugconf.doc-58752"="0cs7yqry99cc6z1mg7f2jkc93n8b3fxd"; -"tabriz-thesis-1.1"="psrla5z8x9icyxgdqnxpiv2vjnbq4rsq"; -"tabriz-thesis.doc-1.1"="h5p0nj2wp01pdmjfwbcdp5fnwhvlrrrp"; -"technion-thesis-template-1.0"="shaxw3mp0bjmq2lg8a82bs1ddb48dpfk"; -"technion-thesis-template.doc-1.0"="8kkfqc0f3pkn9sm84zw2iqi133nr2sy8"; -"texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l"; -"texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl"; -"thesis-ekf-4.1"="qx6shfmc4wc23xl68bvhyxj6iyy7j4gd"; -"thesis-ekf.doc-4.1"="4ljavrr21zd0d15n7r51md5p1v38s5vm"; -"thesis-ekf.source-4.1"="ixbb50g799akwc8c8vwjv44y0z1phfr3"; -"thesis-gwu-1.7.0"="lmgwrdny0kp9p8ldyyxg8521vmhngjpb"; -"thesis-gwu.doc-1.7.0"="2c219vkiy9h43v2jpaj69hv9lwh7m4v9"; -"thesis-qom-0.42"="rnhdvsrpsgjbwih0ia9r1h4kyqdrhg6x"; -"thesis-qom.doc-0.42"="gipmj1b9xh8y2zj52l7r28j0l3g8rnzj"; -"thesis-titlepage-fhac-0.1"="dmyydjxrj16hf8gh7qyp564d195kzmwp"; -"thesis-titlepage-fhac.doc-0.1"="g4jw0jyl09vq4hglb14jx355v9kli1bx"; -"thesis-titlepage-fhac.source-0.1"="zp492p2j40bpphwr3zhjcqiwnj18yk56"; -"thuaslogos-1.2"="jr4nwbd21jwglz99v1aqplzv2jbpn10v"; -"thuaslogos.doc-1.2"="i352h1s47cdbj957kz6c3dj3kwb7rj11"; -"thucoursework-2.6"="mvwpfacql0xna37vqa3q7dkrwkzqnpvj"; -"thucoursework.doc-2.6"="rg2y6dx27cxw5h1y0zifciy9wn2f63l5"; -"thucoursework.source-2.6"="frk70dd03ld969k7l6s1vc38vqkdclh0"; -"thuthesis-7.2.2"="0yxl3ffvml30kzwzas0ikbi6m0a73a2w"; -"thuthesis.doc-7.2.2"="zbnzcwzisxs6bpl5h1wwc9964rds1x0k"; -"thuthesis.source-7.2.2"="78hy4h168zj65kwc1qj7m35pihyv32fy"; -"timbreicmc-2.0"="8mnap2xvfny35sb0ziq5xhlckwcmgb3w"; -"timbreicmc.doc-2.0"="b649dhjapj0ani2as7783bphamp0hwsq"; -"timbreicmc.source-2.0"="8s3vn2id27cl1164brvkrxg96ggvgb3v"; -"tlc-article-1.0.17"="qh69ly6l3pnz0a6a5c70b5jhzphc2gk5"; -"tlc-article.doc-1.0.17"="aanq53h9in5r73qz4r1g8p5d9irqz2pw"; -"topletter-0.3.0"="01cmbaxzr5fsmwsz8y5l9xfdi43219zg"; -"topletter.doc-0.3.0"="ygpvdw145lnyllcwh8yv4pcc0ssydpwm"; -"topletter.source-0.3.0"="f4lvw616czlsqw7ic5mlwq583097j7ls"; -"toptesi-6.4.06"="f32mdcbb85b7dja6cvhc6h0b111i7h28"; -"toptesi.doc-6.4.06"="rx42mn8j2fy5qji2xmi41a85wii0p1yy"; -"toptesi.source-6.4.06"="9am8c6ps9if4zlbcrld528hhgk9j6f0d"; -"tuda-ci-3.13a"="5n5zm0jsbpq7rldd1zznnsp5hdycvqfk"; -"tuda-ci.doc-3.13a"="c2715rljfxk5wq6kwhh7y9wvf5wyghnm"; -"tudscr-2.06l"="sxvm69k0mada5m7m1m290x3s6dvvqhvg"; -"tudscr.doc-2.06l"="hpjfmd60ay9xw060pgk56ki110fzsz9h"; -"tudscr.source-2.06l"="8v9zbd8grv9hldyb04rd7x53hcwsbpia"; -"tugboat-2.24"="9c3ipn2fzwrf0w21mih2ld7j1z1w7i0w"; -"tugboat.doc-2.24"="g6vmgk9zria85cc38khzz1kk7x0s5a4m"; -"tugboat.source-2.24"="6kpj4a43gk6ww8hc434lipc04l2k3abw"; -"tugboat-plain-1.25"="hdp8r703mch4096qy67y5zqjma848hh1"; -"tugboat-plain.doc-1.25"="36nn5cxa1rms40af14c7bbxrkz8y7q40"; -"tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw"; -"tui.doc-1.9"="ddway3iy2gx447ypp2cd4vlvhjvnlh0l"; -"turabian-0.1.0"="mkjjkq2fpg1lipzwqn7k0p77j2i3znm0"; -"turabian.doc-0.1.0"="b1pxcnzj5k4l9r571yi924kykw4wk7vd"; -"uaclasses-15878"="d8zwjxcvgb1rnfv239xwf1qblqpzk32c"; -"uaclasses.doc-15878"="mv9hypafmsgnh5pxl2n0929ib8zgrda0"; -"uaclasses.source-15878"="mzvrcc6gvds2bw1a7cdkjd5n9dm3gczq"; -"uafthesis-12.12"="8qdm4v22s3r9g8q16sjnw3bzx1j9w16a"; -"uafthesis.doc-12.12"="d1nns5qzwkrywy9cghr19i70bp16fvw2"; -"uantwerpendocs-3.2"="3l55p7996pwh2mqc7k2qkgbsyc4kmvg2"; -"uantwerpendocs.doc-3.2"="nvj1596s20n62c3k8yn6a8f1gadqpgwi"; -"uantwerpendocs.source-3.2"="z1304adgkdwq2krq7m2v10i024x0d125"; -"ucalgmthesis-52527"="ijbimiv9xjwlxwrawqzw82f8ycahxwwj"; -"ucalgmthesis.doc-52527"="rbi9mvqdixa2wk7ankfw7l3vy1pf83j0"; -"ucbthesis-3.6"="3wa2xk8yvyh5hwy0d41p9fdrxvy8y2iw"; -"ucbthesis.doc-3.6"="lr9w29xp965yydg4mk93rpq4d3808ksa"; -"ucdavisthesis-1.3"="naibrb9h1lg8y22j26wygm9zxcv3rfc2"; -"ucdavisthesis.doc-1.3"="0mgnn8l7wwi7mhaqanfsrkjwydm8m2gz"; -"ucdavisthesis.source-1.3"="nkag4al3xvv8xnns5gspsq1ix6bii31p"; -"ucsmonograph-1.3.0"="p73dkv6qazqwbn7826iyhbhkl1crlmbj"; -"ucsmonograph.doc-1.3.0"="4h30qzw3g5svyrljfdbvzh76pgpj3m1z"; -"ucsmonograph.source-1.3.0"="cdw1jffh4my2qisxgls1qvbw422c107n"; -"ucthesis-3.2"="kbq1nnk6d3vk378kk5wcwpzh93y8xv08"; -"ucthesis.doc-3.2"="515r7ha1aq9f0zxlgiz2zv2aph460aad"; -"uestcthesis-1.1.0"="h0cz0i3vnalcc3i77qhb941yymg6bl2q"; -"uestcthesis.doc-1.1.0"="7w5wa8z24nrcsd9gfba6ixwq5wi4jp23"; -"uhhassignment-1.0"="0dv6x7f2zzvgqd104aak9j360pqwfy1r"; -"uhhassignment.doc-1.0"="c0impmampnwvrisg300yrmc4zh891r15"; -"uhhassignment.source-1.0"="59yahjzr20xn4j3lnjxf17dwr4vsyy1m"; -"uiucredborder-1.00"="qmpx3zbgnl6224cyigggmsp8a2vndjxv"; -"uiucredborder.doc-1.00"="vc4l9nvnvlfsn44vr48s4irjwaifg8wr"; -"uiucredborder.source-1.00"="l9b35lm36c8gnl1jd9mpxqk07j22b8d3"; -"uiucthesis-2.25"="62smailyn66fyhpdgrmjx0p9m0j0n12y"; -"uiucthesis.doc-2.25"="ygqpzgk5jslsnqa813k0l2nvw2j8gnwq"; -"uiucthesis.source-2.25"="lkq6bvdvm6ya5q5wp263zqkk7y4ig57a"; -"ulthese-5.3"="b446ranwjx8rc019hc595kqkq7811jfd"; -"ulthese.doc-5.3"="0xlr9ybx4nxzq2awbx0lwq456750s99g"; -"ulthese.source-5.3"="3klscdvz28ygk15l9f2pvpygxhnd0xwp"; -"umbclegislation-2016-6-8"="wjkna9qn6g0w0axsgpa80vc8d8jsl94y"; -"umbclegislation.doc-2016-6-8"="44hd3iax5vblcr03xxgxccmbrf4y5sma"; -"umich-thesis-1.20"="mgwbc9lzd25w17fm9j2098r6y0q1k688"; -"umich-thesis.doc-1.20"="726jjvvq6ps0wxlrh74wnj9gjlqf2d8f"; -"umthesis-0.2"="xsgr2p3cw7q2gv7b2sr6xvcp186cvsy1"; -"umthesis.doc-0.2"="p64jg8jns4xp4y400hwbbbzz2wbpsmas"; -"unam-thesis-0.5"="zd62jxiy95m9p7f5g4lkw4ccdjlknfb3"; -"unam-thesis.doc-0.5"="c6s27rsns1yqhdw1kp03q1z5vhp2wq27"; -"unamth-template.doc-2.0"="jn6hykpgd53yn4px4rp9yk0sp688dqi8"; -"unamthesis-2.1"="jvpbqfbpvrzbvs67r0phdrkrvxxjjcyz"; -"unamthesis.doc-2.1"="jfqnn8prn8x9p68k70b64zd1759v92ak"; -"unifith-1.2"="22rmcvcs8frdj5zdkram69ws513blydf"; -"unifith.doc-1.2"="4gsy6kk4w91df3pkz0wxqybr13jgbvj3"; -"unitn-bimrep-45581"="s3x065jkvzazjx24an10jbwj47903gjl"; -"unitn-bimrep.doc-45581"="k2iakhx4fkiz9ckglr1pvnrqday0sbnp"; -"univie-ling-1.13"="fh7pmppl3gz3p8gf4crrxccivlsqa2lk"; -"univie-ling.doc-1.13"="pyws8xjmzfxq455v9p25a5nrk7psk2wm"; -"unizgklasa-1.0"="pz93dd2qidcvdsa78zgl73s07zjgshs4"; -"unizgklasa.doc-1.0"="inphl2x3czqw7mw17if9ahl0jbin3dd7"; -"unswcover-1.0"="5bqxws27nxyhgrlc6c9k9v5pm8jvdhzc"; -"unswcover.doc-1.0"="9c32r1x4094k8saz0w3bcbca28vgl3zj"; -"uothesis-2.5.6"="zbf8swc2haqsdr7sibm4lz9sqyhbfaqs"; -"uothesis.doc-2.5.6"="fa35vj968ywcnj2vcbszrajxi92sh4il"; -"uothesis.source-2.5.6"="ppxr7m777ymzzcl34i9qsil0z859wdxl"; -"uowthesis-1.0a"="g346f0s4phiqykd0n27hgy7f3vh9vp6l"; -"uowthesis.doc-1.0a"="h9g1mwp55hj3jsqmn0fmpjm95g4139rn"; -"uowthesistitlepage-3.0.1"="27sk8zllk19qflnr5am2r0cjrx4n89r2"; -"uowthesistitlepage.doc-3.0.1"="wyz7yz7j3jp1v2z5vildp8lb0li8786p"; -"urcls-2.1"="lkzmasn52h7mfm2xcfxv9gqh64ic9gdd"; -"urcls.doc-2.1"="rkrvkvh23jmn7qhyvgnmgzr7qhyckjy8"; -"uspatent-1.0"="lqv4zrqgwdhav1075ym1wp3cmy7r3ahw"; -"uspatent.doc-1.0"="0pa1qihx7vyc5lfkzr7bbakkphzmxp2p"; -"ut-thesis-3.0.1"="nh3fvwxg90lgiwzk3d1cszbpg883pjhp"; -"ut-thesis.doc-3.0.1"="dkrfh7bklmwlvv5w7cj2qgj9bxnbak31"; -"ut-thesis.source-3.0.1"="b06l2wms746qads53dqd1d4z8g7ml52m"; -"utexasthesis-1.0"="dyplgpcmg18gjkxvnqzgs99lf3aj6yc2"; -"utexasthesis.doc-1.0"="x4ngw5sm9zm5w46l5xap4cwnygb8qlha"; -"uwthesis-6.13"="1z7cpyrzcb9ga77d9a58jm9234w2zafy"; -"uwthesis.doc-6.13"="w30d568jxqqwdfbrpm8s1i7ylssiz3gc"; -"vancouver-0.8"="i4g046vffvq9f8bfrzi05q21fyazvlr5"; -"vancouver.doc-0.8"="hnaysysqmahg8z5fr4ap4y9bmgdfv0r6"; -"wsemclassic-1.0.1"="8rl3dlv1f1vrklknkssldjnkgdwdcipd"; -"wsemclassic.doc-1.0.1"="n0wnf463jpcq8lbgk45h3924c4qm2r2z"; -"wsemclassic.source-1.0.1"="l4db45ax258zsrgvnw5gq0knflxx2nb5"; -"xduthesis-1.00"="qxvczdxndgw1n1hxzrr5scvnrgcl3q3f"; -"xduthesis.doc-1.00"="a58xwk250qq99pyz4rj2br4dqfzhhmxv"; -"xduthesis.source-1.00"="nw0j5z9vd83a3idksbq2338j8ir01fr6"; -"xmuthesis-0.4.1"="y598kfraksgxzjhiqnvpi44nkgy448bh"; -"xmuthesis.doc-0.4.1"="ryzi6wjgmw3kxar74hhdjazylp116a5k"; -"xmuthesis.source-0.4.1"="mjlyb6dl3w3gi34ld39pk5xdjkzdi064"; -"yathesis-1.0.7"="bbl0jlq6kjx19v35b55jyrp9pzhzmlfv"; -"yathesis.doc-1.0.7"="w6l8x4jlnc1p16p55658c5361ijnn6xr"; -"yathesis.source-1.0.7"="8nwsx86zk66rwc56xzf6zmfkmyp3p5px"; -"yazd-thesis-0.3"="583l53kxfnfb7s67fnh3n45lvqqww941"; -"yazd-thesis.doc-0.3"="9qw7byq6s1iv4kfq19xy3qm01l9vh0q6"; -"york-thesis-3.6"="rm9hh3b6cq902rr4crmv6c3z3ll2680b"; -"york-thesis.doc-3.6"="fa7z6lks54czsfd04igviykcij1h5lih"; -"york-thesis.source-3.6"="83mnkcdmb930lfh4130vcr82d5lp3f3h"; -"texworks.doc-54074"="gphjjma2ws68drzz6rmmj1hjb7bxc7ma"; -"arabxetex-1.2.1"="yfvy3m6rz45z7frgsw6cg8hk8kqdxfs4"; -"arabxetex.doc-1.2.1"="f8rpfy5hna1b6flvq6y2balxypjm6280"; -"arabxetex.source-1.2.1"="n7qncmdmzvkjxwn5d5nhwy3660ymvwx8"; -"awesomebox-0.6"="hlp6mahq6q1ysjgwlri6l4wszhm23na1"; -"awesomebox.doc-0.6"="cis8fkhcwr08nfv11g9l0iyzdlcmgrnd"; -"bidi-atbegshi-0.1"="qm4zcsccvzxixab9dalzvlwkniwckpjw"; -"bidi-atbegshi.doc-0.1"="lgp4qynjnz73qdhy543halrvx52gs2xj"; -"bidicontour-0.2"="dayiq858hr4ln8503y0xw8vqvfjjb91m"; -"bidicontour.doc-0.2"="mskxjm50p6r7zlfc40qbylycknyyr1x0"; -"bidipagegrid-0.2"="wipsldvij5v86c4hqw3afsxm2ydqsbwx"; -"bidipagegrid.doc-0.2"="57xmh27vfxi9ijr6rzv2d17vwk2pkdhb"; -"bidipresentation-0.3"="r3l1ac0kryn5mpx4029gwpaz2mjhj5ba"; -"bidipresentation.doc-0.3"="fvqx0rc6cn52lsi3adgllwp97mm5kr8y"; -"bidishadowtext-0.1"="fbx3svc7vx6f1kpvd4ws744gxp9gi6w6"; -"bidishadowtext.doc-0.1"="9amilyh1zz17z7x6hnhsvgvli0dp6mrf"; -"businesscard-qrcode-1.2"="9y9q6p5cnddbfdmjnyzrcy47hmaly538"; -"businesscard-qrcode.doc-1.2"="86l3021yvkp9sps2fiiv4073pzv8is33"; -"cqubeamer-1.0"="1ils8i2scbpka22n09ygmkwbx7d01sm2"; -"cqubeamer.doc-1.0"="ncgd5mcghdncvn1jdghrl263m9h1g85m"; -"fixlatvian-1a"="w8dpi3vx0iwfmq09h5gmqaia0a4nr94m"; -"fixlatvian.doc-1a"="nbnwr1icckqpsxdmmwa817a56zkfy17i"; -"fixlatvian.source-1a"="nvdlbmqyg7j8gx3cn48iqq5rmhcnncal"; -"font-change-xetex-2016.1"="qy2c5wdr14i5hhaxm764j3v6b4ycs6f1"; -"font-change-xetex.doc-2016.1"="ahkzrzvpc1syc7x3mm9jq02c1r75jqdr"; -"fontbook-0.2"="af0x6y47qcbfhzs3ngyazacn289x99y4"; -"fontbook.doc-0.2"="yvq7kxismw59wayzyv379hjd0kw048k2"; -"fontbook.source-0.2"="46vhgm8k7pxwxpb654fg3aj96555fanw"; -"fontwrap-15878"="ap8pwxj94larm8p1dngr1mhdavncplq6"; -"fontwrap.doc-15878"="p3m3czhwc1i2psby8dkm5zkpmzzkk91m"; -"interchar-0.2"="mphh4cmn49y1fr2klr1n5c2mjxryyjzm"; -"interchar.doc-0.2"="077lc5c3w5gq2cm2983fqlbhizjssgyy"; -"na-position-1.2"="1nnrjz7dvqr7xznpi5z3kw8hs8cbs0nv"; -"na-position.doc-1.2"="s1v6aswv16yz9q2ykzpwl399znzpq5pf"; -"philokalia-1.2"="6lcrild0p9jahhgpc1xzz445hh2s1cxy"; -"philokalia.doc-1.2"="k1mn8vwlhrs9bwy87gx2zpn2viidlh0p"; -"philokalia.source-1.2"="80nd8ig65k3xjn92rv7n8g17qq0k4q7p"; -"ptext-1.1"="zy9vq5spxci68zhbfa947x5gmr90ckzf"; -"ptext.doc-1.1"="3dsbqbc9n66hhw8nk4l7rlcbfw5b9pvm"; -"realscripts-0.3d"="h3nl45fx6790wmrfqgnxsy0v46i7gfmy"; -"realscripts.doc-0.3d"="4mm7a354ll0wca7q9nkazx29qbdah3ca"; -"realscripts.source-0.3d"="ngb2fqcmc4j1ijax0qrrdpf0g4587qb5"; -"simple-resume-cv-43057"="vjigpisca1m0lvq3rdc8148lc2in4zmh"; -"simple-resume-cv.doc-43057"="aaxl68aklgpv8996xzd0jgc5gw3859ar"; -"simple-thesis-dissertation-43058"="p1bspb2n9dc7zk0myww59v973rjshfy0"; -"simple-thesis-dissertation.doc-43058"="hrb22ycqxdy8ndw4x6ifl6jifswb7mgw"; -"tetragonos-1"="6v6w3fcjmyb0pq0iia29xcx3wsnpm47k"; -"tetragonos.doc-1"="w3b4g7k13lljq69vg11cakx54m0813r3"; -"ucharclasses-2.4"="lbqc3dsh3v8jd6n2jcp9mpaqnnrhj637"; -"ucharclasses.doc-2.4"="lnvlcnxs086dy9ylhmar1is01zn764k4"; -"unicode-bidi-0.01"="mix51h9rwgjic1g32jx0mv8hh574yn69"; -"unicode-bidi.doc-0.01"="8x4zk0spvhmq3sc8ygvidk03gfzm2875"; -"unisugar-0.92"="wfr974a1y4wzlbw0wwzfr6r0yp9nyasl"; -"unisugar.doc-0.92"="hcnqifbhpj44cwbr8sh4c71phg4i5327"; -"xebaposter-2.51"="glxmnnhjpy8wjab9avncl4v0wmdf0pv7"; -"xebaposter.doc-2.51"="sbpqsj7cqhhhs9gq8jia92hxrdgnhzkk"; -"xechangebar-1.0"="1f2zszj2l5mkqv5zs5bs8g5w4c8rirpv"; -"xechangebar.doc-1.0"="xbirklnxaljhxxghr1prqq7zb9l0mgzm"; -"xecolor-0.1"="pdybpn00rxsb5ipxx377a77xnmmf5i43"; -"xecolor.doc-0.1"="vl2lpda4kkr2q8gzj6ii2rjfccx6qvl0"; -"xecyr-1.2"="8zv0hcgk6f94mjb7h0vkvpz0yij6p257"; -"xecyr.doc-1.2"="27wisfr0l21bc6rb1sd2yrk9pa1c78z5"; -"xeindex-0.3"="85d9z28381jg0jbkwrjrqlcifp23qsxh"; -"xeindex.doc-0.3"="7q7gxhy5zx11dmwvlfivg91v0gbp8pgw"; -"xesearch-0.2"="avch7ld8isxphjd1qcjcwq8hqqkvcz1a"; -"xesearch.doc-0.2"="p2j9jg8h9xbad53h4d10nqnvv9lqbk2z"; -"xespotcolor-2.1"="z3ch5ppswpb231734xjiksmrs8xhqghj"; -"xespotcolor.doc-2.1"="wqlmsgp1mijbwyx2x4w3prpdbaw0gin2"; -"xespotcolor.source-2.1"="xbwp837f18v11kykidcm4mlsaqll2cf4"; -"xetex-itrans-4.2"="m9f0xqxgxpqsi5bml6mpgxvqjjpz1fkf"; -"xetex-itrans.doc-4.2"="nlixz1jqx1al7xks2bp723yl63whrhzh"; -"xetex-pstricks-17055"="4vaa9mkycwc7kwaxbzjfypk3xx7nyxqh"; -"xetex-pstricks.doc-17055"="lqs6hni0df78jwiy8k0hxzpwlpn0kfd0"; -"xetex-tibetan-0.1"="yzps4y2frsplnawgai9s9xb6vpk9h4zf"; -"xetex-tibetan.doc-0.1"="m49lmg8669bbir9hcj33clc2v811xdvb"; -"xetexfontinfo-15878"="jzx2is0hbcggma6s0pdzq21hcb5j8vgi"; -"xetexfontinfo.doc-15878"="h4i3q0c5rpbw8pssb7d6nyy7kqvkkj98"; -"xetexko-3.1"="ny49dj9qisbvj8cp4c84n5fv0xaqz8a5"; -"xetexko.doc-3.1"="miinbgaimmsgd9j0yb5xgkapc0brmqwc"; -"xevlna-1.1"="jwpjj1b3y45n3lksn9wvsh3hyccy1i00"; -"xevlna.doc-1.1"="4559f3ddvnis97px7180q0is9n4aqq2h"; -"zbmath-review-template-1.0"="h5z1v5jpsrgc5xx5jgfx9l5f84nblj5w"; -"zbmath-review-template.doc-1.0"="w3dxb9nx6xyypzmw8jmqkl03xw0b6jba"; +"amsfonts-3.04"="0l3ypclhv5qdpcpy29xwda2m3cjfn5l996agas6yhpdr2m58q211"; +"amsfonts.doc-3.04"="1v7chx5rvvqmcf7j35qi55wxwxkbfkbv34b15yrgn6bflniziicm"; +"amsfonts.source-3.04"="064gndy9lnmsq2srw5hh97sbdk8gk0qv9zzki00ms3c6rzhd9sjl"; +"bibtex-0.99d"="1w7vpf0kw6vi3hgmlmk0dpzk82kns7a77appx8yg76xcip2xid51"; +"bibtex.doc-0.99d"="13xh14d3v8a9ik4z5kn0y3qff9j6zb83671411in78v46dh3d75y"; +"kpathsea-58622"="0jgwbbcbazam4c0hspbi15j2ndjzvxzirgbk0zpp8ffma0xhhcjx"; +"kpathsea.doc-58622"="121f7nv9zq4dsy0krd1wkq5yjpbynjav6asafpq5idp1l5haw67h"; +"cm-57963"="1i70pxbx7bp7lzpd4skdymv1a7h8njsr42v8l8jvh4bs3gkmlbgi"; +"cm.doc-57963"="1s5jagrajx29zmpdbqc6qpbcpwgp7g4c3d59ilg4sgcqgd9n5v1j"; +"colorprofiles-20181105"="05nf7y425f8ric57c3afq7ymc7ndxcdahbx9n32jnaz9j3qq2ypl"; +"colorprofiles.doc-20181105"="152vrbm5km4ymj5h41x8cjyypj06g4xq3vyvmgakai9qz270dvyz"; +"dvipdfmx-58645"="1zgddb27zzdd3ycvmdfzph4khlcjlfdbp3a0nwhjf2682kf9hryl"; +"dvipdfmx.doc-58645"="09mi9lfp4sj8jv6h3rzh1dzfryfixsppan9pavj4w6drkf25rd4m"; +"glyphlist-54074"="12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja"; +"dvips-57972"="0k89qqz9zx5zh13azpjndfzszgl85hq4513kaayf4k3spy9fn5yw"; +"dvips.doc-57972"="1j0k0sg0j5zhcw2k8aznp9kflmmvw06qhwwlmbhsj1ii3847vxsh"; +"ec-1.0"="0l9zf4zs8yw84x5rnyzaggz4idl4kmvj40c03jyxbsxsx6bi8jks"; +"ec.doc-1.0"="013w8hdsln91k13c3ilv36p4vp1263knkxf4m3hh6vaaqcr55aw9"; +"enctex-34957"="02a26lzlkkw3dabxci7w77117n2bagsdk5rlcn4cps45xdbjqikj"; +"enctex.doc-34957"="068qh474lirr3yzh8ggpavqsmzdv5yvlc1i93f5cx49cd9j7dm0w"; +"etex-56291"="1zk4dp55r1yjwy1bpigyzbfm9nh3np544hfmzzfhdg4i4yps87k8"; +"etex.doc-56291"="1nsh69hzpk33ljng9g6drrrb5c59cm58a058damk3s3gzfy7a8a1"; +"etex-pkg-2.7"="01aa6bn8d46ql8aw8kg9k2c3x611jpd5hx3h6g2fqb2lvjqnr1zp"; +"etex-pkg.doc-2.7"="1hcir648vyypvqa8r710mj9qldir9yp2lq7biv3s9w1vl2ssw18d"; +"graphics-def-58539"="11slfvdq8p0i5kfvakqpdq7vrpda1d03mzav69fwia32g9rhpjan"; +"graphics-def.doc-58539"="1hdg052zf2nbnjmc3lfpn7lr7ndjwsp9wsqs38as94caggy6adqp"; +"hyph-utf8-58619"="14jj24fr6v74vj8wi2a9k9zk9vnrvmy1ni4zn24dl5fdfw75n5ik"; +"hyph-utf8.doc-58619"="11n1blnx9i7q2dlhyhf1dxs2vnldc9r8f3k6diix0i1np8hpz05q"; +"hyph-utf8.source-58619"="1cff5ijmpxc752n6cmpfzn1a10ihrkz7n9l55gz2k2q0a00m2ssh"; +"hyphen-base-58630"="1sagn9aybs34m1s6m3zwya5g5kbiwfnw8ifcgxssygmzzs88dgjp"; +"hyphenex-57387"="08f915yqpx6qhc2dzbicbv9cijzpgcl4jpifydqcc0x68y51qrzi"; +"hyphenex.source-57387"="0lqn354bskaa6g0bn9g1r3lbb1hj9si5n1ki38awayzp1yj8a3q0"; +"ifplatform-0.4a"="0abhpfw3w1mvpg52xaw3cngl55sszk5ji9a38yab8vhknh3d3jby"; +"ifplatform.doc-0.4a"="1b41nzn666askfc1kkm1lwf05ggf2ml8gz3rrki4yw6ch52sl2sc"; +"ifplatform.source-0.4a"="0g0qvbvv4j87rxps9yypair00z6il5hfjczkrmf4fkycw714sdqa"; +"iftex-1.0d"="1jcwlnm5wzzwr3r67v6d873c0619bhll93qd7f342xw503vqwlsy"; +"iftex.doc-1.0d"="136jnij0z3xk2kp2ldglg6g1qyp66rzzibmm5rpdk24rkrrakg1f"; +"knuth-lib-57963"="0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca"; +"knuth-local-57963"="02cf32f57fr6bngiv9xiw8bh4sq53p9br034ap74s80h3bgcmn1f"; +"lua-alt-getopt-0.7.0"="17czrz46xlbj3xkh4jwdq269mqaq7165kpkhhqa498hrkcgdgaak"; +"lua-alt-getopt.doc-0.7.0"="1zfwvs979c7s16vpv2k9l81mcmm9y4qdjk46l8ik3123dalchv6f"; +"luahbtex.doc-57972"="0w4hfjmjgiw42bpz1b59cla8v4s6kik54q6wdhmdjy6jp91rfl2i"; +"luatex-58702"="0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg"; +"luatex.doc-58702"="14bz6h1jrnf4azwb17ny8aj5i8vjm0pxrm3p2g2ai7iscmcibsi7"; +"plain-3.141592653"="1mn5cfiaj7wrjij4y0g2mipc6v8dk7l7nc25s1gmgvvyfqwd3byv"; +"tex-ini-files-40533"="0q1g62jg0qiqslm93ycvm30bw8ydmssjdshzsnzl7n2vpd62qfi2"; +"tex-ini-files.doc-40533"="198f4y0bjw9azzck8rz6ml0rpq7g67r37rw8825y8crhpykchp6n"; +"unicode-data-1.14"="023gy5ldjs0pc4a6ffdjrk5y245sxsqn51g21is5cicj9xihysmk"; +"unicode-data.doc-1.14"="1dmjrfqs0gnrqh8dj765j0dlv46jg9z3rbqk7c278njmr7nx87wm"; +"makeindex-52851"="0lpqnw6nr19p08pf52rcx1xvvsywkpf1rqrkjdsgrv55d1afsd36"; +"makeindex.doc-52851"="1zzi53l4sp5zs57bcmylj7ydv3h2638y46g5dfxkhhzpl6zkhvxm"; +"mflogo-2.0"="0swy70pm0pyqzy1i5wf5hc6cbzn91ihw8hwh9kavdfawb4qzjxxw"; +"mflogo.doc-2.0"="1xqk3nwpi3drkzrnr172i660yx541lxxw3wps0jqbqficqn4fiw4"; +"mflogo.source-2.0"="145hmbxr5x5pj2whra9yify9lyx0ak1az31gvwr3gp5klcmna8p0"; +"mfware-57972"="0kcz1gy17819w77sf0l9m5f6rw8dcapkdbvwaknnrmy50v0jfs1n"; +"mfware.doc-57972"="08bx2bl2xm1bqkrs1b80inzdf4q5djwa8nn0fhbir80z1a3cbf0f"; +"modes-4.2"="0xg6jpyxni3r3fl6r7iq1vz97pp1w3gh8ccp7w5k51igs3dpvcvv"; +"modes.doc-4.2"="1lgmgg6hhq5h3zgpc9vrbb6j0pif03cjs6gwj20df8md69hzr184"; +"pdftex-57973"="079pv90lpakdn10p2vddzdvi9z5grx3c9yrjfg4k3iii7zdjagx4"; +"pdftex.doc-57973"="0v47bnyd6r2i4z3gy9as7nvl3gylsniikp55ywbr9p13q1s4pwkn"; +"dehyph-48599"="0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g"; +"tex.doc-3.141592653"="0njmxc6l84j44k48qh7d79n3qznzriz2pf8lkj09i7mkkj9fw9lf"; +"texlive-common.doc-58055"="1k8ssl78b6jkjvzr0s6nihkyri0xan65pwn8p00sw6iilg058jk8"; +"texlive-docindex.doc-58780"="0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; +"texlive-en.doc-58572"="1r6ikz0lga85lw7dk4wh5mzvpjgs9lfi0yyiaij876zvrciziczv"; +"texlive-scripts-58791"="0cmq2d033pm7hydi0k35f9asfaqkid1z3i5fdil90gfnsknpqgzk"; +"texlive-scripts.doc-58791"="12b4bmzsfvscp3badkd77xpk9znjww30c5h2rq7n20dmbg3b8j4v"; +"tlshell-58792"="00vyz5kkvbdivgaiy5yyllpi9q9rv1i3f90ypyxd6nfdcmjdjfw7"; +"tlshell.doc-58792"="1h5mk09sakbmgsppl9fnry28xnzqya3bmp3r1nkzg44cv7kl98vz"; +"aaai-named-52470"="1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6"; +"aichej-15878"="1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf"; +"ajl-34016"="1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs"; +"amsrefs-2.14"="015spycf9ycxav8r046yn7lrc892nhkkrf1say1yy9karsji6dnw"; +"amsrefs.doc-2.14"="11fc87kbdm440v4qyhxnv654mh0m6rpz42zji38qspcqj19rck71"; +"amsrefs.source-2.14"="02q2x8zpwxkyrh9v7xqw35vdjx0b4fzz95xcv6vfjmynm8cpklxf"; +"annotate-52824"="12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm"; +"apacite-6.03"="013769hi9alyizx08a0v1hbl03h5vkwi6a6ar3ghw8m6l445xb8m"; +"apacite.doc-6.03"="0d49bmdiiriklmh99kavvm48zh29bgiw7zr5jbcwk5bw42qarlqa"; +"apacite.source-6.03"="0hsrhw50sb8lphxib4jmjgplfrmy95m56a1phiac4kwxphlj9di2"; +"apalike2-54080"="0mn84ahwjg8gvw5lifvcrnch11q79d4bgw3nmhrh4v8slwgip5l7"; +"archaeologie-2.4.5"="1g0r3y1s7759lx75fhmc2v38ks4mgbldpjkkxnk7rq0ljdqy38x9"; +"archaeologie.doc-2.4.5"="1hccakjvh7ldyja2nfi68926yn175fhawiwc76qk5fksggj568rg"; +"archaeologie.source-2.4.5"="1gv9495g29hqc0g6in438g8sdkaxwwn2vvp8f41mz033dzfln5bs"; +"authordate-52564"="0caz9s2ra7qqlzdnahhv50z050iyp62ypyrfpbj1p9ih7zmcdg23"; +"authordate.doc-52564"="14wxjyrighkhg51m9jpdyjdwz2ipz4zr1rfgmdnxbpg31rbg2x7s"; +"beebe-58697"="0v87mxm1qj1ffz6d6sdcw3m318d3kib7bi1dz27grcmvj8hih3hx"; +"besjournals-45662"="1jpp3ayblhwwqzndss91rcns3axr60b8zzxdd6f4qqifhaqczk3l"; +"besjournals.doc-45662"="02s7qd7vvdr6wf00cm7026984s6vphp88iaqhnhk0iiafpr3lk3i"; +"bestpapers-1.0"="00ig29wqb4fn6qw7szmwmv92s19nc2wpapv4pgv8nwsby8nplyrm"; +"bestpapers.doc-1.0"="08yv29s2cx89nq0lvykx8z6szs72d2ph97g75bqni3l7b4n0wng7"; +"bib2gls-2.7"="09v0k5ldpyhwmzspidnfz34p4m7vmjkinbvrzs304crb2p9xb0wc"; +"bib2gls.doc-2.7"="01f2ll1pjzwjyj51ngijm4vaq06l1hgbw1ajdyaq7anach1z242m"; +"bib2gls.source-2.7"="01d40yrhncjh1jg743av8drmbycmdsfxf3bfpzq89di5hyaj821r"; +"bibarts-2.2"="1zwb8ras2mqv0yn880php3wizs79y1y6fwvjd09jwc9a0j62p1pa"; +"bibarts.doc-2.2"="0p2fn08wz1ng9jgwmvxp93kkb86wnwzh9snbcm1vhf09b8l1klxk"; +"bibarts.source-2.2"="009gysrkfaiwisb5ac89q9n7rhmdvcy4lc1jr5pgka21qp3rhwb9"; +"biber.doc-2.16"="11507rlq3rcvag1xxf8cn55rnnxdaag03hfd6mq42mnki5w54zjh"; +"biber.source-2.16"="1lsvh76vskf50aij9i2vgysnnc75qdc9c0vyb7m4y46zhrx0lvrn"; +"bibexport-3.03"="1zbsilzaz68zvmbf2xw7jqw4l66clcplz3l46ggxw95gns8mgqlg"; +"bibexport.doc-3.03"="17a5w095vkpp7j54h8m7f74l7vycsqbv6zzschdb3dd34scq1s5w"; +"bibexport.source-3.03"="1pqs7j4xdhx3pqsc8i0wqnz9jkyg891dzl7g3cv19a6wv82k0xjv"; +"bibhtml-2.0.2"="1sg9x0jrgh2jng9b1pd08i0f8kzhy94sq0mf33as91gr43dzws88"; +"bibhtml.doc-2.0.2"="0is3q2m1xg52h5s9n9403c85yfmpjaqqbh8lgyfqfwhl5qqmgrf9"; +"biblatex-3.16"="1yhh1h1ir9g1p2njcqqnkkzadpl8hphakv17n6igkwmjpdxwycy2"; +"biblatex.doc-3.16"="0h2i50a483ipbvc8wnhqp5sar1kwvhj0na7cgzf0yhxs8r7rfl76"; +"etoolbox-2.5k"="1g944zizyl05qz6lq1k13hv9952r97gc1i7is9s5fckz664075jl"; +"etoolbox.doc-2.5k"="05c3kvfwvbg4bxf3wza5rdvh98mnxadf818rsklxa5g2lz44jm76"; +"kvoptions-3.14"="10rv33msjbxkxyvxckxbwzf7y011cgdqgpfqh724m9554s6rlqkl"; +"kvoptions.doc-3.14"="1j9jszxr3cbpjgdr2z42zf4yi33bbqs2yga6nrdjykpfi6n8i9wq"; +"kvoptions.source-3.14"="06z7r2100z6k2cgp4slynr7w5vardb3jm2wpxd0zm68b1p9spzq2"; +"logreq-1.0"="1zj1vn0yfklngvfvcr0p8hchar220lwfrznsq73jbw9zzjx47v4f"; +"logreq.doc-1.0"="143b5bb1jkc9j1gd46c28q4zq8jlh9wrngjw8q4prw5dkfnf1s8m"; +"pdftexcmds-0.33"="1fpijk36lx5czl6bpbawlm8f34zp264l1fli095wha41fil25hks"; +"pdftexcmds.doc-0.33"="00xzyvl66fds400dm5zryrv3m5s42mv6658zx7fnx2wbd0jxs738"; +"pdftexcmds.source-0.33"="11516wkglckyrz41pz9cqj0xa2bd6v2l234k28ynnmfjsg56vph9"; +"url-3.4"="189lixyamvrcpds2i7nlh4w83mk5lnk73158kcw3qjanpncnnn1f"; +"url.doc-3.4"="1xragd7gak0vzj14f7dcx5hxg8plh47ncqdb1m5liaibrdlhgpql"; +"biblatex-abnt-3.4"="1dn2929wlyzwb96iq5lj8x9zr2fi1c4qk1rldc0vrr5s3cxfn3x7"; +"biblatex-abnt.doc-3.4"="000akwyh992yxzn51jlvnc20g12ypq2zmffvnbwxjy3cyq0aggq8"; +"biblatex-ajc2020unofficial-0.2.0"="1csx7vad5svflb76ssdkvd8y3r2n9agqqynw88wvzhzj61fkd2cr"; +"biblatex-ajc2020unofficial.doc-0.2.0"="03wzlpr5v6y67syy0bx87z123ark524fm6kqjw83v0sa4y4kwq7l"; +"biblatex-anonymous-2.6.2"="02fssl0l50s94y6x7rv2rm0227ivgr7kfnim435j4k1l0av4gb3n"; +"biblatex-anonymous.doc-2.6.2"="0dffdxp04shrh7fsl4dilqcsnnxbjpbayy9r87hxmq3yk605lvki"; +"biblatex-apa-9.14"="08sldd3qp9d5riz038s5bn8mqhpvws449fk7q86fvfn9hwy5igxw"; +"biblatex-apa.doc-9.14"="1xnfsi2nk33dmqmbl46qaqiv71yxhxq31pf3srdidxn0ymfa6g2h"; +"biblatex-apa6-8.5"="1a1kynyy1gdmsfnwlnxws74hwyqc6sq29wv6ybalpipdzn7dg73i"; +"biblatex-apa6.doc-8.5"="1qvn9bnzvx88qbmbdgds53q08v7ml42mbqbcn7bzzq6mnz9ra2mx"; +"biblatex-archaeology-2.2"="1kf5aqc8mv28k0aiipwm6yc1vkgzyikp0bsmpmgdhy5acz3whfxc"; +"biblatex-archaeology.doc-2.2"="022l37hplzmvkcpnr06n4fz509w8wm24py0c05qljs6jz7smyhh6"; +"biblatex-archaeology.source-2.2"="0shn0bacflcaayajxpdiv9ik994aizpdmlc010shm3fzjdlay79c"; +"biblatex-arthistory-bonn-1.2"="1j0wy272dkzcb96i74qh54ap2hs5wdhmln8akh749fyydsazr43h"; +"biblatex-arthistory-bonn.doc-1.2"="094s5c55lfc7ssmz3mzj61zkxpnn1haj2vh582apzffppgd3fd0m"; +"biblatex-bath-4.0"="1vlkj2gvrki82mg77h1kyk4ngg2r9yfbrr887kvypn4wl32hm372"; +"biblatex-bath.doc-4.0"="0y0j1hdk7kj236civ1ngb03sf24hxd5dxgv4af6xdll6r2ljikpd"; +"biblatex-bath.source-4.0"="119vi9nxizn2l04ghiajp8kpzrvkgrn4yl4qn9brq99drn6hnlr9"; +"biblatex-bookinarticle-1.3.1a"="1gas58hi5ycchbpamm0z9mn5jc2hbry682i4wmba242wm55digyq"; +"biblatex-bookinarticle.doc-1.3.1a"="1s39gixpryiqf44riq5bk3hnp6nc8pdqbdylh594k9xk3770p77z"; +"biblatex-bookinother-2.3.3"="1vb9m88z3cck9gi8d41lsv4ckqli4wjdgwkklfds2z189vbncc4k"; +"biblatex-bookinother.doc-2.3.3"="0zzmlsikzv5zxvd5xh12fzynmkl0bzzvl2s2y2r4kfn6s08xncja"; +"biblatex-bwl-0.02"="1ii8jacddlj15sm45g5rnk7yqbsd7i8c6a1pxy34vpb6bgsfb69m"; +"biblatex-bwl.doc-0.02"="11cspr9i8q1da0x23bplsy88nfmn1x87zvrqdc28gbk4ybi6fc4s"; +"biblatex-caspervector-0.3.5"="158ba1fhzfaqq056wzs6af6hx92h7yscliddmz1y1dlm1as8x1hz"; +"biblatex-caspervector.doc-0.3.5"="123l0nk56vs2i153q9bwplqb2jyg66bl7b6xm60dz7k16l81w3ky"; +"biblatex-chem-1.1z"="0kv44yng5wff1xkgw8nya64jizfcf1ipxrgnf46pd1dak5vlsiq0"; +"biblatex-chem.doc-1.1z"="0amx09qlk78kw6iam8b83xx0kw12k5p7q6wn267imr2rsibbs3l7"; +"biblatex-chicago-2.1"="04qcxjvvfdsfib5cwh4vk6s5rkpalk3vzz9gldgl3xych1k5dg8a"; +"biblatex-chicago.doc-2.1"="081fs68vjvzmbwj6y2vb7782q5w1kvgbnfsnh6hngx04m0f5sazc"; +"biblatex-claves-1.2.1"="0saj8s7q9lzjnydjh3x2hcnhj0wfm2p4rvxk5n6hi2ccfw78d3c1"; +"biblatex-claves.doc-1.2.1"="0g4x5jblj664ngppqpbks3d0ahn818ck871q2aqir6jgkrd13cpw"; +"biblatex-dw-1.7"="17d0mayflv3hwf9ik3z7vjpgp2cv1iyva5iy1nrlf8j7008azmka"; +"biblatex-dw.doc-1.7"="1879390m7ivmb49fkvkhl7233a33q89hpb2pnyvsscz5km3vv4w0"; +"biblatex-enc-1.0"="0kvya1xzxpcmvwgacb726jqzmgr944y9ljai45f0gdkw855ylmb8"; +"biblatex-enc.doc-1.0"="0mmc5sd1jjnj42aa2q1g1zaps1hla6yayl769i4bya6i1w9r99yf"; +"biblatex-ext-0.12"="12x0018lzqvszw17i0id8g8k5dv9lhxj2g8fvw82x503fbll51ag"; +"biblatex-ext.doc-0.12"="1ira281yxvsnqba46avnxign9fbfxl0v4ddxhp3wvx3p7q4axjzq"; +"biblatex-fiwi-1.7"="16grb6hqmrhvzryijg6p4q4vf47a0lxa8bw59avlib5j7mqpg0wc"; +"biblatex-fiwi.doc-1.7"="10skq20bmpqymbgxs47z8ac0q5nckyph7s4xwqmpfd7pi2sksb4a"; +"biblatex-gb7714-2015-1.0x"="06fcpl6q4sa0a848bsglq5qiaxm2jig7mhpxw8wfikrxkp09hipl"; +"biblatex-gb7714-2015.doc-1.0x"="07n042g8ch0xc513mphmxn8ys56mxlgr1aav530fk03fs139a2z5"; +"biblatex-german-legal-002"="1x7x5vpicvxdjbbx17s8va3j0m9mig9ilwim2sp674yxjhfdpw48"; +"biblatex-german-legal.doc-002"="0jgkxjcx6z9nc0c6ms1cn1j7h94d2frxmj9i5rd3h37cj5rax25y"; +"biblatex-gost-1.21"="0v399j9kxdjx5z22mj3zn3cjj48a9f4qjhcx6dkm393a7v63ysb2"; +"biblatex-gost.doc-1.21"="1b0av4hfbh17kp768cyll3cb63gw688rvsimyidvssni0cn27s81"; +"biblatex-historian-0.4"="14p27qb8rdx479pj7zdvl00ir1zg8f0bzp107zfwv61ypq8zrvbl"; +"biblatex-historian.doc-0.4"="0hcghqxbjah4lyjzlrkixs6iqbkjx4d8r3hv16lgnddkndbgq663"; +"biblatex-ieee-1.3e"="00hzyr8c444gplwpjm1rzi613zdxpc839xkbbf13mcli150jk66r"; +"biblatex-ieee.doc-1.3e"="1257hkmzixhsqsax1i5ngj541vn9cixj1flaflkrnxs895l6j95h"; +"biblatex-ijsra-0.1"="0gnm3h0918lvbqwnzk9wkdcafpzz5q3cln2z1sjaylr3mgypykdw"; +"biblatex-ijsra.doc-0.1"="0jl8mr3ai1ybc3lmp7x477znv59az94hlbzaqmvix54rxf6k8f4k"; +"biblatex-iso690-0.4"="0ap3l1j8l45f0wlar9gp537v5dzlhc9b805bp3ijm700csclj0hv"; +"biblatex-iso690.doc-0.4"="1ng5dqk0ch57yrz8macbmm3djm55r4jkrq82bi065a5mxdll1cag"; +"biblatex-jura2-0.4"="1wwhlys3s1zb1zp675ikgydpwzkzgpk51phwd67nx9zphdd9h55q"; +"biblatex-jura2.doc-0.4"="14rpa74dq13g4wjd5b28pwivf7frz5w4712p0mld15z9cvlsi5hn"; +"biblatex-juradiss-0.23"="0zi9b67y0p9zdz2n4j1lr5qgd54p3l13c132wjz749mlrv6njfx3"; +"biblatex-juradiss.doc-0.23"="0a6d7awx49cy86ndwfkfq280dwh846ssjkkkrgbq4vxlbmbh2zpx"; +"biblatex-license-0.1"="1fg16xc32kbg493y91sjxjnxpi6jb7kki7yvy3d796w7vy86ljfn"; +"biblatex-license.doc-0.1"="0iy8ad7k9j5x5wnnk196dwsyc5hhz8fl88wq56x80cgfdkg20jrh"; +"biblatex-lni-0.5"="1dg4xa0xkblf3iy9hipjp4wwk46zwq5yhwfsmiwxa63bkjavpzg6"; +"biblatex-lni.doc-0.5"="0d0cx0jvgy2shly976ypmr0k1rrpmiiqc01m2sb9scj558vrf3fn"; +"biblatex-luh-ipw-0.3"="13hh4x8p8hxnyz6cr22lb3djl5advrl5c9dyx6f491d2mjz7vibs"; +"biblatex-luh-ipw.doc-0.3"="0xb2wmg5psd0wi21j1vmn1y8sy8gw78350fqbmpgd6l4xw7bb4gn"; +"biblatex-manuscripts-philology-2.1.2"="0wrhgwkbi468nzh41278mxh1ljsycz0vvch583jaksf26cxi6cpd"; +"biblatex-manuscripts-philology.doc-2.1.2"="1ybl7drbymw9sr019w8jyxir0827kbr8w9swvz64shjzhblkcdzg"; +"biblatex-mla-1.9"="1r6bx64w9j70wkjbfq1gm7hzr1xlzai3ynfb25kgwcm9bzxb4kwb"; +"biblatex-mla.doc-1.9"="0xpak1x5yzsax39dyr2kwm2lkcgp6fj18jdmndmh0kzxwdmxqbi3"; +"biblatex-morenames-1.3.1"="1imryzaywyvdr67qcspys9r3mhl5k94vhqjsl16pmz86klq1bs1w"; +"biblatex-morenames.doc-1.3.1"="03p7154s44ga7rlf8ya69qvbwkb6gsiwz8j2wycgzljj0z3plnjh"; +"biblatex-multiple-dm-1.0.1"="11rl82yv0bfy69cmij15np3wc15jss82ghf965r0b1py37vsj0s4"; +"biblatex-multiple-dm.doc-1.0.1"="1jypgpaid18g09xxryriaj4n1ql0759jfv4jshjbkbk5fgf4c2yi"; +"biblatex-musuos-1.0"="0zs2dwsid3xhcl01a2hqrr0mdfr1q9j0zga4rjlarfzkgznkqrwc"; +"biblatex-musuos.doc-1.0"="172kvn0rpmk331yvpf3zbyisv1qlykz8icxgr1xkq5z9bxn9qmkc"; +"biblatex-nature-1.3d"="0pfpm5am4dwj04fwdjrw30dx8qrmfx56s7gkl9h9qyj2qadsx533"; +"biblatex-nature.doc-1.3d"="1mga7yx3radxwqhfmxzh2hmsyvx9qmal394cv31mlb3yd5ww1sv4"; +"biblatex-nejm-0.5.0"="02v8bfdxslcgilfsnw0g516zl2rfqx0d87hjb0dbm4md5qbry0km"; +"biblatex-nejm.doc-0.5.0"="1znfnxizc22dgpp3bkl1iim2ksi3w9klw4jam84103bpbl3vwxgr"; +"biblatex-nejm.source-0.5.0"="02q97wss9bm6xj9lvr8vx8jvp8bszkxgk4ayxk5zc4lrnjzw2i51"; +"biblatex-nottsclassic-0.1"="00valazq56srfggfw1mq8h7285lrx8iyk44kb8bhqr1q7nhl6pzi"; +"biblatex-nottsclassic.doc-0.1"="1c5634p7knwv8zrpqh39zlpglbdbx9a5y5gw54gj37x3r1ij769x"; +"biblatex-opcit-booktitle-1.9.0"="1xciw0zxkp2034lccvhr6irkr333s0qqqacxqx20v51vjjg8ywkg"; +"biblatex-opcit-booktitle.doc-1.9.0"="1rbswdipirzv68ckh69cc29k908ifpkzp3vxgd2j0bjl3qvbwcyq"; +"biblatex-oxref-2.2"="02071anv1xni90hi5lzkmsrnkm8m57n1svkslghljy33yxabzfv3"; +"biblatex-oxref.doc-2.2"="1ih3hia7x5ghs10g2gg75d9mhvr4fkmncwi6sp0q4zpl6zz6sg9q"; +"biblatex-oxref.source-2.2"="0qhgzzz69bndzxhy3z7mj1yafxz5r9ihhx90phn4lwcrg5db8lcy"; +"biblatex-philosophy-1.9.8c"="00ad8xawypgdzjj45lfr3w6na8f0rbma5svq3cycb86fr2vwnv2k"; +"biblatex-philosophy.doc-1.9.8c"="0di059liq7v435kcwhf7a5nyp8v6m2czapz18xjr810pblhgqvqr"; +"biblatex-philosophy.source-1.9.8c"="13xrj5izz0qr4p37c6ffdph2k23jqvn3zywsh1qijwrj09w9s0kp"; +"biblatex-phys-1.1b"="1vj1rrhzh7ncvi2dap2cjk88vdj0dmlpakjiz953rvb7szx0h40r"; +"biblatex-phys.doc-1.1b"="0z3y7gmcmp2p5g25jha6kwkd7ma4pzgqybxra4402p6aid823fws"; +"biblatex-publist-1.21"="0z20z9j59w7i8gx95div23jrqdpz5yjb8ndc7y74xx1msrqbd7w1"; +"biblatex-publist.doc-1.21"="0iqqsshqgfz4yxqb8xxbavf1fg3fzs0w4v9swwgffj9cawa4yzsq"; +"biblatex-realauthor-2.7.1a"="1xv65ic8ywf18fdb246sr8pvq60hv4wmg7ris1glr5104g5yhg7p"; +"biblatex-realauthor.doc-2.7.1a"="06nvybm142cd1shgpcabddbrfyvzcc3yxk9zyq9hr3rfhzcqf05q"; +"biblatex-sbl-0.12"="16r9sh92qbbx2caxrzwspqlskwpznlx1b0ni8xfrxq08cdr2m548"; +"biblatex-sbl.doc-0.12"="0fqldbd4n43md8jilf179r1a64r8idw95n14179xrgr585x5wic6"; +"biblatex-science-1.2"="0llhz0jmncjp8c2r255mxh09rvff1s0kx1lacxvy7svwj7fl6qgq"; +"biblatex-science.doc-1.2"="0daq39wcjryhcapsx7n216yr591scjcwg7z4cihpb10igx15kbkb"; +"biblatex-shortfields-1.0.1"="1766zipaps96ks920y5zggc0zhk8vkclqh2c3zc2y8x7jdbah1vj"; +"biblatex-shortfields.doc-1.0.1"="1fs56vf86wwpaz1ik846r83zd9bpidrzzwv4l6jhxss8hgww6y0w"; +"biblatex-socialscienceshuberlin-0.0.1"="0fj2l2wxawps79v81s74jr4d8wz4pf45mmpry1pflm2zcica3ajd"; +"biblatex-socialscienceshuberlin.doc-0.0.1"="09sf6k9qghwll84bj6m7v0xw6zm040y6n878x0ywiq64jc33h0np"; +"biblatex-software-1.2-3"="146mr457mnvjsycsy10842mvn0gd81ij2wglkyqf5rvbx4dwra3z"; +"biblatex-software.doc-1.2-3"="176vrl0vw1f9jgln390y2554kbpmdyw87zsv7i7mc99y311sz3j1"; +"biblatex-software.source-1.2-3"="0jig20hy40f90iq3ywp1cf7ms7xcm5ccw90f17iayz8g2hrn2nrf"; +"biblatex-source-division-2.4.2"="09wsi1nj7hcf5nswkd6syn63xhk2ghaxikz5xb5sfyci0lmnqgxc"; +"biblatex-source-division.doc-2.4.2"="1mfz2bxfwx24a2652n4jrdw1mhrm1y7i5vq54rs7sp5a1xfg2d9q"; +"biblatex-subseries-1.2.0"="1c92azsgrp1cmq82ga3cvnca5s4j902hcncp64g9psgl9fm74nwx"; +"biblatex-subseries.doc-1.2.0"="0ri6vvzcpcm2hz73dkam0fgbnfm7i650x983qcngkr0jqa43xr41"; +"biblatex-swiss-legal-1.1.2a"="1sqskc93a3vdxvycmdz494kddxvzpf6rgw6l184lizwnrz9mr8v0"; +"biblatex-swiss-legal.doc-1.1.2a"="1k0xgd5gi421zvh8bvyvq5naapb6v7216k2sn5aqhca93sifgvqm"; +"biblatex-trad-0.5"="1000rdnm9jqk89snffsf4ldl47wry8k5akm75aqhd9r7qbn73car"; +"biblatex-trad.doc-0.5"="1m32xykdgms8i4aqny35w0happr6vbkkra9m4nasxp1vzykf0n63"; +"biblatex-true-citepages-omit-2.0.0"="1lqs1swmdmnhard0589k0r8gz3hp9bd88dz5z0kd0586vl7z2l82"; +"biblatex-true-citepages-omit.doc-2.0.0"="0madnjxwjlz9hs6jzgaady4sv0878v7fyjs3sn1bcnzyw4krfxgx"; +"biblatex-unified-1.00"="094ddmm1g0lq4dblgp8a87y8gyiab9flcca98fwnyh6jw2nmgk08"; +"biblatex-unified.doc-1.00"="1iip60hifs3xcrpv9zp9d7p3wn4iw8bfjiwqw3z7rhfk02fqn8yw"; +"biblatex-vancouver-0.1"="19ymkk94c4l5sav1lb66f2lxjyfzzi1s78qd2a8drjp9q1c6i0j8"; +"biblatex-vancouver.doc-0.1"="0wn26kl4nli220lfs663rdqmv49xgi76kjgnlwh99yljx7v47n09"; +"biblatex2bibitem-0.2.0"="1fbvrdldp9w6ll568960c4jvpjq7dhwny0ca6mka6vn2r1p4rp1z"; +"biblatex2bibitem.doc-0.2.0"="0mksck3h53zmisabmk06qnbn3p5vk74g1r2p8p0iz6sifa2hqx2n"; +"biblist-17116"="0z69a5x3czy0hb59c93jrkmmg6i66vc7rw6szvchsbsj1c6gwjfb"; +"biblist.doc-17116"="0wp7x8qj7bh1pgcy01jmq35r2i1f8yvrv6bcr8p68d70sr1jqspn"; +"bibtexperllibs-1.6"="0c083hg8hczwc28q0c9gw4z1bwj5w3krhrs5zg15h0s808ji32xq"; +"bibtexperllibs.source-1.6"="1pb46v09ik8cd5kbhl79qfnj9p2wl19g9vpjkdxqvzsb04i7lf0f"; +"bibtopic-1.1a"="0rzz1c1c6vgjm2r0gv65rwvbcv0asc5049agv75yyvqihvn51018"; +"bibtopic.doc-1.1a"="0hzy6353n1rzirfdjd8dgjhnp496i14b0z0n2x7gnisf3qksr0wx"; +"bibtopic.source-1.1a"="0abpdz3ir7l9dvc6vy5zi9ay103ga7i92vg3z69agd758xnz0v3y"; +"bibtopicprefix-1.10"="0vy9cah5mmr1vf4sm16212h36wz4623s07cagjqnmyprgm44sz66"; +"bibtopicprefix.doc-1.10"="070shh1cg3hdk097v9jr37f06q0qaaxji3vjdv8v24a1rg3rrpdr"; +"bibtopicprefix.source-1.10"="1v35hawmsgm12sv80wq2ld0rzz5l4shvky44l8wkxxh7i7vy43sx"; +"bibunits-2.2"="0znv09kqrwvmsjsw3lx9d3mp6fm8444zbn317q5yn5hzg2dyj61f"; +"bibunits.doc-2.2"="1zgj4jpl0fpmsrcp3h4qlkilflmy8zqhjamghidwzkkg1i9jsfz1"; +"bibunits.source-2.2"="04lswyalfivh01hp1wj3fq1q8960dmsvnbi8k856v3dhz0pv0whz"; +"biolett-bst-42217"="1ap5arz0s65bqqfllzwxisp3wa327kgivw1jh1gkc4wljq7v4jq1"; +"biolett-bst.doc-42217"="03hj647j6b7y43djqvb28rkjixpr0y7i02420piskp3cg90hn5dj"; +"bookdb-0.2"="1qky1ccqyni9x3dgjn6s36qyqdqzkj65m2glzzqdc4qs2h1hqr0q"; +"bookdb.doc-0.2"="00fr2fid8yg3ww2gmgadxx90y032vrgicjh23ia41r159clg7fqp"; +"breakcites-21014"="0f3zhwrk0wapckz83304anlp2ssii7nvzjdakbxfdj51cd6schpg"; +"breakcites.doc-21014"="1f8x16qy5v27asch2jhbgh080vmv7mza4z5w63h31gdglbkwdp11"; +"cell-42428"="1y2bxxx73r1h9rhsyar81r4s9nhgqjlvs5rwnkpk148rwwar7l56"; +"cell.doc-42428"="1ri21dk1wgfaay1hblmn8akmq8ccxpbp5lrfnprkqqrvkxnmaylg"; +"chbibref-1.0"="01gyfwsfrjy7fs160zxvzhr517wwbsgh381hk626kvf87wssz2nv"; +"chbibref.doc-1.0"="0h5vlzfw5lfg7chqfmbisqydmjn513rjrvw8pax4xlm75c0p6drv"; +"chembst-0.2.5"="1dg8dasw0r96rnv4pnmm2k96rxmsdfhvkbxc5m358x3i5i4pcpm0"; +"chembst.doc-0.2.5"="1zmqlm8vr2f1mga0b33wikv1wn9lx3lpx4y7pjhgdqk84lhfqyh2"; +"chembst.source-0.2.5"="11qxmd7b1h7fwam9sclazzjhmzf5fiw5ykw6ry553xm1jp7vhvhb"; +"chicago-15878"="0mwrphf2g7v5yc0qij76dkzalgm3fhcm8zs7akgaypyk98cvxw8k"; +"chicago-annote-15878"="1fz95s0d48qb1pzmwy7cdnccvadwsqj3pyvx02bkip5l0mg54kgg"; +"chicago-annote.doc-15878"="1lwrlb5axxqzrj1azyw6bsy9f3lq2n5acwnzmx8z7aw5sj19ls07"; +"chicagoa-52567"="1za4fqlpirbr3qs894abnlwmrhsqbahniyyimy1dxal0cp61cfil"; +"chscite-2.9999"="0db7nrmm5r4b2cvcyjfra1fmskjaspbgymjsl4vvif9j3kwaa0ba"; +"chscite.doc-2.9999"="1q5s4qj508nqy74cdcg8380vjbhs4v70a4jkr9wdirqcxjxs6yfn"; +"chscite.source-2.9999"="009a8y3lxpxjhkd05fcf308k3fihl95pcn7r2bgy57jr4nalmixx"; +"citeall-1.4"="05nb6pywcrhqi1c9xfzkv46j2fq9y1lqmqawi75v3z56h2v6c136"; +"citeall.doc-1.4"="1p54cr0khq72z396r3vl0p9qqn2k82pmx4pjaszlzhni5v54hbdr"; +"citeref-1.1"="05bxlkylmilyzvbl99nsw16saqjsqb4bcaa68qkz8m59wz1ji4rj"; +"citeref.doc-1.1"="064c9zg2rhnym0wy2kxj0617mwb3mxpc1rr13lqpwb1f1qhghm6f"; +"ae-1.4"="1nbhlv1qp7z8j9bhfrljmpjlcrl346z1r7f4hdxijdql0wxs6a8z"; +"ae.doc-1.4"="1qgq32xw5micjri99zmznmq8gsli6y9fqdi2l7sv530ri9i7kgxk"; +"ae.source-1.4"="1ljkgb4qj0wa6yxddx4w8w15z0nw5vnyh0cpzc4vwkc0m03xbrm4"; +"amscls-2.20.6"="0k3di45cn0g6v5j7ccgl0nys6ni1h17dkhmkz5b5lsz4zzbi05fi"; +"amscls.doc-2.20.6"="1lb1q967zwgqn21ix4gxbzw8a8649p9hky4ckd61l0bxxil3mhjd"; +"amscls.source-2.20.6"="0g1i4nj0y32sihf7hnb8jwyh3d3qmff394xgw8v8x5jp8q0rh2bh"; +"amsmath-56514"="0hvfxm97szbj5mll7vmz1gv6h6x6hqpk8z4kn51yamda61bvgmfj"; +"amsmath.doc-56514"="15j4p7jh5xd9281vpagvwcx7v25b1y5b5rrx4rg5gklkvf7j3j5h"; +"amsmath.source-56514"="1sancw41dcbzfkgax8ygbc3s07gr9j3c3a3d1clipw5dpbp0jh8d"; +"atbegshi-1.19"="00r3ayn5qa2p2j4hyxbp2mm1aqhbkjpwk15gan1b4szmm2wk54h5"; +"atbegshi.doc-1.19"="1pjfmnrssaw20sdq801x9jb9qh7s8l2mnhcvla4bxglckgwz2na9"; +"atbegshi.source-1.19"="0b0sxs3jpc6a9pw1z44iv2bwvyxm02yfl8j0mc5qw0asdp773vrg"; +"atveryend-1.11"="06q5b28q5m9i29yqqx1l1y0vjc20i0n6p2k47z66jf3s6abrqnrj"; +"atveryend.doc-1.11"="1nn08cfh3n63xd45rkmzvdmf5580lm7kfd08z9gawgaibh6nii80"; +"atveryend.source-1.11"="0fgzxwc6jlijf0mzjh7pm2afd85np1rwy4xziz26s0gi6i5pdmvp"; +"auxhook-1.6"="0c92za082vzi47m5dlwq8bss4jjgfzmbbaaz5j1yb4ngli9qj08y"; +"auxhook.doc-1.6"="0l6xga3hr1lvhgli259ma78rq394jplnkn5j8fgrfapvzrhsh2kp"; +"auxhook.source-1.6"="18q0lawz00fbv9mgcbp21zk6fm1hsprmrkvhnl34ac1qj1rx6x3p"; +"babel-3.56"="1a9kylk1xjahqiyq9lwqcxgndgmbvcp9sjp8z5nkyrbf2b74jyry"; +"babel.doc-3.56"="0qd33vywp9hvlxzwznf3y7xcshspq214ywa5y7b61frww2r0vchq"; +"babel.source-3.56"="18kf6znikvrysyngk129jim9irgkd14idi5w1l3m3qxf0b56l7ac"; +"babel-english-3.3r"="1nb3c0yikcfhlpfsqgx2c6549ra7wcbcjs614d7gvk5fyh0cds8y"; +"babel-english.doc-3.3r"="0jfjdsiqkg0sfy326nz6rncq9sk1ssjzb0w2frybkp348gif3rv4"; +"babel-english.source-3.3r"="1q9bgs6mdgjlg3pv2ddrwbnfb628dr6rhdsgkf7rnwm5m6ncxkxh"; +"babelbib-1.34"="1ka976ag8w02yrbbgldzlqa5852ag04i39w9wv9bhprn84xy5cl8"; +"babelbib.doc-1.34"="16iznzd8hk1hxxp08zcifn9v5bvh3dy70nyas804z8av306s1h0z"; +"bigintcalc-1.5"="01vz3qrhxb28v86np3a0spq9yxxc7faav32m136nax2vkm5ff8f3"; +"bigintcalc.doc-1.5"="1wa6750qyggvx7nlwq9n7s1rfdm1h6i5hv91y1aq6mn26sw68l1s"; +"bigintcalc.source-1.5"="00gnanfnw66bfrd5gk072z9rn6nhmqnjwf2dwnamvy3dpxgg86jn"; +"bitset-1.3"="0ynyw8fyb5cidlz00f42cf21gakm2ir9ilddaaz12s7qq99lhj65"; +"bitset.doc-1.3"="135dcx0b51br6lf9dxd66jq2xa21bpb1mi4y4kk5z6ngsd1imdag"; +"bitset.source-1.3"="0yds3rhgq52sxvwn5kc32iizapbs5g21cw6avbppiip0s5x0b538"; +"bookmark-1.29"="1vari4mh0ijss50sa103ppz9a7mhbn72gl7sfgs6y9fm0rw2b457"; +"bookmark.doc-1.29"="1habxdliv4vw5xsm3ki8m43fbqxkvpj4wfm2j7nkg01nsl8q2zm4"; +"bookmark.source-1.29"="0ygfyjpz90vpavg4ifalbnw2fl06j6v93906ragk48g711dzhyvp"; +"carlisle-56753"="0pwd4yqhwi3nmp19zyv69pg46xlk7s2n6m001v312vri5f9k40ir"; +"carlisle.doc-56753"="10vxpk4dxf055s1ffpviav8sh56b36znr63npf40c9gbaxp9gcmh"; +"carlisle.source-56753"="1j685lwam6pgkmv0bwsym7a1w01bgraqk5iymv678ax5m0a7f5bn"; +"colortbl-1.0e"="0i2i6rfhbllc5imdaghm4jkfq0yxc6zszm02l49aikg7qi6zmmyl"; +"colortbl.doc-1.0e"="0i8bsb0q3ga7p8mr1wg3l64x9rq7qlg9f16m7x6a7ys4ppd8qhn5"; +"colortbl.source-1.0e"="0s5c1qr1bi835g9a89x08wxsg9y3837xqfkj0dnpg6rs2qz302q9"; +"epstopdf-pkg-2.11"="1bd7bkkk5hbp0bfzrvjpmfrrvil9i2pzmzl7aaa324q7w4f1w67k"; +"epstopdf-pkg.doc-2.11"="1lwv6av0b4v4vzzk3i27diw42hcdqzgvis1fk4fclkyqz7w0ai4d"; +"epstopdf-pkg.source-2.11"="1qmvc299bzgfrf31sa4027rgkq3yjg57318mbx4gl4cwznxr7zh0"; +"etexcmds-1.7"="0m0kf57wcmy50qcca2v5jb8z4h7z82pja82igmf6gsm7fksm3wrb"; +"etexcmds.doc-1.7"="0grl3svqzjh5bdg4jwzmqaxz7chkqka0vn0hnjwpyvm52ngmckyk"; +"etexcmds.source-1.7"="1s7avnnlr4g8xjdfmkm82aanz0k0cnhv2dyar30439x2indyw68c"; +"fancyhdr-4.0.1"="1xcw1bkfh3xh1yysqp8syvl2pnfm6wvam5j44vp31rsa38pyk8yp"; +"fancyhdr.doc-4.0.1"="1bjxd9gvzy4yz5mld4vdc5ik3f049il8046s7kqsz4pb1278y09z"; +"fancyhdr.source-4.0.1"="0rw0lq99kvj5lkkjp7k67q7sxksdx3yyqhpv09l1g21r7f0rw86l"; +"firstaid-1.0j"="1kxd6wg4v9fsngr94cqswn6a73ccf63gkxc313z7vzfqcllgclj6"; +"firstaid.doc-1.0j"="0b81kjvisimw7c07lfvyasi7jspywmm2l7bagxyx8r2k234pcr1w"; +"firstaid.source-1.0j"="0zx37rrl978ip4pmnmccdjvr45aq5q4ri8xlwfwagd3k2n8a9ihk"; +"fix2col-0.04"="14n020dmfn2s54h5xvc9lrynijcwnj3d2w4kg2w52v0kf037hmln"; +"fix2col.doc-0.04"="089pdfpk0bi23yb7grjv4w1agkssfczwvv2vhk3piy43qpk9h09v"; +"fix2col.source-0.04"="0wi711gb3bc5pc2kb7q2hz8y09g4phjxggrqjbl6i432z42fc061"; +"geometry-5.9"="0wv4c77fvaz8qg1ffjg3y06r3q4xjfxkh3m7a5s9ynwmfchcirgi"; +"geometry.doc-5.9"="1npbvp9g9b4mp8w768gzx1vxsdsi9zlrlfgc65xmb0rqx7z19zvy"; +"geometry.source-5.9"="0dm5zakrp71rxfa8xgj7ks0gfvmrm93sqi6f8m4hw7ls7yqm3y9f"; +"graphics-56514"="0ig3v1wcxv21lw3fyfadbnj13bnx36njssc4cdyyhrcljamq6l9i"; +"graphics.doc-56514"="1aqrxbaz3hj5b06vklgb3p02211rvqdzc04cx762636zrkh9l6fd"; +"graphics.source-56514"="0pjal4akvbk5axlrw1sndfpf7c9n7r1z1ipx1mr03hs4pg0s5xmj"; +"graphics-cfg-41448"="09yifx2ww4jjjhl5k8b5vz78711289755mw0r1rcshk596qvn9r5"; +"graphics-cfg.doc-41448"="0rfjgc83ryg3s5q01xnkk8bzw7rx7m96hfxq85xjjn5qxsgy8yqy"; +"gettitlestring-1.6"="0kg2p7ys50ms0li3vnrabywnrjjgllpyr8sf9cz3rnv8zsab4b68"; +"gettitlestring.doc-1.6"="0xkk16ncsyv2s3klv316fprld0d5aqaldh3g10p5gcicmccd9061"; +"gettitlestring.source-1.6"="153bkg899ikkg5zhfw1nc48nzk3c0x5iycxspxcrrj52dpgq22kx"; +"grfext-1.3"="03ff5n3yc3fxrayhyapm9qhd665r15v57vri6ajb5xb4m18rkfqw"; +"grfext.doc-1.3"="1f5kvnnv604qllqim8qv40cfpx0xaxanigqnqwmjfwf0n44akcfp"; +"grfext.source-1.3"="0i5pkqrc4jm3cgwzyhw1r3kh6b0b7sb352bnzid7h8msiwx32y8k"; +"hopatch-1.4"="05v819zywc2g1155yvrzql7i7c99605kxnkgaq0mm62if6a0rsda"; +"hopatch.doc-1.4"="0jc2amxm8c1j6mwcn64x7rpjl61yxvsk4fchyl2pxrn4wa69z5mv"; +"hopatch.source-1.4"="02pr8bd87ri7x0w2bgzd2vlzrq3b42r3l7na4vq7lnikr1p3x550"; +"hycolor-1.10"="1dfd149g2k8cq3lw95z6r4knyq1mgirdqnk9c4lmd7ip4rcs0vi5"; +"hycolor.doc-1.10"="1pc12vbn1yak6l6c1fgpnj0s88fg94nagj4b95mvclad6b546g71"; +"hycolor.source-1.10"="1f5jv91vsib5vk4byr0481a8j5pvbwmhfqz2qd14ck2vw8laz4ap"; +"hyperref-7.00k"="0jyb5s1ry6fw8wlmvsxhgw9gjxc8x92jcqx4rr7h792jbpdxn2ih"; +"hyperref.doc-7.00k"="02fqchjah6997g2d3qj3ly0cxykjb4wzfvmz7xbqj73l1c18rs54"; +"hyperref.source-7.00k"="1mplajf3p3ybhx63dsdlhl80y1sgf6m5vi8mh80a58krp6p4bw6x"; +"intcalc-1.3"="0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l"; +"intcalc.doc-1.3"="1vav25plm639410p59bi7bsihsyys9yaddz0bcawxn72zi9b96r4"; +"intcalc.source-1.3"="059pqs3f821javya7brxvl9v2mifdyw1vg18hr1zgzhj7bmlxh14"; +"kvdefinekeys-1.6"="12nn74skhwiszbdhawqds31caz6d59a5pjmwar0r8lmk4f1jr3xh"; +"kvdefinekeys.doc-1.6"="0x3h28xqgsmngs51m666mvxb8jg9vwk0wyhijcw84v1szyd0m7d6"; +"kvdefinekeys.source-1.6"="13cb0xvqhz5w1hv6hamr7rh1q1cp6abqfsdqzd0xw0my9mxvwk97"; +"kvsetkeys-1.18"="149vpmv4vms269dzq4sghlngg380sasvxnb3sx9rfs7d9j0finvi"; +"kvsetkeys.doc-1.18"="0fw9qrf2cnyiqkpfgs3p3v6ghb4jvckwr4ils2syk8hm6flk3rya"; +"kvsetkeys.source-1.18"="0inw89igbpvpiyhyj5jrgv2n7gs11flkx1bf39aakkcw5lb0pwr5"; +"letltxmacro-1.6"="0p16zmxngzzp9hbg7bxrh087gxj7hg4avf4a9akjkg56834hna5h"; +"letltxmacro.doc-1.6"="1gxldiflxvhy6ca87f8z3a3zzisrwz6f9vrx2r9gsfw72jyfa99y"; +"letltxmacro.source-1.6"="00ykjx412119jxwf1zaz5bismfr0i52psf5fagdiybbshs5ac88x"; +"ltxcmds-1.25"="1lr77yai2qivlx26s5094czpfxmg96bhxps5wbm8xn7cpsw0zbd9"; +"ltxcmds.doc-1.25"="1hxclaafsgj1wiw1hrqzn6p227x22wp679z5sm8507wlys53v49h"; +"ltxcmds.source-1.25"="1k1kwmyn2k11bn5dp3cx8wjdiqrnb0f84rbv8xbsba199k51ws86"; +"pdfescape-1.15"="1vbdjmm9bi9ngzz2z1b8jnf6nzf9xsaj5pvyswg13y4dr00mnz6n"; +"pdfescape.doc-1.15"="1v81nw121acyv6mvpykgrcdvsgqmby8acpby5lj75ih4zya9gs4d"; +"pdfescape.source-1.15"="0jk7rnf3z1hlrqlrcx0bzic46v57d8vpm4w5fn4c37q1f4v5zmpi"; +"refcount-3.6"="1r4lv6yhybqb8wkqyaysimb79kbdgvv393kn7dkjqr46b5w4fzcf"; +"refcount.doc-3.6"="10vn481rkdwv63z4n67gch55w8x44v125kf3v7299j92fm8fdznk"; +"refcount.source-3.6"="1rf8yk9xc1qhiiq30jhvjqmg5773g5d33fpcpih4i9c1l7kad3sy"; +"rerunfilecheck-1.9"="1c8x5cp12axkkb65b0xfwgachflngj2kxah47alslzjxwzh85fv2"; +"rerunfilecheck.doc-1.9"="0pn3fmjhf3mxx3f42zg34ibfnr1dlxhbddssg4si2y1f67yfi24p"; +"rerunfilecheck.source-1.9"="1m3p6zcl37xyvszf61yv7vrhm7a81g34vjj55161zfwypqba57sg"; +"uniquecounter-1.4"="1g7ix0pnd52dsykq5na5d4kfi49zm8gmampf5yn281mn901p3wjc"; +"uniquecounter.doc-1.4"="099clvqs76hiwl8i2gqj2hdmj2m77v03pc82sls2xpwvrs1dqd4s"; +"uniquecounter.source-1.4"="0cgpfgv4yybrq1ryhjrzwfwf97805dw6if2s1qivhry94lb96vn2"; +"stringenc-1.12"="01xnfg0mcp94dh33rfzphk50kjb68bw76kf7jnbsnjwlqf2cr5pq"; +"stringenc.doc-1.12"="00hbmjwhas4fpcx1yg016ggqv324hdc2aklr2nx5m5x0i68xq6qa"; +"stringenc.source-1.12"="1ir6041286fiz8c5zpsbl4cq62gzdrdpj50aqv5p6b1lqd8bsfp6"; +"zapfding-31835"="17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn"; +"l3backend-58509"="1k3xfwlpjcsa6lk5b5b1k1dih8vn915nhy9jprfxjdsr6jha072j"; +"l3backend.doc-58509"="1jn5a4brv3y0nnalvd42p45n32mzm8a3kvw1y13kz73ksfhy08qm"; +"l3backend.source-58509"="071mb9g9wid2jlmzrjg09vjcii170gmxq632mpj9ffb54fp36sgi"; +"l3kernel-57789"="0kg9v51jxw5bdy84klkydsiyyibkyxb8fdw1q9pk22i6nasx8xx0"; +"l3kernel.doc-57789"="0lpcda0dh1igb5irlfk7swf9kghazlazc03k5f8x6qjh6c2vhzsv"; +"l3kernel.source-57789"="0v6w15xka4k8fmh94vf876az2r9zfzh9fx65d5d0xbzjwjf6wb7r"; +"l3packages-58296"="005nlbw61qqj9aqbh50jyygfdf306jx52d66ssrmwfsfppcyv2my"; +"l3packages.doc-58296"="1bw620alsjsva2i0wjv1264vx1vcsm1i89lkfgabvjw00ap9rp0v"; +"l3packages.source-58296"="1c7vgyvq1y656payk1mkwsdx5w4n4r3v865aivlmjbzxaqk34az1"; +"latex-2020-10-01-PL4"="1mrlnxah6sw35zrgjplzyqji6pwkbxv3whd89kz409ncfin7zkda"; +"latex.doc-2020-10-01-PL4"="1psh86s3gf8rps8m3l4168xsd6lwy76196iganrbqlcw1yvlabdz"; +"latex.source-2020-10-01-PL4"="1xig50ldj7pfyg689q4qs2d9b5rnapl856lg7xwr6qh723vxc47m"; +"latex-fonts-28888"="0dh4kgy4mfarlsrgqw4dm5zgfhcfg9qzh8s2wjk6w2g0jfc8rf3v"; +"latex-fonts.doc-28888"="0243qbrs2w7qh17nh8m4ivj35gfgxsnqxza281cvhh7g2fv47f5l"; +"latexconfig-53525"="10ynmd8b9b9l1wl1mva23yz4zir53p6r5z31s39wmxz19pj12qvx"; +"latex-bin.doc-57972"="1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi"; +"everyshi-4.00"="0y738zcqy85ww3mhwgrj1qh0vgpwfh2ib676wlr514xglvmp9l3n"; +"everyshi.doc-4.00"="0ynjq4ibx6rr0qh5lajb5n9skqa3j4zyi533mxc10axp5zpxsjkx"; +"everyshi.source-4.00"="0iqxf73n3l1jf32x571rw5wqwvz7nj3bvyqzgizvfpbnavqhrxfb"; +"lm-2.005"="1b4lc6ipij5iws4rgpv3sjjwrdbaxnwiqdbyyj62jzc3yk999m4y"; +"lm.doc-2.005"="053xga559cmqggdifabingd1f7q1lfad1pkk9nmkximclq5igg2d"; +"luaotfload-3.17"="01b2d8zsxga3f68h4dpkvyh2c72s8yrv1ff5nchipi8ka6bv5h2r"; +"luaotfload.doc-3.17"="1qsvd1d1257gnq2jjj7ifa8a4k33zjynk9c0vvhahdgkggyzhlrj"; +"luaotfload.source-3.17"="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c"; +"lualibs-2.73"="04fdy6p2cm134vs0s0ahzl5rpyh7akwzwil0r0y74r2lckqxmn0h"; +"lualibs.doc-2.73"="0bmnyk1i4cxvqdvgwwd0qzwzav64zh43lzfqjn5mqimmqwb85zdb"; +"lualibs.source-2.73"="081kcsvnzm0fj46aihixahyg0vpn6jiv068y7bxq1y2brinbq5rj"; +"ltxmisc-21927"="14llkpla8gpx7q6a53sd8a0a42wgk93fg4mbl6pc0v7v1kjblr5m"; +"mfnfss-46036"="1m0yza8nw5r3ph8k5nihgf93vf54cb0cnw4c5gkqy0rsd23hk4dd"; +"mfnfss.doc-46036"="1ppjjma5dc5i9ly5y7h91647nw9c2y9w65k0dn1ks92xsvnzf1mv"; +"mfnfss.source-46036"="0qjz8dz76abwqspab89z3a50nndh6gflanr8hn31z5fra3kzfp90"; +"mptopdf-57347"="1r7m71i3cnyf3q5nlg6c3ialw6vmch48sgf0flmd63y6n21zjsi9"; +"mptopdf.doc-57347"="0hw66p8gbd91ddpiifgm4qbd4vv2dbc149k299nb6xxp93hh44yp"; +"natbib-8.31b"="1wxpcyr1b6k1rzizbz2g452klrmr6xh98csqr6pawlnx2zy3sx5x"; +"natbib.doc-8.31b"="1hai95c7ah61rqrsvzvn0ppvr7pn10830dp7wn7fc0j678z9r3js"; +"natbib.source-8.31b"="1qaxwivq95pf014w39igh070cnbs7n0k5am4waxvdwkzql1fafpy"; +"oberdiek-56291"="0qz842nvhzpiiwqgrn4hjbb5hb2k37nfpxrhgjhbnm2d5pi96qb5"; +"oberdiek.doc-56291"="0bmpz28w3pbwh7p12mhx47k0w6wyppj2bgcw917ajvddigla86aj"; +"oberdiek.source-56291"="0h70q3xd2i8fa94ai30vzhpzb91h99xrq273cp1fln03wwiix5rs"; +"grffile-2.1"="02cmm9q14h87dv5h5ci7ny7v4plrry54mz15jddx1zkfx4myykww"; +"grffile.doc-2.1"="119xqz1n57mghhp7db19ffrv1cdk1fgpznlyrn3qgvg2926mx104"; +"grffile.source-2.1"="0pmg9140plqv27mp936ca0193ihggd243mmprj3l0d6rf5dajm8j"; +"infwarerr-1.5"="19nlrbfmqbkjrrx9x75s9nd6crg1lzimb2fr3hfblaivj6lx8p4r"; +"infwarerr.doc-1.5"="0p1s0v6p7ygkvz5f3vgarcrl85clfrj3ivzrka62djqyzn4bb3yb"; +"infwarerr.source-1.5"="1x2mkqyx7gz0bz31na6mcdyrlj11mxpjlzc6gb9pk51sdqjj0bbv"; +"pagesel-1.10"="1j6rg25mhaiamlff4j4lw8pbp6x3mcg00biqz2apsbi6kmbiljw8"; +"pagesel.doc-1.10"="09s7r6dzv95689ysdw442gyqsd2jpdyr8hkrigmn9c4sx32alq5n"; +"pagesel.source-1.10"="177j2s6chsdhhw63q9g6ryc06vn6rsi29n4prrn2w14fgr3wnhcc"; +"pslatex-1.3"="1wfk27qb4x8aafph0lgnkq3bkz5fy4cmaiivd924mk92l1wfg6dp"; +"pslatex.source-1.3"="0qg1055zpy3pi3hljrrhzixhzi19rca2jchg0q04xi0vq3vslpcz"; +"psnfss-9.3"="0ng5pkk6m2l8yqd58wggbakbs4hp4400r4ihyi9akf8j4kmq2s5y"; +"psnfss.doc-9.3"="0vfv9x1qsivwi6c6hi23vw0jcjz9dclx0vxnifslyzlrh7592dzc"; +"psnfss.source-9.3"="0cqpzra8jwdn9d6w4mhmfrfw2zia2nbpyxjfrcz8m1disd10lhsf"; +"symbol-31835"="1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs"; +"pspicture-15878"="0i41lg0nw9xya0gfiwjd3xgbk0w723g90gnsvnfg764s2dl371b8"; +"pspicture.doc-15878"="1p27zx0svlcm4p12xjq35g2lgj1j485c3x363gciqb4aswmlsl65"; +"pspicture.source-15878"="1f8lhyhfcywn5y78354r37bgalyq57bm1fill5vzny3l7cyqxxn4"; +"tools-56514"="0lw5s1g7rjnfn3a9cmfc2q60dl9mn1m67inv71zr32nh3cq2kkdn"; +"tools.doc-56514"="0aa2wmj8hlkm7iafjbh9caa5r0vbc382x6vzhwyfsz16jszzhhfm"; +"tools.source-56514"="19ic4fc3bvkpl9wxivv3i6vfv8bw8rgydqpmzlvn28cygi958vj7"; +"collref-2.0c"="0q1g0x0bm0qjh568fp45b1ljy3w3jgy6s09ji1d1m5yrbs4dm7qn"; +"collref.doc-2.0c"="0vcfrdg9mqrfv2jlxh88g0nhpsrfwgdg9wjdn0l9b4c5h8zq030c"; +"collref.source-2.0c"="156gdfrd09kyxjiplcm38s3zj8v6bygwlpr9g952m0r72q7cq54v"; +"compactbib-15878"="077l73vb0rcxy1n51r3wmcb7gma6nn3xrl543a67n96lpp5xvnnk"; +"crossrefware-47861"="16c50pw2cgr9zldfhwhhvgvs896d8rl26s2frjxb7mfgzmby23ca"; +"crossrefware.doc-47861"="17i45ivhsmnhsmj594hxkzcm27mciri6xkrnzxk8lx1fs28vnxmp"; +"custom-bib-4.33"="1m25bdq11g8jin9qfib12h77sg8lb87p5680d5dkqzsf5y3iq7vl"; +"custom-bib.doc-4.33"="1ydbi1r0jvl936ziypnjqw4fsr7gvc1gksaqr05wj1bchh28cyaj"; +"custom-bib.source-4.33"="0sjpwz9zhr0kd4qn454nm1s4rw4a6n4qnackkrq4qkriwzv9asha"; +"din1505-19441"="1ki5xzdxgvy34pg345f1577cj93ps4mgcakjgqra8jshnnfrfqs6"; +"din1505.doc-19441"="0wh1zkzzm3d9s5gvff6j847jsqpr436sw7ysvrlv0r5s3fb10xl9"; +"dk-bib-0.6"="0b0ypkq5c3bvbz6633csljj2zqibcm0nqj4dkskikzv0dzqkilh7"; +"dk-bib.doc-0.6"="034zpjn14wia2zl5flgndr1p89b8jg0w91wzqhw5zfzmdh4k3pn5"; +"dk-bib.source-0.6"="1aj8d2r3myp74x71jkgi8ckzcr6ngsqfqqpv5id43awrffxicsjw"; +"doipubmed-1.01"="05zcv1db1bbxp6qnw4ni3qjx6yhflad1syqabqbdccrfk5xim20n"; +"doipubmed.doc-1.01"="07pd08qaggy6q58as1aqfnbk77mc2b4kavbzqk4v11f5vp5v0bdq"; +"doipubmed.source-1.01"="1hzv0iaj8rxblqxiak3n855yw8gqmxz7l8jwf98qnbpb9cm01f0i"; +"ecobiblatex-1.0"="0mrrb3bm54d6rpwg8i534wmwkh7v6qzysvd020pi5pph967lqp54"; +"ecobiblatex.doc-1.0"="0mhwspy6k7ixjjxk5frwklasm0xzwbwk2lx684ikv195nrpb6y8b"; +"econ-bst-2.8"="0wqkkd4ylv71x5qqaq8hqxs71c63gffdnks6xhdhhbhj6b4vsjzl"; +"econ-bst.doc-2.8"="16qmwd8w8ggjn8slq1dp5gjmcq27m5bi7qxfp3rf4nyh51zlh0p5"; +"economic-32639"="0jyw807d23b22md2ib7xkgi2jh4mr50pczjbsylh2gdgsplxgaw9"; +"economic.doc-32639"="18jn833w1chbi0qamdxbrrp39945drslxd2jkzi2g8wcca7l5b71"; +"fbs-15878"="18h6n8azrnk2qabv30kpa8gmj2ljkvx0nqs8qb9r8dxxnhng78ch"; +"figbib-19388"="1lxg05j9c56rrinl5gc4y7sc4r9gc5gyq59d3yxq4ggmq9q9l3dw"; +"figbib.doc-19388"="16qbipciqc6vv5hg1fm9rda4kk7x827nlmzha8c9i3dz7gy0cnan"; +"footbib-2.0.7"="1vr72sl8q1ccql2p42v3a9qw01a50v1c1rxpgmz39pp65w4z8s1n"; +"footbib.doc-2.0.7"="1xyq88jcg6p7lc44n2ky7538r23d4n0nhfkq25q7xg0dh8whbm34"; +"footbib.source-2.0.7"="0ps56l6ah0i398f38bxy4yg2i1p0ajcwczxq222hl5176g2z28jb"; +"francais-bst-1.1"="1jpqkxaplcjrvc8647rj4xh9kyaqrk3yj7r3nrkyf4r7b0vwq2sd"; +"francais-bst.doc-1.1"="0v2828gxvwhljsf578a06pbk1fr3dfl15s9xchy5gpb3cmv2xg1n"; +"gbt7714-2.1"="12jq5g2hhx4138px12c9bxs98jfqvnvpsk2y7lh6f4dwg0l1qikh"; +"gbt7714.doc-2.1"="0xa6jbpxalvygvd447gmkgkcr1k00appaapzb8k8rgdw9gfbg8v9"; +"gbt7714.source-2.1"="0b8n05n7ibikmjb3kjkdgaq4din5s5ckwzng2k8agf0jjvy9f3ps"; +"geschichtsfrkl-1.4"="0vnxskd0vlslm3jhvpvb4ihzlssdrz5bywrxxysk6c391vyq3w0q"; +"geschichtsfrkl.doc-1.4"="182m0m7lfz5wz017kb6kk2jn5vkmsll3js0sd4pqmr6gb8av44m9"; +"geschichtsfrkl.source-1.4"="0hdq1lkgmcpjk7f8pl2q3c6rin97hdzwhfwacc43m1l3c8zbmqfr"; +"harvard-2.0.5"="0jpxqyrw9skg7jpw2d46f8nrh7jaa3r9lviv848nfnn6h35vs61n"; +"harvard.doc-2.0.5"="10vxj1cna040i520wj7c0flbk0d4hr22jyxqrv88616xqqkg3b6g"; +"harvard.source-2.0.5"="1j754jjwdil45pr032xjmwhf1i2phspv2swnjbyxgnssl6i370r7"; +"harvmac-15878"="1ky0vc92z3i7l64hkdm4jrlaz3acna747lfd2w3b0ybdsz8514wl"; +"harvmac.doc-15878"="19sfcgshwcvn4z3cih6ha2kgdbb5282zgf244678rl1gkmqjblj3"; +"historische-zeitschrift-1.2"="1zh8jhsmn4klaqn18zxbk3ajxvr99djavz4cww5wjm8lh5sv473g"; +"historische-zeitschrift.doc-1.2"="1gfymz7b2khfnn94qkd3dawb7ppqll9qg7nsx3qac8pqba539pv8"; +"icite-1.3a"="1aszs6kbmwx7k322a2yzk4l8d2gdb84aq7f9sk4bpiljgi9gpclr"; +"icite.doc-1.3a"="0bc1r733c6g8y8r2kam7in3p3cb9y8frph85s26kcgdxqw7j069i"; +"icite.source-1.3a"="0l3gx6sm1inyzyb6z2rb1zrhrnyg0i3xim0dn80360fkxxsz7739"; +"ietfbibs.doc-1.0.0"="18ypa96z1gclq4amka28sv26pm7lycak68zf4b3sf1bx4ldnzmxq"; +"ijqc-1.2"="0h67131gbqr971hln3imf3dljh5jaqmdp23hb60zxnlxllf6msjs"; +"ijqc.doc-1.2"="0l0pvaiqgyxk5fv2carjhvp6f45clrnah5sla7rdslf134d8ciza"; +"inlinebib-22018"="0v37ifnjpvsrcbrjd57yk3qqq195jqvr1cgvfz2fsrjrd2ima822"; +"inlinebib.doc-22018"="0w4j64dxh11fysqpkldksv2qg816shz0dj16jqgbksxkjsig1i16"; +"iopart-num-2.1"="1fx5sw6xzsamlrnm7nl965xrgmgffq85kkxr7ayka1w578p6f8jz"; +"iopart-num.doc-2.1"="06hrw0c3arhssabm3l6fhb1kh8bg4vp5hpafqlbyz064a60m1p9y"; +"is-bst-2.03"="1acvwcg568iv9lskld9hjnyvqvlsmgnbg2akrd59kmh8mmbkydk9"; +"is-bst.doc-2.03"="1hlprbjkamq1w3f1n2dzayy9v14kxj8f1nr6d3z99c7v7kg19m75"; +"jbact-1.30"="0z0x6jrxaayp3w441r1zwlqirvv23g0b8h9xgy6r3ppi71glzqvp"; +"jmb-1.21"="1a5nz825jppq3pl1263w2sbm0a48kmmndppfpp7vi69n5j2248dy"; +"jneurosci-1.00"="0ywl1nlysc5fk7v5cdmy5g5hylz4ll20nnqxsvymsxnayjm4civ7"; +"jneurosci.doc-1.00"="0a8almw0x4b7v3dsdi9cjv8vzg518fl90zyyxn24p614w3zr01sj"; +"jurabib-0.6"="18s5jsi5wp0cac968ysqajwrway4sv1scf6m1g2l86jkp8gl6jm8"; +"jurabib.doc-0.6"="0klv7f8rbcw9qlqgpylyh64ir0zayf5ralpjd26g85w1pyi1c8m6"; +"jurabib.source-0.6"="07s3z6lxhkizgv0wrz0iiv1443dfyz29x9wssxa6y5lg72w279fj"; +"ksfh_nat-1.1"="1qzn0n19lslf2qg8fvm844xx5k7s8a275a77z2ynbb0vs1w4prpw"; +"listbib-2.2"="09rs3zkymlnn9fgsclnfpn1mrmxnqy8kd5pmdiphlga1iwfj5z11"; +"listbib.doc-2.2"="1nz6p8z4yvh91hvk02y184xl6fd8pyjlpjmlv5zpmcjillv176yj"; +"listbib.source-2.2"="14jrkykx2myp5fghh9qj66i5g291azm6cihi12c53bv1ijcyl1ik"; +"ltb2bib-0.01"="0glj7g6zyvm08paszjk45kp65aac6i3f8spf6zn12idf1h0b76j2"; +"ltb2bib.doc-0.01"="0j1p6bcwwgz00n3wyv3vm02z295sj9xf93v946k1xrv5jc6pg6lf"; +"ltb2bib.source-0.01"="0g05r6b662jx2s2kal26b3lv0dd6r54fb8m09yv5d021y1fm2nqg"; +"luabibentry-0.1a"="19rvhs12gw5vdq2vvcdzbz4qd3y87qjvl9x4bcqbncqcvwg82cyk"; +"luabibentry.doc-0.1a"="1raq564ad633c0xbwx6r9hhwmx1r7vis283rfh67lixq3prl0nfl"; +"luabibentry.source-0.1a"="0gqbmg1c4wm57ga8gx9g00dfbczfvhqsyl13q0ba451d3kmh6klg"; +"margbib-1.0c"="114ifix2wa74ix9zz1ml9bpyd0pqzj2983h29n3h425yq98aiqs8"; +"margbib.doc-1.0c"="01zam8vg63igvhdzf3gwgm3gjrnd23i8ra2cwdj4w44lcvapdlss"; +"margbib.source-1.0c"="0qjpbhs7g4qdhna3kmlv4pg5fk0b3xwpwagyvnl91gn3q4aml4s6"; +"multibib-1.4"="0ma2fwy3p9b6ijf727iw2xqsadk1jvh1g27snqvyrzhz7702b6xd"; +"multibib.doc-1.4"="1mwl9yziadzflq29nwv7bnbdb07d8bsxl16agj7ydmiw59ykv1xg"; +"multibib.source-1.4"="1g4d3hf8s1df57yhpw04j6bgc8n7hc16dc6qz8jcyj264vfv6fgp"; +"multibibliography-1.03"="1pmvlk1rvr98ig2zj2mgq91a61l0hib9aaly2irfzl28m092r3fg"; +"multibibliography.doc-1.03"="067wp2cmmrcgwkaxy2ngmhkfbiykr1lr0zii3i6xyyd6z2aidrfg"; +"multibibliography.source-1.03"="1p25yixvajkyksrbl8zax1jrb292prpjm97b6vh74v478bk21kgv"; +"munich-15878"="1dns8n2xybkf1m3j82adid2nr8ngvg5nnlxr5ky8ha706bmz1lra"; +"munich.doc-15878"="0dzwmrv636nca34b39mpxyhh99sr3s5k2rkj7jwms2knlfn81djm"; +"nar-3.19"="1nwk71qirapkg3h6jwlv53fm6zwb2vq0fvmc4xcanf19sm3331mk"; +"nmbib-1.04"="0kmrgd4w63x0f5j5l624j53mhivc7wllzi346c3ny7by6h7mh8in"; +"nmbib.doc-1.04"="0fzg9jm7hd3zx5naf487xxfyg2yg0w9wmc60265av5v97qkghirx"; +"nmbib.source-1.04"="1m3pnml7wdk0p6vqiyxssqi7rz0vkcvbd2z63wqy28r78w9js34x"; +"notes2bib-2.0m"="02iwnpiq918izkssa8j7fiz2jbfjn87xdjh9spwys98q2cvvxd53"; +"notes2bib.doc-2.0m"="1md7zvcnlb2sf8zw0vlnsnia1l22gr69jgksy5yg30jis3zm2gjp"; +"notes2bib.source-2.0m"="1fb70w9y6gj1a0y4w3zd7yfmk5gygx10y8xjmdj06ky7k0r87qlx"; +"notex-bst-42361"="14r3q4z35k5n0rl2igjs4lj5ic4yd14xksg1qam5klb6raaf1jkh"; +"oscola-1.7"="06jgk12q9hmbqcmwb837n8l96f3bafc7mgnv4v9amnh4ajlg6i5x"; +"oscola.doc-1.7"="0qzn7d70vl0lxyql152pzzhi72ivdslmxvfwr70186lh6fjxr4nb"; +"perception-48861"="1dqr68wkf70aj11g4ywr56si8g82bxi2xc9zdnw0nm0wbimy5zv3"; +"perception.doc-48861"="00g96wswsnpd0smv1s23hqiq4lg407m80nybmig4ibcrafjkrqrf"; +"plainyr-52783"="09py8psdqqnxmq2nkczxz092668zscvf9hbr6fcvrnj0blvz3wxy"; +"pnas2009-1.0"="0yl475rlfhlnd9d0pyzm1gj2gixrdzyn6858j1ndvkhr8vc055ns"; +"rsc-3.1f"="1ljdc1qyy9ziqsq2z6p13jlspjpalbkk9i5xmqrjwhbqz88fa1d9"; +"rsc.doc-3.1f"="0ckvfgw88jhfr91ii6zahrziigwsxfaz4f9rmc7ca2a5vk5yqc90"; +"rsc.source-3.1f"="01v5zc947vqa8xpsam5pyg8vxm4yygphyv5hji0r5dmplak0q5gx"; +"showtags-1.05"="04m7f6i3992p93xz9rlfa0vnil6h9dyk7gy1v7ih47f1m2awjak8"; +"showtags.doc-1.05"="0i0iaz4hlgf52g68znl5a3q366hd8ygad2khjs3y7hk1fwqpz45h"; +"sort-by-letters-27128"="0gjmbx6bk2c3nygcbvwn3wfsdj1lscpnqzfl6w8li26hws1ravii"; +"sort-by-letters.doc-27128"="1p0dfvh0l4z4bd86wcvph1fcjip2rvsm22j890y607lfbqhc72kv"; +"splitbib-1.17"="0z2vnb51ksqp3i11903mvgaknvxl1azwqsch5aaq14y7fp9kcrah"; +"splitbib.doc-1.17"="1vb7snjy518hcv3x0cvr40bzlxr0nqb1ssqagqncyzzpg55nv9gl"; +"splitbib.source-1.17"="1sgl95vwqrp6k4y355d9mwkqm6zpw0g69p87hnsmdbd9bqkjvsv4"; +"turabian-formatting-58561"="0bfl9fgj0adpcm405a9b1819463nrzqplzzdlvwy6yanyqfqcp3i"; +"turabian-formatting.doc-58561"="1dam5fm94hdyzi4ai0wq03pkarb6lbrykych3ixcsz8r2z04g7nx"; +"uni-wtal-ger-0.2"="1jyba7g6qmngn4lx7mrmk0j190zkjv8lw775w13hxr2yky31cf1z"; +"uni-wtal-ger.doc-0.2"="0kncfbrs663qcpc0nsfhf0asjri8103laj9zpaayk3by612lfgj4"; +"uni-wtal-lin-0.2"="1rc0dc1g1fwhz8qa550ykc8azzc4i748jh37a8ppgrf4x2lgxzjq"; +"uni-wtal-lin.doc-0.2"="1ja9a6fjrlh1lbjkcsal7ahw24w1gs1mzma6jiiw5p5kbmc4zpz1"; +"urlbst-0.8"="1l34pkg2m14k8qck4mrgwkgcci51b3ar6kld5rsh26qqdw7yfcav"; +"urlbst.doc-0.8"="10bckc81yrjg2cilm7d72l8bz5ds02hb41fi0pcj657345rsv7sf"; +"urlbst.source-0.8"="1wsf4q095mb7lqsvj5gx0vh54bvm4jlmabdp3nmx2xy4nl5f80fm"; +"usebib-1.0a"="1q38qzz87nh2hbmml3b0a4919dgk6d5rn0z5bhrc4ip27dscvw07"; +"usebib.doc-1.0a"="0byl3xhiz3b4hqqmq2wi5fdbshh5prvqfnhjcgjk619bn99cijxm"; +"usebib.source-1.0a"="0asby43xsd35aazh2sncg639x91f91shs25f6f1127rskx5fd7vp"; +"vak-23431"="122crp1ipxwmxp6pd0x04dxnaf3hb822znbx8v9gh93x8db4khf2"; +"vak.doc-23431"="1jxbijc1kn7mx1p167zd5rdczayz5xxxfdd2pwbsmav8zql32aqp"; +"windycity-57577"="07bcpb8v1i3d1pijc8y3dcq239m7l5x25kg45wkz2h0m1cwbyh17"; +"windycity.doc-57577"="0qz90nmpy6lig06i9qn8qpl1lyr1znw71kfkfwq9xjna2jjq1lz8"; +"xcite-16383.99998"="0zsfyaxs0w2xy6fa1s6hlrcnzw1q9n4n676bv6j80cwp5cw7nnhg"; +"xcite.doc-16383.99998"="1sfziwn05dii3gviiahvmg67kb04hzhz4cd1cwjsrrvnjii0dqb5"; +"xcite.source-16383.99998"="0j5blcycs86vgmi54z0b06il06zzyjp4v15lmdwfnx0amb9y8jr9"; +"zootaxa-bst-1.0"="0lwin7dfd3nk0r3drznmhkqd7fhfvizxqy3z2xv616spg1jh9sgj"; +"zootaxa-bst.doc-1.0"="1s4v9azi1pvvh1fizp2azkbwh35xvqh8qcnnn1xwi0g1xhcp38pa"; +"a2ping-2.84p"="1h9i49m7v83ppifkcr4cncjfkrpx0hs8b11qyjn9s9y4mi8ra0w0"; +"a2ping.doc-2.84p"="0yxs2va1v4s6picfqkq2k9l7295np46lc35yx1dcmddy2667k3kl"; +"adhocfilelist-29349"="08fnrvnbrp7534b56hn8w0nm8pbgjli62v34mkalp4qkfb559kh7"; +"adhocfilelist.doc-29349"="1n7nah8vr691k56z0jkgyav4lc8w45rlg8k9shhqhnnpqi8zxv1m"; +"adhocfilelist.source-29349"="1xl0f33yhmbsrnmy9pby092js83vxcdaq2gfny08pjlq57arphr4"; +"arara-6.1.0"="0lfy3sp7zlglsgyrckmlj535sm0wvy9g98kszrvcaw64vfqswsa9"; +"arara.doc-6.1.0"="0xyiirkan7snj78qv5q7841nfb9kbcjj8j9fa252qlg1sx04pf3w"; +"arara.source-6.1.0"="10qr2izmzchpq1p8aw301da3483d89d1bvkph7a8ppk35952g49p"; +"asymptote-2.70"="1a9m3rkmsw5msfj289931x4f6j5lbz711avx956vi0kn01ppcrs2"; +"asymptote.doc-2.70"="0cbcr51gl3s2g2aqh60jsp6jicvvkdl0hya88wkkjanyw3dzbv3z"; +"bibtex8-3.71"="1hi24b8mmpnz17cfj0p40ipyvzqhgkkhhgh7qkcgr1bz9k82q7sk"; +"bibtex8.doc-3.71"="1acay8y0l6gnczznxprl4h3bx7jaxdqrczyvdgin5z8yqhx0q13q"; +"bibtexu.doc-52851"="1h0kh81vf5z752v1s46zs0qvlqhqqzq8ip427317xhq186i71ymw"; +"bundledoc-3.4"="1x5jh8qi3xd4mja7grsyy1qd1vd389dzikxk9b806b5lhmzhlcd1"; +"bundledoc.doc-3.4"="19a297ijq3cw2k7b9xc2f0rmaz05ygi50r3c3q9pj55yfrsysfi2"; +"checklistings-1.0"="0hs740rpar4jckxc2p8wwd8x39v8bghgc2jjrbca9m5zbr0prvpg"; +"checklistings.doc-1.0"="1riyj6x57jb28sjswnnfyqf80jnkvyr2cvckav29j9ni8l970qp5"; +"checklistings.source-1.0"="1ghb0pv2zmznyg12zqgljwd2pc5lbajgdnzr6zf2rrmvlrsgr38w"; +"chklref-3.1.2"="1045jsyhp39js54xmyr1wxh7qp3z5hzasyqi33nvrc4g7rb9126j"; +"chklref.doc-3.1.2"="0pmgdkdn930lzyn8j3diwwam8c7ikm4fga3fh1vpigqddykj7hqy"; +"chktex-1.7.6"="0ij96wg5j3grphp71f3casa8nlkfia7hz34njvi007pzy00kgvr8"; +"chktex.doc-1.7.6"="0ln3in6f2j0bbk1n2lha7s6mv31cqjchbg1ck0cq10aabhvx9fz9"; +"clojure-pamphlet-1.3"="15q1hx198bxr5ip9ssfyf9wbccqrgwknijcbnqsm9mp082d0vc1x"; +"clojure-pamphlet.doc-1.3"="04740xhx1gd88x7qxry0vw186dzqf8p44kss4z4q6bx7dyc79v97"; +"clojure-pamphlet.source-1.3"="096whv58b2g15m6mzg689d0mp6p9yvj8z83w431zbg204h0kx0w5"; +"cluttex-0.5"="1khiy9ih2ij4rb6mpgnpvbkg93fy9h333j5sfmbmfz0q6jj7cpzj"; +"cluttex.doc-0.5"="0zjcdmz6x8g2c5q5kds9hbs4x4a8fmr4z3j3mily8lqzqfnvkz9v"; +"ctan-o-mat-1.2"="1iya9r04n18i8jdzqkn2i1rxfxxmpzcpga03rp0i6ykjj65v4q4r"; +"ctan-o-mat.doc-1.2"="1j053gvvcznrk0fhg21ddyx1b1m1xj743b3w8z01lpjihihzq0l8"; +"ctan_chk.doc-1.0"="09ngqgs08q8bld334jrzhnd558lv7fajfppmfrkp4kv9hc5iyz9a"; +"ctanbib-0.1d"="0skwvk7khk4w4sb17a47zffp5bhd0fy9lqhfhd4ki1dxzz94kgs7"; +"ctanbib.doc-0.1d"="1gk91x395bh4ylhg1vm67w37a66v7xwj4cgzrffm4ld91sd35dlw"; +"ctanify-1.9.1"="159jchim2b5idpzj5fxxc9hvrbddm6n00rpqsqffzdiijvp9jbif"; +"ctanify.doc-1.9.1"="0wnyp4rl4cg2wgaq83xwm0vzm1b5xlgbrjchg4s3glh2zzl4mpg5"; +"ctanupload-1.2c"="1dvqr96ir3gakxrf4fk0dka80inl6aj3kydcf0128vlq168zgvsg"; +"ctanupload.doc-1.2c"="1gzfib72lfbgzcp5r8130k1n2d00v2kds0x8zdkqnikn22fq4jxm"; +"ctie.doc-1.1"="1xz0b4ja9vmx42d6391zdvrfvvnn82qb3xdjhpyly6b9j02bbq3c"; +"cweb-57972"="0ds2kanfw343zlyc28sfmshp4g1gvdvnhqlil45azjaqyz3603w1"; +"cweb.doc-57972"="1qhszwv7lqxxg3v5ddsa50xdda2cs9dlx8h0i46pisnik4sg71jb"; +"de-macro-1.4"="1zlmrrb1x4sm0y6igxxcgh7drf7c6rqfgm8pk1a7bfv5fdmv4fln"; +"de-macro.doc-1.4"="02zxl4xpbyjs5vwg5cskgfh3w2ls2bxlyn50smh0kcqas46vn9a4"; +"detex.doc-57972"="05hgi700kd7072h4x96bc7lx2p4cbwlfgfkmng0jdssiygkwrmyh"; +"dtl.doc-0.6.1"="1fjk69m1dyzhc8arygk26kwqv1p1yac2l9pca0x7xg3awc8nhgp9"; +"dtxgen-1.08"="19c9w97wjyrq6g1j8n8qgaclx141lv2j6z6l5h13gmkmyw08vwhh"; +"dtxgen.doc-1.08"="04z9dy0aada8zsp8ckz3agqcsm29dnlx770xyl51rsvk2qwsxgka"; +"dvi2tty.doc-6.0.0"="17lfphwzjcfpdkxcri20xks7z4j2xd7gm6kwshsc29xw4bw2l4wc"; +"dviasm-56373"="1j8cbyzchrjcflcs9z0208s4wi415i8iycxzag0bpd3h0zl5ppb4"; +"dviasm.doc-56373"="08czd7rm2rksx3xay7hrxsqcm133dqr9jj8nqw33a2bpnz0mrx7m"; +"dvicopy.doc-1.5"="1s4ia6034mdzif2lq9jwwcd4ai5il41yyv7h0cv9cxdbmra8ck4n"; +"dvidvi.doc-52851"="1w153rqm7nlmcf6162glxz282nbb6b6hjf5h0p7mbzr0j1357sxj"; +"dviinfox-1.04"="0c2gv6lgh4r57z955zdgganifr6q3z0gsgdcnvfpbrnqawydan74"; +"dviinfox.doc-1.04"="029y7pm218w83gq9srswb1hkdw8a2bi1837rvxa3cnsmsl5rkqri"; +"dviljk.doc-52851"="15l05cggcnawyqg38a1hpyng88qh9gck4jvl78n1rdk4qdcgp891"; +"dviout-util.doc-52851"="0niv5zy6vksm2qqqz3bjd417ylq46bxz6sra3abp9k4c2bpr0pz9"; +"dvipng.doc-1.17"="0clgfwglxqs4xgzh2d9jjb91dfm0awigg0mv1r4sbyr4l21vciaj"; +"dvipos.doc-52851"="0izv95mvzky166xpalw897z3lgl3424ixbabz5pikrhn6i2q6zmf"; +"dvisvgm.doc-2.11"="1qc8sd9y1zj2wq5lxqr4z8ybr137vi8ihs6n3cyyhbll8zsfqh32"; +"findhyph-3.4"="0b7qqz0p0l70r6dl4jhx086dxywb0vlln3r166pj0yl5jfjzhpna"; +"findhyph.doc-3.4"="0n7cpjxz3adj4bcmc1vd548lggcchhqfahdcvn4w9invw296hhlc"; +"fragmaster-1.6"="1d59sjzlvygwq9b02gbrfra4cnvmygza80b5rkghhhpa0n3xnx9p"; +"fragmaster.doc-1.6"="0j1a2d4ssj3y42f0rsyhd7yl3pak9cz12fy16k2h8v02cvc96529"; +"git-latexdiff-1.6.0"="0b7hafll82widr8vibaqqavwwzi7m488ypm5wx14y6jncfl8py9y"; +"git-latexdiff.doc-1.6.0"="1cbny4qkr8dg8vnxjnjawq9cjb0h3816ad66q8b5652rpxn3zqcl"; +"gsftopk-1.19.2"="0n6nnfn3fwi5dz9vdqk4mv97hwnyybj3wsv3bipqfsxl31yjp51j"; +"gsftopk.doc-1.19.2"="0xdb0h557sgi56gik24izsr5xlbmlfya1w93yih61a5422rv198c"; +"hook-pre-commit-pkg.doc-1.1.2"="0mikg4p9wxb28vgwh1acgdhwa2fqnc8rw3jg355d6s137m40awc6"; +"installfont-1.7"="0lszqj128c3f4wbcrvzzlvj25jl5rm0n5qfj8rsn65ycxvymbf91"; +"installfont.doc-1.7"="15x8jzcd7bwvbjid0hr56h7dw39n2rg6wbfz4b02y7shp1pn7hgp"; +"ketcindy-20191225.0"="0v3sz01qwd2pnnqbf4v8g0xwhs3zqxc9qihfa13df43rw644m65v"; +"ketcindy.doc-20191225.0"="0ch1zjmg04pdz96dhyl2iy380hyjqcscxn0kafj94aldin20256w"; +"lacheck.doc-54070"="16xahphvhdl2xmvicr73lcswm5rdmxqaf5xj4gsdv2wjfqjrp4fk"; +"latex-git-log-1.0.0"="015f1jrfnwr7i7jn6g0cfl3zs73xw30h14fr2pyjhn9pr8kd3mgi"; +"latex-git-log.doc-1.0.0"="0pj2834ax404f0nnlfbg75f2h80wvnz23s8nr9vxr24vr745xpf6"; +"latex-papersize-1.63"="0axx2lkwi1xq3qdaazhb6i7dssx8q2k0nm5vf4b9p5ldl1ky0dzl"; +"latex-papersize.doc-1.63"="1dkra9b0wv8s4f7xn36j1x1p849ziwlm4chf5mrayp0wmx8qshc0"; +"latex2man-1.29"="04m5ccx6z8nvp6z8dm7dqhqyf8h9snmaz4cvd8i8fcwfba9znf9c"; +"latex2man.doc-1.29"="11nl9ldkw3f90iz8r23jbgxaa6yq5p61f1db344nfhy0wimx15si"; +"latex2nemeth-1.0.2"="1r2nwwfjpja96ix7r2qckqh0ix1jnaackkanp0w12k9syn5ggy6l"; +"latex2nemeth.doc-1.0.2"="11x97kfriq9xwj1lnw2q3km4qg9bixg9ik03nghg4h9pdl513b4h"; +"latexdiff-1.3.1.1"="1ipi5laj8r0k72l89dymyrpw8lv89c1lkcz73innqncqahfji3yd"; +"latexdiff.doc-1.3.1.1"="15724mm377xma69cvr18dkk9q0v2fis5bim6671pw098naniksds"; +"latexfileversion-0.3"="1yy159skv29hp0qxpghmq5zmay9yi0ndkgz7lbllj1ymkgxs5138"; +"latexfileversion.doc-0.3"="0k20c2kw0xarjlkdhjyx9h9kvjm2f3rd98lz097xj8xvk0fs0zp6"; +"latexindent-3.9.2"="1j0llil09scga949f6h0xxqp1rm7pm83c5lgsmr6mplh94lhpj6m"; +"latexindent.doc-3.9.2"="0gvwbx9hr2nawmabkydn70dcr48336c8f3vz0rwy9kq3bsjnamjy"; +"latexmk-4.70b"="0gc91rlxs4jhbx0cnjr3np6pqz2myybc99bfdjnnnxpadra2xc6i"; +"latexmk.doc-4.70b"="1fraqhxv3b7jmijc66mils33jhd79m3zc6rva01vkb126qscjz5m"; +"latexmk.source-4.70b"="0v9l5qad73mnv76ccp6fnlwc7cqyq4f55syc52s9yyxs6i7jcxxw"; +"latexpand-1.6"="0n8gjx86fxr03i4pg6dwxr48f12q2s2v32pszg8qc2rw8gkvniy2"; +"latexpand.doc-1.6"="1j7s8f3iw2y8g8inm2f7a5lm1bxfv10l4zmhnfay66xi01py2cbc"; +"light-latex-make-0.2.0"="0cq5gjii0af6kpi7prajh6l6bjz8a48rbck9as3200yrnzzps36r"; +"light-latex-make.doc-0.2.0"="0y9w00qfqaa60iml5h4mqyg6452cf6h4700vqbshm0kajrwcygj1"; +"listings-ext-67"="1r5nq62k8rwllcpxwpkh2z0gcb1rlydp9nry8wx7r0h93hbmm2z7"; +"listings-ext.doc-67"="0jyk8z0nsdx2yljly8nd4g8wnw7ggi6mdjw0wb7y0mb5wq47sbpp"; +"listings-ext.source-67"="0hd117168f5s1cb2iim6y198lnh05ph4ib7p666yxvv48wr0mfpc"; +"ltxfileinfo-2.04"="0f11qjq1a3s5nxd7z9k19yhbl5219nn4fr1vfcqq1zs8pwnsgqzx"; +"ltxfileinfo.doc-2.04"="1qjs959a28cqjigdml0jgyhllyxd5kj276akz93hdbcd6gzs9ss5"; +"ltximg-2.0"="0aifhzn6gmmbmdlf7kv8dcvjdn7xs8sc4cjv6hpnzfrjy290na3m"; +"ltximg.doc-2.0"="102zvry2wj1hq47k22ss3i29m0f06cdcsjysnvq0cpm5225mgf32"; +"luajittex.doc-57972"="1nqhgkh91g3sdsdysb768vw01ikbjviwlmhm4j2a2cdwxp81hffd"; +"make4ht-0.3g"="089vcp6pfqzf9agghvr70v1qiq1zmqqmzgbln8a3dn5b7b5fv09y"; +"make4ht.doc-0.3g"="1qjdq862mlaqkjqx36nvid8ph126i4fmvb9xin4qszk9j5av6b82"; +"match_parens-1.43"="0b0vq9lgr9xxwvzvlhlky7fg66r2y1qhikiywddkd06rmw71yvi1"; +"match_parens.doc-1.43"="0i8dnjn5kfqhp51i255s3q2cd6jwzqy4rfdrhaxl15dhj4il9k7h"; +"mflua-54074"="0ngbhdh8hgpjfqnrjlnp27x3qziks3yf2zp1qq7r4bjfa5jx9gr6"; +"metafont-2.71828182"="1kw37drhnk7qajmivvjwdrh5awns571wclv8b354zk71axf6cr35"; +"metafont.doc-2.71828182"="1aw460fzh0c8kwfsn9f2afpmaymb2krjjr67wzx28w56f6slarl7"; +"mkjobtexmf-0.8"="19nxq3k9jf4bypk2al38n6igpca369lxqcn3da8cm8c3m511nsmm"; +"mkjobtexmf.doc-0.8"="042a29h6sq9mpy6chfkl6893zcpb3gd3gsl60xfwglivib706qwz"; +"mkjobtexmf.source-0.8"="0q2i2xgpnjcx8qdkk47q7v0lmjdv88jjvl7zcybnhcaa9km8f9na"; +"patgen.doc-2.4"="1nc7m02ygwyphfy3d1ifpfdcdfmvzl6g75nh2ydgxjw0xhck8c4w"; +"pdfbook2-1.4"="027mgmbd3gnnc6gqk8vjnz8j52cvx71z5y6flrc4zd7g0syivdad"; +"pdfbook2.doc-1.4"="0al7sc4rxwd7g1cmyh8v4qhmlngz19f0f08x8n3wbfnvk2f8n33x"; +"pdfcrop-1.40"="1pmh9zjxn4xplnwzl5rcb6g7lkqm19kzd1dfm08992c719clx38q"; +"pdfcrop.doc-1.40"="0qayjkyn9sb9r5cvznpml0gd7vwpip0kf1b9r4jrd4vyfqkk6qqn"; +"pdfjam-3.03"="09h4s1kz13migq0slimh805pvnbfaazv9y6w1q5bcplyw0vibn1p"; +"pdfjam.doc-3.03"="0zpj2wzkx4mzrsmr7j0qx3zmq04ayxmdgj05a57pyc7gj7kwmb4q"; +"pdflatexpicscale-0.32"="1z19y34c0x05yp49jqn0z8i3ghv0sz8zm0arb576rz7mskpivjqz"; +"pdflatexpicscale.doc-0.32"="0d1zzym0mgsbicp92qf60fq8l2sdbdx47517k9pj3v8g91svxlpw"; +"pdftex-quiet-1.1.0"="00df842vapzylgavkk2c0j8yg562n2jawwznvyf3qq6dznwf1chn"; +"pdftex-quiet.doc-1.1.0"="0sa2gs440h3jd5i51hhbfvpqjpfwvzz5m32x3ld5q9k6zi88b395"; +"pdftosrc.doc-57972"="0jw910h146s9fzr5z1jbc6kgylprqfwl3ab4pv27p3p86rnrz6p6"; +"pdfxup-2.00"="0shz9ivcifvg12y7pvq7iv1d5d97i0n5xw0kkjapmgfcvf3f1kng"; +"pdfxup.doc-2.00"="07d7vnbgbz7yldlmz7hsbfsfnggbfgwryrhh6gq6l7i2hjjis60j"; +"pfarrei-r36"="1b3jbb5ahwr0sgbgckmrfwbk3ir1g41n6j4mybc78iisxnqrx0br"; +"pfarrei.doc-r36"="1jrg8k3n0mfc157nmv2n1d4b8aijvgr4av90ds0g2m7px65yd92z"; +"pfarrei.source-r36"="1jgrhv8xgai1y81ddnqcrifk8wz47asvr3mh615wgsis38y6k2ny"; +"pkfix-1.7"="1sgss755cf1zrpv3x74x5qnqc6w81cvr1x0w7875ijh4c1xxkn9v"; +"pkfix.doc-1.7"="0bxijxbbj9v4c5p1rg4gkqnm75rq516vxln6s6174ph7abqrhvys"; +"pkfix-helper-1.6"="0hf9hnjw7ws0mx9w5s6ik17zlq27fyc3p9bgya1wxbh8lcvrygn2"; +"pkfix-helper.doc-1.6"="0fh59nzzl58fgpkkfzvi603sfsfnqrj8s39k4nn97567gpv4a22a"; +"purifyeps-1.1"="125dn66xsrnv4acvk2mbwfl26sy42jw7fngm3p8qmzya93sp0vwl"; +"purifyeps.doc-1.1"="0lzw7ajxkx78v5dhlsddb0ahq6a9975f4mzmsgp23qczmz28878w"; +"pythontex-0.17"="1hahcx7k67bzakifbavqclcy1wdl5w5h68insbg736jxbfz98wvf"; +"pythontex.doc-0.17"="04xpslmv41chz7g0nxkz2gjpg67s0jlc33jy9mnwl789xi4k7832"; +"pythontex.source-0.17"="04a5809sx2qq56c394g36fw6ygf3wi3khmqp56lw2yrwhqmhph0a"; +"seetexk.doc-57972"="1bhv5xgv8jpam5apdybd0cggnvcizk2r6zs7lim1hmhzafpqqlcx"; +"spix-1.1.0"="0gqvjc05sl4hrgflb3xx8ly2pmj7r7cv86diwpz65gvdvdq0iyzx"; +"spix.doc-1.1.0"="1mggb1nirihvcqqxfjnsc5jck6qwqz0n1vzgnlyfxqgja6flad8g"; +"srcredact-1.0"="1rqmgpxcvvcmzxdj6k15v8z4i4iq4wv95whddpi93l3n0zv2ihmq"; +"srcredact.doc-1.0"="082ff60lfnapb570ps3g6vjy2xn0gjjih6y4nm3ry9i0k1isbk0w"; +"sty2dtx-2.3"="0l948m9xwn6pkxkwfcay98vapqa1p77rkjijyv6wqkbxr7zxh1i3"; +"sty2dtx.doc-2.3"="0ngfnvbznd1gyiljapflbgw9iq91jrcvjxxvaqcgfh6dilbpy2gk"; +"synctex.doc-54074"="13fc91avs09za1y5rrn50wfr2bf1csnf3p4dn0r3mkny46bdfw7c"; +"tex4ebook-0.3c"="0dgai37h4ssmblk1cg3g0js14mghivxbrp54ffzg5vznhi3b7s9i"; +"tex4ebook.doc-0.3c"="1x4x7b8rp04x0g0dcrnn1lx3w868y2nfya9y7r1aacq2kmxw6axh"; +"texcount-3.1.1"="1bi484kbrcfx3hyflr4f2w0plhz58p2206rz4r1wjllhhhwzc7pl"; +"texcount.doc-3.1.1"="12a3j0sk7nysd3bd7mwnbifyrcvjjkfjy3b8f1caf6k0pf1mz8b0"; +"texdef-1.9"="0wi60appvgs0h5690h8qqvcmsq2r6fcxais2jqps92ryy41s2v68"; +"texdef.doc-1.9"="124azfh1332lq18g40d291gczx2agh2b1cxq07ldmizi8pmvjaza"; +"texdef.source-1.9"="0hanvqdj2dgpgl3wa6sz3qa542882h3mv9709spl8q2glmyip5b1"; +"texdiff-0.4"="1jjzd4grr3ip6gd8xmhlawhdcjfj1sqfsa06rxrpziklwirw6bq4"; +"texdiff.doc-0.4"="0f7q7cszy6ca6fmwzi7fn6p72szgzyj9fldvzz1rk3ywkhsnpakr"; +"texdirflatten-1.3"="0q2m138gpk9cvfp19jvsw746mkxa613c2204qfxw1bxw8b454d7m"; +"texdirflatten.doc-1.3"="19iiznql82a34d2yhzqcp339zszbhfz9fh0h4mb11696mj8rx3v7"; +"texdoc-3.3"="1l46wg9pp0aw5qrx0vh022n5xx269cpr5ms2qqkkcihfh8dln0jb"; +"texdoc.doc-3.3"="164a6fvh75six3bmssq84ax781l9zy9nz6y2fhzcd1jy5hqvvspd"; +"texdoctk-0.6.0"="1k0gl06da0v60hsp2saphkmr2ma5yf1g6azwdl33ddbw4r8ssk10"; +"texdoctk.doc-0.6.0"="1k41z2lbfjsar5rl47xnk1adbcnnb4w97bzbgf2rnjhimd1gn9hq"; +"texfot-1.40"="1005cj268ciihv5942wrn4yqizrkq8vcyn9cqb1wzn228dzjqhjp"; +"texfot.doc-1.40"="119a8l3yah2vnp22x3r0d87plhi93f9c0mmgpa1zdzzlghnf8s69"; +"texlive-scripts-extra-54744"="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj"; +"texlive-scripts-extra.doc-54744"="1svrpyy75ksx0777k6mn6a3c54kcqlf92fnfn10x8wkvv7fkghd3"; +"texliveonfly-55777"="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3"; +"texliveonfly.doc-55777"="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx"; +"texloganalyser-0.11"="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r"; +"texloganalyser.doc-0.11"="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0"; +"texosquery-1.7"="0jszy2f076hrc29kk8qcr9616hyk2cvys3kg2qfhvblxf07ziw62"; +"texosquery.doc-1.7"="11rz21m720pp97vb457pxaq5yxf3j4v8vfcd77w0bjpc632lh1xx"; +"texosquery.source-1.7"="1q7spgr1xk2lnx2xqksjh979n7r2v1n1441fkrc479zyi69ncn33"; +"texplate-1.0.3"="1javijzp7v9dyjvgfb3prshryiw7446mpzdn08hd8czp7f6c9x8q"; +"texplate.doc-1.0.3"="03wg5ckb3zjdghh52f0i7cjwx7rrgwxw9av7xsa8zi0qsyh5wgcx"; +"texplate.source-1.0.3"="1pmx38grc50fszsgkbpb3p7jxy0d1hfpr5m4czvkzjyzgapqfi2c"; +"texware.doc-57972"="1zv8m1y6gvnk7nbqmzkvg83iq1pgncg1qvxg572pxnqlm0lf779y"; +"tie.doc-2.4"="0lfjracp8ifkaj0pyg4i5lccqwybsrgxn11ji3p1g6kfxcy5hmgn"; +"tlcockpit-1.2"="0sm882jxczx8q4dvqaxnyb2wzlpxd249ayv77gj9vgq4lx9v0l27"; +"tlcockpit.doc-1.2"="0zd8hx3f6jhm5rklhr5dxb84y17p4rbgwa7wh95ab5f6n8i5pgwb"; +"tlcockpit.source-1.2"="0kldzbbyjvj0n60jgff8y6y27nxnzihjyq10gnx2gi62qn9bia7i"; +"tpic2pdftex.doc-52851"="02nf2fg4xzh8lbbddvm44qyvcvfn5b7kzcyg729a58l29gd88pbs"; +"typeoutfileinfo-0.31"="0w48qf9d7qh57s7b1745z6d5abc8rlgcjpmf402gqxv636589dcr"; +"typeoutfileinfo.doc-0.31"="1pffnydxqlkjixa71g09f7754ay0gnyphay51dys9gvvmwzv5npq"; +"web.doc-4.5"="0ssyalwg7jb01pmbr309n656paxcd4dhrr1m0m1iwc70ml70k5sp"; +"xindex-0.28"="02srw8v22x4gcm1j306agd9cgpv5mp6bjdx5jvsirq7914fqvfxp"; +"xindex.doc-0.28"="1rqb81xnswipw6qakzm4mhniqvk0iqyzw8y25fs26p64k9ch09rw"; +"xindy-2.5.1"="0rn0s6m6zl0j5vak7rrzm114kb7cr82rcln0rq9faby48isxpynq"; +"xindy.doc-2.5.1"="119lq9mqczsh1np0876fz4gdfyq1rxmc0ghaqyriwl4fzj6lka1n"; +"xpdfopen.doc-0.86"="130wvaypfrg9sav0pdcdy1g10fll8pqcsqsy70fxlzzr937glsh1"; +"context-58167"="16ba0cbqz8w513yijaf8ka9zinzakgvbkpibhilnvmlcsxzcqsk3"; +"context.doc-58167"="0r15aa12cm049ly148sd48vaigqh1z9mbasjf8xc21ravq08jq16"; +"lm-math-1.959"="0vsmzr71d5iqhr9bwjnp7khzlg939mvfnbg846854cxk8wfm9hzn"; +"lm-math.doc-1.959"="1j6jcki1hxdr17njy8sfpb82mxh6bpllccf3hnjvylvpjf45nxm3"; +"manfnt-font-45777"="1cdd2a3xj00bwsby9z5iz5f2iy2iwsjl35gcack9q83hacbf3ssb"; +"metapost-57972"="1sk771ll9kv7sdrgg1xp8bmr1c0yd8g2g796pzyksfrjzbvs6fdn"; +"metapost.doc-57972"="0y7wfxi4l8dbmfmr570x3gx268nav4zhhlg83qv7blh9p8x6h822"; +"mflogo-font-1.002"="1dx834zwbrwgp2v61fagf5m4zmxf2qkhib4mkpw6iadcgfqv6x7f"; +"mflogo-font.doc-1.002"="03b3qg42axqhs1lvm3pz69m4jmhd1385gzg1sw8bqyajlrdnydyh"; +"stmaryrd-22027"="1vvnhyk7fq6kh1jb2zd19r6qq1j8zzp14gyrqvw7yqm5amjff7fp"; +"stmaryrd.doc-22027"="0dvcn4yw7qlb7gh3b3z9vk4rx12b1086glkk0x21cks87kphdxib"; +"stmaryrd.source-22027"="1wmn7bwahn28lwipkpsla74wn3a018808rmh7yvxdkbxfbzcwqcz"; +"xetex-57972"="08l3cyxr61pcr1791d0x93qzd9pifgy842ij3pf3sing6qp3irz1"; +"xetex.doc-57972"="02f44pj53aq3wc6i398sa5a64c53i6gc9h0k14alr6qmdbkzw1ad"; +"xetexconfig-45845"="1253njshiwdayzq0xir9cmbi8syhjb3sc4pyrw9p6kzyqvckkcxm"; +"context-account-47085"="1j1rvgcznn8c637dayxpdagpwjq6fbn52sjmrb0wn4gd4b4q3nk8"; +"context-account.doc-47085"="0lfx6aa235jx7sz27qh0328n68ra3z2bw3dsh5p2wzkg1wxbaa6g"; +"context-algorithmic-47085"="10rj0ac7gqzqmqndvapnhn0jnm2538r5bzmhnfqia259qs2p0qj8"; +"context-algorithmic.doc-47085"="1s84vb55yhxlw6dvzrs4y6bf2cvwp6pp0mhy778k5zyzh2kcfzqy"; +"context-animation-47085"="1cy0jc6wk9kfxahndf82wwns4dhn1nbrxqx8v5bfb57m23id8vff"; +"context-animation.doc-47085"="03mdp7233r9snsz5g43h3axyhcf4vgpivfhfv4fy3vh1ya5fx8fy"; +"context-annotation-47085"="1c2jgc8r9b0inqa5cslmxhrqzh23jkdn9s9xq1q3v5qvlh4vcn73"; +"context-annotation.doc-47085"="1a9ba8l6jl7hjaiv5mmf5jvsvxxj0y6j2s222qaqa62crcbqc9g1"; +"context-bnf-47085"="1g8gdrqaq2iyc2aj4a3a6abs3vkcbkh44y6mnbjq55pl45ja8wp8"; +"context-bnf.doc-47085"="015wnsmz8fyshyrva3n31iz6hbifszi6cxgixlq17nxkpcnc5899"; +"context-chromato-47085"="1qf3a4p63zs4sr5acrfnmxdagf3x04l7rfd9d7pfcmq261fqsy3z"; +"context-chromato.doc-47085"="1w807zh4s7bbsx16v3h5gqc1wg9v92dkg9anysbsh1m9rc6hnhri"; +"context-cmscbf-47085"="1l8c4jcrwmsacr712zql2rp1sirjn0dwbn2r0w83v4fhrpyfifl9"; +"context-cmscbf.doc-47085"="0nim43d7b7bv8xmarilzhm4al3lngvlf7cwazhkwpg80zqzavb4c"; +"context-cmttbf-47085"="1pr47vcz2ix9s3nvmi015bh2w52gayf8962c025vhh9brinxdzsz"; +"context-cmttbf.doc-47085"="0m71dv1rj1dji5skq2pyvlkq0sz3w9lyhn076nnmvjkq8vh9gkpk"; +"context-construction-plan-47085"="0q97h6lz072gfbnlv99r570kkba82qyx493flln24rrs7js5szmj"; +"context-construction-plan.doc-47085"="0pmvwb3dax78wa6v8amadxr36fs68wf3rq5k54sfczxf6k93sbhw"; +"context-cyrillicnumbers-47085"="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2"; +"context-cyrillicnumbers.doc-47085"="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73"; +"context-degrade-47085"="0r7bgy2fliqhywgqc1blcabmhjz3g0ys1rfk8mggkh7908lvvlmp"; +"context-degrade.doc-47085"="0d0fy68hk20az7vh2z87h76hc8x1hmgfl1r5saxg54l20a31a96j"; +"context-fancybreak-47085"="00zdyzfb70fvgrdna9z4958pxhmjv85jxl5vhfryprqkrbw05pr4"; +"context-fancybreak.doc-47085"="15igbqj52g2ybpykqzkzm8b9gqayccip5p6srv30458zmxhci9jw"; +"context-filter-55718"="1apna9ll4acvg8c1rhgp2fzrfjrr1zx65x865f12mgkh68m0ng4b"; +"context-filter.doc-55718"="1p6iah7wk7nk50bhiqssd1vwyvm8y224a4dlxjplpv05ksjskwb8"; +"context-french-54215"="1wdn7ajvmfj413x51v0zcnbibr4378s1sla7f097xllak9iyd9yy"; +"context-french.doc-54215"="1lyi3hwijhc0jl93ygldpjm44fbiw4c7zky2ydrm4s56l3di2sil"; +"context-fullpage-47085"="0i7cwd0q9fcdnh58w6hgdbnxxwv8g01nk33j7naqwc0f087az7qn"; +"context-fullpage.doc-47085"="0pyhpp94adp1rfn7pl7fwa03n119jp455y1brmsww9wfpniz60di"; +"context-gantt-47085"="1x3glv3nanxic9p0xi2dqz6k5awwbhxzzfnj0d9sqwkcr5gfa8h0"; +"context-gantt.doc-47085"="12wbzw4j11fsx412qjjy0g36hq6db7f61937s8k8qrqpgpfjaz4n"; +"hatching-0.11"="11sdpa2fbxqz8diiwyjvx5fwfycby0rdav6941pgfbzsbqd3ys62"; +"hatching.doc-0.11"="1fq1wkq7q5f8jbhx7p49jnpnfprb4z2wmawyjbvcnrnmr8jbrdny"; +"context-gnuplot-47085"="1pahxhbliz6fsj2va5pgwcs55b3rhsmfnjb9qjxkz3gqzrzdkfdp"; +"context-gnuplot.doc-47085"="0l0qp9c0yvdrf8398wyac98ghrdc86lxgzr5l327gmgnk8572gxn"; +"context-handlecsv-51306"="1xx7jq1lqzgnm4jicc270g884qrnsaxg2cc86r2zh5ar584qv9yd"; +"context-handlecsv.doc-51306"="1frlxxqd93p2dipsvg1gi1g3l4b57wgwz9j5r2f31vn9p6dxh06v"; +"context-inifile-47085"="0qakf92qk90nnqnvvada10z6r49dsjyq25mcyd1742b3m64blvd7"; +"context-inifile.doc-47085"="11ds2hvs2mx7xzanzpj9il4piiqwhqj6gc00r8g618m0s2fvkp5b"; +"context-layout-47085"="0j7f5krz8n3192z8iysr7cc8hz0v1zw2gidd9ag0l3ifxl570hn8"; +"context-layout.doc-47085"="16ava246cbx60q43brkfgbfw1vbyszqv42x3k027hlzk3hv4vahr"; +"context-letter-56073"="0sxndnc2sbb10k2s81nkmfpvs0zim508fvh4rdakkcsnp824gpcy"; +"context-letter.doc-56073"="189knf3ng7wpilr8dzl5ahbw6bazfnpmksjgpdbn60ij4v00ckfn"; +"context-lettrine-47085"="1ab6hwgnl4s1524li669sgn06gsvgc6vdlxajnbxj7gby4qh9fr2"; +"context-lettrine.doc-47085"="1x2plp67i8ayw7v3nxf9njlj6fpwy0vvp5cd3k3vp9y0qf6is6cf"; +"context-mathsets-47085"="11r30c6lpcvkx7awgm70cb5darl90fvpnf37hj2mb7h69d281hv6"; +"context-mathsets.doc-47085"="16qckniq5v52m36m05bpnqypfz2jn4430n5x5zazx54j8makv827"; +"context-notes-zh-cn.doc-23171"="16f2ax1vwz0cihiyl9cg0hsgl1la6mgh6lavw7zx1x0kljz3ajl2"; +"context-rst-47085"="1lcxad4kjhdgqny5qcvwdd968wkls96qjmi7m8yrla0nmr44y5gp"; +"context-rst.doc-47085"="1k31vj6wk18ccrnrhw46j98i19iprjk6h770a2y9w6710zlw3pdl"; +"context-ruby-47085"="176si5c7a44r7j23kp5sdg9h7yd5dpf1pp7rzivbhhgiwqinx7r3"; +"context-ruby.doc-47085"="1mnzdbcaccdylxc47s88wpq25xj867j2p4rziw5w4pbvk88h8a02"; +"context-simplefonts-47085"="1kfn5dl43qg64f2nx319xgxyl71wsxq1mvfxr20a9f2w0hvkvwpp"; +"context-simplefonts.doc-47085"="1wy9qncb4swqxhgi263pv1d6f62zsbvfl9lajf0jljvkb1888167"; +"context-simpleslides-47085"="1zzrbypanrckbfnxv70bdn6ypkai213acq1ksa1jq5mfb53r50g9"; +"context-simpleslides.doc-47085"="03lhmixdn1wrfdw8a1ayw4rd7gfy03m4v33ch9i59zzz2w3v2s6c"; +"context-title-47085"="1vpr86mkdd8ib5vvdak3kn19fi8vxz1023ld6axhwq4x0cxzb0ll"; +"context-title.doc-47085"="03higvjmk1b400flddaxdmk5pkfq6vz6445q53qw86px82g17may"; +"context-transliterator-47085"="1hwbj8csxmfm9ih0cz1aqjmg0967irfrlw9xff2nggwmzkcjf92d"; +"context-transliterator.doc-47085"="0l2yrn7jq9641j3bj49w8axlvh7n2wsjy3hgg0v0h9afj8nyc1qp"; +"context-typearea-47085"="1m33wbnajm4s9x098a72xsg38sil61slpp1kk25f9w29vjrs18aj"; +"context-typearea.doc-47085"="1sblwx44pardqrp265xzg5hjpiflgic7k5xfai0q9nga9qi56n0l"; +"context-typescripts-47085"="0bpm824hbmfrwx2svq486nqwk15h1fkh3wgvq526h2pqi3x82g5w"; +"context-typescripts.doc-47085"="0pfvlba9bgrcsz6nqwmwfn1pq7j9qm8hc7dqbk8ax1c0gxbbh8dp"; +"context-vim-58082"="1xzym5nwazvwmgjx36vdgrlkiw9vmzgj6fz6qj1662f29i6zdbfw"; +"context-vim.doc-58082"="1vrb35hq2x5r1cncwsdvrxlnpqs1j7lgrfqi9pmi4kdna7x9k5ax"; +"context-visualcounter-47085"="0n20r8315py52ghivwy9kh7g7yj4ixakmkn97phw1fxgz21jk6qg"; +"context-visualcounter.doc-47085"="18ncq5d4chmnmxmhazbjh9ypsm4c3577vgcmnx0y1pmzgb2g8pn9"; +"context-visualcounter.source-47085"="18yyv9974cxzpw45rzw6ia2jamrb07bzw6gqchdprdjs0xmhz308"; +"jmn-45751"="0iq5ky3llx50smw80lpylv11jmqc51m5yrhlslz3sakmgdqgg1yi"; +"npp-for-context.doc-0.98"="11bzcxi27yia87ia7ych62gi2y59jx379fz63avc4qyq4m9686ag"; +"Asana-Math-000.958"="1ydx3x568dw336nhv7nkl99y10hplvf79jxbpj02607pgz81nd0q"; +"Asana-Math.doc-000.958"="1dpx3w4kxmdwlscck08m9s0samiwkm08mlg46v7nlwqab3mbw8pr"; +"academicons-1.9.0"="19k93f7nyfni9jkg2pwfzsnwwfwydrkqivwskzjmsn0dih3ss8l6"; +"academicons.doc-1.9.0"="19jp1r3h8irg6fzl6n4rr5pxsn5na2b3g1x5vmsfd4hxdz5c01q6"; +"accanthis-32089"="1vwz3c8xgd4arx0c41b4d0pzh00ds7y1npwlq4rz8rqyabg0ix55"; +"accanthis.doc-32089"="0za0ja43vv6yn7wmw7m0f7xmjkcly1ml7f9d3352i8lk3gj8i7r9"; +"adforn-1.1b"="1cb6w50xb9wkl6x384dhldrhpjbk5l73x5gzpbm8za4gmh1pc94v"; +"adforn.doc-1.1b"="0a1f1rrii1zvd58h2slk2zj032vjqpi480d38rgi2k2j9wlbbyyg"; +"adfsymbols-1.2b"="19rr3zdgqlmnrvd61g9bjiqiyn2gpn82fhj4219gqb1l06nqa0ka"; +"adfsymbols.doc-1.2b"="059fjvdmd1jgr1flv5181ac3wvby93hyykfshcmr1j06zs8j9kyx"; +"aesupp-1"="10yd16v85zbkzkxb17gr4kf4li28ims33i1zrkpygbdf10nclxcm"; +"aesupp.doc-1"="1dydcjdz57kn3gwb3pfm4yp6hr69pyqhy5lhm9pnlcrycvqsn8qr"; +"aesupp.source-1"="1s41gd7ansh80z6mmwwha7pypaxwxxvrz3sdfj24pa5b2agprq68"; +"alegreya-54512"="14zxpvvbvax65njqsh762x68ixlsn10990lib4a1dy84507jvfkr"; +"alegreya.doc-54512"="1cpxgdl6wqppg3f44v9bg1856db0zph3vx0jyisaajfixgjv7d8r"; +"alfaslabone-0.0.1"="11va28ww6qk97wx8fh0iqbm8b5s14vf923ydpglx4gann4w9bkiz"; +"alfaslabone.doc-0.0.1"="0wfhd5pi1p5xnkq8lgpp3fhqn8y76h5jp3h5qhlaqygal70fw9kw"; +"algolrevived-1.052"="0qsxy2az8d0sr07mz7yxca17gl1y3kaqmvlckjdckvwq1idh7h0v"; +"algolrevived.doc-1.052"="10m3rgczhnkalf2f945jwrpwvv9szxh3v4wggl1rdxj12ng0svlq"; +"allrunes-2.1.1"="0xgh3y7h57lkzxrhddn5wll339b4zih4nb6a36ymx38a6md7b8ph"; +"allrunes.doc-2.1.1"="0dki14g1607a432549kly1wcy1p6j63lrxfd3m5nyz868kg3hjmc"; +"allrunes.source-2.1.1"="1d49w7lybkn7sfig7i27mfwaccr9vjs7ab2ds27jmhp5wjl7w02w"; +"almendra-56035"="14v5sbjsnvihyaan3jclsaa1kg39c5s3rssclrmvr5a2jzn38pzm"; +"almendra.doc-56035"="1g32m3b6nhydxw0siwc7bw59da6cwav2xrypj636i16hvlck9kg6"; +"almfixed-0.92"="0qrai75pdkf4py7nhggvwzaarv4jlh04dqsy1b593jabq7ngaap1"; +"almfixed.doc-0.92"="0arhvv7z8yf8kcikzybhbsgsj6m9zy4is5ryr6hcf6a6incnkp1d"; +"anonymouspro-2.2"="1qk10w52722yzlyvk2k733sp1h2vic3rjcswkhx8j21a2g9xgmjh"; +"anonymouspro.doc-2.2"="0ijsn9cbkg1f29x0pj6a4p5d4q14rqrh2mjid57cb9qjhvgvqrm8"; +"anonymouspro.source-2.2"="0fl9sd9adhjx49hja3k4iy9pcx3hal0wjzxg10kjmi4j6qvz829s"; +"antiqua-001.003"="16pb6v297iqx09lb6w6zfcyzhwidd1cln14rqc3fblbmdaggpays"; +"antiqua.doc-001.003"="0pwyp1j02zh51crp46rlhbdnwc2m0blcrg0yk43yfc687q3jx91y"; +"antt-2.08"="1clzmvpglsirsvm8nsc3m4dkz2va90877gmsrm7jfkhm62xv9mpi"; +"antt.doc-2.08"="0kpiba7awkrjr2rdgxilni1yi8p4ycmqyy09c1p9j1ld82idsjcm"; +"archaic-38005"="030a281kl48ixl4vh378bf0341lrrpvh73ws5pjxyhvs6cvyxp7i"; +"archaic.doc-38005"="0m64lsmx3sryzdmbsmz7biwmndpn66x9is8apqn7w64y4b1jjcpk"; +"archaic.source-38005"="1231mqascj96yi4jj11p4zcxgkpzxi3p0zxnjq8x5fpajz386kq5"; +"archivo-0.0.2"="19hr6vc7x9csjjd3i6mz9z27cyq4pz1qvhmiwbql2xhvmbcd871q"; +"archivo.doc-0.0.2"="00cs206zp27vpw06wqg7adwj73124zbp8zwfvgqsh9n544npvfmg"; +"arev-15878"="1nx33blp0nfqfmv2akj7w79qg1rhds40k7b58v5yvyrkx0hpn0hm"; +"arev.doc-15878"="1vscwahxzdcb6879pbrxdlfpgapc0bia2fl3jwilrm1has0ffjz3"; +"arev.source-15878"="1k524nfr5zb0nmhhq8dfaha4kv9f2ika192scllnn1bywhbpn2x5"; +"arimo-42880"="0ngpcv1824bwipjpx8qbx4lj1kyb81xw9dj0nqmpfq12a6q01nvj"; +"arimo.doc-42880"="06la48idihifm1n8yzn4b85x1y5y7qssq8d36fwvyr54kl5prh0r"; +"arvo-57213"="0i9x668hjr2b6brdysl35rxgjji1zdsn6wbf21ql0xmn53frk4ic"; +"arvo.doc-57213"="0g4lpx8mra2qk9c1qwijilscq48n5n252m6s0hxfraj5rshrhc1j"; +"asapsym-1.0"="1m4ky7x5pavf8kpyqrjqa5ara2iwzqc3aglvbsjblny7n2az3dr4"; +"asapsym.doc-1.0"="07n000aa7yjvx74vspqq1rrqw444z3f9pkwk3hdmmqm3p1rrw912"; +"asapsym.source-1.0"="0cacvd85rh2j0j6d1zjrisffwyzh0pphzsgb5bxfq3dzycsww0iw"; +"ascii-font-2.0"="190ma5qhshn71vhsjzjb2gxb54qjabili5m9v98vwj173sdj9cjv"; +"ascii-font.doc-2.0"="0nrnfvrcgwmv46x8f9ybk1gv6vgv8jgzhc8480fl7y17dii3jl9a"; +"ascii-font.source-2.0"="0xcv04inym8230k2ljb16g4ajj73gggg13w6zkxxq8a1fa9lwrw7"; +"aspectratio-2.0"="17y22131b9nzzq1skfdyr7cfcq823nqn3ssqrbc3bglggdfibf2p"; +"aspectratio.doc-2.0"="0mw7v1m9afyk462rjcimvwwikdpj0f4gjw5pbw2g9c60vbjhz61j"; +"astro-2.20"="0cjf53gbin9z10g63x2kingsclgnwr6idc4x0m473hf4fvakk34x"; +"astro.doc-2.20"="07kad1fzv7p6inh7nkrq6b34c1792h4v49rxaaxqyldmf4pwjr84"; +"atkinson-57624"="1c1z9cj1vs4jczjcg9vaq52qy6y77217153i1ivd00v73bsfsmc6"; +"atkinson.doc-57624"="1hx779qjjabgsmg5a0halwxd074qdkh0c3qp47yb4ahjsys38c15"; +"augie-18948"="08m2n7wqqj1pvvrw6q8j514mgr1168brckm1dl44yp78afgm6vra"; +"augie.doc-18948"="0ygmvlk1h6n071lq8jnlpdqaxhcxvwrzf1kgvacj78kijaqd0lix"; +"auncial-new-2.0"="0nqz71wdm0w34xdg5p34ph6na12jlvxz7v1bfigjm2v87pbn5lwz"; +"auncial-new.doc-2.0"="1dw0gbhk3hwfapdzysf12kz5g3dfsr5pxpnga9s1ksqicck26b5w"; +"auncial-new.source-2.0"="1gyilj1ldx6c5lfn8vrzsbss4gl77grr2mw4v6xhimv2vsyp29a1"; +"aurical-1.5"="1ffl7fji5r74k80hl3d62qj7f0h439jb7zmsv4f21w7b6cfyj74i"; +"aurical.doc-1.5"="0l19hfh5g2dc3digkbjvrh90h3vwx6zsbadjl7zzzlnhsaq44nlf"; +"b1encoding-1.0"="104n1g3qnx2dj91zylj5byz7yaai6dw6v0pl9240mgk1h8i0xr2p"; +"b1encoding.doc-1.0"="0sdr25vv9svm3r6yqyalqza4awr8k26g7fmh8078bbxkddycchkm"; +"b1encoding.source-1.0"="0mbzrasvppl17965dmkp2f9cbi03539p83989d40kl5p11ih6dgy"; +"barcodes-15878"="12gzzkj2nkkzw4q6jw0nvzil67f83myhwas37s71dnpqm5n1yqdp"; +"barcodes.doc-15878"="0yzqllbvdmymqv61mc740hwjz76m7sncw4mkvpld1i9kv48f0nvn"; +"barcodes.source-15878"="1m9mifdmxc07rmlg9pav8mx856jg1g2jk48hyxkd1zs6b8za6ani"; +"baskervald-1.016"="1wvdsq2qngbrm2nibvmssk62kqvjkk50cxi2d7lx3nb6jgmj33c0"; +"baskervald.doc-1.016"="0zj9xj7y1srb58lr9brmi2m7nw63n798m7mmzibjvn50kfw3qc8i"; +"baskervald.source-1.016"="185jgbk6rg6vkdwhwb8i0inb32qr3rgsdi3xhgj4vj0iah9mdkbn"; +"baskervaldx-1.076"="0nnqkki5ff5jn9bi8xddqpf5r1cj0r6rjgb83ab8x49di3y5qjsy"; +"baskervaldx.doc-1.076"="1q8yv0725j3sfnqgznnjjbkm57hxq5n9xvga1f7kf5c0jkp52742"; +"baskervillef-1.051"="108yndp9v2awi5vw29zbin82bcvx2fzkkhypg7f4dcl9lziwdbg1"; +"baskervillef.doc-1.051"="0divl9d4bgpjvc6yy2yawcrigkvv7pwdnxy1gvf8mypwhkp17anc"; +"bbding-1.01"="17na9lw0yaqn7i5dnlvbfg2yn74j8kr4w526z10bzp4kpynnpnlp"; +"bbding.doc-1.01"="0pg135sdbs1zbsyv1cp69akk7kazr5937ysik38dyhhc8f7vj49d"; +"bbding.source-1.01"="1kgz94yy0gm19x59vh24f9zv95gy53ayc1906r28s067mknmc46q"; +"bbm-15878"="1l1yyiqy3izbzbrpz55dgd46szkj55g8wkjr5xh7g3jc59y5kq13"; +"bbm.doc-15878"="053jc17hvq8vphm6jqr929hf45xkb3rk7yplq4i55x57vkf8bvdq"; +"bbm-macros-17224"="0h1qqr82ihqn7i8r6pk2mrxkpf4cnil1dj1a0y4y3ydph174v4l9"; +"bbm-macros.doc-17224"="0pxrzpbwpfzk9jhb544zmya41vzdzyn0s5dcyynajnf8lii3kivr"; +"bbm-macros.source-17224"="0wc6wf1qi6kxbd5a30n926gkagyjsk7mji9g9nzv3jwrshqihspw"; +"bbold-1.01"="14dz70qh8kawzlb1h8lrm0a4dpqkn9b03czd51s74z01a3cdmn7z"; +"bbold.doc-1.01"="0pfrhps4yirpg244lcpf10ilz53714ic1fvpk3nkp2ihjbaxbzy1"; +"bbold.source-1.01"="0qhfqg6kynfq6jzx93mili9kpgikq39wmlhgiav3bdzqhp6v0q3a"; +"bbold-type1-33143"="0zvkzp43awkf5vbnrvhibkw185zg7h1rcfqav38z720cls2vgd7w"; +"bbold-type1.doc-33143"="1dj0vqnhmk8n383y426ma1y89r8y69y1lc2vkg58gaffjfrpxwxs"; +"belleek-18651"="16vq207gnh24axsmh2nnh8lgy1lz2dn2kfn1sx51cbl28qv3wy2b"; +"belleek.doc-18651"="064l5x679az55jb808yq36n28qhf0gv0xm21iz8rnz4qxymwsx0f"; +"belleek.source-18651"="1w1jbq0l49qd2wwc0xmravrid4rfba52yw29z5ki7p46j51dw7i8"; +"bera-20031"="1i3mahkkb858i6a3wyrilcbswdp8mhclvixdxgc0wpkqvxa6qwya"; +"bera.doc-20031"="0llhr464l0akf2dx1avnm3d7adzcz7ml3x95glafpk0nfgb98qgd"; +"berenisadf-1.004"="05ibwmiklbdkffb1d85w9097sv215afgbr63fka2iqzcnm5lzbk4"; +"berenisadf.doc-1.004"="18awb9xgra9qmrsrm9l090c5lsx14xp7dh034k1fq1g1767w68ms"; +"beuron-1.3"="0zfkx9iiiz7h501ls3z1fxk2ga8kjhi21vpmlng6vvw4v3dd1xhy"; +"beuron.doc-1.3"="0d0mll620s40695kikaykj4w3ngm6rcb4xzrgk3apl43pcf7mss5"; +"bguq-0.4"="1spl6qnixrb6vcdgaaxx0fk740kkxv7y73xamlkprdnrsmqrswwm"; +"bguq.doc-0.4"="10za9hbwigcbxyjwyy5cd760hqabyyj3g74w355akhfpyd20m55v"; +"bguq.source-0.4"="1vaw8sa12c94ia6fknnpbj7xxng3q3lj3h61akm590riffklw2kv"; +"bitter-56026"="1xl5174fppijqlfi1qqdhr251flx8jngnmc3sk4i4vv4d7gfanaq"; +"bitter.doc-56026"="01j95jkb334yf4rwkljfw4sa2dwg43fjln35rm6c7h62cis4vi0p"; +"blacklettert1-15878"="1gvdw5gwjzgxa332ih2rp4whdcx1rdn5mig5q9cyiy28zvm1zrp2"; +"blacklettert1.doc-15878"="1m6qp3bkwl77khvanw498bfrydmyvf1qx5a9sp66x7l7xgjnndlc"; +"blacklettert1.source-15878"="1c38hmva1ffzani4mjg7zad0mr6lphncspn57m55n28hwfq7x8i5"; +"boisik-0.5"="0xqr3sgmzklqsvd26f2800ifs674lf0a4kgr44na2l0lf5msww2c"; +"boisik.doc-0.5"="0l0hi4n5cfm1zdkr68c6ks3gxkda5bgwlnf62y7x96q5jkscdyxg"; +"bookhands-46480"="08nsfgwhlyv9whaipx74hr4w6dhpdlvwcd6kxzcznxc66mlrnpk5"; +"bookhands.doc-46480"="1z0rir98r4fm8vhx26hw7l22p2z7swj5b2i3jdfy3c6cj0pi4g0g"; +"bookhands.source-46480"="17clfn8g2f48v944jlvwl3jsz9ixkw7x1xjxqkpaqnng0wsm6fyj"; +"boondox-1.02d"="1x8xd0q0yg1w1y06gx9fq25jakf7s3nz5lf2vryh5zlan2fz0ic9"; +"boondox.doc-1.02d"="1sc5bwpvgz28q2ym65vccyr5pdg8fn680kd83zgcbcwd85n8nhrf"; +"braille-20655"="0cy4bxpg284blfpmpgh1v9vyh5bczdyz9zdsc1almc51nv6c6zgf"; +"braille.doc-20655"="1ygyzvyz4am70n57hs8xhrkdd8hpn2mvg7hg3rdr5b6dvis2ibj7"; +"brushscr-28363"="04vpb4yvbazm9lb7k2rbv4wr372k3l6brx37fx5283fpzj3wvhxv"; +"brushscr.doc-28363"="0dv19f5hfzwnw6fd32glqc71rbjwi1y66p5fl1r17pxsj16nlyc4"; +"cabin-55907"="179j2kjh2lil2ahp67pd8hj8j5w7khfnfaahn1za8bp59f18xb5b"; +"cabin.doc-55907"="0xxs274z4wk1n3a11ybsp3im81wp0a9rk5ppnrwnxm2hgfwsyk87"; +"caladea-34991"="0cxvzpygsf5p619fd7z2wpi2bahiaqs3yly83n4ma88gac3m4plz"; +"caladea.doc-34991"="0v14bqll7iqx9czwamyw4wzl4grf2vc5y08n787p98856vaqdy5k"; +"calligra-15878"="0x3wvp6crh6rg2sxzwil3jr13h73sjgbf7ar4y35na5ksgz1z2j7"; +"calligra.doc-15878"="0pp4i750ga99x72kzy818062jvldylyfanjaf8nxgkglbyiw3l7r"; +"calligra-type1-001.000"="0liaz2jv1ad3xvmaxdp3vd2b3wvyg0wm1jlrrhxljzazsxzs5d3p"; +"calligra-type1.doc-001.000"="085bcvvz7269v68r8a153cgwgs18bgpqrd40k5xy7k7f5wy7d0c5"; +"cantarell-3.2"="1p5idl8vqp84g7vw3q6ybwnddv8q7a0ijy6vny8jfd6583bjx6pb"; +"cantarell.doc-3.2"="1r6mlr4qq61cclliz4h86bc86zkb5kr5r9bixwnj88pbvbalayff"; +"carlito-35002"="17qyhmp24afg30z3b377n1dcihxvs3x7gvykxc7g43z8cm9ins8i"; +"carlito.doc-35002"="0ixh7s656l5hdl07gcckxh2q40gjmh9kkirkc5sn36ynyd17zldw"; +"carolmin-ps-15878"="1wq22k55696jbawhlcqxj839vx1kla2xsik32pv5i2371dsn7211"; +"carolmin-ps.doc-15878"="1kai31i0pvrvp44y06hl3mj20hwjzj2mav6zs36afz81b491aw79"; +"cascadia-code-0.0.1"="1dld0cvrpdky97ycnci27z4pk2adfflbgp5r43fxkwbh3l45am9n"; +"cascadia-code.doc-0.0.1"="0i5ancv04gr9ryc6kmrm197n6kkhq7m2gs7bj3kmfza0r8725sd8"; +"ccicons-1.6"="0xqq8dk5czaazzjlf601fs4d2z81yn02ama07js7wrxb21vvjz2r"; +"ccicons.doc-1.6"="15hlqk9rir37m45ajfwfpw2w2ngsc6nfyh8g76vmbc6j48zmc4mg"; +"ccicons.source-1.6"="091ayhgprp5w5g59c0zfy51lhas4gf3spya77k9fbr9gxp3phl4c"; +"cfr-initials-1.01"="1wf5lcqh3jysn0fbzpmh429gmicqhh1kvz26jfl37f1z53g07shs"; +"cfr-initials.doc-1.01"="1akblgsix6a59as4z5z6hhsncnsfxqh78s8gw0m3xqv6wrbv417k"; +"cfr-lm-1.5"="1inzb3q94b42n1g3hchqld687qhs33m2zxvxvgyciwqnwfn3h968"; +"cfr-lm.doc-1.5"="1ska7y1xg6qq86kccplwxjd70bdbiw492d9y9n17d7hryg2nxw66"; +"cfr-lm.source-1.5"="10layppddcanvyzjbgn6grgba9ff47kn7fqdxmwfkwnpw0qlw5k4"; +"charissil-5.0"="0nxrcgi0w17p7wwn09nfcx3v9b7ddsw9sp5224hbax0g5h0r9569"; +"charissil.doc-5.0"="13mpl0w0nvr6gqbjgicqcqwwrd5vlc26lc06gzq1s73lrpbjz5sg"; +"cherokee-21046"="1h8q9ysfnwdc29kfc6yj4545xk8cyncl9ns5a465kh6li01zw5i0"; +"cherokee.doc-21046"="0ijq61im5wsv64qibwcllc2mi69d72915c5qjk0dcnsn7k823si5"; +"chivo-2.1"="1nva1995nzxs9mqahqhsqr5ipfg7swi9mms2gy0ir4miv17fpi1h"; +"chivo.doc-2.1"="01p4s3psbi5900cma2xxpsq42f3r6j4a21nsrb17lqx7hhrxq0by"; +"chivo.source-2.1"="1s60n5whsv9b10zlmdr6cpi81giyzh36s9y3b9bxphja0hm7zhnd"; +"cinzel-54512"="18bgd13ly5sb87wixcp3n2403m400xngl20vxa9pfg2xykda1haa"; +"cinzel.doc-54512"="0mad5alznwa0ix3nkbpiivalfyblywl0f7gkjbhmhssvq5z6dyp3"; +"clara-54512"="19g2vpxwjjc3y88ghw8yv0abkm69x6lnjj4p1cqbdjiyy4n83677"; +"clara.doc-54512"="0dkqqps72wws7dhynan243wf86gxn4chn1v5iiishkar33xvvlzp"; +"clearsans-54512"="15f5x2kn3sfzd84gg14f85bh52i9ca93m9hcvfw9nvna1wbz02q4"; +"clearsans.doc-54512"="1h87j7b7r8zvcm1zyn7y3s9432ll6k6a14kz2vvwmy5rf0p4vcij"; +"cm-lgc-0.5"="126k3nr39xvgbzjws9x9xs01rj738lvgpy9r2wjvalxqvd2sahw5"; +"cm-lgc.doc-0.5"="1xffcgb60kvbg07hsw3dc6kzjqh907fj97qrrj2586b66asna5il"; +"cm-mf-extra-bold-54512"="1l1cm32z8wcpj0cl7czqkhnwil3ail7a2bbzn70dnswpj0ka8k9n"; +"cm-unicode-0.7.0"="1y71gdk369hs2yzbfnj5i6yy2xjzv4n65vcfb8z7x596kpjm5jz7"; +"cm-unicode.doc-0.7.0"="0zc7fv9p1m7dgi3vwkra2d8x18c4gkqzkd06gp9c18jgf0m6ahm5"; +"cmathbb-1.0"="03da7ak8q3qyvwnk52mn2a79q2mfbfk0bfrkvmjpqnlagw35qmbi"; +"cmathbb.doc-1.0"="1i54xpnvygfmwbvdnj5wwd2fwfl1y4f99afvs283lz1ki2857aj0"; +"cmbright-8.1"="1ypjv6wfj1nm6wj6laniv304zri75q9gaik95sxbz0wh5cxzwgr8"; +"cmbright.doc-8.1"="05cwyxmh6mqj0xf4awhif1vvms0j1lmadd1fgil7b14l46mcd99c"; +"cmbright.source-8.1"="1y5is2678czhhkw4y5nrg05qqfi3n7fbric9m6pszfkh4iw0ml6c"; +"cmexb-54074"="1hfslkscqr01dkgnckfcr8c04s053s6f8z5xk35lcgbqj1l7ygag"; +"cmexb.doc-54074"="1f6nrlnnq3c8mwsxz58pk05ginjkdjpgpnnw2alky20s78cc5kyq"; +"cmll-17964"="1mv2npq85fmm8ff3n2czs1mfjqcqpy5rx6dwy9c5ra1nybx0a5ak"; +"cmll.doc-17964"="0ps62xbzac6k9hk0s7wlk14iq70h922sxgagy5m8an9vqp94mjzi"; +"cmll.source-17964"="1vhh0ds96n1yy3nby8np7v4i747cana8acvcnik1zz9h4xnf4brj"; +"cmpica-15878"="1j8jsl3g76wxdpzsj8w68ln2i386cjzclcvvj1nl7z9k5bxf4s34"; +"cmpica.doc-15878"="1rj4g0kzy0ci440bjkh7b7lyh52xx6v737chzhps9w8q1b07wvca"; +"cmsrb-4.0"="077f185vcrklhnchlw694113fpgaxy8paxms37rp2br8mbhczy00"; +"cmsrb.doc-4.0"="13nd3vhxim71kcl2n02fcrm5vwakkrn0f5nfw8irl9i9r9bgy6ll"; +"cmtiup-2.1"="16wg8nw15f1pfcrm49xnna6finbvl0jr0wyapqg9i2jh39c1gizw"; +"cmtiup.doc-2.1"="0rr69cqg5pblx5h8xyw1zkap1fj3pmdznycplxx0kd4wqzbdd47z"; +"cmupint-1.1"="0y3pf2mbhxhn67skzy89850fhn17xr0b0ghcxn1ayq19qr66yrj7"; +"cmupint.doc-1.1"="0v180y0j3md4iyx54fvjr7g00mavmkw6b99bsm07nncfq0anajms"; +"cochineal-1.066"="191c7l30cs859xy9vy4pn5281c2v860d77fp0hn4yx1nq7fhvyym"; +"cochineal.doc-1.066"="1vxsa2cffypkibx7sl0b6k79kax07li4zp2qr6v4554gj3fca581"; +"coelacanth-0.005"="1flbg98xil54zvjdcig4allc9pqlliz43a681kx3wacn8c48nqp6"; +"coelacanth.doc-0.005"="1py3h3hx20jfpjxy3mylzz31vrxf4fs851ffprymf6rs9c5n6hm8"; +"comfortaa-3.2"="1kfxl806y2g6axx8csnd7njyd0skxx1gpw7fm3paz8yrzvyyw89g"; +"comfortaa.doc-3.2"="0irfhf9qw81m9x03nybk7br1nrsk4gx1dccd8ay7wd3sgw00kg0a"; +"comicneue-1.2"="0w2jbwfzfhbm5375852zv9rqih3p7grvi0s79sxr6gpzh7iyvlxr"; +"comicneue.doc-1.2"="0wr71zjk337h9p38nm67ga8js60vqyqfslwn7dqvzg06p0741bfk"; +"concmath-fonts-17218"="061kfzds7clbxyq62ilxwcrdkfghi2lx8afik7vi9gg0hysbki7y"; +"concmath-fonts.doc-17218"="1x6wb92k4da01sv8b35p3bly9hj46hh8k9wr22m7lj3rxnndnpcq"; +"cookingsymbols-1.1"="0kz8aaf7bp0y2ph0iia5lkrxnxch9r63iy7y4zpqcawh1ajl10ji"; +"cookingsymbols.doc-1.1"="0dws0sdcg13jpz23zvkw6vfnc34qc1s464nm2nbdybhjwc9gdbdl"; +"cookingsymbols.source-1.1"="1l1jkd6mcxdldvjyk9myig4jsi89mg6n4ab6ymq5lqf25d260h0j"; +"cormorantgaramond-3.601"="16fwq3iwv3alp5frk7hzn4j7bdax8zfvrmkn7sh9hqn8w18gmw0l"; +"cormorantgaramond.doc-3.601"="110f56v8mb2yjyfpdqa82905h0fmra1k5895bl8f9b1va9p89b5h"; +"countriesofeurope-0.23"="0387czqiyawxcjqh22czyd8f7y55kcrscxmp28rcm8wqqdh2ra0z"; +"countriesofeurope.doc-0.23"="0h06f5rpizsdqddqdvvvh5p3nhm4y5aixjnxl8s0b90wpcldwrpg"; +"courier-scaled-24940"="0gfqc90fq1nk7w5rvy3fqd5799aaxh48ia4wxcf01bhs4l7nrl1i"; +"courier-scaled.doc-24940"="17zr8bdv5dv8hybbjfvkrn1skn6xpl41yfrb4q1nq491nwbppb14"; +"courierten-55436"="1maxj7wsjqh2ni75pjpzsbwh1f9abndka1ilaiwik1c21kgb44g6"; +"courierten.doc-55436"="1lq4clwd38f8l4722khgnldjfk11mn1m4m82ppb1qk04qyh1v8sp"; +"crimson-54512"="0aicj6z25yvrnsn15xyn4920z8k5kbxlzrfk7x914rdq9s9s5i8h"; +"crimson.doc-54512"="1sz0f737kkqlx5d1pn5007y78y3xkblibsrkw61pp8aa1cl1mmjl"; +"crimsonpro-54512"="0d3jpr2hkkp9yhznnx0ijxi2pc18fszzcdqxkyri8na15laflbfq"; +"crimsonpro.doc-54512"="115w24lpx8xv6gkyvjmxyjlv2kd8z90036726nfci4wc2d1fr3fw"; +"cryst-15878"="1jd8ny0a0mlhjdbigkkkkz1xn51s3l8w3dpcx5kwg10m29b3vwc6"; +"cryst.doc-15878"="1rdclk91d2hps0xiqj4p0i4najjz9llq0nr9qvlj57h7ipyrahcj"; +"cuprum-49909"="0gqrwdh2gpxgc74zq97zm728ykadkrl066v77hjllmw7x6cjxrng"; +"cuprum.doc-49909"="1126yz6ks0rk92jcsbg2m3ibvv64xznrii9kxf6ss36hm1qwkgbi"; +"cyklop-0.915"="1krjgk4a920bpgb7c6qw6jx5b7gv97raxpaby1vx1lh5zvbybfn0"; +"cyklop.doc-0.915"="1fnsd0p8wp58imrn22zbswk8bdjgp0w9v4hcv8f7x5ks1czcas8x"; +"dancers-13293"="0nni21f6y9gynx1lsymb3pmh6w761q21idq60fib90hvv9jjd85q"; +"dantelogo-0.03"="03a5l0hdlr69knnp6q464x9610mwjkcl3cw3i2q10nfm5ywr7nsx"; +"dantelogo.doc-0.03"="19y2vbi5wwia1lg16rbwzkfd2chi9vw3m3xig48h0bsyy5y9pgbh"; +"dejavu-2.34"="1pxcrv98xgy9hkqhclyp0q5dgpgc80bvjzs378f0dqzc1037lghn"; +"dejavu.doc-2.34"="1f42z94n6dpdq481n5wmsx5hx000klmbklghz77x8pc9shgvlka8"; +"dejavu-otf-0.04"="06cdqjqj0vcxrr2nlqs2qszssiibzr0pbimhvqjpqfdv2hhdxd0d"; +"dejavu-otf.doc-0.04"="0x9j42zm6dagn4wv8hz34x7cgybi6bb86whxvmmwx5slsbb6yqfy"; +"dice-28501"="12j86mgn8zph5w1gd1lmmz0dcka36b187vld6r2srnj9f398h7ac"; +"dice.doc-28501"="068pzhi6a4mnq8bj5xvg4pdgqb4kvdggybs16hpk8jla03ny18zp"; +"dictsym-20031"="1ipmlwgma06nd1rk4y38r40y01csq1myqavmpd1f3c53k1n0v42s"; +"dictsym.doc-20031"="0rljzx70rbvlcirxr2kf0fmrks6g04zc1mz5hzfkjcn6xivpawh3"; +"dingbat-1.0"="18yzigyd9s0c7qs34x1km0am9ii7xywvyd9miicbdr6s4bjrjdz2"; +"dingbat.doc-1.0"="0fxbmx6nz2ib6qfka1qsb9ky9r3xw5hvss532hn89yx40gb6qx5r"; +"dingbat.source-1.0"="130qj3fs12j3sj93xlnqxch9lgywgwk3qchlil72dgmh24kg6ij8"; +"domitian-1.0.1"="0rcyfp46ar0qd2jiir3vmwqmkcj8zrhnrivr0xsi7nf9xbl0xj1v"; +"domitian.doc-1.0.1"="0q7lbpc0lh2i6jw6dwr26d9kxpwqxcrv6szsqfk73h8bpv123ghz"; +"doublestroke-1.111"="1nfbbh7kid345jkcqdhh72q3fg2fh39fzchcbhfkvisvqmqs3cgp"; +"doublestroke.doc-1.111"="1vs6gkv9bzya3hnclqbwx44nf5s8vir0hs499dsya2q64qrmcp2p"; +"doulossil-0.1"="1lajwxs0i5971bvc2jmdi1ljpp3545hq9ckyrr93lrk0ghdv65qy"; +"doulossil.doc-0.1"="1wv1718k51wpbzrlxy8qm169q7brbx0gy7x0mil18a8ik53r7c6c"; +"dozenal-7.2"="10ghknq4nnyvly55mwcisb64cadb0afmsqjh8z026izs684rbsjr"; +"dozenal.doc-7.2"="01m1ljwbzmzq0hcj6p95rl4rrgnjrxlxnf72f49f725xhfsn57pb"; +"dozenal.source-7.2"="016lxqwf1cm7a7ny5znkgibpna1r13zw0cmzs3wk49zhqhkqmzvp"; +"drm-4.4"="0j0r5b2b6js88gy04d12w8wp14g7z9xcgc43y0ysn2xglcsja3fj"; +"drm.doc-4.4"="04i8mw2lsirvzf3n8xgddd2jr2s45fbg6m6wiwjdz4d2i1pi98cs"; +"drm.source-4.4"="0l3j52ypvsc8ma06a2z2dkqsa3vd7afqkmyrd6b3z6w3dgjlnz3v"; +"droid-3.2"="1fmm1k3sxdn2h6v56hqdn0l84rz1cgxmj586wd4ff41vfzbdnn5z"; +"droid.doc-3.2"="14inm79ljwnr36dz97356iz4257vbvkwmbbaq7wdza1yf07gijs6"; +"dsserif-1.01"="1ps8rvv1i9qn8ka8idfhbsb0frnrl35cp8kdimdwzk9hp86s1anv"; +"dsserif.doc-1.01"="0px6acw5p19sn1s69864lpdlciyr4p6bbd9r69kykq2xfb94dfgm"; +"dsserif.source-1.01"="0znglnigrb3fhxd3w7bb4b13hd3yycx4lj7w645j20c89hfnqx96"; +"duerer-20741"="1v6ja2q8bi0w0jkyl3j960gkvv2m5b7n9lg6ql9rxz7sfjcxa3ih"; +"duerer.doc-20741"="020q5ln31smf228xx27gbbw0xdcx9f5zh6qjriakxa9mhixksjjb"; +"duerer-latex-1.1"="1f23mz3nd7icknkz4dircn38y1k2k0pwq3r79ja4h85si6i13ynx"; +"duerer-latex.doc-1.1"="1arjf6dzzkvql0jhxg09f4yq9vgx7ag9l69csrindj8sksvj18f2"; +"dutchcal-1.0"="0j49mha6lif07hnfn2wdfl949kfal4hbmzg6zal4w5rgw366szrm"; +"dutchcal.doc-1.0"="110rbvidl53naa31ndgh6nx19i3rkawbipz9rpxyasqk61kvv6mi"; +"ean-20851"="19w54ch23s75mhn94hxf4nphl5dcz2w1jx138kr0phfzpc6fri36"; +"ean.doc-20851"="1rylr9m7jrv0qq6pzigpm73z34p9n80fg5rf7andmvv0fcpmggk7"; +"ebgaramond-54721"="1q2cshrq5lsm0vmhb30yg3pyc0dkpjxgl44ylxmp2b9ilak471nr"; +"ebgaramond.doc-54721"="173b7f7pbv3liwa22v29r122ckyhqms6zhklg2hna9ld61nnmf6a"; +"ebgaramond-maths-1.2"="1n8xfa9qmxsrpy78h98x95wks24fck3mykq5n8x0qasi4fabclnx"; +"ebgaramond-maths.doc-1.2"="1x4l9mi2cc1fx3qbis2ibshh5wlfn3sypxcrbcr9cwwhpkg07sqb"; +"ecc-15878"="0sa6f5dbq3p0nskxwy8namy7hckd9ihz4j440v06fyfk6wd2dxn8"; +"ecc.doc-15878"="0v95nvyv5ygfrwwr2mnaja7vxng3d5byglikkirympgqpkc59rv4"; +"eco-1.3"="0vp39dva31kjs4ckqdy49smhicq4599mqly7y9d9xfz6gly6z9zh"; +"eco.doc-1.3"="1wb866ilp8hmxndqys1lpw6zb3l1nyl583z06vh8nfys1hp0x0m7"; +"eco.source-1.3"="1j3ik11vjxc1dahd0p7jdcjjqq9i89fnd9514s1lq5499h8jg159"; +"eczar-0.1"="1hpwjxsr5n7f6zdc3ap00d9l4346yvavsy4wjicj41b1g7wl46v5"; +"eczar.doc-0.1"="1hvw36i6szhia91xq2y2jzkngy0aawxw5azpa77026byqm8mrs2i"; +"eiad-15878"="15l4wi5hfbx8lp91jddxwg073z0r42qf93kvrqv7bwhqisk36x2g"; +"eiad.doc-15878"="074iirkf7fzdxik5yq4jjk2p8c5k9jj8a6n178aw767j18h4n2n1"; +"eiad-ltx-1.0"="1ifiigww9nk6hw342qj1rxzl2b94f54cm4vvrpffxy9qggwkd2zx"; +"eiad-ltx.doc-1.0"="1h4cm5b0mllqflsgfcjdh97zn3nn3d9gwa55w5kyimmxgz516mng"; +"eiad-ltx.source-1.0"="1bpy6f6d81n95x81rgpz2r1vzg9gw04309shnx8a9jsx17fnm4nk"; +"ektype-tanka-0.2"="0qnkc2i6zxhx0i5mqx57qf7792ffg246yxcm14g1fa1nlryhdqwd"; +"ektype-tanka.doc-0.2"="1cmsd75pzv0bfr9y868cbpxx39ixs64pc2i8dsi6k90wfzq2bq55"; +"electrum-1.005-b"="0ckfb8xq10bx44zfdjy1p1hfcw18mlfli8zgjks81kfsgv7hzfxj"; +"electrum.doc-1.005-b"="12mq0mn56xi4h8dwnfnlhg0bn7qn6b6wxx20nqd73qgm0p1h945s"; +"electrum.source-1.005-b"="12ys4fdn1kyml62rcwpb424l86kspnzb5xq850ppbb82ng4146js"; +"elvish-15878"="0hz3cfydpm0sq6s2xp8q44k81xxhqm5mmrx5aqn5wzm0kr52pmsy"; +"elvish.doc-15878"="1zzzqgs30gbhy8ja13zq9b2s6mf1m47ms5rp33jc5xp70w5cjp45"; +"epigrafica-1.01"="1kawqgy9kbr535q1v84kk29q2fwhg6yzmgjd5i7dyg06cy0g6rci"; +"epigrafica.doc-1.01"="06ichmfivx1v2y67f5nxx02v75wzci6m3hhg87kc4qik61yp8lgw"; +"epsdice-2.1"="02i2fv7c0kxg9d96k8gwcvm56vd4rjkndc68k1x2wa19f1ymsmi4"; +"epsdice.doc-2.1"="1cxrwbnrfg161ddc707msjya678fvvmvgsrrigdzmqrngpi7vh61"; +"epsdice.source-2.1"="0nj3d8nqc8x41lmqmicqf67wc4wirg0q0djzi0nbk77g2m1qjs0l"; +"erewhon-1.115"="0fq96r0ka5dj0phvp4i3f0sjag9fzv51hp28mc0pslvgna9cna3x"; +"erewhon.doc-1.115"="1gg99y6lpr7xxi88jn6mgzkgdnyj96ka00pz725hspxrfj9460ns"; +"erewhon-math-0.45"="1bjqllw4nk2h2qv9mmc5va93mp356n9ibj06l114f6la81k1h7aw"; +"erewhon-math.doc-0.45"="1mxx4g97m1r4jn2j0315ajncvydly0sj9fwkdsxhnjcyh7jvbx8r"; +"esrelation-37236"="1gjwrnd63bb66vy7f74alxshcr5pqz8g8q178wkgyrm37xql6kni"; +"esrelation.doc-37236"="1nnwpgjy0mzc2h7sp2igqwain2nz6374qn4mjvj6g8x02lkc1hsa"; +"esrelation.source-37236"="0aqb63mzvx5hl178kmy6aawyv5ri8favficfjjmkpq3d4hgnrwl8"; +"esstix-1.0"="1qqs88wpabdx0y92md1w8klmk7ncbpm2jqmi0j5sj1c2cn82mp1a"; +"esstix.doc-1.0"="1zzbwvv8lbd27cxafj6qc5sml4r44ymrdvaqn2h966alzga9ify2"; +"esvect-1.3"="0fgcy91ypllj3i706znwwzri36ja2ca2inx838q08zbs8gqq4zah"; +"esvect.doc-1.3"="00xpfzzhyrh5p563faa7ks0vrrc08ndcpn72a72jmlhk8y8bn7sb"; +"esvect.source-1.3"="1han75c642d3qmr47ppn11f7q1lnz8lcwj3q39nh1f81vi2w6li8"; +"etbb-1.051"="0lblwfavj6awhbw75sn571gbjkmg91xrnf27xaizqlqgf4jj84js"; +"etbb.doc-1.051"="0chxvmpzkxgvik87dbw51lhd2cfq9wikny53sc2jcb4l7xr2bbzk"; +"eulervm-4.0"="1x0zgqw15r5z9mf4pcpnf1bdbwbpwbc49ij7gjrhf9jzzlkwraf8"; +"eulervm.doc-4.0"="1bbd7f4dz3xp7ylgpi2wh9jf8nz4z6i2cvphfx53xvg555ln5v1m"; +"eulervm.source-4.0"="1if22m5h8ma3bvrlp4jzzhjm410r5r7r2ij17prycj3cpj4r2nl7"; +"euxm-54074"="10dqknqlqrga9m2lgd74zx5hk4qcbkfvlzjgr304p94w3k7pclqc"; +"fbb-1.16"="101yfs3np0mlwgfhiz74jh2jngxnb395wkcm9fvpmrs4rp7wxx4l"; +"fbb.doc-1.16"="0b48vqwyhmygv70gsbiknmmysd8pz8m27pfj52zqzzb0kphibynl"; +"fdsymbol-0.8"="19kqkmjsi5kw5s6kkgf4y7nrwjhyd9pgq02y3f43wfdml9jwlvx1"; +"fdsymbol.doc-0.8"="0ddy5d074fjmkvl3pm4akqfq7d3f57y09cfmrs5wfgvvb51gfcvp"; +"fdsymbol.source-0.8"="18hiwralhdsp8sj8yr0c5pj4xmjaiyyha1y36sgca2xlacpw8ah3"; +"fetamont-43812"="08c8xjgam1fx3aa4ikx62jfh3f4bws0ngk428bqzbrd8q445c3jz"; +"fetamont.doc-43812"="1zlhg0wgchgkk6j8v23wd29hklpzb8q4p690pfswg3zakc0dcbgp"; +"fetamont.source-43812"="024bwgb36iz2ylwsfzz4wfgsyr9djdd0p23phadzmc8qzxqsslph"; +"feyn-0.4.1"="0pmj7cz0bdfrkx50mkndiidwcabndkvx6kr38yjwwamagi9mpjx1"; +"feyn.doc-0.4.1"="0hjnn0w34gv04xr4lg11699qiz3fj1m0lq3yn5688dnn8bxkdsgx"; +"feyn.source-0.4.1"="1azybd7v6jml6afrgzfmn6iac5hlx9d286hmkw4cw711id9qki2x"; +"fge-1.25"="1f6ibw87kbhpf3qxjh17jr1lsh9kk9ynf1rngzyjwbq2rk2id94f"; +"fge.doc-1.25"="1c8nnpdvkxcm6218mrs18ipjf9mrl1cqyvv3p31x41ii8wxkvjm3"; +"fge.source-1.25"="119d70668gw3za0mksr93wcq9gpzjn4gyv8vmizlabi0ip1ycgy8"; +"fira-4.3"="0g0ncn5f5r7l2z5qqbddawkdbgxhs0y8p73ai26608736hvdcgqk"; +"fira.doc-4.3"="01h0m3s6dywhx6pbbi1cckbcccz0d5lzy8pwyy67c8blzw5bj94w"; +"firamath-0.3.4"="1d9l5nsx0qswn1hcalzsrxkvc7mvpdqk3h72bfk50h91lfm2i567"; +"firamath.doc-0.3.4"="1w6zlskvs54x192nyxa83qnlqhvq98g64k5fv6ch406nkivifmgz"; +"firamath-otf-0.02a"="1mr9s4cmjflvvglq48nwxrnn4mnh27mh4j5y0sjyjhz5bwcs87pk"; +"firamath-otf.doc-0.02a"="05b5xzbcnb2g0sx5nzydvf0x29yiz5ssbzv178iz1ri74sk55lnf"; +"foekfont-15878"="1vb2j10j6ra47gyp5a7fpv3868b1rgk2w54w0cd8iczvshbzva88"; +"foekfont.doc-15878"="0yr9xzq9pxgaw14r6494162acj4yavyd7r123fabwf4dgj1xf46c"; +"fonetika-21326"="0fmhazwrjh427g0hz8br5b05ccxv523n1ar5ib9hp3ndqh6svpgs"; +"fonetika.doc-21326"="06mbkp04rwpb2jg6kbq2bxdsagbwl3vajzh0nbq5bfg9lgdv14l0"; +"fontawesome-4.6.3.2"="1s1lkmpmb9fj4qmdhll2mn1hz8xk89z9rwga5zqpjb9was4vrg1y"; +"fontawesome.doc-4.6.3.2"="19xjkzn9vgx2sgv5sypwcmwyx9f7rg4q58f913rjwrh8gvncv07m"; +"fontawesome5-5.13.0"="1hya456zi238bm0srhw9c6kkvxbav90w2nh7y2qq84b1fm702ljg"; +"fontawesome5.doc-5.13.0"="1864y6kn1f96fadjbwikf0wl3wqplczknj67gvnkcl7l3g61fmcj"; +"fontmfizz-43546"="1ccfywcywrrim1hk7g0kg0bljq034fh27qrr8w8ypcyjdnafkhxg"; +"fontmfizz.doc-43546"="1fcsrwbn8kiyw4032kkjg2668ax0kfcb6g4kzgp6bjcmqzy6q1zc"; +"fonts-churchslavonic-2.2"="1rqsbwbqfkd53yaxnmp17vygxd049livqj71c2cszzzqq8fsxpif"; +"fonts-churchslavonic.doc-2.2"="1zjd1v8kq1v1sf4wfqb13x8jz12wpkpydmvldjn8l1i5rn0d7d4k"; +"forum-56025"="1kjzmzjnxwmcrgbcs23kn8p4z2izp1sp7xjv7ya6kl0wbza6fsbb"; +"forum.doc-56025"="0x8z7k4xbi1skzz6nw2r4lsmv28aih3hm98bhpgv50q97dyzx3rk"; +"fourier-2.2"="1f5pj59r1wa4fsx2nnbx8dn9gi1hsjpcyxwbfb6mzrcji2lzqhpz"; +"fourier.doc-2.2"="0fjhgfg23g79rfhcwnvi3k2nsiqqr14mzdw497ppxbcmnlknj8ks"; +"fouriernc-29646"="1vv4whd3axfacbmm8nksdc37d5zras4gwa6ykgw1svplqgg3zjk3"; +"fouriernc.doc-29646"="128n1cnv9h1hr4s6bp3xs1v9p7skhxlfy8afslpay2bm0ixf0cs3"; +"frcursive-24559"="063909r7iga0cirxq8qx538407qly4p2a440xq7c603fmgcb8n6k"; +"frcursive.doc-24559"="147sa2wcixanwrhdh3ns8fg447zh5f42z8x0aw41xhk7pxncqrml"; +"frederika2016-1.000_2016_initial_release"="1pi2bhbxw9xg78w6d6k4l6p1qnm4nh6m8k3bn76kv4ascydc9hfg"; +"frederika2016.doc-1.000_2016_initial_release"="1vyy278j376swl2sjwxygqm6mi6s51aa6qypgpw3w2g5kpsqqxqb"; +"frimurer-1"="0d2534172sqpzg4zj2fz0k1qa2m627jzqdnpgcak4fxighvx1733"; +"frimurer.doc-1"="15g0293xz99w400l3rj99849va3swi2j8hcj522qiyzfcx5j7k74"; +"frimurer.source-1"="0qxpdybwz0rp748rqfs026jvps026sffq3c7zi7bdy8a34mqmgsb"; +"garamond-libre-1.4"="01q3jymj6npbip8n20ql4icr26ws8hz3nnd6mkcr5r5l5z0yd3bs"; +"garamond-libre.doc-1.4"="1lcpnra1rabi8xyvw7khky3fkdc6vq6i1ccjy3v7pl829q0fabhq"; +"garamond-math-52820"="14cfrwk0xqrs5ij0fkg0nb9lx6g5z8lbmacjw4h68s4zm2nhas6r"; +"garamond-math.doc-52820"="1bipgq1vh2si94hsylckq1jcmdn3j7c9pnf2ig7fpi41lylpc4kl"; +"genealogy-25112"="0w15jrd6aycdjh8qznvm549kzwl15v2zvs7awgk96380nzcsmhqf"; +"genealogy.doc-25112"="08fxhib7wydjbd3bf24kw6zbbz2sv6fhgmg4q2c1lgxddmm8mpzy"; +"gentium-tug-1.1.1"="1i6qxccddl61vlrfm1lvqaxy3yahqh9qd3zkinn93dmwdll4axgz"; +"gentium-tug.doc-1.1.1"="0b2xqhfl684k501ghwsk1pv328ywvxi4hzgg8lzysj1f4qx9vkb3"; +"gentium-tug.source-1.1.1"="1wwwjxi58yc1wfirvfhrpn1qaswz6w09ay2rnrx5x1q0xph5l5an"; +"gfsartemisia-1.0"="0b200snkvdkrywgn3j613zxyx16prqczw106hfh7pzpr7w717lyr"; +"gfsartemisia.doc-1.0"="03gi2v0vfcdar6qsp7xff9s5pd023i3kh4b8asxh9lah998qm3z7"; +"gfsbodoni-1.01"="00r9b46m6h4vac788vfz6jixrd4wbmscblhqi1pxhg76id33xdgd"; +"gfsbodoni.doc-1.01"="1s0lq3ac01zcaqyvswn12fxhvqarq2b3lni1xza3yyk2p6y95g1s"; +"gfscomplutum-1.0"="02c0zs2xl2hy5wrrj25w22q1fj6q8w4qjbvlpx05pzzh3y63n3ip"; +"gfscomplutum.doc-1.0"="0h9i4v3sag4fmvlnkk0wjxmgsq4kbiikzv0rzfrhzfwaifpznkcf"; +"gfsdidot-54080"="1ks352cxsapibfm3y4rnw3k7izkjzpdc5fd2faq314qh5cpjhyy5"; +"gfsdidot.doc-54080"="0nhjndir8y8s9lpnad05h2crc41la5hqg8ml1rm0j5mn6jwgznwl"; +"gfsdidotclassic-001.001"="03p2w06s9kca35jdby74q4x8if5gs39gb387rjgqbv3vdn7zxi4s"; +"gfsdidotclassic.doc-001.001"="0qnkxqr8r9spg3xl2ifr2sb32hbvmka979c4f8aw4z1i810bs0kx"; +"gfsneohellenic-54080"="1374w2w8vjhyd6ya2jws86fbvzs3wz4v7nyfhj28lijf9d5y86gg"; +"gfsneohellenic.doc-54080"="1pi2k0yks1f15y17hx7q3w36y4z93pwv071ibmgmqmnmk16ymd4b"; +"gfsneohellenicmath-1.0.1"="1f3pls8cpix7yzc9r6fi8kha26mq89sm6wmiamm4r238srwrwhi7"; +"gfsneohellenicmath.doc-1.0.1"="13v53xs4znh9zhywh443rlmi56596yrw665032lp7kh03rmd8sf1"; +"gfssolomos-1.0"="1hn8k9majggqcis32nw2krnqpqdgy3y0dk777i8fqn28517ygxcx"; +"gfssolomos.doc-1.0"="01cw6sq180cjjzwgi7p2qr9pf6rq0r5zmnb39bch2g0n0rjxqwgl"; +"gillcm-1.1"="11aph8kbrsjl4ax5hbpirsgc4aznj0nkk76v1ax6d52f8bxjsgjx"; +"gillcm.doc-1.1"="1qbhq72bip77lsa5pk05g676c08wc0y1ix3c2iw1h5g5fk20i5y9"; +"gillius-32068"="1i2awm02frznjssniqjplhy6wp0jaw8f6y58a5hwyz2gh754hsw6"; +"gillius.doc-32068"="0x8qr4lw81qlyz0w14hc8s88ihm8ax13cw1av53gl1vkax421mrg"; +"gnu-freefont-29349"="1gq5dcbc92cxvlqddspc9m8v5biyafgvjc1k7fy8z31vll6wnfzi"; +"gnu-freefont.doc-29349"="0czpqlipbwnqsh5hp6yaq4ypqzipm0xfsvrfc36pri0d2hb77clb"; +"gnu-freefont.source-29349"="1cmd2p7krwhkg1f8xf0y4z2ik9g0pjc0qgi3c5van9zva0bn84k2"; +"gofonts-54512"="0sashibrwwfhd4f103qhc5w0z9bz0q3cqm22cvqp7mjqp4jrs1nj"; +"gofonts.doc-54512"="0j5ncdvzg0dr0jpqx9m3iyx14jdjazwn7xb1in5ivcd20s2bn4l2"; +"gothic-49869"="0kgzx9qh17hcm33bx8r6wh3c9j6d8v0xs4fhi3w5vwmmlmyv9dni"; +"gothic.doc-49869"="111pz7iz7zckzsdjaxz6p7chp98144727vh9b3y8v2yqfz06vzid"; +"gothic.source-49869"="1r61rnird0n9iz9kg5ky4b602wmvsyg1y94h6az314ax7zdccm23"; +"greenpoint-15878"="0l27vvxzyiar7y1x1a3hk0sswfazi356wsbnx86dp8l766qcc3d6"; +"greenpoint.doc-15878"="0zlrfv2y5ixhyqyr5hxycalg6bygvw1f6bfaxqdpakwiz7k3zabd"; +"grotesq-35859"="0f3nmf0flj20xaxz8g73zp0qcm78yvqx1idyawrarpz3q7zdvqfq"; +"grotesq.doc-35859"="05fy8hg21wq7z2zfsbyjszamif7ixk8aj5bbjsjinyxzfkdack3m"; +"gudea-0.0.1"="00565sv65b64h18cib0hbxh73ylg07lk7wxl9l9gvdczdz7a4xk6"; +"gudea.doc-0.0.1"="0rk9g6kcb8wjhf6is5wcbrr95hv7ahwl9xa9vqnfq6m1yy1bah13"; +"hacm-0.1"="05layzjb8ngwmqvg49abdi55j9gl1l74sm5baipm0yi0k1kr8xy0"; +"hacm.doc-0.1"="1d1znq8r384b4xpc9f81023asq6yrkbvyif70wjn7h64x1wpnnn0"; +"hands-13293"="0x0vdn7hq6k7wr7yxn8pnkvjhjq3mfl781ijrs2mpvjqygqffzag"; +"heuristica-1.092"="1sxpr7f4s5a1q2r76r7rj43drsmljmd32wxwgwj1x97a5k7x3jxf"; +"heuristica.doc-1.092"="1ws9r2hhcqdgcdplhgvwhhl7c834i4rkk0xrsf14c3gwxg0x1ip6"; +"hfbright-29349"="0qwwr02q170q29rlq7fw61888k1pm867vgj70ijckivibl0j2snp"; +"hfbright.doc-29349"="19zdznha8bfwqfyrhq18ad7ri8nd240hjs9kslswg70xfrync877"; +"hfoldsty-1.15"="0ar4swzfczqafanfzhwyw7kx765w743r1davbypc7lglcxwjw5y4"; +"hfoldsty.doc-1.15"="0f9gcdi8wqq5g3camccbdzfyjppyqbvvv0z10grazq463lv83jq7"; +"hfoldsty.source-1.15"="1prpbq8833njsmqanxzf25136g46i2yb4bqpvlps52294pjh0l0s"; +"hindmadurai-0.0.1"="1z3590pi02n90hwsjmihxk957hcqgc3kry3cdwpwaci43hxcvp2m"; +"hindmadurai.doc-0.0.1"="0zws4bzz6fkhxnpsjxj15wwnvbd6rhxqilabzzvm43lv0y21hvlx"; +"ibarra-55820"="0swgfxfgbqxv6vjan8dgh3v3n9164xn144wprblhy6ka00xd3h0i"; +"ibarra.doc-55820"="0ca0p2r4rhk4yqpw68fjs8ci3r31qxnv930jr89xv6ly05b7vs5j"; +"ifsym-24868"="1bs3974l1jdv0b2wwa94861hnb05kb69bsyhvsgh6k9xgmgwfrla"; +"ifsym.doc-24868"="11k9jfqrfmshwpmni6bm0324zj7c939k6shvi2l69k4w0kx6phlb"; +"imfellenglish-38547"="08x5z9s9mc2zq6la6dls3g37b2wn24ihplzhpz6207sczg1cz6vd"; +"imfellenglish.doc-38547"="0s6vzdh5amsyb0anw7m61m3wlan8skglh84a678ha5h7rs0qfqfr"; +"inconsolata-1.121"="1mbf4m3ll3r4nhxnmd3ridq7kdqlcjcm3g2q2s6qxgn4b6j9ikvn"; +"inconsolata.doc-1.121"="1rh7kisvs33v91r19lnqgma705dc3gari0g153ws8bd1px3ivsdm"; +"initials-54080"="13d5pvc2q6xc0i8nbjpifn5xyn7wzln7gng98nnpjxhk5y67bcz9"; +"initials.doc-54080"="0676gq5dx4pqs6c0z7i48gi53mlapplmms8s66qwpdq1aksswdcq"; +"inriafonts-1.0"="0kbf9rvrml10qk5pckz21ag217wimqhdxjfk35ll0a17hc9yzj68"; +"inriafonts.doc-1.0"="1hbhfhmnjya1cmj1wzhvbny7maw9m2dr7sv74g2ka6gnl1n4rx1x"; +"inter-57213"="03fjlav3f0ydw3hy01mwg67klxlny2cj7746vh456v8hx8py0zi6"; +"inter.doc-57213"="051bvp87905b9764q9wv42lfpkn8pgsygkgxzyrx3p34dvi0r4ix"; +"ipaex-type1-0.5"="094z08ygcklbk7nzklfmdz3lfmicrr40i0wzxmia93v1vpsjb4gh"; +"ipaex-type1.doc-0.5"="0946rj1bh2hi0779ss6d003wi4xcb79i9p432jkry07xkr3fpy7d"; +"iwona-0.995b"="1gf8kmpmp2cjz5sg0lx8j0kr67a5xshjkghpiy70jnaz7k8fbrgb"; +"iwona.doc-0.995b"="1skk4p2pblh8h37rz2pjx18h8pgbagvr9w8h9d83299byvjggpi3"; +"jablantile-16364"="07f298cfha42q2d12xihaqkga2iv1id2wa5ph8a61z6ckhchzz69"; +"jablantile.doc-16364"="1lp90rbrji8nld0wzry2nn0m2zb2nrqnqyy85p9sh9rmrplhj8f5"; +"jamtimes-1.12"="1sn588j6v6gxfgk31r861s7cpfk2ir7ip75hm31rxi8s8hv8s7s7"; +"jamtimes.doc-1.12"="1n91f0b0bjwbkm1rq5w2vwy6wlaizlp7qb8pxm2wn08b5a825hvs"; +"josefin-57152"="01l57ps37gpy0zriq62b0z897hxwajfvxc0c9npk3i0y5sqa0j6m"; +"josefin.doc-57152"="1k3g8ani121fbr6n9ql2gbrym3a5k7vhac2zz21kf5rxwdyvk19v"; +"junicode-1.0.2"="05prh0zpnp9llpd1hgpisdad2na8q4qpvsbxg3lcldvs3s61ndnr"; +"junicode.doc-1.0.2"="17z7wdsyrc3pxjqpl361ijfp9zj50g3j66q4sjddg21p1dmcqmi4"; +"kixfont-18488"="02zwdm6zja38n41pvzay09f38cam28rr9ag6yy1m5kmw8421xp11"; +"kixfont.doc-18488"="1dvv4hdgkzmdn7waq4djsgdd8p1cwq3j0bddgxq2y94pq64maq0q"; +"kpfonts-3.33"="08fid7im3qbhcn3lshcm439xbh7m39ic30s9xgh3x46a5rvfxn4g"; +"kpfonts.doc-3.33"="17byn04jy585vy3l61r8xfxcz5y7c3qf90z4kpp8fadbjy8ax7a7"; +"kpfonts.source-3.33"="0agjd63ryjbrhq9iq9k0avqjfm98c6p3ds8j6bc7mv69sd57vxh4"; +"kpfonts-otf-0.35"="0b3g68jhdh4387z00klr613hhp6wzxhihn4q4mi9khkpq9gh4yq2"; +"kpfonts-otf.doc-0.35"="0ixaiwdkc7yj2r1s5s6606lrr1kkicqnxva66562lmyw1w4cmxfh"; +"kurier-0.995b"="0x9270xgsk28i5dxp29r0awf72l5p0786mbx7gb5d4vppkf0v9gx"; +"kurier.doc-0.995b"="1d3lfxixhcrkk94m7ljfcb90yvdwjbp2axjnpr2bbh32xv9zzsnk"; +"lato-3.3"="1w70dgmvcwm9jff2ap7s78qgqs9ip4a6dx5wz8iyd7hn2mwf1v80"; +"lato.doc-3.3"="1fj4n1y16x7hxyd63myk902iwm6lr074rkdybv03qwxl12p9ykxs"; +"lexend-1.1.0.70"="1lqqn007dpp24jcgpn9fdf7ysb99lgrz9zxjw27qm2439wrzhc1w"; +"lexend.doc-1.1.0.70"="1h7s17x7grhdb1hxxg6wql3pwy1w08iywpynymrqn8748s93yy4m"; +"lfb-1.0"="080305sym5mppkmgvpxw3ddn51c7gh07b5b9vs2qsikv616077ml"; +"lfb.doc-1.0"="1a5y79xx9fw1mcinbkj7wv4gmvb2gmlm7sbnxc07603dc0lrhjww"; +"libertine-5.3.0"="0gq2gg3xw6k47s0gcl6gv3kdw98d87k85k8qimpvr8zg7crkrzr7"; +"libertine.doc-5.3.0"="0pqkaz9izdmc22q83ldm637bi4g02s70di8wm7cg15z64cd7aq53"; +"fontaxes-1.0e"="1xm9a33imgfsj1r6ky6c02ir857ccv5llqgjyfh2rlvk9xprmcjx"; +"fontaxes.doc-1.0e"="135xhw9vda8l3cc76ja8akfj33wfmmys9wf2f1j5n1p742zj0g3s"; +"fontaxes.source-1.0e"="0mq9rmi02p8lnkg0a8s1bi7rn34dg82n9cqr14sjrhqfvpl3hzr3"; +"mweights-53520"="1i4jp9yy9yy1miyzcq25nwm4zqd3936v4mi2acv4g1rgzvai86vs"; +"mweights.doc-53520"="11114i98f0qscg9796df1vwkf2m6ycbaimk4qfwv47mrxhvwq5qg"; +"xkeyval-2.8"="09db1yisjxlw2ck3ypjzilgc1g2qlrfk99wkgfagx4k1cb1fn1r9"; +"xkeyval.doc-2.8"="167wjc2qmna55lca5gsbbnagdm5g8f15hn6kf39vxk9h0i7jvl56"; +"xkeyval.source-2.8"="1qs4lnkiafxm7likx3pxrfxkdgi6cz8pqlv7b2rwvyrz4kbixj2z"; +"libertinegc-1.01"="14fdpxgsmq9dhgl2065rdsp0fnh9h0xcr0jzg4k5gka9irazxrzx"; +"libertinegc.doc-1.01"="0isvl0ghjji427p1fd1w0yy04c6zjmp058k5gkpsa3xkhq3ijvv0"; +"libertinus-0.02"="00f4wjqqz4hqh2ic8g162mnn95s0p2v1qshbm0zrnzjy2gr51hi6"; +"libertinus.doc-0.02"="0zkv3fgkirq6jcz7ywb1sjnnw8vfwfgd3y41lm4ds547ra8zp2q6"; +"libertinus-fonts-7.040"="0izp1qihx1arqkgbdp18ks0xz7jlyd5cc4r3d5nhdnpph1nry9r7"; +"libertinus-fonts.doc-7.040"="1zn6nlpr95syxmijr7w0cljq21qfv09b2rp8j6n0rvyzm50gc4fg"; +"libertinus-otf-0.28"="1wh5wwf0p2halvh4vyg4iqrxnz9z8zfm08pa3pn9iv0m0g9yv7zl"; +"libertinus-otf.doc-0.28"="1r52ijg0rvhk15hd3i74csdmmclid4hj6v6a0436g84510879jfh"; +"libertinus-type1-57754"="1xy94cck1rhid4a06n3kygy047xwlw5l17mj40n92dg188azfxkc"; +"libertinus-type1.doc-57754"="0fkn8p60m8761mcm3wa3nggag4h9rq0df1bdndafqazwvwnfc9m1"; +"libertinust1math-1.2.2"="12ghc0ap5n6yfb9jj8lsx93khc0ry4c87frpv2n2qs5vz1qddk03"; +"libertinust1math.doc-1.2.2"="0y0vnjhw0a8xwhgmrp917wf3r8b4vm4s59nldmnmjqj8l0yar6rw"; +"librebaskerville-56018"="1xv6f8bw0ygvwjlxcr0pciz6gamw8xvaqrryj87jqhl9phm12y33"; +"librebaskerville.doc-56018"="1331px6bv7zz8ijq8l368r6jml3rm4f81mrpw0hj93x90asa2fhy"; +"librebodoni-39375"="143ccap2ah0akw3gznf99bcw8dri83vrh1fsgzwmw3qdvqg73ynk"; +"librebodoni.doc-39375"="1wigr8r4z4a0cy8m2psz79fdm4dxpj4ara1am8zdvi5rb0nga4as"; +"librecaslon-56003"="1rla3bnpr548phkcq98h57bj57pk6x59dhpjcadrybhjg02hgx79"; +"librecaslon.doc-56003"="1y1rkqwpjbd7kq14zm8n6z9f37ybvy2g51axfkfx5q1cqc4cx8ml"; +"librefranklin-54512"="1p5nc0vbrrv4ak42hm6h8wi8nn4m9sfrbppxyry5dsx7bpilkndy"; +"librefranklin.doc-54512"="1wkvgzymak63ldng757vibkylzvg10jv0gs6qyzcv83psxwch4xs"; +"libris-1.007"="0nprmwx67zbq7xhjbb4xiw5da3i0k958zvb3z32s71jdd6psnphr"; +"libris.doc-1.007"="1vg5jgllfxh3rdqjvgmzn6ak887ar7a4kc1k5cwwwgmgdsfam1zl"; +"libris.source-1.007"="1dfm4q73p8q8bgn33z025sgna1jq428d5dvmfagjjwc7sjd93ncb"; +"linearA-15878"="18dvv5vnzbpl9aavz6z9ybwds2plr6k5s57z9xiqw14482bdv1ih"; +"linearA.doc-15878"="1lksqvncx3n3bab7hhk47fxnwy1bgfbz998j1v1zf1zq0lb3dnh3"; +"linearA.source-15878"="0ayv5d7sb8ilc7si05a4bdwv06fkc4s80dsr7lggg47n4dvl75fr"; +"linguisticspro-54512"="1xqjb65ny71bq6i3vv7xarm8i7mnmfxkzjd1dnl5sxlfcrlfq3zg"; +"linguisticspro.doc-54512"="1y0fy78msvgkssbp612gmcdaz8mb11nv87hgwg0iqp2wpc4jrh99"; +"lobster2-56019"="01a5kxpnqkr9zghg3pybm4nzhqyhpw5qj566viqj7hz2cwyx7rw1"; +"lobster2.doc-56019"="066zv0ln2288smhmcgj66mdl86a2apmx4l6sdz8ag2z920y2bh3f"; +"logix-1.08"="0yyc9rir63lnnfppgw688rpvw0z4sf9nmm9blvv1praks83cnhzj"; +"logix.doc-1.08"="0ivym2xs8725sm2w65ryf0ymk37l3j2q6sm8slv9af7s5plkj4db"; +"lxfonts-2.0b"="1hl703cxwldq4ams7044m02bmnvm8vkym7xyz9cb8xkaqfyqp8cp"; +"lxfonts.doc-2.0b"="1lfrcfpn9a260bx47nw6msvksjzqjqms5d31nprc800wk2vb8sf6"; +"lxfonts.source-2.0b"="17j1kys5hrvkymba91kp8f1kq5vshc8blv5pm0m6yk6p4kdnfkyh"; +"ly1-47848"="00c2i2adn86dlgmi94ar26nba8kjrsclgzmf7hdmgr01y6hr8mp9"; +"ly1.doc-47848"="1lmy309am46cc0ryx6yr5jri9sqn364czgpjwzrcg06ykjwsx9y5"; +"magra-0.0.1"="02zwkxc94lzi5wf29wws8ia863ljq9bq9swkh8k8318v5z4dv5ig"; +"magra.doc-0.0.1"="0q6ss5ff86ckqyv8l2iy6mrrigzz7yavizqcy3w5s6jhjadz5v69"; +"marcellus-56016"="06xn7rc0qx13g188jp2y7wb9jr69x9k52y8ljxrqidfc1bxsyh30"; +"marcellus.doc-56016"="129f6m3nxszvgpg10p6qyxir9y1wyj0y4q6p6848dnhm8bjqqhsz"; +"mathabx-15878"="0x0amwdxr6mh6j1m1q6wawljzjf1683xp1fxfqyxmsk0spx032mn"; +"mathabx.doc-15878"="107fimmxvfmdjdi1rlk0h0m88q1dbc9q1qwqhx1fwfjwdn62kvsi"; +"mathabx-type1-21129"="026pnrn2y7zrl8qfhjv504bjk114z6kd6ich2ic97l5f3lhl9nj2"; +"mathabx-type1.doc-21129"="172dhvsqql6fk2hfqcw19bxsqwqjfd7376a5wwzcvdgvx44s294v"; +"mathdesign-2.31"="0jd7xfwavfn4dsss35splcxrqj6qwk18jw7qgkwshpifp7m79l2v"; +"mathdesign.doc-2.31"="02fsi2hinjfcf4pb0r1d0r82s50734srpkk0i9c566zx3m52v2vf"; +"mdputu-1.2"="1ihwhdcmk3gd081yn4wimg7yadvxkygybr3bypqrvllwa92lay3j"; +"mdputu.doc-1.2"="1hsd74svpxxmjps3fng679hq7dm35mz9glcwwhk1carzafmm2ppm"; +"mdsymbol-0.5"="1rckczggrdd977n7dr223zfvp7dl683p7d6wfija8ln4d1ll3lz8"; +"mdsymbol.doc-0.5"="0v8d92kpka138yzy4a8hg5yf6zrz267hhsakpm2f0bamdzqkp4kc"; +"mdsymbol.source-0.5"="0xh9d4xpdyacmb3kxmqh71qfx0b5qbrgxrw3fj2nh2rzh35smsy8"; +"merriweather-56365"="1rligpcik7vjvzwv5m9j6ws28f6bh1nxmbsc96f5hrh3b9fmw33h"; +"merriweather.doc-56365"="177al50mr35l1i9fqr0wivjkhd3idqsh4wqkpwkgj1q44v4vq7af"; +"miama-1.1"="0138r1yrv1880nmcpgcgb80nzd29xchm09s8wxb53j71q0vvdswh"; +"miama.doc-1.1"="0dd32q8clxgkd7cdk0699fzplnib4waydx9y9i33lxxwjkfnfsbl"; +"miama.source-1.1"="14d7ryxz6q17jn94wlj5vf2hzif6i08yjbxh5z7pdcgrnl035gxj"; +"mintspirit-32069"="1qapq7j9vf8pmnhdn16c51r5spcssx1vchlfqffcqapbja6fx5vl"; +"mintspirit.doc-32069"="1qqcw9zq18y5pgnrc8mks78s2qws9dz39wixj1hf7c55ryhd6aak"; +"missaali-2.0"="13y2dm6phd9c77j3rajvz4qma2h2k4nwhb520j3mm98bgmbkphf7"; +"missaali.doc-2.0"="16487s0ijkk6va22rhhyhxdqik863n1i25p0f67gcb8xp1s5l1wk"; +"mlmodern-1.2"="16f5cpczawzx4p44svpzy205l9m9g06w8r0554cgdpqdbwr139fx"; +"mlmodern.doc-1.2"="1rqb0g16wj7jg65xm0rk68cfz9r00zwy4r73wbkn0fqrchg08yn8"; +"mnsymbol-1.4"="08b0ypa29zkbch5isk39bbakg76yp5g7w4caahphdljkqy4k27zd"; +"mnsymbol.doc-1.4"="0pv7717qcjd5ps6vnlmxk1bqvkhi9lx6j92i6ggnak8i1izd75fw"; +"mnsymbol.source-1.4"="15ksx2lxxyklg4dcckm82hysin9r2v7pa3v8gjns4wabj4hx7v4m"; +"montserrat-1.03"="1blgdkfjjjhzk41myfp7bb7x5wf3arwapas4mm1770d46nab1wwr"; +"montserrat.doc-1.03"="0blk6jxz1xrascrdalssqd9pdrvpai3k9bqbvgkyngqhp4rzndv9"; +"mpfonts-54512"="1z5ws1kr5s07xwcs39w049yvhfwadybjxb32kf9qd8818pgd4zkc"; +"mpfonts.doc-54512"="1hjy2jqm8mlrwiipl4f1rp10nya3zcy2vsyibhs7f280h4zhdwxz"; +"newcomputermodern-3.02"="1vwbvr7ywbc1fjj9wmjva1h8fxaixklzwcks5d9fzpd2825i3mpq"; +"newcomputermodern.doc-3.02"="0x94jcrwvg0jj8mi4j4xms2jgig651kk0yj9r1gpkwbwyhkwqkf2"; +"newpx-1.414"="1l8l65fdc474xdphldqvllcx1w0a22fsbgpnjvliyjwwh4xb233f"; +"newpx.doc-1.414"="1b6pm2ngc3a47sa4xwjmvf911562sdsmkr0j569rr1kl7d0xkz26"; +"newtx-1.642"="16d93k8xzvkam7apcbq2fpxccym5pgnjm1kjz7d7khwc221jh48w"; +"newtx.doc-1.642"="0gk3zhiga878qc6gf9p61d8fli7hh9mrrdmbf70fc7rzxy72s6yw"; +"kastrup-15878"="139ynj6jr5iniwg4ry57b61bpalchwmk2lvxpzi6rzhp42ifv1j1"; +"kastrup.doc-15878"="1bzjky4plcl24fg5rwbjizixwfn7nkbzb6wwydxd7s2053zba07a"; +"kastrup.source-15878"="1c4ijjifc4lwimzrhp7ym5804fz5afmccn4bnfayypmjqpc8x6jw"; +"newtxsf-1.053"="1dw182jxwcmbg2qzv49w27lm5d639iiv0ms2qxigjiwakw714yz0"; +"newtxsf.doc-1.053"="1xk4n0hwg7hgzqzh03as1bayqx58rs2sa7d58xn0wd514blz71lm"; +"newtxtt-1.056"="1rydma1iqcb7k8ihyhpgdbrq4vpsy2dwyij2pr5p3bbmsc60kc42"; +"newtxtt.doc-1.056"="12mvwqmpb1hyn3l98z74qhyqzkinzw4q4f4q0mx1z586238q4klj"; +"niceframe-type1-44671"="0lcah795iqxkmdkr46gk76fypawz1mwiw3nxvgvbx9wrsdfccxy0"; +"niceframe-type1.doc-44671"="0prjzgj1fg71kf38asq8622l6yjvn1pn6am1nxkwrpfmn3bmn76n"; +"nimbus15-1.013"="0w94j8wh65aprww4vsk4q56g6ra8rhbhbpdw5zhhs24i4vrgl1x1"; +"nimbus15.doc-1.013"="0b96wcvh8kgiyxlhzdgpwrh59hmxkmhkpjgiwwxi9f251cp0iq5r"; +"fontools-58747"="1wjf1zjlk33avhvh3mlws1ni3kfq80hkvlclj0w2qc432hy5b0wv"; +"fontools.doc-58747"="003yajraa1bpvxqy0n09hy1rfjn6an01jl05alabkglra2hqwcrx"; +"nkarta-0.2"="0mhi640hsr7dy7jbvkqq2yl224i9ialf01jkcma0cq527nvrnm3f"; +"nkarta.doc-0.2"="0bqix170zf7lgiv11v4mqyq3iva707zv91z154bi71cvnlknbkns"; +"nkarta.source-0.2"="0f6m2wz1cd99s4nxppzdq9jm1hg02xzswgm85dmi18jffgrd2chp"; +"noto-54512"="176cz2x9aizx2wf70zzbb1b9im0xvmkm42zi7n4h2l7kknlig743"; +"noto.doc-54512"="148kbjzwhmkghdlqzj2vww02z73rbr5rpbcr3yryggn3nlf6y3wq"; +"noto-emoji-2019-11-19-unicode12"="08wv3k0gkhd9mb8b3l2p4ag0wvjj0f8iraf1wnfc6i1757h40i14"; +"noto-emoji.doc-2019-11-19-unicode12"="19iwbi47c1vr3jhffqvdsg5ymq2w9ks1n52lap78bp32akipjpaq"; +"notomath-1.02"="1ky2wk10mpbhjpqcsagm6sydkb5n8czpryfs32xf6w64nzy5hivh"; +"notomath.doc-1.02"="1wjnrksgn1qmalqq1c11wdlpwq34hw8zx07cyi2jw26qvyh9fpdf"; +"nunito-0.0.1"="08hnxivx7ixmvp7l6kxfr0vxy7c78i9jqkam0xxg5mkxs9ip481k"; +"nunito.doc-0.0.1"="0xhv3rws4kp5s4q4c10ykkf3yyl9i9ndxjavjx9xxxwm1iap9m3f"; +"obnov-0.11"="14cz2rqp4sf4f880d49yhvqjkzm5aw91cdijmqwf283cqgzhdmlf"; +"obnov.doc-0.11"="0k20zh42vcm449dh662frdmspmycx0mi81ml8qkvnncy8h40jxr8"; +"ocherokee-25689"="1xhb9y2m6sahkqlng98f9rqi94hrj66594zqdd2sv82902vfgl9p"; +"ocherokee.doc-25689"="1fqjs1zwf9rgdzzc0wk39y3jcn150ssh6yvda4jfyqg3sv17wwgg"; +"ocr-b-20852"="0y62xmxbw7573fwvfr69r7bhfcywvhcb4mg7am5c3j96ipq5vqzh"; +"ocr-b.doc-20852"="13r2chskacbnfawlc9xwskrl8lqj3dx8gzzpyjjk09rx1g5q9gc1"; +"ocr-b-outline-20969"="11lv3dba2g8mrnfh1y6agg8ipivhnppd3s7gqljlpdbdbk40zbyn"; +"ocr-b-outline.doc-20969"="0017l87j9g42cjy1ki2xksh6xq0hl3rsxcrdyrddvvxp520p02x4"; +"ocr-b-outline.source-20969"="0yn2mcwj73mazk503f13qmfy2bqkq0gz264ckr33bc88f1i1518b"; +"ogham-24876"="0hl3xjmd2bagcn2wnmr2rs1hzmgvm421rkdaimplzdnwj0r64j49"; +"ogham.doc-24876"="0phm6xdxl1a6nh6g17nyz6p7f2ymll39k42588dzw45z7zwan40i"; +"oinuit-28668"="1wr3r06hbxrc0v9cwyp7ad6jimw05x3yn6vqpnzchk5l0ixnlkaf"; +"oinuit.doc-28668"="1919kmp5sxd9q49m6dd8zrnjx0cqgav1i87gag1rffd5hz9w4fys"; +"oinuit.source-28668"="1mymvxv4721nhmfdlbl9bgc76dainzykggf93jx6xfwlld0krgis"; +"old-arrows-2.0"="1immbai327l7vkq67nz6mcnyqmx3ajg3blrhbmffkbl92482bv4d"; +"old-arrows.doc-2.0"="01kdfgiqp5n74lipiviv2alzallba37gyzfp1sqrvwwvrp3a3z63"; +"oldlatin-1.00"="0cxpm5qvbn0a643x2h4dc0pf00kqqk1z540j6dp7mbiwv48qqzdb"; +"oldlatin.doc-1.00"="1my5h8wq241dm3d6czb1spznrxmrclwgn8i391pwmc11z2ijqgjk"; +"oldstandard-2.6"="0pzn7g28sgidxiaapd4zl8pb8brr6djvvs70vhbi7902pbvc0bf5"; +"oldstandard.doc-2.6"="1cy73ycz7dbmbl8c6m8hs5nigvi30dkjz0nwwkqqqwa6gyjz6dw3"; +"opensans-2.2"="0xj7v9lv1ni7mq175l29a039a2ifmdsy1wnv1h0gfni5c34knm1w"; +"opensans.doc-2.2"="178pa2kjvp15la857iblh9qc195z3byd1wxxyn7c5bzmndvypgxn"; +"orkhun-15878"="0x78b5d70cxy7binl5iq2jwgsjh9rzs87wc8ib18jxscqick5jgk"; +"orkhun.doc-15878"="0q9hwwf80hq6wffyvd26kq2053vs5czly9zlsclh93hsmzg3vj9g"; +"oswald-57253"="1nl8lrvxxjwhmavycz25znzff1qsv4br83w661fplzp5nqy2xmh1"; +"oswald.doc-57253"="03jhmikwzb86xrm01vsx1an0bcrkpcy8m0ivy1nkc5gjq94zilzr"; +"overlock-56079"="1p0r7sviizbc2kraq4a0k92hrzyjq5qijacfddpj3fhf0sx340ij"; +"overlock.doc-56079"="0zg9lqn4853sd5829v4wf8c8n3nyac0l9xsd4bg6mx6zwm4jbw7z"; +"pacioli-24947"="1fc15ygzkdbv5mykgrmzb6filkl3aipk7i9k1syh2ssr37ldxcjz"; +"pacioli.doc-24947"="0pknnd02q244pxyc2vapdx04adz7gwf41swda2xi3039x82pm8fd"; +"pacioli.source-24947"="0zl6l5yc7v5w1xjd83prvfmy8jf3jyblallphyglgb4vkqq6mxxr"; +"paratype-32859"="1cwcw13xdarisjslsp8aayb984fk4qhx1ihg887fzli0wn7kpvvr"; +"paratype.doc-32859"="0kz4nzz3v6a4qk2svgqyx02j0pni92qpm5agb6k0vwylmvx6yyzi"; +"phaistos-1.0"="064gh7pwrsp37dxvjfiar9bl1i30a1kngirgywndss8xmrvqin9m"; +"phaistos.doc-1.0"="01wd0636h2xs465rypc5q7saxhind14krmk9dp9rqc9129k7rc0q"; +"phaistos.source-1.0"="0l6nmd3v9x3j8if5aryak2kh42zza0g73plwv6im6hpxkhhb21jf"; +"phonetic-56468"="1cd8x4qajx3896a1bzyhnrhkg8j73lffri0fzks5h8s27jlnl6al"; +"phonetic.doc-56468"="01hnb97dwbd7g4lflb9kz3w0vhnk5nzni31sfiqbg35lypa0pbwl"; +"pigpen-0.2"="0zd90dp5bx1l5d5ka8lzx83yprl1anh7r4qc0laa455dix3swfq7"; +"pigpen.doc-0.2"="0z0a78akxkigpw7289692sr3z8g2vnyc6hwcznn2963vmsrayv6c"; +"playfair-56005"="1zsvd8mczjg8az9gp7srpq6nwr3gkr1v2xl9d9zjdnczwhjmyqjx"; +"playfair.doc-56005"="0wjzinx1akf83i60ayj8riw2isara4319pikj52naq8d155npj3a"; +"plex-54512"="1c932nw4v39wnzdxjlvicg5pllyjxgwpdg44kc9dw7jv313ph2c0"; +"plex.doc-54512"="1f6vdcqbxmpz5kzkxnj75g4jjhgizqrjzcz2g1j1z1yd78k0bh2v"; +"plex-otf-0.07a"="1xlckvvrv9j03gzg7b4jw2ff8zpp8qi1996xlm6ixxj6kiipk9c9"; +"plex-otf.doc-0.07a"="16yr6amxalcsjnkphfwyn140k7q1lgbnch6w5iv1b106q2wqxx69"; +"plimsoll-1"="0x39p7fhfyxnz95g44ci8xdiwiq0w2n7z3vq2vm26l9ia9q9m6d6"; +"plimsoll.doc-1"="0rjjk5l0zvqmj32m1xcyrawzzllbs11bzb4i4cvzmnakzlwkwcrr"; +"plimsoll.source-1"="1b703r0ssg8q021z9dc8n7p1w7hk5b548icc269gjrpad622acmk"; +"poiretone-56070"="0wxqymp27c173h3qs7if47mwmfa11d52z07fl0pxlxk1fiy3vwrd"; +"poiretone.doc-56070"="0w3ypjqybh9i711c7zhf6iq30xc2xfp4ppxh83fgp71wzb0qqyx2"; +"poltawski-1.101"="018iqwz4apkj8pwc3ws7k00zldnz4k02h1hv0ry9d83z34xswfsn"; +"poltawski.doc-1.101"="1kx83mgwkxd0sv2xjzvn6wdsbdng6skw71z2xc3xk16lk356q8hc"; +"prodint-21893"="06s9qbfy0rkfby9ff3dylykl81yb3fxpwxrwa8hn1aa2gd9bj2n9"; +"prodint.doc-21893"="0z8ibz668zjjjypcn0kiy488wzgwzxqackz5z996r3sq5x5zzgh5"; +"punk-27388"="0jywh76pckajz8m9c9li6vvybjwljyzhk7hsn437mswbfdd5f2yz"; +"punk.doc-27388"="0lbly72hl8a5996dkjr5ssnzklbshbypxymp4zgdvb0i033pd0r0"; +"punk-latex-1.1"="1wfs3li3h0fv6dmpvfjvf0bhq72iy82gpjbxhp3ssm7sj41y07cf"; +"punk-latex.doc-1.1"="1agngq3shcszz054gmikza54ny6zki30rsww8mp7h9ab5nmm6wsf"; +"punknova-1.003"="19qc4ypax7jlr0hw7aim6p0afy9a2qz1ifasx9dh5rnqhjf0q5hl"; +"punknova.doc-1.003"="1x432js1hj43nrxg2bvp4wrrmgpi6p44ckrfic1gk7ki8wzcx4s4"; +"pxtxalfa-1"="07i7xk5v73r30bn2nmyk730pib1d9gwgpg0kqchp2pz27vfjc0f4"; +"pxtxalfa.doc-1"="0jvw6sj4dw08cmifddba2fdq300a4x6vkczj0b1qirrq5vx87iij"; +"qualitype-54512"="1r59cbk6rmdy0zhljcfqxksf101rkzib8ll20ak0sshc3f1jj64y"; +"qualitype.doc-54512"="1jxcqd48v11b74drv0lh2gv65aqsjv5zziph2s9g5ldd1733fgl5"; +"quattrocento-56020"="0z5497g9msnfv3rmydr5aa217vbpqpd4x26q1qy71wllpa08gmk5"; +"quattrocento.doc-56020"="0jfykx42rcfzqnafz6497dpfwh0g05sivfi7lkwrnlbjz5zyslb8"; +"raleway-1.4"="1d8zv0x1j2c996ql8g7zc38s7fpc61ibk5zdixhj7kbfrz5cbc1b"; +"raleway.doc-1.4"="1i8hja5817kzy894j25hy5cjnw31y4kcahcymx5hrbi0aplhizx0"; +"recycle-15878"="0pj6xvdd30b4y1fa01vmhczinw48d6psfd8iy0rpzpaq89rbjrvq"; +"recycle.doc-15878"="0sylgv7viy4qgl0krhsf8q1gkxiz91wpn0l5jyq5y1zg92x8jk1b"; +"roboto-54512"="0gckp6jfkl7lfhff9300nr4zx1wdp4v49a4341hiapc8151jrfry"; +"roboto.doc-54512"="0lmi8yig397zs56v5s834plz50l27rm9ml5qfa1w2zcrims59zcc"; +"romande-1.008-v7-sc"="1bmqvxmlv2065ifn6bdy8i3mj1g6pkg44dhjrfr4sj5g8dihhqq0"; +"romande.doc-1.008-v7-sc"="0fgbq36nzkvfw56rvqajvz8krfd84msx8iykkjizn1m5zkqb4iv5"; +"romande.source-1.008-v7-sc"="1v8360kqvxidzkq8sgcg8k2cqhl59q7bmrk3gvf9vg0shrbvdr39"; +"rosario-2.1"="1jqgz4cxiq3md1dldlil6pslxxrp7brr9hl28qcf6akymnfxx37f"; +"rosario.doc-2.1"="050yna9vb9cz026cyi44f1qc596svxvf6fgyxlby2isl1jqy89zx"; +"rosario.source-2.1"="1bzcpxygwsmcg91nxx8lxc9skm5cr8hbz47qmydwznkkzldkdbh6"; +"rsfso-1.02"="1h1hzsf74jll793qs51pq03b2l9szbqagn2p03bcg0f3lgx0cxx2"; +"rsfso.doc-1.02"="0ibld15imrqmrs36ch31d5a4kdaspjk03vbb667r045ds43q8a5v"; +"sansmathaccent-53628"="0653qd7c2lb63lbgjrbac7kwl2lzygz694li1clwxlkrf0bnv1q7"; +"sansmathaccent.doc-53628"="1r7dqwn7vxgg51jlsgx82kv79fxskcdz6cyhkdbwgd2f3rmkcm5x"; +"sansmathfonts-51356"="1w8sv0jaxgr5pjz0mnllmkd9gpbrg220flr2j5lnz4vlcyvlskw7"; +"sansmathfonts.doc-51356"="18ag0933q07w5l7li369j0a8lz69hf1i6paa30470pf41i1gyxvr"; +"sauter-2.4"="037skfr46198y0vczwcy6dzq9ry8w5imj1ih9nfy9mrb0hmj8caq"; +"sauterfonts-15878"="0x2j4rz8n2v5qw1j71h2yasjv2yh5g503svjrcy70n27njcic2dy"; +"sauterfonts.doc-15878"="0r3xc4128x9nz9wqqs9y7a45lfgll99l7n6k87cb2zkyckr0kk6f"; +"sauterfonts.source-15878"="1k5fix44afwcx3rihmipji2zalc2zhz8m0rcpybpz76mzqsrc1fi"; +"scholax-1.030"="1znmi5l96dis86x5b5ff9yr2ghvnylrl7gn0x02qj8s0j52w07gj"; +"scholax.doc-1.030"="1f110d56spi8gjsniimxjpcnbklxqlck9nqnc8fm3r4h7rrm715x"; +"schulschriften-4"="19nh81mzd8bddd921h5qjn0jrkggy67s1crsjz16pi0l7nmai1qv"; +"schulschriften.doc-4"="0jkgsphbmyy82vxpp0a4a9i2pyn9plxpng6ygpgnipr98v5vf8ra"; +"semaphor-18651"="1fk3qdnkpv28zc8q172w9yn1aq8ff9ag6ql2ghh8aa64j9gygdsc"; +"semaphor.doc-18651"="1bq53xa67jshwlynsbqhf73jgy6pcd8hhdc5dbh83cgma804fyyh"; +"shobhika-1.05"="128p64d6bc0m65nwdrjr35b7rxlx21c025vj8bk6n1frfg4k4lzx"; +"shobhika.doc-1.05"="1zxg9rxsdf15jn0hn81p20j0dbq1095vqrmh7d5mzhlhnybkr1kg"; +"skull-0.1"="0v3kvrk5aqsfna30z920k237jql1byy12qkb5i8zlr73z4cy1ll3"; +"skull.source-0.1"="17iby2rcnqakykglv9k1q5zmcj0h4gj4h2vadihvyyz6m6bvcx0c"; +"sourcecodepro-2.7"="0vzs79a6bhvxap9xw9nm4csqm8x6m83nmsxffqckihkrbcbwnkz5"; +"sourcecodepro.doc-2.7"="04g53xmi3afzv76dn4pg9vjsd903rl0hbzqw32gr7hhgh60xwb8d"; +"sourcesanspro-2.8"="0j0qgb04yvwf265hwiiv581fy39cpr6i9f21k38xdgdi0dl7ghzl"; +"sourcesanspro.doc-2.8"="1lg7jxxcymnvbrhgdf6ddj0nahbr6g5vnz7ahav8v8zfyfw87z6z"; +"sourceserifpro-1.4"="1zwvz4yqvs5pcqwsig4sjkp4chsc089j0dl9mn8ah047nhr2d7z1"; +"sourceserifpro.doc-1.4"="11q4ppkw8m56bpn8s08w0zkiilfz6s5jv0rkqjnqbzn47nm3dqij"; +"spectral-57296"="0rgn8svjcimqm7ji3ga28gmz8dk2frhgnhs99wlsi3qch8ds9pwq"; +"spectral.doc-57296"="14jxmfi62ddhxj9551m13r54k97ms2dd2wqbdsfn3v171c7va1j6"; +"starfont-1.2"="1bf89j0qqyzih5w9ban03k85v8ih0d16sil1sf7smzmqk3nhmrz8"; +"starfont.doc-1.2"="0rjx4wj021ri26zxdlhkh71q3d0ygf3hvcqghq9fwkbi0gnig1r1"; +"staves-15878"="0pb7cghd2p1f7y5x19x3zyvaz63k3nmrwd04g0yqrl3774fvnh1r"; +"staves.doc-15878"="11i1rcc30lnm8fqmnpmk1hgz2fmm54hgf23ich279aqfsk2pm8iq"; +"staves.source-15878"="1y87sw1qrmvgvayzwz2i6qjzvx952h68123fhhv67ga0kpxf9fwi"; +"step-2.0.5"="1r2mf2qlcksllpaakrycmcrpxfq9c4g7n18ip13ykp92fmrbcz4h"; +"step.doc-2.0.5"="0f0hph5cjwhwdn2yyfzvn1jbkh8xm71jw10zagbncapfqfgx5h62"; +"stepgreek-3.0b1"="04xldk3dzcr1vg1xld4hhwx5xzi2pr0v7gn526xr8ca3m3x5mwnd"; +"stepgreek.doc-3.0b1"="179zz295nxpp21p6xhrn1r9ka68i3l9l8bphrb2833a2x6qgmil3"; +"stickstoo-1.034"="0di39yfsk63bhvx7aiicc2m11yjr3l79cb7fzxh2yxlz56xw6x7z"; +"stickstoo.doc-1.034"="0n5p7311vckk3w7d0ffg7hbr1ljlj07z6f3qvaic4z73gr3qv7xn"; +"stix-1.1.3"="1jqrvkx444hvfh7246g22k02jm00m2cnc6ffj36k8qdi1s5m9dkj"; +"stix.doc-1.1.3"="0vmiariam5zd37zq2ni9560kjgia89p52cm1phxqp6gp7avfyl7q"; +"stix.source-1.1.3"="0jjxifyrkdwgbv6xvgpk9ji6qwn4wr91lkdprcdjpmw9b2mwflj2"; +"stix2-otf-2.12"="03ilzmkskp2fj3jwyvlwz8b2ryvb1rfj08ciqhkhi9ddygzjk8xx"; +"stix2-otf.doc-2.12"="18cqnpabka16kfq09rspzgwmyh0fva77i8676myf4wg805953zgh"; +"stix2-type1-2.0.2"="0xrpb3y7wbpxdc627gn9h6s3sjymczbhxqqi0dbicrcrd4065kp7"; +"stix2-type1.doc-2.0.2"="0kqh52jkqgsfdwj83wks80h9v326hxz1zqh2ls346kc6gz0r2p9n"; +"stix2-type1.source-2.0.2"="0ajs9ri4v4jw3hp64hflxwqd9sw75sk2a56lv57qjzzjzkc51243"; +"superiors-1.06"="056i8jrpfs79g2n4fb3kabkkbqbpyii1g0z63mciqyfbs0wvpasm"; +"superiors.doc-1.06"="1459za0bj73lgz7nqv0ys0zimfw1nmmzzcyhydi9km7mjv5sf5r3"; +"svrsymbols-2.0b"="00wr6lyncnpvw806ff8s49w239sqpc8c5zg1776qyhjcpypkfgym"; +"svrsymbols.doc-2.0b"="03jdqja9hm58w65vp6mf2q4dd2i1n6gq7yr9p2qrzjm33dxycjx8"; +"svrsymbols.source-2.0b"="1dsw2z368hj4sixfy733r19yvnx0mi2qzff8647i6faj70lrj6ry"; +"tapir-0.2"="0ad1qkbvvswq7msx9889sz8n7wf8iszigd0vmk2yycykbf0axzii"; +"tapir.doc-0.2"="1m5g6bsijqris8r7z2dw3cj74ajcny2wjysq8ql26531z61hj9ss"; +"tempora-1.05"="025smp68d941hqdxqsd4qpaxvk4z8ybg14xwc47i36k04244rarh"; +"tempora.doc-1.05"="14k350dyiqjcfg5fx09i2i9cqsdw4mh1qcrv8cglf1gf2d0b3jl8"; +"tengwarscript-1.3.1"="0v6mpqkyp7fr1nb5myjs4alz8f7y56rnd1vlsgvp0m2shvnvhy2f"; +"tengwarscript.doc-1.3.1"="0225gpdqbbmcpgxmpjcj2blbpzxcnr7vmm38jkkpyan3gfw52n2w"; +"tengwarscript.source-1.3.1"="0jzzn01c5gwkc8n6naaddm793sm8vs67vsjd30lj4ls7djpnixkc"; +"tfrupee-1.02"="1q0z0as8gd9qb3p10rf5kwzljg5z790cgmxi5dbz1piy0lcnj4hn"; +"tfrupee.doc-1.02"="04zmcfp1xqq53wl41rw199yj47nf7l396qcnsp8dsrvf7d0n0pfc"; +"tfrupee.source-1.02"="19bgxgg9cdgfdvdr4kzmp4na0n6p28dq0iq4nqi849j4ij5lwmnj"; +"theanodidot-54512"="0i3z98npv4f0gmvkfshr26bnj0wj80r6ffdj8s2qdpdfq0m2227n"; +"theanodidot.doc-54512"="041dib8a3y9y5jn32rm5kvfp5vzs20z8kalki5jgr83l07ib734c"; +"theanomodern-54512"="05xc05nsas25sn8f3ra0jaw09zr0kjxzjmx2fdlwdyr2xipdpmga"; +"theanomodern.doc-54512"="1wcvbv2jicvfcr4f6hkh35p6gg3hfb67sphzh29ysvy8mdm3l663"; +"theanooldstyle-54512"="1nzn0j53nl62f03m47k8dwk7qiz9zh8x2mpj804496qd307cmsl4"; +"theanooldstyle.doc-54512"="10vvf59wggqfbq3svc852s9qicwxhh2hbv03vv55fyl8jg9dqxrc"; +"tinos-42882"="16w7c1a7nsm2i6riwgcl39l2r0kz8cp6xydr7xqzxpfxkzhav42m"; +"tinos.doc-42882"="0aq2wyh5cvmi6gnvwwgm8ch6r17ncwihb9f5vjclsj94almpp4gb"; +"tpslifonts-0.6"="14cpw6n2j16mq1742lyjb09zynyjhq1wcljhpbb4c6brwnqvb05q"; +"tpslifonts.doc-0.6"="1wwmxwb2y6zyp1h5hskl7b6bb58ydasv3gq2bj0jcnqhdphgii9l"; +"tpslifonts.source-0.6"="158innbi79r298sj1r4qk9c0g4gv1wzdkcmxf511sdb8ipar6xk5"; +"trajan-1.1"="1hnk1qb46hihc3ga6klxghqf7yvn6zschp6w36a08mz1hfsdb8sj"; +"trajan.doc-1.1"="017v3bmngyh8wydjl7hmxqh2rz61dg2imcl0gabsfs98l8fnwsfb"; +"trajan.source-1.1"="01qgax96y0sklbbb8mdfv5yc0i2k90i23yg75vhjmb7xlwx60q7k"; +"twemoji-colr-0.5.1"="1009mh8kw7ch8gr80pcc9xhdjvsj3062vyzjy0bn8cb3qvhr3k2j"; +"twemoji-colr.doc-0.5.1"="126na3n7zbzngx4zpimq8lr32anwixl571yp0cj0c7clkqa3c6ky"; +"txfontsb-1.1.1"="0g2hjxcqhgynzmvj44q9d1wpxwpwy52a6rbl3nhnq06w2v1lh637"; +"txfontsb.doc-1.1.1"="1yls8kb1bglfqa7yiqidanyjgj3xb1isc7z99ybw2j2kbmvvcjbn"; +"txfontsb.source-1.1.1"="07bapd1i9rwf3946pj54s0m0841ximmj60ic266mcmj5gipw2q1q"; +"txuprcal-1.00"="1l1khap1kpgjsjrbsa3d9hgd61lw4x7pi771mchszkaklqx8qarn"; +"txuprcal.doc-1.00"="1j2y6scl5pa25yk00zf64nqgngrvvb4hbig3qi50rzf5kpq56pxp"; +"typicons-2.0.7"="0acmp2zpg1734c6719jpmcccyq4325h2023bc87xmj7jxqq0xlp6"; +"typicons.doc-2.0.7"="1r9wabmkqvzdj6dcxl9syymp0rzz8kj0lfmqn9j4njghclndkfdf"; +"umtypewriter-001.002"="02b53ljrirn1248ycpagrwg7fw5n96kg3m9y4gh94d36v4bnc870"; +"universa-2.1"="1r8rh4jbx3lxciszf93klg3zwv06qqgnzikhp11c2qmrjrk9gznh"; +"universa.doc-2.1"="0acfyvdbqagda11730d5bmr5qlfq7hiqw7dajq143i54k9ln8mvi"; +"universa.source-2.1"="1ydba7wjiqnjc8drv5j8skv5q8hjrliwd38s6xj2jd12i0zp3gyc"; +"universalis-33860"="1xig6xi179vm2rnp6qimrjy5y4kigyl1r1f6b62jiqlvj7ii31wg"; +"universalis.doc-33860"="15j9fv12ch2vpzmjyaiq3hqx4cg6xlkvn3d0wn7v75y4si86lcaa"; +"uppunctlm-0.1"="1a71nsc5dnaa8gb4xmnlhvdsvid2h9gwmxr0xa8blh4xd0vwi2d9"; +"uppunctlm.doc-0.1"="0d1qs7krblmnf9r2afvzx5ir94aqgxv8p2d9sf9p18nlz9f5h06q"; +"urwchancal-1"="0hlaimb12imiv0h7khcaar4xi5dma11bqcrb2b6imd4srgg9b50g"; +"urwchancal.doc-1"="1mzfmfwny5mzag8wf1h3k4xbmbzphwqv6r74sql8wyqw53s337jf"; +"venturisadf-1.005"="0a80pz2ng6grjj97hgk277d25ijgc7swjjsr4rjbd1ljnfjdvf51"; +"venturisadf.doc-1.005"="1b50h04xl2nwlpclfxl7m1wnyl1ysf9d7p8jbahglnxaxxn8ib3r"; +"venturisadf.source-1.005"="07isrwhzw538w4asc5baw6wbfydzdrflrp3pk1qilq3a5wcj1n00"; +"wsuipa-25469"="1grz4s0zi7dlgbks7rx0h0rkjvchilhjabs59h81f92f835lafm4"; +"wsuipa.doc-25469"="1zw7ibbqc75k4hplbvqpdmnqg5ks9bw75mrwcg14q1rb1807sp8w"; +"xcharter-1.216"="1rfry7xnl1byh6f3r949xbvq00cmijmlblihhgsyy3bv5r4pvy4q"; +"xcharter.doc-1.216"="0q5yl9fqqh00jijmsrfh2bkrslz0qji02fxaxipsmsf4h5lm80g0"; +"xits-1.302"="0hnjyncrb0r9ssp6aj9lih23b0z031fjhc7fjjsjc89igbxb8v58"; +"xits.doc-1.302"="0iv1bs2i1fn0pr3gkz07xaqsdfw9idcyfdd6bzqjryynas25aia2"; +"yfonts-1.4"="1k7b78fr6x8kp6354viqfni3k77d96qmx9r76249m5j140hi6fk1"; +"yfonts.doc-1.4"="0a7fy4z790fr6q4z5qnzv578x48kqs128wl5znd5bn3mbg0n0cq0"; +"yfonts.source-1.4"="1ph8vc09vg0zxc9x1xydrm9wn6q5vml2bc3wln15v69p8nm52d7z"; +"yfonts-t1-1.0"="08fbdd97n2h649kvks6q03zrsjvb1f7qwys3955g6iznf4y8pyv6"; +"yfonts-t1.doc-1.0"="0h0gi1j5fcn1nkvf0abf2aimj2q3h6bw4rx7kzg5xra735fqpl4n"; +"yinit-otf-1.0"="1yjz72nixv6di0ifsimbnc34wlw6s8nqkwflkag2p75q0jw52qrg"; +"yinit-otf.doc-1.0"="15yjqa1s4zrpz8cj199ak9dgriys76q8iccspw3909g2ci4xyyfv"; +"zlmtt-1.02"="0ka4hx95138c3aarinsivmz13jfkbm4lyqcgza96cmwx3r3hs076"; +"zlmtt.doc-1.02"="034fjal61sy3f87cj0wx4z1qgiivdr1h84yn0s6ygfpdvxrrqd20"; +"avantgar-31835"="0zqa5rz9rzczpnifcq4rwj6ybvpl365371jnz65wvaq0l5zgnlip"; +"bookman-31835"="12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9"; +"charter-15878"="1z9145ri2g732bs4fb8i74gc0ymak33k7sclahln2bhdpxi286fm"; +"charter.doc-15878"="0gm9pwanxvzv0zmxq6pf54ygxaxvg56kh1ym6f5ij9akwvhf6nwb"; +"cm-super-15878"="0vpxkin8zvanasm0n6zzgmy7wssca6bm5yia2mjdi7nxzqyawlwr"; +"cm-super.doc-15878"="1ygbv3gwijyaaj8yzwxzsjqsfjdf52m3lm3f7rp1503d2wvq2qzx"; +"cmextra-57866"="00my52lh3cn8bn211fpn7373b7khaylx4fgkrd2m72xgaymil308"; +"courier-35058"="08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r"; +"euro-1.1"="02kkwf4psrmp7n5mqyrc3745kj82p3nxswad9x8rw1hd7a278y3n"; +"euro.doc-1.1"="1ajqx7axgqpmbq4kl2gmk97ibwbijqsq6z8ln71qla61j0mkgj32"; +"euro.source-1.1"="1hkzjy4vmvh06pk8bhkpz09ln5jygvyhwzyznqkrzffay3i89cll"; +"euro-ce-3.0b"="00ypq57ri9vkmc85c5l5qzq098has90qllm9lnv4jd73l1my7pmc"; +"euro-ce.doc-3.0b"="03pcwrjrjp74s2xl7pahpr76dls17x76xvhck9izgsr29j6kny4d"; +"eurosym-1.4-subrfix"="1bf4vwygyakr999k95ki53fykknizakz9npz2i1h3r5ci805l7z4"; +"eurosym.doc-1.4-subrfix"="0vmh23f3ksc3b3hym7iv7m8rsddk8vdbqr5ib49bjqylppvxrsnz"; +"fpl-1.003"="1jpbgs674zkjayx5xbg4ymnmygxcc15ysvr4cpz3abp333cqzjb4"; +"fpl.doc-1.003"="1860bzvxbajy3r5gpz6hwy0vib632fkdig2zcb51yy2qgg3vbal8"; +"fpl.source-1.003"="1fr7ydvn8ql0jhplkwxzrl5cppxbklg97nqb2rjigvmqqidjk0i3"; +"helvetic-31835"="0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl"; +"marvosym-2.2a"="14i2alqxpz0imgdlx03gyg2nn56wrhlc0rziyx93h4ya9nz6xzbl"; +"marvosym.doc-2.2a"="0qyfyz8qfcchnf78r71fp5p16hmsrq6xf54g5mnwjb4p5ipbd9np"; +"marvosym.source-2.2a"="0vbiq807pazw2c1ck799w8sy3q8wcpb6smmq5qqw4nqcxzwsxk78"; +"mathpazo-1.003"="05j5qgq8fralghp5wkx6bha1cm59vha29ppq96nllq2k2nqhpi3d"; +"mathpazo.doc-1.003"="1z76cb473nb6r0vjjxjwiymnk9wsf7pnycc3ad3ba4vd3yl1827g"; +"mathpazo.source-1.003"="0lmyc1q7jswlhlzz4fd6ia407jj4pzi7wvmrcgfyw20j2nghfcgp"; +"palatino-31835"="12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22"; +"ncntrsbk-31835"="0i6a48zbn9lg4pwbw8ya2wjjgppwac816fnbpmahm67kknx4d7ij"; +"pxfonts-15878"="0vkhx82ywv17rflmq119jxs3ib08rfw6lkjgr3mp9vf6vplgqzki"; +"pxfonts.doc-15878"="1afcy7c1n63zi5czbpnajrrgwfp9xdymkgwf5h9865adjbb3lm82"; +"rsfs-15878"="0q1iqlkq6swy905jh73y42ya9zb55xvg9w991x7lsmdxc0bzdf8z"; +"rsfs.doc-15878"="069cpd747d6bk7jmmn1im7jvfb00bd597l34p87vdjcwbk3bzfvh"; +"tex-gyre-2.501"="08578kyph2grc2ca9bdg6271iqpjyjg1qcrivfk5r27sq5c8cwf0"; +"tex-gyre.doc-2.501"="1i6383n8w3h7rjhdzhj0zc8xfd7ngmbqyvzcm0xibqpsdmzis4yy"; +"tex-gyre.source-2.501"="0f9gzhlawkpn4cg284n2sad05aary5pwyczi1qdgnvk9v8sbjax3"; +"tex-gyre-math-41264"="0vqg04im4s6k1sjfclrn855liilgayh5kca774aicifzjgsigs1d"; +"tex-gyre-math.doc-41264"="0s6s2bs6q2ar4y53fyckz104y8rbvz3msjvyb4sv2p4j6x0kwz4g"; +"tex-gyre-math.source-41264"="0vl9ggi62bn1cpnjmqanx62b6an5294375jg68gskg8fwi8j6gir"; +"times-35058"="13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0"; +"tipa-1.3"="1vax0padc42ks1b4rvl0ikfqmb5i04ii27k1711vfdbzmg87j217"; +"tipa.doc-1.3"="0wwnbarpvjcq8ibbn8sr0zqrlg3clplc9nyh46r5gsr06qgd1prf"; +"txfonts-15878"="1dfrd8dzrzj9y5qnz9c554xn2g9931slhj9ylan2i71k5asxmkiv"; +"txfonts.doc-15878"="13v5hhk0nzj38nfgyz9ijmz9gb9703izrgb617z274d744qwqx73"; +"utopia-15878"="1hsvl3la37nbb0b2q9995w1hlgvrc0gkyjkgqbsp99rk0ry392v6"; +"utopia.doc-15878"="0yyxzyg38z6kip43gxlj3j55rdabqjrzl33yp1z043rblfw5b9mc"; +"wasy-2.5"="1gvk9gdx32sm4q2f2k4i6yj45c6zyf0hjkq7r6ysygmd2zsvf9lh"; +"wasy.doc-2.5"="1ah93bb5gr4di1jbq316cm4d5iaijj4f06vcjj4x44jajirlaq6m"; +"wasy-type1-001.002"="1zkhqyh72q1w6lr94a7164myp5qfmj119qim58cal1h48n3wypcw"; +"wasy-type1.doc-001.002"="0rhkbkmn7xg044aw1cm44vbwiqfpcixpdpcdvz8yq6in8kmgs0lv"; +"wasysym-2.4"="1i8pvf5yfw5j0rkcpy6v8czvr85p1yk18c8h18iljgsdvfj786h7"; +"wasysym.doc-2.4"="07lhw9ss609gjlhv9f0bbyv3z327v3jqblfwhcspwg2sjvazzx8l"; +"wasysym.source-2.4"="1i7y0si6mbd6kxbbyvcfak46hrcf95xv8x6nc29nc6adqjbygkiw"; +"zapfchan-31835"="1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn"; +"accfonts-0.25"="10z7c7cgwm62dyzxfnj0jiy328zj3wccqjick37lz641vqifrd4v"; +"accfonts.doc-0.25"="17mbr2ydbkc4md6zd34km3d4s2vjmqzfwb2l01n4y30vjz2lzsn1"; +"afm2pl-54074"="1nbb9lcxqxj2aary7a65fai3hgj4nwzm690iy0xv62v580krdbck"; +"afm2pl.doc-54074"="0cp8il19l9sz997v9lcxkl6r94mnlnbj2lzdrffwd1fv63gkxc6x"; +"albatross-0.3.0"="1krqfxy24n96xzzrdq512mc78va4isi2xvhmvrzp3hisdvysbdk0"; +"albatross.doc-0.3.0"="0xvfa182yi2hjfxs80z6kmsn7lbg6nxqnc947y8p0kcbikzqbwc3"; +"albatross.source-0.3.0"="1599i51cdzqgcmshvghacflivqbxj1gxnbl9sr373nz60jsqj8sl"; +"dosepsbin-1.2"="0qknrackr7m0s431vrygphzrk99wkrgdp6kl04q7f4lsffq12k9r"; +"dosepsbin.doc-1.2"="1lhrlgyn9sg88052ib0jkwd88zvjpzqnz0ac5whl5gpr5zw2y2c3"; +"dosepsbin.source-1.2"="0lqmcndd5m4hxslvpq4r9g1bal12vfdsncfcii71glv45c2hl2x2"; +"dvipsconfig-1.6"="02vgk91y80ch4pkj83vbiz1b2ccigf152hm83p607y4n4qn2xzsf"; +"epstopdf-2.28"="11xw0f2hl64scpd14iicdq9z1gm3s1q16y6mbm6n9v07zhz4pv82"; +"epstopdf.doc-2.28"="1gjb9xl4kwqwcb26200xdz3gl5ghsdmv70cwzw1zd3aakhba00rl"; +"fontinst-1.933"="1jqhfib1ml33wq292x9ff03shyjrn2b3grw44cxzxndg4vq7mn1l"; +"fontinst.doc-1.933"="1ff19m49rawz7jlqi85nly05d9k8940ld94six21c1ik0v7cxn74"; +"fontinst.source-1.933"="133myqzr4xlp4a3pw8ld815mpl7l9y6rhz620ja77sv4fmci76v0"; +"fontware.doc-57972"="06n3am526l1g44db1pyjj0y3jj7792z4z0xd9crc8w7khqc0jmna"; +"lcdftypetools.doc-52851"="0yjbc6rsf8c62qa1lyi9kjyjy2p0xlps19llnvly3xyhla08j76f"; +"metatype1.source-0.56"="1nhbsn33w6zbzbvi3a32ng6ib5dbh0vll9g2c5ssiv1ysxqrg6yq"; +"mf2pt1-2.6"="0gqs7xg46iwnwsx4shsdl2zsac604nzi05gn3fnh978wi409kvrz"; +"mf2pt1.doc-2.6"="0sh0pkdi95yrg0s624dahn51ljli2aszh8np544alzzkdivhwr9a"; +"ps2eps-1.68"="0aifwqbw8r3i4db5pfj51nfjgbz6d8qjz4l2nc3zkl67g0kmhrf2"; +"ps2eps.doc-1.68"="1k731khcjkavaqfrh8pqyzc82b4x355rxri1s2m4ilnvizbwifx7"; +"ps2pk.doc-52851"="11jchhii2z34ikw0jaddg6kni13linnar4bwdrp6k9kl8zm0h2hq"; +"psutils-p17"="04xwjilc64d5zpbngcsr6c6gvm3857wf2hsyag32v8bk1pjag97f"; +"psutils.doc-p17"="0hb0bjnk53i2q5wkkcn4rkjbpvyv90d41ynxbgsk8hp2gli8b0zj"; +"t1utils.doc-57972"="0hdk57179nn57wnmvr3jasjavkvmrn6ryph6jvjhsfqprn7bhf1y"; +"ttfutils-57972"="188gcwglfgl7yi4026n9l3zkpgwx034vfr4damxpfr6n630rixw1"; +"ttfutils.doc-57972"="1y86pg5lxz5qk2bd2zhknxip1jwj9d3y84xmvg7ydxkbp8kimf5s"; +"aleph.doc-57972"="1ba94ifw2vny6d5cyvh71g98r01v1wswzn44mrjnh6d3q4vp02il"; +"lambda-45756"="1ajx5g5cd5s9jqr4b196689k7zmlxmhhksly88qps31s7lzaprvn"; +"antomega-0.8"="08if5plzpj7g8m1afhq8ci6m4yba4nnsgglngq94ka3ga8czfk6g"; +"antomega.doc-0.8"="1mrr1vqkyic5nyzyxkw7zq67yz4njx9x68cqr3vjd9d77qv85i00"; +"antomega.source-0.8"="0s0dzmb00hqbp71nhl94w0ns1dqj5fmfqw63z789iihqznyxkii0"; +"omega-33046"="047w29bij6g9k9fl7ymap4arhdmm9kvjfsikvjkf9nd7shd6k4kl"; +"omega.doc-33046"="0r686ck7z6vxcajrjihp4a4mh3z23xr8ic34dv9yp039dh0kbm71"; +"edmac-3.17"="0cvxirrcf7qxa1a6r4fzklqrmala7pdj9i8wywapy0anak8lpd9d"; +"edmac.doc-3.17"="1s33bml7f2lsfrj3fprpazjgjiyiblfcjr554fwq8aadsvgz2xxy"; +"edmac.source-3.17"="0hywrvvxaqb52hd29r0dkixj9fcczhr8b1rj6wxj3wcgdcbfhlm0"; +"eplain-3.11"="0gxqyf4v9d18qk1bgg8g0gajkwz9wx0pj7a627lgbgack0wk4ghv"; +"eplain.doc-3.11"="0mgrscj49zqq97xkg0yqis9afhcagra0vsmdycwp2fbz6fhizxfl"; +"eplain.source-3.11"="0y86s9spkyqqidwjs55q1vwhkmxb7zgnfpqri0rwdyl6rln7ckfi"; +"jadetex-3.13"="0gsmhql8p421dyyv1b021sv0hsnl2y4m8wj3vkcabhpiql76yfyf"; +"jadetex.doc-3.13"="18ljn0p607hm9655v6z6xs2apkai20l2mlxwyb2asqa72s6x79yb"; +"jadetex.source-3.13"="0vrqpjn64qlyszf7d2vwkbd1y2lj5lld6w9zz1jqz1f0arhq33lj"; +"cyrillic-47350"="0p9fbfxgkb0pcxs0rp6bcj6j51m820a772b199w5zcg2w1dfn4a4"; +"cyrillic.doc-47350"="0k8sz5blks5l6xbffw69kg0dql04jya14q0q9kkrkjb2ccp5dj8m"; +"cyrillic.source-47350"="1fy9cyi79z4naijng1pccxa4wrrgrfsvfinmy9hflcz9c40fk6am"; +"cyrillic-bin-53559"="1m8ci739229igk1mgx2n5dqywijfs2dxafjxsmlpdyafj2vbryaw"; +"cyrillic-bin.doc-53559"="1clxm22f85q7qqkcdbij2kihiifin6wis4b71ba53xlbx2x89b81"; +"passivetex-15878"="1h49v6sqbm27isfwwcql9dzxn4vmcn2algkqh7f1pzj860xw3ygn"; +"ulem-53365"="0v6p4hj3hij0qvq7vpsbnk11rhwwlx80p3g575jy4sn2vfw5zzsm"; +"ulem.doc-53365"="18ny9kfv3w2ag97czcj2gaqqy1gj2f7rd8r72vd7wsdihgqd5wzb"; +"lollipop-1.07"="170q59wqy0x5zhziaycmfglv1wnc5kf252ni1r4vgrrs3rlwiirr"; +"lollipop.doc-1.07"="1wj858kqp27amx3jpndsqma152r40agfymh9ah8s42pn6kfl4dkq"; +"mltex-2.2"="0j5282big4df396xvk2xaasl7cwnjn2sa14xj22xgzvrz3hr4dvj"; +"mltex.doc-2.2"="13c7a99jl0y75nkciir5zqdiz8dgjl8znbyrb485xrwlkzm6ygq2"; +"mxedruli-3.3c"="0xyp3zxzd55h0m201a189rj9h7js6ky3vzikb4yaa7z8hwsad7hz"; +"mxedruli.doc-3.3c"="0ydh0292i72lb9vcglwq0pl734qgrh9sqdy7qvdds6a84jwc5w7a"; +"omegaware.doc-57972"="1wjxih538kp4pdj770pw590041xrnbb1vwsyh93rm8fbc2kqr19d"; +"otibet-45777"="0fg3gc7614r1b304g78ipq6d84bml2q4mvl2yc49jjnz13nr05js"; +"otibet.doc-45777"="07l6475b8z98pkmn5labv4i4q6g92lh5bdsdqcwd28v5y1jizhmy"; +"otibet.source-45777"="0lfwadx3a1ni2k91dpzsdh297j3viq5dazaz78acb879lgz61ik5"; +"psizzl-0.35"="0pzbip08246id09mm0chi0gjjgdc7yzj0bd7q8qh5yfdbhjn8yc8"; +"psizzl.doc-0.35"="03slfkyrb0pil00n55n6yp5vxxxl8adjbxxmg1c2zl261lci107v"; +"psizzl.source-0.35"="1h2hrjxc3ck75cigh82rmi3558dmpliwxzzsaabb178bh76m2n3a"; +"startex-1.04"="1d6c54hm9jdi882srj87drkcxm7lldb4g60lbic9wwzn9kpa0ynk"; +"startex.doc-1.04"="0ikmb30ndmj0yhzxy9mba3kqxdc5f8i66sji51ihjcrlplj3jk73"; +"startex.source-1.04"="0304dzv4nzlcqi5k1gbfnx823xaxq84ja4gwh7qg941q152y7w9n"; +"texsis-2.18"="08sn35x8wab41mdv67ra3hahrsf4v4brp9n5z0l4bk3k27rl4q0m"; +"texsis.doc-2.18"="1bgngwqj3kkr196sp8i59yrkqpambijr4a54jfrgxb6595hiadsj"; +"xmltex-0.8"="06rhg0mgxsv4061w8k6parag7fkhrja81aj900mi65bdwmxqxxql"; +"xmltex.doc-0.8"="0zjaf8nvsid88nrvzgprwjcm6nirs6glyy25xws57fa9yhza8di2"; +"xmltexconfig-45845"="0drgvmn27snq43kjkpg5k4igkcdi56p1q3fwkrv3ivsiqfp6cdz3"; +"bartel-chess-fonts-20619"="0xd51ighrn01kwb4n20dsvrjhh7a0y31py2mfl1dq34v8l6yvn9l"; +"bartel-chess-fonts.doc-20619"="1sjwli00iffizzwaiszwyd42aya7c4vz5as8k21lmk054x9afjpc"; +"chess-1.2"="0r1danvrc979bbpcka5fdbnmxwiv54inxyd4rcsjkz6z03srbwvg"; +"chess.doc-1.2"="0h6zcs8g6gg4fq0sp2s6gihbyrs9kkvrbqr6pdpb7j3fkb2jr9m2"; +"chess-problem-diagrams-1.15"="19zdm4wzwcvsxqldvjhydk6fxh6gh4iycvwnvnlx72wqzn602z1r"; +"chess-problem-diagrams.doc-1.15"="0aldvbjgjs1i55lmnhgh03i266cwlh82w1h9aynw7m8aa6k1pc23"; +"chess-problem-diagrams.source-1.15"="03r2s0y6rlj3inq07jmgwsf7ylv1h7i6ynjikp20rwl7ngch85j4"; +"chessboard-1.9"="119dsa2mjv5kjw15349bjjz2xacnd82szwdb4m1hjqb3pkc8053c"; +"chessboard.doc-1.9"="0gny7vq5cm7ibvw8fjnpbysqs81bf2s8nvjhs56qq3j7yg7ljapk"; +"chessboard.source-1.9"="05wcy7c9arj8w9zsflr3byy31p0nl8g6i78bbkvw38rl9azpj20l"; +"chessfss-1.2a"="1bi0lzxr3lr8nbrxj8189ycadm16l66isgslqjh1mfqyggz65gkz"; +"chessfss.doc-1.2a"="1xrdlw5z6dal81pdkhx8lwg18fzyfy1v4agq93bw09i94045cvih"; +"chessfss.source-1.2a"="0ryd536x30rv71pqvji805f9fm8ix6g6b5jravshrrksk9q8qw9j"; +"crossword-1.10"="1dk5c9x2nriphmnps7srd8my1g6103japkbdvfi2afkic5q4ird9"; +"crossword.doc-1.10"="0y4vxlyf9dk86kfrqwgvdh7diwkgi2jhbq9cwyhv1vvxd5rl8ipx"; +"crossword.source-1.10"="0ygclxr774akkp6601vxs0pbqq4yiclvwmxj653bjcgn4ib057lg"; +"crosswrd-3.0"="1c85733q3x56s1fvag4kw39r6lnx4hr1wmhsrjs0jnyf5j6lf38w"; +"crosswrd.doc-3.0"="1abqbdfk7c7cx1ij56q8dhz87bc8ppb3hkfmc2z5r6zv94l34n2i"; +"crosswrd.source-3.0"="16didvmnjfbd103skc6i9qbim4kav9vw76954yfqijz1q74c880s"; +"egameps-1.1"="0y6naagmi9qii1k4qcp4svczxy5vbramd9wg1ixr8xckp806kn58"; +"egameps.doc-1.1"="0i36znlwls01ch6kns5ikw90nbq68pn71gpvfizf0x9ipymqwisl"; +"gamebook-1.0"="0ccsyi63paf40lxphmb60k5xciw8v7vd1hqllgq84mry7igzb9np"; +"gamebook.doc-1.0"="1c2m4009fralq8ahhczwfxhh1cmsdh0c5072yrirda46khd5wy91"; +"gamebook.source-1.0"="1dk3fpg5038jv5bs7c2f82vll0bdd7c1jrajwhlfk1v16p2f5i1c"; +"go-28628"="0lqgz9r0vxjbq1nyg77zjfsglwbd44zdpwz56smalb6lp2ra3r5z"; +"go.doc-28628"="1mf49wywa32chr8q4c0s4fdkmzd88a1fj3hxcf3zx7bnsi5r4gl9"; +"go.source-28628"="0vslzmpj94qlh5g2jirwj8b4w93vx33j8xdadyc32s6b9rrdwnyl"; +"hanoi-20120101"="09a7cv76naxzdach5507wdqnjp12amvlia7kw0jh224ydmkzfx9x"; +"havannah-36348"="0zdbwl36d8a374yhaqfb4f3561ncch10v0vh7nxj22f267lgl2n3"; +"havannah.doc-36348"="1pkkslz2f66j606j44rq32dp9qhfqcr959wrp8j9xgkw76i9lprh"; +"havannah.source-36348"="0gyndaw2g2j2j22njn32839mihqx3pl7sij35vhsyahyamnipk2h"; +"hexgame-1.0"="0s68961p0dsaila2a3symqswvgdhh4ah08aphqjfs7licn50yy4d"; +"hexgame.doc-1.0"="1bfrm8mz98l8nrxgnvp8q54pr09ixm81wy1ds1ww4syczpw7jypm"; +"hmtrump-1.2a"="13pq5h9pwnp8hynsc35ib8wzblh3y4gx2lmrrvd0big80wwsdhsm"; +"hmtrump.doc-1.2a"="1bzgqgrjlpskqydqdj26lsn55pkznmbbiq0w4ybr9r0djdmqbn1a"; +"horoscop-1.01"="02kazmk5sa40x0a4zb30gk9lkky0ak825gczbr5z8wchwpy4i1ac"; +"horoscop.doc-1.01"="0w9sgk2j1fzkcfzn76zpygrlyi9fnimp92mygsq2z6rpblzd1qyv"; +"horoscop.source-1.01"="0c6zkcb2057y9x7mz4q3nwin8h8ax71yaam21m91gk6ad9k8l4ij"; +"jigsaw-0.1a"="1ikkihqdpcsxca0hr57jsa9kwbf3b28w4zpgf12dj3achv4jshrn"; +"jigsaw.doc-0.1a"="1vr3qhzvl4hs9jz36lx5n3a5wx2vdhkj83y232jf7vg3i622mjr6"; +"labyrinth-1.0"="1r5za0nrvcpmx7bbnvvxf4l78pv4ciq83ck9k9qh32pawv5jn8sp"; +"labyrinth.doc-1.0"="14405x5dcm2k4m74jjhwd3f1836d79qz3w9m1zfj3gnvzx2kij9w"; +"logicpuzzle-2.5"="0zsg11lw5x28sik6ifj2v1zjvm3pcv4vf7w2pfxcr395vmw33qm9"; +"logicpuzzle.doc-2.5"="08vgi2s2cy09dhqdmvmq1ijlw83dgjd7xjfdhj28vm9ny16zmydz"; +"musikui-1"="0z2ya761bf0n7l45dqkc626s9d66qwr810fnwf34lr1876y3sfyi"; +"musikui.doc-1"="09sdb98m3j5wkl4p7hdpdrnrr0l25ni46nlhkhg1g54hdggcpjb9"; +"nimsticks-1.1"="090gx9753q9cc9kr973yjsbq3g1bli0qigsw4k2n0a3wb9392frm"; +"nimsticks.doc-1.1"="0s36pkz37qwjrmfw1sykwz9nf7z91jdmfvllgzaymz745ssh42bz"; +"nimsticks.source-1.1"="12xvmydh6p79xjfyv67bnkiqi0qcgk2xwby6ysw06nrn6r4y37qh"; +"onedown-1.4"="1arb5vsppgnfv1802m0iqv5y5vwljg8pfwr1pxmgkaff0vc34m2r"; +"onedown.doc-1.4"="0xgkcmllgxbncd49yl956pah6cl8rbbn74870rpnvxg6h36n0f90"; +"onedown.source-1.4"="114h8a0hfv9awf1l5lan5nkbiipvhkwhxpyf3jxsis47frma4wrb"; +"othello-15878"="17y68qzxifgnh8k1q6qfn97ka7703ac8nqk62ridn1wbxc6fb80r"; +"othello.doc-15878"="022pv02lvlphl8168rrcdzk6w7d9wd52riybfvvy537ifwp7kqr9"; +"othelloboard-1.2"="00cybd6dg10bwl2k87i2lj9jq1nmq4jc9v4qhjwqij5zv0l5yz4v"; +"othelloboard.doc-1.2"="0g5k2q33r726xyj1mp08qmyb4xdihiyzsm52mgbdn95iz08b2989"; +"pas-crosswords-1.03"="0nq8wqxrsgpdnmi2yqcs45mb93gp2lad6p0b6ifqr744hycq4njm"; +"pas-crosswords.doc-1.03"="154ifvbrx2z4ig8k00agjsgpsplrjlf8glcxipbgai9wqf82i2k5"; +"psgo-0.17"="18h614dasdg19jnwwl5swih2dxp4wis66fkscq8jjmpvjnckpck2"; +"psgo.doc-0.17"="0naza2kxcgm9wdcyibs36qnwwgwpsbj2m9qkk3l9d54kml3wiznp"; +"realtranspose-1.1"="1m3gmj9bay3a1b7fidjs6rs2077m7csaszz11g6y5i2sjpjyx2aa"; +"realtranspose.doc-1.1"="08w4ad33pycaaiwhrnmx3sfx2c6kv417ijhqgxdsja1mrhcp0nxw"; +"realtranspose.source-1.1"="0s4lbg2jg5fa4x8f9cnp5zcb4yi92g4981dwdksqsilcd0in4ksh"; +"reverxii.doc-24976"="15bfdyvyzh5ynnx16bwr401bw6dbsl60rh40f8l1wgnbh93cdpy3"; +"rubik-5.0"="03qnnbqas5qrf6jmj90kgdn9kkliq8ap70z2b9jyr4rzq8m19ryw"; +"rubik.doc-5.0"="16jzhkbh8m8v8cb0jyifhz6dcdn0sxzi898dcyjrvf245zfwk618"; +"rubik.source-5.0"="1cnkay6vn88p5l5jzhf5lzzfd39p7pbmz9psc814jvlpqlzx90fy"; +"schwalbe-chess-2.7"="08fgxr8f37hl9773m3920876nys1xdp6b84kbmsqhrbw35g49f50"; +"schwalbe-chess.doc-2.7"="18vqhcicndhyaxgndd098h9imwcz16wc6yj6jjn9mg4xip36p94b"; +"schwalbe-chess.source-2.7"="130d6m37x08fphq4qf3jjnsad43jrr3s8735n71gm4ivazas8px6"; +"sgame-2.15"="1axbv7ss7nh6nj6dzs4v0g6lqccm8vyvpc4qfv2aqij37qlyv23y"; +"sgame.doc-2.15"="0nj8n049lmin4j90an75p9bqillwx7wgpvxdm0jb1janfip4r5qj"; +"skak-1.5.3"="1lh97kc1hmz3ybb67zr7vr74z1zngwl2cppkhmp9cagm48j24am1"; +"skak.doc-1.5.3"="0abiardppn7hx6l5h4zh92b9m2yf3w16y15rcvsspv1cb9sf4lfw"; +"skaknew-20031"="14j42hifh60p6glfp24c2f5k9k34vcm0l3alqfqhvv68l31i05rx"; +"skaknew.doc-20031"="0i144akq7sgs6kwayl8c2yir0kc7czjs49vj6l5lwdcwbyryhh21"; +"soup-1.0.2"="00glliinyi7m5m6gkr0szzsp5drgnqww4k50yfb6p3qv1mlkqgvi"; +"soup.doc-1.0.2"="0470i396sk8a6lnx189zcazns280qgyw3yvwiyxc1gs2wd812qr1"; +"soup.source-1.0.2"="09db050wsnmpqxmba7w23h3g92xyzg0sqv57yhns5nwxb2cmbr2g"; +"sudoku-1.0"="1nyh5rv8fgs0lgmsjgkfx24s3lh8pph6jcp7dx8nb8q2ij8ia4pi"; +"sudoku.doc-1.0"="0hdvzb1vcrlbis4xsgzdnbidapqp7kdaqdskdha5szjw53xz77ys"; +"sudoku.source-1.0"="1rwwqpqvmwvq26ycj2glk0k4m1vlbjrxjp0l20qnh5vad98a1x7p"; +"sudokubundle-1.0a"="18y4x1g050ircqh3nd95m45scb8zgjzi03cj3n7whn207dvapsdw"; +"sudokubundle.doc-1.0a"="17mdxysiwjp3ii1qhknrxw07dcds57qbm986583xh69bhq08c4sr"; +"sudokubundle.source-1.0a"="17g96rhis66gvgbm1857ck4ri8nz3isdlqshfx9rdbpgs8x58i0h"; +"xq-0.4"="165zyviwxybpgfx9ycngv9nml482faz766q1skgmligx05qzkhyl"; +"xq.doc-0.4"="01yhk07lrcbl7ppkqvks5j7wjpwyy0zc69q46wh42gbp65vp24a4"; +"xskak-1.5"="1hirv11b76xl7jx4swpa7imhjncfn81i9qc118qfrn26n890dgr4"; +"xskak.doc-1.5"="0hzyv8gy91avmpf2fgjwpqfkkbi8255gy86xzn5cz3y948l3m5vl"; +"xskak.source-1.5"="1gw6xqbpcsgdi5s7d239j0ds18w674z4zfibsvbgqjb70lixnyv6"; +"adtrees-1.1"="1j38apxxk3klabxrm9kpdf6zbmiqb17is5yqgg1a4576n8paqg4y"; +"adtrees.doc-1.1"="1851rqb9gs1wf8wl8f7pqbnxgpikzxzw1n5mg5w0kcwd889g17yc"; +"bibleref-1.25"="0ds1a91dm11y93dy46gflzgdx5rgzzm8j50q2aghbhfiqmb4vx83"; +"bibleref.doc-1.25"="18zif1ciynp47z8hbhc2p6r8jiqisj46as052scb5q6p49fc1ibb"; +"bibleref.source-1.25"="11brqv3pgzzk3j09z6ps6ggwsqm89y82s3cl6xldnyvx2ngc5ym8"; +"bibleref-lds-1.0"="18x44jyar9dnfmw4a5ijhfipscydqj2hybl79ngw1b88k9iq2wxb"; +"bibleref-lds.doc-1.0"="0yr2kwzbfbak1c5x202w8jpgr3y6fq63vkjngb0k2y5ivmjs636p"; +"bibleref-lds.source-1.0"="008hvab2f0xw9bg4ry74g19bfsrhp5ync4ilpya2h79smrwp5xra"; +"bibleref-mouth-1.0"="11x3ldyg77xzpx8yl27sxn6x5gb3jdngd5hgm42p8ac0x57x7ymz"; +"bibleref-mouth.doc-1.0"="0vrpyl0s13sw0hi9s14qamzk69c2vxwjy0zzafzmlfd0pzxhmx28"; +"bibleref-mouth.source-1.0"="1mdhq4qchr8gvdalf3rgns43b2lhniyp9d5lm3c9dnnlaim59hsv"; +"bibleref-parse-1.1"="0xa6nkbydiczmhphdi3rpipiva94x2pwmqgqcwmr6a66y1gk0d1x"; +"bibleref-parse.doc-1.1"="1mn4hyfyialzmzm0syizq1vps07z4zxd853v3aljn6zwqcwfpkxs"; +"covington-2.5"="0vad21mlpf4r0hn3010fg2bmvrhambkrlkiww0cc7n2wby4l9bnf"; +"covington.doc-2.5"="0kpxk5kgpg03bj5f8jpnfzpbkczffq9l7z1pfzw5q14sd2bbl8bp"; +"diadia-1.1"="0gygfg9vs4gbp3r0h9v6dqc18np331c0hjfmc5rbh29i74jcm8jh"; +"diadia.doc-1.1"="0bm0sb3fjj73mcdmrsvan9pdla2ki7j1wwpjpc4kpfc116a9lzy2"; +"dramatist-1.2e"="0zrkdhvx7f1261r5b2d08bd6a3pzldvpi69iym5k6f79ziz0602q"; +"dramatist.doc-1.2e"="0vwk6zfvf89773bwcxnpsd8crbkmq4lr6hksp4dn0hn6rf4smyyf"; +"dramatist.source-1.2e"="1xy8fm9h9qgjna6z5gz28rj0cq65wpxpxcs4vsfr4vr1p3vmig05"; +"dvgloss-0.1"="0fgc0i7cn0kd4f682xny0968l220ypam3z33mwac6ifqaaqbiy9d"; +"dvgloss.doc-0.1"="0l467jcanablvj95l0sbdib6dblc6ns2jcbg41kv0nxpah2i5ms8"; +"dvgloss.source-0.1"="0b106p2a8xr3c0vxwx3j0qmxh2z842h5x1z22509jabry3sf1y98"; +"ecltree-1.1a"="170bf0i0g2fnmmv9qh0jrdv7xn2xd5xmsw8dpvw8rbxfmn94l52b"; +"ecltree.doc-1.1a"="016hlxjhfzn2pgcpxi7hw0wnfd25idp70jvig7p8614pvkv3bsby"; +"edfnotes-0.6b"="0aljhm0wiks5v2s9qkwbp0ma8p6230ahsyr38w9akwy4j9ziiq75"; +"edfnotes.doc-0.6b"="1260dir3aba5wv12a4xidx6ld0vizl7n9m7agwrkmbanpzcqscf4"; +"edfnotes.source-0.6b"="0wm2hynpa4xk464rl5ikxdh5p71mp2cwzac2xl582q8fik7vjx0s"; +"ednotes-1.3a"="1kk0n2hdbi9cz8ag0v3g0a4w70ccjwlmgj2sqjmpv8yr8j9i7zz5"; +"ednotes.doc-1.3a"="1z0wpmq9rxx3zp0m5i934cpkcfipr0qx8iyk4gj8cb67ind1kxh2"; +"ncctools-3.5.3"="14wam15z6jdl97dxibf789ji0mk59mn96fn5x0vns63d8y65fh6y"; +"ncctools.doc-3.5.3"="1j5j6zsawp9i62kwb8xxzxsvh0qczx6qd1ppq38nlha3cj8k2rfw"; +"ncctools.source-3.5.3"="15anl5wwds08h2msz7m0a11xlcqdqgqpihvcrmy41kdzgnzgc56b"; +"eledform-1.1a"="04sd6m6ay9iav3scf72i6id726gn12qgv19hbaav7dvbkx73s10c"; +"eledform.doc-1.1a"="0f8inf12l7f8cg51adr269qs9zc0imsk9g08zh793aarvrpfh4gm"; +"eledform.source-1.1a"="13phf594kj5a9ql14wvd7pzi3vcrwg61lmc4fb7079j2xpx7drmk"; +"eledmac-1.24.12"="01is22hyay4xl1bp58g08kn99478fz5l22xdlbaqyr5yg0k4rgmc"; +"eledmac.doc-1.24.12"="0x2h38mlixff4yacqrvz7k4q57cwigal3x10f3k4qdr91q9frd24"; +"eledmac.source-1.24.12"="00pkybywz4j1qcki9gv9mfxqvm6q3m60b4lj2ms44c4mric77wk7"; +"expex-5.1b"="1vdbsxn85gkg24rx3qhkwcc658zjyhkymfspysxkxmmb8rn42y8n"; +"expex.doc-5.1b"="1mgq1knfx1lf0vr32wa2r6v0sr49m0xjnsdy0y42zngfi1mizp20"; +"gb4e-19216"="1mi8nwxa418wqp9w64ya1i0ag0pdm4cx08fkmaa302bkhym92bal"; +"gb4e.doc-19216"="0nzmhjqdhl0x29c70iqb8b96pjnx2vm94nk3xgid942pmx44skxb"; +"gmverse-0.73"="06v5fxz15byps13vm1afrpx365nfmq57200gspqpdch2sji2n4k2"; +"gmverse.doc-0.73"="1f8hccasv9f1wbjn7cjkwa2z9rwn8lwkv657i8n533ccjk6s5xvy"; +"jura-4.3"="1mmdx5zjrsrvh90kkdgigddvb4ih3cflygv70al0jy0mpm6iwha5"; +"jura.doc-4.3"="0zy4rafc7lhdb4gig1y53fsmk6faa2zh3s7b1la7z7qdw7s2gyai"; +"jura.source-4.3"="036ac5chvg67hdj8g82nra7p5jickwq041jixbprf080i0mywvdp"; +"juraabbrev-15878"="1rla1p46nb04flc2grrh1j0wvwk84cd2h1v767xzg2rdsinaxw68"; +"juraabbrev.doc-15878"="1708lfrryhlj2d3in4gvhfl8c6yvhhgi0lb3yz63h0n7flsb4a6m"; +"juraabbrev.source-15878"="0i5xhmx4j6ry4plcgdn8sc9vvbai9vzk9jr0mc54dhqaby2slyxa"; +"juramisc-0.91"="00dkagnyz7xrkn1kdzb7612qsdc00h2mkkhfv2xnw1fhrcsy11gf"; +"juramisc.doc-0.91"="02prrfg5vvy5d9y45hjx877438r8syymjj9q8465c3y3jn4ka9fc"; +"jurarsp-0.52"="0ylww99b12splqpkci2hps4zzi4myfy0agxzz4m3s8q74h4bqj32"; +"jurarsp.doc-0.52"="08bvr93ax4p00lmjkhy09bfm403lmzhq729gjjw6skla4wbvkmci"; +"jurarsp.source-0.52"="0fdxnj42qk4cywsxj8x40bfrkp0yqm7qh54jp3qf79gkj4hj6yp7"; +"ledmac-0.19.4"="0ipf7h58bylrfwg8yzarqvpkl0kr4k3z9hl6cjzxwlh16s5fs76i"; +"ledmac.doc-0.19.4"="0pgkv08nsq0rmcpck9vq1hfb4gnfqh274hclq4grk182fpn4ggiv"; +"ledmac.source-0.19.4"="07fl3lypnxz7sa4kjf3xllwqakhrwgx8z8r7l6x8id96n48zri9n"; +"lexikon-1.0c"="0ql4hzzf94v0pxr0jma4bnkgh73napz4np2zd1jhfsf55sm3axzd"; +"lexikon.doc-1.0c"="0fbz7v6a5pw20p22vyx1mjdr4z39wgf902ph9f9nwawxwsl24v9a"; +"lexref-1.1a"="1whic6s54279zypip228xyw7da5iq8p7lw090z71d8nywjsgllqm"; +"lexref.doc-1.1a"="1vqygg7hqn64d3dxj1sj4nj37k3w7y8r23d8l8x0lb909y285jpl"; +"ling-macros-42268"="1qr7bpa2wcp1hqx3ckid8h41lp8idhqqnnbdv42j2nhcy6f409wf"; +"ling-macros.doc-42268"="0lk4whkamzsf9mriiz06ynpp962w5473ppf4n36q3bb13amyp5vk"; +"linguex-4.3"="16rqzqipzng4xd7yz3i6416231cfphqbwq8n6pfal83awzd660jk"; +"linguex.doc-4.3"="1l0m6k9adq0zr88zbqrj4jl286mwarr6fiy4181bwxm9w9kkxs04"; +"liturg-1.0"="11l8ccpq2mcnpsfxry6zzjihj3s7s76p9plh7afprd7j2nnq1a79"; +"liturg.doc-1.0"="0rhyz3162nzh43nrxwkynr45i4w5pqb5ip53x5j2k2a4cb4k1z86"; +"liturg.source-1.0"="1hn89rf3xi66bfc3kzwbvllfzrxr62gx60ywbh8gkrw813n18lll"; +"metrix-1.5"="11hcw66f3r4rvxy8h0znwgrdvlfvibc6j73pcdb3bvyywb3774gz"; +"metrix.doc-1.5"="0hx74wi8vf57ly8yrzdq6x5qm8l5gi9km4v0ma66i5v40i9jwgcf"; +"metrix.source-1.5"="0i0xzmhqbs91qpznbanlhrnqvgxc45llk0wwb4mfcvmj622d47bp"; +"nnext-0.0"="0vf53wnrjday1q3hrplqklfp5kg57ibyjiijqw0jc074gzhyw0z7"; +"nnext.doc-0.0"="1rxxrnm8vb274c9l6lki1bxd6pij92klryigd40wwwwxzh8fc10r"; +"nnext.source-0.0"="1w3p9ig1jivwyy9rlbzfgcy82h3wlj2ig3rdlaq9k9fx8vd6znah"; +"parallel-15878"="0hja3k53n8v8qzj1vym1j2b4pj7hqszda82s83kw1v5av6kcy4da"; +"parallel.doc-15878"="1i0ls71ib0l3igd52cgn5z0cjz0j17hsj0qc5y4sqg2nvivvw7gy"; +"parallel.source-15878"="1slmdxldvxrvf61aa1b7m09cxpv6jsaw5lvbgqsby6jvgfp4r4g8"; +"parrun-15878"="08cbzlfy5cfkxpgr4igv3282k1dx9bsvsjfdi8b5dhl2gacg4i7a"; +"parrun.doc-15878"="0wvbmjzi8jwx5gdg8zgb4p3gz8v8rfp2hw67q0rm5f9rkza1a3ds"; +"parrun.source-15878"="0d79vvc4j1sysbpy1qdqwd27fai14820z0hqkkd6hrxzq39x6xza"; +"phonrule-1.3.2"="0xv49vfvlfjad65gngbk5022vcdi0w86mzqk60nbz3i8npvncplf"; +"phonrule.doc-1.3.2"="15bgpzfxjm22f4vqq9nbjhldvxzflrpayv51g383nr41j3k4m3xx"; +"plari-15878"="0jybi5dvl6ksjpgfqfrdnx5q25gl5xgqhwax4dk1shf6rbafkgyg"; +"plari.doc-15878"="1js29imppwx2jny1hcvjbkz7cc9qrafgniy9qd11bvjyp3n1vly8"; +"plari.source-15878"="0br0vm2ncrdyqgazdr2p1kvgl6lq124b8h82245jc8yz7mnrz2nw"; +"play-15878"="0gs6iibb9jkmynhvwldwrh8rvalayv8vk8ziyx9qyqsdsgh53bz1"; +"play.doc-15878"="1dvi29x0fdnb83bkqfsv6l2jp9rvvnqpf1paznx9pli8gvgwa1rz"; +"play.source-15878"="0nlyi6ra8v3pgk5lhhvar848mcd5zqbnc6mbqnbxsj409jczd0rw"; +"poemscol-3.1415926"="1k1vq2hki8jq70d0lmw9sbzwhp7mi5sx735wkrz9046xd0qmhq7w"; +"poemscol.doc-3.1415926"="1cdbv1ls20p764vkllgw710fm4v8nbkw8ryw2546lqa21v9ki4sx"; +"poemscol.source-3.1415926"="1l6zsi6x6akb4z37iyllg99schd90bny8r3pz8vddqjyacnf1j7q"; +"poetry-2.2"="1z36zzm75zidsb8zixmsdgngvg1gyasxdz4lcw4ikdwvjmswqzqr"; +"poetry.doc-2.2"="03cal4780m1r6i1g86d2gil5h6n0h8dkiv8phfjcp890y9vdw2y3"; +"poetry.source-2.2"="0y93c9fvjhfs70qvnk9ff7hwq7zyq8hw8h65bwgr3f26b6skfxyj"; +"poetrytex-3.0.1"="06h9aqwryssmzkagr5af598ic2rr5j0m5h5mwaw3ssrxwry86mxz"; +"poetrytex.doc-3.0.1"="07jkb5z8sdc8gp3j2fls8hcqrh5g67wimb0nfmmz5287why1br3w"; +"poetrytex.source-3.0.1"="02x9gadfnianaq3hjrhllrql20p1aa81jv8lc033qj47wml9fajd"; +"qobitree-15878"="0irdc2w96ad7mkgm6jqwia7lk1x4557fm60l98mc6kpd3a9djzgc"; +"qobitree.doc-15878"="001w9a4kxbrx11298gnvjamx8c6plag1gp5b7x9vq35s25kdy0i8"; +"qtree-3.1b"="10a9v90yspc1pq3ja9bzixdq6wxl6q4jxz5na7x9yw9g44z3xaf3"; +"qtree.doc-3.1b"="0ja3xpng871h96q220nrlq2iypk2spjs4qr5vpmri89b5nvngf6m"; +"reledmac-2.37.2"="0lvyd8kag3qmwpvf4ya6np2j71mjl11a3plavcpvsj9zgcmdmpy4"; +"reledmac.doc-2.37.2"="16d2brl9dqv9v88x81xc3lx0a9g84222xz4vayjggppcv2cydm3c"; +"reledmac.source-2.37.2"="1y2i6sn1hjjdw997axbcf5w5368hrc6nc9hrc9macgc5bpal1kki"; +"rrgtrees-1.1"="0jihs23929pzbgpgnb2v9i16fcil9kxkggdv1dvg6xq9f2fh21md"; +"rrgtrees.doc-1.1"="1skw79hvvh0xkjff4bfl0nqdd8znwhhwpdx33v8ns43xxamzmnwy"; +"rrgtrees.source-1.1"="1q7y5mbvnrykrp87kljcxw7zdglh08cqz92iahdsaac4xffnz6bc"; +"rtklage-15878"="0wrvj1d1dmdff3kqph59jbyg22gvz3bhpnyvjd7ih7vzfi4b8861"; +"rtklage.doc-15878"="0nc926q2arbszwsq88dd96spaj5xzkrfng34m84x0l8wbiidbvlh"; +"screenplay-1.6"="14p99gph5jvm0h9x8irh0c4mxb7q4208j5q0d8pd1dpmlvxvzsh8"; +"screenplay.doc-1.6"="18i460n3p05mx325nh7br1fl3i1lfviy7jgl24yc5hwqyx3wwdpk"; +"screenplay.source-1.6"="1fdw0bpf4q294yqnc4svbpyiza9bq7x2m0x5rc0x709c1wylqsyr"; +"screenplay-pkg-1.1"="1xzwvnf16djzsif7ff8b51dq98h2844nzkj2f9y6c75g6rhnyls1"; +"screenplay-pkg.doc-1.1"="0hkxa7gz3sammjdvglvafwczn54m6vcywz6rwqng8qa2hlvb2c3k"; +"sides-15878"="11anl2mfkzkdv5qb0rfw7940z7hy5i43d8hh9nsvzgwfsw0x1qkr"; +"sides.doc-15878"="0gsqb1hzhy1qk29lhq57arzivkwxw1achz08ms1q8q9vxwcsf0sz"; +"stage-1.01"="0i2nq4mxbwlp474iglwyixxs8aac6wwxzaa16i698vy5v0840bz4"; +"stage.doc-1.01"="18v7j7likkwkhwsccvarp9sjg8y7insgpngy765w56zdzw2r5m66"; +"stage.source-1.01"="10ln9mp7rf8z7xg0f7hrssns6kb5psf59r5vbb05xxn68h90j9cy"; +"textglos-1.0"="08932gszahdc5q6pckg9q8bdxs39gacjw9cljjlvghs8vn7jjwjj"; +"textglos.doc-1.0"="1c88my4j07b7ihn07bcii9xxckdv04g3c6jycm0ffhjffw4p7609"; +"textglos.source-1.0"="19hc7lalmbr85pbz3pd3dm696fsbdl7y8v9g1c4l2k7b0i5mc8zf"; +"thalie-0.10b"="0v12fsh5hf77x6r105n2cvjv26hzsn26yc5gwjmcl3gy5b74x38a"; +"thalie.doc-0.10b"="1n082iqbynx9sq563b1d9kkjh19wvbmrhcnfr3h314gfgdmw6fkx"; +"thalie.source-0.10b"="15qb05nv0ac34vjk6b9y2l4ag6sa25wj3vnq3gkrzbvvfy929kad"; +"theatre.doc-0.1"="1nhm56spqvryhmhwmzly939mzv5yv3398lh2lyfhf40rr02mzgi5"; +"tree-dvips-.91"="1l7vgcgbh31hdaaqb9kqi9jmvbyr5429wchyjg5pjjgpffj599qv"; +"tree-dvips.doc-.91"="17l7mmvb03zi7am3nnp60ychx224kn5i3bdl2yv2v1dywbsnl7yw"; +"verse-2.4b"="19yp18fl88zcph3r53ajbnwcr8lbvgahs2kfdg733l5zw3k5pj16"; +"verse.doc-2.4b"="063lkcis5m4zs509hn4z1zg1faz1lsxvjak6c574xasspm45v559"; +"verse.source-2.4b"="1r9pn4dqpr42ng4xk899kxph5sci82dkdx834lyrhi8lsj32g9b4"; +"xyling-1.1"="0gixafnkq15xgkqm2y8qxljfpy1n5nq4ll0lq19sb9635czak427"; +"xyling.doc-1.1"="0s38yqc0xfhf6ap8jc60s24vvmsqhn6f4dsslsdk8i4nq1dmsw92"; +"alkalami-1.000"="1llldpmc485zxlw1k996g3gfffb0ixx72afz3zkj83i78dpx180j"; +"alkalami.doc-1.000"="1315idl4yricb06bh689hhdf9jkc0ckmdygacsx3ywzxj1zcrcch"; +"alpha-persian-1.3"="0673i0l6vq1h37g9jqcp7am5kl4dfbcrfqp42c7cr6a10zhvfqyr"; +"alpha-persian.doc-1.3"="0cfl47cqpwxn1k87h19a0ggayf6c52sl60sdrmpa7sfydhg9w4qg"; +"amiri-0.113"="0s6ri9lsbzym1q6rhqqacypmlad0npxjrr9wf0dc4cnrciz56a4i"; +"amiri.doc-0.113"="0ygizd5qywk8fzpx5cnjrykav75p217aybhdsfhr70l6bcsqhy0w"; +"arabi-1.1"="0jmx0xsb3hz5i25mmqnxgg3bikyr1w26i3364cqrp50x9sqvkgfm"; +"arabi.doc-1.1"="1yipdaiai9fbmrxkacqwnbibdiaa5vskzj40d1hxv6wnkxvj2qkw"; +"arabi-add-1.0"="1ylvj2w98dly6blpk2aicz206rfg5xzqbcjx00j3jnmw7g847kxh"; +"arabi-add.doc-1.0"="1d1wngc0179p7ij7ibnyvq3cxb954sqywxyv5k7a3dg5np9zlg7j"; +"arabluatex-1.20"="1s66v0qns84vhpwvb9if07b9s7957jmxxd643g1mddg36z6pkqfj"; +"arabluatex.doc-1.20"="1rfwl55la33ag9plqwssjvgq47mab2h7ljrw5w6l96vq965c2csa"; +"arabluatex.source-1.20"="1g84xxm5fvp6dzdrkyxcjn4wlih0iydrdyxn93dffx1a9n1c3yyg"; +"arabtex-3.17"="12vl66hn2lhc825fp5z6sv1gxlmcivzh8v0qksjmnlkgrbvj7f66"; +"arabtex.doc-3.17"="15ajpzcyxn55f3knzm5zyqnkd32dbylp6zgg98wphvrxmggcjh1a"; +"bidi-36.3"="1nyd4zz12gxlk5n1bg6vinkm4isy1zi0iq9d6vfk2p6w3qwy9dm2"; +"bidi.doc-36.3"="0wx2bpygghmjxz938qs4gb8739accp7hnwlinrbids3pc38mxhl0"; +"bidi.source-36.3"="08apy9pwz55b1r2ab706slvjnmyc8ik0qz451jyrvlb48gf3g89i"; +"bidihl-0.1c"="09wrzqlldxy3lcxp21rdqi9bnjzza9wvdgssqynynjdmfggahd34"; +"bidihl.doc-0.1c"="1k67d2zd16ash4krnkwvmwx4wl668r0pdg720vr9xq6q3b139y9d"; +"dad-1.2"="1sj53bp0fp8d2d3qnwvl0lm7c6pzbvv8ds9ww3x6qhrna630iwaw"; +"dad.doc-1.2"="1yykrywq662s311l9daq9wpxdcr8l6qifi5bzbnv0vx2372hhhw9"; +"ghab-0.5"="0skiyyxr8l6a6n34lic42lf0rnv4jm5rpmzm08gv0qqq4ha67zki"; +"ghab.doc-0.5"="15vpkpbpnj1w3nlc5wzy2k4fh8jw1a21asc24lj0j6dpb4mzja1n"; +"hvarabic-0.01"="1h8y4wg07bhjcn42z5bgiw8nkgfsb08h80mhsyg0mg3dqrkpx93v"; +"hvarabic.doc-0.01"="04ngis91nsdrlb2cq0hn9vada37ciqsydwaknbjynb5s1a5p172w"; +"imsproc-0.1"="0pkhmc596xrmfwp90w7brrzbjn5rzn70kdpnjlxbyf2j85dr7gz3"; +"imsproc.doc-0.1"="04qasn12qqg69k6isnv2qjpcnfs1nd27vvdpqqdb23z97k38x2xn"; +"kurdishlipsum-1.1"="0b5x438l4m396pmd427zcnl7jyy5ag5c004gyn0n1zzwbz5lcnfk"; +"kurdishlipsum.doc-1.1"="0kw9664fm4gzv7cspj2psczyn7m09qz95agn4j953q39l0qyz6ls"; +"lshort-persian.doc-5.01"="0b1b45nh2d3d3zv735dymgyllj6m8i57icbihjkl1im0nghrzklk"; +"luabidi-0.5"="0flk2g56wfdsc8330grmpgxxmik0sgq9vbw2r51mlzj00dl4wz7a"; +"luabidi.doc-0.5"="0qdbn058p7xlr7s7ivaz4pf0rw4w2lywfxh4nkrr8lxjlszbqsmz"; +"na-box-1.0"="08xixk2hl5w876x6hmp6h044spi0qw1qbgrqklwrmkxkgpa27i3s"; +"na-box.doc-1.0"="0i1p5f2nchl9hyrkc6s3hsqcvmyxsi4dbwyr0mph8slhw2rzl711"; +"persian-bib-0.9"="1yzbap8fwmlz46ngqcy6hwjw98z1cxlprpzk6vg2qw7wvs57b143"; +"persian-bib.doc-0.9"="1rn6p3zbfx6vxdjzxavvbf9405cxk1kv56971n6i2bysb5h22w0y"; +"quran-1.81"="1cgig3cq5057q0mrs0h5mz8l9zpp5xjjzw42kv1v88556wxc564c"; +"quran.doc-1.81"="1n20l8366iisgnn9zdzfcwhqrlg5zz84w30ddm1zjhwnjsycin17"; +"sexam-1"="007lxpvam03cvldnq9q8l2p60iymfijs2yc30cgj7i1lx44630va"; +"sexam.doc-1"="17rn2wf68f16zsr8p1dk3klqapw251zpqc2a7z3b7lgl4164q57w"; +"simurgh-0.01b"="1nhdmdi6qbvx1nd92hxl8vkly82a9nxi7ghj0zpm31c15z5pb7rq"; +"simurgh.doc-0.01b"="1cw434sxnbgq5dbaidn3zn8i9az4q35blcx9lr6yf3m0yy2rl8by"; +"texnegar-0.1e"="0qrnysss751vsbgd794gwh8lwrq6gq09p55qkkfngc5ly29icx9c"; +"texnegar.doc-0.1e"="0jidhqlklr8yd48san5iyy3i5pxg8lygf4xi0gcp3ps7xcb0m5g1"; +"texnegar.source-0.1e"="1bayaa5vffnkmvdmg64q5rsnh69grr8qirwd41mlfi9symh9gm2j"; +"tram-0.2"="1bk233y9pin9r76vsbkg5j2wadp3c6p2x3mgqchnmlz2ip54x336"; +"tram.doc-0.2"="17b0vw6r2ijgxs3dix1ff9r342vkz1gsa603mxixxxik62j5crk5"; +"xepersian-23.1"="0y3r7hy2sxwim38msy87rd338hncygc920140i8bs9ii9qyxddwx"; +"xepersian.doc-23.1"="0g9n3pkd5zj705iyyw6rp4k88mnqc8kl4ng0jvcma1wj48xjzl83"; +"xepersian.source-23.1"="0yj8z89hhf083fzw4kr2475zl7q0zg5frh04hkj617a3cylc3r12"; +"xepersian-hm-1.1a"="0qj98xrbnh9bam0a6c6vy7ffaia3iqsx5s71bjlmbnyl6y2h8lwp"; +"xepersian-hm.doc-1.1a"="16f5x8jv8mqf5a32gvrzqwh1xz4s5nxwqsq4q8sg1za6micqniyg"; +"xepersian-hm.source-1.1a"="0zcq75xzkr0bgpf1xdsphrkcv70q17vs8jkhzxvjrfzilh9h3iqr"; +"arphic-15878"="04a15kip51zp4bhrbpiv4m5pm587xbia792ckj17gj281ysd4817"; +"arphic.doc-15878"="1z1z7nnncp4dpb91bajxf3li47k011jn5jbxzgdaspa5mjvw32k8"; +"arphic-ttf-42675"="1z8fa90baasp8j8539a4kzilah602lik012az7i3pc0dnm4m2w1h"; +"arphic-ttf.doc-42675"="0nfbjnprd71dwp2dxmkmdggfipa36w4qbps82czn506xpzh07lav"; +"asymptote-by-example-zh-cn.doc-15878"="0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff"; +"asymptote-faq-zh-cn.doc-15878"="0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb"; +"asymptote-manual-zh-cn.doc-15878"="047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb"; +"cns-4.2.0"="1b9hs7svh6zm22vw5zv6nqmdnmw453xv15gl5bgm4n3f1pz757wv"; +"cns.doc-4.2.0"="0zdjgg2njgcf35jvbhkfgiv3b9cccf7ds8d50ga3v1ia9i4h9xq3"; +"adobemapping-51787"="0xarfk18da0rl44i2w9acvnivdbm1sj04v1arc40yywdy6pyb8sg"; +"c90-54074"="0dwi568dsqyc7qw1k59f6i6dp8d22130zgppzqpm4xwp1x11r4f0"; +"c90.doc-54074"="08mnypp4hgyq62wrir0fma2gaw9c57nibc54hkzknvzkkc02slxg"; +"c90.source-54074"="12bn9sy8dcji52jnzicjrwdp0j1m6c6pl6fk7i505djgrxs000ab"; +"cjk-4.8.4"="189r8lxgrdl710k6cvnnsazhmp767da75qn2xax59mcfg5nq3z32"; +"cjk.doc-4.8.4"="1kbchcf6i4svr0ilhh8h0q31js77hkprx8wjz0grc0j35rsclgp5"; +"cjk.source-4.8.4"="08lx49bj7jy5yki8zkynssi8k03z5c27782ajr49chw9slyrs49d"; +"garuda-c90-37677"="1yz7zpwdvvhzcsfcz4dc40nnaagwrsxvskc5bymmdxv1zf6m3npf"; +"garuda-c90.source-37677"="1ngmq35xjs1ipr9y9agxxj3kzncbz3f8wbrkhpml45r52jds2vnf"; +"fonts-tlwg-0.7.2"="15npkl9qypfrvsjwwqi9awl56di7wpr200pi4p0rsr2bx1117mlf"; +"fonts-tlwg.doc-0.7.2"="1rv1dy6phfx807df03d1fbhydcddqpdply2a270gsqh4agax69f8"; +"fonts-tlwg.source-0.7.2"="15b8j3fbhdgz3lksra822igy4hwy5gyynpl5wzbs5zh1yhzr517w"; +"norasi-c90-37675"="1bsx31al77ci58p1zavp5q9dl8msdjqilb19fglnkhgg8bjbqh7d"; +"norasi-c90.source-37675"="19zfqq52ky4m5hcgzyy830jr1bgpbrhc43ygdvqyb28pdfgm6sd1"; +"uhc-16791"="1xvkp384p0xcba1lbi3b2najk6d2w1s78yi6vgppmcjrd5limif2"; +"uhc.doc-16791"="0q1wxcn2zclpj4bsn47jgd78xmp82a6x8w068j4ihza9pfvbqacm"; +"wadalab-42428"="01lf8nlga2nycr23xpzl6xas2nlgajjmia4lk4zvjdgcxqnipfrq"; +"wadalab.doc-42428"="0m8x6plkry0p3jabvhgkccb2rvlsz941di4ihfc8schkq7iyjlxq"; +"cjk-gs-integrate-20201206.0"="00rdlkwkaclzwawnsqzyf07l2lvxl1drfw4qvq2lg25ld3xni1b2"; +"cjk-gs-integrate.doc-20201206.0"="0x1q9kgl7y2nc6pq3a7bzb9na6i6kw629g544k8a5rgfhkzk9g4p"; +"cjk-gs-integrate.source-20201206.0"="1h788aq405c44alpj85lyhmlnvdslc21n6h89vx5dggdfypbq18r"; +"cjkpunct-4.8.4"="0wvqmf60gjm5m7fcc2qqz14lfzxcrqci3lrla96hxkqnqraiyb84"; +"cjkpunct.doc-4.8.4"="1ja16xaqfg5158155flfvayr39k7grij13r1r89g59va53mpsgrk"; +"cjkpunct.source-4.8.4"="1pn85n7n4fp2p5pq3w66kb5zlnjk1bdz7fz4xsa6z31d5216j39b"; +"cjkutils-4.8.4"="0wl33vh7pcrbyvxy6bfcjfv0xnawp4gb76cmq2304n9mp2w8dg2h"; +"cjkutils.doc-4.8.4"="1gvbw4yc0knc86rydscpwclirg0mbvl3yk4fphwx0wwr4vzi3my6"; +"dnp-54074"="0jlvb0nps1ij4sgbg3clgbk34p80la1fhh9zihn9fhl9nrqk637r"; +"fixjfm-0.8"="1v4gn6bwlb294sxrqgy6j9vx2dp7plbagkvmw7vbvp6wk8dkza72"; +"fixjfm.doc-0.8"="0wiihlpjzvmh8dynf0nbhmn8raxflqxmzpk97s1qv7kkvpc79sy9"; +"jfmutil-1.3.1"="0mgx44gr6dm8mp35k2z766lcmc4pmkb7jwbpamvz3x6zv0f925n7"; +"jfmutil.doc-1.3.1"="0y4hfngr23gf5spzjjfj9c6f863x2hvjrf5v7m80zjpr1r9x4p1a"; +"pxtatescale-0.4"="15swkjxfxznb101hvlqcxpplxngfaf0nbpkw7j2fgccyqjs5fhfn"; +"pxtatescale.doc-0.4"="1j6yrpyfhn75qkv03bnwj9i3s4lmsh47sw696y13cflvdmsgs8n6"; +"xcjk2uni-1.0"="1x77gmg738r2zbyd0mc7q079hz5wbvabyszmwizfdj6vflm86w3y"; +"xcjk2uni.doc-1.0"="0xig1w251dsn2qd9iywcdc20plibadiw8hl1iwygpzfa3187djjf"; +"xcjk2uni.source-1.0"="12hbjjdypk0s5k5iaac80n2n4z1zlkg5lp59y58dwnn4y1dx6m6z"; +"zxjafont-1.2"="1blq826xrv3wqkpdndd21wmd5v4gp1b45yw9rkb1g2ypsighmbwg"; +"zxjafont.doc-1.2"="1vaavdxhjq72ri2aw5qnsf8jiijwn1y36fhgnpb1x0dhkhwz8076"; +"ctex-2.5.6"="0ckxf94x3117m4fwrjyzww0diwwfsx1hg1wpmh2l2zc3pdg69r5h"; +"ctex.doc-2.5.6"="0p1xx2zpj5nzklsx063j51yh7pfr14iicsv99aa4lpjvdad55rkc"; +"ctex.source-2.5.6"="0nzs5bllvbf8mki5j79cqq1wbybgdxf1y66k870llvp851w0can6"; +"beamer-3.62"="1jl89gvk3ka810d0jxk8c30rw2xkv92jikhdz9150xkw9slk5rq4"; +"beamer.doc-3.62"="1n3i17rm82s2is8csh467y69f2n0s9kwi82m3l81l7a78xivzgkq"; +"pgf-3.1.8b"="0llrxra7574cli878z67rvm5wab8ny595sl6m3k79gzv1zlp8k10"; +"pgf.doc-3.1.8b"="0ky0rk0mx66m2124b4jjrcjb3w05rsjw2sfrnrz3kj21vyiijlb5"; +"pgf.source-3.1.8b"="0g81wcsn7dx21q44b29jscikxayw1pa5vqclwxvd54p1x5f98ch0"; +"fp-2.1d"="07qzdfrk2y499cz9jbpnj024r43japqdngbxg4mbapw9cp8066d3"; +"fp.doc-2.1d"="1y1xwqf6mskg10h31ws2pvn5y6g9asflc7l9r24fp2fi4254mvhq"; +"ms-57473"="0km07va23z5vzx87ndrv9mj0fq4yw0kv7qygd59smhm4q71yspkl"; +"ms.doc-57473"="122xwapvjzv9qyh3p1884bzdpalvqzzkmzd18gqr3q3r4cmk2q20"; +"ms.source-57473"="1myxaybppzkdl14h4g12xcp57zqjzkzijryv9nd6hy6ggl9y8i99"; +"xcolor-2.12"="0jaiwkqynbi9f7j4kacvhzcahndmzvrb063r9524p2imv3gia8c7"; +"xcolor.doc-2.12"="024avysbkx4h1z1l451pfy9hdwny2bks5c34m14qlsb97qhi1smw"; +"xcolor.source-2.12"="0jjdrs6q191dmnk941di50pby0mifriz247g0dflf1a78il2j4sq"; +"translator-1.12c"="07lw6zy3gwv3w5v8qpjd6fyzlz1qp6rk4qf70lrsd567ybw0vmzl"; +"translator.doc-1.12c"="0icgx47gy6m3b92q7knvqjb4pdxikj3i8lj35kw9irhzrg9yvndr"; +"everyhook-1.2"="11r4932kly5zmksmicapqxndqw4cdq1sg2x9hgffms6v8m5cwkfs"; +"everyhook.doc-1.2"="1g9p36ki26vqdfiwnr77jxk1bna7733dml5k4s8nxq1drsklwqwn"; +"everyhook.source-1.2"="0hv04cn2j7sf6032jxv18py368zbpp4ya15wv18qymbk6yv5najs"; +"fandol-0.3"="1l6h2brl2d6bnam6p6j0p1d2s13jnva5zkr1xr4sarzzxj6zlz2r"; +"fandol.doc-0.3"="01ax7za7wcr644ncpv3rpfvl2ndqlppqnjzbjp8y2d0hawc3k5m0"; +"fontspec-2.7i"="14fl3r5zvx2va4wl3jikvlkan9w8cc1g6ri7rm2rizlksi0dad53"; +"fontspec.doc-2.7i"="0bwfq45mx5cdxjpwjdhdjxyw400933ns0zynxkijcvkvzhjx4pha"; +"fontspec.source-2.7i"="062mm06inkgmpv58c2rqc9cpbr5fkg7bznabdvyq8rvvy4qiwd5n"; +"euenc-0.1h"="0lh0k5g6icbbzl1xzzcj4sw7vjhqpn59y9xbc6cn58klpww8ywdh"; +"euenc.doc-0.1h"="0likhzn8afsq302aiyjk6adhjimz0naqffjrj2s06c6681z2inh1"; +"euenc.source-0.1h"="0bwr4cabh3w4jbx476ygxv6afxj6sblszr47awr2nixx0m018ndj"; +"xunicode-0.981"="1h8ixz9zy9izv5j7555094jiwfp5js5y8mp4bh993gn9xn1rb6b2"; +"xunicode.doc-0.981"="0jrxnpas07np9a30cybk6jqv4ng96vjqpyyadbl55szkiylzwwfi"; +"luatexja-20210319.0"="016glnf76gbbhb7japvk3p8x37i31pw8hz58qvn610cg88w2r755"; +"luatexja.doc-20210319.0"="04zjjfm3yd3kkscspfjcplbflv9nsv6iyain3fyv2z4lk97i8169"; +"luatexja.source-20210319.0"="1ld91sfhyavw0v6zs77df97mnkfip4alyr7a66qgzrgn1vpp920q"; +"luatexbase-1.3"="1zrwz661gilr4iizcfsxwmfr9dgx7v28lypaslmvp3zaf52zl2q1"; +"luatexbase.doc-1.3"="118azb2x20gyaj42r5w0749dx8rzhhri1nz3szy9vv64h0fig603"; +"luatexbase.source-1.3"="0vsg8q5k8l66sy3d0bskr6cv1f95lnhap3b9yl754x7ynv272xcd"; +"ctablestack-1.0"="0b739h1ndkisr49d8y4q0vnbl9j3diqwl9r1ah8wk2za1ww2mi54"; +"ctablestack.doc-1.0"="0qmshnvbyfjhi8bb989hbffwn3447r91jp46z1yhhmcbjpr7clk9"; +"ctablestack.source-1.0"="0133xxb7470lyfssi1kp81yr1zsz4d8ai3qjy72wki0p7ijkypw9"; +"platex-tools-57729"="1vzhnp93lpvv59qlj3kd90lb5blyxfq32k1x6g8301yqmqpxf4q3"; +"platex-tools.doc-57729"="1rk37vwds2qhvlj8r9gz6x7vzsp8zjbwr560adjh5981a03d0rib"; +"svn-prov-3.1862"="0r4s76i89wh1fjrmf9imf6y2sf96xznznyjfcivi3sp8dvf5ln5v"; +"svn-prov.doc-3.1862"="1al7qiwd5ajjpvs2f90p7frlkd389p1ama019yl0nnxc1l45m067"; +"svn-prov.source-3.1862"="0cg7qwgv20jvvw6bibkskj3p8jc5l2mhgzwq6x0wzy1ds7x1f6b7"; +"uplatex-57972"="0l8vw2fcsvrq0zjixwizijib9v7yz9fh6ac5hs76bjm3r4xvj870"; +"uplatex.doc-57972"="0386xnw7fazkax5zp929mqmwqzhanysip8zycflg5n9gl3p9rmfm"; +"uplatex.source-57972"="1fzr3vh98nnkr3f4xh6cs3i5fkqqh08530kx8rr70325714mrjkg"; +"latex-base-dev-2021-05-01_pre-release_2"="15z8vjz6a6ymkmkxma5p16gjvr9nsqx6wkxbgq95ljpp74hg3j72"; +"latex-base-dev.doc-2021-05-01_pre-release_2"="1s94lk12cyrnkfb3wjvjhzxg4dwfic17pmsqbnyladc6qx3r10ys"; +"latex-base-dev.source-2021-05-01_pre-release_2"="0zbnz9j2qzmkw7j4wimflg04lh14jxhzvssimgxqvc352zhh62pd"; +"platex-57972"="1nfkv6g4193wlyq4r1wa70k4ilvkkgi0iv6ka59s2c7avr9ji0j9"; +"platex.doc-57972"="0w6kqw1xdw9wgn4890lspskm4cvznr6d1cbi8nqgv8dfwxvkl0wa"; +"platex.source-57972"="0q1hnnkjchx1c6pkpwr6fqp2lyhyiz9izs9x2m5g68p0764zvk0d"; +"ptex.doc-57972"="0c4gyjrwcxhiim557m13kfnlbp9hc6781z78nhabgg6zd7qb7m6m"; +"ptex-base-56487"="09j5xw5j57zv733n9r6ac54fn8aiv18xdvhbphzpgry98kh0clwk"; +"ptex-base.doc-56487"="0nkk67k9h8iiiplg5jcvb1gh8j1flnzdg40kdq475zlhigima33c"; +"ptex-fonts-46940"="1vvgb6kxl4py4knh9jqnwjy5a9xf0r0yr8n6rihpxmmw3lymwrip"; +"ptex-fonts.doc-46940"="1fys51jjzzmcxrkkc2iq6yx5p68mspqnhm3gap292f7qbh2n9jp7"; +"uptex.doc-57972"="1w0wvd77mvba1qszvz8j6kpbrsyjx413ldpi7bz87al8qcqhj9p3"; +"uptex-base-56832"="1sp3jqkxhylcqxm5hlc0gvgzs7h6xfirclppzhdwm7g4v1ckf0ni"; +"uptex-base.doc-56832"="0d82xasqjq2mmmlcn833jjqrpb7cab2d36rnw02ivbrf07m8i1hy"; +"uptex-fonts-54045"="0q4rn470yg1d892mb6g9z1y8y3w1rw7a66ag5gal6j0ndxllgghc"; +"uptex-fonts.doc-54045"="1nc9fmaq2vyp6387k7rdpvpzclabr2g30cpng5ry17k3qmliiaqz"; +"xecjk-3.8.6"="0whcqadziv4xdilgcl59dgfdd9m79944wjk73j3ynl6djvihxiwj"; +"xecjk.doc-3.8.6"="0w8vq96qg7z6brf5q3ckqdxwczc5cgl19jakn9i70p27nxci6dny"; +"xecjk.source-3.8.6"="0wwymwnkdfhmmc0c6zb5r3nbiznka0kykcm404hyjixjqqcri3mp"; +"xpinyin-2.9"="107l74kvfwhk3r325hpvvs9p92s07mxq46qlvdvaq4yr6gjvlh6s"; +"xpinyin.doc-2.9"="0w5pwgw1hd8bpl4j8nm6qmv4jdj25rdv549dfhkwncxwb10ds5xq"; +"xpinyin.source-2.9"="1qi4paa3bvwhny0xysq8a88czzdn736mm7fg7cvxlclfn5v9r0xx"; +"zhmetrics-r206"="094afdf0mwb6f5jvg7z7cs5xinia71cnlaixcihliai37kdn1qss"; +"zhmetrics.doc-r206"="0achyp4i8dfhrkr9jddp7qzdifcqsf28qaqdnyb76525mvgkip5y"; +"zhmetrics.source-r206"="0hic8n6kq4sx2dc8vb34fhyjrbbxp50lllyj5sh2ld9s5fwgm3yk"; +"zhmetrics-uptex-1.0"="06g61qm3ryy6mvvaq4whk7084hjp544dig57mwcxlgp6cfs0fq8l"; +"zhmetrics-uptex.doc-1.0"="0ybijj2hjm4byli3yh8q9lgb40bdpq16d9273nrmiyy8szxa20qc"; +"zhnumber-2.8"="0ijvfd7pkg9hqxl0s3h5yj9zqw6p5kinbang8v14h6bbb0nzvhxs"; +"zhnumber.doc-2.8"="1qvqm1plnxjv4ag7japic9kzf27c69hdsy92dqad6n66q3v22kn3"; +"zhnumber.source-2.8"="11ydch2nd0l1w62c78v9i64zcl16crvx7r1gq2lj5zjfa5wc9bg8"; +"ctex-faq.doc-15878"="15c0g0x8w7vm3hyn6lk60jf66akyfcq6x8jc2lnbjx8ydwgb26br"; +"fduthesis-0.7e"="1dcvn1ydpqf01vgfbnyx83bwcf8yq0p1v7b0hx7bd47ssj9kn6xq"; +"fduthesis.doc-0.7e"="13n0f40hfg9h9yplhwv00ggxb3633inx4k8w9yx7ffzf74gjf7d6"; +"fduthesis.source-0.7e"="0816bas2p5n3x6601b3sin7kiaxm40a549gr4xydxh1ijdxxn52a"; +"hyphen-chinese-58652"="08sbasjp9b4wl15zmx0diayqfa9i7pf65nnsa98lbc9rpyydvhn3"; +"impatient-cn.doc-2020"="1pc20pb0las3slam1d9hmqigipmr6r98wwif12m33mm750vmq65i"; +"install-latex-guide-zh-cn.doc-2021.2.1"="06lz1mrziimfgng5sls31i8z0g06zsvmbmjvng42ra34ybmy1xvw"; +"latex-notes-zh-cn.doc-1.20"="0w9rmd7b5fnfvix653n9vbnn1k8yxlaaak79ipvm8p53dx75xfxd"; +"lshort-chinese.doc-6.02"="1lmj130hybwidxp1kba2684vm4bqvzd1ylnnj80w2wc60j8d1xkd"; +"nanicolle-2.03y"="1sk2frvlsxzrl5cv1c1azqpxbpfr4b06ssli54j0p5aikf0rls1f"; +"nanicolle.doc-2.03y"="14zsfxcyw2ckdsi3fg5qwxfy6d0yja310ycxsi3xrdyxyia9nrd5"; +"njurepo-1.1.2"="070jmqsm9caidgc0n1cmcj2v0x8dlxxwv54hcqkrisaf4nlkyyk1"; +"njurepo.doc-1.1.2"="04hg7gxg0nplqpmmagqynnddxv12qadamjy3rj1sxhwxgjma9c5f"; +"njurepo.source-1.1.2"="08fan5igmdc43s82s1adq7ymxpvahnp08f90p3p4qlqanj41yh65"; +"pgfornament-han-54191"="097i0gyxxvnajwfbblr52s8qw2y5ld52i4rybg4lk130qggx2v5g"; +"pgfornament-han.doc-54191"="12vayalf8hjaapdfdnhr6jnc2x14l0kxak3qwi7xsn3cafrsfm1i"; +"qyxf-book-3.1.0"="08v4n8lc3qcxjzfvwqypnky9zhia7ylwq5f31arxgdf0wq4gyhia"; +"qyxf-book.doc-3.1.0"="0i6g7v0xdy26rdy1kap0b4pnsz8xjm1h90dwby8y0bqlxjhd509w"; +"texlive-zh-cn.doc-54490"="1r8n9k1cy7798g1rg1hyj6g945j9649c5hhqf8hm7a7abzx7w6ll"; +"texproposal.doc-1.4"="1yxb3yagljsdp4s07fzd6498889i7cscch68fb77jbfc2z4srvsy"; +"upzhkinsoku-0.5"="13fm9r3s01003n8ykbq8plx3xzj7p9bz958ylkl9f10kd9favr57"; +"upzhkinsoku.doc-0.5"="0hd55x231kpcl1rmds601a2k1yzvhvfks7sg0424gzw7wirhns75"; +"xtuthesis-1.0"="1d68hx38gwwscshdm07rcg75zjbsvk5kyliy5rx6z5jp75k0fra4"; +"xtuthesis.doc-1.0"="1fdr5k60zxjb75vv4m6mj1kalka1kg7cw3k5j9a53n01m2w7q6r5"; +"zhlineskip-1.0e"="1j3wkvd57kdwhhny0dzw0hqqnv2ghx1mdjgyzrhfj8gf3fifdaym"; +"zhlineskip.doc-1.0e"="0hy14njxpzffcnyciyc4zbil6372b640bshfw9jq4wyskwk3i45h"; +"zhlipsum-1.2.0"="0rvwbnqzgbdihdavscn8mcc7hy6yjdzj2fc2h3xs3i77lfa5140d"; +"zhlipsum.doc-1.2.0"="177l81c3zbgdvjgr861jn917ps174zg8bab824f7dx2gj5mhdzgf"; +"zhlipsum.source-1.2.0"="098fqbcr9fdv6f6hjaczm3q28dpx0g8xqjykg5hyx7nfp7nh6yjk"; +"zhspacing-41145"="0h588z408lggk7370l9kcssz2hn9lz19bnakadygrklsyhqh9pzh"; +"zhspacing.doc-41145"="0s5qyrsi5nw0vppgx90lzz3ra121jgm9hgzg3z791imlxgjn8pzr"; +"babel-belarusian-1.5"="1jad77cas2x8nlkh72rkxi3bqdlqzichqkxd3bdxk9bsqfhvj80s"; +"babel-belarusian.doc-1.5"="08lb1909wm2r4psppcbn1sf3zg4a8qp5y4i0b6kksfp0n7v1nckn"; +"babel-belarusian.source-1.5"="018jayyq2mzb89l60h7f9vzx2zgy2skklbqqx9zs3krg23xy2i6g"; +"babel-bulgarian-1.2g"="1lflnrgn8si78aj9ms8lh9lb07maghvqlnrc7i3lmgn1qjrlvzqx"; +"babel-bulgarian.doc-1.2g"="1lb0kxx7bxrllyb7sqs1gjkqv7414jvs2kl06cnrdwsrfbr1g0kz"; +"babel-bulgarian.source-1.2g"="1wck40na2vczwni0kk1a8c1naczrcwx8sql7j0la1b4c5dcikgxd"; +"babel-russian-1.3m"="02zvg65m1g15a1fbin635gvx2mxw2ljv4srd0wjjfcpdyfg53sl6"; +"babel-russian.doc-1.3m"="1bs2q9xxqyjvpqxr3zfbmk0lkf58jg1ksi5a9mp07vznzplz01i2"; +"babel-russian.source-1.3m"="12ik2dwkih2g0gqpbg83j0kcfwsb5grccx27grgi0wjazk0nicq6"; +"babel-serbian-2.0a"="1bpk4v943cc349clqlrqk3z4qgys9hcy6i8f0dih5sf3m4rkz33g"; +"babel-serbian.doc-2.0a"="098v5c5ncjbbihz2anzpnxv0agvyvp2i2zp4n95madqwjwj9hy9w"; +"babel-serbian.source-2.0a"="1pzmq241c4ra9ms9q0w8rfjihszz84yh34wg0lbn1w2f82zmvmp4"; +"babel-serbianc-3.0a"="1i691hb5pjis0g9vahxi6f4dbi1rxjl8wd497hnwq6ca4qv68yq0"; +"babel-serbianc.doc-3.0a"="10bdkiq26h6ack65g0xfn7s8vbbj2chdbcdphzhb5s7w8wa3217v"; +"babel-serbianc.source-3.0a"="1dn73rsdf2mrzcd5ggz33fbqfmd7rqvwbsm4var8s7zlgfw386ir"; +"babel-ukrainian-1.4e"="0fm0sbr6i1lx2zg90w3mlwlyg0j0f11ya6as2n1w4gbm1inmc62w"; +"babel-ukrainian.doc-1.4e"="1h3ag9pybhzysb65xg3m217jll1h02ks04icrlhkp97sx3gs9wqn"; +"babel-ukrainian.source-1.4e"="1v7w99b86iclp16qxdjfqsxnh2p9zg669pwdlman1467y2z13p8s"; +"churchslavonic-0.2.1"="0f405qij680p4jjacjryjgqvb6ysra52qmydqk5zgqyljrm9h6hh"; +"churchslavonic.doc-0.2.1"="1k7imx74l512fwd97bsqy1k8jkbkf2b97lr1iy4pp8jibam534rm"; +"hyphen-churchslavonic-58609"="0yh63znzx0bqqqr6x70c7laikxx82ph85jw48i0jh9ziv0n5gq8s"; +"cmcyr-39273"="1fdsd6ks48rvbvg44ac01z89rbd4w887lg2f9wqca1byx142jg3h"; +"cmcyr.doc-39273"="12bg7k2gf206gwlg89mqwfadsyznpwl2nbzcz2vrnvrh21z81s1c"; +"cyrplain-45692"="1wdcibxs0g53warxs6vz39s3chldzh05p7v1ksskppghg5qzgh8z"; +"disser-1.5.0"="0kksdx0m0lgb7f45g21yzfh90id3pzq17bhff8x7az0djb6n7zk1"; +"disser.doc-1.5.0"="1pb4gzw1yx3kx6yxabm4wj99gmnwmx9vw30m3l21304axdxgk7w4"; +"disser.source-1.5.0"="02awlfmhyi2cahd0dkhxkfiqqg6jwmkksv6134lyms798j0akv0z"; +"eskd-15878"="0cpaix3x3qw5mgaim5574pc39hypi42kmk7yvnbvf3qj5bv7jkyz"; +"eskd.doc-15878"="1zwpxmr721b3ij4b4zvkncddy85d9s9ma7llajp36qh4vl0bc0cf"; +"eskd.source-15878"="1kfyrzs1swin4ph70ifm1mnsm77dprd96rsw228liq1cybn5bgii"; +"eskdx-0.98"="0h11378qh1y4c4ac3vd9pcl93a09kpsh0vyqcg7mfn01dgmqfam1"; +"eskdx.doc-0.98"="19bcl4szagigbd2jrlz60vhhphm86667chciwlk05k6hkflg595w"; +"gost-1.2l"="0b495h3wwvwzn7dilj2am4h934y7b4fm3g3j85bb6i8fpqxbpikp"; +"gost.doc-1.2l"="1as0a9pc9bv0aya47ir77vlwv2hqaapl1ks70gslfqj57082whwa"; +"gost.source-1.2l"="07jn8ji4fa68mlq381lcmvk5qcamiczain2jlmpqcc9cfxd31s3z"; +"hyphen-belarusian-58652"="1n5md9kf7iiwqm236bkdsl4fb4vd6a03b6q1arvfa4l4yh8jvr13"; +"hyphen-bulgarian-58685"="19h61n6ip8ja8kn8p1fb79lfv15pfzdhhzih0hg15cp1891nzlql"; +"hyphen-mongolian-58652"="1mdgs6gcvzly6y2i5rlxajk2qxjac0m91ayqb079mz8yxwvmq6xp"; +"hyphen-russian-58609"="0vlnw1xn92ncl31yh6i7k386n0hp6vx90lgb1kxs0a3zrxcds0wa"; +"ruhyphen-1.6"="0pizl8szphgyq12sbpgsw25x88svj6vmf8j7ry23hvc9bvjibck7"; +"ruhyphen.source-1.6"="1s0wscvjg6hj9f8arjsp7b9m7nqszqxh2wyjrx9i2qb60n2kaaac"; +"hyphen-serbian-1.0a"="1v0v281ws9dyivqd1nrb5ms106vlvmsrvka5jmnzl1wnpw34z92c"; +"hyphen-ukrainian-58652"="1jpi7argypmrx4yvc23dx777r157c7kxgwpsix7cjjihakmx1s6k"; +"ukrhyph-21081"="1fnh98jcbn9l09mi952qrdw0dq0pjykwgwi35zz2lz8h8r750ihw"; +"ukrhyph.doc-21081"="0bbj125zb494g9x160n3lsivims28w0drhfmp0c2920cwhk4m0xh"; +"lcyw-1.1"="1c0js52z8mgfbr3lgbvnhc646ggvsvgr7w1mq83lyx0pvnlqm3aq"; +"lcyw.doc-1.1"="02h21pl11ax04q5psazgxpm6xpb8lljm4b08bbmivpwbm0z1namn"; +"lcyw.source-1.1"="0zf06l74fzlici5dzm3ggvz3h66dx3yjxmb7qz8xlsk5fppyhcb4"; +"lh-3.5g"="1k2nn4zpxdgj3b10xdqzldcdbw56ws9735wp0yajkhxl72ms0705"; +"lh.doc-3.5g"="0zvcl1zfbn7qv9069hff2a2r2d33xmqr31l4di24y4p33y3ylprf"; +"lh.source-3.5g"="040n2hbkaypam4fhyb82ncy1sfyvg7fdhykw9fnvy42mlzxv1p3y"; +"lhcyr-31795"="0civwbn156gky4k51189s9lpqcs06wjr32pviwb1gzsfr6rc7vws"; +"lhcyr.source-31795"="1pwlcsilza9f2f73qsvbr2xxxbs2dcms08jxjlnpk8fxcpiy8j6z"; +"lshort-bulgarian.doc-15878"="0qg23asq2i5mqhp9xblv5hm3qxmd5886d5x0gq1fkdbyy9gsawi3"; +"lshort-mongol.doc-4.26"="153k4dzia30fpx847wli7i5p407a808gmj3p7jifq5bpx479qg1g"; +"lshort-russian.doc-55643"="02abh69xl43p56fcciyan4j0z4mqq2j7ynwazq1nywhz37d6zn7y"; +"lshort-ukr.doc-4.00"="1nsah1h3z3sy96a9x0mfdwby7pvvjwq7zxfv2s8nvsbvnn1al17s"; +"mongolian-babel-1.2"="0qv413sx05pz5ri4p9znb020nhb8m2ybapcdgnxvkdamgbfvi17s"; +"mongolian-babel.doc-1.2"="1zprq4x55rbd667ll7a1rcscbqvg3i4wafmxnv4bksdm8p512w5z"; +"mongolian-babel.source-1.2"="0qf83v7iphfavxh7kh1zav95r6q3k0aiilzwnc0mm607bkjzc2x5"; +"montex-IVu.04.092"="0rgf1rflrf98jayyhj1gxz0mkw74qhd88b4i2ccf3mm0kzwlvw0a"; +"montex.doc-IVu.04.092"="0w9izkjmb90d4x5j1azhlskhgfmxh67jq1awsdv2s52psgscpfm9"; +"cbfonts-54080"="06641hiw3yahh28yq3bnz3dc6d25als1d8kbjh1ldab55gb3vz6i"; +"cbfonts.doc-54080"="1vlhqfx3y85ym7xaqzr7bxkzm3am8806s6bkp50mv58r914xmlz3"; +"cbfonts-fd-1.2"="0gaw2v82im1k7addx320xhwwq28mcm2xkz4z90pw09r848s9fsyx"; +"cbfonts-fd.doc-1.2"="1arnjpk1n9mkva1f9gsh5834kjb7m9rd49kgn3jf6acmdac67rv7"; +"cbfonts-fd.source-1.2"="056b2x1fv2gvy7ldi9v1kgsla7jzhvl3lsd5wl1v0sb2rqr2jngv"; +"mpman-ru.doc-1.004"="1x3drpi21zcmkhkscvl4l7805wskqa4zskydb33i0asss5p62396"; +"numnameru-44895"="151c13r8arj094jw3zaymz6i7invgpyqr95p0qnwhj22z418pj1m"; +"numnameru.doc-44895"="1rrargznsmgq1h6a2ixxr9bg57zcrs9zwhxgz0ssbscdyvjqik8n"; +"pst-eucl-translation-bg.doc-1.3.2"="06c9ajnfl01sl81z5r8a5lzmaygq9rdmgym2v40y7xp7z033gwwv"; +"russ-25209"="0jr0x81xc1zi9vhgvqy0hcga48nhkj9z2n4rd5303b8h68n92yfd"; +"russ.doc-25209"="02dl5mh45z9n2b59clcqnaj9fsv79jw46ph3303mlx7plyvdqj8z"; +"serbian-apostrophe-23799"="0anhf0xj3pm516sxiby2j3pbh0cp50ipch2s5dh037h8bfmjgsbv"; +"serbian-apostrophe.doc-23799"="1r7fsgsggbr8gf973a8nzpq4rjjpmzbcqnwc8qrlynfiscwc2mjf"; +"serbian-date-lat-23446"="1766dw6c8skacjbbcd0d2lvy1s57vjl84c12xf1w2q8kh6p4lqk2"; +"serbian-date-lat.doc-23446"="1k8lnnhb010rq872yc9d4m8s3vd1my93qydv7x8l80xyp64sq203"; +"serbian-def-cyr-23734"="1zxl15y1j964sp4iys1rl4gyaqs13hi5ms9rhc7944p36rdf32p4"; +"serbian-def-cyr.doc-23734"="0nwfxr85nf19ddk9b7hhin84jpimsx2hm45nzh136qr5jnr1g3hz"; +"serbian-lig-53127"="004bfyajczp11w6bpb7zfyjwfpqwlwzian0m68qhmb3j95vrs3nv"; +"serbian-lig.doc-53127"="1yrwmr8mjhqnizsgvar8s4xaaw1f70x6zij5z394a86ygx1gx06r"; +"t2-47870"="0s6zn41dp7vzilfyk92yy5mbb74lcrpnmhrwl9xcj1dbadi97nm6"; +"t2.doc-47870"="0wfm1gy3dyhfv2xzjfsky2fvdhki5r2ndgvzliq2n0kvfxf1sgna"; +"texlive-ru.doc-58426"="0c77yyfj87fajran8jppj0x8krk6b5195iscpn8z2n94spz2fcc9"; +"texlive-sr.doc-54594"="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj"; +"xecyrmongolian-1.0"="1m20p5x1s92cwhsixaz3s0y00r8n0j6172bi8vpyzcpf8mc886br"; +"xecyrmongolian.doc-1.0"="0kiyjcqlajmpj80n8wkk0ziri83811ivl380i3cyz7rxmsh1hqhg"; +"xecyrmongolian.source-1.0"="0dj2191iqcm9qpi45h45r3cp4nz5gdviw6xf9iz261b3pn515prp"; +"babel-czech-3.1a"="1qk6k4y1rkay2fcn39i99pxsip4k68xac4axznl07pbgx46v3h64"; +"babel-czech.doc-3.1a"="1hvp785ly718fd1f0ig092rldcqglpb3mrygarww5bnl6fpp2ffm"; +"babel-czech.source-3.1a"="1274pzgdya7gkvxjmdm3v5rb7hc0sj6mqn9pd8y9418yx5449spg"; +"babel-slovak-3.1a"="0724h8hnc4z0l0kkafjczzc69rh6h825wn0srfpy1zmqimybvaff"; +"babel-slovak.doc-3.1a"="15v2hdmpbivcdwrm3mlyb3bb3p1298swq7vwxqb9b5ylv8907sd9"; +"babel-slovak.source-3.1a"="1k4w34wq8n06ck9z81wa490fy52a1dcgi98pcvdmfggkalwr7ml2"; +"cnbwp-32550"="1xn9s2scd7x714c178p3p8bmv5bjdqzpbyz75nmn50d8irjg1zk6"; +"cnbwp.doc-32550"="0cs6jp079acnjj0292xba0gjkykva6grviwnm36vhxy93732cls8"; +"cs-41553"="0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3"; +"csbulletin-54433"="002dpnpxvppdrx5g523n17fj4f7jdyhfam85zvrf3qbqiahij3n4"; +"csbulletin.doc-54433"="0p2wbn2ndsmzrwry79408qfmfaipnkg4cjsd9phifpz1hygc0a96"; +"cslatex-57972"="1qdcnf755fak3kppl02yi2q9ghb17kxr2cyxc2y80idaafqgr9sf"; +"cslatex.doc-57972"="0b2a9hrbqzhd7k4ac9sqphs6zvj1hc03acgm5afyijy2mkx865v0"; +"cslatex.source-57972"="0ig4a8nksmsm7pb1hxfy6gksfv27bgayqx60ygiaphcz0ir73546"; +"csplain-Mar._2021"="068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f"; +"luatex85-1.4"="0ss7c5x0x7sx6lsn1iq6lyyp6w0xb1iy01s1f7zf7mlb9n1yzffi"; +"luatex85.doc-1.4"="126y3priwz6anp8sj0296bnxd53lz20nchpxw74zphfpwrv4hzih"; +"luatex85.source-1.4"="15bc8g0pgrkqpb8q2dhb6zml2d4jwrripih9898mmalsjixy62x7"; +"cstex.doc-58354"="0j3ifcz9myixr875rf71nh4ly2mxa5yz7cs3w8waapif82yybj3x"; +"hyphen-czech-58609"="050b4vmp8n9nwqzagpw7mq1ciin9rwgdicmbk1ajl9gvci7q1q8b"; +"hyphen-slovak-58609"="1vn6i784fdz35dcbxdcv85886mbg8vbjvx0w6sx230gjjxs1s571"; +"lshort-czech.doc-4.27"="0ar9qa0cg0mjv6ydgx1phaa1qpiy25s3jciznbylgi5xprvnnfa9"; +"lshort-slovak.doc-15878"="0b5gn95i32dyn8r7v2cdcz759fllp3b0zwx17adjs282n06vfymq"; +"texlive-cz.doc-54496"="1m442mx60ksmrani152rfj05mara20jjd4hba06qyk69716gqli6"; +"vlna.doc-54074"="0g6x2m8c5mjwjfrbqcndjj45alslin7a0vqasc1j7rhfmqr3issd"; +"MemoirChapStyles.doc-1.7e"="04m56f629sh38khc771jc50q5fv1fmbyqkww1p6cr617626m2f4x"; +"Type1fonts.doc-2.14"="0a4fq8sx73nbgb5lmbsbxsjv3n4ax5x7l284yw8qzqha9l0sqni3"; +"amiweb2c-guide.doc-1.0"="0cxwsx49p3c162ysv0ydyxdncfg8ij9sx2x7c4pvzb0yidvad01c"; +"amscls-doc.doc-46110"="0allim05cp20zhn480df2mivd3p9gnc069d7hbjlzv660bw7mapx"; +"amslatex-primer.doc-2.3"="1kzayyh1bycmq43s2xn81jf05r18azidbk3gv6igf2vaq37fmxil"; +"around-the-bend.doc-15878"="00nc6kx4ylz9g6vmjlgyjvmy1ls86pjblbcpm5z40wh5xl7l184f"; +"ascii-chart.doc-20536"="1m2x7iwz80plq6hbhp9xia6bp8wbi03iifs0pkr7ji3gn8hqgh1r"; +"biblatex-cheatsheet.doc-44685"="0y2ry2q1kvpy8dqglqdfq3rc849hmbni0k78wr1xnjbpd102l3k9"; +"components-of-TeX.doc-15878"="05wq82pa2m1hdpjxx2bhj61nkwcyynjn3fprbnngf2llv8yzb9ag"; +"comprehensive.doc-13.0"="130s89hkcr2im2k282crcpgx892dciw8b2cblpgw0fh7akr5c05h"; +"dickimaw.doc-32925"="1mxjqn4lblnpbmad3jk453lyx1qzcmrddis59j3jsgc5sp929w4k"; +"docsurvey.doc-57362"="11qir5haz6k0caa7c3gf1iads9z5nwqli7gvblzclxv6g97n9374"; +"dtxtut.doc-2.1"="1szg0xvwm0jbzs8waillijzrff4kv04a73gsqh9c12ap427xfryr"; +"first-latex-doc.doc-15878"="13ngk5pia5vbrbb4jrrlq1lmyja08m7cy4ydcjasxha8kns001ss"; +"forest-quickstart.doc-55688"="1bjy0bfkb90nv2dbdw8hdrm3dvm1v0r0m7a0l44ckw48vnc6amvk"; +"gentle.doc-15878"="1l5fyfdbkpqlgpgi1hrnn2sz8hchlnp7z5s5584czafvs10jg6vx"; +"guide-to-latex.doc-45712"="1wc5pclv27af2zr6kjjahjzxxlab31d8970jvxr9lxiqllvkxyab"; +"happy4th.doc-20120102"="1x950scxbvcgwycpakflpklc775pknjab620g099dnsfrpb76f4a"; +"hyphen-english-58609"="13h2gli0pfjg797i4i86dihmnrpp52fjr1apj71fgjiq2453zsdq"; +"impatient.doc-2020"="03cjl3lg7k7p4h8drw7vcbw6ymgmm2clv6sgfs3hdixs8dmab1b2"; +"intro-scientific.doc-5th_edition"="0bzgi3zg0lm6zwjnac90ihaqwcvhindfdphjijv7mh11ii0qxlmf"; +"knuth-errata.doc-58682"="0rcyw7dqcwlnf9q421k017hrx5c0d9rra6rcr3n6wqmhxmdy5mn9"; +"knuth-pdf.doc-1.1"="0x2m2q8bjjfn8i05nn68pia1v5gsf4zcxgymymmd840xfziih838"; +"l2tabu-english.doc-1.8.5.7"="0dqmdr3lffhiaq7pg5pn6ia46miwq4nh5vimhd0qbf936amiv1mm"; +"latex-brochure.doc-40612"="0xba20sy8q10ac9hxwnz9axh853hrj06vp7mfn12ajax31miznmy"; +"latex-course.doc-2"="0z6q95l2vvxrspc04ki9wnrzhz76nynb5ai6969pgw6ihl68384f"; +"latex-doc-ptr.doc-57311"="0mamlfnxzi4lwh5cpss8zcfr64jdnf6vnj9fp48accrqdj2rpfs2"; +"latex-graphics-companion.doc-29235"="01zs32gck1sl9zlbhghyjmjwxyvw0jha5vl2hd10knyrb3z4dhxc"; +"latex-refsheet.doc-1.2"="169h1syday30qiw032k14fhxikdwszggvqz8b9ga4i9wwxf1vh4m"; +"latex-veryshortguide.doc-0.7"="17i8zmr7mjfrx911psdy9cbn05c5inn4ixqmnjkpr9sbgsninyc4"; +"latex-web-companion.doc-29349"="0v018lwf88z3qmzyqpyvfql7dbwk5a9r0wj3jfjc9cp2ksl8zf8f"; +"latex2e-help-texinfo.doc-57213"="1blnnx7bnabb8yqpx3sv62n8xygibyxva9d9s7iw8w7rr74w7650"; +"latex4wp.doc-1.0.10"="0xyk6w8jmmcsccbd9q4ikblfq6nacjjyrmf58ddjxkb6v0lzndph"; +"latexcheat.doc-1.13"="1383rsi21ma0291asi779bjr33m7fii019di8gv8kxwgci692fz0"; +"latexcourse-rug.doc-1.1"="027siznmshk60flxgra7dgzvwbmgwvckwb6r257b91x3rm77anv5"; +"latexfileinfo-pkgs-0.22"="0lf6pkxjqdilg10i3fwmlb1nvvag6c5bm6pbcd50jjbd1q39iih0"; +"latexfileinfo-pkgs.doc-0.22"="0qh84r86pszscg96gri652y6p5xx245lfzvx50qvzw77xn4iv6ra"; +"latexfileinfo-pkgs.source-0.22"="1x1sj91sd5bb0jihvp0qg52q8ybak4flvijj5hdq84jf0bw3gryi"; +"lshort-english.doc-6.4"="0pzqdbzynlwvpamd69cmfpa8jdcvq96qjr9k1fy3dxpzi2mapvhd"; +"macros2e-0.4a"="186qfgd6p825fjnwivvzvvpx1ydiiw4k4lkvs9gqvm5gmas7kcv1"; +"macros2e.doc-0.4a"="0faj1gxhrc1fsqniy56c35jjzmxbpgyc27ai6xipbdp8sjdqm6pa"; +"math-into-latex-4.doc-44131"="0k11j92h9hpxnyciczknhl83b05avc0rqdnwn82ssqi1k3qixibd"; +"maths-symbols.doc-3.4"="0z83qf1rz84cr0b1zvwlacf24pc5r8dn1cxiiyl0xrqncl3279ka"; +"memdesign.doc-48664"="0aij1b7l1kb2x44qn33m39k0kbhdrclmr25nmvzfn6yw42lh9fz7"; +"metafont-beginners.doc-29803"="12hhvlnvh8dj1396242m6yi0341cina7sxrv7pwzqxzzahwdvmgm"; +"metapost-examples.doc-15878"="1rslyjnw27b5br17cbf6mjjkcgyr49yav4kw12spm3vdwyzb7gxr"; +"patgen2-tutorial.doc-16490"="12b78p7jsrfi88rr2hf4118x3myxbiq741k2kdasrs40fzvfjz5s"; +"pictexsum.doc-24965"="00yd0945qiss5jizkxncg8a9bdsld7mkhaipi92bbn1ghqicsw5a"; +"plain-doc.doc-28424"="062d6hg4npy57307avvyd2sdxnmyrh5ia2rdb17p6cx555k8zxwq"; +"short-math-guide.doc-2.0"="1wjcjgw0xk4zx57f364cpl57qpxj3lq4lahlkbk6iiin1h9v2prf"; +"simplified-latex.doc-20620"="1cgf1p7p2ikda1nb0c2vhhx7ai6rd973pz6a00pr9yanxsvghp6d"; +"startlatex2e.doc-56809"="1nn9mcazsmhlb7gdw06qcyf3grf8sbgqll9j8825p64ahy35al6q"; +"svg-inkscape.doc-32199"="1gw3jp7wph0ys6372z2rgjwlpmmawdax7xpgrp4hzg5hxz748pn5"; +"tamethebeast.doc-1.4"="13shw7hcimckn7pp8pj0cr1zsi1wq6r400x1v6akpmwwjxkw09g5"; +"tds.doc-1.1"="10j98fv34p0mwgsgjps8mfpn81kbzghfchz9nr7r5bwz93s3ycsz"; +"tex-font-errors-cheatsheet.doc-0.1"="0pfd5qphmizhxb2p4gg6809xcx1rlfkwqa6vs4f74457chcwljwn"; +"tex-nutshell.doc-0.6"="1yv4l3il5wpfijr9h4k2wfvrvk5g472p6p94kcb6azfmrnxda6h2"; +"tex-overview.doc-0.2"="1agfya9rwvyjvip0alvibimz75jivpf19hp4jvlv7z0n9m26m9jd"; +"tex-refs.doc-0.4.8"="1w7hcd3qsdhmb2siakjg2hm3h6kxa90ncsaif9spr4xkxs03ib6l"; +"texbytopic.doc-15878"="0pnh1hsd6k434c8i1xdjq3ywrwylmryrsl86d6h7i1cnmzz4pwlx"; +"texonly.doc-2"="0h40f8hj03ha0ilpj2fx5kzzvdv0yplmr4528s2rmmy62l9kgdkd"; +"titlepages.doc-19457"="17ib7rpb2dhb2m724x66fdzddv8cqd808wxy5kkvx0vb3rl27hyh"; +"tlc2.doc-26096"="1ysb233rjb8gpl9s35qql1dny5rj6fn8ssy2dqdqsn5xj9pdasyy"; +"tlmgrbasics.doc-56221"="0sgbmlrzr0v9d09h04z9mpqxcidv9ggdfi1ibv83y85f5blwqirq"; +"undergradmath.doc-57286"="1z8my3fwqc8rfc1843j7lcmfka2023z9k0js4ygh1m8kilc2nrr7"; +"visualfaq.doc-38647"="168agj8vspwb6496rxx6gh5prdwx64ihc34rw74hwdr67nxh7ihm"; +"webguide.doc-25813"="0wid2sxrif3mm3lrs0s6pil949byviq4d7924yzvmf9hkrs5f03v"; +"xetexref.doc-56291"="15gb91s8zmqh1zwar2r3yca3ywp1lz654h8ha6xg52lg83vjzr2v"; +"armtex-3.0-beta3"="0m8z77lvwkrmk6zdlbxy1gcic8sgn3xwcnkgv9nfwxrjnxxmbhyr"; +"armtex.doc-3.0-beta3"="03inlslwgi0zgnndz4p23r40rdwpl4lxbxpc1w683c673b258hnc"; +"babel-albanian-1.0d"="170mxpwnnsc1g9s7qnlhjcryw79cy72d8c4m8bhr36i5c78my0zg"; +"babel-albanian.doc-1.0d"="0x5z4gfi6m9h5gml6wxq3531i1k0sfqrd4hxrzbz68ijzyjnzk5j"; +"babel-albanian.source-1.0d"="1w8bassqn35bxyhpw6cg65ya64x1dn9h35p4fxclcjjhmv53xgg8"; +"babel-bosnian-1.1"="1q9nplgxfyv877y5q5hm4g6i5dla5c3a9s5cax27pr1riccgh5dh"; +"babel-bosnian.doc-1.1"="127g44ww87gaizsak6lbmbr9yhjhy8k32zkah3189yi21w7ncs4q"; +"babel-bosnian.source-1.1"="0mlllv7k35vyqpa9r4yz6y23cgfarqbyk47blfc5b3dill1imx6b"; +"babel-breton-1.0h"="1qqayklpx89qmva8j6l6rhwinr0jik9lq1sgr6av9w0qzy9y1ifd"; +"babel-breton.doc-1.0h"="1q5xlc5cm91wa5lpg5wysqyhiq71ghf6sb8b3syxsqzxdicqwqrl"; +"babel-breton.source-1.0h"="19rafbvhd4fp6vb1pbgvaxrmiw1miw4j2n0dsi8fnmn1554zb25f"; +"babel-croatian-1.3l"="1d6xi12v3qr7gsknkfcb77q0wx5hyqpp0cyqq1spq44yf507nnlk"; +"babel-croatian.doc-1.3l"="1h15dzgmm5230ypaznk44607naj611n0mrhp9mjabjdqbsb71qdb"; +"babel-croatian.source-1.3l"="05zhbrvq0iwg7vbccq59rx2yfbaznixgr5nfh37k3584iwaqipwi"; +"babel-danish-1.3s"="1q5gl9dxl5qky0g263yfa4gwb992ngd7vwsb24cw9fd513j50b9h"; +"babel-danish.doc-1.3s"="1xmp93khcz4my2i1wrnzcb13bnxd9mnjm50s2jhbh8qaiywls7m7"; +"babel-danish.source-1.3s"="00dryb078fqckqjnxa2riq478j6d5i28j5cclv4bw7dn5naa3lz7"; +"babel-dutch-3.8j"="1hiv1r65zvn3hqql6pglm209nq9qhh5iidbm9x8ikl3q272f8y2v"; +"babel-dutch.doc-3.8j"="1pbg8gfc3z0k5caixlz5vfybhfxy8wbc0xls9kjld53ia9mvyy4r"; +"babel-dutch.source-3.8j"="1a40rz6rznawgarnhk0wh751sln2x9js4420i0758y2clf4rlhg9"; +"babel-estonian-1.1a"="0j7z04mcvjk72cad5l3np0x862nvgh7jxha8mll55cf18k9aj64j"; +"babel-estonian.doc-1.1a"="1nmjvvms0zijpc15rs0fkzli3pmidc4v4kzfp9sswvh43622p1b1"; +"babel-estonian.source-1.1a"="0x2a379m1b1ll16dr62dg5ai353p362dw9js4n0dn3x2wjbndmzg"; +"babel-finnish-1.3s"="1z49ix8w96walkq5p915amii7n73ahzhy4ijxa1b2bb0wzz4b1l7"; +"babel-finnish.doc-1.3s"="00aij1bdybgcg69995mjrdddzlr3hqbhmg8q9nq86cd29y1gx029"; +"babel-finnish.source-1.3s"="1930zxk4l6k5q4wcbvpvijv4s0gxp2mkxvblczn4gcbar10vfd4x"; +"babel-friulan-1.3"="0gfq4gyi720kp45vcbial0yrn9i2jyx1lzh39lci0ga77y01j3mp"; +"babel-friulan.doc-1.3"="0hnj5scfsvisf9k6iwh4awzqccm96apxrbwzlknpxn7x3zv93l0k"; +"babel-friulan.source-1.3"="09bzwmc1jnal4ikxciwas8y342rix0xksd7qcp39nwajyg8njdmc"; +"babel-hungarian-1.5c"="18hc7z7gki6jyglywmljlf37aff3cndszywa32kmprbn2qlfc87k"; +"babel-hungarian.doc-1.5c"="1imn8zlk18fcs2nsy4ml20xzkhpmv5lzzh28i2c2zv6klm1kmfba"; +"babel-icelandic-1.3"="12v78k2l9vmc07mx0wy8g0mjwryp1jf6ij06502h7jr55my6y5s5"; +"babel-icelandic.doc-1.3"="1mbgan8gv7hld0jym7qks13yph9lz0clkgpb199x3cdxmbvawpb7"; +"babel-icelandic.source-1.3"="09wz6pfk3vb4c0az1lgq35vmzf8v49iz9cd1ys7rhdssbcz6flv3"; +"babel-irish-1.0h"="0ih96jfa66jn1s8c3dpr0631pa17r9sch1lv1qqwpmsridp8dl8q"; +"babel-irish.doc-1.0h"="19k6gps25d8i28vcpbp59k47mxdzjn9d89amccr5si5hvg1c2qnp"; +"babel-irish.source-1.0h"="043ias6pyv22g8ywv5krlzj5ma98wpi0r44lmi4gfpqllkay5g1a"; +"babel-kurmanji-1.1"="0jp1aivn0pzn8yq1q79gvzwdlcz871apjg6yxx9x4wf8yqr8q1g8"; +"babel-kurmanji.doc-1.1"="054b2pj4iv2mnaffw1a6zqihp18765rdx6d56k6vj9kxf2gqrz1n"; +"babel-kurmanji.source-1.1"="0v6nh14816ai72rqc7nxd8k16bi75dvx2kbvnaavknxyr53pjwb3"; +"babel-latin-3.5"="15hnxn0660dbds675xrd0zsak4bjvlcw43bs6g87c4m6dqkcg8c0"; +"babel-latin.doc-3.5"="077jr35smbzmarsjl9qqjlbq2q6x4s65r82s42ds9nzfbgjmg0za"; +"babel-latin.source-3.5"="17xc21mb70aaks09cgpwg8qdqz1ll3gksah6fpz337qfmd1v4z9v"; +"babel-latvian-2.0b"="127649mzw9jp35mq1yqpavlvkvcvxvp61sn0yl4nvhn30d0dws68"; +"babel-latvian.doc-2.0b"="1dvcwyqvx5xw4fl58accykkmd9ksbg5a3yqalb6x86hdv2fgsnq8"; +"babel-latvian.source-2.0b"="1w8w1ayk1ixwsixlsar5nmhv70fqahx06ydraiyz543gm3vrk6br"; +"babel-macedonian-39587"="11wiv5aw0k77rvqwcgh4xdiwcr67q42rwq0mq5vcpfz2hb0v8i6n"; +"babel-macedonian.doc-39587"="0nsvnmjx8397xb02h2l00nd7ynz11f9qiqrpim2f18r55qmr0hb3"; +"babel-macedonian.source-39587"="08z4ca7kja5kb2azf3whgh0w7fabxs3jcijihm0vnzhb1809napi"; +"babel-norsk-2.0i"="0n173mskrn15pz6pnxyysavwc93w5cz57wywdnn2xvb574ka8jhf"; +"babel-norsk.doc-2.0i"="0a3ka4hfvjv7w2s90y7rk2vb4jsaqz85sfbnlmkfxlhamr937c0d"; +"babel-norsk.source-2.0i"="1d5h7zm7d3d58lmkn3qy8aazx4a93fxmziz68cckrxa7izni7s1f"; +"babel-occitan-0.2"="0s13mw7w48zq91kcx3pk5rzfg7d9dcjr8n8bvqsk5dvs0k4hk1dk"; +"babel-occitan.doc-0.2"="132kk66ya2j6d7cwzd3p21qvjqm96dvb83ny4yj5q7vjqiflkn0z"; +"babel-occitan.source-0.2"="1slny81jf77g32nxkvbwr429yi51gfpia6d1qllni978ivc9lagx"; +"babel-piedmontese-1.0"="0kcb4h1xsm8qcgqmqpgkqqxii5xvzpa2dvx6l41g3025ybbp558w"; +"babel-piedmontese.doc-1.0"="0c6ql4g2i43zxx2ffnvg2rwac5hshvwngj7999g371fndhfzs31n"; +"babel-piedmontese.source-1.0"="1xqfd8s659plyijsc13014zjhd9ndpi82jwgd597lw5d9jzwxf6a"; +"babel-romanian-1.2m"="0pmjpy2p30299a10njvnpl954kdazir149b3aggcljaq0j4zdnzz"; +"babel-romanian.doc-1.2m"="1wgimmy2vwg66kjm0kx0lcx3zvvhdczxc19nnwqfbwchbpfhflyb"; +"babel-romanian.source-1.2m"="1qq1j0hb6vp8cdiigc425m6k8wpf7rxzdcgq14p064xlxnmqrbp1"; +"babel-romansh-30286"="1hh4ashx2fban828gj37y46rm0q7w2j18785in1fwpir3cjcab8b"; +"babel-romansh.doc-30286"="0w4x7c9vws6k799ilw2w1p5d4qv2z9wb3bkaixb0p4gxmp6khamb"; +"babel-romansh.source-30286"="08v3db9g43pviw7fi87gcgj5xb5b2f07sll1slcvy94ffnmwlpww"; +"babel-samin-1.0c"="07h531h0n7lyi8jhc3v9clcn66nwg8x50k2absmqzlq4adpgdqmc"; +"babel-samin.doc-1.0c"="0rjzia85w9jz8hj6d6kvapcm1y74gq5wxirrlyqqs7ar7i11yp2l"; +"babel-samin.source-1.0c"="1p6br0ki7xpzrs4cpsak9n4mn39fzxja93dxb6dl00rv8f9snj3f"; +"babel-scottish-1.0g"="0qkki9838204xy9ac4rm5v72615iz63wclgpw49srwwzf698z3nj"; +"babel-scottish.doc-1.0g"="0vag7zmwsmp6pc6xd4p7i55na39nhmmkcg2mlg4xp81hgladi3rq"; +"babel-scottish.source-1.0g"="0k3dj8awj55azynbdbray872pigjs8m9l86imdx5hj7dvl6svdjj"; +"babel-slovenian-1.2n"="1zpw0zp4f5wggaqb5wb9r3hjsxx8b4f892z5w7wirazqwgmxzn2j"; +"babel-slovenian.doc-1.2n"="1lmjr0cs0j48d0l2qflg8hxcaqfbqfxlqsl5fj4g5icpha4nji96"; +"babel-slovenian.source-1.2n"="1brwg8sr19048wgn0fdbi2y1rn5ls99kij8i71i789qf32hb1jvh"; +"babel-swedish-2.3e"="0h6p32rjvsqzy8kdhr0f1zi301xnrsvb8l9k7g6gfwv26fpdcnzr"; +"babel-swedish.doc-2.3e"="11kshqcqn2187q8h1hc7ifjnf8cz774wdnd9m2ncfvhf52h2l6mj"; +"babel-swedish.source-2.3e"="03rp4n9wkqyckman765r8v8j2pg5fg9frbfxsnhq0i2mr0yhbr6v"; +"babel-turkish-1.4"="013k4sv2xj0ky344frgbkl2h836dzjl72hacgb6rcdlkzwyh5sqa"; +"babel-turkish.doc-1.4"="0qdcg64lykk0g0gr3y4sc9zml58spq2y4yvlhc3md20mp6l3ji8b"; +"babel-turkish.source-1.4"="0xk8c1l61vs547x7586m60x2hfqil8zq3ikpsj9733ykayfclifl"; +"babel-welsh-1.1a"="1778pckqmd6fwd3xh3yk1dzhxbaqnffbk9arhm9qy9qxass1nnf4"; +"babel-welsh.doc-1.1a"="1p27zrk4dacj67lfim236mpv2s08j1n5w1wdpyziz60hxv5phmaw"; +"babel-welsh.source-1.1a"="1gkryz7dng4919w9wn73bvc5cfcly4g7dcwh1ilci0pbr55k1x4b"; +"finbib-15878"="1dr1ivhfb83ky3q82dzzv5vvc8bl84iq7am0p1rc8fjlbj95i4wm"; +"gloss-occitan.doc-0.1"="1q00j5r6d2y3gf8rbh7f7rdfjg3mg1c3rrfqd69rxyam9n92h41r"; +"gloss-occitan.source-0.1"="1cb92fpzv7cqqxxa0img0la6hrgxw6azb6j2rslszk9hjghbcjdg"; +"hrlatex-0.23"="0klc0pb2b2dcixaqhgxinhy18rp0lwck7129zi5qnpygzfslpdws"; +"hrlatex.doc-0.23"="1dlxj4rv9gaxd6i4ns4zmhykhxwsacw6m3m2jmk2lkc3sw68hsyh"; +"hrlatex.source-0.23"="14cw35brx8mqv05zbgrvfmmjhxyryx7dmj8dk0fkimqbyvhvv9sj"; +"hulipsum-1.1"="1wfcsaff7rja3n0151ddzbfl9b3gkfkwq0vp35zcrd80xsqlw935"; +"hulipsum.doc-1.1"="0994kin6fvbk4j9rp53vjp6ci050zxsf6z3qi7zdfxifd269fhx5"; +"hulipsum.source-1.1"="1a5mkkl36dk60baffj3an2sa382p39j2sdrgadczj5r9pm9q0am2"; +"hyphen-croatian-58652"="0fqwf7val8hfdcqww828cfq3706wi0w0ypmvwkkllsx1nv2mqiia"; +"hyphen-danish-58652"="142jxvssj44xh1p8d0b298l0ri33blvac5syvqgx71cvsbwpc6lb"; +"hyphen-dutch-1.1"="1hxwpb67c2hzzfk6jchhzbj2mfxzywz4zqm3z1hz9r2ywahram59"; +"hyphen-estonian-58652"="1x8by00sb45acj1rkd5az408i0i2wjdabd992p4d599sf8b9dk05"; +"hyphen-finnish-58652"="06c9r6dfihycr4vb4bvnf08d3p94h5n5g0ayjpha6gl08ab6wmv6"; +"hyphen-friulan-58652"="102sxp8901hln47nj7wng556bmrn0hqsljlf0v0ll8lsngf85h33"; +"hyphen-hungarian-58652"="0d0bg0h78ij9b9anmdlwrlddd1xg09c2k5ganwnydbpj81c4z425"; +"hyphen-hungarian.doc-58652"="1r10gjxyk8bkqjiiz7pij7zy4cvspvhnimkszl2sv0zgrkgayw68"; +"hyphen-icelandic-58652"="00lnbm193g0zv7c1m47yz90gik1bd80718y8cmz5jhxz9ny1l271"; +"hyphen-irish-58609"="0kaf1as4jrs8kc7rr2jg3cjkxr0x4fxn88gqjxdjdac6xhlvg0w1"; +"hyphen-kurmanji-58652"="164q51fkcfslh1vdz19ilwjbrs0v96a4pn45d6n0cvv9vw6gi791"; +"hyphen-latin-3.1"="0l7lsp9igylrk4cvjff8lx8jk5biisss3wkcil26cca4hb1612aj"; +"hyphen-latvian-58652"="1p5kaf7pb5qxj6h3bglgnsqx9rys35i02piswwvayf4bdmv9sqx7"; +"hyphen-lithuanian-58652"="09a4636b77fc2rmgc2b4jxl174bjc4ji69xply0yls4b69727i1x"; +"hyphen-macedonian-58652"="006fg0snc4h98fzdzwdhk6ibhyrvqhs502wn2c1dnizlry05fdv6"; +"hyphen-norwegian-58609"="1sp47h5syhcb12nik26iy6xs5dyxrj5a53vzr0scbc0s746qi4gw"; +"hyphen-occitan-58652"="0v0yivzx0xl48isjlnxfzvlrx9gslg6srids1aywfqmybffmfw95"; +"hyphen-piedmontese-58652"="04sva2d6dxaick0j30izd7z71vpw8q7xx0xvihcvcgb62gb5bc7a"; +"hyphen-romanian-58652"="1720vcpvmm086k0ndlbp0rkzmz7f7mnmb4wn67jm53357iamkchr"; +"hyphen-romansh-58652"="0dxcw56bkl7ddqj9fahmghwsdkmi7ncr5j319hgcgnlbp1717rkc"; +"hyphen-slovenian-58652"="0fyzw8r6v07p04m44ky3n4vkkq1dmfkl58xyx65pcpj9399bdjy3"; +"hyphen-swedish-58652"="19rdzs7w80gf7q2xdkp1z2zc2hgq7mklfkrfdwzch2i50zzfxy6l"; +"hyphen-turkish-58652"="0zqizvrri9r9bldqds768bslyipqrs06hx96b0nn9k6wm1y8pvsf"; +"hyphen-turkish.source-58652"="0rjwv5b0jwnwhlp6ifzd6p8iid59zylp2wbfk5crfjnknrl48qn9"; +"hyphen-uppersorbian-58609"="0rvb1k16rs9hvb9xgf3yv79mh2gkndvk85blmjjsq49awwgkd8y5"; +"hyphen-welsh-58652"="1klj6ir4b918cx96jd772ps9fl2fljh8kwkakdwaqqi8szzr65d5"; +"lithuanian-46039"="09dncv4i7jqc2c28k992qm94iqg3x3nbnw5wqiva3xn3jiwx0fg5"; +"lithuanian.doc-46039"="17kac4d54nvd0bh0kqz00j7bm26vi4gnkbl5il1zb12g76r5afv6"; +"lshort-dutch.doc-1.3"="160r060gmw6f6lgbnyvfxafjpqvyr4jwd56ddkjfm3ir2bfl973d"; +"lshort-estonian.doc-5.05"="0dfwp7kkynpskb345i3yz7h5pvc8iljqg3q6l546vrwla0bmb95c"; +"lshort-finnish.doc-15878"="06madlm869kmwxprmy2c78ma4s8zk8mclzmd4xdl0r4mlhk4vdsl"; +"lshort-slovenian.doc-4.20"="0cwjg0z5vr4x93bz1khwl27rk8k7kpjm978iyzn6w7gx3wi87zr0"; +"lshort-turkish.doc-4.20"="00r6pv4z4933jw072djdasd2wp5j05wghln62ga4g6y6jblf6zks"; +"nevelok-1.03"="0c4zij8ihx3mz615jr4z150d61mj4ln88zrdbsjx9hlnandqkij1"; +"nevelok.doc-1.03"="1x7jwmp32f1wph9k03q6ly9nbmdpsrkhyvn5j83n1fj6nj6hmzqf"; +"nevelok.source-1.03"="15di74y4h7qgjh7gmmaingbg71jrlaiz1qxf960589k2xshslbi4"; +"rojud-1.2"="1cmpg4w2pqwvr624kc4rv7kvnf45c2ffqrryh0i7kbqgc22xly08"; +"rojud.doc-1.2"="12y4cph62b8rag4dxajpzy7y29kvnb3n0z99s2vcq1hfscyijn12"; +"swebib-15878"="1y5rrhrhcvjzz17lsl2y9h5qz0zl9gn34xwwprnns7503d1d2nfy"; +"swebib.doc-15878"="1w3fl5qg5hng8gsnykb9q86ddz48jdbyghizf5x31rjwiim53q6l"; +"turkmen-0.2"="0jhg6nd47y8igsn10m3bcsn61zydlwk3g1qfqpy8snz80rkyn9d7"; +"turkmen.doc-0.2"="1rs4jmqy5zrgk2awvvw8lsvdkzjwbfq65bm3m9c02158q63bw2i9"; +"turkmen.source-0.2"="1kz5qhyjax82mv74qxhsiwj83jijnfhgijdl2w8ic8lwc31q5ihl"; +"aeguill-15878"="1klri7b3isxwa9lpc2j857y8r9n9x1av865jm93ha6nrwlzqk7a3"; +"aeguill.doc-15878"="09lcp9in9v7vxck9kaql008qmcvba3g8glbm6rr5iag7nn2vbvj6"; +"annee-scolaire-1.6"="0lwc36v09a4ji5fz3pq9939jm39729k0k7hha4kkk20jc3j4jnds"; +"annee-scolaire.doc-1.6"="1f0qc5qvsrnjddp1kyrcigd8is2y9nsxc9x8a215p5xds2z5gc30"; +"annee-scolaire.source-1.6"="01mga2nif61mpkf7ifzhsj5pq7wzm2imlljap4c6wcrzb9zlhfx1"; +"apprendre-a-programmer-en-tex.doc-57179"="05779lk9v849k712wfjv0mhyzahwpl4n892ydamfdc5yg05bsnyv"; +"apprends-latex.doc-4.02"="1xzy7svb2xz6bdfg0f1r3whwda118pl7qdwygx1l7h4d1vqm2rcq"; +"babel-basque-1.0f"="11a26db60bwfhbx6zj42yrzzvf8nn8a96nq5mpw29xhxlpbhrcp0"; +"babel-basque.doc-1.0f"="04jf1brw3ljipdyxv3d001slc0iggjmq6hkr4b5jsa3z8gcivzvw"; +"babel-basque.source-1.0f"="17mz3bqi50ayia4nb2ikf60vgpnwl3i90gfbaq4692y354yvlnfy"; +"babel-french-3.5l"="1g2zhhkh0gl7d46fykrrwznl91g2wav93kmsw2gnlp1izwdsyb6l"; +"babel-french.doc-3.5l"="0hhrhspwbpcqkal88g55iakc5gn9jwlnm8xq4lvgq9qai98y9fcw"; +"babel-french.source-3.5l"="1cf9vnz87qxran7mpzhgjbk7wpb8wv2wsfd3xippxfkvrqh1a0n8"; +"basque-book-1.20"="03jh24rrjczpgj9d4w5fy9fv8w29wbqylx5s9n14jwdsf6f588ip"; +"basque-book.doc-1.20"="0sza7d2qx89saj6rx591ys15b8gvrnalrbrkk2wcjln1x2cb95jn"; +"basque-book.source-1.20"="15lgh24zyqlmqkw7wdigwvvkv6qwlpv4zrm2zqwgxj93bffa4fs6"; +"basque-date-1.05"="1hikrfz1z6y294zg00arnnc6any1iyn0gkhmv9j9wsnlvylcbnxk"; +"basque-date.doc-1.05"="0gifh2wlhxl5s2p816w06w5h51pg6gn2mdskhpgkq16shaj4xqcq"; +"basque-date.source-1.05"="1vjq5pqkan433wisv0d437m6hbmfqyds27dzwkyd233zq73fpjxb"; +"bib-fr-1.5"="0csd9a4j3hvgyczgnfnhp8n49j4baym7nw8sck38m86r3kn8n7ar"; +"bib-fr.doc-1.5"="1inpqvmf6c5zb091q5fxg0r2w87kacvg1yy1lyai7wq3ll0axvp7"; +"bibleref-french-2.3.3"="1r12767ayfh073559p6pdrfs9fs9g2dxcliyx06j7r8lyfab8d83"; +"bibleref-french.doc-2.3.3"="0kiijl5jhd024znr80g3xqdhz3jyg4vm4kyf1rcpa7dis4ffazpn"; +"bibleref-french.source-2.3.3"="17xih976gi8my8mdr8n1nfvq6hacicdk8a01s23a0sarj4qwxz0q"; +"booktabs-fr.doc-1.00"="1xkqh6r2q835xaa92b24fzf61jsm85280570hivvwnch96i4fnh3"; +"droit-fr-1.2"="1wz883z4a7g4na18z50vd0156gj6zpkkl49h4k0dhxwgqibh13mk"; +"droit-fr.doc-1.2"="1ss2j5jsr4h96rqcqmm89mprnr6w98zbsxy87jlmqavjjc8k8jq8"; +"e-french-6.11"="1pm1k7qb1a3h2b8kay9jwby382jxp3866b9m890rj9gfqdmwbfd2"; +"e-french.doc-6.11"="14719qp1qjcx4wjwcarirj7iz6qmjgwb95b308zqdr197y1cvymc"; +"epslatex-fr.doc-19440"="1xs9977g9g3i6sipkf7i9jdl8sdm69ci3161a4p7k66qbizi7zvb"; +"expose-expl3-dunkerque-2019.doc-1.2"="0xij1ycxnc3hfzkl0bfs03s0zzzv6xsj3myvykb6n836j1g66g2y"; +"facture-1.2.2"="1x0jqxq6jn2y5lzbk2y576g2wgaaqwlb11kpq16avvhxybgiywwg"; +"facture.doc-1.2.2"="1kcnzmssdnzfp8szs4c3psnxaih36clifln5kpdkgwd3hnkizl60"; +"facture.source-1.2.2"="0h2274fc7h8si7rzrinz94hddzfn073yvkv9hnvd9zlq35cyxif2"; +"formation-latex-ul.doc-2020.10"="1g964xll3y7llhcq1xih2zk916ikhx5jkq60il65z89fsb6v5jj9"; +"formation-latex-ul.source-2020.10"="184d2dnzcvx0f9di67433jw6b505mh3iv9g5fh30gq0344lfivx8"; +"frenchmath-1.5"="1fla63xk7qv8mx6lrmmqlwfkfz3z2gnym1vbyr2idaa7zpwn5y6h"; +"frenchmath.doc-1.5"="15ijjp0r7s3c32rr92cjc04rn871786wszsdbr6v0f42qic7jy7n"; +"frenchmath.source-1.5"="1p6c0ff81w671rp0cglvvsz29km4lxrxbhjv8wbq25ml09fn8vn6"; +"frletter-15878"="11gxmdwwzwwdlrmycdxi0y123hfikhp9jv1jjmhgsmsmmxsx13ly"; +"frletter.doc-15878"="1pzpz0q1hplni18m6wkwrhknw15h555qfdxfnnfrnrmsa7n2q2bl"; +"frpseudocode-0.3.0"="0ypiw6sfap27hpflbk0drnd412ylv9r307jbkkbhnm5lsmwaax2l"; +"frpseudocode.doc-0.3.0"="1cf6424l655rykyfvca2yl0lwdifgj5kgvl0fvw9ikayf02wh3qg"; +"hyphen-basque-58652"="1dy9fgbh4i3d9ar8wazwjvhhwzyhbys68icz3zjvk7gk9nvbm9aj"; +"hyphen-basque.source-58652"="1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l"; +"hyphen-french-58652"="0j41s8jl6449lys7zvjy9psynxlxlbcf23qh9sxf81rk5srzwkdq"; +"impatient-fr.doc-2020"="1qwdllmi0ci304smf4yl6g8ah083jrch9clkyav7r5qsxnhwxbxh"; +"impnattypo-1.5"="0kmyjdasybcvr77jrirp3s1i8jwvhk7j04wz6blawihidz55myvq"; +"impnattypo.doc-1.5"="1cgk3wk3flpmlw3wa4sg1s9ry6bz9vjanzw8kpyhj3d8yl7cnzbn"; +"impnattypo.source-1.5"="0qc5wz5a4rgvrzv361gq3i6h4hp3v176klgn6fhiwshk84zqccn4"; +"l2tabu-french.doc-2.3"="0c6fbmgwv2adlxbhl1shvpa1w6xd36gmrwvkjgdp9xc3q999l4dj"; +"latex2e-help-texinfo-fr.doc-57275"="1kbp36h6nlnw1h1lbi783jmwsznvi6xmv7szlvdc3fkc96qn5cgn"; +"lshort-french.doc-5.01fr-0"="1hdl0w7b1ablx7qfcvgniz7dcbgazb49b8wfw7c08hlb38gxfqh7"; +"mafr-1.0"="117qd3a06lpiqimizj12lxd0vba82lsc211b46ags0mwgrqhcyz9"; +"mafr.doc-1.0"="1m6y9mpsp4w9cnbln8pv1pn86vqj9piki4kg2q2rq5m9q0g57vsd"; +"matapli-1.1"="0hjrcjkihb29z0z2xspvkbmq8qj18z3yww3lgifxlc9ydp7bppd3"; +"matapli.doc-1.1"="1r0szrdmmdwjjmhhy97bdyxkbcx0xy1c6papnh58hllx45lbznk7"; +"profcollege-0.98"="0zacshfs8fdacplknwmsq9yckvlrfvn06azf71i0m6fjp7vxf14h"; +"profcollege.doc-0.98"="0pc8kghlnm3imch7kqds8rkxvf8ln4wgjgwfgc79bblz2bqkbgqb"; +"tabvar-1.7"="0350mqq0hnqcx7afgy2phs4zl1x8ipzkmkmg7lkabrhhwq2haa6g"; +"tabvar.doc-1.7"="1qrr3j2b86shaka288mhz4hdbfm0kz4fkjfyz2xf90cpgl0ly5ql"; +"tabvar.source-1.7"="1v39fas0k1wmjjzkyii54j5ycafm5kwcriq65j26vzkwz4ykb0px"; +"tdsfrmath-1.3"="18qqjmdh4hgzar37imn811i7nbk93zx5w7f7agwnzbxgy1kx2plb"; +"tdsfrmath.doc-1.3"="1vvbsq5aql1f5q0q6v5z1xm16bmb20w2jnn0d0rc64dw4dxnwpxw"; +"tdsfrmath.source-1.3"="03r9f335gb31zb2frpv6hk50c01sz6rwlqw9vdxf4ch2np90fd9z"; +"texlive-fr.doc-58579"="0ccpwl4wpp2py5x5sp240mbgdv33fhs1avc41lmwzgv7m4z5b2f9"; +"translation-array-fr.doc-24344"="128k8isyn4s0v496sykn22fqn0gfwyyk19kcrmxnc6clgxxfbdy6"; +"translation-dcolumn-fr.doc-24345"="0xakssrkxb2wc6xyy1yvx4mm398x3yq032b7vapqxl82h992fjll"; +"translation-natbib-fr.doc-25105"="0f0r1n8q3jkxsdcddabsgz9h9ndq4yffdpxdqxvqjmhfafhzwgkg"; +"translation-tabbing-fr.doc-24228"="1cih442gp6zf8nwb2lbgjn7a64aglyrcw3aciqy5pkdw09pwn0an"; +"variations-0.3"="0cij0zdvlv3icymqxsfn6mfzdmb3jrxnfa3lz2kz0xx3x8yn0sx7"; +"variations.doc-0.3"="0dwsw8j2bhk5cdw61xlcvlg152z6k6306zpbap2gjlfhf0z57syj"; +"visualtikz.doc-0.65"="1q0a1mhc330z8cnhghp2p46bxsmzz8cdba8hcvssglz0gsq5z5fc"; +"apalike-german-54080"="143ipz8vajbakcbr3rr4kwdh4xl939q0gxwyq0kajvkdgzax9yw6"; +"apalike-german.doc-54080"="0i1wiibv0v3c4r94mq95wv8q6yb8mil0pr6cmj66gab5np8m8x1i"; +"babel-german-2.13"="120912c0nk3zdvnrxp7pv78vnywbw68d0xc9iv8x2cwdl2hfwzrj"; +"babel-german.doc-2.13"="0nkblrxgckb1kxrxvj02v0mx18f3cmv905xpd56i3lsp7rhi2wjm"; +"babel-german.source-2.13"="05nwdy9ly2cdl2aayf573hc8v380avxlw568np9kfvf7nag3p7al"; +"bibleref-german-1.0a"="1vki9hg39xhn8xzbd4wq6vn6zk3x9gl9bm9n3wr214c5n5mpxkq2"; +"bibleref-german.doc-1.0a"="0q69vfak1yrv564qcw3nrklhq4sf62hi6l7z8w2hcj3c325kii56"; +"booktabs-de.doc-1.61803"="1ld7zdr88xjhnnl2x734rxr7h0fz84awapmv50p1kzn6fczrwyam"; +"csquotes-de.doc-1.01"="087c08c44811vd8p00l1xrkg5w6fsl8as64jq83m6gf1hfan9w4c"; +"dehyph-exptl-0.7"="00h4zwp6pdpxiwdck11vyglnhymkmlahzvk2pk6nvqafsmwz5rzp"; +"dehyph-exptl.doc-0.7"="1niraycxd0myvxh3p6dn90j21mzdrd2hrdvh8nxm7rn3npm1kl4s"; +"dhua-0.11"="16gq48zlsfk9llafs8379797v908khv954q8lw2dvzk0v69d0qki"; +"dhua.doc-0.11"="16l76rvba4fz3vfw8mzkmks7b7206h2dva5dgw3m0j30ds8d6vm2"; +"dhua.source-0.11"="06vws91qfar1h87d57c9f9cw04isjk0szhg2aiw7sc8ligs0v907"; +"dtk-bibliography.doc-2021-01"="1fhvvq3kan1zg5m4qh4ckhx2r05bz95fa7pbdm8l0jx9r5qhbmfq"; +"etdipa.doc-2.6"="1jp35apalaa1lh44dbn1zayavv1n3wkm0v69hgy8vdz73yp5yvhz"; +"etoolbox-de.doc-1"="1vchha7ymvj51jfnvl76rxv466lzfpxr6xcvwafxhi78w4bk9yry"; +"fifinddo-info.doc-1.1b"="15zp4xvszy07cy1b5r3k5x256lbalr5acrrdj1gx33llfmvm469a"; +"fifinddo-info.source-1.1b"="02pmj7a9hx4xnfjbhwg273a3wx4449542rs7rxkii4hk78xs5lwr"; +"german-2.5e"="0w1s582hpvmri7im4jsi75xjz8iij7yxs3n6nad2png1xaxxq3ic"; +"german.doc-2.5e"="0hclzvfgrc4ii80ywgjb8z1byn2ccqckvgk26fzdvcgg5j7v9x9a"; +"german.source-2.5e"="1a5svzkxqqnqzva8nb1r3z1rfhjyl5w4sgkfwj7by83df7fwgnhh"; +"germbib-15878"="1nrmmmq9j52yjasjjsxx40gjdbz617j66kwsiv7qzpkh9p2jy9sc"; +"germbib.doc-15878"="1sbvvjxls934s1rxk0aq46glzvrn46cdznh26mhpa3i28c8xv3hy"; +"germkorr-1.0"="1bqzh9zklr0y1fj7lh6izbzsswsx00wlwgkg9wl8dxvxmzhrj6y2"; +"germkorr.doc-1.0"="0fx39c00hmwv2wvngf3agz3gl1qs5jhcbfc377nxd0v44kbl6wga"; +"hausarbeit-jura-2.1.0"="09nf6pz7xqhzs0n7nafmmkpsy5ksvqvnwha80yv6rxasnazd940b"; +"hausarbeit-jura.doc-2.1.0"="1na417f6avcar3dmgk5wrggj99mpskc1j7fj4qkh33rii7yw6f4g"; +"hausarbeit-jura.source-2.1.0"="05f4qr5cz06k7hnjranx6sbqniv4h77dy0rrm6bg4dd6hrk474q6"; +"hyphen-german-58652"="12x6z459lmns56s7h15lhz0fvz4dw1v51l1a4akynlbs3wh1adiv"; +"koma-script-examples.doc-47523"="1s95a3vgjxrn34cpcinkyr1yw2rj8s2973np71yxrwzi9dqdjpn1"; +"l2picfaq.doc-1.50"="0mk8d082gcqlxw2x7d2w85sm6i51928pijybzbsh9fy2rfcv99xz"; +"l2tabu.doc-2.4"="1jl0n43bqbys0c9v0xb4sjql0gvk4r14ldzp2rbwzjsk8a39q8v8"; +"latexcheat-de.doc-35702"="1cpqcvqkkyb2bf87yjvc2migxawnacx5mva8dapma7hmwx0z7rhm"; +"lshort-german.doc-3.0c"="073v7zvk8xri0f05mr0ad770p81akl9b9cnia1q4hcma9fk89k10"; +"lualatex-doc-de.doc-1.0"="0vnmgs475bzbqi14m9sm45cwjfsbvbk45wkb8m73j1bnk7wg7hh4"; +"microtype-de.doc-2.4"="069d2f0jcg9m4fv8dli2dr9ags9gz6mkwy6fzz37ns4jzrqfsvwi"; +"milog-1.0"="0v5rxsa182n28dzd3l3y4qdsz6rinv3r6p94iy73r26j7jgsqd5d"; +"milog.doc-1.0"="04z8ya5gba7f5q86ch57zqbiz81s62hpdbn7b8jmkyy953g5l8vb"; +"quran-de-0.2"="1a9dqgrdh6vw6zpygslfq9d9z8qws9n614b5adr7pkjcdwm8zsaf"; +"quran-de.doc-0.2"="0fq3yd3grj31wyjvac4qkvs38hjjnlsygiihrxw22ddhsa4cl2jv"; +"r_und_s-1.3i"="04icw2n2vz98bk48kbqybb6x3wgzz8fr045133vinybx49nk8xxa"; +"r_und_s.doc-1.3i"="16ksw9wid0sr9gjhjkxk3696fcy19gky3cp9ia6rsfh20f9f2yw2"; +"schulmathematik-1.1"="175z2363f6bb0cqhcjrfc0cwbkcwpgxf1rwanx9hsjip0qc3v73p"; +"schulmathematik.doc-1.1"="1rhn4rh3dpb15xx7s862acppslj7qsliyr0fz137g1mbclhqxg3a"; +"templates-fenn.doc-15878"="1s91swqsysva49cjrb9khgik5mvhxcb3wr2wz4l2683gdgxlbgkf"; +"templates-sommer.doc-15878"="0z75xhawsmcxv4f24cqcvfi0r22gavjpg4si6nwrgc8sg82x24m6"; +"termcal-de-2.0"="13a79lp2lp0r1r1j5nc94adbir463rhprdlc9p6rk3qa7lh445pf"; +"termcal-de.doc-2.0"="0krnv111d82razivjks8ip9m6z1bllqhx47yzjw6b5af9ps1k6a5"; +"termcal-de.source-2.0"="0nn9vgxv5awzqx1zndl7zvgd5nhllw7kp8zj7snd1nqvz3wgc5n6"; +"texlive-de.doc-58648"="1wq56zn8i9kc9a4yawgb3rawnc59x5rdgf971wwjf0rm3l9iy6ph"; +"tipa-de.doc-1.3"="16gwc0dpdls6s2vdl3hmd6307d88gfzsa3kbw3vhl0z5iawvwj4h"; +"translation-arsclassica-de.doc-23803"="1ix5lafy3ay2bc9zkkbqw2rrw6ng3izb8d9p6rki6h2j7n0qj47s"; +"translation-biblatex-de.doc-3.15a"="12wmiwhrjw6m01jh6qy0qdsvh4n5rx52q5h4qs0nmzryqsgn1yac"; +"translation-chemsym-de.doc-23804"="01liazqafs3lh9ppipw6i6sljcjzr31nq70r83qgknqmb9j0yfl0"; +"translation-ecv-de.doc-24754"="06b4vhsgdphi6kdh5x4a2kl74b64z3y5qzxcpkn0hj40038z1av7"; +"translation-enumitem-de.doc-24196"="121raikamd33gabvbgwygrc8hyi3qhvx4hhv4h8wq2chrglj37dq"; +"translation-europecv-de.doc-23840"="0n3x8g6k3qq3f4drkhzygz4khxyw6isgxmz963xqp91s0y667gws"; +"translation-filecontents-de.doc-24010"="0d2ds8kc98yd1can0gzcngm7gsn2gwhriaxnnds5kz3z3al71gkc"; +"translation-moreverb-de.doc-23957"="1jbpmvcm9q73kh09mhrbsb2wlycwwm4n8il342hz4jd15gwhmy8f"; +"udesoftec-1.7.1"="1lq0n05v6q0p78jnq1wf67pgzh214lllcas4jxlpz8hrwk9n9v1h"; +"udesoftec.doc-1.7.1"="1gd4qhdr4wxgjalxgqp0d404w65x7r3ipdkdq82lfcyclqyab8fh"; +"udesoftec.source-1.7.1"="16fgvdzlxrcaxbbk9m9yxviv8v3qhki2s5kq8j065xx88zd181aw"; +"uhrzeit-0.2c"="11ysijqpnm3b4z7pnyg7m7kpzp6fiw42dc36gxk1aq55wsv7kk7g"; +"uhrzeit.doc-0.2c"="0rln5amx6vkny0pm4yhgvnmmr9akwcrd93db7bifxdp07hjbvj83"; +"umlaute-2.1"="0k1pjakg7x49lyvpabjaspwa73z659gj4qvgysm3rd1smkar6vy5"; +"umlaute.doc-2.1"="1x9l84zk5jnfasgqc4d35g10a5la79z5q6q55f364chc7bibyzis"; +"umlaute.source-2.1"="0ajdnhbdw7b0d8qxnbalv3867p5lrk4mk6xl9skmvmkzpbf4s9an"; +"voss-mathcol.doc-0.1"="1c7kzk2m2i8f6vqywnzfvcmv11ckanhcjxf72p4rgivw8f0lbwjm"; +"babel-greek-1.10"="1jp0a1pr0zasii7xzhrdin7m628xihaj3bf1w75y35qhq4lb19q7"; +"babel-greek.doc-1.10"="1463n58g9c0y1vcxc7p1q08kdqhkqzvb8l557xk8cmn3j8wcafrm"; +"babel-greek.source-1.10"="1sgwqxzsybx3l2hlj5cdc61z26cqxmjz8kfsbiavzfwa94mka2d1"; +"begingreek-1.5"="0mwcgc16dkm7r082ng69babnjzdhh60hwsryvxl17prj03l861zl"; +"begingreek.doc-1.5"="1dzgzpdrpkkn928kkzdxj2wdc99wmq720vakb8v2ssj4vabn2s3w"; +"begingreek.source-1.5"="1v6gb2jp2fkczrqzgwqyhlxyc6s5yps7zqqvb9ph68hvn85bngki"; +"betababel-0.5"="0m2m3m59a2ma30zkyqjc3h076dp74m4igks0dvrlpgx4sfqg90zb"; +"betababel.doc-0.5"="1zi2yxvxhyazjncfjv6dv8c733hb0g5sxr9x7wqqrkxlxgp549wz"; +"gfsbaskerville-1.0"="0n68mfx7026ymxlyhdyg9ppylh5g4bkwj95c9bfmp5bmym0q6dfi"; +"gfsbaskerville.doc-1.0"="0v0widjs2w65ppvzm04wzinrcyp8hcicgxp6brydjmx9d32yrzcq"; +"gfsporson-1.01"="0h2zy85jalpx2vyjszw0kkrav82zv549c82qik9iylgfwfk1amx8"; +"gfsporson.doc-1.01"="1zy50pqr9bzfncs03fg98ws41v0v5c9y36rnjm5d9i7q2zljapy9"; +"greek-fontenc-2.0"="14qib531ac429szahk2q1y6dk452s7c0fqs84k21al6yczvk0si7"; +"greek-fontenc.doc-2.0"="1ly26mysxxr3jfp6fn3zypb3b1fywmfzxz9h7j624fhx5ajxjlsc"; +"greek-fontenc.source-2.0"="1w6afry8y3yfps6as8xd55lwprqavi8xn1s1pm5g3mqkh2m99rqz"; +"greek-inputenc-1.7"="11pi613m7ny46l7v5c0sy55dyh7jw26bpy06h8arxgimnvms8gnp"; +"greek-inputenc.doc-1.7"="0zg48vvgdi9ad1p5iiiqi3pbhvn6fsk8148dc33sl8f70b72fpfw"; +"greekdates-1.0"="0g8cgyrw6lacr9cjig3q1g7rvjdwb0p40b41rsqg6lj6y7m25ya8"; +"greekdates.doc-1.0"="1sh4dgxfn55gg9vp163qj9nd6kbp03cb3nkg3hqlf6b1az486nh5"; +"greekdates.source-1.0"="0k8vyyxvi1i6kqnanfm1nfhbwllgn22ik57r2p357y69hfj3bs4f"; +"greektex-28327"="1v39z550xynw4kkqjqcj7izj2cghkk1g2swsy9x9c71sz95r2bw6"; +"greektex.doc-28327"="0g4m7sb6ppjj0nxgv7pwwvc5p07jdkablcqasdmj8p44ikg9vp59"; +"greektonoi-39419"="1dhbslqclyk5d8a9v9s4af4gxdy39b35zbbr3k5m53gsd0kcs5w9"; +"greektonoi.doc-39419"="0hmxx4pcirm2v5xpl3zyij8r1zm45f373dv18vxj4xr3sn6b7p14"; +"hyphen-ancientgreek-58652"="0lhy1zrg27748mrx8yz5qxpxl3nl460l5l6impiz3lbrgnld487n"; +"hyphen-greek-5"="0yknyhys5j5d34hlzw5wqdm1gw74p6bvx4dfx5kylvwjahj6ys5x"; +"hyphen-greek.doc-5"="16ikyzvd161hn95mi1swg0a390liwz1cq9534i5nvzh1vkyy4wrx"; +"ibycus-babel-3.0"="0az75laq5fxnvn12348c3985148isz4n7nv6hd0d8amanm80h779"; +"ibycus-babel.doc-3.0"="1256n1qa6zpq509rk02llcixw3qh3sgi9f649pv1hjk6xdy7nxfl"; +"ibycus-babel.source-3.0"="08x3knpkwifgi2zxv78bnfn10ix7l6rf5nhfqi6w5xck09l7fiaj"; +"ibygrk-4.5"="0krpzjn96r70z8rwsq52j0v1x7ppd766ngvf6xhny2kd7mshl9ka"; +"ibygrk.doc-4.5"="0prn5b6cjc9ljxdnd1ckfgzqwlc5vv4w435zvyz75r3f1dvbhh9m"; +"kerkis-1.11"="0hcaw35viqpsbpy82knib5lbf3ngvmmkga96d48v5s1zd6m7fwdk"; +"kerkis.doc-1.11"="079i5x6liqgnkc3ii65ka44r9pfpf7k2gxhkbklsb3hm51zs06ld"; +"levy-21750"="184jkjwm17ms75j86njpkr17ipcamca3r5l1fcg8vfv00ffj9fp0"; +"levy.doc-21750"="1wbxdyfxm80w3h8bq8z5yavdwdbgccvhf4hm697ss5yshp7l8gfs"; +"lgreek-21818"="0ry70b47s9bn8ixcjzsj0qvyvlbava2dn2jpmp5nrqqycihb6jvp"; +"lgreek.doc-21818"="0r86kjbayji1cha84dg37ajn1hnlidyw3cf4byq3x63vyvx0ag3c"; +"mkgrkindex-2.0"="01db35xmg9583hkr9bpflr6rj8bmvidaqahpvkr38bks21466sxz"; +"mkgrkindex.doc-2.0"="04p2xaycwszq5dp8s2h6gdm36l800ipvigblkm8m58bgycm553fw"; +"teubner-5.4"="19a788wm84k5gb1k7fn9sm53b5h3hwj45316di0gy3m4h8bafpby"; +"teubner.doc-5.4"="1hsq7x9g26b6rs9796n411dpm6hvylyr4vsryr0sbk67cnf30spd"; +"teubner.source-5.4"="114jgsrdvs5klrq2vd51mvwy2v7j9mhsmsq6fxamanm2asgvzxs7"; +"xgreek-3.0.1"="0xrk16l7mbkdm3mfi2qlx6pyqg23209nkzbpxiah04j1prchzdws"; +"xgreek.doc-3.0.1"="16fdvfzg0aly82svna22iryq9n5raiqgr5mshgl3ic104sy4z4g4"; +"xgreek.source-3.0.1"="0i9ca29dglp7cy0p7nnmp0zi9cm80bnrbdqqcskv3bfmdkqb8c3g"; +"yannisgr-22613"="0h61qn97l6k97zbgk0ghqgr4bf8fhbrb037gdskg2sgxb7zsl5wl"; +"yannisgr.doc-22613"="1vw8p9xk3aj3lfsq8a2qv7qd00aqx22fs3427j31wnl1iymwycag"; +"amsldoc-it.doc-45662"="0d4hwb7hywy56d6934448lcr6fdx7qchkfzs806dr7wfzfy36yix"; +"amsmath-it.doc-22930"="0xcwsk8q9q3nsz8wbklgpbw0vzjw7iw0chffzcbp2zsk6rypqf7w"; +"amsthdoc-it.doc-45662"="0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz"; +"antanilipsum-0.8.1"="0xz42icnw36dvkxlh31g8hvy37mrbafgihm7l3ivh1z4hg6gabrh"; +"antanilipsum.doc-0.8.1"="1rfx3aqdvl4gvcrpsqzjh9dglk34ll6qc1a889yz0np93psnwmkh"; +"antanilipsum.source-0.8.1"="02qpjks29b4fmma6qm43p3w1k8h28wv1blpwjnnsfq4ii6xrkn5s"; +"babel-italian-1.4.04"="15c2ii2pyg054jyn8miyqrbd02gazc9kz6hpdjgqz1mi4agpdm75"; +"babel-italian.doc-1.4.04"="1sjwk67gsqzn3b3q348k25a5gfgzdq84c5mcrmlr401h5knv9d93"; +"babel-italian.source-1.4.04"="0y5ixa44561h29lfqhb372by8zlpn85l9dssg3rlx5qz5n7bvssf"; +"codicefiscaleitaliano-1.2"="0im75yz3sw89ky5lcrcjhg6k6j4sgkjfn6v4srmqzcfdmn2qyx7m"; +"codicefiscaleitaliano.doc-1.2"="068234c0shvblzkcgl67a9s9whcbyjy3mjw60i8ljhs5z5wjrnc2"; +"codicefiscaleitaliano.source-1.2"="1vsb7dk4mlaacl9ls17lm4xdw27xzdgvng02gkfjvja1ja3cq4zr"; +"fancyhdr-it.doc-21912"="117826hd9zl15i8qf6d1pz2qz57l68a9nxqldxyk21acc29ifalr"; +"fixltxhyph-0.4"="1lvr7r5adw566q0hbvmmvmh7igcm8asl0ispd3lflik886ycmmlr"; +"fixltxhyph.doc-0.4"="0yfa6a6dvzx2jjy1jcw7phps4wxz3ysfhk5mxc65qss9kmc94mwq"; +"fixltxhyph.source-0.4"="0ksb42pc0bm64pgszgph6g0rnksd9fhb48z97bnd9jcsg5rhzi12"; +"frontespizio-1.4a"="1rdgh6wvxk0rhkadcrb1f3ymgxn81vbx489z16k88wkk1p0r4749"; +"frontespizio.doc-1.4a"="0mwdqry0h2f65vrki3kvqpjnf1nm5n9v3ljmn77nlvkarqp2kb57"; +"frontespizio.source-1.4a"="1p2c8sdrm0ay9nz0dqrcjigzsjki15fry6mmhqcm3gqrcscsk5x2"; +"hyphen-italian-4.8g"="0xxlpfvcy4frkvxjgx85nz86z0n9cwhgsdfmhgzi66w8c9c2r9fs"; +"itnumpar-1.0"="09cv6x74vs8m10fhk5ka6i1c6gzbs5qaqbk7i7mf2zsdg5w447r4"; +"itnumpar.doc-1.0"="14273y8zl42gkqm915271n15pc6srsjvfbnc3jhp5xcjcqnq3yfk"; +"itnumpar.source-1.0"="1wg714a0ipv9g81wgmjdrm4l4yar0z2nqxr5khiwihk9nrg26yc2"; +"l2tabu-italian.doc-2.3"="0bgfmn5v80rdhs9wmjj6mki29p28ip1d29rmgbw4jh4z6gd4sf22"; +"latex4wp-it.doc-1.0.10"="14r86fwhb9zafmyv05pqfi9962dpxj7wq94acm43gv8m2rsjp52k"; +"layaureo-0.2"="0ggab1drpspvqwkijlj2d7k1iwacd8bihgrj9qvrmsvdlswdjsd1"; +"layaureo.doc-0.2"="0vxa87pk0fq67zlnbzbpnig221isp1fy6qp30fphk7igvnjw8v70"; +"layaureo.source-0.2"="0mdibdz7hawfmc6bzvk3qfhs22pnmsnvkvvag31p3b4n25zshmry"; +"lshort-italian.doc-6.2"="085ydria5q7s648r7frl54sa1y4kyr569zvqjjkancfd83h873cg"; +"psfrag-italian.doc-15878"="0ssx8rw7fwln02zzscywivnhizgrb6w05awscvv9gf9n1qj6avsf"; +"texlive-it.doc-58653"="0vmwn6n8bxpzcfrzic5qg5k2vklbm6rhl9861zxsli0rd9396qn6"; +"verifica-1.3"="0i5bh8j5yjvql6mywfs617mh3pywnqd7z1m6158r3jpwyn6ki25g"; +"verifica.doc-1.3"="0sinc5ha8k3nk307q0piqwj56r2bh4pbxxyww29ygalfqjr755bb"; +"verifica.source-1.3"="1zn10fr9kv131w4id0djycy7492ch7gis27gbr5r02ydwm7nny1c"; +"ascmac-2.1"="18hw5yyqbr8ji39y39293z7a70czipzw00fzfsqcrhgdlid79sc0"; +"ascmac.doc-2.1"="0xzwc7kw7hqpcmisw5wm3n508n4zr4s207pizdhfm2q9mjij0jvr"; +"ascmac.source-2.1"="1rd5qmy9miximwv1n96h6djjmd3mdgn4b0955marf2k457bb71d2"; +"babel-japanese-57733"="079bhnmpcgaml555dgrmiigack6qfqx20fy85c75p4fsn2c93bmw"; +"babel-japanese.doc-57733"="0a479m8rq8l02q1w73d6lpfpi0gs5qdqfbl132483f2wwzznvnrl"; +"babel-japanese.source-57733"="0kjv78h69422dj1jh7s74pkdr3qrdxxbzk3czzfsc5rax71x9jhm"; +"bxbase-1.2"="1jbhxfaqpmjakvda2knxvgwli8crkwlhqa1i29mkzaal74f03i96"; +"bxbase.doc-1.2"="0ny2xzg6z92fpw4s012pf2h90a77d96csi4x0cqdlvzv1f7bqhiq"; +"bxcjkjatype-0.3"="1b2srzs5pwaind8pjsghkbq6hwf42ipx4bmcim2zbfxmzyb1ga44"; +"bxcjkjatype.doc-0.3"="163farvip06haph6dhwf123dk12rnls1mgvdsyvvszgyy9m96bgp"; +"bxghost-0.3.0"="0xkc69hq51qgdmjqnlyrgaird7p5lfd4mf84mkb726nnm1hhgq49"; +"bxghost.doc-0.3.0"="1b4sja3wz9782cny96lfbi6r41mfzmybc95b0dnd2vv09w96d00j"; +"bxjaholiday-1.1.0"="1y3rfdwf969381vn3i0si5268j298bjrn7b8wpcj0zp178scjv2y"; +"bxjaholiday.doc-1.1.0"="19qm278v8d1kvk3fbvs07bdwv0n5waxd7pvkspbw3yfsg0yy4ws4"; +"bxjalipsum-0.3a"="1j43iihid2akjgd9npyqmg14g0m57izzp8lnrpqz2ybbp3mbh0r0"; +"bxjalipsum.doc-0.3a"="06w601s7x4c6cc0wyrgmkz1vj19aynsq9l66h0hbi4hp52bh1ka4"; +"bxjaprnind-0.3b"="1q29bkdjw19iimdggy4s0h8h5vl2s9zm40q965r99b86r6nwf3fs"; +"bxjaprnind.doc-0.3b"="0f5lb2z10p9ayk5nka8bngzvr2qxpfwnh5b1wfdq00ra1khssqqn"; +"bxjatoucs-0.2"="19n1wr7i1mfrabmrsgnmvk5wgdqhbc9lfpz3s5qhnsqsz69rzi00"; +"bxjatoucs.doc-0.2"="0icd5zj0cabkvwjgncsjmqwx79d2rqsm7ddp54ahczfl6mfg7fwj"; +"bxjscls-2.5"="0hamg91pckfjm6222rgcdjvjh14z5sjv0h25hncivgciw0j6ci5f"; +"bxjscls.doc-2.5"="019bmkhv0cmzajq73nhc4gv7yv7c959dann36436y97znzgvryqw"; +"bxjscls.source-2.5"="0wh3b5cg5zvja5fxdy8bpdch777491i60xl9jj7v4rkd9sg9hsm0"; +"bxorigcapt-0.3"="0z4yyfrw0ga1gd8xmdj0npd40zrnhw1g4anfyswypkdnh4l87jxy"; +"bxorigcapt.doc-0.3"="16hzvpff790qsaxnwrxbv773pcr06gbavqirac8021g2sgn6h2h5"; +"bxwareki-0.6"="0b0n3yhq6y4dq13nwm40zyw6hn1jz5r3bawsrnaw691amvfb2blh"; +"bxwareki.doc-0.6"="0ay0rsjnvpi1g7iyn6dvwc4awfswd48n379qqys5xhzd19bncs0j"; +"convbkmk-0.30"="1hb4ahbgihnzqmcszxlq67bsiqprrxa9vf25q8yz31j70sg7s18r"; +"convbkmk.doc-0.30"="1h1iqcc1rjcvwg9p7xg5zq6sj5bi68s2cknsbwr6dbkx25ihwi4i"; +"endnotesj-3.0"="1rjraz5m7zqyj1j7c640ngxv7i73d03xh5wsmcaakc10h36n3pyr"; +"endnotesj.doc-3.0"="1sss0shcnz2knzghjqw41s17v0bs7dfcmg6x566fdwdm4mdg4dkv"; +"gckanbun-1.2"="0bf42j8ismm450431pqvqgwzd04xsr7qlhb9di867qdyiy6hbrpv"; +"gckanbun.doc-1.2"="1rpgm6jclifxzs4k5ybkn9pxsl60vl167jjhffg6d319g3miy7al"; +"gentombow-56665"="0pzvwd6qpp5r7is7iwahpjgqyc3ikgq1jy248kbn4g2kq38hffhh"; +"gentombow.doc-56665"="19sqdvw9fazb8aw8ss9v9sxc185dqcvw8pnimm0bkzkmz9jnp5ws"; +"haranoaji-20210130"="0r11mqkhdcvmv44z919w91qm27l8l48ra8014c6594lvwkwv3pba"; +"haranoaji.doc-20210130"="15b0v3p3dgb0008cjk811lwxbwqzxn73dm6zcqs3bdyq9xcdv6x4"; +"haranoaji-extra-20210130"="1n0wa9kkcx7d8jbczii8v8pnpgdj1hgnx73pi0m7ni10mm2sfn1z"; +"haranoaji-extra.doc-20210130"="1qmxiz95sivgkwy3y61fpki0vaq6fzl4w8brdzq48grb7mqbj6n7"; +"ifptex-2.0"="1skabihim6l8c3iifzk45pdsid1kkd24kdqvjmnba1qr40ywgda0"; +"ifptex.doc-2.0"="09nh0bkvbam80vsm13p2f6y30bjxai6p7n87xz04r9bgi6sdpbcj"; +"ifxptex-0.2"="1wb1laq1nn02klvjgwvjgansi4anmjaik04fl0lylr7x5996qa9k"; +"ifxptex.doc-0.2"="0bh8bqly3zzzzgs21cb51a06023l9xfig5qjfzrlyvfqms7wj19z"; +"ipaex-52032"="12rd8b6kbnn2hvsimmfirfq3nj436h2ckg5129qxnfnqfqr9pkl6"; +"ipaex.doc-52032"="1g2z2ichh3wdjmn9jjd48jic1b2xw5sb8sksqv0hm043hk5makaw"; +"japanese-otf-1.7b8"="1c0xz9mwgl1ywfks446647gndkwifh5kc0132a1g2p226mzs8hhh"; +"japanese-otf.doc-1.7b8"="016v8wnhxk8l57fcxh7p6hpvqlrwn93dsrxr736xkz4kvrzznjqq"; +"japanese-otf.source-1.7b8"="0pdsmlcy1h76nfvh19pibxywnmm50474g9yk9rj05p1amapnpkja"; +"japanese-otf-uptex-0.26"="0y0bv7m11g1nh11il7b74v65vfzh8fh3lzvv1ssbika8w83zjw6y"; +"japanese-otf-uptex.doc-0.26"="1qgkfqx1fbnsnyjgxg5iwcax1gz64nzq2sjlz38pi55h5gka4nrx"; +"japanese-otf-uptex.source-0.26"="1pn7k97px1b97lsydw5dwxkx3r8a2aa8cjrm2ffxijgdslb1nys8"; +"jlreq-58472"="1l63k8d3iwj5sf44cirmi4sy412ha54gs77mw6slzbxh2lg0z52d"; +"jlreq.doc-58472"="06r0k89qxx7hsvadah9xis2v858kz6imbn5w1jcwmb05skjmq19q"; +"jlreq.source-58472"="0g4689j7ica7vxkmhxyvlxwmn7k75bvgdzcb382s8ippp2c4vq99"; +"jlreq-deluxe-0.4.0"="0v27w13xymviphq1168x3kvc9anw1z1sa5l237nffj2cv7spg8gk"; +"jlreq-deluxe.doc-0.4.0"="11n5l1f3y8b7ak6yy3z0iy8cqslii7w9v52bnryi68yhn58kgyv6"; +"jsclasses-56608"="1m0nm7fh8i31qap9l95v919kj6kx13mgw3gpzvan0sh1fcby2dkz"; +"jsclasses.doc-56608"="12ncwpjgmiyy1rkmz3q0hvhykinlsnscjn3idhixf8s4qrji1qvw"; +"jsclasses.source-56608"="07imccrb44yv0lzcls2fvxkah419yqfp51dwzfj2if5jgh9kb3cm"; +"lshort-japanese.doc-36207"="0mfxig980jyzhay1i83d69p294hgbr92v3kk2a4z8ca3fwzy8w74"; +"mendex-doc.doc-50268"="0xgg4iwg8dvsl8i2dm4pxkpwylhk8m901nqfyw5q84hslfb92agx"; +"mendex-doc.source-50268"="117lm6mvjpfz36irl2j1i96lc9hfcjv18bryk6nw41sv4y6n26if"; +"morisawa-46946"="19b8nzkwdnqk61p1fc7yygjlrdimawmbam18akphcm70qx2h01dj"; +"morisawa.doc-46946"="1y218bablhn06njs5zqmsl6jvvsgyihm4il1x9722pqvvyxxf9q0"; +"morisawa.source-46946"="1flrf2c2jxpq33g26i0m2h63yd5jfy9bdh80idpx1m6bi6hhq7ac"; +"pbibtex-base-40986"="0h5yi27rmh7ajih3ww4wn3z746mkdwrvz1pn44kklrz9nqryqwhl"; +"pbibtex-base.doc-40986"="0980gdzdygb1frw0drf2pkk27xv4qq238syxpsbcf5rp78855byi"; +"platexcheat.doc-3.1"="04hvm19x4z7vq2md3p3r2wwa7iqkgkxnvvj1xx3s9145m6fjib5a"; +"plautopatch-0.9n"="19pd0p9g5bg7ycix2h0a8q3riwq69jb82bnc2i12ip0cy3nzjimv"; +"plautopatch.doc-0.9n"="0zr69jihpnd49cfr5s18p0av79ghxj36ppfjfjzwhgw4yfd4imy9"; +"ptex-fontmaps-20201227.0"="1ppzlsi0bv0nhx8lfx8hkg047vyrzm6jr5syhl5pwrifjq1wdwxw"; +"ptex-fontmaps.doc-20201227.0"="1b96r79zv61skxn4x1wp3jcvbz72syz02g4yq5f8bgsjarkgsbcr"; +"ptex-fontmaps.source-20201227.0"="046jbs402n7g7dyd1akqwx382rkn9m7cs6qr6nz1cpd7c56kfb9n"; +"ptex-manual.doc-57128"="0hh4g8v0j1dk4saga9wkpjjmw7vnfknzrbmap7fla5y06dzadfix"; +"ptex2pdf-20200520.0"="0s4b60gc0wg4wgxczzr2h1xlic0rk23a9wvfy76vysqzlsfmh0xl"; +"ptex2pdf.doc-20200520.0"="0ky2zh6a5d6w2aq8k9wg7p3cvp8l4wihfjlz3sir3ggj1rx2x6j4"; +"pxbase-1.1b"="1ppl310g2l5k318a23zdj7n7yadbv1zjrrr42fszwj7xri0zrwvw"; +"pxbase.doc-1.1b"="0lkgyn6l1xkfk5578i7wq2arp3wrlf4kvrmr88z86si915clqzbs"; +"pxchfon-1.7e"="02x4y5jl3gzgyyjkzd0dbhzb5k91a5vyvzb1i3n71dhmghqjw578"; +"pxchfon.doc-1.7e"="1dqwykwymgnlslmwh4m5bm1hlhczvi1f7nq974by8ipq8l3djc4h"; +"pxcjkcat-1.1"="03rci00d4p56ibg7yn18jn86mji3yj5mnq89niwiaixzb9x2s9g9"; +"pxcjkcat.doc-1.1"="0lj0s8q357gw05i0xfldzm7wgwc6x2b4jka2hjpayqshh1zm01wa"; +"pxjahyper-0.7b"="1hknk5s9z8ygrymhdgrzwx14b5pj1l82q1ia9pp6rm70x5d03s6r"; +"pxjahyper.doc-0.7b"="1icb67qaznbhwn84hjg9mks42calxk61lyybnj4459vhzjr8gmyz"; +"pxjodel-0.3"="0gywpypmv9c6bqyygyz336v7dn6bnx5ibz2p6f38paamk6bqbyf4"; +"pxjodel.doc-0.3"="16nf7za81mq77irbdqkxw2iwxgi3jpy5vh1fijp67bq3lx0az7is"; +"pxrubrica-1.3d"="1xz98vzi6cng9f2gj1xqbsvk3cw1h98q3yn1ijq2xkphkjv1sfhi"; +"pxrubrica.doc-1.3d"="0m7y1m7prfgcg20f8bmhqxpslxycw7qg7si4wr3pvcmmgv2skd09"; +"pxrubrica.source-1.3d"="1grr42aixxrxccjq1119ir0d0yialj89svd8yl0lzz852pp2jycg"; +"pxufont-0.6"="19d5bm980iqx0m54fdybllq1f842hmp7976zc6v5w7dbfhndybgj"; +"pxufont.doc-0.6"="0vnvdvpdwkwjqds23bif51h9myq4bzgj2k9xmzqzvan8xj446jxf"; +"texlive-ja.doc-58581"="0vbxdm3kai3qfxdvdsji2fnqx3wkis4yb49072mla26q4xf81jwf"; +"zxjafbfont-0.2"="1zcyvwsqn2w9x9w79lvi736r2zwrsk2xdk6nrrmkiaq3cakd81p9"; +"zxjafbfont.doc-0.2"="0dfh592niw8s6zxmxj1sf8h02s2vz8s2ywd291946bb72xidb4gq"; +"zxjatype-0.7"="1ap4f0yq4cmkz5djy7mpgp32l24jr7xbxd9zc0nv1fvnywxpxfcq"; +"zxjatype.doc-0.7"="005rr69f433bllggj997rhbwlbmsglaywi55az5j02x0036aj2dd"; +"baekmuk-2.2.1"="0gfj79zhyg7p300bw27akxzgimvqmagk7y6b4nd7jq5wvrv4g5y0"; +"baekmuk.doc-2.2.1"="00y0iglv170b8pz79xjc0kz3yjphbb6a9alk5gg6hsdwvc6gf1by"; +"cjk-ko-1.9"="00mnybbajapn25gmgk2m49skfmd0vi6j198sqmvjspz38b4z44sg"; +"cjk-ko.doc-1.9"="0lnldm3zarq2php9k1a3kdsw6iy3znldbcws7zwq7dinfhvbbjc0"; +"kotex-oblivoir-3.0.1"="0f0cgjjjg0ipka5c08qac3zb5mgwds9blska2rh6ps9i9ahknsbj"; +"kotex-oblivoir.doc-3.0.1"="0bkh1yyrlia2v606kw6hzbg7f6547rzpsgb5px31fg0jab05alay"; +"kotex-utf-2.1.2"="12klbs9as0immwm6v75ibjdhq7g5ybv276ab1ffd5a6nx0nksxas"; +"kotex-utf.doc-2.1.2"="0ppqzzzhkf9cqa6sqd5ys6m146xdnsz5v326g7d7m2b9104z9k62"; +"memoir-3.7o"="1gaz197gaqkr0207sxkfk84h5fzdsc90bapiqfinfbj5scman3ps"; +"memoir.doc-3.7o"="0vghqh2aywj3x197hr9m9rs6v9431anql5kg9f8qckg5lhrv472v"; +"memoir.source-3.7o"="0330h0xndrbsc7cxw3c2fzal0i1p7j4a5z4dq9qvl9byqprqlwjf"; +"kotex-plain-2.1.1a"="02y214iy349yz9x2l541ynhypwc0rlq3y97sk35dzhdy3cnvsmrp"; +"kotex-plain.doc-2.1.1a"="0hj3mbh74nzk1s2sff2sv1k7b2mrcs3bg8vn7kka89q8yf56gwmq"; +"kotex-utils-2.1.0"="021hgi7iw47b3c637mk0g4v52h5ygx5w1060bpcknjlbg0qb09aw"; +"kotex-utils.doc-2.1.0"="0l7dby446xxjwk7vl1h3w4xsid4dqd8zdspj1f457jy4qwjaqf88"; +"lshort-korean.doc-58468"="07660lrss97hswmis7rgc419h05mgrvsfrrwmnrwk5yn97flhhqd"; +"nanumtype1-3.0"="1izx9cjsd46ydhrl0ixsjz23nbk7mfv3swfk5ada0d4adcm7b73h"; +"nanumtype1.doc-3.0"="1sxap924dzf17vslp3n71r4mj4f98m9cmchq603c7ara1cyjk2mp"; +"pmhanguljamo-0.3.4"="0lvpdxn17n64ihznkkwrzj3qzqg8b7l9mr17f26a7slly5fjh93s"; +"pmhanguljamo.doc-0.3.4"="1aqbgy84q490br3r3660ggjm9bw1lvdvkgqzm0g6hfcvi0p4lf89"; +"unfonts-core-56291"="0pyrnydswlqhxacwqpbc1m3bzm8v4gcl3ka7w2mppp77l8a70drl"; +"unfonts-core.doc-56291"="0225vsqaj8l0g1igc4h8m94cfk6wv17vlnappdgxwws1fknz0x5m"; +"unfonts-extra-56291"="1i7skyjqlprf6m1pnz5l2hn67f1cix4n3pai6v1a8adrrx7vcfdx"; +"unfonts-extra.doc-56291"="0d3cxfm110lg12n3c9hc88lqmx77rcsil1s6yph384scxadlg3bn"; +"aalok-0.2"="039x5s8x01srm6z34wjcg9snhvkf3m4msbapacjgz8j35anvr5l1"; +"aalok.doc-0.2"="10wsnqdg3q7wjwpsrq9pakzzl7pc0y95vd8mnbdsgazcla2c08br"; +"aalok.source-0.2"="13g7d2jpx9sgm9f4q0js1ivg567nl9d000n648jr60fsg55jxms3"; +"akshar-0.2"="0g1pbihbpl3b7k7c19qiq7lcgx3zrfn15065dyan85bs8h85c2cw"; +"akshar.doc-0.2"="11a18b7a592sx3wha1lpy659hgh1wnka16zf8m0cbc99f867xfln"; +"akshar.source-0.2"="0g8j0015dm3mhphg06ma9dkgc28ywlihr6pcbi254qaxgk7kdn9g"; +"amsldoc-vn.doc-2.0"="1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x"; +"aramaic-serto-1.0"="0j1i5snrgj579zx3cn7z7dhi9rrq0ssl392r2vxykcxalcc8cmg2"; +"aramaic-serto.doc-1.0"="025nkiqh91laaj3yx2qkl5z0jcm2w0qwgqm545dd98i5y1a78lfx"; +"babel-azerbaijani-1.0a"="15siklcjg7wmpzgy059d8r6ivg6cib5by9a4l6n31c9pxncj7xka"; +"babel-azerbaijani.doc-1.0a"="0dncpgvjqqa41rk80n6wif8nzdqw7vkxp2056l6sblzxgh87fvz0"; +"babel-azerbaijani.source-1.0a"="176r483598gd2dfmfc2qhmknj913n3k6rk58mpfq69af72jq5rjw"; +"babel-esperanto-1.4t"="0p11qa0d496xb6hpj6qc2lisr3xk3k1rbnj7b88wcivfjwf5ypmp"; +"babel-esperanto.doc-1.4t"="0ra2iyai9vyjksfsdcv5b9ifvqmhlc4aikyzf3wq073sh9crhxh7"; +"babel-esperanto.source-1.4t"="0i1hzj701rii0hbp05h25633vs2cbmqgyc113m3g78i24vh2rkbx"; +"babel-georgian-2.2"="1mdsi9mq6ka6ahrgnasik0sxkhq97qa223q5iy4fkfccan30kb07"; +"babel-georgian.doc-2.2"="1iw1hbn5i0c7xhvcmap4hgiaar9rznr76h2mrgya8xj0czppxwv0"; +"babel-hebrew-2.3h"="1mzjkrjasm6i7qp8pvl9l0dwd4597hnhsnjljfqn2mf39836i6s6"; +"babel-hebrew.doc-2.3h"="1w45vylwaiy2bn457fcc8c4fv33lnjbznsk69z3ky8r6sgxra63y"; +"babel-hebrew.source-2.3h"="0cy281g25mn3pcm5m3d340rp9l82472zyqk09xdi05mxz2hwvnxh"; +"babel-indonesian-1.0m"="1nmz2vl80cs7d58hl22y9m2hlf4xzdw2brl2z9k56w2mk6rg510k"; +"babel-indonesian.doc-1.0m"="1bd7v0wrp85bchni7sbn4b7manybq1by8sb4bhzcmbw4b9dnc3yz"; +"babel-indonesian.source-1.0m"="0p89lrfyqfhmnvijf9mdhmjsr8wzb4hxr40rf33wn50ak3m8gm7l"; +"babel-interlingua-1.6"="0zbyfhfs222i1wdsfbik33m1asdaa71rg700s9vfbvfdvjcikciv"; +"babel-interlingua.doc-1.6"="1z7j47zmp5y3406da831kwxqq30mgxh2wwxsrkdjycnsswsywgv7"; +"babel-interlingua.source-1.6"="1y3xsscz9zxaih3752sk6jhh77ljnllmikiwgqb3xsvzj7b5fs8v"; +"babel-malay-1.0m"="1h4n9m38s560iw86cr88xzflizkd37nhgyl51xvniyvkz6nkhrxr"; +"babel-malay.doc-1.0m"="0c0jriwwkrll6sknd1c90bhipcjr3inc7vdn6cd2szlbx72ir12a"; +"babel-malay.source-1.0m"="0r1gzyi40yx8ikxkrdqa1hg33vciz1qbvibd8dv3qbia7mm11hqv"; +"babel-sorbian-1.0i"="11vbl2ybqkiq133xsl44waj9y718g1snv3k2jf640gxihpzkqj5a"; +"babel-sorbian.doc-1.0i"="0jv1p1k7wlq5i87isj0lhxcj3wxrz13wvjqnlfg2sksxa0pay56g"; +"babel-sorbian.source-1.0i"="09xk5fhfh9mgrlmma4w1z5d3w2fshdpvg5hg2ffyzz0w7jvpvsma"; +"babel-thai-1.0.0"="02n0zl8xa4y7r2n8zb1870b95inclcdmwq0llcspl54vjgds2yig"; +"babel-thai.doc-1.0.0"="157r19z20gn3fy9si8mn0c4zhgf1kpkz6jv8ag6y26qjp1c5g4kc"; +"babel-thai.source-1.0.0"="04x6d8q4glkb4w8ic5qcywxi009zy0f7dcczp2fibs0prhw1kmi4"; +"babel-vietnamese-1.4"="0xb8w1dm525xrvpsxy6y4n6m8rr6g895hysxbjcvv5x8bjvl2vx6"; +"babel-vietnamese.doc-1.4"="12cj6335qj5igap6hff1qrfz4ms4s94xv7vlwdcv1hs5gabqylaw"; +"babel-vietnamese.source-1.4"="1xdkjigwmmkbihczgd0hawszzmnn3j7fypsv3sx634ham8j02zzx"; +"bangtex-55475"="0gbjmkkidm8xk6hpkd0i0b778my5xf7hfwq3fdq2v7ca39bii0d5"; +"bangtex.doc-55475"="1xizgjqmwafjvcf0j25xh2gzcqzcipymhmhh0r56lwv02fd34b4b"; +"bengali-55475"="1rqwjn1vim77r30nmdmw5v50phpsfzdcx8nlxhxlvqsca3yqzsvz"; +"bengali.doc-55475"="1zxczyil1izzj9pnz9c6my76mggg8maxdign07qn4kzf8c0fq8jp"; +"bengali.source-55475"="0b4v7jrngga8znbfiafazxq6z333wa98prp7hwzzhpv3nxj6kbl8"; +"burmese-25185"="109492p6k58bdgs4y0nb1hfnk63pdpf0x4b7az8frfff4wg2jvb1"; +"burmese.doc-25185"="1lwgifmixkyxscy6ichwmc8lv26dwmcvy2nm68z2wq0cz7cihjli"; +"burmese.source-25185"="1iwnsjnacafq1w3n6asj93n7nfxxyslf69jj0rfrl05fai0iq458"; +"chhaya-0.2"="0vnq4i5sz147db3nvld8rqmyvni3dwzmzxwy94a9d5x7dm1b6819"; +"chhaya.doc-0.2"="1c0j4izh7y4ss79aipg7206q1m0fjjj0x3myc5xyfz8a2nnvh6k1"; +"chhaya.source-0.2"="0bppya8cng8mqjbchbgnbjp15clkcd6rfzwrk6z6rn060jwk0d41"; +"cjhebrew-0.2a"="0my3jp6pi5lbbhn24jn07gx95laq2p7fqk88pwic7wwyji097vxw"; +"cjhebrew.doc-0.2a"="09ldma056ipsamrd558z24k63p187ziw2bh8qgy4na20pp22wj0g"; +"ctib-15878"="0vm3aw2havsabkrr8sx4m6px9hi189vgsmqy0s922dlm479d8bcy"; +"ctib.doc-15878"="0q7jss1ai1jjr66yk5927psyvvmp1dwbr54llvwyc4z131g7qrnb"; +"ctib.source-15878"="1im0zhrw1lvzp9j26d9nh4m1mjhs5by6nai0dh2mrmdjw1i2222k"; +"ebong-55475"="1khaz8whw26znba0il6cam65q5sq9fb69clsk0s8qh26hp9xmlnw"; +"ebong.doc-55475"="0fa0kdipnn5hgfpjh8rz3l9zz97i94v45xmsxjgjn40xqnai3v27"; +"ethiop-0.7"="0h1h286nq6f2bplxxkpdg8mr70ip92c7mkj9lakxzcwacsj849xy"; +"ethiop.doc-0.7"="1aqgl8hvapg3p0f3knpirlgnifpkpw4jb22zncp1s26jqjc9wdcr"; +"ethiop.source-0.7"="1cc66b7ad2kfs4whzbnqdzfswn32y8h19bj3ad20ia24dggir5mv"; +"ethiop-t1-15878"="1xbkh7xx71d19ghwfq8bhjnf7jmapm13hp2gr6ggzavcmzf12ffz"; +"ethiop-t1.doc-15878"="1lafizx606kv455bhf125hl2xqhndd5mblkd0zyvqgyir9bawcd9"; +"fc-1.4"="0bw8ifh6sxgii5s3vx9d87m4rdfmifdvw70wmj2kwqzrij1ri568"; +"fc.doc-1.4"="19p5r28fzw0i7kmvvv93hiw7cm3lkcsn2hdn90k8m7jwy758qrdd"; +"hindawi-latex-template.doc-1.0"="0q35drybrlcfcrhrd5691m66nd17b0m6hkcsqazpb1ck227zih61"; +"hyphen-afrikaans-58609"="1kn57mzrbk0qhz69b1ysdqjv8xirsb40yz61jx146kqc4p1y96lf"; +"hyphen-armenian-58652"="02x9p12zc78w1x7k2kz019as42d5kn6gxfl4s72rd6dyrqii7bc1"; +"hyphen-armenian.source-58652"="0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c"; +"hyphen-coptic-58652"="1ry5srs6qr7z1xj1km0jsc3z278iylrfq79ji31kxmf1qs7rwpnd"; +"hyphen-esperanto-58652"="1vfrf4wby1gmw5gm8h4qkyqa3hsx00nwj2qs05m1kn119k0sg70m"; +"hyphen-ethiopic-58652"="08dyf72ygqh24h15na2ssl2f4w9jlffh4vhy6lvrw2y6kss1xr8r"; +"hyphen-ethiopic.source-58652"="0j55k0sh4dc53wbngadz4wy86k046bsi4l5a329044hk24v4ydm0"; +"hyphen-georgian-58652"="1ja7skdhwwdy3idgjf508dbhbpyl3a7cj9mx8x1rswywy924liqf"; +"hyphen-indic-58652"="02xnj4lrkvy7gs4vlnsvili90p6p6byh659mzci1ad4x36z4362k"; +"hyphen-indonesian-58609"="047j1835ny6l0ris6j5haw41m9id38r854mx384kfm48sa70bs9x"; +"hyphen-interlingua-58609"="1gc3c86zbjv6j1kw353xwhzrqrmq41rbw2ah1xrl7rxvksmzmsnr"; +"hyphen-sanskrit-58652"="1svx84qj9vr2s6pyxn8zz587ph37g615hi3g1m4q6glw9hgzsmkr"; +"hyphen-sanskrit.doc-58652"="1k6vsa9xakzwmjma4f2vm685cyb28rjjj5qmpb7l0fpqpmvndp1d"; +"hyphen-thai-58652"="0k35mjibmsrahiv71dbl82r9v978gwkm42xjnp3zb4kgc0h79kc8"; +"hyphen-turkmen-58652"="17bhr58r8sl4fw8w3gqsb8lvpw48vdijr16bdk7n6ma0183vd1bv"; +"hyphen-turkmen.source-58652"="1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw"; +"latex-mr.doc-1.0"="1zd948d9y63js7980g2bvxpf67hshh2xa3n2ihbzwhpw6l9cbh1w"; +"latexbangla-0.2"="0jh2x97r6j8lrl5kq5m4bvk139229fwf7r8g8xq7n0qywnfdr9zh"; +"latexbangla.doc-0.2"="0hgcqd8vqq67zzdn7mq4bps3q56ad3nmaq71mkcyricgrkn5xxmb"; +"latino-sine-flexione-1.2"="1k8inj0rl7mhsjyzc39w789jlafqshh9sgy99szxqbs0jilgfb78"; +"latino-sine-flexione.doc-1.2"="1wccb0ksrrysqjp68l3wnf6l4n3s64ny3cvxiqgalrf0mlfipxmi"; +"lshort-thai.doc-1.32"="16r9gx902a342q2mj570y269yw97yaj6hrbqrk4h49ihm695z30i"; +"lshort-vietnamese.doc-4.00"="094lfry6cqvpk02c3acss6581mgb7j30fnja1b3qwzxmyxjdblwa"; +"marathi-1.6.2"="0b1s7nhsmvia6sy4m3lj4iijacp4x40dp8ssp29cpr1hajb9cpxy"; +"marathi.doc-1.6.2"="158j3rxmy6n3j2hljwqqra1797d3b5j5ny5kgamkn2ffbhnfwmi8"; +"marathi.source-1.6.2"="0n15j37016xzq6yyik97h0kwawmwvhzs2nxg9whk0sjwbcj956ns"; +"ntheorem-vn.doc-1.203"="13lkgb4qjiblbfm4jcxgkxsf08zk90lqz02bxrmim1n8gvyihwcc"; +"padauk-3.002"="1yjqxzqsvk2mdsk837bgwqf3nfm9gh873bnir19wj5kj622zfh4d"; +"padauk.doc-3.002"="0331w1z1b5x15yb3xyxv008l95idv5yq9xb87da5r9p5fzfh1z0y"; +"quran-bn-0.1"="0dlwf4jnm9jmxa0q3fpcnq496zqn2z66jrmsch520xyxf3bsgk49"; +"quran-bn.doc-0.1"="00466c408q27rz6yw4wkiqarbf0z5rk2cxs2ahhnhxzgw6pi7va6"; +"quran-ur-0.21"="02r06www7n8mb8z7cx0wgvhawnskchnq28mdqmnyk4a7f59gl1yp"; +"quran-ur.doc-0.21"="1d86p5dkj9l2g8y1lq48bs92by5925w3zgh94mcl59i156jywlcz"; +"sanskrit-2.2.1"="1w2qni1pgzj2mafglzyvwfk11csfwz83gbcq1ihqabxsy3wqvpqw"; +"sanskrit.doc-2.2.1"="0i62fzaa6qy05qgb8p4vpv37lrivqnshhiy42zc75kldacbjivy1"; +"sanskrit.source-2.2.1"="1xzsgbx5z3z6zi7q9s4gjkq7xxvngifkrbqyva8m15nc0rz38hl0"; +"sanskrit-t1-55475"="17mqm0iapkf04z5wlj3qpk9qlz8nnq50bfbibikacdanv3852m8i"; +"sanskrit-t1.doc-55475"="14g53969gw2azpn7z81kdwc1m1hz8mafrz15kzrfiw9w6hh7s6jk"; +"thaienum-0.2"="16awnv395nhgm8s3n7w1x7x0h32033258bb0jp81v5nrnmn344wi"; +"thaienum.doc-0.2"="0jvggbnxinc81bn8glmyli746asqcpclgmvyl8gzbdarrnabij3b"; +"thaispec-2021.03.01"="1inic6cpbf1kf1hi6brhq5fj3fkwn95cvgjqwh7bxk9dxk1rzsh8"; +"thaispec.doc-2021.03.01"="0ki2jl9spv70f5hkzr762nkcylplb9z70c8gdp97whqg9l9mb8bs"; +"thaispec.source-2021.03.01"="0j69dwrn3qk82xgnwabq30ab1pf4xs3sfnxgnrksgmhd0ly4lpjv"; +"unicode-alphabets-54236"="1lmjf3yyr0zyg2b4bdx0n97vqfbnzyd929ginqrjxsgk7imi6l9p"; +"unicode-alphabets.doc-54236"="1sygp8b5191llj96lr24w58hvxsacsddah8a5w43a8g1cdqi0dgv"; +"velthuis-2.17.1"="1ki27wimj82h2dgw6c1f6hs93yg794j711x1w3vmgiwz3mdqkzdf"; +"velthuis.doc-2.17.1"="133f9scdzjncbvqqf9c5nj6vjszp1f235vrapg2pjlg018hlhv9x"; +"xetex-devanagari-0.5"="0i6hkzl2jbiixzrw2gvngnyzqkz0lfdilj1zz5xi6ypffi4vyihx"; +"xetex-devanagari.doc-0.5"="0ahcawr9872lipz33jrv870lj2601j593fwfqcn5x0jhas93ch6c"; +"vntex-3.2"="1hvpvfndmhbv0d25a26syp36a1035kv5wbbb7pq7ljnbaf4a9qfh"; +"vntex.doc-3.2"="0ssdvddzj738m6z86861dfnh1xvg3blfj7vb2z8iq1md01zvk005"; +"vntex.source-3.2"="1slib4ha6avplxfhmnvv7k7dbamlr8m8q6aijx9b83fy6vxjvmf2"; +"wnri-22459"="16hcapjdb5dx48gbcvk2bkpnp1w9knswni2vs8v1l9shxz03nnxa"; +"wnri.doc-22459"="0wpf06is1vkaw4ivhrz4hfii3qrgs71cawgn1fnm8fdzalgb2frc"; +"wnri-latex-1.0b"="06m6xwvm1pxz2bjf2xa7k3x6m70p1f5866wn5imipmhw4wjs2jp2"; +"wnri-latex.doc-1.0b"="15d9mcvdhs1jd574gm6a9ppxyy7avclvq54ikcmlf4vn20lygidx"; +"wnri-latex.source-1.0b"="02x8fdavhkxfnxhvr891adpn93yhqccs31w05h8f9hyg34jlnb30"; +"babel-polish-1.2l"="07b286ssppna5gvv5l9gg9lwprrzh9wn28jnr65ixr9w817kphml"; +"babel-polish.doc-1.2l"="1ssr8wgk8csj7fkjr0d4s9szm8mvap2ps8vbf4lr72z34bb6zmf8"; +"babel-polish.source-1.2l"="1jymxl98mwxmq0yq90mhrr7bq7c613rh1rnhl7l3bih36af55rwr"; +"bredzenie-1.0"="1mcl52mlbbw0yxbs53x9a7kh3xlaka9c7nszfajlhpvj4s3jr1pd"; +"bredzenie.doc-1.0"="1zgmhhyqf2bwlf0mi509nrnzqqa5g4qxr3zj46rsa8jz0giaig44"; +"cc-pl-1.02.3"="0cvyi72p74qx82qqw6cwn6kdrrsfw83ngwwkjrgywqr08q65v1an"; +"cc-pl.doc-1.02.3"="07s3lnrl1n7pjbm81bqg6n6q6lnv5r04df0xjc6v6dqbdq08s51d"; +"gustlib-54074"="1kqlqxwlx12hyyhsxyn470rgpzg6xw25ix1v5j4sski6nwspvn9c"; +"gustlib.doc-54074"="13yx3bzmbm1b1p5rbjdfsdlwxdpzdhhmm2xd05hi79wdfxbbby7p"; +"gustprog.doc-54074"="07qx4xvyqb4p0cx0macjgyg0pcxgcmdxmzfsx9ah5s0dqvminwrc"; +"hyphen-polish-3.0b"="121aayyqidlz8kprwkb4ydzqakw1m7a5ysz9zvw7clb65z5yd69i"; +"lshort-polish.doc-55643"="1d6q7xjplyhynicd599cqa44qhncpxyqca4d7lfbjq2p6rgx5if5"; +"mex-1.05a"="1azsp6n01qhph2my75r05sby7r3lsafydsxv8f5532dkb9r86p5a"; +"mex.doc-1.05a"="1nkr92d761c7yfb9aysni3ihidzw334w4180d6r15k1iwinrn2al"; +"mex.source-1.05a"="1nd7p7ssh79rrpv5i0z4246cv4wmjgy3by66bbrv7w2xhmh5819k"; +"pl-1.09a"="1j2a3vz3wabv3ai0k9xvf8brwljr5r2bi57nk0bba476vkvxbrbd"; +"pl.doc-1.09a"="08qkn286bx6akfrxrlbj52xylbvv00bvmmpin1sbpy342ij57lrq"; +"utf8mex-15878"="0inwvyrizq3mr4c78l036ib15d6v2bnrakm08hvxx6ck753kn1hj"; +"utf8mex.doc-15878"="1nj94nn4s662jh2wykvrwkiiv2xzg6v8q4iax18d20p75yfcn3v6"; +"mwcls-0.75"="13a1vldimwdjq9lna63gy6gcc9gnwirb2zrm8m4g170q9r2b01rw"; +"mwcls.doc-0.75"="10nc7ai9brm36hqhf1czs1vvhp9nqvbk4h8r9l02jsdjbf4rrml3"; +"mwcls.source-0.75"="1fdg5j1jrsdaavg20sai9ffrq4qyffkkpkij5czab5zkbmiz8kv9"; +"polski-1.3.4"="0p94rbih64pnfx7mnsqh8girkvx35p5d2jimi9q0dax8d28g6jav"; +"polski.doc-1.3.4"="01j8yak6swkwkf1pnk948si7ymc4hifd092236nv59l1vv4c77b7"; +"polski.source-1.3.4"="1svpvdcvb89l8i90sf2kdc9x0jc9a7969a36mcg3ckhxxhjji516"; +"przechlewski-book-23552"="0qn5agid0s57a8bdlha8y9m99xpcvlqknq473r6995qkdsrrdxl6"; +"przechlewski-book.doc-23552"="1bp9yqs9y28nbzwb183yf8h5862pm3iw1jsi8c6qzhsrcwr2b2jn"; +"qpxqtx-45797"="123dfaqzpl8h5ia08swjmj4h05ncz3ishsh6rbcm5px35ccrgjld"; +"qpxqtx.doc-45797"="0ng1h0yhclki35v1w08r2di3dvf9rp78r43dfa752zr8agrfd713"; +"tap-0.77"="1ci65i2k6n0h9lklgk41sdq4acp5655mps77j9gcb65yk4mdl6c5"; +"tap.doc-0.77"="0r8y4jzri83qypvnmgchnhrd0yi7j0k753zmnwhzxqg4bvki10gp"; +"tex-virtual-academy-pl.doc-34177"="1kb86nn5vp1b0sy21aw9wlla1dwlaijppzq7728bmfs5nk1dnbjv"; +"texlive-pl.doc-58649"="0wwyap4jnj80adj1a6b1gp5l0a0nzkdyi11am5dpviy1ij3wbw0y"; +"babel-portuges-1.2s"="05vvgp1vblxr50hxgv7sl4dy3pvvhlagjgxsg1nrhsapw0j3vgm3"; +"babel-portuges.doc-1.2s"="1pksfsiv020dikrj49l70annfc4vjxmaykj800bsaklnsvb2j1mv"; +"babel-portuges.source-1.2s"="1k4kmkdcrrrxf51rhs7wrv6irhyfv0vaxiwps0k17cxr7qsm5a3y"; +"beamer-tut-pt.doc-15878"="0ayh3kbh11l4nyyzp2kcwzn0phqhzawppy044iyl1wwwc2v3zx5b"; +"cursolatex.doc-24139"="048s5fg8c19s3zbl2dkmh8ffkicb8fd9n46m0iqrc39i0wrh7p12"; +"feupphdteses-4.0"="0sgg5wi5iylsz0y2495cajqdp8nzlsps3x7lzalx0qpjid91lij3"; +"feupphdteses.doc-4.0"="0ish03jv00i0crfzhjh2l32cspk2r5ifysz5prd6fwhdrmwmvm93"; +"hyphen-portuguese-58609"="06dxp3qddbh26wv1wpwml41vpbm4y6386vgd4xn2107shhbvhqpy"; +"latex-via-exemplos.doc-0.5.6"="0d5c0bvg71nw6zasl70sdq62xhimc4acsq7vi7mlkjx3q8x7s6q6"; +"latexcheat-ptbr.doc-1.13"="0m636j9gdfpm4j1b679z5qw5ygbm6jp8xl9dzy6v5zzy695fcgaf"; +"lshort-portuguese.doc-5.01.0"="0wg51rjcayiizkz0vvjkirrx19q8fbnfrwilgh13prlbpams1hsh"; +"numberpt-1.0"="1f4hmqlkfzqm8c4q9cbcqsh9pkchnylfv6gfzafgn9v3rdksg2dj"; +"numberpt.doc-1.0"="04hdl6zrzw4zm8cihvfidlnjirfj7zlmh9mb7nzzq68cyxn30256"; +"numberpt.source-1.0"="0ha3v5lgn8sycfxs6hlbdf7n0b8mcl2mny2kx37s1bib0h8i0bxg"; +"ordinalpt-2.1"="0nia32ms50727kn080xm2v0kjzws5sj6jdy7kglp8wkipvc6nw82"; +"ordinalpt.doc-2.1"="1nwfz0q6csg7rg3hqgddjbiz8f1nfcgghiqvj2wxqf0cfjh8zb95"; +"ordinalpt.source-2.1"="0rzlbngvszl1sjrigpn55i7a8rwnj9sy76c7gwb43d4im1ybd14d"; +"xypic-tut-pt.doc-15878"="0d9ivdz5jnhnh3pg8qb2jn7qfxad06hxff65scyhdd6wbsfaizi9"; +"babel-catalan-2.2p"="0brmmav2iwsw46p9bhbq5nc09w8wxfbsnpb6nrbx7zx76h599fwl"; +"babel-catalan.doc-2.2p"="06lb6gkmidlps7vs7ihqg94jqnpxyih2dkypbr0j46whs5nb80cv"; +"babel-catalan.source-2.2p"="0l4c6wxszawd0a7dd7fpljkngmmh1p7i7imyhgfsjyli6fpxmah0"; +"babel-galician-4.3c"="0mk67w9lhp4nfbhrzyb1ngm3rmdknvv8nlqb8601hrglj4hzmrda"; +"babel-galician.doc-4.3c"="0pzpk8d8hhvgsjssy67hpgvjb6sh3lfbn6f5cbpqbhxrgllhpgva"; +"babel-galician.source-4.3c"="1awy39dlr086hc807zc57l7xk6zqbkwrayvzfv8ch1mqnl0d3a6c"; +"babel-spanish-5.0p"="0r21656nzsxsacspkc7bf6hfq49l7cv2in2icd7z274dj75b9a15"; +"babel-spanish.doc-5.0p"="1jgdkprm15mfcbc2dbds5nprir4vhzsqd8gfk42ga2ayiw9yn6sh"; +"babel-spanish.source-5.0p"="189rzw1f7d9scw16ryp5hplbg27rhhp427wqh9c8bg70mam81pcb"; +"es-tex-faq.doc-1.97"="0wp5jx1qs4yp3y4qpwqhpw7rnilw3vb2z5xb4lzwph6zw27jf6sd"; +"hyphen-catalan-58609"="1aqn66448bbiycmjyhbxikr4l5pvjvl5vm8gpzjinngiw82v9j98"; +"hyphen-galician-58652"="1l0z14m9j9w1c9kkm61r1s4q9fvbblhdbrqhg8gcddfh0b85qllq"; +"hyphen-galician.source-58652"="1979y5x7b1x8j9v4ifc7k24zb6pxd00z0c6j9knndcaj428mf135"; +"hyphen-spanish-5.0"="17gq675kb397kqd87qg4x03wj2b5zkjy8ynzpq2h1flh1lf2zfwp"; +"hyphen-spanish.doc-5.0"="13kmgf0lwxm54gs39lm8vgg2hhajvqwviql1chhv2l7d66mxrcrm"; +"hyphen-spanish.source-5.0"="05r3c2m5xfs6yl52ms6kc95v3x82zbs4py9ip6xznshfs5xakb85"; +"l2tabu-spanish.doc-1.1"="1p83xflgv8x7nq9mylh468zn3hz5pv3zxprc63q51fwx0ylxfdbk"; +"latex2e-help-texinfo-spanish.doc-57213"="19rxbwk1xqhsp7wkgrx50q984n77lqx9zxy5s4741wfma69p7g9i"; +"latexcheat-esmx.doc-2.00"="1d6nk9p9adlhgr28mnnizrxzzqlk20zw2clcddqlaa8pn73dqhcm"; +"lshort-spanish.doc-0.5"="0ls50syrg3dl5dl5a3fi33cr9j990l2xr6pribn1vqglsqrh191l"; +"texlive-es.doc-58221"="025q4pn9x88qb4jxlczwxhw94fz780cxkyf19z6c06wbvwgv9cy1"; +"2up-1.3a"="1phamhfskhhyg5s3ab00mv3wsz3wg18j1dskq3x1mpkc5ys9a022"; +"2up.doc-1.3a"="0ijr2gsi7ywp72ydpyj0cyxwv06vc612cpm1inkx8rhnn6hjxbw6"; +"ESIEEcv-15878"="1zg2i7xl2fkbf01a9h9wsmajj56m2vif7sl63f9008i9k3nw1774"; +"ESIEEcv.doc-15878"="0vr6jmxwx8jhn1zcnry5qlm952dvvac52a1ms7xxgcrhphl157m9"; +"ESIEEcv.source-15878"="0yp924d13y4prbn1sqlbbazlfy09n5r4rbha4fhrsav7x1iyf9p0"; +"GS1-22"="0l3dyhv7mab9c91bl2zzcwgjzqhjw9v5xz7riy5066xw0w9zf382"; +"GS1.doc-22"="1cal802485nr6hydaf5irbn91wrcqg3d5j6n4pinwmapcrw9kjpr"; +"GS1.source-22"="0dsy733m8lyk9b0rybxvs6iacn25c8gjyyllx9wxjacxkyzcsjll"; +"HA-prosper-4.21"="13kia2sxxlfmlwawkzb11ypcqjllcz61sw5hlqwh0wq938hbkjwn"; +"HA-prosper.doc-4.21"="09jpdzznzyy3w8gzh8yls94y89il06jy0wl263xs9px38000ifik"; +"HA-prosper.source-4.21"="1rcihawsrxakxdh56by0p1vd8hzz1np654r8jsj6m10l4gcmvwd0"; +"Tabbing-17022"="0rf6prndsh7wqkkl97qnkq3i7791rysrnvgzq7ir3bnpighdnxk5"; +"Tabbing.doc-17022"="0ic0ksmgf39sw7312j6frl58iw75kbf0fi1f63z5q30yl94hbm8f"; +"Tabbing.source-17022"="1fx1lklvdzl39bb85vgdlvcrjvs0ph05qazslv8k4sb7ad4lmd5l"; +"a0poster-1.22b"="026ia95qflhgfbd9c32yagm1f08lnr9iyh1l2sd2b0hf5z27z4g8"; +"a0poster.doc-1.22b"="029mw747qln0xcnwalw2mw8iz5zzarv9qghcwsx9jzhqijmcspg5"; +"a4wide-20943"="0jw1d021vrr4f2sv94mw1jk7ma72m84idmq62imwqy23x8nfccy1"; +"a4wide.doc-20943"="03g0vwfdcczgkpbrri3wfhfbrq6r6iljpz5j9rllr2z5svlrjf4d"; +"a5comb-4"="00801lhrnv2qkg6ly949csp4ign89cpsbd70fcyb7r7zkd8lxczi"; +"a5comb.doc-4"="0bz9x4297mpvv082d0qjfvynflrcgj6rn9jikwikpvq8wlhz0fph"; +"abraces-2.0"="03283ybi97v520l84jwrn75lf0f5f1mjfnc8j6rnqmpghphynrkf"; +"abraces.doc-2.0"="10n4252lliivzxf1zi487jiaamabmlx29p2r2qr9y0z6bgkr2ahk"; +"abstract-1.2a"="173bimxd0923191xfjjk7x29j8xs5kxy7ih55l1k6dbj0iwlb9g7"; +"abstract.doc-1.2a"="166lhh2vi36qbhc5gm3xx96sigksslzb17bpzncycf0zgkh7j0gi"; +"abstract.source-1.2a"="14f2s393nd8q5kb909rj8r15apf48rg6na8yc45z2hl9ksfwx172"; +"accessibility-2.0.3"="0d7xrsdanx7wnnmc983rfy00r4290rigwx5ils6pfm0br2g5kfsr"; +"accessibility.doc-2.0.3"="17gxz1lm39wh2a235wk0s03jc7jxd4bl0iqj04v02m994gz43y3x"; +"accessibility.source-2.0.3"="14av24zcjqxq8v92yni6aj66cblnfzb1f07hbcd3ljbycw14ii44"; +"accsupp-0.6"="156yax2q84naj394xzr8m7hfyl1j7pziw8d6rzkrjjgxs9p9az1j"; +"accsupp.doc-0.6"="1ak7xv0hhghgbwmcviirhh1x5y9pb4is8h0a32kdd4hdxjdm7c92"; +"accsupp.source-0.6"="0spz8640bdzmirlnc3rwynzvgy5fi58vfs802jzbqxb0ypdg14s7"; +"achemso-3.13c"="08m9sl0smkn6nm4693pwmd33aqrxnz9yg95pg6w1v1c8m5y7pw55"; +"achemso.doc-3.13c"="0f34lgxfjgd37qzmkymm34kjipw42l7dhfcqjc4wg15zhdbr7654"; +"achemso.source-3.13c"="154d6siflvq22gz5dyvcxp601zr4wjr6as0as1iwy7w8yrhpd8lq"; +"acro-3.5"="0cpajq4ifx584qd6wrmpv0ga4g069hw8387sa6gda4kmzck9l387"; +"acro.doc-3.5"="196gs8x2hsdvrz9l99fdwwkjg5pa4payqga1yhvk7176rjxqln84"; +"acronym-1.47"="1gq7j83gjzlfbnrnz1cl0lihpdalsn6ww6hqxdfxikm28vynk88g"; +"acronym.doc-1.47"="0zscjwg22s81awq27lhqs14davwbhf5y4zsl9dsq2135rppmmyvv"; +"acronym.source-1.47"="16dds23mj3ha1b64fxz2dnxk7wsrcmhpmpz0zgqda46vaab9qiw9"; +"acroterm-0.1"="0snnpamdf0qqqf3nabl2f4pnabpjxjn949s44lb8wb4lifndyj8d"; +"acroterm.doc-0.1"="1ybgfy3x0a3dz5p2gac2w4ai2yc84i28vi6x0bq61ff3v74iqdhc"; +"acroterm.source-0.1"="1gja9j0a0v22qqdqy5f3ivrwablrz550gp7nf20054cirjzgr6f2"; +"actuarialangle-2.1"="1cb333pky7vq83gfriza8afy17ag9lm81zr2f3nbjz4vrk7sidqd"; +"actuarialangle.doc-2.1"="0bwyj15r2bf3bqc7y0dbz03bwccwlh9ygcv1frnq6bc758rfksb1"; +"actuarialangle.source-2.1"="169m5msyy0braf61jz721isba94fx5wxinzfsr2yz9hs6ic62dg7"; +"actuarialsymbol-1.1"="0g8vm5wynrlj0764w7l9wfx2zw6ir0hik8nv8djlc96qlp8cm80r"; +"actuarialsymbol.doc-1.1"="1kqfn2c7rws75yk01962nx2ra94vfh2j8rnfqk7qkip45x7ya172"; +"actuarialsymbol.source-1.1"="02s6fiv0i0a1jzx4jkbv18rbmnld4gzhv2dfa1gijvzwzr1rpvp2"; +"addfont-1.1"="05a413mb0ksviwbl0y1a14j8y3np5ra5sgjcnbrslrvavf4q2spw"; +"addfont.doc-1.1"="069vk1d1ig38r6a5a87fblq4m429crp79xqccrsk48ixswxafj95"; +"addlines-0.3"="1rkcpk1c8in0g6dgyc1m6pyz01jbx19gv98jmaiybxgvsa3z11jc"; +"addlines.doc-0.3"="1gaf9ljzkdhwjg460hl79hlwdwi0mrvgs51si8k8gvialng8b1fv"; +"addlines.source-0.3"="1m3l2s1l671n9j7jdsxfljjhrsvh81bayw40v81dm0f68g5hslnf"; +"adjmulticol-1.2"="141whgxnp67y4wnhxp4a947rqfyxw2vy57mk60dn1cpx28f07fyn"; +"adjmulticol.doc-1.2"="1akcng99rg1sl6k4kqkivaikl7sjx9ilslnakgz68vc7jqyarfan"; +"adjmulticol.source-1.2"="0py3ygz3s723r2d1w31zlwjnp6ilshyr7jcx2hxnqqms61lsk34i"; +"adjustbox-1.3"="0pjwhzgfg0lzvsd7iisjvhq96yh5ip7bzwzvl7z63dyq276z2rk7"; +"adjustbox.doc-1.3"="0afbqxq4ni9wfcsbimmpwk89f1gikxvd7vj48pz0j2pzwn5249yb"; +"adjustbox.source-1.3"="14f4abqmbxyv07lfmig1daq3199dnvd1divii8di2b4wdaxzgksl"; +"adrconv-1.4"="1wx9a00jky9v8xmjhrjlhbl3kcdxh1n9yybpsr74g2vw4bwdyr70"; +"adrconv.doc-1.4"="1ny594a3dvx3jba0lf72kjny60ix6hnnw8gj479ccfj3gw2wv0mp"; +"adrconv.source-1.4"="1cndbrbw5hss1qi7z9mgymqrcmvlhj8hxw16qjjzch85xw1nrwzg"; +"advdate-20538"="0wgr84y3k10g6622sm11c4m4wxj73vpklf5i5gnp14yamwi19cn8"; +"advdate.doc-20538"="0hyq7kn10ajqabmz2r363wfpdi71a9zkv6yr30s9lda0vy5vz4k8"; +"akktex-0.3.2"="1npcfjjg9nwrb392g8pa4yq6i76aq4ys67zil4qgkf4jyzrixln9"; +"akktex.doc-0.3.2"="10ma4ic5bazlmizxvwks6w3qqxbbir0rrhzj1yw2j68p0600nmvn"; +"akletter-1.5i"="0gigzlxkqmiqz4nwpxj98rcrxmi6yfipf5bifg1mywchnw7a1f2h"; +"akletter.doc-1.5i"="0ngj7d4vdnvh99inw2vggqdgx6h2hv5z77glxjcpx8kmxf8h47sv"; +"alertmessage-1.1"="1mj3wiz4fff3ry5q4dk3k0kcx4bcqfwdvgaa9x3vczs746q57dcg"; +"alertmessage.doc-1.1"="1ga46r20zyb1bq7pvhq4348d2prdshy5m3yx6d00v5zzis1dmx1r"; +"alertmessage.source-1.1"="0n36cfjgh1byik8zn997lmyz2w4wmz48f5bzqrhcps7bg3kmp4zz"; +"alnumsec-0.03"="08i891g4b3k1qqicbsgd3h3sy98cpk6g1cfn17g9ysws8k20a0sy"; +"alnumsec.doc-0.03"="0fanq66cm0r2dgpdrblrhqkchxpy2dxykq1g8zrk5ddx27v6r9pd"; +"alnumsec.source-0.03"="1ssw0pi7hn3s7pqcqkm36jjgmd5g2x5rqyf2khhdscfwrsjh07a7"; +"alphalph-2.6"="10gkh6nnhsrlqx8b6k3dylings3q97ky4qsv03nk7hn41zkqsyq0"; +"alphalph.doc-2.6"="0v36l765s4lc5r2xfi8a3i7vxf79yxy29xy52cbhx4ps0av4dxpi"; +"alphalph.source-2.6"="08yagdxgqvhvq50cc7rvb2629g4n2qjga86dpa43x2vjnmmz08vm"; +"altfont-1.1"="1nrcjmf59r672gmqks8spqwz3vn4jrwc272zvx7ncylphsjmip70"; +"altfont.doc-1.1"="0c5hz0zjcar69w489zz2a04rbnc3j2lp8yccw9zv41ninzl94ifv"; +"altfont.source-1.1"="144m2ph835fl9x3ypc7wfc444719rv4clfdar3bk73gvf53rmjr6"; +"amsaddr-1.1"="1f5w9dhlmni4qp1snqb7l8c6h2ffhicpq74dhb79q18b00dlfi8x"; +"amsaddr.doc-1.1"="04rq59d00gqyzg6a6v17ifmcn45y01r6f426izkgbq50gky9xlxd"; +"amsaddr.source-1.1"="15v1xh051j16qgpm7s33d8hsz73pxv4qq58i6kxwq63mkrnwgac5"; +"animate-56583"="0rqhhw61bmp5r5j2fz0k15lbi4877k1jgyffnsf8qzz261dr1xjp"; +"animate.doc-56583"="1pmk280p1z2d6z3cxx4v0mfhy206h450y5rprrdjbldak99631a6"; +"animate.source-56583"="1fqlk70b71x2zjysk77hfp7xhf3bi4s813vjhkq04b2yfqr835jp"; +"anonchap-1.1a"="0nz53v74sigvlb4dhgk5qcalw7nrc1vafbjx754j3gfyp2ilaf1j"; +"anonchap.doc-1.1a"="06khbq6p3drxsbjwgkm1sd163f7nl8hc52pjsm55g2vknib5caa9"; +"answers-2.16"="18s0c7hdk5qnj3svni93m9lpj81dhla9v7nsmcgh0jabhwy8n3v2"; +"answers.doc-2.16"="02pfg28dz10w21ap4pi2csvy32pcvmp0baiciavp354ky4avjbdd"; +"answers.source-2.16"="0mcczai8da24jvmakc7glr2c56yhq2jv58y1xqv6ny9hg4ph8v61"; +"anyfontsize-17050"="08dnpzjajn0k6hrf12l1p3ncsqjiwafzssa205k2zgsz61m3sis6"; +"anyfontsize.doc-17050"="0zmiklc2adbx5klyyjdivicd5j19i35b51ddm3nhfrcqrfvjrxwg"; +"appendix-1.2c"="1xcnin7414mb1jvgs7f1x27zkl73sabmqb31i79n88gi245bp5lz"; +"appendix.doc-1.2c"="144hblxkrfp8g040yiw1k7nr3anqb80pd9c2g15m88gbb1xzyay7"; +"appendix.source-1.2c"="10gnkpwvm08zqwi83s4xiqshp93v5ai0qg22n7zcwgaq86mzs44w"; +"appendixnumberbeamer-1.2"="198sc0fmnx7b31j2mgzjbjyjjfsn0imw2j8pkg8m0r2rlphqx72x"; +"appendixnumberbeamer.doc-1.2"="1b1rwcxrs8cm3zfadi9jpxgzcgai36rlnfragc9l5wcbdsaw1qp2"; +"apptools-1.0"="0b6yzpk2d79qg2irgfhns0w05i54z5z22ik5yyx4w6wg45v0j389"; +"apptools.doc-1.0"="1n8ak9cw66780zkk384vpjkxm9j8f9dzlqzshy48q7hhprsg4p9a"; +"apptools.source-1.0"="1ba08rixibjcpi420blw8a0v4c4zi2byll7dqlvwb7azqr6dz720"; +"arabicfront-1.1"="16426cyvrk461z9jb728w6glfm0ahss82kkq6fqkhajjc0cflhwi"; +"arabicfront.doc-1.1"="0ck7nl7v6kvibiahh3szf3nbibwajg2pjwrbcz06frpfwhizsnp4"; +"arcs-1"="0qahab6a041wn6s6isnjn93yrs6zk82g90x5aqpv742b2y8cj5ix"; +"arcs.doc-1"="05wgq5pkzxg3vj9anlzjq1jvwj7b6wvsp7a02syca6n4qvy1v5a7"; +"arcs.source-1"="0jnvkhhcqv7qgs4knwx1kz38x305a19kh13wn47zqlqn65991bpp"; +"arraycols-1.1"="0i7vm2znai3wgc3h44vhwd3wrrw0az86b3g3ndhy8yyyl17jk3hg"; +"arraycols.doc-1.1"="0gq5ss2rq7qgj4zqvf6n9a45j1kqsh0k9myphfjhdrf0s1sq8w9x"; +"arraycols.source-1.1"="08vfglpdhjc0b33b5r8x0mqpjamciq4g83m49gxwn1dd71hvwqiz"; +"arrayjobx-1.04"="1ry1gix4nz11kyrfpbhy160c8dir2y68jbmnds64qcdafhfv4b9m"; +"arrayjobx.doc-1.04"="1hqjhkjh5ryhjpi98hyi92raffmish9n9193ry75mgfx1p2b2w0g"; +"arraysort-1.0"="00wbmciwdnafwknxxrnprxj4xvs24xxwdwmn5y5xh1c8c3q8rn09"; +"arraysort.doc-1.0"="1yn9kbq8icd5gxix4kzp0qszhg1xy59s4m8p66a88h3cwcs7fjba"; +"arraysort.source-1.0"="08gbn5s8c7a8klg605kalr2mdpijy73pxvfsndaw9jdnr9ipc5my"; +"arydshln-1.76"="1f2y02l7fkhrc005ib1s94z0yxgql2m515zy3mlx6ba4mqadh9c8"; +"arydshln.doc-1.76"="0xw13bdw67n2nsahi85bvh5p1xrd8fpb1aj79vss9zgdslzb6j4s"; +"arydshln.source-1.76"="1xhnh7jw0sxy6vkw31gcxyxg06dm7bgw0njsfkailbxgndwcp6zs"; +"asciilist-2.2b"="0ni7182xwr3ns1dk8i75kf1cw9wpfagrf1y7w20hk8fpfymx2669"; +"asciilist.doc-2.2b"="11gyi8mcqvfpn07f4cypv05f77vhzr44zn6y1idlbz4mgzjw3kp6"; +"asciilist.source-2.2b"="07k13s9y5nvbp7w1ylyj3mlpn80682yhxgf27hz9aayk3hs77d58"; +"askinclude-2.7"="0s1938harm9sgna3cggllpa1g85yl9jv2wy4b4c5v6fksiivxzs1"; +"askinclude.doc-2.7"="0gkbk6j2wv05kgfbjd4mqx5k7rc22bmqn47vk7pvr5z60dr4nay5"; +"askinclude.source-2.7"="067dpl3v0ipspfm5f2fmcmg5cb6lhqg6n8216id9j1blir1ys3mg"; +"assignment-20431"="1nxgpadadzf3d30ydc9rndwm4v53s4v10a6sbqf6yfqds7ry13vz"; +"assignment.doc-20431"="1wyyvay22r68hfspaqv0a43s9icg8a3pj8wii3snn90svbsjfajn"; +"assoccnt-0.8"="0im3x8im6kkjmvibh57hkn8nljcfc4mzp0hpimiqn29ys1yrhj98"; +"assoccnt.doc-0.8"="11p081b0b6mcigqsmvgf6kc9ik2480c74madjli19rw9i5nzf0vf"; +"association-matrix-1.0"="0i3rfbmdh0hmnng19jzl1z6mhxpq3d0y1kdgwa80hwpzvl1chbg0"; +"association-matrix.doc-1.0"="1bkx5pydr88zy386malg4vza9syqhqrz6f5js9dwpvxmy4igjr12"; +"atenddvi-1.5"="1lw42kgkviwh5gl0fnc4kp8x578bss6fj4d3jqp3jh0iqj53wwf4"; +"atenddvi.doc-1.5"="1f4210s4llsbgnnf6s91j7gpdajclscnqlkrmrsmiphhvgjihcws"; +"atenddvi.source-1.5"="11sxy0c5vmbf17w1h46dc033lisp4aa8sjqfi1zdzlp7ha4c6rr3"; +"attachfile-1.9"="0akvm9al5rz67b81bsl0k92gjqwxjrd6dwxj9qmwrb9c6pd311n8"; +"attachfile.doc-1.9"="169kh9zrf5ykal633zn8n3i41dqbyv7jdrm905a7q47icvd4ar03"; +"attachfile.source-1.9"="1b9s69vvclpvdm02gi9x7zv5mf77q68xv7zd784cldns8h1a553l"; +"aurl-41853"="0dxsldgnijrjrm97a0k33cliqpl09b70xf2dccigyzyyps82h0d9"; +"aurl.doc-41853"="0rw2vhp4r9sb6pliqc3xxjc5hsznz4j7i2w3qk227ibg92qx4a8z"; +"authoraftertitle-1.0"="1gikfjhxkz21qb32hrhyrdymkn29x7bjcsml5clsw4cgi4b67fcq"; +"authoraftertitle.doc-1.0"="105sk016n6sh7llhk3fjcz63hbwms50l7906qxdddjq67qpgrvgn"; +"authorarchive-1.1.1"="0da6hacxksxy3f4ag9bv408hlvq3m811k2824dc3phzr972sfwba"; +"authorarchive.doc-1.1.1"="1r2kzr0h9mrhlz6kj5a3r331ikh76ppjbdqipl5i5xvibbfzhfmn"; +"authorindex-51757"="0dhdd84hdf4iz67acyarzf0asb7c8dmp09s286rq0ylgn7lb9xx6"; +"authorindex.doc-51757"="0hhffkmldhhm46xi8d1bvjp5v15cg5kid383g7s1dbjxqyd9vbvd"; +"autofancyhdr-0.1"="091dwnql2fy1zfkr92ww01hjylx6in8ay56gq7ywjlwb84r6sbm2"; +"autofancyhdr.doc-0.1"="04fjrbsa9nqf5rj0gqgm96c8wg3dl8cpfzyilqrfqmim26rviskp"; +"autonum-0.3.11"="0y1x4j7fyssmhlqf9974yprqxvplxihbs879qiwa13x0zmwhnp55"; +"autonum.doc-0.3.11"="1a73xg2csfq051lnjnxkplnpfvl9vhfm05qvgxz4i79qmgs7a3b6"; +"autonum.source-0.3.11"="1q58d514bdm0mbqkmyngxh0nzzg7kxxc0z7bllnlkqb99h3x3xb4"; +"autopdf-1.1"="0fd1dw6h409ffn2prcsmq4rsgjshhs9if0igsz3ibxb6wkngbphv"; +"autopdf.doc-1.1"="1rf0l15pp475f41si7qkx9rw7n6938jj2k1wybx4ck7pf6hs7i9l"; +"autopdf.source-1.1"="1vw58d9g41ra5j2av1vdkzqhh7g5nrprr27qgdrn8nlirvwzbx9m"; +"avremu-0.1"="1j7mg5in2jhpb07jpky76qriyb4m0qq0rlkacs6amrhh57299prx"; +"avremu.doc-0.1"="1p7z2vj25fnx23rl6m76h82q8kli8nfl2vail4mpkx0brimn4j7l"; +"avremu.source-0.1"="1zz9b5d08i3sjj74q609k5kyi9nr7yyczk00i3dqfz5x3rlyljsm"; +"axessibility-3.0"="001z3ra1zgsrvhlnvg9lmvc56s72b3kip71c1cnpl6qzqcc2y6s1"; +"axessibility.doc-3.0"="0s77mr42dli8vfc9h6gslq5g103rp5vk94hx9cw3w3shxazib73r"; +"axessibility.source-3.0"="1bh92wig3grw2bkkdd3fxwlky7rrfabzis1rwwdzgk3bmmrl9554"; +"background-2.1"="0rxb5vdfgxxadgd3isbghsmycdh4ia9yjx66mc48n396b4psbrcy"; +"background.doc-2.1"="0a1zxpw8wjq1mc87glp7kwdvkrg618ybwyagdkg7xnp8r7wisnjr"; +"background.source-2.1"="1mb6radqhhaw7k0ay4i0mrj4bm4n0v4lj6dwbk8h898ypnmdirx1"; +"bankstatement-0.9.2"="0r9yfjq0m55bd973gqvjpy3qfdhwglwm8zki37ppj1dvca7rzrbc"; +"bankstatement.doc-0.9.2"="1qyrb00m7rlqkn77hw6sb3r9b8aap2qj13ni3bwy4qv2s12sfmyy"; +"bashful-0.93"="0cp0lvqb88myspsbp7s3xd0rrkr1jlqcqq846mk8p7r6r4apl1ca"; +"bashful.doc-0.93"="19dbyg9njh2lwckmqnmy52gllsdwv2nvcp20marsjv5hps80946r"; +"basicarith-1.1"="10cjfm3v6b7rkzc0wngg635xbyfmrnzs5y6f3sn0akdfxj0d3x28"; +"basicarith.doc-1.1"="0qm4qnxp3n42zvkxyzanl4psiph9z9dxz5b2i32fpn7p3jhn2qh4"; +"basicarith.source-1.1"="1my6sp0mvbmpn2bakr93qwasqh7rwmzy8lhl608lssnxk33h8x8j"; +"bchart-0.1.3"="0knv4byfxfalyhmsqiq4wjcin0q0hyj9gs7f167cddjyzcg4z23i"; +"bchart.doc-0.1.3"="0zyiw3f37i3shf8ihhzxagvzwnsdaymbkpcizdm2ryziglahh1jy"; +"beamer-rl-1.4b"="0ah2skzc5kd7dxaj30q1bmjk6r6c3qzswjf59h3mn3fy0w081knh"; +"beamer-rl.doc-1.4b"="1kdrhcx16xlkqfx0m8kz6qc55nginrhr7kxcr6cv2zmw6h747771"; +"beamer2thesis-2.2"="1rz02mxmvrq0x06xbrdqvfgs21nhkcislcnpdwx9gvrdmwpcyccq"; +"beamer2thesis.doc-2.2"="1ialsnm6qc9bwry5575b8l9ifgymidrsvy2dc786ixndc0fzn84h"; +"beamerappendixnote-1.2.0"="1mqx0wwb38h1aaxc4xzzq6430xhrxb70qcdqs5yj1sa7k9638ags"; +"beamerappendixnote.doc-1.2.0"="0nvf6m7d6v8mbpnpz8bdam9bz4h9d84nsf17s1k13zv846rsp34w"; +"beamerappendixnote.source-1.2.0"="01lkwbk5vpnpbrmjdarnz137n5sbaxw0xaich2jvcjlin46vfly0"; +"beameraudience-0.1"="1p3bpgkdbm3dlh7pj5w6yvgr0iqjshn6kchdpx86zicywwd2hqpg"; +"beameraudience.doc-0.1"="1qs882ypjg9cp19mrpr3nl54h1zry3pawjfwx8si2b6bsngz3wk9"; +"beamerauxtheme-1.02a"="1a8q3a0z2wckyr3694nnkry0waqzqsgp3cmaf8ijcrfs42khxjcf"; +"beamerauxtheme.doc-1.02a"="19r7vjma15p3vw0nr3w51ghy7hq4pv6x92iway5rxmlx97dw4piw"; +"beamercolorthemeowl-0.1.1"="0kb2pvj9caszn40njgq99779ynp5kdq8ynqa0q6vhrh9l0r7d1i0"; +"beamercolorthemeowl.doc-0.1.1"="1crml0lvdyk56zf1ylk8d4441237kfpnn7v9sah98w8s7rlk37r1"; +"beamercolorthemeowl.source-0.1.1"="0l171ahdzizwpq8lq4rai2naj0h66q16p69nwhlwabynjkmfhhzv"; +"beamerdarkthemes-0.5.1"="07zg346brdpckcfr1vnmvqcahjmp87cb2sizvyx4jvxv19qqwpkb"; +"beamerdarkthemes.doc-0.5.1"="08zkfvjvrjh8wffv7qjqmv6p0997kriz6lxz06dnsp7l5j3p675j"; +"beamerposter-1.13"="19h0zh583chawpzm59xv7243vzkz597df68yy0zmn3r6ha8k0qz7"; +"beamerposter.doc-1.13"="0xspyywk813ndrd5xps7fxwggkmdl078fmn1cvxfx3cxpnmdf822"; +"beamersubframe-0.2"="06csqdbh272jbh3zpi0f8zblbmi0sp5iiz1r1qa9qc0lw81mdh7m"; +"beamersubframe.doc-0.2"="1g29xay21yr8aap2fzklkg8q3ybz0xmz22xx5cd9md93c8k9kg7l"; +"beamersubframe.source-0.2"="1zb42dsisab4234s79xvva74rlicd1gg4pbh867rxd15ajgy14k5"; +"beamertheme-cuerna-42161"="1r6c3ar29s06b0yfn85wssxccayxn2706y9jxdx2pxsr85ndc4js"; +"beamertheme-cuerna.doc-42161"="0a8mmg184chg2lljv1k7ffydg4sgcjpjbnfjzqcg43cqd01v5dmx"; +"beamertheme-cuerna.source-42161"="1avywir51zks1hygqypsfi6lkrba9ld6x5mkr8lln7b2s4ijnysw"; +"beamertheme-detlevcm-1.02"="149ya5raar4xfkb910lk85pqpm6mrc5n5ghh6350knbmaa6bdwg3"; +"beamertheme-detlevcm.doc-1.02"="1wfq3wc7b3516s81sbp6md6mx9szbzq5ycqvsr50y3s2wfvvj2lv"; +"beamertheme-epyt-1.0"="07pjgzgkjmr4hdf16m7kx2cf1448253jwgc522akfvvnmx9fi26p"; +"beamertheme-epyt.doc-1.0"="1a987h1cg48bw05zjh79ga23qb37s82dkqhhgvp7gsnwz10pax2j"; +"beamertheme-focus-2.8.1"="0xfn2xl9bbghw0kcbgjv7x3cl99bscwsfkfva48l94j4zhn3b8ji"; +"beamertheme-focus.doc-2.8.1"="11x05d09j14r1ax4as2q6qs0kd3xcc9q3if7srhjwpvkjrw5a7rp"; +"beamertheme-light-1.0"="133mvm4cayp49l8xvh33q0jp4qzhmvd3q2kq2aij3sh6i0bzh5aj"; +"beamertheme-light.doc-1.0"="15s2s3b10w0czq513mm2y7qrczm7y91qhghd0zsfvmy129mwfarv"; +"beamertheme-metropolis-1.2"="1pmvcyjn04pgcmvanj369hxqjha0s7lh1z4b6fbhaj2aj32l52r7"; +"beamertheme-metropolis.doc-1.2"="195jhmhzr4gbi04zmss5nl0lm9rkg8spynwz5vqlgbci1xc2cw15"; +"beamertheme-metropolis.source-1.2"="1smxiqwdvz4bj5rk9cmsqmy3kwa722ab5fhns67jllvzrkzy8zcd"; +"beamertheme-npbt-4.1"="0m1mpavq8p4pswibgfhsbnvg59kn4sxz0m4p2w6zjkmy80s3naq2"; +"beamertheme-npbt.doc-4.1"="15kc24d21d1r34hd07zr65rp1k55fwrxr59h0ayiiwgc9fkjjsd9"; +"beamertheme-phnompenh-1.0"="1smqwy1f7jz012x5hmsknvarykalz58iysnwf3px7kwg83fr8mb3"; +"beamertheme-phnompenh.doc-1.0"="1pg8242n3z6x1n4kp8my2nfllriijxwmwfn7d9hccfnsvjj25gdl"; +"beamertheme-pure-minimalistic-2.0.0"="1z283v6ipp7c7h1qhm043g0sdfcq2dwzk9l0lyy5951y1kj965bc"; +"beamertheme-pure-minimalistic.doc-2.0.0"="1chzf3lgd4sx26nbmacb7dadpk1m1rm913dj01648vbd2bz9y4zb"; +"beamertheme-saintpetersburg-45877"="1d48158ladllzj6a1np20irl0r0syksb3wnisxbbwv3kwzr7fgj3"; +"beamertheme-saintpetersburg.doc-45877"="1qkzpbc29587lmckjkl3lx08f2j0q3aaidqz22r6bg896j8q8pr4"; +"beamertheme-saintpetersburg.source-45877"="1r4cw99zffqsvppc9l7z9k8l93sfk1nk8pzj50nm2bmkrdbfk32x"; +"beamertheme-upenn-bc-1.0"="09a7da5ghgf5q4qp0djp3pya35zsm45wkiy5srz8p9q8pwg04bdx"; +"beamertheme-upenn-bc.doc-1.0"="1m1bc9mxdwfdm0v2lb0i3pfxgf5as1lpm8a05icrm7bdvii0vsiv"; +"beamerthemejltree-1.1"="02ccd8qqyjkvqqyxr94p1gc6qjryl83vpa72wcm5ywr8gmxci0pi"; +"beamerthemelalic-1.0"="10wv3820avgviic0mcxn38yycyxqfvmf7qhb5ybz1x84jrw8k9hm"; +"beamerthemelalic.doc-1.0"="1wz984il1z42ck69xn6rnxww3x4xx127syyx37wdy246i1ji75vw"; +"beamerthemenirma-0.1"="0ivhbhybc99hacnrfw1fb9412f6614an1955rglkcbwxwkji6nyn"; +"beamerthemenirma.doc-0.1"="04155wbw6ix7an8sblw4a8q9hbn7vzwffady4vc23vzccc2i2f4a"; +"beamerthemenord-0.2.0"="1kb3485dv7kcj04bkgz8cv15kv7jmdjy0jcilvi5zc1vn690cyba"; +"beamerthemenord.doc-0.2.0"="0ls5ivdcgayz9pqm6j1wd5f45s063kfknzxf594rdipz1jnmvj4q"; +"bearwear-0.2"="1xaq0bmv8jv1zss6lwx2ccx8inrmyw1r9bjv3sbqfhp2x4d5xjrl"; +"bearwear.doc-0.2"="0vm9lm6389jnmcgzx0ffmay2bw4d0h1wfmsfbj3x1s1vrfl62r8j"; +"bearwear.source-0.2"="0dzmlcrc4izb63862dcafshzsaglq5m88z3cxmwivmwpikhh0gb5"; +"beaulivre-58503"="0ik54162qvk6chijfxlwdgyabxaq7d5yr0kp3p1g7jkl99zhpiqb"; +"beaulivre.doc-58503"="1p8zdsrm8ha1d2nm22n7h7p046x72zl4h6gay4habfiw8ax5kcyx"; +"colorist-58434"="1yhhpyvxwlv95grqsnpb2y9ndsp3r6z4f37yr6j0xlbb9khbrwzf"; +"colorist.doc-58434"="0x71nwnla6wpi2jxgxs17c2ikipg027ivdm3x0pnnbzwnnp9kqb4"; +"beton-15878"="1rjj64wnd9xvh940rl9scidhv9ridqz38n8ndzs35hyjm8n2lx5f"; +"beton.doc-15878"="0i8lg2iyjkzpxjzz9ym61v4zkqczkhvs6qjb7zf5xw557l2i55gw"; +"beton.source-15878"="1l82y1fz86qsnv58gjq9rm58zf3ki80xmcqkwlmgfp334j9jqz8y"; +"bewerbung-1.2"="1gqj9cxjx8sn94rqlmhg6f4a8a4wnjccf6cjc4kbi9p3p27s8smz"; +"bewerbung.doc-1.2"="1g2nkv66926yh9fcnv4yhmrbs220cidw6bilcz50f6jyv6zj6lr6"; +"bewerbung.source-1.2"="1678hss1pfp9bijrsn1ll7fh3y3vxjm6d80x6lnqjm51igczl7a2"; +"bez123-1.1b"="13l8qvnhfq575pg1nvcpbrwyv5wvq3bhpkmh2306mds784hvcib2"; +"bez123.doc-1.1b"="0qrskibmq7sv07g60gzd5cp34p21ragr6yn9g6384gib8vx60nqf"; +"bez123.source-1.1b"="0ab153h8i8nmc6v5g9xwvpymjvpp605mbj9dmxdyl3ic49cpnl08"; +"bhcexam-0.4"="01amhwjvy2w4738kn71ananprbgg025l1ciwnbx8nymp8w97byc9"; +"bhcexam.doc-0.4"="0lnrnwjilkm4xiwpj23r5c003ddm8zxsr96hsdry9inhi7pqih1k"; +"bhcexam.source-0.4"="0jaq63yy6rwp79sk34cx5pknk5l3lppqrzvca79s08jgi9aw2c58"; +"bibletext-0.1.2"="1p2cz95815vkvvc9fsa1qm3sc5grkxzdsyw30qkilff1nivb3cd9"; +"bibletext.doc-0.1.2"="0czz3l0m314a25i242kixy9f9spcj72h3bibfdib55gg05iw102c"; +"bigfoot-2.1"="1md91jivqvgf5kvwizc30wns9y9krk5pzvaihxkn9qs41j907wx8"; +"bigfoot.doc-2.1"="1lj6lv7iizbsaj00hvrcrdk9w0iak3wmx6mdpfb77jkzgp9dgg1d"; +"bigfoot.source-2.1"="112kj1669xl7qd2vrpgbi19cw00rkhj64ik6rrr885qr7bq5w79v"; +"bigints-29803"="10lsfqfzg0klg59s9zkrrxv4qjhnk74x90rkk2w5pi8zn83k6xac"; +"bigints.doc-29803"="0xj6vnqfd5rb8ahxbjaqz7jd5kpvihr4dx88avrfvdfr0qhg3zlm"; +"biochemistry-colors-1.00"="0d4bbm1p3j6q28ckkl7ilkywrjx6iqvmx0qb27rpldw3jabf1lp4"; +"biochemistry-colors.doc-1.00"="10pa8jwpxr37hs0wcywzsq14x1jgjx1cqg94lpghi505mlrikcg1"; +"bithesis-1.0.1"="1vx34f7qfrw9wnq5r5n7kd1234a6dfvm8l0ah6f05x2hs5xs4jrb"; +"bithesis.doc-1.0.1"="0fi84nykn22jsc37z1h15zcqy5asj91jgxbwsgd6z0svhilrxmpy"; +"bithesis.source-1.0.1"="0vpzsjzzin5rfavidfl3ak278ibmp8l8fn1hqqqjyblib6y83x3g"; +"bizcard-1.1"="0s6c3s99hid9pkilskd8ssc4hv5d5yg5lvw6kqz9szyii4rb6a18"; +"bizcard.doc-1.1"="0ic6c43nng4lxsznkpj7w86ampdzjrqqcsdsm1f758rfds7wbnf3"; +"bizcard.source-1.1"="0ywip83r43a721yfzrfnkfms0saly4p2ihagyp6259h2kji3vdjs"; +"blindtext-2.0"="0nwxq33ffivn2ywxwx2w4y7ny5nv4af9p5cwn6c21jadrdj1rysp"; +"blindtext.doc-2.0"="0gg45ayj3bibxvlghnz3vs0yj29zyr50bf6la0m26ma8ff0pw40c"; +"blindtext.source-2.0"="09ppqs9mdkmax1s20m43hdi6yfcnpy0ylwdi9h9lw676gr65cn0m"; +"blkarray-0.07"="096mlldfyi6hxsnp3flkr1gfqhvhxm2vzk81zw6dl64xihkvl6aa"; +"blkarray.doc-0.07"="1km35jnmh1iwya05s3ilhikzvz5yspxf18jh3f4v6iv5g8rxf9gd"; +"block-17209"="146ava8k2z6mlr2aq5vydax1i2sy6spn4avshcblgr5ph49iirp4"; +"block.doc-17209"="1nwb1z6df3y0anzrl6b45fs2k069i42bcmx0i4p9z9fsbgqqfw1j"; +"blowup-1.0"="0ynw0n297iy02597g6pp9ghwdbn8aw1xmyjr0dwdzn3r79aad336"; +"blowup.doc-1.0"="0b9zb3kq41brzsfqrhyn7h52x8salaq2kmsyc4457v2mnvbg8pf5"; +"blowup.source-1.0"="124cy91k3m7vc15jvn5y9nhiz7pd8g41d8qxjcbqys9d2qmcdjr0"; +"bnumexpr-1.2d"="11ishmbzhcvfxj2y7q0z6z5lwfb4qndyw0fwzm2acxv9v8wra7xs"; +"bnumexpr.doc-1.2d"="0l77jkgqvcnd2flxdbjiyk3wga3a1awgfxar5gcj1v9khkbs2gl3"; +"bnumexpr.source-1.2d"="011qy8vbk5jwr3snfwmklkhja8hmr0iw8wfvp2cnjxx0hn5g33s7"; +"boites-1.1"="1176j9ikh36s0cgvsflayik1xp0zycbp8m9hg0c7jmzkm5haqw41"; +"boites.doc-1.1"="0visqy0qg18sa4mxszdl601yy0ilfgglv872dhzy8bnqqs8x7zzp"; +"boites.source-1.1"="1zirqghkw8kk8fa3xahd27dh60phxg3blp98iavh6bdhj0rm7iar"; +"bold-extra-0.1"="0samckbdgi91y5ay98h6jcaywcqfbmzcdb90kksjxv160nsvf5ca"; +"bold-extra.doc-0.1"="1101922s78y5d9rjf5immfir46vf0i1ig20wp360zcal571csgjl"; +"bookcover-3.3"="0bna2navb27gzc30bcmgc5hjg6g6njcnq96s8s60b2lhbjigldpz"; +"bookcover.doc-3.3"="11wyk4r1z6m47j3a2yncjwq9vgz6vj752px33pc46qsm2xfllb0l"; +"bookcover.source-3.3"="0rp0fbv1hhaijb0mc077dg9g34dial6l7ldfxnpg8px4b33iwy67"; +"bookest-1.1"="1n6n322vb157fz11djcnfz07ykarin7n8mdr7v04wlsj2gfvv5hi"; +"bookest.doc-1.1"="1n94n8pv5s0w12w7yiws7sv8vwg06r245b7lka3g1j74p3xyc5g0"; +"booklet-0.7b"="093kp4ryfp8q1hg8ddmvaxxsw75wplgz4rrmmwmzcj3hcgyynr1f"; +"booklet.doc-0.7b"="0cd1mvkv29r2aqdy4bs02m3ck90rdv0nz01cq2x5xvqk0i8j5dhx"; +"booklet.source-0.7b"="1c67lj35yh0w9bfgiba9ank6wk9zqq3l3vvgwn8f3v6kygyqha63"; +"bookshelf-0.5"="10sjmi94cc4ix3a2c0qpavs1sc0mqfqfbbw4qygf9w1wdivrijfz"; +"bookshelf.doc-0.5"="0j0lqi7bjlivivvrvswlw89vav6fx8wg95bn18amlwy5l8d7kyiw"; +"bookshelf.source-0.5"="0jx8dfl4j4k2av1syngad6narkdjksqcr71q92h3090rf58njgj3"; +"boolexpr-3.14"="1jd298qazp3q0r9dwn7m35yrzvkl988c41l0r0vdq4g3nv4ppv79"; +"boolexpr.doc-3.14"="1cwj9473nazkz0acz4x7j1xp50139xs1ifqck40f2vb1gvhasly1"; +"boolexpr.source-3.14"="03kaz41353m40rbmars31pkbrrj6zwiajbv6fkabq0gsd9gy7bq0"; +"bophook-0.02"="02wgw8462aaqknrnfsv1y8l6q7b9qvscnarysg2hw51l9g349idb"; +"bophook.doc-0.02"="1j5xyh11h3wsidfjnpw2wr8pc5xazf5wbbzi04r3wkw3v0haar2p"; +"bophook.source-0.02"="0mansjz0a6g02k9n7ijyami0gppkha80mnyaf9sqqzl6ppqygvn0"; +"boxedminipage-1.1"="1sn8liypm113jvmxsb0bl07cprrvdgq4rhbnp85lb5671djr63gr"; +"boxedminipage.doc-1.1"="06wan6b11z6g2nbw73z5l27mb42cd417bq2vmmmxla2fyksjqqa3"; +"boxedminipage.source-1.1"="17lk6ns0zl83nhdi8g6sgij4ajghksblqx2aac1gx6fmq60p7pn6"; +"boxhandler-1.30"="0ab7kp5xpsvn0i796xbsvnz8lc1ka1wqayva54sfbsv9bg9n0xg9"; +"boxhandler.doc-1.30"="0wsl8ivnyxf38rj2xv11jzyiqd5pgcpjnb3nnabl8a3ijdynzsci"; +"boxhandler.source-1.30"="1l875jplpql2bq0h55nl9ddmia31069chxc4w86pzh4acqn2c60k"; +"bracketkey-1.0"="03mq7rfgkgv06m25hkvlhaw1mqw3xr0ghfjj2jb4nlpkwn6945nq"; +"bracketkey.doc-1.0"="0kr9il6ac79kvqdds4rn4g98qxy7nvas62364sv75zv0hb6wl0kw"; +"braket-17127"="1ml5xz6pyj66kc2jby0bg02m79vfv9z3r91da808n1zb22mmnjkf"; +"braket.doc-17127"="09vqvl0v1qkrhv65bh9ym1zm254iigl21d4c98df8ayvffjf6bx8"; +"breakurl-1.40"="0a3np519c1knm8i60z1d6rmmzdhfl340gkf6c4m1yss68didq0cn"; +"breakurl.doc-1.40"="0dk4hgl3411q0k9dz9f9p5f7r5a59rpjcicz9h7ynpc4g3nhn019"; +"breakurl.source-1.40"="1hx73iw3n5wgvaz2niqargiw36p068pjl8x65cajn081831syzfc"; +"bubblesort-1.0"="1qs3y6vs5z5m988cj6dl9n74m0j5d4hsmnrz6xfbpw2cs9g86jj5"; +"bubblesort.doc-1.0"="0pcbzg1p1wpw00h7h1va4j6iivz1ky31k8aq1jw4z9s5rwz64p9h"; +"bubblesort.source-1.0"="11g2brc46977w61sk0q9j2wmn5q9x9s3mv6fcgj8ywql3g4r85pv"; +"bullcntr-0.04"="0djfn002j12nb84svd414zng3rnjp79ssrdhfb6j62mx0p9j2hk7"; +"bullcntr.doc-0.04"="0c88in90fy65pd9shbf09bl5dm6yd3z7g535ni5js251bqa9wijh"; +"bullcntr.source-0.04"="00pdz4i2pkn1fbihaz16vbhsnwaybpcavvmndg7nj47jlcfplhfq"; +"bxcalc-1.1"="1lgk3zfraip1jx7hpkkxwzril5sqc1hn00km3ybicsvi53z1q19f"; +"bxcalc.doc-1.1"="09x2b2cdxgf7lil1vlw4bmmjn2kl84cgxd75w2js2y1znsfgsivz"; +"bxdpx-beamer-0.3"="05zpcwq6syy612w8jw10fqym4w4b4qxrd2i4n4hqwxv2sqgsw4n2"; +"bxdpx-beamer.doc-0.3"="0g0ld901kdq3558ngzy6mf2f2vgjjcngiig2pbjb8xakcq933jj6"; +"bxdvidriver-0.2a"="06rw5wwp5ky30s31f23gl4hpyzakn5b3vvgna8iw2iyy6rw5cl7a"; +"bxdvidriver.doc-0.2a"="1qwxy88fnfsx9na6c8r56n6zhs13d8apkjq7hhydsfs7qy54q4vn"; +"bxenclose-0.2"="1mii9n7x232y5398zl9xysg81hflamrj3dflrngs94mm4akmcv2d"; +"bxenclose.doc-0.2"="19nmr2ripjifpjw8xrr5dhll392llqbfqjd2vj2zdgkvqj4bar4j"; +"bxnewfont-0.2b"="0mc8akfajlyl6vfh620h8rcyfv02gdg4ycqx18lhb9vfivi3j4py"; +"bxnewfont.doc-0.2b"="18na6f8nqlagfszk9miy5bbx2bylgspck3pgglbkqb9cgkdf4qq7"; +"bxpapersize-0.5"="1l086n38f6c5sf33fckl02zcbdsmcy96yl0vi06vacb81g958k9w"; +"bxpapersize.doc-0.5"="0c1ga0v995k92z3bdnrldbp27h2w4mxvwchyjwbgiy86dknaz9wj"; +"bxpdfver-0.5a"="167xwjk3rchf7z9sh53i89lnkmixlaq4n52zd2drvf392pwir8zy"; +"bxpdfver.doc-0.5a"="1wnmdzwm5qan70i2hcll06hnhrqhk9adbj0hmsxy0y9jdjypsfbq"; +"bxtexlogo-0.4"="0s3dv2vadhqm54nssazwp419lm7k9030ggb09bxs1rjlpw7j3cfv"; +"bxtexlogo.doc-0.4"="1ym41dys4yzj6l9fqmssdxx8qxi4yvkhy1z8069639pi0xkjibfs"; +"calcage-0.90"="18rp330i29cw8pkfv4gzlr4lz5rlcvc4k0l8mvsvs0xa767fd3h3"; +"calcage.doc-0.90"="01xp6i814bnzgbcghdpyzb9f0zx3fwmqd3p97rk4qlf3g378l8y8"; +"calcage.source-0.90"="05lcg7mix6z6cw85bpzcqgxlgb1vzb3irhljlfcvq08lrdfjy71x"; +"calctab-0.6.1"="0rs028w20fcg5jmmnhwhvasb701j763pk4bwv09lj3g78769k25l"; +"calctab.doc-0.6.1"="07fxrnpnzn23lb3lrlvil6a8624vcvam1lq6sf8nrgs52fzl2grh"; +"calculator-2.0"="0zzir6kp8bkj9w8jyrh16w8bdgzk6scrdqljxvq2fpvw87fdxrcm"; +"calculator.doc-2.0"="10a961z9llgnrbsny9ia0yi5ikzqi6d3vrpd5dc1x6swxmfayv3i"; +"calculator.source-2.0"="0bgg0hyp0vj8b9d9rl19qr4nqi43rmslvg7fva1wh5ywm9x6ax3h"; +"calrsfs-17125"="12b13dhwdxr5dc37l7imlhn4sparyrnz0d3vagjxlsiinm7hakf9"; +"calrsfs.doc-17125"="1295qb7s41y2abs2ip87ipcvq15pzza0bwvj6pwpwxkxq5yrr83q"; +"cals-2.4.2"="03100nskddcxi7z48iwm7vnwlrdkxj7xh8wgbb8bx3vfcrz731jr"; +"cals.doc-2.4.2"="08y10p0i7y0jndknkwrwdws6ja78sz1qf8vxvhhhcpivxc7a5gl5"; +"cals.source-2.4.2"="19sh899dbk4z728h9v72xrf54cij8jhnb4k4a035xfb7ijc0jcrq"; +"calxxxx-yyyy-20.21a"="0zlz35ni88p5zb0318mr6hl432d30mjkz0c10nr04bsl930w9hjg"; +"calxxxx-yyyy.doc-20.21a"="1kd2kxrhv602pb0d82h00dl3hj87wdcxpajb6s9f1866g9b70qqx"; +"cancel-2.2"="18bkqkdf888nd6j187kd39g0vgfhfh118bky8r5wwzy2aq843061"; +"cancel.doc-2.2"="1x6dhr2xyx66i8qwk98li3vp40rlalfrf5lk8ah4gq03ndhmygfk"; +"canoniclayout-0.5"="0smvc9bmcqybim01h2r6lx6xdr6y7218lfl7hhjrl0w25hiszaa4"; +"canoniclayout.doc-0.5"="0yh37kqxksann7gjvc1kfwnnkv1lqhx2aj52b2skv960visx5m4q"; +"canoniclayout.source-0.5"="15iyr0bcymylnbdfqvavjiazmm2zp8f93zx4fb5jvi5hz5bryy6z"; +"capt-of-29803"="1b89cznanql6vmcn1jyr1nqkva40i61lsgjswsqjgdqnlbmvsm43"; +"capt-of.doc-29803"="091qchrgwikiissyrbb5i14634130vn08rkj2v7cnqzsb9c44f2k"; +"capt-of.source-29803"="0dlgrkl1vcvf8qck0pn20ic7cmsvxqkmvgp04f9hn3dmk0yrzc3r"; +"captcont-2.0"="00zp59ypp753b17wcn9212gxk0w11g2a7rn9gi2mn4k5c3djc10w"; +"captcont.doc-2.0"="02n200ziiq4lbfa3mc8yk7icayl7l5ci3kpl8mlkdyg9r0a14j1d"; +"captcont.source-2.0"="04wilkx7vd5bn05cww36lywb10xq6b2nbhlxnjq5xbmdrdf9ckyv"; +"captdef-17353"="0gjbxdn70qskb3xl6gmags3gjq4pks44k8c48lxljx3avpvxnfp5"; +"captdef.doc-17353"="1wl56hjc0204d6xrpvypgra7md18db4bz7657m49893m2pmc2x7x"; +"carbohydrates-0.1"="08fsn3xp2bmkkhhqq0l8808j92vibkc27mi8frhzb7g253fnmbwc"; +"carbohydrates.doc-0.1"="1ygfgsik471prmbnv7cwak72w8daj7zgvdw50hjn4c6mqsi6g3xa"; +"cases-3.2"="15f3mngrmvd0h6yy3jiifyzfrgi014g4dsqz9c5g1mw65yyssl8s"; +"cases.doc-3.2"="1vq4x3lc7zrxsh3b7dy6w53aikx5vfzx26fi288b44g99f3h37jy"; +"casyl-2.0"="1cmz40n2h7nckjw9x8wjrj0kkig4xhjslqjachsdgidd151m65c8"; +"casyl.doc-2.0"="1y1gc2a1fw8fmrs4milnqvn0i099khhjq8pmsycj4bxpbsbpwqva"; +"catchfile-1.8"="0dx2smqpw2jmzbsfl1g1zpa790qaxas4cz1xb5r905pvpca4q9h7"; +"catchfile.doc-1.8"="1xhzw6ahzn8fgv2rxn30xszzpdjqgr97njvx7fz9bs9z7xr8f3si"; +"catchfile.source-1.8"="1gbcl7bfr1zdvn69zzhsbfa808qdfq10c11qc3qgihpzz8s99fr9"; +"catchfilebetweentags-1.1"="0xvk581zl6wk04amq4q6s4mhpb4d3f239ihk16m9fglabhq34xwx"; +"catchfilebetweentags.doc-1.1"="1bd9dgjp2rvsv6mn40m7i2s5s84wj7hbk8rka2a5djb00fv4fgzq"; +"catchfilebetweentags.source-1.1"="0lvxhx6id5ka9r3zp8h0xgrs05jax4r5rcyqcs1f77zfc2s6s8iy"; +"catechis-2.5"="098swk90wbnnnlxs529ixbjrhxkaa8s06f3g4rfazbv8ij28g27b"; +"catechis.doc-2.5"="1chl62idixljdf0kiicnb5mwdq1yxla13j6j0s53sbp6shxsgps8"; +"catechis.source-2.5"="13l8lnwirsyah34nh5scz1p6hrr8brpiddlxzj407lfcav7x1n1m"; +"catoptions-0.2.7h"="0739w56yv2rrz9958xhargjjknkf4bs2rgw1d9122ixrp1vw3241"; +"catoptions.doc-0.2.7h"="1jfv3946gqfbph8lzpzp8q1n6nhd2dcjprjylzw9kwxj5i42qqcj"; +"cbcoptic-0.2"="0y4y76b69ila35ak85wkakk6w1idjy92jhbnj01i82xpjnq9qrss"; +"cbcoptic.doc-0.2"="08c3v6rppp3qfmg4nz0abwn2ka60wc6zrdx6qh1b591xgfwcm4jr"; +"ccaption-3.2c"="06xbcnwyh6s417dc5kdf9h2qhi557fp0w5ikjdwkzsdq8q3ybd00"; +"ccaption.doc-3.2c"="1319qx3dz57f9hs21lxicwr8ql8131yk97zdps9rpnr5c6b0pgdy"; +"ccaption.source-3.2c"="0is0wzbqijcyi703k3va7icjxmf3v2rmrlhdlbhs1wzfyz1cmd2h"; +"cclicenses-15878"="1rsj1gknw2ib42h1jn5zdhwv1n5hg2fdny08wpkwyyn14r5n52r7"; +"cclicenses.doc-15878"="0vdr7nw2w4mqh3hiinywmrcszav7b0nc6jgrky1l3pgja9h78cj7"; +"cclicenses.source-15878"="090smmkqiaam8k5jfk30xk6jrzdz6y75bcawm94x5l4sc8mqihir"; +"cd-1.4"="1h6x7mm7bvvd9za8vsr0dnbll2m404hbp7g3bwh6z5dr15y0hw8q"; +"cd.doc-1.4"="1ws4qpknk8zz7cm0mfi9g9viy1f6r14y8hfi7dw2fl1lzi56j4d9"; +"cd.source-1.4"="00mi6aazb16bq9b68n0jh2vs9n5kv7mizgp61n7r9mpk90hcaws8"; +"cd-cover-1.0"="1x1z64h0473bf4dvyiraym65h15n0jkqbc24kr0xw4i0fk0q4l2i"; +"cd-cover.doc-1.0"="0lsxmkaldpc89sm9pq4zi8j3fd2aszglx06mqn3y81qjil9h7xvp"; +"cd-cover.source-1.0"="1060k65sxs323zkjv8pvx6b98v6bq3h51r84dmn960v9xaw8pp3y"; +"cdpbundl-0.36d"="1f3375jl826gm4arxsv0saigl8230d35dmkzvqyg2kldz5ig24s0"; +"cdpbundl.doc-0.36d"="1yhc82i1n44fp375vqyzrq47qdzwxc3x3zg10a791s4p25frzcn8"; +"cdpbundl.source-0.36d"="14aw67ah211c1simgsz0i3j6jxmnsj4arjfy5g20i05l892sb2xw"; +"cellprops-2.0"="05gr1jgr9m7yfrl1d8pgnh0z8xm7rk8522vl5wck2s2slmk8schy"; +"cellprops.doc-2.0"="15f1mbagh41qvzkqf1bdzlvchfn4dibsa2qj7zwaqszc6smscl1c"; +"cellprops.source-2.0"="0yb9gjglaqfivifxi6n1al6w1nm0ah3r4d9y8bc7xnfxikhx3sym"; +"cellspace-1.8.1"="01sm0xv3jbh0n45xql6p22dz1i4j9qxzsz7mkl8rgrypbdhv5f2c"; +"cellspace.doc-1.8.1"="02i83pfa5pvvky3bhw0fx4pplws8s03v4zpjawls4vwmgz012lpn"; +"censor-3.22"="0vb23lr2ny6713ab825xrd1vqnq1g93axn3x6ywgdap4c0idfzzm"; +"censor.doc-3.22"="1v82y130k7w3piq3ppn2h9dr7pxr6yxbpmfg35j3f89l9zkhwbd7"; +"centeredline-1.1"="15paqcr4acypfgisqrcbd4qg5ma2z0msz7d76shzlc8a8bxahkph"; +"centeredline.doc-1.1"="0zfj31277wg4ymlzc3z3skq4c20b5c6yw69460knw4jj1qi9pp0v"; +"centerlastline-1.0"="0wc1pwppiwycm5w3hp5ysnv3wgsw9s8m9p9ra3xbmlkqxd6zjwnz"; +"centerlastline.doc-1.0"="0f1x3wzxvgjxsgqparyjq4x32zbqjm88v5xdxm5qkiasai68r7q3"; +"centerlastline.source-1.0"="0ngxhlawj8igq7d2mhijpfcybfr6lv1jl82vs9kk7j8xrdf2nyr2"; +"changebar-3.6c"="1xdc20v3sgpk59q2rdjc3lmn08shvsicaa1xqcxyyrfvpw8gh4fz"; +"changebar.doc-3.6c"="0vyngv1ljprxv18awpaxzs4kip7l9zyd1dnmnph43s92nqa6bj66"; +"changebar.source-3.6c"="0gmgcbsb913g0bw3a4bvpha6gmhsf6z77yhrrs6k2k1lj0pyr96g"; +"changelayout-1.0"="08bapli8zvv8p15bv3sj7l646fagzbj44dbq81apb8lhqanvlf0i"; +"changelayout.doc-1.0"="1s304gpjg30kpygvg4r8r2j4bk9fg8vlb331lypd3dfd6slphm60"; +"changelog-2.4.0"="04djmbwcl4llwry38km6qcxz0akwx8y7smvpz0bp7fnvcc8knxnx"; +"changelog.doc-2.4.0"="12yfrxiiramv0d2l0fyy7m38f0llmlivbfarl6xr18ncbxr0g0qf"; +"changepage-1.0c"="070rd3drhaaw6z386v9z5rs7dmf15ci05lmlxsaay3s1ry1425bc"; +"changepage.doc-1.0c"="1149csn0iphkxj7p1bhkza8v6xj39k49rylp84d1ilckf1q4imng"; +"changepage.source-1.0c"="1slacsdfrjyy7hmhj4ssjkh0ln846b2ds11g446hmdvckyvz4363"; +"changes-4.0.2"="1r1iprf67b0x7iwc6d8ljb04j4rgp668cj9z80j6wi7abd2fk60c"; +"changes.doc-4.0.2"="1c3qan4rw25838mi9pgb3aqf8mzj4yv1lfvhc3z8b5bkhjbbhlqx"; +"changes.source-4.0.2"="0xqmwy0bnpvnhb7j9j27rpiphzy4yxn8p2431ipkl3gc8dvrc546"; +"chappg-2.1b"="1lx2yw7xyvbhvmcaj5qk2bjfmgyr4dn7q0v8q3xfkrnbzbzmcajm"; +"chappg.doc-2.1b"="1c9qkc2m4rcixnif8y1zvcc0mzwjhzsbrbmy1cqv598cysc2yaig"; +"chappg.source-2.1b"="0fzy53whj61n52k1ashphabpa076244dqjy1v7icrb27gd1y86mg"; +"chapterfolder-2.0.1"="1lphi7j367ga43j95vlph7ywzj93lppnn4n83xhbvwp56azryqm1"; +"chapterfolder.doc-2.0.1"="1ns01x1y3dq3r37q783ha7xsnlg50vfw5knh2saw1rv40wf9vf1j"; +"chapterfolder.source-2.0.1"="0zc9fa6xgs0s6g3rfzq3p32dlr3ay4k6y443z4zslkpmnv0hprjc"; +"cheatsheet-0.8"="1cqv885i4crrramly68wamd9fcx0lj96vzys39aplars3pjv0glz"; +"cheatsheet.doc-0.8"="1ykadvnpwkyj701xwfpnlnqr313d33r0yigmsscshgr1dd52jjf0"; +"cheatsheet.source-0.8"="01hd52i399c9nsk68ymr8hmllxq1vl6v01fvs1gpm90pgvgdc9gy"; +"checkend-1.0"="1g4kx83kkpdd4fbd70b29hv82gbf19avd04b3bcxy8d0r7zyyyad"; +"checkend.doc-1.0"="1hzllxf7pnp7kg2623i5yhl2xq6phifc4jc57f2zfgfvvw0hqihy"; +"chet-2.2"="1ngh07j5kjp5v1pmymckqnj9knjadqzs8ia4h4vdyxp4zprgyqv3"; +"chet.doc-2.2"="0l628j4b4m7a5p3vvzz8rwc236wqqs7vrf698gfj8gjdbbv0c9cz"; +"chextras-1.01"="0jb9dl29m57hby3hi2cfwks99xhrnf74d3fpan64852gvk0shb4j"; +"chextras.doc-1.01"="1ijm0ymdd4hh8sh4m5kxmny9nfn704prawr1c8x7445k9j1m2d82"; +"chextras.source-1.01"="0kkbsx2rqakaxq00nkvws7lpilzysxkmsijfxp1vyh73fz9cb8jk"; +"childdoc-2.0"="0vvf825w9081qcibwgyjdm57rs6083axqnr3lz9g8hd5s1h26s78"; +"childdoc.doc-2.0"="0hh51g80vlr0malbfqbfb0m5nln84bvnqa2d847khncxh0azlr2f"; +"childdoc.source-2.0"="1gaisc49xfpk37nrnm33wazihv61b61yhi40wwyblmhvwimmx6qy"; +"chkfloat-0.1"="1bv0gfqa1bhrwq7vmjn0ih49lzb5g3sxv1fdnp25lxp5fxck31k5"; +"chkfloat.doc-0.1"="02s4m1ngjcw8w0ywyqislxs6cb5vj5zgczg3dnfpqsypvxg2xr12"; +"chletter-2.0"="01gvs00kjr313a09y65hif15vqvxidi6ri11ypsbnsc0man6dhwd"; +"chletter.doc-2.0"="0mc8nlph24bh90l4x5bfc9dyldd4jjn46y08xgf194482dz2q8gy"; +"chletter.source-2.0"="03s40qmlbnlslcv8na5vwz67fad1chagal1pjq6lk0glhn5211dq"; +"chngcntr-1.1a"="1a61sdmfbbryqd2gj87bm4qsva0xjmf9mkxhxnjixpqmr4gixq8r"; +"chngcntr.doc-1.1a"="1rrkyvwbgfxxrnsdjybjqxqg15xyzr4s7qydx1ky2k7d2yxhiy41"; +"chronology-1.1.1"="0scb55ph1k2hm5bp1kvj203c1f27a6d263x39cmb79n9a6idynrk"; +"chronology.doc-1.1.1"="1rxwljr8jh5q3id04vg4abl0h19dkbzx8m04iq7500syf2xsgl7a"; +"circ-1.1"="1m6siikjprch991sqbchbrmhvh2knjh3895w48wjp9par050cbgr"; +"circ.doc-1.1"="1zmyxc0iz7ljrkklqdmpiax9alk56pf1i4dm6ljpyisd95blcys2"; +"circ.source-1.1"="1vdj8qzym1ihkhm628zz99w6xwzhav8ci0vlckqpz3y91nkkpxaz"; +"circledsteps-1.3"="03cz4fk8lnqdqnvx870f3anrg024jrymziwxz5n2nzmfv20smwc5"; +"circledsteps.doc-1.3"="1lq6w8879n19ilp45ajjq4nq8bsl5nn18n3cbwa38305w4a72vzh"; +"classics-0.1a"="1l5p09agmrik9dkhwghjg8qh407bjw5q9hviykq7kf3y006dpzky"; +"classics.doc-0.1a"="0xp87xj7328ipwq0l8xgxn2baqm9zmp8dqyhv1iy68k9wgqr2f5w"; +"classpack-1.19"="045fl18pbqs3rxjp05mcmzhrqs94xgqnim96g8mij5v82fc7c99r"; +"classpack.doc-1.19"="1875ak0yjxlvsn1gs97np1vhy2jr2yymjxgr72p25g548sgi64q4"; +"classpack.source-1.19"="06r1kpanvp3y43jc8vrskba6qrsi115akw7yjal528fxn1lypq8n"; +"clefval-0.1"="1wdxl93z0svgg6h7vdhzqp74clcldxqh95yimqb190cbm6v5ll05"; +"clefval.doc-0.1"="1d1pw87hszspsfrl5c14q3c2iy1fkbh77dzldhajx71iqjfza634"; +"clefval.source-0.1"="1x7dvg6q0hy6pg05qpi2qaxw7y7a2dcfa4khddvbfcngp1dirrzi"; +"cleveref-0.21.4"="1d4qp3jl9mgv4afgdgcns5rr7agn5smiwqkmrasqchj4hqzwxhwd"; +"cleveref.doc-0.21.4"="10wy2zndm51fy3d80cqnwsjxyczqjjffx61ir6ky3nkmiikiyypn"; +"cleveref.source-0.21.4"="1qyyvn226dj4yq25cf5f7yzc3gx9qmxmnlnjijydgmmwam71s3xl"; +"clipboard-0.3"="1i9facsdigll3rzl8xv1i85cqyvlc54xhia69cv5cv0gly00p1dl"; +"clipboard.doc-0.3"="1b6wvadihwglj0653bn8fnnq18whx2hymigvyknw00fyn3xjgvgk"; +"clock-15878"="0w5z1ffi25nabsaqh91glby7ifn40c9rhzxlz2kbyvbrdg6a3and"; +"clock.doc-15878"="1wp9hglx1vw8zfa182m2103xb0rhg9hmp51rc7bzm6fh3iyz52is"; +"clrdblpg-1.0"="0p38c8p426dn4i40wwhi5hisx3yc8bqdi7vwxdbya02smixkpp5f"; +"clrdblpg.doc-1.0"="1l0avfhvabq1mm9yqrpr29ps9iks84j7mbfgrbrd6kfgpdpqqhx1"; +"clrdblpg.source-1.0"="0iphx9hbs4ld49d24f2i8dcyjxaqgvxznq3i34ik2ywampr2a5k1"; +"clrstrip-53537"="04k0wdzbj2a0cvjxyzb0msrx4l7jaxnzrl8b1ly2q9bmmwmd5ch2"; +"clrstrip.doc-53537"="12wdxik5rqmrrrlab5mzmn02k8ksgwn01n4kfa56w150qn00jxgg"; +"clrstrip.source-53537"="0vhbf3ml1f6s2hi8m77d6cdsq5iyn8f5n5lfswj5wdxr12sq1313"; +"cmdstring-1.1"="08wyaqfyjp482gwkwfq2xw3skazfzlv0nn59qri9728rmgykd3wn"; +"cmdstring.doc-1.1"="0236d4ngq70xrgsaxg0b0yqgcnq55blkq7d4hgw3sx6s6hkxfkn5"; +"cmdtrack-28910"="0ygl30hj8rczxj8sxis9cfq419rscvndj5fwyrls3c1d2mnscizd"; +"cmdtrack.doc-28910"="03gp5n28lg10h6amf4vxamvnsr7hvrkhmscfcdf4jyp3kkkvnv4w"; +"cmdtrack.source-28910"="1m8kfxys9nh3xml6inyn4qyhqmw3h572lvlbh7g4z0zzqgiah3qx"; +"cmsd-18787"="0zykh9s50cgsxsv2958qyvwck5lw9s2a6fdx7yb14b95wkryqssd"; +"cmsd.doc-18787"="1mp1lxxhb489appwqsbg2g3lym4xvffg047lg7rpyw4msw3m87ak"; +"cnltx-0.15"="09czgnx6jqn856sr0hg5j9azaxc4i22yp1dz95nn4s331khl3z2a"; +"cnltx.doc-0.15"="1ly2cl3srazzynhikk6myzsfhffz3k63ddw2x9sbnvw6j7syd545"; +"cntformats-0.7"="0mx4rgzk4av74s906andw0h9ga5zl2c3ip0vi4q9349yj643k2q1"; +"cntformats.doc-0.7"="0015ynn7mw1y8v14qckbqkvb1fn5xqaz7rcs6gid1n19f1qsbh6f"; +"cntperchap-0.3"="0g7211nljimm9a5fvry89ch4nf49xhad9ka7prdmlpj87h9ygas4"; +"cntperchap.doc-0.3"="1fmq2r8ssvp99ykil3aak8w301qvh4nldsph389m7qar2pviy1sk"; +"codedoc-0.3"="1zz70vp8ssblnacrqdsq9nwvf1lw69mlk9d94cfjc818szcgi9v6"; +"codedoc.doc-0.3"="1f3i3vw1cmdvgp05xckr748kzbairhvdpfvr844y7wnmxzr4rfzg"; +"codepage-51502"="0kxf5zr3mhn5pd8pzmzslgnngk8gms27ax6cqn1z0n35zvh0p17h"; +"codepage.doc-51502"="1sd01q8lzrzgk9v1dyhf4m7a4fspjll3w8wwkbzp7gc693xg3lm6"; +"codepage.source-51502"="0b38lcswx2x1jl6ydmvs6yr1y0kiv6gdicnbrx5qs8xhwd93bcag"; +"codesection-0.1"="0qp4k2z442idg0mjnancfskj0j0k75w327fixjgdq1kl9q6jm9p5"; +"codesection.doc-0.1"="1fs5qhcm1cil5cqi8dh04zxcnv2imq4m77287amq0mbh3j5h9i77"; +"codesection.source-0.1"="1qfnls0g4z3xsmh89wjcw31gm09c7yh1g99ksf0x9ml6yx1j8f3l"; +"collcell-0.5"="0f0dzdnmmi4cpyg2qfdxkdl83qrcsddpqm7z9g9mxfnx4lf86y3i"; +"collcell.doc-0.5"="0wyvhcw36arrgnwq7zc8vck3m37qrn7my4r6959p4i7zhpvsazzz"; +"collcell.source-0.5"="1k7s9rkbp829wlby7h1hwlv48bzxwwghcsnmlxrs7qnh374dwb02"; +"collectbox-0.4b"="000fwzzw018nfijir6hzwr30szlqgr3glmpnl56rrjxbxapixhyx"; +"collectbox.doc-0.4b"="0d12j4mh3m3qhdzxabxigfqi2r8hc7jrw2d8lnfz16jp4yjhp3x0"; +"collectbox.source-0.4b"="1k0bbphvr20k9hgpr3dv869h9ygxx3g8vjapkc63nq8i13crpsvz"; +"anysize-15878"="0kkjzsk03bvnap54gdf0i797zqq6bdz39yh4dn810l5hyfqxbhwc"; +"anysize.doc-15878"="15z3sa1zj1hbi7cy9q9wn4mcrf0pb3n39q2lhkx0ijhzaxn0rmvy"; +"attachfile2-2.11"="17kxgd9f4q7qwciayq465wm1akrc4a5c3lwswhria540lim2sn8c"; +"attachfile2.doc-2.11"="1p66kvz1k17hvkkh5n1ygj9fcfygipsdqlpi4fpllc2q04w79y4r"; +"attachfile2.source-2.11"="0k1j5yiz71zzwpnm37pklmr4h8bavyfjay396pkqvjwrmpxbxfkz"; +"booktabs-1.61803398"="04bfbj0v47hiww6z8xlzphm2yh4vidf9gcp3rvh81j66s7wybffj"; +"booktabs.doc-1.61803398"="1hp3fbvg2v2hk1bns9b28hdjb2bcvn5d83apkr503ahln6rigf8a"; +"booktabs.source-1.61803398"="0p0hym0xn4zcmq8q5v93z1zi8n7hxz9kg58fq53y96hf6isigdb5"; +"breqn-0.98k"="0iilwmz8nc837cdya0hydkg031q18igda96m3bzjmh9slrgzj4xl"; +"breqn.doc-0.98k"="1xk6kivqrm3qvbik1h0gbff8ypn2g6w5s8vhmwpw5vza49hr7wr4"; +"breqn.source-0.98k"="1373k3iyglxk95hqj8zyi367cy49j21ghrqydjcaj3b5qqs61qcg"; +"caption-56771"="1y0rvpimkhzwjgc7v4f5dvsl4dmsydzikfk151wn5pfsv7y4282i"; +"caption.doc-56771"="1kg5jmrvwnajmmgcilgzncw3bda7kv0n6kchl415bl7l6s1yqkbm"; +"caption.source-56771"="1bjhsn8gzb37mm5j55cmqrwljjx7wfdqlcpqvdqhqc7gyfbnw6z9"; +"cite-5.5"="07nw7axvgir19ayi3zy0b2sp8bb9pq1nl36x0wv3nrqjilvgrwr5"; +"cite.doc-5.5"="0pg5fc41iwqc1y9m9b47nh48fqp5dpnjbx14ny7ch9irxblg5d31"; +"cmap-1.0j"="11ki3gqlk6hjbpffmi2zdlj0rg5z5drcx8zw9nc480mxz931h273"; +"cmap.doc-1.0j"="1ykxc5bg6s1c2p52fyl2dkmkg25ylngsfrhsw05yzskj1l8v32yh"; +"crop-1.10.2"="1hnf65q6mg5fq75l4g81zvp4qqdb092zb41m6nl3zw2cvp8gal23"; +"crop.doc-1.10.2"="1w6ql3bnghj633ar1zwbv580py4f1fmdm4vk7pa3q7vpnrwrgh5n"; +"crop.source-1.10.2"="15fxivp8d1xww6j5nbfkmsb0b2c2ldmkdy3ikw3m6jjk269nwy4h"; +"ctable-1.31"="1xqhq2ww64h8vpqqzg3zbhh0z7xpjbcqcvxxm4a6kyasyhc9iyr2"; +"ctable.doc-1.31"="1nfdrjjb3j1n8w3x4v92v9l1k0smnygwj47ry717qgf2sq7f2b8n"; +"ctable.source-1.31"="0smcvvlq8n9ahx0z1kmf37p8zi5bjsh5q4x5mk7npay96s87z9s8"; +"eso-pic-3.0a"="01q25ka4aqpz46z84ldhd5rs3xcqjk6rl7j0nhgw4s2lznrvrpry"; +"eso-pic.doc-3.0a"="1fglwrzd52fv11i3bq60d9fzfm4h4zh003nks9wgprdj9cz0s0cf"; +"eso-pic.source-3.0a"="1si3j1cylgck60rqlk5ral8mfdv348xp7ialwakynqzf5yv1ak25"; +"euler-2.5"="0f63sy9zs0myb76wqgzww48g7clq6ni9kwnrfjkyyc4lacvd36in"; +"euler.doc-2.5"="1rl4bxzlmw95pgcf7va9gsrgz89602a9pqvhiym15b5hdwc5cb07"; +"euler.source-2.5"="0fy3dx3bf8idddxsj29yqd7bsv7cyyg8q9njmb3p0mw7laqrkjxl"; +"everysel-2.1"="090nizak865w2mgrflmz91kc0b2zmc6fq0xxrlpz68xwb214lzwx"; +"everysel.doc-2.1"="0bhqpzw5dpgq3842jbba9y21yj1808nxrg50339lx7b8vc5d2i8y"; +"everysel.source-2.1"="0aibvqmg2n26dici3adi849a5k20ck68v25vx1bz2f15q4gggd6g"; +"extsizes-1.4a"="1249x8lklry9ibil9crfvy2x3hk5afnc3g3khixqf54jcb29zpg8"; +"extsizes.doc-1.4a"="06a01bmilk7hqr2k9237i6x53f6wz4z4vhr8n0qc0i3j09n5i0ps"; +"fancybox-1.4"="077xd75n1lpy5a4gdgk88p0ai2is5aj4lf2cfxn7nsyhdvc1y6gv"; +"fancybox.doc-1.4"="1giimlw8zfksar2hwarpnhy2sd0jsdlxzfw6gz1lmdb8xmwkx2nz"; +"fancyref-0.9c"="1ns9b3viqg45w3pmnh69fdrjc9p39pfnqwwsfl9nnx04pf8b0p8i"; +"fancyref.doc-0.9c"="07g7ynr4qjv5l8v71ymbhx3vf000g5qq63c4i8q0iq35gird9yac"; +"fancyref.source-0.9c"="1p5xd5a6lwv71hp1sx490qwqbjn720gc1fpkk2inmmq6h6vwgpdy"; +"fancyvrb-3.7"="1i7rk7wna0yi9najpjabridl1wa8yfhp166p7plyls8afcqh5fzq"; +"fancyvrb.doc-3.7"="0g1i8r7cxjdqnzwfppgc42dr00fdp3q1njxhs0k5lv0mih0hrh9x"; +"filehook-0.8a"="149wsy6d4qzjra3m6cl0f9p25mwb3b6fc9d6vqqps99ysc9nvmia"; +"filehook.doc-0.8a"="0r4phnzx8y2swlyyjk59hxbvas73r9m2k81v330zxfigll94a7lb"; +"filehook.source-0.8a"="0lk1qzv2j1g3qmf91b5axcpjilagck5k7b7hfnmqj7p95gkdlb95"; +"float-1.3d"="08jb0v6lsyff09hid3whah0i0fk5znsik5rigl4l7vflnvc6km8y"; +"float.doc-1.3d"="0pqj9qq5yprg0xfxga8ck1s2wyjzz4ymhpqgzhzbxbdslh475vg4"; +"float.source-1.3d"="0774d7gmb8c7fc3f8yzarlx1m8nld1vg4gpd3dfyw5b39ra4aq4h"; +"footnotehyper-1.1d"="1341gjq4lqkzgq3n40z8zdy2qyz26wnyyjcgyddh93dv71xhynah"; +"footnotehyper.doc-1.1d"="1jf8ri15nx4hxzi4bqxrfi3m4izqyjgbpjfmpyxg18sshhypqx6l"; +"footnotehyper.source-1.1d"="1683x6gd0z7fjrdffs783b5sqy4xsyfxjq0r5i2ag9kgkz7rzah3"; +"hologo-1.14"="00d4dciklw6npr3wrsncak44nw3mcwx15c8kgglqjwpgpi6knn7a"; +"hologo.doc-1.14"="05if4ff6nk9adz1s061a4yall8fjq2piapn694q6g84wb9w3syrh"; +"hologo.source-1.14"="0by96mq2whsflfva842givdb92swmhpfiniysxck17g9dwlq6qmq"; +"index-4.1beta"="0lx5jl7nckbn0brsijlq78mm0gjshf8m1dqjhgl0l59qi56x5f4x"; +"index.doc-4.1beta"="117h2g30zbw5g6x3xlmpgq0k4fqixh0l8ah7350q1sxvddxfcc24"; +"index.source-4.1beta"="06acw1yb5z4f887p44l9afk78kpnjv9djmbwj55bac23ml2k3ddr"; +"jknapltx-19440"="1jw24izfsw3l8bn27qci3mblmhpkal9wcldhjll7h84fgjb9q396"; +"jknapltx.doc-19440"="0m3blfj4ninra6zn501x17q6b2qzckzcavgihgqmk9q51yibd5aw"; +"koma-script-3.33"="0k8mhikpll066x3683gmg3xas7a2mz93b9fip4k56hacxxb6map1"; +"l3experimental-57789"="1wbswk80mh7a5hys1kgapzz03mfsrdsvb6li1cpi7z11l1sh16cl"; +"l3experimental.doc-57789"="19f5d2zx2cg3gnb5n8q4dg476ps15a0r3s1fzlk6p0zs2q62j84s"; +"l3experimental.source-57789"="0hlqkkg1hxr8dn6l9lzsjfcbcrksqp8qnjz8y16b6irpwd6smxds"; +"latexbug-1.0j"="1jlrv9pzvfi9d2sr04sqymcysb40kygbry8wgpdy641mlkygcr9k"; +"latexbug.doc-1.0j"="1y8340ry27s2ga549w0c24s4lpr0l4mjinzkynf7rxcp6549j39h"; +"latexbug.source-1.0j"="1kxhfkgnr6b5d7hkxj4ckmd00r2ani29j1c82v5idccm4bqv3mjk"; +"lineno-4.41"="1krdnz6742d36818qhwn9i5f0wr9wqpjgh6qq1dnbjpx5589djnv"; +"lineno.doc-4.41"="1mgl7ali64f8mq2hl3gnwnirwc3r8ibb1fmd3w3fp0c3r15alyc5"; +"lineno.source-4.41"="0whh2rf7q6c6afw4qb68dfzq0bpqxmrp97f6fpb28i57m3f7fq35"; +"listings-1.8d"="1xlqk347698pq8w7rqgdd9fq39a279hjixcnxz93nzhcp9v93jzi"; +"listings.doc-1.8d"="1c3b3mhbaz5nk58wb569b6r9hwjb65wyjf3r70hrn6z2y06rq9lw"; +"listings.source-1.8d"="1q7k6dmma7l3vraic7k6gycb1jbpfzy09njj4g5pjc7j89qfk3sj"; +"lwarp-0.895"="1p2i08d5i7a41f6vkkbfn4shv6c4bhz36sxy2f5nqz9lbqxm13ll"; +"lwarp.doc-0.895"="1fbjaajyy7aibp4cxq3b4f9xwjxi8f05vak0nd5p7k7dm9yjzzmf"; +"lwarp.source-0.895"="0k6b44x1s2sgbq3rw2lid2hk95s6hcrnm73sdfm7psaiqhn9n3p5"; +"mathspec-0.2b"="0gspy6kjnx7bs5dxap8ym8s0k9i8hczi6s4s97y7av7vc8j1fb5w"; +"mathspec.doc-0.2b"="07mmfcd0fvhrhafsfk4sb4dvs5x8x1rjk1a2xl20kwpfpp8l1rb6"; +"mathtools-1.26"="171iwsrxs8l0qqkkppwvk4hq60x6n1iil9nhm6p1lqvc5g1in7yi"; +"mathtools.doc-1.26"="1rw7bllfd28si9axmydmjdcqpivdrqhqzqvxzj1ciwx2ggksmwvd"; +"mathtools.source-1.26"="175xg321lcrmc9fz3zbfc0734qab6fbfvcxpm4b33zi8kil4bqpf"; +"mdwtools-1.05.4"="0l40ydzljgydp8qfq1lm9v8nz0mrz4zxpjxicypn2hx7bxs2b9rq"; +"mdwtools.doc-1.05.4"="09d2ahrpksnjd4x7gqfx7yw51ivfpv4pwi6ms5c394c3v30xak94"; +"mdwtools.source-1.05.4"="1w3sjwa0n3pyn33k4lwnzcswm86zj9givshk0raq2qdb4znvxsk4"; +"metalogo-0.12"="03crm3sswv7mz5akghqvkq1zpiy9jdpy32ivwwmf14sfrrri2cz7"; +"metalogo.doc-0.12"="08vgbmjhynb4ramaj68i27hpgijg51j80lm0qf1jrfpapz7lrzij"; +"metalogo.source-0.12"="1ak8qbcbqgirljfwhq7ylxk1w2frxfkjvadjq00cclj007idr3x8"; +"microtype-2.8c"="1c2g1xzm914kawss1my0irmp9b05aj0c75prp65iqazmgs2niqrs"; +"microtype.doc-2.8c"="02hgl0zkmy351dp8y1v6da57d4lk6hm2834hpns62ai4xl9ffjx3"; +"microtype.source-2.8c"="1is19v3w7a4kfdw9criahs00j7ynkfzisjpdh1pxa1dy3i0a3fh7"; +"newfloat-1.1l"="01l6gl8hjml0q2kf3wzdnypr96ib3dryspgqd6hhfg33h26dji5d"; +"newfloat.doc-1.1l"="0lagdv0hd7kjxf221a2vzpgskvfr2h2wcdps0l90ycr48g9s1j68"; +"newfloat.source-1.1l"="151qai42ssn1ngn4fqi7098hmfb9v858bkbxh0qrszawhrz4w5q4"; +"ntgclass-2.1e"="0hi8qb8xqxkpy2xa3ggc8fbbraar7xxwi3n9zy4zmjwq9p9r97bn"; +"ntgclass.doc-2.1e"="1dk7y25pvmavvwaxnvsf0wqm7vwz5wqmqd1gb7zbklmwszd2pbm9"; +"ntgclass.source-2.1e"="1pzp4daznyj38karq0vj8a1jpja0jbdsdyr1136nzi7bh3q92i0c"; +"parskip-2.0h"="037404fa7flsznyidn6vpp5r5rw6wpzrg6sc8zppj9hqciqlbd52"; +"parskip.doc-2.0h"="1pw9mgg04lxmrin7vplqyfhxa2bb73yf7qj8l3bwc9yiw78v5h4m"; +"parskip.source-2.0h"="1ysz2jfdi49qjyrfkx5k1vjcykk4774i581d7kynw7q9r25lyq9g"; +"pdflscape-0.12"="04r7pgna2bziz6jsxkm0kkva37gbnz5q42ib1r23pah9knhw584d"; +"pdflscape.doc-0.12"="128rzqfkvx5ys3f5402fi7qf7iw2rrgmrs3jvrglmj9719fv8g94"; +"pdflscape.source-0.12"="1idx3b5ndgnfnyafhvi6xjqvgsyjp2cvmhd7dwd6qn6m88c3dhki"; +"pdfmanagement-testphase-0.95c"="088pzj43hq8rjn8db370b1wp82zdbjv5l9c06j9jbnlsi6m1hpf0"; +"pdfmanagement-testphase.doc-0.95c"="0l3nazd7ykqrrpaq7hkvlzpmib9xj8lr9lapc91p751155sb5gdr"; +"pdfmanagement-testphase.source-0.95c"="0srl7w0dbzadckjxgf842n7cf223s2b8b4ahcb98c5yipnv48wi9"; +"pdfpages-0.5t"="0p41hryggm71xlfjv7cbp9dq59wjsc7l4nvzyvzb2d20qnvgv9v7"; +"pdfpages.doc-0.5t"="1mc18d74fcw273lcpklpy1iyxjz2ijvl7yp5wm2sn8cj0dnywb2z"; +"pdfpages.source-0.5t"="16wlid55jihy0xglhc63fwv1c1nr3scy8p64yyxwz0gc00l2sipp"; +"polyglossia-1.52"="03hw0zcl90xc2m9npcrpmpmkiay65hmkc5d75lhpwybx9fiz31r9"; +"polyglossia.doc-1.52"="143yhjrndb77vy51rfwwsnk62ri91m34bc47qsymh596sjcrszzm"; +"polyglossia.source-1.52"="02b2jsvwvs0pk96cvv1a7byc6yq5808q4g173xvv72kj7lvczlsk"; +"makecmds-15878"="1z4m1kg7zy5q8l0a5d0fr7jl46wrw0rbwkxq1d0lm2s13xdn71dm"; +"makecmds.doc-15878"="1hqwvilvx61w47schnchlbgrj5snlp0lahsq5a1g2c1grmzpirnc"; +"makecmds.source-15878"="17c66isk18ch47syhsihj96yzi1jpr84946gck7r8ivpmk3cmmza"; +"psfrag-3.04"="0m5dlnjf7gmikg4nyxzzfz999gphkg41qm2sksq9ly2rspbdcs8s"; +"psfrag.doc-3.04"="135c7sr4i8617vwr4nnz8vcy5qv8icr0r0cmqsj6r1hpkm67zqhk"; +"psfrag.source-3.04"="0d68rzpxax5n0da8sg1nh50li7rc0m7syz0kvpsgzqbdp1clbcjn"; +"ragged2e-3.0"="0bx5fd1bpqkgzh1ixsri0w3hd0i7fdsbwps9qbzilwawhf788kpq"; +"ragged2e.doc-3.0"="0dnxij4vyfgrl7y06g56cikz8iql22rzfdcm6yxzx1i9zbvhbp4c"; +"ragged2e.source-3.0"="01arnx366ig5md4rk39f78zm2wr0h4s6mv0rx8xv3fks51nsaiar"; +"rcs-15878"="1kri1q5b36d00k1pmpkpa0dmbv7qqprycxzmlmqvp7fx82s5awwk"; +"rcs.doc-15878"="1x6m7v28p3lslral4wk595clg3kjf2nwk2mi1sva2fl56mny7mzx"; +"rcs.source-15878"="176fvqs3r8wysrqlqwjdnm0xqgqdyjq7wfwnfb2iv3c3rmpr7ab0"; +"sansmath-1.1"="09zi9xps6pv6pjwp8pjiz6w4zqa9d3rwqn38167k2dlwnc3ij6g8"; +"sansmath.doc-1.1"="103h78a075lh094slfwlh2yk4dbl0wryzmsksvbp80gbv8w7llpv"; +"section-20180"="0rqlczfl443z7mjmnmndclbjy6qnqvla89s8yqwngzyms4z1h3v8"; +"section.doc-20180"="14d7576idcbpxlw7hy3hsdd41gpiyksb9ajwnn0jm1mk2snzb51b"; +"seminar-1.62"="044c6chman0w57y8lz7j3n4s3ajg1zz81qf3ndz5pfakyivqywlk"; +"seminar.doc-1.62"="1wc34683392vnd1hb2lqk9p1ydxbs05njkqygwfkncb1q0bwdi1p"; +"sepnum-2.0"="1gawca8sqgvkgc92hrv0mjhdhh9nqiafxg2ssk7m1r5dqc091qg7"; +"sepnum.doc-2.0"="19skfqlaz82ji5fzqzgnfaz642ms71hqhv2pavm6a8ifish8wcj6"; +"setspace-6.7a"="07dpjjwslfjz4vr7g04gdy3n5f886hb8x6x2h6q593mdzy3l47sv"; +"setspace.doc-6.7a"="16zqyfv4jwrzcamns4lz684g5fijhilwnx2wywim197rw396pvz7"; +"subfig-1.3"="16fs6ax4rjnv446x56jydx59ahw9ylkpq22a1dfnnyf8s4jm7a08"; +"subfig.doc-1.3"="0jm594akhy2b1w8i7ccv23z4z94lbd6rwpmr62mg1h80af806biq"; +"subfig.source-1.3"="1aprv7xqcwnl6076w71x5x8kspa1sb5hlpbcdrws3slfzm40skcw"; +"textcase-1.00"="1d12a3wqsm2qqkd4x97j1b42ngwljh0k7y3qjpnrjfs4rd2pkgxz"; +"textcase.doc-1.00"="0gzyjqj3i5lpj46qw9q4ivhswmb0d6v2pm7c005fc1ngy2y9dy86"; +"textcase.source-1.00"="1sfwq47axxrwgwmiyxjgkyzd7hm2p0nzyy29wab3c6ab184v6avg"; +"thumbpdf-3.17"="1zj2733wnq4zydf22qhza9j0nywh6fmn8xd3dc6nwfzm68pdn9ic"; +"thumbpdf.doc-3.17"="1j3grkd8vvz6ynajk9d4nss86qsx53xw9pzkn2mbm1smddbdh8cc"; +"typehtml-17134"="1lv5bl9bq1413bbbsjvh8gz1p3qd075y7asi9x0nja36rmcags11"; +"typehtml.doc-17134"="1cgx2prk9ggw3wkbabrm0sbsfb4ablglzh2ckvg5s0chgkilcnyf"; +"typehtml.source-17134"="1ihc1dq38rklrmw8h4k4i6pq3qy9dlwn7nwzmjblpsghszfivxqb"; +"ucharcat-0.03"="0xiryrx3pjx2nq01f4f0x3anx3zvkdarp87103z9zvpf6aa27slw"; +"ucharcat.doc-0.03"="0k1aqic1ljafdk8xralygdyjapkqa0qiainrbf982233kjqclpvd"; +"ucharcat.source-0.03"="08xxmm2rrpyi9a601bzxka226fnhmyqfv8cfbc1qdivn8658785y"; +"underscore-18261"="0a93sgddm7xy8iby50yficparkr6hnzj46w70madbwpjkpnfya78"; +"underscore.doc-18261"="1lqg7j0hnnhqnfzdv0zzgpnmbysypdind3fmr6axkw0czix1pz5n"; +"unicode-math-0.8q"="1ix7yd0yiss2j5gm6s8njqp3287v1h27xxall0ya34ip1n85wkmx"; +"unicode-math.doc-0.8q"="16w4qsgvgq8vi0ylivi3j5b80y4in205ysyq8xaa2ksa8rbbaa4b"; +"unicode-math.source-0.8q"="0isg86y341w2p4a8lpsra9djb2ldn9w5cxffwzbprri33j2yqs82"; +"xltxtra-0.7"="0zpvlsdsrn6pnlfd3aa23hcrjfnnrjivi7r61g25j9sqcx7cmkym"; +"xltxtra.doc-0.7"="12wp6zwqa5mi5i5ridd2amnr48xrkqmi92xdhh95ydijpzyslhli"; +"xltxtra.source-0.7"="0vwlj6f7z7fh1vx257v0gnxj29rp3xqjpxlnn156xp9i8i29v0hn"; +"adigraph-1.7.1"="077iqsmfa1fpgmnppb7bcnskpa9ap4wa53ip67b4d21pa1arzszq"; +"adigraph.doc-1.7.1"="11z48jaj6xcwrzv8y2byjcs88mdvqi2fqk0nqw3cy5pq7b5m7rap"; +"aobs-tikz-1.0"="0fiq64szq6243gy7vg99gi9zhz5c0svrwjwj92qnv131zj71lcg8"; +"aobs-tikz.doc-1.0"="0yy2nlq6d6q5cijdswkn3b1f2a3j5sbl3fdv599vxna5pgywsw6s"; +"aobs-tikz.source-1.0"="1dj665gs9cbx3mf3nqr0944kg59gwg43ll1dz9ci3jra0nsr8w5q"; +"askmaps-0.2"="1r6lk9szs7jm57b4hl9w4ngb9dqcsi6pvp37rcnwnznj5m2daj50"; +"askmaps.doc-0.2"="1ryw8yy59mfi13rrwgrfg5y5dy3cafz2a3f8zmq5fbl7zhbylq6p"; +"asyfig-0.1c"="0zy0vxxmzg7nzwzw8z84sym5wdfbs7kyf06r6vnn05ga06wwn603"; +"asyfig.doc-0.1c"="03nby6d7cjczj3irqql5wpxs4fx9z77bb03lys5j1kg63ccq5msp"; +"asyfig.source-0.1c"="1rzicq0w7byrxqvv8pympxkwq575zqs01s02z205azaqdgrzdhss"; +"asypictureb-0.3"="1ls5ryz8c68liyyyqkjvmzyyblh9m8c5b62igz8frrj4m5vhi3aa"; +"asypictureb.doc-0.3"="03d4l74m9qwjvl71xfkhspf0d2xaafl9d2kcqhmil5yg85hsq069"; +"asypictureb.source-0.3"="1jzpagmnv21k761r52m2f708275k4pwa9sqlp88l6pgv6s6p4pab"; +"autoarea-0.3a"="07fi6gdnl9srrhmj5v28kfvjs3skf8g693hbdrfzjkyw76iji46x"; +"autoarea.doc-0.3a"="0chpz1mj3sjqjq931i7wkddgs0b96nwnfisv8r3q56ln35m2g1g6"; +"bardiag-0.4a"="1lwa55zrl4pqyvl754j4wz076gn9rbl0kfchad5pzhckm27vvp6n"; +"bardiag.doc-0.4a"="1q3ng4j9g4bp3vvbs9d4md4296vi2xhzxji8nbvq1ibkzbplgd01"; +"beamerswitch-1.7"="019j2jbww7sc5lj6h1smsvf4r55ir4k7x71nklny4s71a4sirb1w"; +"beamerswitch.doc-1.7"="13qjgjm5k9ly5wllbl5naa7pj6gmskmqgcwgkipa2gd3zninms5p"; +"beamerswitch.source-1.7"="1d9ayi5zhv8vihd6jd9lbj3z50ih640x3fm02k5qrpz6k0nv0xrn"; +"binarytree-1.01"="04q8h54dl0fmczrv6fqvvisim1mz9lnvkdmij6b3jcn60z722k84"; +"binarytree.doc-1.01"="0j8gn6mqaf1zfi9y5ahfzmywa64kzl9jxpdcdz1fl98ailbzywf3"; +"binarytree.source-1.01"="17nc2whi2nh2r17gi9jn0qya8nyfjnn6d5r10klkp42b75jff993"; +"blochsphere-1.1"="0lifkhwl8rigg1w2k915yv1r9xylsj0qnj48cx58likwanvl8s2k"; +"blochsphere.doc-1.1"="0dbh11c3fjrdypam15gjlqwf3n9wxwhjqdd1h01f2f8yams42xfl"; +"blochsphere.source-1.1"="17bkqf64qvjhbids04bm3qhghqrrwf4m2bsl3gjxxc4h6sfih259"; +"bloques-1.0"="1gr3521mxmabcwvkqxn7f0wcpcmzy5jdpypyafyklmnhc2ij6zqj"; +"bloques.doc-1.0"="1jmvan6ja2zf01lm0dmh3dg4rf1cagfniqjfrmzpxc062khf97w3"; +"blox-2.51"="0p3ci3xf1vndbdf147r9l1s68x72g7r2np6znizj3qqxd22h3wxx"; +"blox.doc-2.51"="0hskpi2wnlrrqmv0s8i4g4bh03ka18w3czvnjjvhvmf7im9wq2ha"; +"blox.source-2.51"="06zimj2liix2y0f6a35kb8q9d9asp48c58mhc3pssa185bcc7bv4"; +"bodegraph-1.4"="022m4w5rpn7n9fndddjjlyfxrwgirw5x6k7vl40nnyc8swkjwb62"; +"bodegraph.doc-1.4"="0v79v2ijgx7qs3xbsp6h1nw3rn9rry5j0qkk07bvyz5aqnzx290q"; +"bondgraph-1.0"="0ryp004w9bbphqwddprw8c3v1vndl0r34gx7ag36hlqipl6r79pm"; +"bondgraph.doc-1.0"="1hk7lp72x6skzvknhndz6f4lppamd3frl2f4dbs4hlvi4wfwjgc0"; +"bondgraphs-1.0.1"="0dhm5g508wi8r8hsk753bqflc4rvm4zi8iv0564pfsfz40fh3xnn"; +"bondgraphs.doc-1.0.1"="1wnjhyr6r7jkmxzry9my2mw8i7q2nwq26zqyfi9mh6cv3x2p8siy"; +"bondgraphs.source-1.0.1"="0qqs868saap9zsl70bwzfpmq8rnyvq2k45nc31ddzq3563djhfi7"; +"braids-2.0"="1037lf47r7w0q8j3gdxcv032vyyqvw75zacqy6p61ydp43cj587c"; +"braids.doc-2.0"="0k8r3mdimm0yqv4wkswngc2yzg3rkgvrfxgq2ny3gcndqb10gp7d"; +"braids.source-2.0"="1xf8jn4mv0ds6bcaqlr59265r83984h9kqj9bsb8h3izfbpfx7qz"; +"bxeepic-0.2"="18by54j2rg04n19whsb2zjkksrdh6f6i54fq257i2mvcp0qpxwr5"; +"bxeepic.doc-0.2"="0117dzkqs1sy8si4dbal9p5p6csskcby2swmf2911c0vbpdl51zm"; +"cachepic-1.0"="1j93lljbpwca363sjk5qmljrfq4f671kg4qrnfyv9zqcxcpyfmmg"; +"cachepic.doc-1.0"="00j7j75zq3wa6z1liy0y6wzxjv96sq5r4dh7kp9f9icmxzs0x8xy"; +"callouts-44899"="19khsdal0siv0vvj56bxgkrj7bk1yyd3lw8iz6zijchp0by6gbbr"; +"callouts.doc-44899"="18zy2yzjlgn9g2wzlc9i52x8g3dv32hvbybjkm9fmklsgnw8fang"; +"celtic-1.1"="1vg75zj6p9bhp9qg4c7nvgncs7iiki5jizx27ld26yni9m2cd0sb"; +"celtic.doc-1.1"="1llinw15fnpjshks9yzlmbi04pkn6s87jfwgpnh5vb9hfws1ira5"; +"celtic.source-1.1"="1w3wm5ci6kzpnvlaxbpqndclhxlbs4xiwq90iig98wf97b85lfi9"; +"chemfig-1.6a"="1j5m660a1pcc1cy9gkcszv402iflwc98838nrah90ww5zbnkk1d4"; +"chemfig.doc-1.6a"="0x4sawnsi06v2k4qm8fmyxx1jn1d22c42v2na99j3ay0lk5384vg"; +"circuit-macros-9.5"="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b"; +"circuit-macros.doc-9.5"="1ffj1cg743606s14nizqsl45vmp4rcir4lk29jl1wm9csw03fhxi"; +"circuitikz-1.3.3"="176mlnx0qr2hpb5vikyna5w0vzri7ba2dbhcd0mrv2akaziiwq0b"; +"circuitikz.doc-1.3.3"="0yixqi5mhwyypq03lrcsdbi2x89nmsphffkdf7zk6c26ibgdnwyp"; +"combinedgraphics-0.2.2"="12569y2i0q2lbmnwlwjfc02x0drpa3vcy58wbch4j2xzv1cih69s"; +"combinedgraphics.doc-0.2.2"="1jn4vdnlz0mwjv09ry0phbisf5zv5valwd3779cqbh1dzpnpl7lq"; +"combinedgraphics.source-0.2.2"="0xacdk2xsdlzgrxh0sa8sgjkwhwasvahgdgjjxa9p82bfjhr1f4d"; +"curve-1.16"="1h1mfx67i3d2jr6l8qlfys9m6bqzn4x1wb74cjbrkdclyqn3lmd7"; +"curve.doc-1.16"="1jv8f3izp9pvzh5qs3sh33c95v0z3wn88f278qxi0f1bc1k8990m"; +"curve.source-1.16"="0l9cq8aji7z8qh0p45af8rnz0iw9m1hgc118482x699iqrvg96y2"; +"curve2e-2.2.15"="1kxd01qfcj2ii7qics40g78xwb0d1scdlkc8a2mx2zsqyhnwgs12"; +"curve2e.doc-2.2.15"="1y75vjq25yj5pzddxgakdj8b18bq0rykfsv4j724aicmpfs8z6dl"; +"curve2e.source-2.2.15"="0dk1iksqd5chp9b221zq54n7flalwr91f6pgb2k5amwfy6i98qh3"; +"curves-1.55"="150iv654y4x5lb3njd7dfjf8i0axlpf7zz6gx4wqgq06kddjr7w7"; +"curves.doc-1.55"="1ddgy7gzw2871qsh99m0k90lgh8kf5883skcqxww0bl7b335qc8y"; +"curves.source-1.55"="1r9c0rpi7q6ishzaaw7qnil0lzqgdvc0ybmr3j083af17snkq0v6"; +"dcpic-5.0.0"="0yfjhpn8hr3yk4dyjfzbc8g7cki64039lb96naacyv8mjhqdpgyd"; +"dcpic.doc-5.0.0"="0vxqvnkxm00k0xqpllcnq01si33wyg2mkhpb7l8jxxxizn3wf5vi"; +"diagmac2-2.1"="00jzm6pdzxbg33fbj19ih813j9wvb1g9hr01g9xjc0d6nprq9mcs"; +"diagmac2.doc-2.1"="0vpm9lc33x5xyip25kay38fhld0a0z4l6g3nvhbdh65apb4j4wfs"; +"ditaa-0.9"="00ym9qcrzq9g72r5dkvqwsxig9gryizzznjfzarq9x9dvd7x1r48"; +"ditaa.doc-0.9"="13cw5a4wvv5fyknckvm6qzhl2lvaqvqvlwi711ix6zq6db3ghfsw"; +"doc-pictex.doc-24927"="0fdvqhkgi5j33rx0r4fifj69f4smn5w0n99vx90a3fw15qzxsg5y"; +"dot2texi-3.0"="0hb9mv8ai85smn9viig88f5hprj3dyj574amy9nzdr8f52lrbg2z"; +"dot2texi.doc-3.0"="0wa63gs8h9a5d94chiq1gr4lam8p0338lyqbw3bmf3ix3v1bzyvm"; +"dottex-0.6"="1ykjw55qzv5vk1wk90qddswvj3ai1s5xx674vkf5r07nw07dca76"; +"dottex.doc-0.6"="0vk0qgwvmny4fpa9d0gwg4s8z68aaiw1bn135d5msgikbkhbbmw7"; +"dottex.source-0.6"="1ph52wyv7fqri6pxsi289s7svy4p4zap1bdzbwqpbsrp6v4ngjqa"; +"dpcircling-1.0"="11qhxh5pgjyc98hnlbq8hfsb77bavs0z3yjx4809z6aypah5cd92"; +"dpcircling.doc-1.0"="1qrx0pnk1p046mx6nzjwgrfxaq1hmdgalqsp3cr6d6zgqwzsnms1"; +"dratex-15878"="02nyg30awmpp2yi4m6r9gbgz04irjzpbjhpp72j0qxzly8c8frqn"; +"dratex.doc-15878"="1a5knp5hylpb1i7hkd9160bah7pps9b0hm00zgn9fk33g5xrvhbz"; +"drs-1.1b"="17jp9fvj86sp4ywgc6j1dp3pnvgllilbq75298qamnnj3f403vlr"; +"drs.doc-1.1b"="158wkgnrgwfg2ikbj98hmcaaymrwpmnmaxillksv1b7gxmdrphk5"; +"duotenzor-1.00"="0p9gq8i6xcfg4pxdnqfswjcnc17x7pzsp4iya9b3fjq4kplqv28s"; +"duotenzor.doc-1.00"="1bc1pycds7r45c2bzmjhxs2wv0f2wqyxbycfrl6g4fycr341h8gi"; +"dynkin-diagrams-3.1415926535897932"="02s19zsjsql9qhlhf94z2smlr0j40z4rrx33iiwc54xx3j55asap"; +"dynkin-diagrams.doc-3.1415926535897932"="1gk31brjcrw88a2fb3y7jq47g9lkpr7dq7b2rmvkbwxd0yyf789i"; +"ecgdraw-0.1"="09affkfqlsrjgn546h6fkbzi4y7dy9zgf4i5a8kw6lbgl631gvid"; +"ecgdraw.doc-0.1"="1m42ngbia5ilcx6hjd0xid07vdvxmrb2vd4qmzr8bzzflj2janhf"; +"ecgdraw.source-0.1"="0825jfxsmicfqv1amnjx69wmfw893pcdqihqx7vv6yd9xs4bqciy"; +"eepic-1.1e"="07hg546cp5ab7x4zq25m7z184mvg7hyql7dsbwvgpq6hyz5pqzyq"; +"eepic.doc-1.1e"="13v8n27iw1b7qvs3baqqyls9cp2mqbycrbax7jnr8mfvp83jmpkz"; +"ellipse-1.0"="0hp6gm0na1gjxdjivxgakbkrq48mp9zblbfxxw68l2aa4jm1x1a6"; +"ellipse.doc-1.0"="0invkczwak9b89n6w8ny9bh1mg7amk418cf6b0552pb5rpkbby8m"; +"ellipse.source-1.0"="0143mncfyss0cyzq0aim8lvzxhq5q8a0cpsh92llqjl19s30d3fd"; +"endofproofwd-55643"="1dz3kfsjalq9419l9sdjws5bjisy8pmy93my8m8acdf3d4ryr11x"; +"endofproofwd.doc-55643"="1m5wq64v14cz4i29smnw742ak6sraxq9rzwcqkg40vgzsss73lxc"; +"epspdf-0.6.5"="0c6p7gqzkqdyii0jh11pvkzqjlvb7c82rpm4qh9mz8l7b9xfrzzd"; +"epspdf.doc-0.6.5"="0hdr1pvpdyxrs01438azgbj5sbysi3bxbiisdrqrlbsxvwijp7wr"; +"epspdfconversion-0.61"="0arf6kmziarh1sgani0bnp2jm8psxj937hrkaslfj8fm2s46gcmz"; +"epspdfconversion.doc-0.61"="1xpj5lymdh9w2ary36sx66ib0hwbjfbbhhcipdq4nkikq7a8zmpg"; +"esk-1.0"="007jcqvxp41h0ky25mgn2k3qdvyiyr3vj9mn6ml1zsvy1ymxq4dj"; +"esk.doc-1.0"="075wb7q7z5idhqh39isvkacpgacfcv966af904yk9ralin5fwbr0"; +"esk.source-1.0"="022n8rh8rwn9y4yx1rqpdynw2lpm8npwd45y88r2q29qcd9f62qb"; +"euflag-0.8"="168c6y6rivahj6cw377l54jsykpxaxvv3nbmr80w19d90h4sqa5l"; +"euflag.doc-0.8"="1a65rasxx88bkz3bg51bmzdbq67yphljaa8mgkp2b69fjsifm229"; +"euflag.source-0.8"="09g2gn9ci11dca9s8bgdrjaprzb66vb47ssfnj6n061glz9a244z"; +"fast-diagram-1.1"="13c2r5prb7dg05j0r4lkdz36v51zj6v5p2c7q22gfkbz1lj1s6s2"; +"fast-diagram.doc-1.1"="1f3ghs0l6mj2q3iw74rjjb12y8151cccvhww13h4kzc30vacr3r2"; +"fig4latex-0.2"="1bq3hj1gnc1g70jvrrvxsg1lkxrdnj81h08qr7hqwlwll37qlha6"; +"fig4latex.doc-0.2"="0ddaikx7qphb98xc3nswyv01d0xh5g4vf95fqsnbhg811c83jpk4"; +"figchild-1.0.0"="0ha1ca8npa8pis6dp54cn7sz08x3q5h2b113h2afifmcinv7iy6v"; +"figchild.doc-1.0.0"="096zwf8wp643dk7rkkwmksx5y4d4d168ww2csmmm87hwnnvhsznj"; +"fitbox-1.02"="0jk46rrq01bbqkwfqf1rdrzwv475mdmz4hqvbffkivnbwj1vz18g"; +"fitbox.doc-1.02"="0gb5gpdrdagilxsklq1aijr5zfl5n82nwal1h9qls0iqzjvgizka"; +"fitbox.source-1.02"="039q5as7939zc5nby6m6piz5h0zphm19hqjkdyrgzw1q4r9ypzc6"; +"flowchart-3.3"="1b6gwbnd9xjcvjxgnl6xjq6lja1a0p2xnrdlbrhs6ka6f6pnrbl2"; +"flowchart.doc-3.3"="06i32gmsqgvqgy0l0qbdjybnp4rmz2cn1c7zw76w3mhd9z220d77"; +"flowchart.source-3.3"="14ikpr9fga193y2vgr5sisvzc5scf04b1xc9hcv6zmkcph8dvnnk"; +"forest-2.1.5"="0q1xd07z1ccqrrfl3x0fg35sdv2kcyl6vgps7f6gpk5yp8j7d392"; +"forest.doc-2.1.5"="1s9i1kxd5zhdqv5xx29kh8i5fis642hcw76ya5bh94qffhwwg7j3"; +"forest.source-2.1.5"="1i6r6i8zh70zxz6sk0c9b07345vcfr9aapw8q5kzd3k76fzcqfdl"; +"elocalloc-0.03"="0jj85nyrq2y7w7pm9pq8qdj3xszg5s3a1j8zx2dvsy6a1s7mzd8i"; +"elocalloc.doc-0.03"="0rgf8vijb0dl48x4rwbzg7gd1apjs7vwl8rj7zyv60vx53zzkp5i"; +"elocalloc.source-0.03"="100hs4drnz5jy657crs8g62281sbgza7k78pvk1qfds2y8la2968"; +"environ-0.3"="0in2a7ar0c6ji7qhrbgp4bglcr2cmb9imxch8fcrwkims4g3vjp3"; +"environ.doc-0.3"="1pb6nmprhz3j9dx2h7sw0y66y1qlvhkjl3ip28bxa133fgqab148"; +"environ.source-0.3"="1jkbi2g2s13rngwqvr435i9n94ycnzp9xa8szik0nnmj482ah2hn"; +"trimspaces-1.1"="10rx6pcvwn1lzyivn312j76lsrw3lb40jgzyj861gl3r3pcls0nw"; +"trimspaces.doc-1.1"="13zf5bz4pp0lwp44kxdj1zw44h978bdpaiskbma752603jlznaqs"; +"trimspaces.source-1.1"="0nfwqm4a7c1ks5sqypkwmffqasjaw008pxjb5spr49h3sv7sp04w"; +"inlinedef-1.0"="0k6190v8lv2l96qpmh3pkblhwn6camcq83w75rz09517bnysm4yz"; +"inlinedef.doc-1.0"="0gz9m7fwcdxs6q5a33v7n32x5jr4hbxsy4j2shwv39j1j2amr1vl"; +"inlinedef.source-1.0"="007648wrb4ar04g0851yw663cvlmdyifidp854y87yzh536hfwi1"; +"pgfopts-2.1a"="0g7a22d0ppdzcazrif8yjic19lvz143p6vwflz16p6zh88yhcdm7"; +"pgfopts.doc-2.1a"="17q1mlaql7f510pz86n64sm4m97nii72jghf75qs5yr9h9lqrq6v"; +"pgfopts.source-2.1a"="1mz5nzbhmbgzjkpkglz2w3s9s8kzrigg3wrd91dmdhjsm4d4kczi"; +"genealogytree-2.01"="01z2gfczggyhm7anfiax6w9d0da2ph8xxx13yc9agnshv1p5x28n"; +"genealogytree.doc-2.01"="0q3yd8ljwzqhnxid8xpzgd35hn80jm67vdjw6nvkad5nb2z112m7"; +"getmap-1.11"="158fwravmqda1zwzw6qzvq7lrd1xsjm9cdw3qgif2jjq6zsrnjqd"; +"getmap.doc-1.11"="0s9djdlchnp6w7wr7w2b4jj6iq3v6f8r1ri5kbp5q3hfshjgah22"; +"gincltex-0.3"="0w1pk80idhws2yva3zvlbnwy2xbrqa0dckhwj8d9sdqxn5j2va4a"; +"gincltex.doc-0.3"="0zdv33r7r6x39p80jwjxk4k2yi4rqyv9w3nzkn7si5ckw223gz4a"; +"gincltex.source-0.3"="0m1yd9b6qlbmrxqnyk7kgxx7227zy6v10sf1vw856gpx1r6xbc22"; +"gnuplottex-0.9.5"="1ck4r4inr8ac82p0r8062z3hwf9187sv43ym9586sk3ip6kqb3yj"; +"gnuplottex.doc-0.9.5"="198g23i6k5f353w2aa9f9cw6cj8b4f93nsk7iq2hvhvk6ia876vx"; +"gnuplottex.source-0.9.5"="0iz43zdvzfs7spc6zvgclyh0vjnzkwcixgk5mg2a3wrig8r4q6fq"; +"gradientframe-0.2"="0c77ymahnfqix4h3i5q8fyzra5vr1fc2rygycwsz9zrf332ca5qw"; +"gradientframe.doc-0.2"="15lf5hlw760cqwqjf91wjzfbplp5npv586k967bpzm17pkmw6pqq"; +"gradientframe.source-0.2"="022x1whvyd9gqw2kj3m8pncn0m0c839bdwysw4sq5xx9nw6ixib2"; +"grafcet-1.3.5"="0yz1f2p8dn3a1ws5skmznbd4ih9bri6r7vr6rx3zcspmad1fjg4d"; +"grafcet.doc-1.3.5"="0inzw5cw5759c4l3ikzgn0zx47b0l575yjpz2613fh9l5ys800nl"; +"graph35-0.1.1"="0xa99vmdhmh77dyr63a3rqz79mr6lxa1sq74x8d9sj041gdmryq4"; +"graph35.doc-0.1.1"="08h1v6f44z3m31qdgb4b8p2z4d331d8ccqxii85dzmih25w9jwvh"; +"graph35.source-0.1.1"="14ch24l1prmpwfv7bwd8l96c8mf0cwdwlmz37br0b2qcb4kbjr95"; +"graphicxpsd-1.2"="1fganh87hpkac141i4c8f5bw06sfhy3qs14blx466h1nmc6308az"; +"graphicxpsd.doc-1.2"="12d820bdrnlq0v6rzd72icvac73vq7b7sq2kq0nab05xsdi2418c"; +"graphviz-0.94"="1gpl57lb4wkysxdhvqajzxjb4w0m5nxdxi841dzg0sg2igchfab6"; +"graphviz.doc-0.94"="09aa9yl3zmcc5vlvjvgaxfmhj83qk4wgp4fx90bgn28kxnzhicxx"; +"graphviz.source-0.94"="1w878b21va1y0mz08wr7mgdxl09hmbmxbzfnpv2mdqyy01lwpzks"; +"gtrlib-largetrees-1.2b"="0l0fqpw6sd1gg3da8s7wz324q5bdd9l80zxg835gfw0vvrn912im"; +"gtrlib-largetrees.doc-1.2b"="1mq4pbmsfvm4y7g4ar3a438469yy6x4ciksrns05dnkk54adyyj8"; +"gtrlib-largetrees.source-1.2b"="02x48sgx6vfwbdvgj0f5b9sc0kmkwcl6jyqzv0ascc77av9w41na"; +"harveyballs-1.1"="0d3wc82qamnc2pivkr23njai42vbn7xip2rlsj4kc8p75zh9da3h"; +"harveyballs.doc-1.1"="1792wp7zx6a9f19lplca1b7pdyf8zjvqndl26s84sfv3w4fmbr8z"; +"here-16135"="1l6xh4jl2nipnswdn78378vhr41ikj7qk07j7iaqkyigk5ndl0vx"; +"here.doc-16135"="0i454862gik3jy1g3v21laf8qag2cadvapqz0mn68hl9ymly4b13"; +"hf-tikz-0.3a"="13232m6hybqv16f6v0bmgiyfqdfj407mn0h4m9wgh9pzwy3g1rmz"; +"hf-tikz.doc-0.3a"="070h5rdgfffjs8sb2gaximsqjzby2vcf9ffvpljkd3jzc8rznlbm"; +"hf-tikz.source-0.3a"="1df36m347jl9640jig0qrk445s0gxyk6rl74i19xxv567bxh9n69"; +"hobby-1.8"="02p8xxqxkq486dxz2fy3vghm9qnc13pznz84w3grn1b1cys1sbmv"; +"hobby.doc-1.8"="08q2nn1av4wcqnlacjjh6bgbx57qrc9vigb695x5zrrydcqdac0g"; +"hobby.source-1.8"="1pbzsba0z0i3zf9np60fjx0wvpvimslal8xq15pf5p9lrjq946r5"; +"hvfloat-2.19"="1575cs79d6pcnf6a2g9bvlijrqz2kxskly4771j9haa4gg9g8gnw"; +"hvfloat.doc-2.19"="0ha1lnzsy9yh6qv78wdpv9zgqyzn4dxc8rn2lb2j4nfdwcciards"; +"istgame-2.0"="0zr94dl9q3whjlsjmkcdjyhxndcj4dx0d2ynm21inksavhxc9xbs"; +"istgame.doc-2.0"="1a0xrxblfh2kz1bx3iqw908cifhh0gwvxxpxcfrvjsilzbd6hc7w"; +"kblocks-2.0"="001mn33pf532iwp3d8likhbc5a4nsgq72dirbilbdgaxqxndmx12"; +"kblocks.doc-2.0"="14qyg0sqrr5b04j2ramw9zcfhbgmc9qfyy5im9la4id4b4zxrk25"; +"knitting-3.0"="10x5yxlrnj67gzd5kz7fvnz0nykvvi26sdm7i3n3d0si1vjzvczs"; +"knitting.doc-3.0"="1zm6s0rd3zkir9vxvbc37big9ygnyhcqpr4p306vqavvmf5g7p57"; +"knittingpattern-17205"="1ydq16bmviqkbf9zkrlxsh33bfn8nmyzbbi1xwfd7nsg1bhdf6d1"; +"knittingpattern.doc-17205"="1x1bswn2sd1w19g1szc573zayk43zi3718a9yqfzqnxa0qxvxsqd"; +"ladder-44394"="0a2sxy3rvc4w4a625wa000g4mjm00d8fpjff49v08kw1ddadv6fh"; +"ladder.doc-44394"="16dg0nz4k3491mj7ccvw32r71vyjz2hdgdh4xgs7p3n9jg4jdp95"; +"lapdf-1.1"="1lfmn6axzbfk03j6f12yqa0vy3gzvw1ylpq7k2ki4prb3zwhx9sx"; +"lapdf.doc-1.1"="0h9wy3amir9wdqv0b8678mfmcd172zll9p5v7sf1l0w3zlbw5msy"; +"latex-make-2.4.2"="0xsickz9392cgsq4jrbil9k6d1xk1dlgq7d4mfmw36lxgkwgkhks"; +"latex-make.doc-2.4.2"="0asg616gsk2dv6mlz79mj9glg8w1nim58qdrwkhnbr7ibwyplxn6"; +"latex-make.source-2.4.2"="02d0d09wy1zvsqv6w8nb07b5yy5lrfp3igxzf3prxyxlrzy6zdjy"; +"lpic-0.8"="0axszk7cpnc58rs7w7pwy3vpj39l6zc27g8lfxjzkzlnc8hbnycd"; +"lpic.doc-0.8"="0hyg9v30h6n38j8a4pbqfjxkqfc9ls3hcp1cf8n8dwr3ajyhvins"; +"lroundrect-1.0"="0s44pbvm6iwl2jyffnxriqlmpp6zs1y70z4aix8wwfasx86gq131"; +"lroundrect.doc-1.0"="01ncbhr1x995763d1dnarhy56d7mq3r8k1b56whqs6kq55115w2w"; +"lroundrect.source-1.0"="1sh8ypnfq4pwaqd934vdh77svs9d3a4114vghg6m4sz5fxh11i39"; +"luamesh-0.6"="1di01y6p60r52nr8jqlgrj9sf1fcc4mhkzlf2fjx533ss6qsm7si"; +"luamesh.doc-0.6"="0ybcj2yny2ljd1kzb4waf01h0w0n1wk8r77dv4a74v60px99k6km"; +"luasseq-37877"="0z0p4a0cr7id3i3wfbg0r7p20d742980k7mipiawqs8a3b18x0g8"; +"luasseq.doc-37877"="07chcsawrnayyskhf5x4bm5mdz7c71prh4176gg18ym9jf7kpvjp"; +"luasseq.source-37877"="0jdq2nrsc1svjcbx34r6n38zl1a8nf74wb9hf9nr89a2mdl3aj71"; +"maker-1.0"="1fymg22y0w2kghmqh5pgxkrncdcbbmhhxappc72g5q337hcky0xa"; +"maker.doc-1.0"="1yz72c1ghqjs06nagngpp2q62gh67c3klwm73bcbc090vdfkw7mf"; +"makeshape-2.1"="1fy1ccz3707f8wxilh95k8sc3a93gl93qcpvpxl833mbkamkx3kj"; +"makeshape.doc-2.1"="17dnkldg0v2qp3hdy4bw1k48p8xx3v566pm088g8qb0df6kx4217"; +"makeshape.source-2.1"="1yd3ssh3cpy54gm0nkp2ah0nqarbnk9hqw2kkwdf96dj8vjlsgwd"; +"mathspic-1.13"="104vf0cbxhfbgabxjpypyx16fbpyi05k14dhw5ynmlh4rv3ck7li"; +"mathspic.doc-1.13"="10j7z7yb5fjqlldf8w5sm5kic6v842dijd7f4v0b2q5h1gbhwyim"; +"mercatormap-1.02"="1gw28rgsdllh8h9cg70nayj12aqw356svv34lhvfj5b52y7ykabs"; +"mercatormap.doc-1.02"="0v9v54qz9m9hnfid2k9xl7fwgwhjxnk0g7wndxypd73b63mvfhpi"; +"milsymb-1.02"="04r9xbgsc8w783zf8nn5d6c5fiwmzhlqdw5a36wk7l9ll2rvbvgd"; +"milsymb.doc-1.02"="14wj7l4bykfy8nsayl105g61xc8zvnrvd13mbcd1qv9x5j8vvp4d"; +"miniplot-17483"="1hl5nd6p9c1xhm1kpw9sh1s81ymdy8lxfn7wh1sdvildcvclvd4q"; +"miniplot.doc-17483"="068s76gnva6rsnd7gfwswxfam56dbiw9s9ymqr2hcqx7i4dl87x4"; +"mkpic-1.02"="0sib2pckayb4i7lxga35rkxvy05ix6idifcqrlcbmddfix3djrzp"; +"mkpic.doc-1.02"="11pj8q1zvblsc2dyd68a0nri9zpqzrp9a6lha5dk91a2aygzaf87"; +"modiagram-0.3a"="1d3sz2yxc1n3xk6haja2yz14jgcl15pp21y985h7dflk2yjflabx"; +"modiagram.doc-0.3a"="1a42ylnkigyvvkk0yrxcpypz1qlki9r4jzpy6lpky0fa6bfbl4yc"; +"neuralnetwork-1.0"="0rhvhk46z3wgz5w7xrbmlmgk2px8mvajbrrj4ygpqa58g37wl0v7"; +"neuralnetwork.doc-1.0"="1apv7bhss9ilqcm5fxwg83gxm9i8563671jcsmhkl13gcii1lpv8"; +"nl-interval-1.0"="1lrj178yhmd4ajwvpdlbsr97sg39k39b8n30wib0ww2lagyw6rgq"; +"nl-interval.doc-1.0"="0b439r5r8zzhgd5k0n1bzag3naxs2bjd6hlm3sw60viq8fs5wgy0"; +"numericplots-2.0.2"="1c127aalh7jcx9rxhsyhi2k1qdz6fg8d6qj0kvf564s9c0npgar6"; +"numericplots.doc-2.0.2"="045z6l4dmn3bzfsn7gi6bdhwvp3cbf9nj8fcs6q07vi4by71bk98"; +"pb-diagram-5.0"="07l8172hqnv9dq6qg1ipbjjbmkpv7s589gci6q82zb8a0y6kyqvy"; +"pb-diagram.doc-5.0"="05h5i0b1y03j5y0nf8iv8hb5qnq1lh5a55nn8xggx2rknnq0d1b9"; +"penrose-1.4"="0swjzbd10xvab086m7zjbxgq0jjzrxds534rsv6nkmsm3zr9qdfg"; +"penrose.doc-1.4"="1xmylw0prazylvqmqklhpfxhwy6wvbz9jln1cyd23m66297f8q66"; +"penrose.source-1.4"="1l9x5l78zcgrqf9xi1w518j6l24zbb6mh51fv3g7xcymr6miljvk"; +"petri-nets-39165"="1hi46pzd5cjvpakya2bl52w7m84xm8h03m01jfrry3vnp9hqbc11"; +"petri-nets.doc-39165"="0ixpads25k51rlb2kapxgv75w5igbnv5isn61c29qpm51dpaq012"; +"pgf-blur-1.02"="1w9p9l2nw9bf0rhn70y70h6lqqqx3qravgarmmz1z86ara26k49w"; +"pgf-blur.doc-1.02"="0fq1w85wqqrml9jzi7s2n888165pg4ds8ysvgh56kbkd2zzahnw3"; +"pgf-blur.source-1.02"="1pc8x23l6qcq356s843si16yc6yfrvdxg7v821271dndkg7d2vvh"; +"pgf-cmykshadings-1.2"="1v9cpsh206r45hjn53hvxixi3kh3l094xgj5yq9vqsviiprassd2"; +"pgf-cmykshadings.doc-1.2"="07p9glm33cz2dk4891r338z45y1wqbfbmmdk51if8jaq52dp9w18"; +"pgf-cmykshadings.source-1.2"="1fpa9iqc6rz6j9qja43yfhrcahgg21ij3jscbpsvwq5iy7j96n46"; +"pgf-pie-0.3"="1n98jvahq7sd19vxhzmg7pz6cr796k8r8dgb7p05r4znxaq5k520"; +"pgf-pie.doc-0.3"="0qlpzxpl4r8g59297xldndryw2al05sbwnsycnpv904jllypsi83"; +"pgf-soroban-1.1"="1y1c70a9v9zy8i58j19g5c8nc7f00zcdrdjmdcbm19r8vi2r09fr"; +"pgf-soroban.doc-1.1"="1r1rgd313fijmjqy468j25d55p76vxmcrgkp968riknych16y1pl"; +"pgf-spectra-2.0.0"="174in1jgiy165dqpqvm6gqwcpz2nlr6s7garwvqqrwphjsj766g2"; +"pgf-spectra.doc-2.0.0"="1jbhxjqqxkcnh8svzpk37lfnyvq1fm70zdnvvghbssy76940340a"; +"pgf-umlcd-0.2.1.1"="0dd5llczfvn64kp6iqfmlgig1g9lsryz078hz2rakjfzlhbbvgdr"; +"pgf-umlcd.doc-0.2.1.1"="086qcz59zznqg7a40l8y2hi7ijajkwq3ppfbckl65niz0rmqzjhn"; +"pgf-umlsd-0.7"="0rs0iskzhmlgydk4i9idql66sk9dyiqrglp429b2sjaw0mbjyxvz"; +"pgf-umlsd.doc-0.7"="0vl7wjrgnfz0y0pfp4izqi1528i81fssak85w1sl2n97lhyq8mkk"; +"pgfgantt-5.0"="18snhw1hvff64xq6jaq6wjdxcrkjwjv39hif31zj2r0ghsajqaqs"; +"pgfgantt.doc-5.0"="1xhls9kyhf314rrmd8r3065qaffbm48mc746lwhsrh6vmq548baq"; +"pgfgantt.source-5.0"="0hgjiy1gs8nx0211ar38qr3ql5yx32mcdvms0yibpglr2ncv4x39"; +"pgfkeyx-0.0.1"="0gh229dsrbxw6brfz5m2zz6x3zfsa03iqps5bgcr4bz0qfjl0a2s"; +"pgfkeyx.doc-0.0.1"="1cbldr5x9n649sk9dfcp143jrzxh6l4ibzndx4yr8f7id5nx3nag"; +"pgfmolbio-0.21"="1arhxgwpsw9ifj3yy36mv52r8843bm3v1lrda17r44zjf4fhimfk"; +"pgfmolbio.doc-0.21"="0kxp1gqd09q5h4ixjlfmda9jm25wd3s7dsxcqc32sw3qay4d84cp"; +"pgfmolbio.source-0.21"="0lxbszlky3q27cyzfnnvglmzim4lfjh14p62j43sj5w2arv9w3v7"; +"pgfmorepages-1.20"="0xarflkdk2xvfmmsafv1hhpdrfyddjxlqjjwps9yzzcwblpjnali"; +"pgfmorepages.doc-1.20"="1wsa6iqyrcjq7zyanjgaq6a1i5d7lm1bk9y07mz0bjwc2yv359zi"; +"pgfornament-1.2"="0hvr6cbp4mzajmqz6fyd3x7qr9b2vlwdhkpc62axgm2sww8igp70"; +"pgfornament.doc-1.2"="0i1fncv9saflkvib43jp02mh94cv0nnq6k8psrf4l1yx95sdxnky"; +"pgfplots-1.17"="0hdr9ykdy7vl2gjxakcs0wziqvpn192hx1msj1fxsa7mg29nflfm"; +"pgfplots.doc-1.17"="1dybzp5icvg2i23kqx9pp1lzmhf7vnznb88y708v2a6xm1lzf686"; +"pgfplots.source-1.17"="0sjfj0zg91s5gq8fs88p16h60zxs07nmfwshb494q2bwcsf3br7p"; +"picinpar-1.2a"="1hw5yx5pwz92mfxd5z1fr91dv3dbsqq1522xkflc8kjwl72qmmk3"; +"picinpar.doc-1.2a"="1h4z08ws3r1kfrfg2qz47zsv26hb92qv1gd3bi7f7jidczvnwgph"; +"pict2e-0.4b"="02rhm6a26vgpscasrbz25vjimlnkh9s18pq6a9025k65iwp5f08z"; +"pict2e.doc-0.4b"="15k5w2l4c9mxay416bgj745g45pqyaw749mn69dchg2pqh77yz1j"; +"pict2e.source-0.4b"="007yb70j4ay0qdls8kqb4wxf1g3672yasjjlqc10zsywc005f0nw"; +"pictex-1.1"="029xdg1c8g9xxycsbx0av6ir3pxn13pbjvwfmckrsd7gspcf2j2n"; +"pictex.doc-1.1"="11p0ypwhf7yvjmydn6g9f5d7i9jlm0ic14ljkkhksw7v19w4aahf"; +"pictex2-15878"="1qqf08yharknq6csk01jdff62mg011bryqlq5mbmjwqwh7wxs0wy"; +"pinlabel-1.2"="0dlg15b6cjykp481xn03kg3p1zqwccwnm2la710xdwf87p1k4bp6"; +"pinlabel.doc-1.2"="0jw94fl3awpyla0flmw9f72j3ssrqh1scfrbx34mxlbmnl4z3pfc"; +"pixelart-0.2.0"="0pv055wzvaj7zymqnb9zd2fzvbb4c7my1kablpldirksp1wh15xl"; +"pixelart.doc-0.2.0"="0ak3djrw28lqrc6bgmfziqcpbbhz05qi8shvlxy41l3hjiy6mycx"; +"pixelart.source-0.2.0"="0nmbvm8z8j5q3ghggkxk6y2b3syq2wyqws5n44wmsk6p3kvsiczw"; +"pmgraph-1.0"="0mrvf2r4bv4qa9pzv90ardy5ncq2kgy3y89pgr1acsm5cspgryr5"; +"pmgraph.doc-1.0"="1pizlqyb0n20apwb6rvh6yfncyxnh6vfhnvc10il9j4894rii6mw"; +"postage-1.0"="10s3lcypskq2qmlyqcgldkg4i4a4qbbqn27v6cr6h3j4z93zir3x"; +"postage.doc-1.0"="1zy7hrrwmdlr3vib8i8vliznri4p8dhfgkz0fx5qgc3ji15ks095"; +"postage.source-1.0"="0h89r91diqwc1z9wzvbsynazv5k9spg2rfvg39kzb83lipxiqwjf"; +"prerex-54512"="0nri97arzym6z3pjzidlr6svyk1dpr4yrlgqzh2jcsrqhwliifwl"; +"prerex.doc-54512"="1wcf96nc4zvmydn9d628s9bffq3lnhnllci0v9pci03cs5p1zscz"; +"productbox-1.1"="1idarj7sxqkqzlnwaqv9f192r228fclilz01fjy444ly765k0cbk"; +"productbox.doc-1.1"="1pzba2ymna70gflrnw6hs35dgkv17qfjs8gh4g6van44wjykhfvg"; +"productbox.source-1.1"="1fnqp2sx0wmyd9130j5zbqw2dk1nkajp4qs46qm47b90wga8pkkj"; +"ptolemaicastronomy-1.0"="13zs1n17jsiaavw98g2ggfrmb4pbd48qscqb918shai2ffkpx8lw"; +"ptolemaicastronomy.doc-1.0"="1r0c5rixwam85wchqhf405h7mwim88616ycy1i4zv03hby18156a"; +"ptolemaicastronomy.source-1.0"="1aacl5pvqww0j2kvk7k5ikn43qhj2pqsxh47kid443g56hclkzwf"; +"puyotikz-1.0.1"="04s6878wblhz3m7xc7zgqv0ziwx76r22c4sa974ismfqjbdh6xdc"; +"puyotikz.doc-1.0.1"="0wikdmv19kj62vc5bd0n2dl91cqg44lwlfs41nw808hnk96a02q3"; +"pxpgfmark-0.2"="0mkcc99fwi8n63fghw3mz2alhgpakc3hqyd40s2fpwisvh15rbbr"; +"pxpgfmark.doc-0.2"="16sapygswd6mr0pr04c86jzngw6gdf62bgv2xlrfzfpq7cnjafxb"; +"pxpic-1.2"="0ny14rjzj9vidwkgkcx1jn66m3gk1ppbr62vafgcfy8mlrj6hnjv"; +"pxpic.doc-1.2"="1d0f0zqq2l774rv5f6844xcfci9pls428i86xy85z3hgfmjzcjh1"; +"pxpic.source-1.2"="1fk1mqscrz7la2b6pgrwcsll6pdm9p02hwgkca2yjjnfwdz5l44b"; +"qcircuit-2.6.0"="0vxsppwbmhh03mq9k3zb2hgl3628q4i51dz98j2s73z19693266a"; +"qcircuit.doc-2.6.0"="0571vlvpvmpjhjbbrd1ybzckhfy7ymralr017d09kf9p5gk0y677"; +"qrcode-1.51"="0vs5sg5hch0c2rxy27yiy1c543l2fnqinr8nvsyr288fja0pfrig"; +"qrcode.doc-1.51"="1rmwz89yxlgrypmki8xanqc3xxm10m9zc2shh5r0fzwmsfssri9r"; +"qrcode.source-1.51"="115wlgvpxx0vkb9d4gfwbqamk7sfmcfd11hxbfr8khd5hv8asvpi"; +"quantikz-0.9.6"="12g2vq2sckjidabs2ivi1r87mzj2rvqk89632szgr8vccjjk7yqb"; +"quantikz.doc-0.9.6"="0ckdbfx2fz0kjja2sanhmmrr61ald26gw4v5d4fw4bqrph8mpbq9"; +"randbild-0.2"="07ix44c2zm185byn868bmm6fcbwq9q37h31brfa4839hpklg41pp"; +"randbild.doc-0.2"="1cpyzrmswxawxk6x2vfjy7y8qj3mjrxgmr9lgjvz11f5fvvdb0i0"; +"randbild.source-0.2"="0yzz5awhhw52zg877nl76410a4q6gy7mrri0hccicj529kk0d1x5"; +"randomwalk-0.6"="10ivivbyrxm50svqdhv9lm623pvmnifpwpnbhpmx2nvf4crxxbcm"; +"randomwalk.doc-0.6"="1lvff00h8c2fxyf7if1d2xqkk87lb6396w6mb4yfxwsk0j8j2jhf"; +"randomwalk.source-0.6"="169x0wy0k91kmfbisqh4ciz8n4knhkxmz2d227gzwbf80sr2a80y"; +"realhats-5.0"="1afqmzxnp3bagbhwp6xl8155snqh29r60iy6vaqk212nr7l66jfa"; +"realhats.doc-5.0"="0h1n9p7pzdj38cd1s6s1cw784xrhkidrdangn2zfk8sallj0xv0b"; +"realhats.source-5.0"="13knaq4jzjd3f6fhvayfzva61svkra12z4wfiiwii5wdk60pi0rm"; +"reotex-1.1"="113nfw6md0v4522n54q63smd2g2iwm89qsqld237f32r3rdkbcl0"; +"reotex.doc-1.1"="0lapzgfp019a7qihfhf1cp2szwq98j8kmcy80c3gf1fa1x0c3x1q"; +"rviewport-1.0"="06nc81iapfymbp0kxfk0srpxilfhk94xwhslv6az8n5a3bvp2mq5"; +"rviewport.doc-1.0"="1m4xvkafdf2skhclg60fjgvyd6vd5y9jrn3186q0hdi66pa7dl66"; +"rviewport.source-1.0"="1hijca49b0cvh3w8dqwng6wdssmg2fjjj7ga9ifmziznb2k4qng6"; +"sa-tikz-0.7a"="1hmxifd6zkq4scfwybz0j4za911r76v56pczgym1shx8lqadsjcx"; +"sa-tikz.doc-0.7a"="16yjn7zpfwsnwg0mpqzwqrlz6v2bf1gf7qd9hhj28kzp0qgdnka6"; +"schemabloc-1.5"="0bpcrivkkwqb6kg09rkwhqzmc101c64g1j5kicfp11r9ha1fbwc5"; +"schemabloc.doc-1.5"="0cvbwk285i01brrbpalclm0bfhxs4hnngrmn9aw42ywdi44ls624"; +"scratch-0.41"="1gd2yq2w2v7n3kfsid71qv2v5q1rvpfm49rsk4815pk4k16kxhg9"; +"scratch.doc-0.41"="0jhy08h2v2qf3p8dvh8mz5yqqrdzxnzlx1p50ng7xn88d9ihpqdb"; +"scratch3-0.18"="0z7adggc9lc9j98ljpgfz36ys0bz2119cmfxdyx8gljaray22w70"; +"scratch3.doc-0.18"="1687l1infxryaf6hngfgm72wx2xqzn48ka4si18x4acj79nqipz3"; +"scsnowman-1.2d"="0991pn476g7pqhj6njgyal21fn0k5ig3c0bwzv2vfric6v52nk9g"; +"scsnowman.doc-1.2d"="0kn1dhgq8qkfvfhg4ip2zsz6x3w31ax92nwypcg9scd1p5s125r7"; +"setdeck-0.1"="149m9s33isx98vkl3498ywjy6f9q31jkw8schc16hxxm1z0jadnh"; +"setdeck.doc-0.1"="1rp64i0nrrxn7l2g6dlcmfvwbq3rg62h2ifxrzfp3k5ifnlkhpz1"; +"signchart-1.01"="1qg1r76v1llj68iqk5imp7f63774ky68sv64xa6j4w52jkkswn1v"; +"signchart.doc-1.01"="0scpaw7l26fcqylcqspd0g5va331yf88a8wc69diw78haywwgp4f"; +"signchart.source-1.01"="1lx77qldn3d23dvs11giircs2pafm54094h6ipxlc4g39g7xc0zl"; +"simpleoptics-1.1.1"="051635sr8yp7n44hw9wza6hw0b4av87yp42wkxwq0rshxldqgsq6"; +"simpleoptics.doc-1.1.1"="1lwk3qq1rgkgi7qd8qxdjjfrnk44c1gj4vl01m1jl181dxjs7lp2"; +"smartdiagram-0.3b"="0b9rq06c0xm9dpd6yljvgay0p7xpglpddw10vlf5c50wma4xqjda"; +"smartdiagram.doc-0.3b"="1gkgpgnsyxv9nmhnpalshf23g0iz7bcp4agkh7l368j2h48d5xmm"; +"smartdiagram.source-0.3b"="0chpnchdqvljj7h44ybpkln3b7kjzr7b18cj2qhj66ng9cwpywwd"; +"spath3-2.4"="1aq6vfhwkvqgjbyfv7x29dwr5iiby3iswsbw33pj351hzjp78a9k"; +"spath3.doc-2.4"="0xbhh91d0rwzhjwlmnrcszva6z4h8cnvnv6di31k6s5cs0akla1n"; +"spath3.source-2.4"="140g4blf80szkkyc7l2lpz8vcd1q32slha9d6wh4f02akg5kx157"; +"spectralsequences-1.2.2"="1sgrasl22ifbmgl483kg6zaknabwjszpjrjfb8jx6ii2ns6cvgd3"; +"spectralsequences.doc-1.2.2"="1k258c12k1jm2ignq7h09g4y8i3iq8k5wmw1dyi6ppwpc3i6fpd5"; +"swimgraf-25446"="065y4xxg85kdcv3gwp4xiqd1xdxjkng9xkdyvlk61zfjv5pks03r"; +"swimgraf.doc-25446"="17qxnzimwb828pby8mx2xlmjd2lnnpd60rdn45455x8zfxdll3s1"; +"syntaxdi-0.8.2"="11l8609xj9gz2zkd6b0ah41lgw4qhrvdjj47vwpzb4sb1sirsfgw"; +"syntaxdi.doc-0.8.2"="04hnwc8hc4z88wxrp81balza27xjj56ymv4wb8lvl7kg0087ldw2"; +"table-fct-1.1"="1kpmd1qynxq29aanvaanq35ihiv0d55k6wamxdz3lssicrn3f2vr"; +"table-fct.doc-1.1"="06jr9wmjppzd9m0d8hgmchnf78k8r7cxiqlyf3i6apdhjf6hcxiz"; +"texdraw-v2r3"="14vg45kci5pffvwdqnnb0dv3fznfaay3rg0fjiwfill24ifms14s"; +"texdraw.doc-v2r3"="0mz605k5n9angywvay4nck8ixq36gpbmixqa742a3ch2cr66ddkw"; +"ticollege-1.0"="1mivwaf3ngmdr1zdkl9xif1rl4fy0b062r43064645idpkk4120d"; +"ticollege.doc-1.0"="0xy35cggk34ziagi1m60ymckknls2wwil0wdzlswn0aw2zca9lc7"; +"tikz-3dplot-25087"="06ij3bk1aham4iv0wm14z9dhcq1v60qiv9n6idfcmjqz6m05cdf8"; +"tikz-3dplot.doc-25087"="1mq9drqg2z9khxfylsgpz32binla5abq88938jcjk9y21d46r31h"; +"tikz-among-us-1.1.0"="1w2afhv7qs9n77bfy0mybg59hhca7vxzmy831rzj8lxlzlla21f5"; +"tikz-among-us.doc-1.1.0"="13bkmfbwgjpw0q2d5c2wi6hlz0v634yiq220m7y1zh25kxnn69c8"; +"tikz-bayesnet-0.1"="1sdal5mq1s3xkklj09hy0j41xymprmh78z3923f55bg0kzdc2i0v"; +"tikz-bayesnet.doc-0.1"="0kwlqx1bys43hzwpwj8snrn5693grfih18fcw3d74a6x7s5k0h8m"; +"tikz-bbox-0.1"="023xrf65s1c4g63ggpmsdyckp6zspgjz1ad7pk7jf56zdnhqaxb1"; +"tikz-bbox.doc-0.1"="0ilj988mh0w1ws8ancnxsz0ig4s5k0yi3ywihn6vsk3z94k51yfm"; +"tikz-cd-0.9f"="0il2dpd5fmwvvhmzrq2zcdxqbcl4jsq2gh06hjq90mf9l6ybrgvy"; +"tikz-cd.doc-0.9f"="1v8nhl4q48gjig1z25ba73wwaxh4mfpfl8di9fsrcdisdfdvqk6d"; +"tikz-dependency-1.2"="0v471rprwnqlhwvx0lqxvpsgh8ph16lbvrpcrynx2hx71n9daqla"; +"tikz-dependency.doc-1.2"="0h3mnxwcb1k1ilw9pi1xcwmryjpci0kwlaqfxx2i8lcggsdrxfxi"; +"tikz-dimline-1.0"="0mp6xg317m0dkrw73609xdn7r9hbf8bdmyp0bdj2xzpynpvxisxd"; +"tikz-dimline.doc-1.0"="05rikgrm1f0f0rx7ir1nn4cy3a93bwrck2xqnms26dg4dqddnrbk"; +"tikz-feynhand-1.1.0"="16bb4h6wbmyv9mz68sywgw18h2dcyxkmkcyjjshkbagimf3ikb58"; +"tikz-feynhand.doc-1.1.0"="15h182ywc8ihahv76khphah6awpahbsrdi0hin578jmg1582rzp4"; +"tikz-feynman-1.1.0"="1kh3riwk5iksldsg6ljk27lhh6fka473k958q9781m65isdzhwa9"; +"tikz-feynman.doc-1.1.0"="0cjl1zvn2q39khh4afzvh6nh8dlhrkd6vn3i8n2ywv4xldpb2k0b"; +"tikz-imagelabels-0.2"="1xg2malb3ybgcvmr1gksgg93i4d8fvr7pqjky1b98n0abfxybxv9"; +"tikz-imagelabels.doc-0.2"="1fqkzfbbm4ckbjpgjrg5fa9ggam2lcy5gzvnhc4njyjxwx1hjcsd"; +"tikz-imagelabels.source-0.2"="0cqcbwccfq65zsbnkcdjfqwj9h8ndjhan1ghnzp9by8z41qj2fvv"; +"tikz-inet-0.1"="02xbywhzzkiica13d2dzingz9qm2v1w3fjrj9kbjn9q9fmw2xw64"; +"tikz-inet.doc-0.1"="15mvq4gpd22nah4p84dazld4ncdshygmffz7sx42s2zqyjwrm6wi"; +"tikz-kalender-0.4f"="0lkvvwzfilmhcamy00jdfrwhxr75d3jzppyhvvb26ymnzm6v1inv"; +"tikz-kalender.doc-0.4f"="1pxc1wii1hqmhr42yskil16ahjslkn7y6q8qj8hbq85y7ymm3lxi"; +"tikz-karnaugh-1.2"="0qabbn2hs4wp5pkzpjrr6g26nd8qmykljy4j46snm36ixj600lfy"; +"tikz-karnaugh.doc-1.2"="0z974a95hc2z72brn7nd5c42b2rdhf40sag725m5bi504v1sz0gs"; +"tikz-ladder-1.1"="0a1bbsfk9dqdmp5y3qgc2i9r9fl3wdj4fbag7yisxlgrh447k4nj"; +"tikz-ladder.doc-1.1"="15pjhbyfwr6029bnkilx35wz1nc07440zy6w0wg3fhaa1ynn5jnn"; +"tikz-lake-fig-1.0"="0miw1aws614ffb4q8szr6zh5rb0216hz1scl50ambx1qv97azsgm"; +"tikz-lake-fig.doc-1.0"="14yb48ylr5rv4n6ikqh704vvzxx8k68l8ww2vnv9lx5nl2nhybp7"; +"tikz-layers-0.9"="1ym859l9bzzd2rack9kcbckzbpmqxyglaa0jggpf3hlbsgzy33h6"; +"tikz-layers.doc-0.9"="1lnlfl8k4czvxz1vyfmnqk3k1arc7jpw7cbgrnh5xbanhvyjfzl0"; +"tikz-nef-0.1"="1i1l0rk7k6kc9vyx9jbpj25bkl77ml5ay1wvwff7a51rr8c87s99"; +"tikz-nef.doc-0.1"="1nsbycqfai72xbrzy6vz7lzpywdavbcyz7x3h1kfhby10s2h136k"; +"tikz-network-1.1"="1mf196mmkg097slc5aslpjlpih2kdq5wkmcpznsyhg7s20mf11yy"; +"tikz-network.doc-1.1"="05dzfw2x5j1i3534qmhp6wcymba5mwilv2vf7vrw5fmrgd4h1gy2"; +"tikz-opm-0.1.1"="04ch55a4jvvif7c74s8bbsq0bkw3v3zjh6wdlmij30cfyxn114jg"; +"tikz-opm.doc-0.1.1"="0ajrvamsj1is4lh0xf25wjylnjg8kd02b7kwj40nq1kawnp0hlxb"; +"tikz-optics-0.2.3"="0r5z7vp05s92hk87m01vcxfa0kkvfmzxyzfx397b3lwmlavzws8q"; +"tikz-optics.doc-0.2.3"="1zjlpblczvr9390fmz0vh8zf0pbf1zc4d01l4ykhdpvljf7ndrmd"; +"tikz-page-1.0"="0971kcdlavr24lkf9wdzgwb97cf952iw1d5ls6zz7fsfj6pigqjn"; +"tikz-page.doc-1.0"="19g4b944wzahnabpw2kighd1vr63c7im3xgcjz3l53yrz89nhjmk"; +"tikz-page.source-1.0"="10v67pn2zvpxl3817h1rvn0y4wb7dj07p4nv6wf1jhchgvmb8bdz"; +"tikz-palattice-2.3"="0pfp30l373li523l0skr52fa397h2wkizvggsls3kv3p087j16an"; +"tikz-palattice.doc-2.3"="0krdfwivibibgpxsjnlsl11yppmsynanj2lgf892izxj2m3hld7d"; +"tikz-planets-1.0.2"="0gjkapcls19839jrjimshd3cqdl9x0ld27i2d51s7k8f0rcakkmh"; +"tikz-planets.doc-1.0.2"="0xx18gdj4r9jj7qvwlrd237nhcbazprhqgzn6m6cy8m36xy6yc09"; +"tikz-qtree-1.2"="1x638b7a71mwlcrn50w86j649qlzjm121ap6jgccr5vck6q9wcms"; +"tikz-qtree.doc-1.2"="0khnzjc78v1p8ahyii5rsqx29797jv3ycdan2d55bvw87p4iyrra"; +"tikz-relay-1.2"="0lyln2ifd27njc497kndz6wr2fwz1i3j8vw6b8f7ca2qh71b9zcz"; +"tikz-relay.doc-1.2"="14ds9xrf62zl87gi7w3kdh0lw8bqkvg92b7pjjab68aqs949k1zj"; +"tikz-sfc-1.0.1"="0kkfds07qskfbd7yxfyc6spylnd0nnhjyfa8s7i44y4d2x1skik5"; +"tikz-sfc.doc-1.0.1"="0b5cf8kcchp8h33x5ih1wvwdrgdhbkz589d55454i1470b3h4f79"; +"tikz-timing-0.7f"="145r878hxqfx1sdn4hdagmcnfx8xqcihfz775zabn5sbzki87ywq"; +"tikz-timing.doc-0.7f"="0na0rjgnala2lyww8chnkqyp26c1y2siaj7gqh6h8fjpi5bpamdf"; +"tikz-timing.source-0.7f"="17wzwm58194p5jlwb74z30864q7nzg9fi4q4dbcp26b3p6kn5cxs"; +"tikz-trackschematic-0.6"="0bvl0ijxkq1300n35dnq6hnc23d2vb6538bqf8adqwh8981iahz9"; +"tikz-trackschematic.doc-0.6"="0xivh3nr8z7g29k9rsxib2qs26ryfayhzv8hbiw44zmxkyicp5cc"; +"tikz-truchet-50020"="00yf9044lpsazd8wnmcz39lnazrxpqd7lpyr8ss24gk9gm33b563"; +"tikz-truchet.doc-50020"="1vlsyyh7xj1fn6wkafh7ps4ys439n1lmvmgk63pya18laxkphxxk"; +"tikz-truchet.source-50020"="1zbp1xb9sbbnr4iiqgg352ymn9ybfmkwmwd49r1ws3w7iy3qdvrz"; +"tikzcodeblocks-0.13"="0q10q8gfbdw20ysv40pj9c1ks4mnb4dqvvz39fvyji3f4s4xd60n"; +"tikzcodeblocks.doc-0.13"="1imd5qf95ykqs89zqb32yg7p61in242vkjx5wv6r2xh2dkjpvv9h"; +"tikzducks-1.5"="1sdryfjchphbk6w838pfn7ddqxg5gq4hgh4k7b8k99avnxkckll7"; +"tikzducks.doc-1.5"="14rmpx2xwww8v0lpdgv6nz0kp43w1wlxzpr3i11gi1didd78nbm9"; +"tikzinclude-1.0"="0s0mhfshfzl28z6lgwn7f540pbmdxl51gqf7nw1s88738mx3m4z1"; +"tikzinclude.doc-1.0"="11jj75nnzw9m3i6nndbfscllfxzn5bd636s85q17gds03jbqkhfc"; +"tikzinclude.source-1.0"="1v1bvpfqhvn3hp3zjx3sqv4kg288aviy1b9zl3s8r64zmai86bfy"; +"tikzlings-0.5"="19gcgnccnfy6wx449cmwgbvbwmh36iggap4pc801w8060662j7yh"; +"tikzlings.doc-0.5"="1hsvpnvnrr9grrpvqlssvajy8v1qi66pw9hil0pwq586g9sy11ld"; +"tikzmark-1.10"="1y0ciyb31z8cixb4cqzh0580bqjalpdy95nqspwrn7l7zgcf43y2"; +"tikzmark.doc-1.10"="158lkrd42j80wz5fmm0v59m677rrvzyxsgz63d0645qs0wcjr1cn"; +"tikzmark.source-1.10"="16h9ddm3i5b1nz2f2a835p6baxl4wdsckd6hmampb54163i00d15"; +"tikzmarmots-1.0"="1m33y48cs82f2z19gwhr89qyaa9n5qlrps9ash5ijjgra9dkfj8q"; +"tikzmarmots.doc-1.0"="1jp10kd7vpx68z9i1j1pk904yjb078yr60hkfk0vxhwhnpychlgz"; +"tikzorbital-36439"="17g4bd556kkhrxir4c2q6f7qxa8rigkf41dj979nb5k3a7w4k3b4"; +"tikzorbital.doc-36439"="0h1s5dnyv8n4hv608c5rspdgy2h10ilqknddai779h9biwhfzh3m"; +"tikzpackets-1.0"="1kidqyd1d7wvs1f3cp6ixp397ipaj7jd19djhy3q4dvbnzq1xm4b"; +"tikzpackets.doc-1.0"="0rlpz3m4vsyin6ckyjkxjp9a40gxhhi44z18hrw2blmp0mg011v5"; +"tikzpagenodes-1.1"="197sijaabaa3sf5syasf4ciwz8hkgy2pyr7lp78gzhlv950drghh"; +"tikzpagenodes.doc-1.1"="0y9ik1r203inp74hx4xznkypw0p88zhg9fq6b9205i053vvla239"; +"tikzpagenodes.source-1.1"="01bjvk944nlld4zbrld35n45dzljqf1rng83y14ipn3wcdxa0plx"; +"tikzpeople-0.4"="12i0m8jilbl8ldji9xmxm5hgsl0bd5vkjly1ykmj6w2rzgmjfbbp"; +"tikzpeople.doc-0.4"="1a3cjadvnrv9hslwgihxv8z16awkikinv44zcj4fd5drnqjsvcrq"; +"tikzpfeile-1.0"="1rwv1i6yb0jd5gw16db3kqar4ykzbwcyw51hv781iz358hgww5mc"; +"tikzpfeile.doc-1.0"="1530vkp14lpv0hnv8qcxalibsi1pkcj9xp1pa87lisrillxs7kwb"; +"tikzpfeile.source-1.0"="180cp8vp26shmnjxg9qs9n28v4xy0qhqgm1bvbkqrpagykzzhsrf"; +"tikzposter-2.0"="1r6pia3sjl9xcixnsr5pk8cma4f18mvpn60dxmpzpn2nn1sk4p26"; +"tikzposter.doc-2.0"="06vy5vmzrqhl6zk6z9a4kyqfvjqc4s9pslvl9zfl17cdqsfvbdf6"; +"tikzposter.source-2.0"="1idiz8izn9m9h7kyiavw836v9x1vzg58vap42wpj7yd74izwvf1d"; +"tikzscale-0.2.6"="0h8hpk0nv712vydxrzyhvqxrrqb34hw5qjgq9baagqj42ka06qfg"; +"tikzscale.doc-0.2.6"="02sz63v9zxr58417jn00ypm3myga7x29q31xbnz7p7mmq5q1r94h"; +"tikzscale.source-0.2.6"="0rf6rsrcpapmhz3q5wkgcivhvswy1kb3mql94xs372qc08bxsi3h"; +"tikzsymbols-4.10c"="1q0dycjw1njbwlji717k2n9dpmmjk5bwic12x9zhywx8hily9cg1"; +"tikzsymbols.doc-4.10c"="02gyp8pgl5c08jyvmvqngzvpbvy0g9pac3c388i9ky1vm1ylrrh3"; +"tikzsymbols.source-4.10c"="1q62sf2mrx29xif25imb8qnpxyg1j61nv3wnzyyairry74s5w89h"; +"tikztosvg-0.2.0"="1ic82cfsd0zc478gvwkx25lwxyvzr07hn8hg70j60d602ml31d2h"; +"tikztosvg.doc-0.2.0"="0asjk337l699bkv1jchmpvcc5jnihcill8yzasgvmvf05i0pvzaj"; +"tile-graphic-55325"="1l87pqfzgyr8apcs9f2gssf5rh1mvknkr5jim98zj5f93ca5mjpq"; +"tile-graphic.doc-55325"="0rq35cpk9l7rc30l1hk55r7x07f96ishr3dzdi7x4d50gv7675ah"; +"tile-graphic.source-55325"="01xqc704g5pqwmlfifzvv61nypgvnabxv6xw7ljgv9vvpyvfh0ni"; +"timing-diagrams-31491"="04yal5fdbwwdq5i7frmvxm0z7zy379gpwbc5383xn0nfdyzrq91b"; +"timing-diagrams.doc-31491"="1w3qzl1j3viaj6qi50qcyx51w2ms23j27p17h526iz11x39w0gw7"; +"tipfr-1.5"="1a9vj3r5b15chzyrpfd7rn0f19qkq9lqklzxvzm4xc5b5n802zbw"; +"tipfr.doc-1.5"="02x8fikl1vnirfcrw42xq2cbkf6wpciary55xyk6xwnnhh3abbgb"; +"tkz-base-3.06c"="0bff82v1gpdjyclklkfd1ns90dinwdhlr7k4jr6amql1vqh04jqi"; +"tkz-base.doc-3.06c"="0hi30szzssy594m6i45lk5418a23xhb689j353dxfml4rc9hgm2h"; +"tkz-berge-2.0"="1c9kgzsagh5ww0zlwywpddwn3mx0wrf8yc627gjap3f7nyyvixn4"; +"tkz-berge.doc-2.0"="07bsfmh9qyn8q9z4brd4si1clmw7sn2vh2nr8idqnm1z1jqdnq40"; +"tkz-doc.doc-1.43c"="02p765y97adxc354hn4fw40hhcx42j3xavxjyv5swz8jn26dys19"; +"tkz-euclide-3.06c"="1kcd294pqi2plkgs9gs2lp9n5baca62l2yzkmj53wk8ql1028886"; +"tkz-euclide.doc-3.06c"="1m95b6bz31fcbwyp9xvhqw03abw1x2jbd9wsglkgdn95ggvjlarv"; +"tkz-fct-1.3c"="03rd7731f4kvln990bbjfy3xhjbprplyxwwvnvr97ks6i504phfy"; +"tkz-fct.doc-1.3c"="1p47gkq52l1kh1mvychjyfrzakrpckcb2g55gxg3pnglqbj7p5ca"; +"tkz-graph-2.0"="08kfjaniwrlw23vmz24yq9gbdks9fwcf0g4jyy98ikfqh9phhhs9"; +"tkz-graph.doc-2.0"="1drk9va3bgq62qfkcvp5z30gvnscl7mbjz66m27wmgagb2ki2f0q"; +"tkz-orm-0.1.4"="020bi7dgjipd2ancqji6fa1zcf9lh9d8n4zbacy5l5nclxfiphcl"; +"tkz-orm.doc-0.1.4"="1zgmsl11cf4fgkfilflw8c4wrcfwnvk1f88l90hwgclfj5q0ashr"; +"tkz-tab-2.12c"="142fjk2kdv02b7whr2m5a53z6b7rhh2zfv2fi55q1sy4xaa1wia1"; +"tkz-tab.doc-2.12c"="1p0h1l1jca83j27wa79ncjarczissgp1jh9f9ylqhbi7y5mk8abw"; +"tqft-2.1"="0v14gsk9nwyppdyvcd4ngx6mavd4sa1y8zzmjbb8gcf5dlnz2vg9"; +"tqft.doc-2.1"="1wwvklsd7aqn36vym38m3q6gqf8fgf16axy627vdfqgg30jsml3m"; +"tqft.source-2.1"="155kv0h90zkymc6b3r1iambxsfx3y3rci6nrk01yd185ml21dvdy"; +"tsemlines-1.0"="1c7sjdrgqbjw6f2s3185k5rlkig643pkkahjisx16h0akbbdm4k3"; +"tufte-latex-3.5.2"="1azsqa3qa1w2k0r4sp83xp9b7g1xjw47wv9l0sk065zq0bdjr9yy"; +"tufte-latex.doc-3.5.2"="10h41jbfmjg7p8k3m98l2jyhl7365qym844y8f38g0f9sr1pyxvn"; +"ifmtarg-1.2b"="0wxhdmd2h7rs3fck9yq1g48kyd33m7xzz3g7ixg046azai8f90m0"; +"ifmtarg.doc-1.2b"="0h8li5c5lxccf2a325p4vg7xgalzwryk8czdzcf637sbbkfhd53d"; +"ifmtarg.source-1.2b"="1yh0c42glrw5cgqk22h8lrc12lriz436wz9vrc4145gjcxm6p09s"; +"paralist-2.7"="19m0ddw80vjzm8p0z5rrd3jf9kqzq653h3jdqlnjw4g81r0z730p"; +"paralist.doc-2.7"="03kv1n9m1b6r0r5drp81hv2i8dgnlcsz81rhi4h6a3xyxnyhw6bj"; +"paralist.source-2.7"="069mn3mk34rxxhl1c1878zs61pk7asa21iwwk6r2v88yziczkhlm"; +"placeins-2.2"="1mlx2wlm5j7qhhz8q1fvxd4zvjmjpzhk2aajql3wqvamrawba6k4"; +"placeins.doc-2.2"="0libqvl13md069fjbx3gl17fyzpn6v4jk4vk5086szbi93dr692m"; +"sauerj-15878"="1bd9cvx40skqlx71hnfrnc87b2p1wrw3587fjxlp6a22yhzghhvq"; +"sauerj.doc-15878"="1swlcqm2z289ijbxnv7aib0v0aisqdn4l2bfymvn268siz58l4cg"; +"sauerj.source-15878"="0l5p9c0fl1p7gy815l5064x93msfgb6z2lnvm2x24mwfnfpykrqg"; +"xifthen-1.4.0"="0ys8yq13vhval5jg9a4n4pv7b3v11w1yh63ssvyx3pnr767ay5r8"; +"xifthen.doc-1.4.0"="1miqc1bfwi2ssl6yp9aqw7ygnars27vks0grpyfns494yimy8nc0"; +"tzplot-1.0.1"="131aj29l8crs9xxppb36pzrwqfyb6d7ch2iwch4izxjphb8pycfj"; +"tzplot.doc-1.0.1"="0kkl95g9749a6bz63yy86kf1q3s6p2dak0ndpsxdybvx03b2psj7"; +"utfsym-0.8.3"="1bkrmrd31r2r8aq2ldqvwrlx0k9pgnh8hnm0qzgjxb5mqj7rhwwj"; +"utfsym.doc-0.8.3"="1qllclbkqvr6nqjvfxkr1xdv2af6vi90sc40igxssf4d0gcbkp1s"; +"venndiagram-1.2"="1v4hbkc214fjh5wc2myqxa6jcvr6sa31c7nz9avzj2kf40kp3ip0"; +"venndiagram.doc-1.2"="0as35w7fd9xjqhrr3v3nzld9bnhz6xg7rqgs2hyzx150xndy6cb9"; +"venndiagram.source-1.2"="0ci3ajx316b6iin315z1xkdfmxbbflnj8sf2ww7gkxf853qakwlc"; +"visualpstricks.doc-2.3"="1wfri908smlw1ngqq1mjll2b80b29piicqmv67x0xs1v3kc2sz3s"; +"xpicture-1.2a"="1z3hbmqlamcm9wgwan834hggks2b73s73h3r2pppp00a1sz3g343"; +"xpicture.doc-1.2a"="0ymdwdspdhrhgyxw7h7f8nal6h0kjw6i8zicmll5vj8vbmi44dv6"; +"xpicture.source-1.2a"="1yjvqrpp7a0d3nldqidqrk2xk1lp5vbla865l3lxw1xd5b08y40r"; +"xypic-3.8.9"="1srvrq5biqczvyi7k0ilbray7ilzi6gsmvk3b2hmf5qmv8hk0cs1"; +"xypic.doc-3.8.9"="1js0fkhn60fnxgbgviri58c4q63a0ycq37r4hynxhyix17h51kff"; +"colophon-1.1"="0v8q22qxjrbc1mpsmfvdp13iwkjxp11cxs86h2b7b9rjs0cjxy6s"; +"colophon.doc-1.1"="0s2kz7q6nkwc19jyl32rzcbbcm7ykhkglanx010xfz08vgirk1pz"; +"colophon.source-1.1"="1z2dihgwd4vbk87n0hzpipm2359fwl1z13fjs4g9r5ys7iv36wsq"; +"color-edits-1.1"="0p465bc127rlm53xngrynmrxswzmp1xsivkfy3mj22h4ij6db03c"; +"color-edits.doc-1.1"="04zfa0jryyw79rz9s1c0yzr1i8zla7ivvfw701f8la1rab7z6q94"; +"color-edits.source-1.1"="0279n81xyiz4ipjbr1jdl0wipfy1lkl18jx8mbqcbwczw8k4fbn1"; +"colordoc-18270"="1hay7bb0xh2n2j9clvbn5ayz3jq0yjaixi35isdsf9ysvj81rx0m"; +"colordoc.doc-18270"="14bw1g3dna2ykyv4fl32gvqjs0n75vlfpc9icdk09l7zhdspsvfn"; +"colordoc.source-18270"="1bssn8rjrp34nm6qhmzcrcn6a0ah9lv5n94d1jxqhhaj4pmimd2j"; +"colorinfo-0.3c"="0ip7py03xrsrn40cgkl4dnj3q9g0f9fbw71c9rsg9j7vl82fdn46"; +"colorinfo.doc-0.3c"="1185m34382n9rk6w81ppb414vl77kikkhwvn78aahlyli4il51l8"; +"coloring-0.2"="1ld6gknb8a59pkz50wlil5p11mnv6ss0zsjbajbw63dg0zlwaglb"; +"coloring.doc-0.2"="18y8apbkh7yqzxrzpraqhd76k93xnvgq5rana8lq4xh5z3f7skjq"; +"colorspace-1.3"="17pahq2wh9vqwpkaqkzc3ypcz90i9qpmw7867qz4k8a87sp7wgji"; +"colorspace.doc-1.3"="0g766c50w7xpfvqpp6lxjc6lm2cyr8yl28g7n357j1d1lxgnv0x7"; +"colortab-1.0"="0hiq8wgqiwxnw1gsrymshkldspdnizcci56ihn22h0hcwz76hgzv"; +"colortab.doc-1.0"="1cj84k7cl6cww25yy2lynjrbicn0qy4y09rh6dx2zq19972fggi3"; +"colorwav-1.0"="18svrj3bfsa8m5q3hl5njc8ac2n1qw5lk01qlc45by8vd0y55s1g"; +"colorwav.doc-1.0"="0jprx7kl9vi0497xfnvrswcx5d3ij9474iq2xqvnl5yhw4mz0v49"; +"colorwav.source-1.0"="1wls4ixd2q85yawkm0brbwiiipb4avgfjgi2mi8ix1hwawycqacr"; +"colorweb-1.3"="1rz9ay86z5bf8m4j5w5prvvk1nmlaakj3g0qfsrl0cdqk7hwsfsf"; +"colorweb.doc-1.3"="0vzcwhbq1a6pczvrv21z0q3y1akfwm45fclf0857c8jvpikkzb1m"; +"colorweb.source-1.3"="1z0h3l9gdxsg6lbw7j6nqhafxq8b8smcn4nmq7ywdzryp8b6fbw2"; +"colourchange-1.22"="0y8r7789xaj16cdmsz4q0zyq9l09ihgzzgk4alnggsyx1ny45ybv"; +"colourchange.doc-1.22"="0zj9b8xcnjlvadams6a2z3pvnzjci5l10kran8mg79ncvzq386cj"; +"combelow-0.99f"="0s14rmmv44js6vc2l8h7gb9f8h5w4as71qgxbadaxw641xfs0ys3"; +"combelow.doc-0.99f"="0pwrqhd8m7c2444czsllk4sqai3i2scll94y6qy7m51jvjycyf26"; +"combine-0.7a"="0rk76f508pwhq4crcimw6mvqw40j31g2nsrxj17pld7ygxf9a5ah"; +"combine.doc-0.7a"="1kbvk5wdpjxw9slhz63pgz65kkxcn0lkr6i5gv8gcjh2w61xizq7"; +"combine.source-0.7a"="13z1yd5mb4jdsa3kjl49412zj2g0nkprmmv8d6ibnjg6zdf9s0xn"; +"comma-1.2"="1xaq59fm295wwnpls4qfw364qf9iyg97xhsvglgnnx8w7ydhr68a"; +"comma.doc-1.2"="0g8jpwf1ilkbk59p4l372is00qwhfbsf8f3db1mxysmlxyf0m535"; +"commado-r0.11a"="00by3sskyr1hfc9wqazn2rii739bhl2fhlwwp83h6wx98h51rfx3"; +"commado.doc-r0.11a"="0mk7k9gyv2xxd3l7m58dsirk32cn7wbmdy9c0nc6i1jyfpsfhmq4"; +"commado.source-r0.11a"="0719a7bp07vf5jgx00cjdgvzfnv7wbxrxna2bdjjsfyvipyr4z8a"; +"commedit-1.02"="00anqgix8vydq5ssblg5w5i8pziy8fvlva2kpwy5cjjiqgpprcd3"; +"commedit.doc-1.02"="0vvnkp8r0xbsyvzps4a20fr43cj2559cs6mq7jhja6jzvqqc6mic"; +"commedit.source-1.02"="1kzc8i6nmvw7xwz9fbfanabypissbm7hnmmgp2m8r462ywzpa79c"; +"comment-3.8"="14k4y4abv5mlhn1i8f90bxfymp9vz0aha4p2gql148wj2hh7h96m"; +"comment.doc-3.8"="1589g0dah13lw4p18cqprhfnh1184m79ddrgvc2l22bq6vb1dsb6"; +"competences-1.0"="0hijar81j2jpwk5j2hrgaxb1fnbk6qh2qb0qbbmhsqrdrfcl6xdl"; +"competences.doc-1.0"="0ywq9f2a1fb584kpvzwg8b16qc7bpcn3dzsscs6ndqbgcy0zc2yf"; +"competences.source-1.0"="01dccp2wqdy52kp79n099v9lh1vfambg0b63amq37ac68pwn3qp9"; +"concepts-0.0.5-r1"="18vjncdrbp7m7m08dnfmk6sgv79jx83bc4yvvcqb0j9mn9niy1f0"; +"concepts.doc-0.0.5-r1"="1bq82dgsl6gqnrs88dzg07dn4rmc4y5by8122zqaqpdrpjxhnvax"; +"concprog-18791"="08yr8yk9gp35d0nvh54ysgv61s062vj446fyb87n8jipfm49mj2x"; +"concprog.doc-18791"="197p2bdn1rqmxva56sagvb1z7kc8gwxr9zf612r6g8yb07xg5riq"; +"conditext-1.5"="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc"; +"conditext.doc-1.5"="1qc7w7xfpxarb82hf66f3i63v7ypdybqwg5g3j8qswj1a39cy1wm"; +"constants-1.0"="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk"; +"constants.doc-1.0"="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp"; +"constants.source-1.0"="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr"; +"continue-0.2"="0vwz01gmbid6b2aj32qnz1xrlk9h0nicjv9ix1rvqdad20m1i4wa"; +"continue.doc-0.2"="1mzsj70v9f6srmc8ja62pph9j67p644hl54fx6nyahvr2h9vdik2"; +"continue.source-0.2"="1q835904qai3r49yi8hrfxkh4bjf6913qs5fd2dv7myp1w93j5ir"; +"contour-2.14"="0xb8a0y3jazrq5gxfnxjl7qkyaqjnmyhjshgngqcsrw2sq4j4li5"; +"contour.doc-2.14"="03rxkl9vhhqa7gpigar8w2h78qvx4k68chhf0881ws3bm6lg15sy"; +"contour.source-2.14"="17sfl4npipzgc7jwqx740nny7fnd8bv8k4vav9ds765ky1xcs521"; +"contracard-2.0.0"="1qvpz8ybjc7yx8zx4kzcpjchvxrb949rqb3905rhl61shpqv22hm"; +"contracard.doc-2.0.0"="1jg8kgp9wvxksjz9kxyh3qqxhgjmalkpj8y004qvrxna2r2idj50"; +"contracard.source-2.0.0"="1v6ffg84czajnl6p6a1j8khnfmzssjkhbndz5ajkww64iiw060i4"; +"conv-xkv-43558"="13clac7dhg2p69ccv2yjzdh64yjx02y0fb0imx9lsd0knnb1j3aa"; +"conv-xkv.doc-43558"="12dln1r2qyadxr4cy3xbwn18s5y8yxgxid22wpb2i42n5qc8j1fy"; +"conv-xkv.source-43558"="02hz64vbcy7vg363vb86vydaa29g5cgji2mfpn640dgmqq0s91vb"; +"cooking-0.9b"="053wbmf3xrhwjxp77f1myfvz3f474kpk626p8gds939yx50jqzvs"; +"cooking.doc-0.9b"="1db5wxixparr81vanwkvg097ll58fqpp3qkh0wz7mbqjkansp6km"; +"cooking.source-0.9b"="1gka18njp7ipa0jp1527mhig43hhvz5bcdpvs95c61cvjrmwcdm3"; +"cooking-units-1.46"="0j20rj1s5ip6sr90n3v72kphqg6hlvi02md80gycnkc3kl0p2saf"; +"cooking-units.doc-1.46"="0wg611s2c6x97lf8bnf2cx7gl2rddldjhy42czz2kpp7rvjzfapm"; +"cooking-units.source-1.46"="0skifnmjh3jl6008j7zblijyywm5is7k7p8nlpsx22j2x0zv1g5z"; +"cool-1.35"="1lakvsarqhicdcfx306xp94m4hsypdabr0fggakqv7adcwmd734j"; +"cool.doc-1.35"="00mqaavadqb2m2rf8j00z3dclflk191gd70qb1674pyd0a82z2qv"; +"cool.source-1.35"="12r4d15nzd3r1dxnwz7vzgmxgpl12gkq88hdzqwnbpan4y90p9zh"; +"coollist-1.4"="0hv9qi4d40vyi5shga53czm887adq9h8vmq6m0n087iijqnlxkk1"; +"coollist.doc-1.4"="14r6h8zsdwsirmpz435py6a2hsc8qkw39krp419b6v0sdnk2lby5"; +"coollist.source-1.4"="107mpivrah9m65pa29wafwjjhcql9lwhrrmn8ny51p2b0w4xs8kr"; +"coolstr-2.2"="1ivmy6jmjbbbzfakfz5ib58qg4xd2pyka90zskzcwzf5a87r22ih"; +"coolstr.doc-2.2"="0pb30nqgfijdkgsmddb14n6aviz331wab2cd32vpqsb9jnc4rz3d"; +"coolstr.source-2.2"="0fakgk7g7c9kkgd0xdm9fpcrnx7jsczddbvypwxkppll2wfsnamn"; +"coolthms-1.2"="1z62gl39f9cvmwap70q05jml1657jxg7lvq81rgqh878z63d0rzi"; +"coolthms.doc-1.2"="0zqpx1c0lcrkp1zpwl776hd8gln7i5f5m5k5kjhcwxwngd8w8df0"; +"coolthms.source-1.2"="1bir9kbsvayk3xkchg7kjbwqkhda81vay9d70hmqxgwpa0l38j6x"; +"cooltooltips-1.0"="02cyrv06a8j85x8r9s0rf1wxl1npdwhjkcxdry7p6w65xwi4m4k0"; +"cooltooltips.doc-1.0"="0z73crjs5b9wkcl5ymkrp5qsbm852ajgdabxjagvnwckxdz0nkr5"; +"cooltooltips.source-1.0"="069xj8l41anzl1cxckhikfhq8azysjs614nv0ma4da5lvczx77ij"; +"coordsys-1.4"="12vpxh6ll7q2jpsv85j68ij0m3b0335hflpqahk40dagybjkp426"; +"coordsys.doc-1.4"="1jcjvd577886q8sqzcsqil81b2lm31vjxhbdrgs38fw8n6q9g0sq"; +"coordsys.source-1.4"="0npd3qqigvp0i5zdgizm68sr1g5xcplgwfahrkak0kq4g882qmdd"; +"copyedit-1.6"="1rl23bq3fbn4rajc744ra2prvm4rmh0wvhc7jjsiw7sw2hzv467a"; +"copyedit.doc-1.6"="1ihvynh96vgl8ik237pf2pdfzclslrn0i7lc64skx3q7pmyv11in"; +"copyedit.source-1.6"="0i2pwjj4bdfsykwv6bchp2p7x0gpdbnyx37ri1d27vl72yi72pw8"; +"copyrightbox-0.1"="0n9z6dngf0z98bnzn6nl8yvy7dh1jmcdbqfxnzxarxzqq16f99ch"; +"copyrightbox.doc-0.1"="1clg6jq9cja76j5x9laykndfqp0i5a4bfmqrxaa8rp6y2gnvpign"; +"coseoul-1.1"="0wqxvh5mnrl59ry0qahxzlfajgpp0yj27h0falxnr4m5iygv7699"; +"coseoul.doc-1.1"="0l3z0fxsdlln0hjwkxf9ka9hw8zmmixml9lfy4kbrn88xq6z62yw"; +"counttexruns-1.00a"="0qmm8902apb9ks1ik1dxmzb3ivkivpj7a8f8mkn5xdyxbnqvm5pq"; +"counttexruns.doc-1.00a"="0kpasflvbal7x4r1ni3jf30fh7w6wi68109m5ajcjqrjzxkpgmdm"; +"counttexruns.source-1.00a"="0840fyw71mw3l5k5g01wd6hn41a079f83wmbyg64f4yhgjdjxjnf"; +"courseoutline-1.0"="0mwv6bslzgm5ys4gl32mxcw42gkpzwkzrvxk6934682v85qi6f4k"; +"courseoutline.doc-1.0"="1k135zma8aacd0mf6l5v4zac2blqzf6z5xa40094by61455x48ha"; +"coursepaper-2.0"="0n8gikcli14inz5q85n6k63yg6dczlpi837mbxrv5552hqzpivwv"; +"coursepaper.doc-2.0"="1d8k6yj45x0wx790y46b46nhjb3zvv2ncbkhlzckq71fsi5ayp32"; +"coverpage-1.01"="1739rmdrj07q8s9xpxarwwds13hciyv3q41p18cm7md8qrdd74xk"; +"coverpage.doc-1.01"="19hw1mx7ghigybh23b8v65y0zx28p9armynkw9s7mgpbsq0wld32"; +"coverpage.source-1.01"="0spllq6j5rxqc6a96x0dx3n7skm4gqpp6fgas9vflywiw6i5vk75"; +"cprotect-1.0e"="016z5zz8njkk2cra768jlh2s9l3r4wmn50nk3psmk3v0i0cy0197"; +"cprotect.doc-1.0e"="1wjyrb0z85yighkw9a1pxxwilp31c5fjra7y07y0v1z20q6g3rlm"; +"cprotect.source-1.0e"="0lrf75hvlp6jpwfppkj0dwv7a9q51n897bwrf3gzwswb7icvqnf2"; +"crbox-0.1"="0ni16ldwni2gyzlivd5ii2fdq15h6np4mv73raa5g76i5rw42sbb"; +"crbox.doc-0.1"="1yk96bajna3ihvyhx482jrwiccbmqdr9852w11x00xkcvvc6azfp"; +"crossreference-15878"="0xc8d3g8j86dzpfxzfcildiyk8zi2apc9af88v2zg6zjra6vra1x"; +"crossreference.doc-15878"="1iahzjwns9zapa5y7z6yy2wjdcy6qiqrqvp9q9v4ky2zgsf7n5pi"; +"crossreference.source-15878"="0yajk2dxnsfy74r6a50zs4lc064aha0lzfqp26gpgnsx2h0bvpix"; +"crossreftools-1.0"="0pdhi9yij4n6bwcwbk077sdvwi1v8ww51g2r9ssfnmvmxs4zjw27"; +"crossreftools.doc-1.0"="0q80k648b967q9gcy7c3lb8ywk257zbsw04kc2gazlc61scviy49"; +"csquotes-5.2l"="12yxrcyh0igs9khkpms447k2p7b388p2vqb5bxxmcxp6fxvfq9lr"; +"csquotes.doc-5.2l"="0m4ync4sjrlv0qccls24brba7w6zd4d8hmh7h5nbwwv2lynqxf4q"; +"css-colors-1.02"="1q3vmcppk86v2y72g47ifp129fj4rgdq3rvzgkzdzwhs1q06ipfr"; +"css-colors.doc-1.02"="0rjqim8zdmgrz5dff8bjkz9kk456l699k5nplhc8bxa6dn7yrfdx"; +"csvmerge-1.0"="0fyrqx85mklws5zny7gmmyscnsivjfvwmgwi52k3jk2c97nvsy8z"; +"csvmerge.doc-1.0"="18pmc5h44jmlh583cg0hjr24k2pj369l6ya4hqm9kwka0bhg29nm"; +"csvmerge.source-1.0"="0mggp5xankhif93firc5g01c6b160bkwqwbhc04wcm4ndlamvip1"; +"csvsimple-1.21"="1h7zdribbh96iff296dl3n69xc8cdai9xxcnf0h3wndv775wv07r"; +"csvsimple.doc-1.21"="1cvcldm2ci1y107z5bwxsrhyybqdrvvpy5apmd8zc07nn51ymlyj"; +"cuisine-0.7"="16kvfkx5sj6xp5dz0gqlbp5079vh6snkpixmphvz2gzyaqnmafi0"; +"cuisine.doc-0.7"="1mbsgn7mvy39pwq5gn7l3h6l3lc53vjyqyvc50xj8h9gs1gpdrb3"; +"cuisine.source-0.7"="1r14f44bjdry108f6iy7byzms4dybc0wi936dwkg5ahwyq07pmck"; +"currency-0.4"="0673ji0kw0j0a764kjvla157mf5lcxa02wd0ypj82gfz617sn0r9"; +"currency.doc-0.4"="0v8sfvj7g65r7iyjijimbg855rbbg5d1zdkp7vc58q14y8f34a8c"; +"currency.source-0.4"="00p52nbdv0x1v71fb0ln63wb9mxdhy7zgagbpmcn2ca3xb83m16k"; +"currfile-0.7d"="02fb49hd8dh25yf2wajnzfni0p4krjnc9scjvnzazpsq1iygl55w"; +"currfile.doc-0.7d"="0mlrlxa66jx9dqh6m7b5rlw0vd0437wyjkizxw12xqi5a2656izb"; +"currfile.source-0.7d"="0zhxf7r1hlgj133ckyk1n7ki3814z91k546js2fkkmglr9s0bpf7"; +"currvita-15878"="0xrcc3pash4g8mkmnzqi0llhix63hqk12vlwn98ipww68qnhfbky"; +"currvita.doc-15878"="16v8r2vhvb9ssmnyj4zzgv2b2m10d3zg7wm2v6cn0p65hn5i76f1"; +"currvita.source-15878"="0xrsqmaan5h60970d12bwm7k9nlf7h0flzmqhl0j3kbnclm0x8w0"; +"cutwin-0.1"="1wzw6xp767mf85b8x6i37wfdi3gjnn95xcvhyfalcbjw19d8fwn3"; +"cutwin.doc-0.1"="0p4z4yjjs0hyl2ywd1n77kzz8mwslrmyb9fy5scpn4ac101xkf52"; +"cutwin.source-0.1"="06l4zx4k2jpqj09k7qjkgq6zl8rxgg86hkyj531h78sw4190g5nv"; +"cv-15878"="1w9gx9mhg9wp47rhb6kf1w03mypydp01rxmypv6yvcrk551b5jm0"; +"cv.doc-15878"="1b16zaypfphbn9x2fwh2v0i212jx3pn84vj513lkxzzfh0if78iz"; +"cv4tw-0.2"="0nli9s73cns9x44vr2npb7zgfinnywgwajlr1k2hf9jldzm09dm0"; +"cv4tw.doc-0.2"="1b9zd0ky6h8mlcigfwj49c4chsznvbycsphs9lkpdhxv8mx9wgyq"; +"cweb-latex-28878"="0cd2rgn25s02p2ga3509pnbc70iad936qznr2yl5q6wnlvd78lbr"; +"cweb-latex.doc-28878"="0vc5f0h9mq7p9040ksql4clcb9y1dxq7s1a4gzgpsjyla05ps3qd"; +"cyber-2.2"="0vlx0r57ay6jpybs6wlc1w1qpbd62cjq3snaqplaj6dkah98kcbq"; +"cyber.doc-2.2"="007g12qa9v04z3b11cdrd9z7pc7iba0aa2g7z460i0hi2fg4gv3l"; +"cyber.source-2.2"="1kivc83wjpm2rf2myk4079f1l8pyw1pm9a2j0iqbwshic2qfm86q"; +"cybercic-2.1"="1g7iv7xyl0a30kjmrwvcz2kg6y7q3r51344nf53r6ln1asagm68r"; +"cybercic.doc-2.1"="1nman70rpgd0wqhgw84qg8acm243y45nhxd32dmh9y8ywabynvc1"; +"cybercic.source-2.1"="12pbrk2bmgv25fa0llpk6pfgmz5jljmy1w5b6j0md0ni46ldjxpb"; +"dashbox-1.14"="034nwqqbd4q99mzdd6958w6a3jcvvpvamdycda5blh7in1gwm1b5"; +"dashbox.doc-1.14"="01zb6bc407282xhfc6ccrm38jjz2vyl96h552435b6cap68jv48m"; +"dashbox.source-1.14"="1lgpiyfizg0vgfgz51wk3mhhc344gwra79k1xp95c2p6w32bgf5y"; +"dashrule-1.3"="050scy57rjz5pvwd8bbl4h32w1paigyyy7dazr33v28061yap9b2"; +"dashrule.doc-1.3"="1ryclmf2l90n20qf516p4qz02znnp5rgjx6pfw4p3wrkamnh6xwr"; +"dashrule.source-1.3"="1f05m420qbbk25pc5snh3nb4dx7bd38nwfix1p8ndngn7l9dfkcs"; +"dashundergaps-2.0h"="000fzv5a00nap8ybzyijz7kx1ky4qx418jmkmyz5nm2rpnz8ckg9"; +"dashundergaps.doc-2.0h"="0zj18ikjshyd9jdrn4a8h1l8d9kypr38kx2cfsd9gllppp27m4c4"; +"dashundergaps.source-2.0h"="0n43mz7bnf05j31p99dmxr26rl6xzkc4maxra1aavg8s19x9pmd8"; +"dataref-0.6"="0isa7vgl7ic6fckj6i40llzp0cfr8j2lw7xyl4yd3fbha332sy34"; +"dataref.doc-0.6"="1qpkfaii2hk0ycpcycb2fl7aal7wn7ynzr8hpsnvfg7xv3dkvsmj"; +"datatool-2.32"="0c4f0byqwfkldxc1430qixy52xsidzw8s78igrxxrqhvvls4ywh1"; +"datatool.doc-2.32"="07gg85s1sv5zq1n766av958fc1qqlc9ifmyz8kd99b27yf9im4l1"; +"datatool.source-2.32"="1w5rdaqnx1mrf0vagxq5gvpxskwm5m4mbj2h4xhz78p3varn2i6i"; +"substr-1.2"="1qialx52sccay00z85z001xsm62ajvbfxqxc9ps0bpmjkcvvgad4"; +"substr.doc-1.2"="0zfcggj17bf26dxihkmqwn80pdir4n216x0nhkb3v17q889q903n"; +"xfor-1.05"="0m4y0caa22fps0r6735kb9pr2f89z5a8wflzrvpbms4nh3a61zgc"; +"xfor.doc-1.05"="0c0qg60h631d3m9rqr0nwj9772zjv3ch0d2p1ksnqnjf30idydl1"; +"xfor.source-1.05"="16xp7hziirlnd507g9bjvszm90wk9iv6ankq8bx27qkyk1shhjfq"; +"datax-1.1.1"="1lmm4dg5y198p9hhkhrb0nzahyk2i2779h9cnpdydirh07j6bpl6"; +"datax.doc-1.1.1"="1d1b4igfq7ly3d2qywj0j9yjlw0lxbpnif2zq1z38mzq9w3abybd"; +"datax.source-1.1.1"="0rjyskib7g16zc3dkdw56a189whhqzrxwlw9b9b8vdld8g0rn1cp"; +"dateiliste-0.6"="0vzq9y9ilc6pnhg60psvwsand6sd4w5238rq3xhwnj2nq80yi38s"; +"dateiliste.doc-0.6"="1gxjc45zim6vykmskmhrhnkviw9i7la56d2zfyi89c5nyjbry5a2"; +"dateiliste.source-0.6"="0ks8aka4km6z6xcn6sihsff935z8kg74cyf3czk31wmr9qay4yq0"; +"datenumber-0.02"="1wc1cixsvcb6346jvvy5811my0kgpc60hrs355w9v3z5a9c2vl4s"; +"datenumber.doc-0.02"="1lhqb3fj5dazlmnnxgxk80lq4n5gbbwkcf2dd228d25pnmx7jirv"; +"datenumber.source-0.02"="16cx0wgn2mxxp1wrfb51ngmxvj9r8fmfb1gxyqp1sd5pxiwdshnd"; +"datetime-2.60"="0xwh0sl6x8fqvaxahh8356dfwqkzk8g9dkxyaax5gz8ar9p3xb6b"; +"datetime.doc-2.60"="1j8zlxbyqpdrwm3z4pgdv3gz2firffk8wwr3ih1vcgn7nqxkcd78"; +"datetime.source-2.60"="0f644wc3c6zx6dgdam4wh6ap4gzzf5qn02krp90hkqmbrg080zxz"; +"datetime2-1.5.7"="12854by3m3pr6j7s6zm8inj2panr7c9h3ngm19gzybwy7cdb34nq"; +"datetime2.doc-1.5.7"="1pk1k3rsd9h5csnmnhlwi73i6dbwhlpqmf5z7kxgy9czmarbfg56"; +"datetime2.source-1.5.7"="1n60n0i9iwh8qyhv78z4d2afsfk04k912ixjciblgnik1gnd4xjh"; +"datetime2-bahasai-1.01"="13xslpv73cvxfs9m010qnnqsrz9ncgci65ha89y1zsi87fld4xfw"; +"datetime2-bahasai.doc-1.01"="080zpliqc8wb85gqx86klrq9rj7p73m5vnka5qmxzj60kvicwlk3"; +"datetime2-bahasai.source-1.01"="1jhxyrxl2f7qnld898b1hhga80wl6b6xfhi9vd9ka3w373qgqfjg"; +"datetime2-basque-1.2a"="0m9sf0ghni3c2qmr6byjjy88f6bjj4hhpiy9c5bgisc0ccb11jn2"; +"datetime2-basque.doc-1.2a"="0krgk4krb8yglk1a0fvzhgrj6b2n38gn8kxin23p98b9928wmcl3"; +"datetime2-basque.source-1.2a"="1q9h4jli6fcsd0vqlh88khv10gd6gz0vxd4gx9ikbrvgsx9wx25y"; +"datetime2-breton-1.2"="11hd7fq61g7j7nxsgrw94hdrrn54dnjvh10rfwcn0x6ck1vxawfg"; +"datetime2-breton.doc-1.2"="1h50bi7q6gvv3c2qchrx81ybly1svzyirhdcyy2swzqda2w1x7xs"; +"datetime2-breton.source-1.2"="03ppqjw69xbkvqnjfkqj0zlxsg4m5q0cx2magq88f3wmjp7kw2l4"; +"datetime2-bulgarian-1.1"="1vx3n6n46kzcspc10fwysq7xij5dnlrv2wn6b7pkfbl4yh1001yz"; +"datetime2-bulgarian.doc-1.1"="1yfgdcr1l6qji2x0i9gs17zb5scc9p91cgyk1w6brhy5sk4syns4"; +"datetime2-bulgarian.source-1.1"="00za8skfwr1mhjpizgslppnlg05rwab3nbak4kbsqglcv0nivm93"; +"datetime2-catalan-1.1"="1lj6407mzspkhh18yxxmvk3srgdpf8c5r06sycy128dqjkix4ma8"; +"datetime2-catalan.doc-1.1"="103nx5macgfrj8hkvyyra24378g5n1x4vnxi30pjkawapwjwk982"; +"datetime2-catalan.source-1.1"="0pc165ql0aa2wdwkz8wyk4yafxr0j3vnp98vxybq1x3fwfqvipv5"; +"datetime2-croatian-1.0"="1h8nxr5n9k278pngb36sswi6655p0vq442x6ixlw8h4mirlrq9jk"; +"datetime2-croatian.doc-1.0"="1lma00vhrjkvldgc6iq5p9k2ky4cfjywxdzy897308yxrbahm0rv"; +"datetime2-croatian.source-1.0"="1xcdaz38mm09i8zc8jpfxpbs3l2n5hhv8nk5xxw108x5k8vb8fnw"; +"datetime2-czech-1.1"="0q8f1ksl8lhkfxb2si8l84l94w4nfgav1ybfryd596kmcbpf6iga"; +"datetime2-czech.doc-1.1"="1wz7sznkpk9rik6612vibk2zc832qxrq4yq09rqwp6y2nar0p3vj"; +"datetime2-czech.source-1.1"="1bism4aqd05cjjrxmsqxxpq10sw72855fk5v2wjkij62yawklp15"; +"datetime2-danish-1.1"="18shs9bi583590a50jszym2pwcwgbz39p75j4nj5g32bwap262hd"; +"datetime2-danish.doc-1.1"="0dr9jv99c51na0b4ds6ac4rc26na0v0rbjybna25fiy4b0k7dgli"; +"datetime2-danish.source-1.1"="1h71ibvmhsxi1j5h2sq1zs29d466hylm7w9pl5xb491d091nxfl9"; +"datetime2-dutch-1.1"="1s5ff3wc9lgvz8md4kwwlqc792s4dqr2mcf0sif0dv0z8ssi079p"; +"datetime2-dutch.doc-1.1"="1562fdf0c1w556mwr5gfbc5qqnrbw0f8i7dc4lwh8gfnp7skirc8"; +"datetime2-dutch.source-1.1"="0i1kv624yr4zc184vy2y42qnycsqq57349d49glxc9lh0bpc9fgd"; +"datetime2-en-fulltext-1.0"="1bnmzpll7s2pv62hafbwxcj9i0c4s7vk1090xg2zvf80d0k0biyi"; +"datetime2-en-fulltext.doc-1.0"="1szzn4jcgchf1h8bg507lmb4mzdqx60k94v84z2g8h2pv7d5ip9z"; +"datetime2-en-fulltext.source-1.0"="1vrhcgsjhb6vfh44lqh2hx22zaw5qiwiwms7lnzwism5zghdkaxs"; +"datetime2-english-1.05"="1xjjv46vk4s3drlzvs7iprw3zhn1zk30bwi2dgczjqzk0fxyiql9"; +"datetime2-english.doc-1.05"="0iyq0385pj2lqmd5rwyanry6brbwrii4zg2jjnhp2ib404jwjqf7"; +"datetime2-english.source-1.05"="00sjzcpsp9jjfn9fnc1fmq19448qm0p0ggi2yy7qmz426mqb3g7x"; +"datetime2-esperanto-1.1"="05691xa25qp015w0cm5mzi3qrb88hlaq5jxjrxqgid1ni9rpgwh8"; +"datetime2-esperanto.doc-1.1"="1c0dhq8ll04pl3ics7d3p8r73mdawnyridapfr9540cs2a1xjjbb"; +"datetime2-esperanto.source-1.1"="11xg3v8dk7aiv9ms4nggsm1xs898m0zzi7lszi7jx8pcmxqnz851"; +"datetime2-estonian-1.1"="0vdnvfswgm92ncrkh11p523s6vczz1vdxyjqjl9cpm1nfj7wp14j"; +"datetime2-estonian.doc-1.1"="010i5rcy8pc5y16rwhpzzywlyna031g6s9xsdpgg0avci1yvw20h"; +"datetime2-estonian.source-1.1"="0xsgj8l6hipdb0f75ckqw1h2lmdkjxxgz0mw38pc1kg6sr4r3sdf"; +"datetime2-finnish-1.2"="01hjh5lmd2461n0g2a67z31h80wcfj14b9y9amxkx4k01b1268li"; +"datetime2-finnish.doc-1.2"="1cihjhhm37f38rknm45ndli3kmgrb1waxfncl1fg9l95hn929cnh"; +"datetime2-finnish.source-1.2"="0zi9ydsj0zjrg3c7618fxxabas6zhvdimbsd42n8fc5acvddhi36"; +"datetime2-french-1.03"="0iznh6qv41xcaryyh70lk26rmrk2j0j3239hib8g924zqgyi83p7"; +"datetime2-french.doc-1.03"="0f1j72g2xqaq64wi1jkllhkpxbjm1j3d7wraq42x13giv72g95w8"; +"datetime2-french.source-1.03"="018a641mqcpj1maqhpcrp09msf9rbr8a5nd16hk8c375sh2lqpap"; +"datetime2-galician-1.0"="1g5qmiy094yrid6jh3xvy783kq331bzk0lqzci7jsb2izymz0lqm"; +"datetime2-galician.doc-1.0"="0im51qyxg5dbc6p1w3k4vs63d7nyyipd2ad7z9czlfid0n4ywksf"; +"datetime2-galician.source-1.0"="0j4i3b3mp1bpqir7imsfw2y1098ak0j8zs7gjhm16xdrb4n1xhcl"; +"datetime2-german-3.0"="1n7s5fj27rlz61r63s1mwbkxm62ddb2izz7ip4fb165d0bbba8xr"; +"datetime2-german.doc-3.0"="057p9xgdbxq31ff43qi7lr4wy17nk625dnpczrinfd80xn92dhsd"; +"datetime2-german.source-3.0"="07dv92w3rfg0xi6d8n6ykp0rn4pj6k8knp9sx8an9bhzmwqw2yw1"; +"datetime2-greek-1.1"="13a1lpvg680881xpgphzni3hcdymvph56mhgy0jbsri14fw0mdyi"; +"datetime2-greek.doc-1.1"="1kkl386rd0h5psr1z4aw32r7m55in62hql8x9c8njzajm5frhf44"; +"datetime2-greek.source-1.1"="0kmwn8mawmxvrgx5d39j92p3r1nlk1z378z1h2lx129yz4qbsv56"; +"datetime2-hebrew-1.1"="1b04g9lm0g5128phix3mnx9yphg07ig7p9d149rw0b1imly7f6mv"; +"datetime2-hebrew.doc-1.1"="1lslls4q5j1l9a5m0gzv351jfc93ii0zzcb62p3icq2qjig3rz37"; +"datetime2-hebrew.source-1.1"="11q13hms2mnqyxg6hc3279a8hs88j2d7v7wl90v5avwgh8923q55"; +"datetime2-icelandic-1.1"="0qdzn3sg7wamii3gkjgq7sas1fb3ixpy3b2p6qfz37a38phb4nyc"; +"datetime2-icelandic.doc-1.1"="0fxwl3q2gb9pxvhgsd7xmcf78ql67c4ajws944rwvsh6bn7m7w5v"; +"datetime2-icelandic.source-1.1"="1jkcxsas9x43zafrl8bmc56800487p037793k58kcf7w6vlr9lax"; +"datetime2-irish-1.1"="0k40sibvdqhg333l0iyhg3zs0fkhfbkqhs64ch9hs0kpw1mah48g"; +"datetime2-irish.doc-1.1"="18yd4icn0vmmizims17lsailn0gjqnhx4c7yy5jgrycammbjns03"; +"datetime2-irish.source-1.1"="1hs18kcmzgif8jcfp3v87h6rvrhskcvi5jzzspp7zgpq73izb1nj"; +"datetime2-it-fulltext-1.6"="03nr1l5gzwzdg4simif6wrwzg9716vfy1nbp8xfl98hs3sznhdhi"; +"datetime2-it-fulltext.doc-1.6"="1rqkdp81zg5sq5klz10v00c9xzb162dsmqgic2y3v4mxi482iy89"; +"datetime2-it-fulltext.source-1.6"="0y50s2mnyyx5kxb0bjbbr4pr7ywnfq3aqhqybqhd5x6rqpwagnd9"; +"datetime2-italian-1.3"="1if93khnpiwn2qpk66i431aw55y43qr603kdfdfq76v4sq4zrcys"; +"datetime2-italian.doc-1.3"="1r7gbm3ik84ny6nk3fb36g337imfq7w53cmk47qg1cpmff6c800c"; +"datetime2-italian.source-1.3"="1ckrmbv22dm7998r9p3b730zyk7ldzzbf1ds8ac5syqibh8wh0dl"; +"datetime2-latin-1.0"="1xgjcby4kyr6pb7zmwvwyhcq5y468vvja64l8bfivhv0n1s6q2cs"; +"datetime2-latin.doc-1.0"="07lvgcnpi7z36l21dwbs1s19f3afg55i18wdjcc9d02566g2fjv3"; +"datetime2-latin.source-1.0"="1gi5n1sf6v965hd4p0c6d8v92myhh218ql6bgaarsba1axp2c1as"; +"datetime2-lsorbian-1.1"="0vpqvd3fcmd8kqs2cj6ix5g3ci9zjr7i9ym31whryras2cm6r24m"; +"datetime2-lsorbian.doc-1.1"="1ysrjnw655p1jplcxajrjgd48sndqssm8j7gv869nf0ngx4mx1rc"; +"datetime2-lsorbian.source-1.1"="0875nzp676qv8vi3f37k2cbf7vszsrws6clyldqqayxkr7gnin63"; +"datetime2-magyar-1.1"="06y57br6g9clfscqma0lqp38fzp6rrxja3sz5x6jgi0acyljxzxx"; +"datetime2-magyar.doc-1.1"="1mcw5rzb573qav00jz611576lvy8nkfl3g92wj02szb6fxq66g60"; +"datetime2-magyar.source-1.1"="1697h8jh2gx1ybcfhz8cqzvk70h83qa3028hqi3c1rhkcbxbrabb"; +"datetime2-norsk-1.1"="1kcdkppmc5h3w09bwcrvlsxcbcawksmdam0x5w6zbqibvhlhvh78"; +"datetime2-norsk.doc-1.1"="1vrip0mq47w2qn8i14ckazpzhzrl79dpyj7zv01b43xw5zkyqg4q"; +"datetime2-norsk.source-1.1"="0rkjhbqppncaw67pfiihy2grzlcsaszi8jnxhhvb2sf4i3dpqlr9"; +"datetime2-polish-1.1"="1mndpf6vnb7lbziaj64aa3q796bv17mh4r9s3p0y2k8yjrllql3m"; +"datetime2-polish.doc-1.1"="1cn5qrcl4jxcnn90llhn6x7rd5zdnzz9h5szv4hhzbn9i4k1ci0f"; +"datetime2-polish.source-1.1"="1c42vallyqmpjzivcfvaxidhi2rs05sw6xbkb319dznl1jmdby6c"; +"datetime2-portuges-1.1"="0ikj36y2n7zlxgvwxd8z8vmkm4gwdan3si8bz98ajc1z5yncb7ha"; +"datetime2-portuges.doc-1.1"="1m4ij8xjshi23hrm723m6vsbijd9cbd49b29fr2466sbxmnkyv22"; +"datetime2-portuges.source-1.1"="1r0nw953bwgdz3w150s78s0rpd9c88djygwc68sr3dkfd6iih05k"; +"datetime2-romanian-1.02"="04jypimj3pcvnalkgzwzxvgav8s0g6c7br1w5hk769k7aqjf7qx7"; +"datetime2-romanian.doc-1.02"="0nv47vpf5gcnj86f1m24xbmlvhf7iciyjaz2kxbbsn4yz55zmbmv"; +"datetime2-romanian.source-1.02"="14324lrmh75g4jigcbcgx9zyxn0318k6my6ndvymamldwln7gmmv"; +"datetime2-russian-1.1"="0m3cmm2ikili85z44mmsnaxhv3x2s6xyk6kkfr3kaczn3w8srqim"; +"datetime2-russian.doc-1.1"="01rfdj3wf69j976mkv2yxw0ns4pzf852miykknni4zw7lbcki00g"; +"datetime2-russian.source-1.1"="1x931h6rnzm11ipfa747x306iwn3381ahcf7bfzhg75p8707glgs"; +"datetime2-samin-1.1"="0wqnsvx33d68j18lm0fmvjrdg8g5hv0xwzv6wqnb8wwz1l5zmqvj"; +"datetime2-samin.doc-1.1"="1wfij9j00pqs8bapbjpmg8xzah9509vrsb9h8sqc2abdjnqgkmdc"; +"datetime2-samin.source-1.1"="037gm3s8rxk4chj2q9yilbkvg46dxnd2jpr886ibydfp1ndnqcp1"; +"datetime2-scottish-1.1"="18c3y6968css1zm1pryn3cfbdqfn9px0n62bq6mapmgbd7fi2plh"; +"datetime2-scottish.doc-1.1"="04dy9syy4qmn36mfy1agxjzd41prwqzlx5f8vpyq3148w51kpp1j"; +"datetime2-scottish.source-1.1"="0nhfk8b19dqa08lb10sbfwp3c2f4rn493dgp4sm254bk00nil1gh"; +"datetime2-serbian-2.1.0"="1akyl3r70rwdyjjqvpsmh5m9g7xsdmdmx7l9qyh54x8c7gir7wd7"; +"datetime2-serbian.doc-2.1.0"="1kgkpfgfqj99m0262zcc6b7fnik83vr45973720dbf9f5gvyin95"; +"datetime2-serbian.source-2.1.0"="0hn4w3rw6mqzcj14a55m2hch3ra1ax0kb3l254pfgk4x9l3x028v"; +"datetime2-slovak-1.1"="004s60h3zi0a947ayc7kk2slxwl6bmpba8lxm8000f6yaf00wyk8"; +"datetime2-slovak.doc-1.1"="1wblf0fd2lb6b05vvb31a33lz7dxakd5k6y5pcvs6iwjjb755n52"; +"datetime2-slovak.source-1.1"="17hwr9yzpdkcvqvm1fa4qvacgica9mm29npmcl7xc3c503h4z6wi"; +"datetime2-slovene-1.1"="1lcpx7nz5lqb6pdw2j0dybkilavp535pxijs13nfl043xizh4brq"; +"datetime2-slovene.doc-1.1"="0i6p83lixs6maiww4fdsm09nql3xx8xvs2qz38r5md4r5zzikyb0"; +"datetime2-slovene.source-1.1"="0grv3gcm8wjdcx9smsq3dzd916pg8kcvgmh6s47xh83wz00qqi36"; +"datetime2-spanish-1.1"="0ggb24w3sljmmydnjdkbg34n9mszjwrqny8vl70fcin1dj69njcj"; +"datetime2-spanish.doc-1.1"="1iglnacrcwwmc43shhsaamwajlb3mzj9dgqnd5qg3v7ynlp5zblq"; +"datetime2-spanish.source-1.1"="0fjkhxqgw1yb1nzfiymwv8bsv6zlnwvdjl7crd78n3yx1fgv9wd8"; +"datetime2-swedish-1.0"="1srl9lm3hbsg3bwdkdw4bz7rhhnkkl6pihjky5p2h0jr9mribczm"; +"datetime2-swedish.doc-1.0"="15ya3082by696ysi8gj7d0x5n5g93przna74r0g8yv3qpqkv52j6"; +"datetime2-swedish.source-1.0"="0yswvrgh6xg34iryy0anhb4jac8q0iyvdfw9bsbhaz1xbldn7xw9"; +"datetime2-turkish-1.1"="158prpx4ma56qvq6ivq7ffwp0llll5x34af194qygxs0ldsgjlwy"; +"datetime2-turkish.doc-1.1"="0n47wgnw5kvcn85s1983dg3fbixh7i4p3lxrfnd7qvaxyrph6lw5"; +"datetime2-turkish.source-1.1"="1hnwws0y43d9hpdgb63y5pxr6d0ahis2q40z705b199051lg2qfw"; +"datetime2-ukrainian-1.2a"="08ba6xbivl8gv2a3g0p4ch969zq1lid4zq3vqqvgzkhkdsvc2zkg"; +"datetime2-ukrainian.doc-1.2a"="0biih09p6a90qbjck5w0qs4k8lnqdha0xd3f6kdjmlljqxk24g5j"; +"datetime2-ukrainian.source-1.2a"="0mrysl74pfbs533h08jv5wld57s30nsq6mar2n07668nmplqj0ss"; +"datetime2-usorbian-1.1"="1dynq4qqi7mpckzcmwvfc17hvnfjlv3n93dwypp2sxl1596vili4"; +"datetime2-usorbian.doc-1.1"="0pvf7lx3g09jy5nxlzvgsixmaz9bkcq0zlhq8r3ijd743sq4y048"; +"datetime2-usorbian.source-1.1"="0888x4b0wjqwfrg96rcpxfj6mycdpwwyk9fjavj3j535nxb5hjxr"; +"datetime2-welsh-1.1"="01p4mxn78ynyan6pb9598qmi000alyaiw3bh83w0l5682v2fi7ip"; +"datetime2-welsh.doc-1.1"="0rkibaqirq4xgy6r7a1aws6awyamllg5z5zixb3imapj3x6c8p1h"; +"datetime2-welsh.source-1.1"="0d21jimjq8sipg1qh4fxwb9cmq3sga0wjlrcqapjpy559bnfgmrx"; +"dblfloatfix-1.0a"="1r8s36il4bmqvvvlrsdbhdp4nanbyd1lh71dac4f774bf5pkhzi3"; +"dblfloatfix.doc-1.0a"="0znp5j2v20q7bsic5j7cjqxmbi1dannffl0b14g2w0jp3p6hpfxn"; +"decimal-23374"="00byxbhi2pqccd1vd6hsh4ri0vzvq1mwjnvqmqqlrbr3qfv05zla"; +"decimal.doc-23374"="15v078s3d3aawihdmd0l1ndqinlsqz11xxbvbw0dyh0arw6d1rc3"; +"decimal.source-23374"="1k88s0r82livblqfb140npf2p7lvmsqkpasbr93ihwjj9vp54xb5"; +"decorule-0.7"="0r5pxcpx29l8x1bw4hj4xp66zgkjgm0qn2ryvxy1d30dyjgp34zb"; +"decorule.doc-0.7"="0a3qvnknhcx0jx8x9gk7bh4sbnzv1mnqvdr8l03nzjcbmysvc3hy"; +"decorule.source-0.7"="1lj47s4k44pjnr0n06xdcb37625hkjclrsj4ccmkgcr61d85vkwk"; +"delimtxt-16549"="0s2bbxhbfvq0jm4i90sh6krcik8yk2nl0c39lzr1nrakal0k5lkh"; +"delimtxt.doc-16549"="1wswrw94n5l1azs2aczv6vf56ksbagniry4rwq9b16bmvdy7slyz"; +"delimtxt.source-16549"="0sfwmd0mj359qkchqgm8zc80ayqp0p8ppdgfn3cmayhf2pml6gyj"; +"denisbdoc-0.9.1"="0nqajj7nq19s74m3qlsrii126gp6kqakf9qb9pianbdq9xqpd1yk"; +"denisbdoc.doc-0.9.1"="1f21z0638dnlc6wlpchkx16zbl2fx7mpbkppkpzmfafdhql2i77k"; +"denisbdoc.source-0.9.1"="1zqjcmqllbj3yig5a8zwjm4q3r4c9jw1zyaab64w7fvcav825h6l"; +"diabetes-logbook-54810"="0rmahxnjnjd677z42ra1mcp86na41sz9ir4chkpmaikhdvnbi4qa"; +"diabetes-logbook.doc-54810"="0qb2nyjc7fpc7yc632bblbjryxdx39xr64c4kxncdisi34am82z9"; +"diagbox-2.4"="1p7wfkhdcgdc1gifr4im390w039609j6mg99sixgpq8f0mqqnlsf"; +"diagbox.doc-2.4"="04i03qdy9gfzf14w1vz8nqqgw4hn191w423jf2ck5ibljwlwa214"; +"diagbox.source-2.4"="1x1ixmmixi2sal1iajwnf0wvg97kj08hi5vv4swdiwqpd14g1i53"; +"diagnose-0.2"="16pikxgaf40vm6l5r0wk5jxbfyzy1jgpq2qhpl859srxrygdar4q"; +"diagnose.doc-0.2"="0k6vxzd3biyrfwnfr3p2zvj5j10r4xsda65qf6ppdrjr8cvmjx6l"; +"dialogl-28946"="0vdx7qnpp5s6j5c96207px2fdhylj2kv3ph9mr3jcb6jyrsiyi0q"; +"dialogl.doc-28946"="15082p9pi47vdwrdqz4kdcl59ymsgnanrrnil9p97c1wbmc9saqb"; +"dialogl.source-28946"="1g9c68a7pqpk5vfcnr95zi11km3bhjll06zminw2knk2naxlykhh"; +"dichokey-17192"="0bvv3893jxpblddqi75hppb9s0rxaiqbq70jns2x7d79afl7xkwj"; +"dichokey.doc-17192"="0m5zc521shp00wld4kyhp9xipsqfq00q1dqd3qp9ki1b2kmr5w7j"; +"dimnum-1.0.1"="0mrcnz3s214a4yxljlbrzpqyrsjlh8gd0llj96wsirlc1kpsb3jq"; +"dimnum.doc-1.0.1"="13j2pbbpsnd70gmn3ap4sad4bvbwg3r00ix9s1m2kvx4k7j3zwii"; +"dimnum.source-1.0.1"="0sx3y3g7jn0dbbfw3a8sga2fs9pz9710jlckmc464a5zlxmcyldh"; +"dinbrief-15878"="1msbw91lljb18c10bia4zclgb1klhmnck6kf23dgpv5ihpdmzla0"; +"dinbrief.doc-15878"="1m3dvm2d0s7xbnvywwwcnjcl3hr8sczp1lmpcdx8m6gyjspllbfn"; +"dinbrief.source-15878"="13dcia7rzw0djajb71b9gq2isgys63zs6g89rnwxfvn41a0nkgh3"; +"directory-1.20"="0z2kczyvd4h3751ndfywzfvxl16xrjl3alvqxpscjsplrrrq53l4"; +"directory.doc-1.20"="0w5rhczldn9p28dys7pjn3lgs0a6dq4yr59n1969qbffbcyv2m5q"; +"dirtytalk-1.0"="10msaqhpb66l95vk8l172mpglilhdrqc4qcvmq3v58ssj19kksjp"; +"dirtytalk.doc-1.0"="13yv6x3v4is4l0z5b7a83r173jq7mkyqc8nn52sfdkr168saxylz"; +"dirtytalk.source-1.0"="1jw485pgqr0l60rnd39jfn4gmac5n9k67q8ykn2fk3s38nklyzib"; +"dlfltxb-17337"="0yql8krlb6cbi5vhds9s8qwy4010vlsi3szbiqlzrby82bnfpxnz"; +"dlfltxb.doc-17337"="0c4nvwlf5k1q34gsn3z0pb00b0yhprhp3a1mcrg9i53yw7chwsy3"; +"dnaseq-0.01"="0vsifiirz1mwmjnav8k6m27mm5qsn3iw01a9c056p4g4ji8w2v2y"; +"dnaseq.doc-0.01"="1n05sb0yvq1hm2wa5vdnkhr54fgdkxv2s4kd8dhzk2zqx6sdv4jb"; +"dnaseq.source-0.01"="07vdyylb7j94sphfz6c2szxhx7l5swvyzly3afky69lm356988zd"; +"doclicense-2.3.0"="01mb0y2mpgbpf0rv6xfwq8yiwibm9n3sh23r5xnf49agbw2zgynm"; +"doclicense.doc-2.3.0"="158rqgavljjck3ydfmagxmira7l6vvdi31xvv9n1fkypjxggdsi9"; +"doclicense.source-2.3.0"="1bc58ih6p32lj6lr3n6n4cq14kzdgzq4jh53ycv6b7frd21j8304"; +"docmfp-1.2d"="13cxjhbafm0xvnng6gc9g03p4j79sia7jvygxmphgnf7wfndv4sz"; +"docmfp.doc-1.2d"="1j2b530wcpr8252lcpmy0c5w83kqbi9xzsrfbdngi1jmkfy4nlgv"; +"docmfp.source-1.2d"="1w8g6m2whza3w62ngsaslv7h2x7asijznwb9glx6g2vjv456sgf8"; +"docmute-1.4"="15ad8274dwgzk7fzs7i5g3ss02ld8in8f86339rb314zmraj5kv3"; +"docmute.doc-1.4"="1mrwispvif8nwjbq12jgzpwjn9xf7mr91pwg5bfdcnpwwy8l1bh3"; +"docmute.source-1.4"="1nfv31h23mp7alrm9saz5abakjsvs7rqva3q9zvxlczix7yn63qw"; +"doctools-0.1"="1rdwmdah8rb2yiicd9mbqz0mmf56rpgnp5vwyjhax7m0zqjgqkgm"; +"doctools.doc-0.1"="02jrr4wbkdx8r44dpfn4g83j03n6yrska79ljnwigs77p5jqlyl8"; +"doctools.source-0.1"="03y13bijva11hqil84l2p4cap7fcm8wk6ds53nx1qizh66h8g9vr"; +"documentation-0.1"="088imchmqchi1ilwfzlhk8d4am2xjjgacnyw5w4mb6sirbckhi3d"; +"documentation.doc-0.1"="103rpywyl1h30c7jamp3cfi1rg89y48krdjbxc0calz8iq5n0460"; +"documentation.source-0.1"="1fzk62clv9ij07cfjcrwn94cqvz2piysij09y2wlkcs06lgk2m69"; +"docutils-56594"="1pxswkjs901clnd8l3n13ghqypv6l8gxr3pnwn9i0zakvxz6gdh3"; +"docutils.doc-56594"="11fzx9kyxgxr20hnyqy9nvl5rczdfyb43j1bjwxnim68kmy5bjyz"; +"doi-48634"="0rxsgmqmkpabw1qw7k0ssxjmzkia323dl0p73zw7qbwdpgs4xx5v"; +"doi.doc-48634"="0h6k3bg9wg4wa4shyijr0xsx935s8s8igad0zzyk57q5g7lhhka4"; +"dotarrow-0.01a"="0wjan8m1171m5bl5x6pygfn0lm3pyq87vmjjgzl1zd337l3wz45w"; +"dotarrow.doc-0.01a"="18d9y7mzfwsmy9c14ihj2blmikiwcwp2y462wjnmm8hb6gm58cpc"; +"dotarrow.source-0.01a"="0f8dmgsrd2wbcmxipj0p40d09sgcl8i5indbzsmkfz7fxvnpr15d"; +"dotlessi-1.1"="1ii8ilc2hqdwck9z1lpbyjsgh47pkfh62r1yv6kdkafqqrxzpxxb"; +"dotlessi.doc-1.1"="1vc8bpzzad2k222ghdcqmkbd7541b88wccc108avzj9v85wfpjbk"; +"dotseqn-1.1"="0n0hgp5saipf42kwx4hxxgx66irmy91pdzcznc8vmnnlayly8s61"; +"dotseqn.doc-1.1"="1an4s3v47f08z7v5gmz49g4bbz26xcvadn74052nhrbmj8xm8fav"; +"dotseqn.source-1.1"="05zxrzpm7mcms2skh9mpv4nga9ysqwin8qjc7yy9prcaban00y33"; +"download-1.2"="0dwivfcjvg12gsf4zikyvlyb0p1pks6a2fxdqgji2x79ashxsm24"; +"download.doc-1.2"="00p9cjzqqh95nlda8193111aa5kjagszbf65wfm3jfy4dahqxfwz"; +"download.source-1.2"="15shcpxz2h0i34pnm2nz47h37gy4xdws87p8yrxbfi4j10qr8c62"; +"dox-2.4"="1vv1arqah132cns24s99s18ixcrjqfkbq551d94pjs8di7fiik2p"; +"dox.doc-2.4"="08x3h0750nbh20wsnlkfz59na5kvi9jsm63l8dh3l7b0szzq88cb"; +"dox.source-2.4"="1p5xmacd5phv5ig0ga1wj32fqpji9fl21lbygb39qdjr6v3g7vs2"; +"dpfloat-17196"="00agcljhzafzhbcfk1jbxaxyc3znwxd1j1sdhr982m3s1nd8733g"; +"dpfloat.doc-17196"="1nydmlbk1p4gywq0hh7jnvd9hs9lxl73khbpi4zn5j4blzkb31x9"; +"dprogress-0.1"="1sz7msvh7wyf5k8ag857lr11dqwf12p1wzi6kdkwma05i8wwni88"; +"dprogress.doc-0.1"="1s356ffii215bybc5cqg91gril5am5zzh5w4s1nf875yl4yjxbji"; +"dprogress.source-0.1"="1f7ym5lr0gn24jaca509hbhg9xr5mhbr5wgncvvf937jmq6w2jxp"; +"drac-1"="0p8li8cln7674zd40w8x6izn2kf63wsxpwg3dpbjnp5jccifvsnr"; +"drac.doc-1"="1lhibs5s6h0a97ggjkp1i8j02ry9p0zdq6pzjxm4ijx3fqj1p3rq"; +"drac.source-1"="1478yizwfvzrpi50k3fxbs9vq7g39170jdh7l3ynkbq0fkbssxhd"; +"draftcopy-2.16"="0fxh7h37akz0s33vjmnzxjp04m7ynb0z6650p5wd399lfg5bi11k"; +"draftcopy.doc-2.16"="1z7cjzk75d3gwcb4dgvg7a8jl9bvzqnc7zn0ginqcl0aih37yg5j"; +"draftcopy.source-2.16"="11gswnpz0azxb2d1clmpk9bis9cijsd1hajll7jxm5fhnk6vigfn"; +"draftfigure-0.2"="0dhjlykc6p6jm6p0s0h0d74097ny29w84ns1pxbb7f8iwr8hhkvf"; +"draftfigure.doc-0.2"="0gnazf3bmbgnygn3pv0lzrlrcic3j2yfqxq1kaijkkhsr9w57jy9"; +"draftwatermark-3.0"="1xrsh755whbaxizzljcpk5an5k9s09f6hcndp1lhw2z9mfnl2na7"; +"draftwatermark.doc-3.0"="0cnzbj2wg5kifqg08i081d0043462vswbxr68spnnxp2y3b5ysdj"; +"draftwatermark.source-3.0"="1k66347n1cf3ap8406dw2qa21k6mazwhv6brr569i0khsxypfw0a"; +"dtk-2.08h"="1dn61q1kxyahl9xd5aqscbz0p499iavp0fr726v2zdy191wk38n1"; +"dtk.doc-2.08h"="1pn9v2chglsggi98d6n9b9j5zsl6fqms5ykmqr9x908nixlavlmz"; +"dtxdescribe-1.02"="0xl8q9rb9nsfac6cjlbg2ind900agza2n8zid4ss4vr8g8zxaadv"; +"dtxdescribe.doc-1.02"="02hh98qbdymaxfp0nc8dg2yiw7kl94jam56636kig6ik7305zhwj"; +"dtxdescribe.source-1.02"="0fij0m7yrwc391imbafhzc7iynpc230myfjb2j3czzaklan46p7c"; +"dtxgallery.doc-1"="07c403zbx7sxkhhrwrfw3np20xlqhdk893b4bd6r8lqb0zipp5b5"; +"ducksay-2.5a"="0m8dznw00in6hpsw3qwv42aqn7srxrzl54azby1a0wpf1c1nivpg"; +"ducksay.doc-2.5a"="0d4a3ldjvblq0n4mjkdvizswklhaz67z8myak8clc60fd2pv5f80"; +"ducksay.source-2.5a"="1j4bjigfj3a81h54xwi7ciiixr4fcl5g4vz85lxfwyqb8gw01mc0"; +"duckuments-0.5"="17fz5mkr812ig337m2q40dcsj98qpczw53vjrsqk1skmknk0q4g8"; +"duckuments.doc-0.5"="1pbq66k699v3b6c02qx89dvzsh45knr4y9s6a45gkm4a7mkk5nkx"; +"duckuments.source-0.5"="0xcdlvm247d3hl7bvb981fv07nb5g24c0n0171vsk3hacxpshcsk"; +"dvdcoll-1.1a"="1b07xplza4b3ngh50czq8vwmhpr2qvkl5xbgd93a9acvsf5pyg6b"; +"dvdcoll.doc-1.1a"="0fhkdwyvlizlb66bd24pfncbg58a31ygnfg0f9dw5z9ccfrf50hd"; +"dynamicnumber-0.1.3"="0y779azvla68n692x0gybg74cp3dk32219v67qfamfzz389nbs7s"; +"dynamicnumber.doc-0.1.3"="1appm3ddbv9ll0mbnid4xa459w9q89swmdlvdzy1fxdps4y0vpz9"; +"dynamicnumber.source-0.1.3"="0ydmlz697c46fx0xpnvcdcfm9sm0j3jmk47xz8znd2ghzg395fgk"; +"dynblocks-0.2b"="1zb7vk34k3z0cvw6kz74s7831fz17mg3j9hw60diabc0q47pwyr0"; +"dynblocks.doc-0.2b"="1m69hys2b7fvwn9h6q3whkpcnvi04hnhx7811s5fqhdfi76v4zk4"; +"ean13isbn-57514"="0bzvkzpi10d9sjlsc4df5v3y7qycbz1qkn7ngy97prq58wg047gc"; +"ean13isbn.doc-57514"="1gf076ybmni0wzhh0fsf5w4sj4pv3c3w7g7m09k9607y4havv20a"; +"easy-0.99"="0jrza9lf3yf4d1wm6nzwv5iyfia6625fjvflfmxsscbmwqickjhx"; +"easy.doc-0.99"="0f72bawmxrxqk60xb61y079bqpxj8kmvn167plbq5whq5b1fsxfl"; +"easy-todo-32677"="0fkwlzgx20lj44cvwv8hqv79v528k1gghx30lvqhg44wqirkmy86"; +"easy-todo.doc-32677"="1yj3c25mhkp16n49riza4qchr2pqycqmb2k80syn5w3dzrj021s2"; +"easybook-1.24g"="0gjpknhsjkyfnhd0xv73k1vq5j6kii7c3ms4yim119ac831bwzj3"; +"easybook.doc-1.24g"="0rrsx7v0gsilsq2z104zyfp2021zwm511gj038zj059k4ri2hsvy"; +"easybook.source-1.24g"="17rlywp9452hsagpf4cn9p2z5ap8348nyccmidxxqfiys5ydhhn6"; +"easyfig-1.2a"="164ncaq1l6hdrjp0zinynf825hwsky1xam2yqxphhk90438n5hzk"; +"easyfig.doc-1.2a"="0hc63z5456f00a2x70ckvf3r54zld4d3r63a8d4ra7502kk8s9n6"; +"easyfig.source-1.2a"="18f4bb9yf3f7q96w79rhx8h4svlxnv0xc6xwcawav63zsk40mk7q"; +"easyfloats-1.0.0"="0vbg5dz6wxzk20rn51xv7v526qg8m0ih3wikabdf1bfb4n093k2k"; +"easyfloats.doc-1.0.0"="1ncmmmf2w313cpsc9s4w0c3gzvx09r26gwlxhr9rszksvd4y7fay"; +"easyfloats.source-1.0.0"="1ih161wrkxf8sfm0zyl2m9xgmff4qs6qvsz7mzxbjl1j2zxzhhf3"; +"easyformat-1.4.0"="181x0sycxhwcfna2wblvijjs32zvqs6xl2am4hz8204mk321rjsb"; +"easyformat.doc-1.4.0"="0fg7y02717rk6ikw32qxn6iw7l59h5vc22aif6hs9xjnbm3nhhfr"; +"easylist-1.3"="1ghjps30fa1jvfkxrzaxqvy5ilacdyms6dl8bf2qg6195w2sgm33"; +"easylist.doc-1.3"="13wgq2pz9jw761p2yipf23k6lrx66bp25l50446rp1xz47yk386g"; +"easyreview-1.0"="10wl0aihr4c55b08mxafr0jd1xaz640p2kj7n63w3wqxzxlpq42i"; +"easyreview.doc-1.0"="0nnnr4l1b6qhp75n646pd446s7c3pc4fxsxw84gvfqgankfsx3zz"; +"easyreview.source-1.0"="0p7xrqivvb685d0xcljyi4whh5vr6yahskdl63ynw836bmin1b3z"; +"ebezier-4"="1zmsrs7dpw5gwh6h0707gxcpsnbb8qklsqnyr0q30mziz1wqhdvb"; +"ebezier.doc-4"="03afnc0nw7yzv03n4gq38js3y6x5v0kaxi5psmnzpf2lj0kfa7l5"; +"ebezier.source-4"="0492q2l7yrv1h51x4swqzfp74k9kb989m0lxbgvgffh4gl7zhi5w"; +"ecclesiastic-0.3"="008agcka4wj694snynfgak1ycm49rbkwn3z58470adc4rwi99klf"; +"ecclesiastic.doc-0.3"="1xmbxkmia5pcr2l5m3rd12qzpq92f75rcbipgpvck6sqpp7psc8j"; +"ecclesiastic.source-0.3"="0c32d6fzzn090hi9nxdj3qbbhp4q11siziwr7m6lp2l285n91wj6"; +"econlipsum-0.8.2"="0xca6dhbz49zxn58g5bc2yis2zci9v5iypfh3h53rxhlkbfbcqln"; +"econlipsum.doc-0.8.2"="1pb6z051r40wp8rv5makhaxbf23aq5j5gm6pw1khvhk806rdig4w"; +"econlipsum.source-0.8.2"="0j26l888qx5q5j39875iab4106fkn3ign9fmbcmcvf42yzx7mav9"; +"ecv-0.3"="1rvj3rf5vrjhqsz070id4i3l9svwsgclfhkjzxlb42va1bqxkcdk"; +"ecv.doc-0.3"="0cp3h8pagsxpr0i28v8x9dh9j6imbprd2hxrl6ln2m75c9ki2wmk"; +"ecv.source-0.3"="149jwhqpmfn6gwzkcqpilxp7hqnidjlvhi1khqxnvq3k947x33js"; +"ed-1.8"="0wb34cch7jfgvfql5jy6vvfalj9bv6pjyd9dg2i9msq1azvrjjv4"; +"ed.doc-1.8"="09kn8cykfsyk14g428v72l2ppwffcdrrycnyl65kixv8hj0vsdy6"; +"ed.source-1.8"="0ldjyl7gpa5fswzabzmklkwmz94z8al7pm97hh0yjzdqgjxfsdbx"; +"edichokey-2.01y"="0c4hwpvassgrlycrjygwywp6ws91vhhb2wq1jwdla8x3sk7hkdr4"; +"edichokey.doc-2.01y"="1b79022plz2a6gbf1grrcg4j6794fd0a45lmq68lci64mz33b66n"; +"edmargin-1.2"="19dmfw76l03v87igfhmh81kbfsp5zbznk62vqpanpppspchlx7p8"; +"edmargin.doc-1.2"="0v9lbfynw840xampn4sgxmq413357wjwjr5slzrlpv9mh1f8z0jr"; +"edmargin.source-1.2"="00b7b5c4n7baw4c973d0b3d4gzkr5k7m4xj258sw2bhfgaqnrjd0"; +"eemeir-1.1b"="0hxnd2rxrm56vblrkvg01c1pf5gccbmvd9lvrwlch89flxp3fiyd"; +"eemeir.doc-1.1b"="1s576bk99sw867ywkq1qhk31yycc19zqr34ry2zix25cs3hk4pia"; +"eemeir.source-1.1b"="01z6p0ndp3nc3pbbwchchfn9nlk86kp35qvb5hkqb3ha59wlfyzs"; +"efbox-1.0"="1jss3bkgyl365rkgzil7xp4pab8k00w57p60s2sh8wrdy10qjsda"; +"efbox.doc-1.0"="051s9yc05ai0yipwm5f5kdqxgiyiyzmzyxf8rbfwl9ir90k84fq8"; +"efbox.source-1.0"="0fcrnrfk6yrdhj25xmchlaimc5qqyhri287b9pwdwsxlr58wgx9c"; +"egplot-1.02a"="06i2jh1srww8111c2axcwn2lcs7lwdgp7npn2qpi2x7g38i2kkzv"; +"egplot.doc-1.02a"="1silqbylbkxfyzacmyvc3kf8g3md8931ax1s877p5x5zi0vpwbz5"; +"egplot.source-1.02a"="0qsyqhmx0gcl13hlhbia9rq82kkkhc6mhmzp56g9b62qy2wl1ss8"; +"ehhline-1.1"="11db4dh948g744bynf1ydlg6jk562picrzfbh5pszxvfdag91kar"; +"ehhline.doc-1.1"="18jr25hnp8hg3dbjgf16cskdhm6kx9nxliiggqixb7c1ii6mmn2v"; +"einfart-58414"="03a8c7b2nd4mpcipvnvv13f6prji5kd0382f57hkyliyn4ak9dmb"; +"einfart.doc-58414"="09c3a1wri0li7fzxxaj30hzxypn9rn3xlb03cy5vzwis0ga5rrly"; +"minimalist-58395"="0pqhsxvnjmlaciavxnj6z8na259w3ibbbcjk8binb977i3g5rcyf"; +"minimalist.doc-58395"="10yk6v8603ssficdjhl0hky6wcyisimjymggi0cjb2gfvzsn9faq"; +"elegantbook-3.11"="0hw23xwfgc6wvrqks0sws2aczpzi988i9i5drv9cngnlrj0wi2qr"; +"elegantbook.doc-3.11"="0imczlqh7rwd37vrv3dbhds2bvl7526ba2fhvggld9srsymciswj"; +"elegantnote-2.30"="0wdhwn4c1brqalghyj2mlpvn32kln9rck1nai16inihq41zqnz1m"; +"elegantnote.doc-2.30"="1byqlpjxz53c29sdc48073agpy9pg88yfbhvp0wf4fp7l9jl2m0l"; +"elegantpaper-0.09"="15mi33d8ml27axgkfqdvddwa6hyg02w4bqyd5wnsvai9fisigivd"; +"elegantpaper.doc-0.09"="140mrxwr89gkdswizwrgn0dirq0lm3gf5vvrwr5f7p961swqzk6h"; +"elements-0.3"="13hcg8vysd5ljbkpjicxpnvrdc1dg1c2vcf8lz1m7x25g2sgwq1x"; +"elements.doc-0.3"="1fp0jjgyd5f46pxs80wnz550jg6vv0dmpr45zn87anbq8mkxzcyi"; +"ellipsis-1.8"="1zbasvm792cghiji6gkg27ixjx7ms46rgqbi3wphpm9dix9296ap"; +"ellipsis.doc-1.8"="1w9hp2k4qvhg5275iq5kq79ws5z6i7jb1536h0qrznm0lkw33c4y"; +"ellipsis.source-1.8"="1z8f3x734nc364gybhslxzvvv4502a29dmb4nlz39hm0kzgqq3h9"; +"elmath-1.2"="04vacr9c71nmrbq6hnhpcgk8g75jzdvwf6z513mqabr9d0gf84l5"; +"elmath.doc-1.2"="1da0lrbzy598yy9jisjq0yk2qfjfiqpj32l1v63l3x7dff6yi4dn"; +"elmath.source-1.2"="19q44k909mkxrwsqx4zvraa8cv8jbq8z46xnm53agk0jr94bpiqk"; +"elpres-0.8"="17iqfpd37yhal9mwz6rwws4v8cdkv91iali8jxcjbg4xsxnsv6pg"; +"elpres.doc-0.8"="16ca64sw810if3vx2a2vcpnl9yilav2k8czbh5bmv8wb2ys9yg3l"; +"elzcards-1.60"="14vd8vnnss12flbszsg8357831r986pk7hhpcwqln53r6x5kd543"; +"elzcards.doc-1.60"="084zcf7dqig379cqc6ahiqkm8f5jwqgiizd6h5ki28pcbshi49rr"; +"elzcards.source-1.60"="1ipavy4km50d8larywyb63dldmawawzfw3x6m5nzvi70zkx1f6rw"; +"emarks-1.0"="1qf1qrbw2fsxc137g8dfsx1c202ylvg2ijdwcmxq1fv1pd2zjjwz"; +"emarks.doc-1.0"="00fkdarm7i16vlmjzvjpkyp5v4mbdc6isv12g07shx3nz5v4zgp5"; +"emarks.source-1.0"="1lznlfqhcwd3r8dp4cix5jav3dq63v4wspr1ks3pm0bkycy8wr5a"; +"embedall-2.0"="1078qszq99jdcy2vsaxmg1fbnr9fdbd32y5lyxl4bwl0ja62m459"; +"embedall.doc-2.0"="1c17d4bpzxws6j9z5p7x97zfggyzyadfjygbhi7ykfiy55qywhdd"; +"embedall.source-2.0"="02vdmjb6vqvqmfq7fhn5gb09x2lzpmrfhx6dspv33wmwzv99kzr0"; +"embedfile-2.11"="050xldq8z85rq6ma1bk2acnirnfbjn8yx3v3x1s2sz3qilcxmdha"; +"embedfile.doc-2.11"="0mmq1yrhfjhbna9g8cpywrz76jhv34mrxhrgnwvwlhac2krs7w4d"; +"embedfile.source-2.11"="1dshj04gn4krv7fvbi5yxbirc0di5v326hn6ij19pcmjj9afj29v"; +"embrac-0.9a"="0n2ll7mxgw228qb3j0x111yyiaa4ikq4797g5k8xyakjmv0w3sv0"; +"embrac.doc-0.9a"="1lqapcz7iv8z7df7cyddg6ylh2b61ndgbfhnfa8abzgsqz1h8sjy"; +"emptypage-1.2"="10h1mlhk0841wgc70hp51jnah14si7rf2mwpkp8lfc1xr7jwwvi8"; +"emptypage.doc-1.2"="00l43lhrr246hiwa717b72rc4ignqd3kljkw6ka3l8z1nzbcbni6"; +"emptypage.source-1.2"="16nzgkvl9gqsnhx38dp71c3cz5rrgm73n99g2vg7rapg0vb623xi"; +"emulateapj-28469"="11yv57sv6ys3g8h2ix5xjnjrbnyfvcma4i7vzdsj160rzi12n06v"; +"emulateapj.doc-28469"="15zm7jqpk917l1r2qfkqdkbsxa2q7w4640h9115v4jis0zwgj0s9"; +"endfloat-2.7"="1vqy4ii3dz79ffpjc5n234z9v0lqpkq93vla0lbq0791h71gv53d"; +"endfloat.doc-2.7"="0y3hkihs6pc0g835nk21qj8v3g27f6rrvadwmvqkhchvgh02bwnl"; +"endfloat.source-2.7"="0mdr1ga2p1ikbcs0zzznb1c89n8shrha87qm49sgzbj4d0f2gdbx"; +"endheads-1.6"="15dkd3ky14phrc9cndisa88vbmcp48wly8l27k4wvbbd0221rxwr"; +"endheads.doc-1.6"="0yp1rm4ly2005mw488yscrgc0y8awsis83wwcfh3qh8rcgm8jzhy"; +"endheads.source-1.6"="0578fyav3h5wz40c12r3rqzbsba7vqvk0r5jlw6wymk2m9n9n5np"; +"endnotes-53319"="0hm5mwxdvxhj9v51y88g6mm5fs9p2kaksmhps032cbc1inn5asj6"; +"endnotes.doc-53319"="0354v4klgz5yn1v9hkk3zpvv3x1l4b6jzla7iwxpnk9qb0bvfh4g"; +"endnotes-hy-54758"="194n7n7xcjpsxijzsjpgsxrpshilki0ixkwlbn6hxd92jjq7amz7"; +"endnotes-hy.doc-54758"="1mj4lfvn86676s3sv0v3hx07cjb4mm3j3i3swwzxg0i48acpch52"; +"endnotes-hy.source-54758"="1qhf4zzhk7kf0wcpacl82przkcf7g8z6jwirrzlwd39876jmhbwk"; +"engpron-2"="1jxk1j23v2c2ffqp9x948gkjkqvifp9lhd1wlp2nhmr4k0k3pgmq"; +"engpron.doc-2"="1j580xz1jgw088xah57zv8mrn3wgm6xipj1jf3c0rxyd3fkkk29v"; +"engpron.source-2"="0gg46lfqprs6jr2dgpa1c882wz9k8jjzrs281npy8hk4hhqgrg0y"; +"engrec-1.1"="18qzqg4i4f2dcpqdw4zs9lk8cxlxxn01wbh8a275wiaqj5fi7hzn"; +"engrec.doc-1.1"="038a925h1047a8wnwm54mmyq12332waxx8nbrg9m3pacr45hwmgy"; +"engrec.source-1.1"="0x32a3cgh7pidln750qbwxl7bkzcjwj4brxbqmhyfydnhzw1xzar"; +"enotez-0.10c"="16qlbi1s3sa8m1zmns78n2hv05f3qm93xhcmagix2aya7srifv4k"; +"enotez.doc-0.10c"="1iygaqm1gdiyk6s786nby1ahwc0rgaps2b1h4b141gdczm03dyn8"; +"enumitem-3.9"="0hp6sk3i0a1jwwvlr0lk4w75fc57c2fvqw9x5ir8db049380ixyp"; +"enumitem.doc-3.9"="1byxv6d9g38fhd83f4g23yqha8nvr5iv6lv97w40jn58i492dyrq"; +"enumitem-zref-1.8"="1isvqbp7wvib81r0yn7sngxa2dygkfm4jn4rdvw0kp8rknam91qh"; +"enumitem-zref.doc-1.8"="12ffsw4mzwg8gnw264kvc9gpxcmrhda5pwfyml2ih50g1dj6fwv0"; +"enumitem-zref.source-1.8"="02y3rlxcsdmafy4n4iiaz2j3syg5x7bzwzfvfk87xxg0n3bvahl6"; +"envbig-15878"="1szn3ngy2iwzbc9y5fpchr5vpx5alr908q8bfg94lylmb8lx2kb2"; +"envbig.doc-15878"="1y778gc6wl11afjjv2szypc8jf1g7gg2s0lvhv2skl1n3wpb3x7a"; +"envlab-1.2"="0q84vy7zbjqrrvy0r2j2hpbg9b5vwbwk860q24azms2zxy50a8vd"; +"envlab.doc-1.2"="16fnyfvvixp6lfgvz32w92q35s21c92556qxbgpcd94fd1pw2bki"; +"envlab.source-1.2"="1fygp7wpyzhzh070sa61qk17h05rqr4m1wqp78vpp0awgkmdji56"; +"epigraph-1.5e"="1lb4wzjcag59dcfvizvng9s47v3x2af6v62hc1x3ck3fqzx9haa4"; +"epigraph.doc-1.5e"="1h13sgi2bxknx2m5kxxlv9p4fxf1pxh1zdwm98h3kamzb4a4gm81"; +"epigraph.source-1.5e"="0kqfrmx732m0a6k21iiq1ar47ff50ri3f5wy8ib6ssbbvd9agx4l"; +"epigraph-keys-1.0"="0p4m2z9v0ckjncy5mpfs85nzpzzi9lx30a4dh6rjkhgmnk574n6m"; +"epigraph-keys.doc-1.0"="0gd3mcw13r3245dmd3fsgyww30f4anwff6vj14xsy75zcs9k0ywy"; +"epiolmec-15878"="0wn2pi3n9ls945i4v3x36kgg34sqhi1x4az5gq6lbvviin4lnrvf"; +"epiolmec.doc-15878"="1j9n7g9z2wbbq04wh2x0cxx7m4zggh1scblwrx9g69sd8r0b7582"; +"epiolmec.source-15878"="0qairwq1jfl5jrkrwlblmsc9gb34wpanz61zmsawz94yf3plwxxs"; +"eq-pin2corr-1.0"="10g0hf98f9mrp9k918nra9yvr8jrp2kbj78rn51cr5kgar17q1ji"; +"eq-pin2corr.doc-1.0"="0rzl206gg2h63rmdxyix4x0k3k21fn2bd7gp21ys757vd4q53jdz"; +"eq-pin2corr.source-1.0"="036ff4gi94g0a2qkww32dw4j3cq9gz05ah44n6pv550p8b9ssfy3"; +"eqell-22931"="0i0n1vb43vq2axghik3sbs2cja2fi78jl0q5xcrkbn5gr6vi49md"; +"eqell.doc-22931"="044bm3jyll74jrxh8va8g38shjn3b7wzchjq39n4rjp3238wirsm"; +"eqlist-2.1"="1cxas8g683y4i22rdakgji1r282mivmnap2l0b80rv3adg3ccvrl"; +"eqlist.doc-2.1"="11lbz2s5v35w13vvcf2bs4y59hsdd0haai1244jqswyfxgamybgg"; +"eqlist.source-2.1"="1lw20i1iqb0lxqpv2g7dw62ff4xd8w8k4y2ccpqmsb987sk223d0"; +"eqnalign-1.0a"="0214pwf689rj7ycjzrafkhpj1rrn74h043vryihyscci03lf46fs"; +"eqnalign.doc-1.0a"="128yh629nnxn2ca799s9zxbvbp0zam1lrz8nciinfbb10m8igwv9"; +"eqnalign.source-1.0a"="0pdzvs4hyyxr229jlcw7766qd4npasc676hf74nx0msxwm5iq2yr"; +"eqname-20678"="1qryjgmn2cw2indmmybgzrcrakqi6a3crvdcyvj769mciz8lsdwy"; +"eqparbox-4.1"="1bg49m7nzw20g2g51g07d7sgq0sjiisrbaq4ca31qbybr2rxcp12"; +"eqparbox.doc-4.1"="0z86nwj06zn55gk32wwlxbqfb12a1fcgqizrpagm7yp0xr99b8wm"; +"eqparbox.source-4.1"="1ny9mcnb76yds4l7q35wdm0x2vzia80aaqr12idybkzi75a7b2yp"; +"errata-0.3"="0hp8pls350swslim7m3cpnw23v94vnqj9avfvx9hq0bgl99szc5c"; +"errata.doc-0.3"="0h30iip57km31074cya5fyhlmyamix8anpk19rqbsfb43h3988g8"; +"errata.source-0.3"="00bdq20dwwmq0nw3c271ah0bclzkzkwbr5ak4y9asnab1g6fl5yw"; +"erw-l3-3.1"="1103f0mwhjwq575fg099v1xsqmm3jg0rfgmz7d8xqpjjy3y6g7gd"; +"erw-l3.doc-3.1"="0zhbp441kw9h9xmhfvzxkzisx4kzq3ba4jgkkdrlnd6zxl82fdgm"; +"erw-l3.source-3.1"="1yhz5jmbapzjr5xk27pqjs6y1cg0civ78gzz8h0g6klp4jjgsigx"; +"esami-2.5"="1qc8vwxmbhppzpvqbnf7c7163jhhw7fqva423f3yr0nmhhzdkj9d"; +"esami.doc-2.5"="1i7qdy6q824hb5nl21d5j5p91ll7ki5x47w5l8lr3cch81mkwxqi"; +"esdiff-1.2"="0p5d89r6pzsf0hzaky89843pa4z2n4dgq3yg8li4gb5m2b4fjfkg"; +"esdiff.doc-1.2"="0jw4rhkshni47zdk18b3gd4amyhh6v9a1mgja58wmp2vrwv1nn2f"; +"esdiff.source-1.2"="0iwkbkmkl31wmdrd1wapd94p70mwd45lqld3b7pfb0j287nzkzl6"; +"esindex-1.7"="1vxdlbqc3j33gdvy04pifd0cdfvnjwmpqbmz305g79733hvlbw55"; +"esindex.doc-1.7"="059y8wnnzqn1kfy5jhbpk8zi4lgx7r5s6xg6b7x3iih1ccdyhwma"; +"esint-1.2d"="1i9bmx7sk3fzzdb1ny4a9b3sq9mjjk2x78gk18y77rxq16d2bjnr"; +"esint.doc-1.2d"="1sdklwvw46yj8xbli4yl6qqp5jdm9a32fkspk72p5186swwkwnc9"; +"esint.source-1.2d"="0j4ms51a3qzk7mrc9vh5psk83jxnlh5xa8vq36y9iihha0d6rz6x"; +"esint-type1-15878"="0nfvka430084h72w0gdlvbxxlay9lp5z76bckmr5vd1vqi4jz8kn"; +"esint-type1.doc-15878"="0lp2hc76adxdl44nn4g8hb19cflndzg9ir004di3wggh6s2yx40a"; +"etaremune-1.2"="1l3xz9zh5f3wj3v3mvq9xk4q6vc7k01pq3ivsvm0qlkni4bffyja"; +"etaremune.doc-1.2"="16v4vsd7dzihnx72bdz99994kpw6r5im659hm51w5wyh8gf8mp29"; +"etaremune.source-1.2"="18rcvjpyks01d6qkq61rmngmwwyxksh4i5dmnvq8ihx4vj3zlgqx"; +"etextools-3.1415926"="04x0a0wy3avac8cgjgq7npiy06b0vrkxa0hizpn4vkzv7xbq79yd"; +"etextools.doc-3.1415926"="0z04a5f4c1xygqsgkss4bh0s41aqv0i61sh6x9h0isrqlhbvrzs5"; +"etextools.source-3.1415926"="1f0jr38lbsrdjxhihxks57y6xw37ghgmydcq48ll14nywx07qa2l"; +"etoc-1.09c"="17bqav13vx2jlp31qwv7nh5sp4ga8spwm6x48vxqh4zwwc9fkyrq"; +"etoc.doc-1.09c"="0jngh1s0b2iz1xizbidd5wlwcidyda9r5filn3qflcxkh3mhkms1"; +"etoc.source-1.09c"="0j55yrbaswhmjixjmkj3pb652w34nh6pjgdm484a9s2337399rld"; +"eukdate-1.04"="17r61096angayvbdi9r3d7ljb1a5z9q9r093kpgdsi11ahcgsr26"; +"eukdate.doc-1.04"="0071bi5m6v5ak6g5pxjxzq5y5353mpdjx4f2dbznkmfd23wp8j7d"; +"eukdate.source-1.04"="1p6vg8nj8qipj59jwvp4izf2dv0l8490773h6j87wlclnnnlh2gq"; +"eulerpx-0.2.1"="04lcc883va515zqv2ql7wwffr352qrlg585q2p0i6hkdwhc3s4lv"; +"eulerpx.doc-0.2.1"="192dagl43ni38591fky5ywird1vlphqzw6iakj24awffnxi3sm8v"; +"europasscv-56829"="06vqrnfzcq04mjk38q75n1k1dw3ap7z5xnzpjmgss8rl6mjn4v3d"; +"europasscv.doc-56829"="032298ir415l36gakqalg5n1nk70c47xbm2svvg1ygb32sgn4afp"; +"europecv-57641"="16mdycdlk7nvb5g1mpz0lz4vcf0g117sifivr4bz9aqmnsfsw242"; +"europecv.doc-57641"="0f98qm36flvns48z6cn0v7n0fiqcwb6ji4gvr31xhbgf697kzs25"; +"everypage-2.0b"="1i8fjcbk3flywzd55y0cbsdmzymvkynvgc5cvv6yh5y6nr514rjd"; +"everypage.doc-2.0b"="13drphjv7gzgdzzwd6fxlngm2rprhls60gj4lz1v69sqifymnn4h"; +"everypage.source-2.0b"="0vdi8yd0r33ajnym0f3j42ajkc2xs8b5yn3kmklmgx19kpc93ln5"; +"exam-2.7"="1ybbxy46wn1xz4b6vd6g7y01ijl8a5yrgc6v48jilnhwdh25yklg"; +"exam.doc-2.7"="0lva2zbslf01bsd0jz8k1k0xqmbf1jxjsqridayv9pq0ysn2m97a"; +"exam-n-1.1.4"="01yw3s29jkvrcaa8krhdyf4k53kmlx4mb5x2p933jm73whvlmwqa"; +"exam-n.doc-1.1.4"="134d4g914gw2gll8x78z06is7lhihxcxyp94jf3mpkn569m608jb"; +"exam-n.source-1.1.4"="1qd2gaq55rz3x69lidf4lyifq2m9nzizly0wqg3y9wygb7xs8sc6"; +"exam-randomizechoices-0.1"="1cj863bz3sh9xz6g0kpi0131z2zf302vrzjfhsj02d903zh0f2nm"; +"exam-randomizechoices.doc-0.1"="0bsdysbdy8ghmirwxagfgfp46aqqk6pqmwhmm0pkllb2vmf961sw"; +"examdesign-1.101"="0y9kqiihidv24553zlijr6fspbayvram1mqgy9kmd1wwskvbza3w"; +"examdesign.doc-1.101"="0ddgn0f086qdsyssg4gm6ynlcnnsd16qpvn2g3wzija7ai5sqkig"; +"examdesign.source-1.101"="0z5539hv1li9vw0d3jx7q9s844f29wi9xr5z30hvzl3721rnkvzg"; +"example-33398"="06ld0b9gi8s7y6igijylfvj2qvj3d45z2ml9wd1zfzkpf32pghmy"; +"examplep-0.04"="1a3pdaqzc9jx2yf66vmjg9r4w07b8afyqijl21np6sf7rrsn7zg8"; +"examplep.doc-0.04"="06jqa848zzswd5pbfrvr9lh3i4l5h8wf3v9g179g3q2yb4dmvjwv"; +"exceltex-0.5.1"="1075b0wm708wj537pgki1hvj58l0pfrdiglalbjnk3gmf18rk22d"; +"exceltex.doc-0.5.1"="1s48mcj49j9jm8vs5nhvljb972vhfng09xvd6kiw01a7i4zpw3h1"; +"excludeonly-1.0"="0zfml40br991mijcmplxlff2lzkn8fdgwgxcam7vnr23kag7lzxm"; +"excludeonly.doc-1.0"="0argzz7nwadm11qp642r454w8p0swyhvscic71fhwi47n69cfbgz"; +"exercise-1.6"="18f7mgc2lmm1lg13dm858nqsqzga52sw0r6zlz7f0pv5hpc0mgak"; +"exercise.doc-1.6"="1y50izz1z2s52knqn9a1jianq36isyafviv0yxqqx6zdfckqca0p"; +"exercise.source-1.6"="0lpslsk9a7dx5xzr5iif1prvrn399j70wfcqhgbypz970zzpril7"; +"exercisebank-0.3.0"="1algypm3nhkbccd9k1w5qr6y75hqiinw5dj1h4fbmripmhdwircs"; +"exercisebank.doc-0.3.0"="0szpxkmx8qi3zpcrjzd1nzn7jcp30wf9nv8rp77x7rd2yd0sw0dy"; +"exercisepoints-1.2.3"="0vr2yxqx2ng1f9qybapz61146lvsniv6mjwl1yfxk10qyvdw3pnv"; +"exercisepoints.doc-1.2.3"="17kz9fyd7cc4pa4j6dsm8h5zpwfr68wg3ndbswgh2pgwwvf63777"; +"exercises-1.1"="1yvdj03hr40732swfsg2br9f4wx9855n7a3whlqjdnczp6545lvi"; +"exercises.doc-1.1"="137g1gvwfxm3gid5xvikrqk0iw75csrkqgrwmh0hda28dd4zbdwg"; +"exercises.source-1.1"="1lryxm36phhp7p269zzf9a200k9k0v8zw8qyqvyk784vmvyilv7z"; +"exesheet-1.0"="0mhdvkhyk80ikdw1j11yvghhb8pgja78yjxsh3savf39grnnw7vs"; +"exesheet.doc-1.0"="130pczqsc1a0awy7yi0yy2wk9467nr762j9my6f1w0qi7vb5i8dg"; +"exesheet.source-1.0"="0x8ydqs3xgg8zzh30bbmz9yj7h7q6jb6xvic8lp309kd72vhk0cb"; +"exframe-3.4"="0sc11jk94l0nmjjd69k6nl7j68szdkihim194pdxlyiybwqf9bbh"; +"exframe.doc-3.4"="02s61k5lpjw121cyxkkhlbm5d6wv0gl009abkjbidpgxbnd5yl4z"; +"exframe.source-3.4"="19y20l5g814cvn9z0axpkynxp0vwkay782dmn05g6a6qzjb49i0j"; +"exp-testopt-0.3"="0g7q4ccfamsd7sr7wb0qsw74dnwiyz0rjrniaxm5jvgaadiinc7q"; +"exp-testopt.doc-0.3"="18i2ym0da8vp3xxy5q2gaykvja3dga4l64q9zjxknkm50vj6dj23"; +"exp-testopt.source-0.3"="1xfp15q94icdq773ivdvk4n47i2k3g3y9smdvmxw5m9f35nayypl"; +"expdlist-2.4"="09yhcdbx3n7gj3g2v2yh4navgdf5ik4x281h51kd1lzdzbbnf3aa"; +"expdlist.doc-2.4"="1qgwn2ignri6wh67wwjsqpbk28jch01m8fn0nw6lpc6kfa4a9g6v"; +"expdlist.source-2.4"="1m8dww4i5w0hivs904v8ls1dhs35vp3qpbb44ihwha0zsbvghabk"; +"export-1.8"="0la9v2m3n15hgds8mmp1c56dz0a7iqygjk2qnd99n5924n187wyd"; +"export.doc-1.8"="0ipbs7rdwjp6jrr4drgcs73mc8fy6bav24qfda1an7byglgcf2nm"; +"export.source-1.8"="1q3xbj3zicbizadihwb6b75c4d95b6wq0adi45wbqf6hzj05bd5x"; +"exsheets-0.21k"="1ymcfy9i2ll048sc0gyljcbwa06m9q0g6nxp3csvk4a367wv9cxa"; +"exsheets.doc-0.21k"="1l3ln3xkniyfgmhrs37rixszacsvalwq78fyh72v8ca61krxd35q"; +"exsol-1.4"="1jlkz4c29bn3wrzlbyxzz9jl7f6iiyvz89r5r2cvnlhfai83lk6c"; +"exsol.doc-1.4"="1z663c69w62v8fcm25ikaw58q3kxrh2mh357zjhgi8ki72wjwja3"; +"exsol.source-1.4"="1ja9w1k43v1yjfa1jhbzghdqha6i19lc6hsgsncr0zjm4ky104w9"; +"extract-1.9a"="0yfxyzmicqczvn6pc7ykakpm2hjsrsb243n1bs0crjsvacw29hb2"; +"extract.doc-1.9a"="0lkljkwf22vq88nj21ca023ysa0hmgcsh7a0xhk210ba01a9433f"; +"extract.source-1.9a"="1h06ji378l32a18nbf2plhk4q3vzihc541d0wkw80ik53m0frn0k"; +"facsimile-1.0"="0mfzqrn76b2nhz60rqjdr55s6i9fzw96ya74nncvdjjcvaqpjrjk"; +"facsimile.doc-1.0"="1i3vv6a8r1mmkmpjwr66r0isha7s5ksp5cwgx3rj9sl3wfnywsfz"; +"facsimile.source-1.0"="0icxnmiwmrjsp1lhhdkcgsjif1s396lkdxp73vz59afzhwdm6l0b"; +"factura-4.00"="1jlql1yfkcrsbfbgjdwhaz8rjcmm1d64z0na93ycgldv7k8q87ly"; +"factura.doc-4.00"="0cw8gkcacf93xhj58j8zxnf6xn8cp27z98jlhdha3kic4k2w79q9"; +"factura.source-4.00"="1gzhz8ighvggbybjcvcnbnk79j679i1vjqizwdvbky1qpykgiz96"; +"fancyhandout-46411"="0fgyvrww1h79bvwf77h83p2lwff5b564gk8cjjnkp26zjpphah22"; +"fancyhandout.doc-46411"="0r5wzyw7z8gsm2k1y06h9gj5cfxnclawicxdjpq50dnb6233ac08"; +"fancylabel-1.1"="0fyrhiknwb658rg4lkdkfb221yrvzfs5g2rmxfas69p6aambyv36"; +"fancylabel.doc-1.1"="0fpxag39xa2piybkb19fldg3ykwb26sg700jp8hy6kgb8afp4hrw"; +"fancylabel.source-1.1"="13hx2k4i8ji3a9kxd8j2j177l4d5asz79r9v707d8i8vkxcm1ild"; +"fancynum-0.92"="0vfis38yawys70hv4vrrnyy820dj89dqp38jbg199pbb8y0qf1kc"; +"fancynum.doc-0.92"="01f7d3him9gcm7p8567ljamwrg2jl25xs7w6jm05l89dkcb34fdh"; +"fancynum.source-0.92"="0cfm5da0gk4y8plad5khzhf9gjyayxmca67qpvdj296p86xxdi32"; +"fancypar-1.2"="0d0yl486lw3lwk5p893s91z954065j0yjx23a3na1j9ngw1lbijs"; +"fancypar.doc-1.2"="012m4rrp9j89ahkm4nh40kn6xfd9rxqsyyf5kpf0n5yii9yb2qwj"; +"fancypar.source-1.2"="0rbzph490cfwybjdqndnm7xdgb1ffbciv9pxs21wbvgvyh1cc9gd"; +"fancyslides-1.0"="0hfa5jklvybgx9rji032rdmyh2qr63fkyanvvs0jmg1bkpqw7s03"; +"fancyslides.doc-1.0"="0nqqvkv9gsl3jp22rjkxrzklpz6dfmm3wy3mc9f15jv9iy2zlrr9"; +"fancytabs-1.9"="0yxr24fnjabfzhyvfj7nhn26cc7hi08byw7zzmky3nnynxnxc2p6"; +"fancytabs.doc-1.9"="0f9b7rvnz5syq5dghj426k9ypppjg4q9wzs8v3jl8af94xy7zrig"; +"fancytabs.source-1.9"="10p8hb18qrwp2dxsjybrawnlryl97k854l11c0327r39qiya61ns"; +"fancytooltips-1.8"="18hygq6ks8pihlamr1pyvmsrbsl8wa0kx2qy8san53hd450lqn0y"; +"fancytooltips.doc-1.8"="0q28xlckjlm231r14ysl05ic3kb6aa5qnwv9x0qj3iz3lmyfq9zs"; +"fancytooltips.source-1.8"="0nhmjrivw8a2xhblhxnjbyvmz4hp68sjxnnfzmqyrf1agjgwz8m0"; +"fbox-0.05"="18974iy4qh17kmhzjrbnzm208y5wv4bq7aq9l4cdqnvzacnkad0i"; +"fbox.doc-0.05"="1m81a4n1ar5k5rpsjfbmqnwd2mnrhidl4bfgd8jmmlxnsfd59q4q"; +"fcolumn-1.3"="19in9l9wg7wb454ffmfhnmhrchf2m5fbw0kzk637k4bb5w8c48xs"; +"fcolumn.doc-1.3"="1fqgwd0lw8g1w0bifz6wdl6mx4378phzdpr5xbinzflmzzj2s700"; +"fcolumn.source-1.3"="156wmyx2i9fgvzfc9b9h3xxfii6jda2q7rhjqpbcqb650q3nfy6v"; +"fetchcls-1.0"="1pccfz68chmnbfi9qnrmdnyq5kvkq6ir5dl09jqbjlcw7hw82ka0"; +"fetchcls.doc-1.0"="0if19dgb2k75qhyka4jiijnl3msk8y8kj0fzhriarsicivwd47ds"; +"fetchcls.source-1.0"="1qb9ymkvbxmxlpcs3drcyk02bc372s0vhw6wwpig2bchb1hwdl44"; +"fewerfloatpages-1.0b"="04903zr0lk50i88vywpbzpg908zkmy0w8vcfks55cmbfb2ja37qd"; +"fewerfloatpages.doc-1.0b"="16hb3xm2aszwlagzq9w3bi2hyanbss3s4f09sypg07dkilifdnv8"; +"fewerfloatpages.source-1.0b"="17rcaydy16vqnlgn76ijhjlv2jcnw962wrsssca8z8y6dfvy0aqs"; +"ffslides-38895"="1mpfpawdhh16rl6pnvxnkj95gf9hjs49gj7cwfyngmqkjc2idi8j"; +"ffslides.doc-38895"="0z5kpim798zxj20p70dpcgmwg4vx9mb0zrmq620sprxxdr2gd059"; +"fgruler-1.3"="0cicjknd9djh0csq1s7fx90a91yx4q25nllsyamsmp8br2c5rsyb"; +"fgruler.doc-1.3"="16lgfpapgn487yilf94lg029mcc0xqgyc2jv928fbwvs3lwgsc95"; +"fgruler.source-1.3"="1xg8zr5rjcmyz9qh9q7pd1scrxk2ld7gyrq86p9nfhn4nfcgybb4"; +"fibeamer-1.1.8"="06gb540hvfywk1y4n6apcxn4890ya7jvc5pvjdr57896pqrs3sdw"; +"fibeamer.doc-1.1.8"="1rili08dmdl4h093m7x281hzb7g3218qsq5llc0a012ak738r4pp"; +"fibeamer.source-1.1.8"="00qzawg66pm81f3w9ick6asab9nh7axmgbpc0ckdlj89bcziqpzg"; +"fifo-stack-1.0"="14d714q6mzpag5rcn2b2454pad3mpvdz6ii8k7jdvx74ay24zphv"; +"fifo-stack.doc-1.0"="0pgvcyss7h1mynawdhpm8xid0albf5cajhz423ygz3ifi2dfrasx"; +"fifo-stack.source-1.0"="03hkqd4s9dm2h10i8pw3a6qgrjskiyhnkp4wh9r55l60wnqm80bc"; +"figsize-0.1"="1hb2fck0pz1gz6vm0ffpzn3vcm7lclagsi599bi2f2bc9ly2372p"; +"figsize.doc-0.1"="1zdncnl8nmkazvqjyamzgj1x1f5fm3kyw5m5fi669rk9dqhsiq69"; +"filecontents-1.5"="062jaqszh5fr1pjrl2hms9yngcr9xwhkfn9if53kb3wal1dn4x48"; +"filecontents.doc-1.5"="0i3fjb81chwiz6msm1k0frkfaqqcla49xhg1xq0z617y3rb59pgg"; +"filecontents.source-1.5"="1zryw6mx9vmikba8za8981h3nnx4gbbb2g3m6lm3cws0ak1h5jwy"; +"filecontentsdef-1.5"="0lrdmz5fnmrlzga1w2hr3ksydnz52lmqlnnmix7xrcp81qv9xmx0"; +"filecontentsdef.doc-1.5"="1nxb4wm4wd223f9wn7x8j805ybximrk0v6n1l56xysz4k30jxcba"; +"filecontentsdef.source-1.5"="0n7zq8plqn1yki6azmncgdlg2lxcprfpdq5dv0qnxvpvw5dawdvp"; +"filedate-29529"="03fwpi529pp6bqwr37ns8nas236nhh7nm592rpjyrvlyv1w30ifp"; +"filedate.doc-29529"="1dywknjhl2p9590nvcpg1vi8r0iaj52dv7sn8c2y8337w37c6ny9"; +"filedate.source-29529"="0fwqs6wqw93ih2icg9b5zxgya1zbaj2sn0jd3dc8b8dm59cwggk1"; +"fileinfo-0.81a"="0x922migfx9y1nqqs9lv4ygk3cvqj88a92cj1kb9xkgykp8c6cqx"; +"fileinfo.doc-0.81a"="0rw1pdrqghgdwzyfrc0y44cj1989lrvpab4n42qxbbb9srhmary4"; +"fileinfo.source-0.81a"="0kssla41sryd278w12syrhsi5aalld94vjcmddldcc0l8l71sz5f"; +"filemod-1.2"="05lipahmxgd7cy76rz1j3p2z4k31gj4q7ihvb0zbi44g4n26hz6v"; +"filemod.doc-1.2"="138481q84a436a9ns587qcmmsv7p9fb5wzz1gwla25jigx8fb4fr"; +"fink-2.2.1"="1pk9qp2cbc1yagrgnjz6rnldn6zgcb6bw3vi452ks4fwic4pgwz8"; +"fink.doc-2.2.1"="19fnaw32vgjpj991n5nlb0hwac92kmny3zc483wffbhbca1nkdck"; +"fink.source-2.2.1"="1dm06hhp311xjfjjjpw66hmm52yivjhgkpwpif25cvq1z8dfgw2h"; +"finstrut-0.5"="148pca47nggxv9dyg5n0p40ri1mqz5chj4ir49472w62c8zh83fk"; +"finstrut.doc-0.5"="1jrxyksw0bldvf5faykbpcngjfx06y83q81rs3k3m6vldm3rw23d"; +"finstrut.source-0.5"="179640qn5swml0wrc1glvbf94ia5y6s1qlyf3hf2vmr3vih7k2mh"; +"fithesis-0.3.51"="0f57kk9w709j938sndpjaqqkk4ma41c3mhr7cxw9hyabis41n92k"; +"fithesis.doc-0.3.51"="1jxhk1jv5v328zqvcnzl1hhlv6izx5cirs2knl9qv21mz3fwk6v4"; +"fithesis.source-0.3.51"="1iin58ilwrdvirarh53wdawd6zwc5pas5p5p67vgy83qf39cf214"; +"fixcmex-1.1"="063a2mwh75mdbh8syvrdldb7cj4iyvqkbkda4jm6cq3nwbq9kly0"; +"fixcmex.doc-1.1"="1c9q5srhfil0wnk84k072ridssgwbmzpskk6pwpaq8id36dydvlm"; +"fixcmex.source-1.1"="1h3xrdz9anb2cxr8p175rrcjvaawv80cj3bp9l6bcpli6yb6fdfr"; +"fixfoot-0.3a"="1zszczpwcggczq428ha84g71rvgml2zrx2v74nmk1damcp35pzlv"; +"fixfoot.doc-0.3a"="07zdbq43l9yddc9gi4i2qqpvz0xxmkhxgg3wl329j25p4h58amra"; +"fixme-4.5"="167003w7a4xhy35fj6xm7mx1hvqn1bh1b563sih3adrwyrdnqjbd"; +"fixme.doc-4.5"="03qddrr56q77h8qhrx9kryx1d0cab6lzcngsbmyzaj1g81hvwsxl"; +"fixme.source-4.5"="01rpq9xd8rhy4fz8g1l6354pyibjsl90h591w7l7cz7v0yxldy17"; +"fixmetodonotes-0.2.2"="1pca7qpkqfd8506jcjgr1kwcymbcljzvsq47xlvvly3qzac374vv"; +"fixmetodonotes.doc-0.2.2"="0icin53y7xj0dddsi90n3hkd2wrcpymlyhfllyqfz7ac8y4xn8r2"; +"fixmetodonotes.source-0.2.2"="0aphhsamc6x1k891ybxhnqmhiwh0my9sj90x3w22gp7zhavgrww1"; +"fjodor-53207"="0gnmdc2i49529hniklcyqrfyrkfh83wbv9zmiqngw8hqmdw3zv68"; +"fjodor.doc-53207"="0dag2ial9cx9hnrhxc40nb31jvkv618jklwahgj6ckqfl89410i8"; +"flabels-1.0"="1aawdjmk8rinhjwnkjz67bq7rcp15i15dsbb9xll59nij849ppjg"; +"flabels.doc-1.0"="1yzlhd6c5b9y1r1gy7kvbrxygrkia0cz98p496nj1kdg1wr1xzbl"; +"flabels.source-1.0"="1vyjgbn2kihvzf85fg4fdg0v46nh0flic1amk7k3sdcxirn0fzvb"; +"flacards-0.1.1b"="1k1h06a22jc8wdcxf1066rn4sfgy4m3wh479f4by1zrp773gykzl"; +"flacards.doc-0.1.1b"="11hadqdf0s7zaidaxfhd6lqhl3qf7zkalf9wimi3j3plp8ln5499"; +"flagderiv-0.10"="1rnnj84vl29061hnbayz5sxp6h1civl9c9w2n3b0s56i9kxv3dd6"; +"flagderiv.doc-0.10"="0djwrp2rjyyd0wk0sg55w2l75fwj3gabd6bim1smpvjwsps0fcd0"; +"flagderiv.source-0.10"="1q0g5127vyhkjb1g0v20kd0x3p0b67a9haich1a6yp71iikl1s8p"; +"flashcards-1.0.1"="0jq9xq3i2rsrajmvlxziwijf75np9y6q6rvg1rxk620q3dzghwp4"; +"flashcards.doc-1.0.1"="1cwy5g4rxydlayaw5b68m2qrj1h5l6nzs3h4cawdgh2hdi6zd7li"; +"flashcards.source-1.0.1"="0vkldfg44kyw02zpbc66496yd8zxx68gfh40k0b592hha7ch4y4s"; +"flashmovie-0.4"="01rmqf1rg5vbxzs9wap7m8d19fw73mh3k7min4msbipvg1vqhgi5"; +"flashmovie.doc-0.4"="1lza6mv55da69v8jwjlcd08v5y2gs2s87z5h1hrsp3p3mx3chya1"; +"flipbook-0.2"="15b2nzhpgj6018769ggajya6qmhq9rnyzha0sic9fff24jwdq62x"; +"flipbook.doc-0.2"="0lf04giwsgjq0fsk6wrms4c3dg53v1lq3n0q1ij5pw4390llsqd3"; +"flippdf-2.0b"="114xvv7sv9fhqxgfz5ckydn95mrg4049ml3kg6vjjiwbilmszr2h"; +"flippdf.doc-2.0b"="1fgk3g74arazrmw6swfyq38s5gdw8knnwwf5ij0dl566cwmcfvmj"; +"flippdf.source-2.0b"="0hbw3wgdva8vkic4sz0349mdyx8dpz3k5kk0fn80m0yqpldwgkid"; +"floatflt-1.31"="15v2m2mchki2gcz0fcp3myyr806fqyy77nv9g6rqm11aqp6212bw"; +"floatflt.doc-1.31"="1d7v1m23p47rl9lln02c6bsi5mkqi7c03dhmnjhg8bqp6xfkfmaj"; +"floatflt.source-1.31"="1j53lkr1j3fp5wlb41x2vimncv2l1pc8qm7qy74i0r1xf7kfibzz"; +"floatrow-0.3b"="177knmgpv583xajihdd5q5spaainn8h35kgydq2sfi6ch6cadirh"; +"floatrow.doc-0.3b"="0py5a36gdbsd91679k4chfxy6ykj2wkjqlg4zkp5xsww6fxglskx"; +"floatrow.source-0.3b"="1mpskdqhghmgh7i3425xb985pwrcqcbfw3hlfhbyx3bhwwx5pnqx"; +"flowfram-1.17"="1ccmry6f8danw6jqdsck7pzwjsrh5vcfy99f8kzyqcbbrzl5rn8h"; +"flowfram.doc-1.17"="19rrav68s3wlwgaa4mhgqsdlr1syfpvp4jzc80cygi0fhv2hn7yi"; +"flowfram.source-1.17"="1hrs58xhwawxqd96jb5hjywbfra6az2qkap0p5zap9zkck8ixz81"; +"fmp-15878"="07ml6i8lqcz737fm33g95nx1hz1p0z251h7pgxvvvdmn5dml1l94"; +"fmp.doc-15878"="13i7axi1s8qqgdvdky20dckmsa95q2q54z7cf6zgd0znzjy6d4mp"; +"fmp.source-15878"="1fd8h6dndrc7hphs87y1lfplmkrwgn1pxgmvf00gfhgkg1zf127b"; +"fmtcount-3.07"="11d9pq2cqd1qv20wr5789bzmk0a82j4rf8y9xh4l6nf2nk9p5c3g"; +"fmtcount.doc-3.07"="09ikawga4sg27ch8rvdf9ni0k8b3nk3k84mgydlv4lrg5gb2hv12"; +"fmtcount.source-3.07"="0ijsl21nsx2kkgbcc00bzs637rq3x92ax0xbrdagkfvnrna0bg69"; +"fn2end-1.1"="0cj26s7555q49fi382pbvy65xa0yp0wbihk3y0magblyxjn72wdx"; +"fn2end.doc-1.1"="1kafhgr4c9d4pjpydd27ha1pdbxk364qv8dmcr7k3l7xlv31jv4f"; +"fnbreak-1.30"="10fh7d75a3628jrsbl04g2pc4015nsnrw1gda0ndv8bz603qc01k"; +"fnbreak.doc-1.30"="1vsv8prgd37bj141p0h92wjc7sqxxzw04czbwyk12xzpbg7d7gyp"; +"fnbreak.source-1.30"="1jf28rb0vv2xvp06awiglg4ggk6mzc6pyr1irfgyyniha54gi0ab"; +"fncychap-1.34"="0x3sjslvz1gsrr8607q9r6k8683p9zcz7p0kxvr92j9ls1prl5c4"; +"fncychap.doc-1.34"="0is37brbbdqb1szx3rwgmaqbl8vlqr82sy8svam39yrbnzd9v1k3"; +"fncylab-1.1"="13l9jmcwabifc7m9klgwl2gqypwlizy1mb7glsvp3jslpkhfj267"; +"fncylab.doc-1.1"="11w7z5q433lnzfm4c72697f82yb7rljk9zq41dl5bdb7l9wd7325"; +"fnpara-25607"="0rn4yk1zd4h2r5xhghv7v0ph0raspq4r6mw812hn80bn8rhjjrlq"; +"fnpara.doc-25607"="1w0pkqqgkq379nnqk0wx419z961l3g81ldkh8ivfhn9q5vk04p0s"; +"fnpct-1.0"="1kwfzz1mfk9700rs3hcq0l2px9qcbqlj3wv66v0bgj176g2mpjkp"; +"fnpct.doc-1.0"="1ilj77lbr7qa9wjf1m045grs7334q17xy03q73rf3si3lcdz8mqf"; +"fnumprint-1.1a"="1i04c2j1jnw9qkbv92nd4rr0zzvwwdwwk0ya5f4g4rarvw9h4z5q"; +"fnumprint.doc-1.1a"="1cwc4jv9jxxinradairp45rlr97h52vxghfxin6dwszw51ac8p7n"; +"fnumprint.source-1.1a"="15d3jpxs8zgsj40xipg3mfgir41p46c3ppwh4629a1dv4skxg2nj"; +"foilhtml-1.2"="1qnh70h01ys26spbjcq71zdhq8j7lszinv26v6ikpccsaaxnfdl8"; +"foilhtml.doc-1.2"="09b3lmxzhfa1h7nwjvidq2pd11dkz4aq3l4ciz0xh7gyslfdwvgd"; +"foilhtml.source-1.2"="0zhva600hf43h01n9ycjcjair84y0wzpn00z6ihyh8s6g199g428"; +"fontsetup-1.009"="107sk7dnbfxv564n7xggi3m7qyzv9vlpn4knnsimra6dcnk8zlp6"; +"fontsetup.doc-1.009"="04b6rzah9vcaixl88ybgx99fqiiw1kb2wcdl1lqm03f3vmfxa4d9"; +"fontsize-0.8.1"="08c2zgkicn7i82q2y9m0pv6ld103yjhq6vw2yvldivayjgzrkzs6"; +"fontsize.doc-0.8.1"="161ccr3rpjgdax47bl4lspn13ivzg8jl0qjn54b3srcjj3cwzrhf"; +"fontsize.source-0.8.1"="0yp7j3480ka17kqadfkvhjmwmxrqzgzaz88qfya8b81b4b19xhwf"; +"fonttable-1.6c"="1vz99pfw4akid9hjf7dcqf1fx5h30sr25i1f9q6a9frk0wpwff72"; +"fonttable.doc-1.6c"="1inb0ai6q8rjsrcwgv8ns6as60ifdidqzqb8x9ygaw3j5ykzr02q"; +"fonttable.source-1.6c"="1qjilvy77072jpbdc4p4qfy5d4n2ww2wcm5drwvai6p2aclqf29x"; +"footmisc-5.5b"="1lnvcwxyq3328m7lrdv8plzzvphwz6206y1y3c025g50k11jvkil"; +"footmisc.doc-5.5b"="01bcysxxzlvmya4npjryflgbn9bqiza3b9hjin5csljfmgpkkypn"; +"footmisc.source-5.5b"="1wh9sq39amiqp79wy23flqv7a415k56ik7hdrgvfxgq8sk6aysml"; +"footmisx-20161201"="0f6csxzkwbf4nlw6z9rfyys1f7fc0vpdi2m36g7y3k9l3j6wb3mq"; +"footmisx.doc-20161201"="1962sivh4jipsxd0z0cpzpd0jdw8v4afbpzfinklivnla2c9hp4g"; +"footmisx.source-20161201"="09w5bfx94533q36z3k0a1sf9jx6acz85qgqypgn6b0b5mkhjsmar"; +"footnotebackref-1.0"="12vxch1i8x0k8d760vgq61i7j3kkylgbcxj6ggdv8wzd20h4izyc"; +"footnotebackref.doc-1.0"="09dvvnjvika3617zx438ca8z3fmdkqbxx9y73pdhn6gaggfmzr72"; +"footnoterange-1.0c"="1k5xz3xjcgr3a23yfyw3zrh28hxqcr5djl4g3zly5ackq7q2m19p"; +"footnoterange.doc-1.0c"="05rwaqpnfsmgcyx9f88vw766iz57g8vy1il0vp6cky787lr047zd"; +"footnoterange.source-1.0c"="15asynssisdgz6py0f024g7fjf1rpsv9v0k1v4l3fjw8ppp5ddns"; +"footnpag-15878"="1qdl7lpfy5nn6qx026b9aqz8nfs958grh443lkqyxnrnws0n2nww"; +"footnpag.doc-15878"="006w2w6aga9zazlk8sv8maqi4s1rdzqyphp0lpa8qv5q23vcdhl6"; +"footnpag.source-15878"="1hh2754as2yrmfz4hiyyl8nlshsfdhpgpg3ifhs6h5s0xz947rw0"; +"forarray-1.01"="0cn062f805lgy5m45q6flxj5w6gjfa4w1ip7zmhxd2z09s962jf8"; +"forarray.doc-1.01"="1d6m425lfg1g8arjyz4j3q9253rdmfaabaasbpd2ynhjr1abfh3c"; +"forarray.source-1.01"="0dpqr0hff33ddfw6vs0pnk8yhaa4gxkxgn43qgx06mx1srv6rz1i"; +"foreign-2.7"="1hqmhy3l2hsjf2hkxhrsdc3z1mn3zx8718w90g8152x9k84bf7jw"; +"foreign.doc-2.7"="1gnaazl1ds76sqdpbj773k80isyf5hmjxh22p3hs9zxcpnvdhng7"; +"foreign.source-2.7"="1ziafjxcncsba0gbn1qjf2w2gn2g9z55bpcff71hr9axhp8xgpgf"; +"forloop-3.0"="1s89z93fvsj2h4w1g8ak512mnnfmd3pjvwbgwym6y0dc428sp5k6"; +"forloop.doc-3.0"="03s4w726zmx10s1xdwyrag86lw84qf4rc3vcdn4g1mhm1cwqg756"; +"forloop.source-3.0"="07bjxa18cszvffxbvrzg26fpp77a5vvmywrr625qyx8v84khcs4f"; +"formlett-2.3"="1gjdgl26ma0sh15yrgi8kpy4sq268jkz9jmyw66iy3d4k9ybggsm"; +"formlett.doc-2.3"="1mm2m4qgiz0aplbyf3rwzhpfzhyg3mfmzc00z35kv6s5phcmlnf1"; +"forms16be-1.3"="140xh5578cpjn6mfwnghy38alz4av25gha09gl7c7qxljgpc2a7i"; +"forms16be.doc-1.3"="0wa6pyn8l8d14d47kqvwvsnkv2s9mxfhmzan7jgzfrmkb74h7xlx"; +"forms16be.source-1.3"="1l3ci86wl6an48a68vfh4ynajq6j3br8wbafm8w8c0x810hb141w"; +"formular-1.0a"="16h5hf50ngqarcxk4gjs9x9mcycmj5cqwy5pb6ffpj9xbsxn4r8i"; +"formular.doc-1.0a"="19aq7sbghvrif72x7vzvabrhwj7lgsddsbdqbkv9vhmp82452vyy"; +"formular.source-1.0a"="1s8ngbw6s163dzj9mi629yd4fisxr1gl8w8i618my426szc1vrcx"; +"fragments-15878"="02m23bx1p090m6w1frb2k6m0cv6jk8d9fdbmjscwa7c9c55qh5gd"; +"fragments.doc-15878"="11kj5gczbhb0imfsf30hc74s50iwq4zfs79j6kv62ib6v3p32mm5"; +"frame-1.0"="17r35x914f3h72drsszy74ir5phcxmkrcvwlrfd11li0lsmiyj62"; +"frame.doc-1.0"="0888jcccsnlpzkynpg8mvxy2mnb2d3xz41bi341q9fdbbzs5lmnn"; +"framed-0.96"="0fp0zbq3bjfqx87zb01m5ffn8kw8044vkz8b9cfndz1ki64d9x4r"; +"framed.doc-0.96"="1pjnqy8zl5zkadpkvwa35khwjk1nxg9pq0h1wqwgrdvqk6gj0cbi"; +"frankenstein-15878"="0zj1gcl4gab78qcs2rv5i9y4q234iz731x2hnab169ygql4d95i8"; +"frankenstein.doc-15878"="0x1fp5xc2qlx0pac2vqm8567fdh8i97k25ixr28w7fzwl9xnm91x"; +"frankenstein.source-15878"="0ag37z3klcy0jvcvvj7v14clx2dvv6q43lh6gw83rpsx51v9wza4"; +"frege-1.3"="1n0qak8xsi8wlg7r2daszdvi3hv9gmp7i04phcnx4hnlr68842d9"; +"frege.doc-1.3"="0hb7a6c0i0jk8cvv2vfr743ysqn2vh1y6amy7arc4zafi097nwly"; +"froufrou-1.2"="1790fjq69nmbgh9ghychrkcc5mq6pnvb7szcj4ikgmajdaxa3kza"; +"froufrou.doc-1.2"="11s2hrxr7byzhk66qczgwazqyb8rwpba1r1i0g6psnzmh0pfdgw1"; +"froufrou.source-1.2"="1g9lrwwrjczak9003dvrzqps5agylasjvvzg8dwmckm627jya6ir"; +"ftcap-1.4"="0dbrhynslppw5nrdvikzdkfvilzr909ypc9v8nxpa3yh4zln182d"; +"ftcap.doc-1.4"="0iq7lq25gzyc85wpmr93a8ivgc9038rs80mvhm46zdrrixh5ry21"; +"ftnxtra-0.1"="07fazshsyqng62sfbnjhxglscw707jmn5lz1ws6avq8c5chs70pb"; +"ftnxtra.doc-0.1"="0a100iy3imy2x6rgv8pgkid75ah21684ddm6vda58gv8yzfz9fyd"; +"ftnxtra.source-0.1"="1ips0zm2cka9wh4474sc283102s6r9hvr4if7lhd04c92f40r3my"; +"fullblck-1.03"="1bxnzkidpszq5l2kfilrn8ny1gw680gcx9gz9975vylh5kissrmh"; +"fullblck.doc-1.03"="0zj229qkv3zdf2gz6qkgblj33zdhf8zixy59gqm4v69ld491wvh1"; +"fullblck.source-1.03"="0arshfc79aljbpfnnq5rhi7gc9sqhlx002xqg46wrq125cgdj13q"; +"fullminipage-0.1.1"="0zy9vk5a0bljq3my17fw4jl8rhd7vdzcmw550ps8zbjbhxphssrc"; +"fullminipage.doc-0.1.1"="1n9lzacq920lmc18rhavz17xnm92lm964pglf6j8i7yyj5aib61c"; +"fullminipage.source-0.1.1"="16q6f9nss1jx3pw1xq0j82y4gn70hdjaj9m7pq3947m6bkyz92vd"; +"fullwidth-0.1"="1kis1p158phkwxdfhpb4ihfs2w7wywj1lighc44sfkpima9c4nmx"; +"fullwidth.doc-0.1"="056k7w66rh0z1kxf1m91sbjhg8kdy9jvfkwm3jmi5mkclil5ihi9"; +"fundus-calligra-1.2"="1rnrqblg06qkwcy7f460pd1hnh4bwl47zyswa1iv4iknx00rd8a2"; +"fundus-calligra.doc-1.2"="0jvbvalqyj0kyf6cwr6zf18ylckh3fwpshwhmnv7ldg5r1ylia9j"; +"fundus-calligra.source-1.2"="14a0d7d8mlsw7qwpspqc2rmcdyhnfy6l7f57bk9v9jc8pg9fxb6m"; +"fundus-cyr-26019"="02zz37h71nqq0f4sf00fiw80pq1q3yadnhqm2j3niz13gms9ydl2"; +"fundus-sueterlin-1.2"="1zpcss3lzhc9zkh8b91138ycwj8pihch318zr9pc6bl3ifq37wq1"; +"fundus-sueterlin.doc-1.2"="1pjka7j1378bqa32h0b2dcinf6ayjmzcbm4c1sdw6dsvrzbnda3f"; +"fundus-sueterlin.source-1.2"="1y4bg8r2hmpa38hdgkrk99v87cphikdb7sq5x9aczbmwwgmgw8fp"; +"fvextra-1.4"="0qx1rzvaai2571c3fmlc9whij7wjmgqznrddannpfim6vrnsiklx"; +"fvextra.doc-1.4"="17096sy285z8qy8556ji6zgwn4wcmqchdshxn3s6b3gz9gpmdz00"; +"fvextra.source-1.4"="1x2vswnng9v8ngvfwy1zpg2ivid9xdrk605gahp8h9gxlrkhsm8n"; +"fwlw-29803"="1qwlknaljj8f1cpnln328az913cdwypr7w8m8iqbqiqhsl49siap"; +"fwlw.doc-29803"="1cib3id21xblai43gkn78ypz6n99vwzhzmpdifdm8wv001x7wb82"; +"g-brief-4.0.3"="0w0i9mqc5wg9za3n99i3fkn4bw78l8kf6glh0k6rvrzss0sg79cj"; +"g-brief.doc-4.0.3"="1ikasv5w1xr5ms6836q1bnk7b87s24m15mnwsbdyf7cnsh267x6k"; +"g-brief.source-4.0.3"="01j6zxs8vpiiimc10hhl93xcixwlzsih5k56n7v9a1a3czgymad6"; +"gatherenum-1.8"="1b5j4106mjdswm519nb9sswnpnna5v6wcy4p8xbccv01044iqlk1"; +"gatherenum.doc-1.8"="0afd1c352075ix46y0jrhfwlbsaibchvz3xs916qi3hd8a90hbpx"; +"gatherenum.source-1.8"="05dri0sgr8h29q3zxcsyhplhrkj1wllfb42d8scy6hp4mkmbsr06"; +"gauss-32934"="0jsbvm7sh7bhs5yfl17fj1gbdqgpm7qchf07y3p7k0rxxg0f482z"; +"gauss.doc-32934"="1f6ycdq3lpylkdwja4f89plz7wpnz73wzgjz74far6r9wr026443"; +"gcard-15878"="1pcxw9mg6hadr5c6m4z3pdzs0b9jw22injdlk46xxhqy5gsafa7v"; +"gcard.doc-15878"="03686fg2fw1k1j5rrskxpb0yjn2n5l697l66gww90jysq9546iag"; +"gcite-1.0.1"="0dl1plmbn4i5hzmjz48hyfl5wj819pg6k1kjsdycx4wi0d9ff2pr"; +"gcite.doc-1.0.1"="175151qpcykxsf1a6g9v6mkhr6m9cm5miw3ys6j5csrqm3vsl604"; +"gcite.source-1.0.1"="08h5kxah5q9105n1awlrmiy0zrl3rafb8v3nwp4qfakr83q3vf3k"; +"gender-1.0"="0skwbiclrpl1n55dr3lkw86dvqy3f1n0b271ygsz6rr3qa43478r"; +"gender.doc-1.0"="1gamaakkqqf37cwwzxjbyfhz25gdzayzdkqk60xls9flp7227hbr"; +"gender.source-1.0"="1l5p8ib5lbvq2b8pizpwpbcv8aslmi8dd554win7ssd6vhgb68j1"; +"genmpage-0.3.1"="0fr4m2y3vfymlwk7ik7rymifyam2jhbxn3qr2sj40zbcr9wbah6n"; +"genmpage.doc-0.3.1"="12fxwrz5gpswyf523wm1pg99zilkgrpq8z3ls5gw9j7bdb71nj1l"; +"genmpage.source-0.3.1"="0q7acjs7g1xh5kcmrg20k9jayaf5vxz5p5amjjd4xj4rnb1wdlj1"; +"getfiledate-1.2"="1bhqqsvykrmqlgd8whfwxm8bkcqdfzm182ryngq8s6yl9vx39ck5"; +"getfiledate.doc-1.2"="1jdsnf020iyiyxaabyaxp0nzf02s4kqmm8qf02vaclmbqhciicf2"; +"getitems-1.0"="1n02xiwch25vv9qk3rqddsm54nhp4fkwi3i5a7r3285md2b4vsiw"; +"getitems.doc-1.0"="1m2wfxyqkbfk7zk1czmqp8wwmqd091zijqxvanjxf7azxfmlnvwz"; +"getitems.source-1.0"="0njzl590bsmdnvm1gfqfjf5xpj9mj5ijjxjjxiya0741ylhwv6p1"; +"gindex-0.2"="0llk0aaa43n4in5am3ziqvkl1c35q27am5xk1naszwlqxcn4lx42"; +"gindex.doc-0.2"="0fpy0kvkj84vg1jz80jaz26k73rijrldy4m1p1xl3ccc7dxvr299"; +"ginpenc-1.0"="1brakvxxrm1gahl609psp4na8ylkggfs534nysnrijq6vf4r1ryc"; +"ginpenc.doc-1.0"="0d4q0n0wh45ndqgd2zk254791lcvzrxz4alr2bnm9akcfbv03jz2"; +"ginpenc.source-1.0"="0jw7qa8wrb20wf8dsaxinkrvfyjdsndd9izxs549dj19whf1jmfy"; +"gitfile-info-0.5"="0qk6r9fiv44hamlqvsgpm75nd68sgj81sgy93zsylypp15283z2b"; +"gitfile-info.doc-0.5"="053x23sq6657lddjyk9bzadwydfh4zxl78gxl1payxmbl9pj925i"; +"gitfile-info.source-0.5"="0fnrwcjfji5pbkh4kdsishfy85gqcvcmfqxwr5s1n3bm3prgfc8b"; +"gitinfo-1.0"="1n8mm4g7bmiawd7l7xhx9fcxv7z3l629bj21i6j9s0rfd6c7mzz2"; +"gitinfo.doc-1.0"="1ip59qxlqzrn8y211691cv4bg8d0yxkyvbpxw8xpzg99fpp3isqx"; +"gitinfo2-2.0.7"="0k3vw12yh13q1v21bz7i3m32s1w49pk13rg3c0d0l1pcx0wwz20i"; +"gitinfo2.doc-2.0.7"="0586h9c1kp5cg7gk67xhy5fbshpskrmfb81m4xncaxg6ajaljk7n"; +"gitlog-0.0.beta"="1v0zpfry2rz6xvm92gzhabc9sa157kylvp6jg298kdsbr2limn3k"; +"gitlog.doc-0.0.beta"="0pd1f42qmka0wh9b8m15nk69p6isqp74b5qkjg6ymwbabqxbcbl0"; +"gitver-1.3"="1iazzsks5ki7xvc6sm9mbf7ry2rw4xlnjcypb8gxpv55cf6mxnbn"; +"gitver.doc-1.3"="0b9dc6rbfrh2r4hvy9hmyg190229gva32cn9j1bsg1jf633l2yvh"; +"globalvals-1.1"="1kgzrymfd5lzvb9dqlb4cgxfszpzhvad859r7sl0dl282596apgl"; +"globalvals.doc-1.1"="0c2qf5fqn4n8lhifvi4731r3vifwxp7h9sfd4c26d2nm1w42hv7d"; +"gloss-1.5.2"="09d8r16dwl26a76a2gky152bafjip3r3hf41bxxcb60sjvnz2qva"; +"gloss.doc-1.5.2"="10vgsm0cvcbfxwi7ly38lsvvg139y6abmdsv91qxq3s1pn1qxg6d"; +"glossaries-4.46"="1jmydwbz5rqf2ljbhi1af2r9fjpni1kym3fv3rikr7mqawqsp6ir"; +"glossaries.doc-4.46"="11ccsky6m4flpjcfic54569pmgqdqllaivh8czxl6znc79lzq46b"; +"glossaries.source-4.46"="1cghqqd09n5raz1y71v2z04hwva0vsgl0nrxm14mh0396k3cp0ry"; +"glossaries-danish-1.0"="0qdyvkx33a9jgfa7y1pbm1lg5v1ba4xrxxg0hyfqi0pmpkajqb87"; +"glossaries-danish.doc-1.0"="0gvpcl8881g9xfcxhpa3h3c5zc3467ak8mhmr4szgjrsi4nsrnv6"; +"glossaries-danish.source-1.0"="1823i0b0firwzz9038wag2qg2h39az1xsj8484w36kbij8q7ygld"; +"glossaries-dutch-1.1"="1ipxgp919h2jh5jajq72dwaf6v5qi7xjplcihjy8j88zakd9iacs"; +"glossaries-dutch.doc-1.1"="10k1xh64rzgcddzaz7qawb2qd353j79xn3754byhn4d1kz6nihxw"; +"glossaries-dutch.source-1.1"="0g2kfnxmnnqz8y095b125d7ira54s5dpb5shfqld7m52cranscy8"; +"glossaries-english-1.0"="15nm7bz90ijx674p16d596jssi5915iy43wc1qb6gbbk4s8y9h3c"; +"glossaries-english.doc-1.0"="1dckvl8g0visp5j8ip9kvmis7qw1n81xpjw136bnbm28y7a5m4sn"; +"glossaries-english.source-1.0"="0x2iw6g9a6dzw22p05n3v7vbif8svhnw9sjqfmxn020jqnajza0d"; +"glossaries-estonian-1.0"="1p2d21rx6vs8gcsalbf5kjyhmz71gbbn10c4j4lsy7rqcb97zi99"; +"glossaries-estonian.doc-1.0"="0q8rsf08snd2p4nkfz2ry7rmsbdpixgn14n1mk4wkjclrbnjszgs"; +"glossaries-estonian.source-1.0"="15xi0xl53jxfqsz7dwbmcrnlshvs2zbdq38v3izlyz47aaf6ajdx"; +"glossaries-extra-1.45"="0asj8vhfb6bbjbdvcfjv7wh7wpgp29ldm9x45hjkj3iib8f8z6pm"; +"glossaries-extra.doc-1.45"="05i9mll0qszgdkkpmckk55qwy5i9hc8jz985w61a1cf45w2wwixn"; +"glossaries-extra.source-1.45"="1nrs8rkf0wdmdvga9d3ala1hvs9vxpbsmi309374i80wqhczfcda"; +"glossaries-finnish-1.0"="18la9s6gblpqdqa1vcvsddzfxadssnd1mrg6iwl4aarq57605cql"; +"glossaries-finnish.doc-1.0"="0zjwasnxi1fzc3xq8xjmgyrfcxpf3sbfgh6nzz60zdxd8sz1wvfz"; +"glossaries-finnish.source-1.0"="0jfvjka4i94vh88jfpyysm6r1q9wwg7q29s5ik8d3da9g3n1bhyj"; +"glossaries-french-1.1"="03i8xx80d740c5yv3i83zbxpm9kckzj2kbdsakxa3sp9b0j0jk0b"; +"glossaries-french.doc-1.1"="1k5gkdj5madigzvs138r360nrg6d3fn145xf8g708bk43r92100r"; +"glossaries-french.source-1.1"="0fhi17x6kk73mismll255b9nsr8hm147zd0n3rcndbih9ray6c6a"; +"glossaries-german-1.0"="0h30icsisgk45ghhmngda0nqsjzsm23hay0sxch00ix5qcd19s27"; +"glossaries-german.doc-1.0"="0jmkcq9h2kfjzfwysfps7nqjl7f0zmh5s60ww9kll8ypdd4a1n0s"; +"glossaries-german.source-1.0"="085xarcnj5cvkljz70m27c7390jpj8kwndpyb762pr26dxvgspqh"; +"glossaries-irish-1.0"="0xyijjl1mffhmwlx7b7rprzl4rvhb2h8jdsx2jq86qg5gxd6c4r6"; +"glossaries-irish.doc-1.0"="0kic0jhmwiik3y2gipncii6j4348qkxbvkzs3sp9678xjl6j5zl8"; +"glossaries-irish.source-1.0"="12qdj6wfgrw6j4vdlkv0bcknnamb09vsyxdmyd094hwgi4cs7wi1"; +"glossaries-italian-1.0"="1dwvjb91jn93jbvh0idvn3nxm6s7frxyvc5a7yszyisfbaxx917v"; +"glossaries-italian.doc-1.0"="0sb6kzw87nh2vznwhky087017c6338jhqahgh4ljmzan9h3imk84"; +"glossaries-italian.source-1.0"="0hj3wdzdrjv9aciqgj68ihaalvarimi85vff0hf6isnmja5pwg28"; +"glossaries-magyar-1.0"="0y1540a4f531mc8fqpxv50d25a78waipkhhjvgnilbh7p1l3cf04"; +"glossaries-magyar.doc-1.0"="1sgndhgxlbhfjg22hpqazyd4zrqmkiahjfwhhwv1nk4dnn1rflcp"; +"glossaries-magyar.source-1.0"="08m0srsv9nspqfzab0g276rimzw64hg9i6dddi7fy9pc55iikfky"; +"glossaries-nynorsk-1.0"="19di0liyrqgi4vb0aiw3p507klaszwbdmsxjh09snp7jyri2rd43"; +"glossaries-nynorsk.doc-1.0"="18l362siz2p65qhb2vfgqdnczqwcgcd33qq8c0c1h3vqmsmcjfvb"; +"glossaries-nynorsk.source-1.0"="1diq7h06jw2s26jrbb44amniqyipdndzidf2z122xyc9cgcwzcwm"; +"glossaries-polish-1.0"="1pm5c1i0zfzj32p75cj014n2kdlfhfp6zlh09y5y8a7cfdsbcjdj"; +"glossaries-polish.doc-1.0"="1r0igixgkwcp7h3aslj7kmchxz32qp09vdan6w2garkgj1nspnv8"; +"glossaries-polish.source-1.0"="0zg3pfjg03kcrqm4b3s2bb9z3jhlga85hzd1n83pbrvf7fph4ld2"; +"glossaries-portuges-1.1"="1gjadmklh6lsx5drjqgph31z3x0g4xy11g074hm4y2zgziidkbyd"; +"glossaries-portuges.doc-1.1"="1cbzpx932chvxrf4myhy6bg4jrj05nkr2l2g893k6k7xgm2i1m7y"; +"glossaries-portuges.source-1.1"="0cz40x5s9whyr7r7w8gmw9gm119xmbb1qkhz19zfijg6nnq2yig2"; +"glossaries-serbian-1.0"="1nbpnq50kki9i2i2dlj2x9ldy6g0in0mz54ii107m8fc66g90vi8"; +"glossaries-serbian.doc-1.0"="1cx33aqm3qcj94rl6n71wm0sq2kc29r1wny3bwwpqg5mp3bw2g8g"; +"glossaries-serbian.source-1.0"="1vgihxf778vvf86rka345qmnbv5s2ma1b5h47s2f15x8bjx4xy9r"; +"glossaries-slovene-1.0"="0i74cn88m4llskd371z5xakw0s1gdgfmc01i55xqmc3j1n5cayh6"; +"glossaries-slovene.doc-1.0"="1bfw6dnj6vcz0v6i8dhy2ffd6vbjqihqshkzhnwrrc858rzgahiv"; +"glossaries-slovene.source-1.0"="02c4gvv1qvhbznxlxff6kx976whcv80c15k2jxsgd6bira50414r"; +"glossaries-spanish-1.0"="1wg894gdkqkm2mpzixgpnsd5hzbvvviba7izbshiihhldsijs60d"; +"glossaries-spanish.doc-1.0"="0zkfg3zk204q8a4xj00ibixqi0j3ll4531vrbavafm8b9qjl93xr"; +"glossaries-spanish.source-1.0"="01hnx7zkqlb4r549252y3nsqrj8ywi30ci27r5n1p846jv366lxc"; +"gmdoc-0.993"="07hf9413bmj1iv1g13wnngfb07fjb11162pz1769dz5si4av5nmm"; +"gmdoc.doc-0.993"="1p3zpf3rmmmvaam534vyw2n8r3klfxlk36jk19pk5akqwxwv754r"; +"gmdoc-enhance-0.2"="15c1bah1lxa4ap43287qm24nmcml5g8a62plq0wsdhbd07w51h34"; +"gmdoc-enhance.doc-0.2"="1fy3y1f53frsv09vz74n7v8gv1wscga6h4di9wfspwan1x3kdp76"; +"gmdoc-enhance.source-0.2"="067ind9qmah7w93bhwg9vfj8nyps60gsvbxmx7qhkr6c1cxqa8wr"; +"gmiflink-0.97"="1b7gbvkhscb2p4yhcwd8mlh3fsvgfq8g6876s1brygnp9lsz7cxn"; +"gmiflink.doc-0.97"="189srmaykk4pmm3p65p0i00ycisr2bdvb51r6ddn4rjbliv6i9gd"; +"gmutils-0.996"="1yf7r1bqv7kid7v65bv56w4an5nx22fhxzh67fh7r9y8msrz86lh"; +"gmutils.doc-0.996"="1xplwkdjdcz76rmmmnv8zfp3fj104b1vag6rzrxj7ap9k8zzc40f"; +"gmverb-0.98"="1mqmi97imyr63ff0qyv797sipncqizbx9cvlg49wxnf3bjyk2ki2"; +"gmverb.doc-0.98"="0r9sygczigi52piyk4zgw807zjr0jl4babj3qmnnsg0qclhvaqnq"; +"grabbox-1.4"="1w9gmzwzy8dmk5rymwhn75rlciszk2wyx9yiiqn3npz872b55sf2"; +"grabbox.doc-1.4"="1h4fzi0199gfzdsx3f4pz76q14lv90sgad8ixfixn4kq6zywg4cs"; +"grabbox.source-1.4"="0sg5ahgxmm6vwa2ng0w8dmgxb4d3x14929i8apkm21bainhaxg4d"; +"graphbox-1.1"="1hvhadbpd988nvrlcppvv3bnm5lzmlnxgwmfp6r4mgsr1q7xgg6j"; +"graphbox.doc-1.1"="1gls7j4753s16q6lgdsaa3yg8fc4vzxh74z7qr2ykz9b8ij0sdr5"; +"graphbox.source-1.1"="0nfmfn7y1qqbm4yifqxfpxn9yw2xb9yj4smv9fmxrs57ism8d9dp"; +"graphicx-psmin-1.2"="1sz53s8j6rn37xz1kkw0zr85625qki05zfvj6zpyw1yxay86r89w"; +"graphicx-psmin.doc-1.2"="1fjg0pwh8qxk79mmrpgnwps50r8hvw6hqsjd2cp021wkqcyk5zb1"; +"graphicx-psmin.source-1.2"="1rjl35jhy6dwja782xwh0qp3bxyw6ziha6fw5qbaq16jfy8hs95q"; +"graphicxbox-1.0"="1pl1x7n7yv7grkplpx7fflfi4cwzmkmh8nnd77i2n5wdlylyabxd"; +"graphicxbox.doc-1.0"="0f1w22m5r1xz6n70yb1p21qq3fi2rfj9mdcyqq8s40km1i40yxkd"; +"graphicxbox.source-1.0"="163isaz9zh1jr5wbhsw3ppicxsq4v92d6516dqgiwjhf6hdgay94"; +"graphpaper-1.0"="0gb5vwg422w53njdn8f2ng0rj5klbwfl4hw7xkqdj7g8cybnib4m"; +"graphpaper.doc-1.0"="0cdxw7yxb6i72j0mhlnmbnarpwricwmc4j6r90jlazaf6pb6dxiy"; +"graphpaper.source-1.0"="0r0rzdbc13i5hjqnmyx57s70pmgg8ql2z609c8awcvfb08x12fwd"; +"grayhints-49052"="0p65f12y0v9s13gkmd0limdcsz36lnbf0975c4pxcsc42i8smvqk"; +"grayhints.doc-49052"="07qpkj60rrl1pc651qa8kpym3bzcc0qkfwaggcyin9a65a5snnhf"; +"grayhints.source-49052"="1g32xq2f1ncq124j2j8xm3vdkhv4sxynxc3wzx7x6s9i91p5l59y"; +"grfpaste-0.2"="0y1zw0l245chmlgmi7cmg2yp7s30z8055wnrbm6f45aizcvgdya9"; +"grfpaste.doc-0.2"="152b029w1203lgfmxdmhq3nh9h2hcdx4xanklv59rih9ha5l8j5v"; +"grid-1.0"="17yxgnwlxi16vkhhy0mij2f07cib589305iz3kzf0gfha2x1fnxg"; +"grid.doc-1.0"="0h3pfv1hilyn9c9mlqm9nbfd0l0s1n8w7hgaa6cab43y8n60z8gy"; +"grid.source-1.0"="1ah419141p76qjl1q82l2v6i5z34mj19rvsbwldp8fawfkl093k1"; +"grid-system-0.3.0"="11l07viwfi88i7c05yjb39wxzdgvg6xvxlcgbmqpvc4fbwmr45bi"; +"grid-system.doc-0.3.0"="1a72i4af612w28wkbsvqvss5462ar8g27y83w2h7y65nqv42wi9d"; +"gridpapers-1.0.2"="1nshsbv4qf8vxsvrqidwr4rqny5lp0cxijx018bcskhh3xra7r6n"; +"gridpapers.doc-1.0.2"="0z3vns6jk1ihiqf12i46n8yhfyjmnkb4l5wyc18phbh9l6879b7q"; +"gridpapers.source-1.0.2"="1bnb38mgi6pzm6gvxf0k60z1dal3kgi2rjgwfrcg2h5vmb5rpdk0"; +"gridset-0.3"="1hg92rhf2jl3yp9y85pm0hrbc2a43ysxkhdakfv51a3bynd7ym51"; +"gridset.doc-0.3"="19aq6g6dnbmgz6a4pgxm2c2vbwc0m3hicg7qcbjpchahj8278w5y"; +"gridset.source-0.3"="1gmgaql1wyd6kbhhv0ssyhg5dz9jls0y895h7yg8pyjqg4d0i2rh"; +"gridslides-0.1.1"="1y5bngrqi46yii7807nw2y6vr7xavmbnk7x3bpfj5fjm8vpnw4aj"; +"gridslides.doc-0.1.1"="0ringj34cl8lqdfa3qwfcq4jdfzsghw4haw7c9dq9acqnpc6sh3f"; +"guitlogo-1.0.0-alpha.4"="1zjlfd49hkq9qc1l3g974wxzw200qyiy9vbiai0v9gs627hxckwj"; +"guitlogo.doc-1.0.0-alpha.4"="0awpik3x75rky5w6rk9zg3cy83dgxs2l57wfg8sq9h35zmni875w"; +"guitlogo.source-1.0.0-alpha.4"="1hi4rb31mc3820fafyhk2158y67b90xp5wl6xxd0b5fqz2z28qnj"; +"hackthefootline-46494"="1l2iq2k1bil4l5nzxrfi4pg831kxn22ld7402y285hlhv7cj6qfc"; +"hackthefootline.doc-46494"="0w10yipva3ixyp91iy2y15n312gk5fw90960p3adla2w1p4qhs4c"; +"halloweenmath-0.11"="0sfcggpqhai8xzpnbyz1vlvh7cfl3n2m7z0av4drd7wqzas0mcw2"; +"halloweenmath.doc-0.11"="0k7qfv036aa691902chj1rgcf3z2xd58xfb2r0b5z80g6944xjrk"; +"halloweenmath.source-0.11"="0ir0xr3aiyjiashy6jl39f401ccgx3dhlyiqx4h2myiwq45ay2ka"; +"handin-0.1.1"="0xcsmfa4jjhrl3xkglqwbgvi844q1f9zjgpyix5akx058qjvwl7g"; +"handin.doc-0.1.1"="1k3ar5yzyndnfqkv3bhl7q8aczfbaaghv9mkhzpfri4za5ks6fnn"; +"handout-1.6.0"="1563x16fgw29vzw9bzjrc8maj1r8337p288y7v066qjaq886x3xz"; +"handout.doc-1.6.0"="1y1wpkpjwhq7aya9b98ym4xsv15zavmv8k1i6q0vx302awi2r5yr"; +"hang-2.1"="097qbqwbib8gj53qlydflff7sqp5ghcg5812hjnav9a0rgklpw8y"; +"hang.doc-2.1"="19falj7rm7diwr24q5rpab3rp39awnyg0hdxfhhalkpdmjwqk2iy"; +"hanging-1.2b"="0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb"; +"hanging.doc-1.2b"="086lzvx4g6bj04xdqnadmb8832klmq362k9lqh4pz7ym34mzh5c7"; +"hanging.source-1.2b"="0wwfnkb66m7r77723kkkdp7yxkl789g310m5lhllwx33fbhm8vhj"; +"hardwrap-0.2"="1kwsns5vg5pkplcl5nhmvpm2ccdv0f9431qxjxq1k6zfsknpy60v"; +"hardwrap.doc-0.2"="0h1n80c9l34isgyzl36hf4nigxcsykfgqv6i9jjdf6dqpp23bpw9"; +"hardwrap.source-0.2"="0hiqsj0vpfkmi8z048ymlnxrxaam8raq2f48wlyk67x4w2gv72k8"; +"harnon-cv-1.0"="125885fg7frl37pmxxj51i7d22xydj5wsva9i27126903y3qdm8m"; +"harnon-cv.doc-1.0"="07i4qv95fcfnlfj18qljwbkv1cm5r00mzmq570ra3bgjc301gk9a"; +"harpoon-1.0"="18p0xqjxix4ka9a9ja513il0wrpqrqh8v9v13cc89kh8qfjlf9m7"; +"harpoon.doc-1.0"="0l2y9l8wn55dg06fbxjnv16bkhgbg9rpfclawfh4p7m2cf2h1k44"; +"hc-15878"="04qricj1nmmmhxwsam901cr43h96ymc7qdb1m52byniv51i8g0yn"; +"hc.doc-15878"="06q64drrpgm7lzp45hrl33cs2dj4mx1mjpsd3paqgsn2xxqls2yj"; +"hc.source-15878"="0knqx9smbx7lyr1r6vn50x3x9zldv14gb3484jqk28jvm92njnij"; +"he-she-1.3"="1rr8pdpizasdcb1sfg74nsqs67xh2lcwd8w2rjaf719bpx9372yb"; +"he-she.doc-1.3"="1lmahrp33iv7bbnkbiwpkagy3rm7j0wric7m1fbzdvkgkzv274na"; +"hhtensor-0.61"="13mx7mg5jqrlyxnx19n0rs2crpxx2gp6m7l41m6l2ig5vlgc0x1r"; +"hhtensor.doc-0.61"="0k5fg9ad5avnsg84xwlcbzffrzf6y8l8a2m0dqw3clg7zjmq4prp"; +"hhtensor.source-0.61"="1pay0c1z6avkb44h0iibfn6xskiglym0fckfqrdv0bablk3cghjn"; +"highlightlatex-58392"="1pmhvjxp5038nnxd9bnk3s30wgzxvbzq6z8cfmvz0k8h1nzkc1a1"; +"highlightlatex.doc-58392"="0q4v0dvr50wd0qbk8xvn7bayyq00kj8b8wwyn6axia3mpjmr7a41"; +"histogr-1.01"="11zbm3d05j6nrzwb3hpahli54lf06aly60arh4fi9k52qcbsylv3"; +"histogr.doc-1.01"="046gw7h51w5s8p3rh6kwwi22xxj8bspbh7anf2cdzg4w88dardl4"; +"histogr.source-1.01"="153lhmgh0n224xkg7dmcajj7bydnv21spihh371hj5a461d4h9k7"; +"hitec-0.0beta"="1rzv2baizqa6fj063knxhac39slaaxk5lbgpl6zwk60nbp1lxq3l"; +"hitec.doc-0.0beta"="1p6vcgy1l1avz05h6r7bqwr7hl3jrnyryl3vn1i0qad25jryf7qn"; +"hitreport-1.0.0"="01xxw91175ffcix6s7ji2600j966dbm6zl8fbnfwabb1rvn39nq5"; +"hitreport.doc-1.0.0"="1wpscl97hpc3s1s34bskz088ph3x83qq7m6qgjj0xa2hbm2g77ci"; +"hitreport.source-1.0.0"="1hxcw8n5aa4jfpd8r8f3442diww9zhnywd6kbbqjs7928bb51vk4"; +"hletter-4.2"="02v906vgbidc2s1mgz1k3666riwb27vsl7dp24rd8q2m167xjd29"; +"hletter.doc-4.2"="1x8q4jkrbw6ddkqqlaz6mxj4q105vjs8k8ifphvkvhawl9iikki3"; +"hobsub-52810"="11j0fxsxmyd93px9j5fdarz1231nczdkfpf1qf33kcdpyb44jrs3"; +"hobsub.doc-52810"="0hdidvz42acsgy021c1dzlvshcmw6fz3pkqrwpk66qk2nnh30dal"; +"hpsdiss-1.0"="1l7mbnhds4c6y1w5vylsx8j7b4syl2j785l3xzvk89nc5g6ck2qh"; +"hpsdiss.doc-1.0"="1cxdd1340b1gkn915id7xcdac2zp79r1yi5g3wjwmj4kbn7z6sbp"; +"hpsdiss.source-1.0"="1dar4y0ajqz93znww0fkf36li50b82hbxixi30hi8fm8y2hc3j2j"; +"hrefhide-1.0f"="1b9p4qwbclsgd61qqnifqaid1s93r0yqkwi95f24snvklm8gw7zk"; +"hrefhide.doc-1.0f"="0x3md2dm04kvnf4dfs2i6gpplpsayjcw4qz9qwayad7nbnpr9i61"; +"hrefhide.source-1.0f"="0jcf8pvsndvhqa77bi4i8wl5lvgca8w0h74pmaqvs1d0vc8nlja8"; +"hvindex-0.04"="1wk4q29iyqrk83kafwhah5gvvj2ywpnqzvnza6cwrkb85fd1q2i8"; +"hvindex.doc-0.04"="0vcdmn3xc4cm3rkdkzi0qvqakgkc3hrgy8nycr5c8vcb6xaiw0gr"; +"hvqrurl-0.01a"="0ckdgawrb76r4fszzsrjlapnd2m9zcmy2la2621c4gwrgyskjvs8"; +"hvqrurl.doc-0.01a"="1bxcgwllrpknm4akd85sm13y6wn36n86r04y8kc9ymv7i0c77gis"; +"hypdestopt-2.7"="1753c7vjx3smnhl1iylg4x0sdcqfg6gb0wdbwqmlass4qdn494w1"; +"hypdestopt.doc-2.7"="07a2dpvvyj2r2691v8izjnqjksna1nm00za4sva1npcrhkc2qq1q"; +"hypdvips-3.03"="0ax6n7ki47jyzp5g8781c7rv54hwrl0fg7d1bwzbj9bmqi39df4v"; +"hypdvips.doc-3.03"="15vnypyl6g50d4mycz3s41h8ccpmknr0vh9bwacr6nxbzlyyykrk"; +"hyper-4.2d"="12737gd2nmnalkgl4d2sh45r4d621zl6g2zcih98m7dw8qr38w2v"; +"hyper.doc-4.2d"="0hzl3fzgmn6kyl6p4d98l9ycisfhb9v50a1m6n8q1k6jpvr10z9f"; +"hyper.source-4.2d"="09m0kdcs4kqksqwxf29yq4l52kb2mj5pxkry010ibwqw64cs5p74"; +"hyperbar-0.1"="1bj0v54k85isn3p48vmiygcvd3n06r4mqcp75hf96mmp0wvmczg5"; +"hyperbar.doc-0.1"="0fmrz4hlzd8clxx150fk4zbkdgbnhg3b7ck10225b0n1lqgnlh0h"; +"hyperbar.source-0.1"="19x81f6bki5mnx1nblrl0ji663q0pzkacy5lbjsqyr7krdc33fyh"; +"hypernat-1.0b"="09lnsw7ycwkk71fyjk8zwgzdjv8ff3k028q7hr27dqsiyg4hjg7a"; +"hypernat.doc-1.0b"="150ayv12ym9h68a09h1xakdfzccpix1pff9blkzjq6iz5imzzpr1"; +"hyperxmp-5.9"="1p3pj50iq61bdbqvm4bijj48bwg2n6sn2dhlq5xgp04w8jxc29v0"; +"hyperxmp.doc-5.9"="1sqsss76f9mhxv8vlp1dh8gnjpv8i4mzy74146hhfjwvaf5zygmk"; +"hyperxmp.source-5.9"="0n7xzbq57kaqnm1aafrz58am7s6wn9pcxbgfiqdc6yniz8680jl2"; +"hyphenat-2.3c"="0ckfvjxdv4rb8156x2vmwl15mk9057i2lyg9xhqkmvqh1ani4lc4"; +"hyphenat.doc-2.3c"="1lzpdz05dw5m8ljxf5f846m1x4nv5yrqbg3sixf7dgyhsmpfxnls"; +"hyphenat.source-2.3c"="1ddwv26nfl4jwz8vxs4fwc9qw8gds1sg275g2bg9ci8dfflk16k7"; +"identkey-0.1.0"="1vs6sr25ybmrfkg5v3m021hlhw9x3gpynh89q12a5pl2ka094hn1"; +"identkey.doc-0.1.0"="0r33gzfwrj4j8a2i8kdddbhgljf3hz1b7cjfxgmv5gdqmmjywnx2"; +"idxcmds-0.2c"="179mvb95a1cxkn7ncgs7xwhh04d36s9nb5jjxvaszcfkp9rnlkcg"; +"idxcmds.doc-0.2c"="1ym6yi4cpw9flz4si6blg5bfj85sf0p3y6nipc886ixkwiyvsgm7"; +"idxlayout-0.4d"="1y1vzyb1l5b8q3qqs62zfiw7vfd9c1pdha9z4nm5xpsar1nk69qx"; +"idxlayout.doc-0.4d"="11qiyzcj4zi8kd9h2k2jhg8i8rzfwdam9rhr7cmvbxqsqirf0fp2"; +"idxlayout.source-0.4d"="0fkpj4gn06wkq3saprsb3gm7myj04yll4spz3j7yi28yniv4cr5c"; +"iffont-1.0.0"="1a4zx0mysk6i7awvcjv2y1yid1k160icrkqkvw34qsgs35qnqbbq"; +"iffont.doc-1.0.0"="1iqchl5nra5ldmv5ddpwjcm84whpsxym34vphj2zxvzl0hqwrc2n"; +"iffont.source-1.0.0"="1x187pafzgg7h2vvy5dfc44y37q45lkzqfkxh8b52pysxxl23014"; +"ifmslide-0.47"="1n4dmmslpsx9fv9wqiipcg04lasym2fbgsqkvvffqmx5rszgdpha"; +"ifmslide.doc-0.47"="0n7hsymjs1zfjc5gbn26z2wdl5qicc7pd251s0h4qnfigq3nhr08"; +"ifnextok-0.3"="0sf9dmz303pbxfi24z6fb1wxia89qaf4svgp4sbpi1yl3gkxwrmj"; +"ifnextok.doc-0.3"="11r5zrs467h3rv5j8c7b5iav19v9hbcxbspgfdbd061g871xxd5y"; +"ifnextok.source-0.3"="047pc422qhh9d80rjgmjgmn5xsapf9azvqrl0cjn28qw4m5ccs12"; +"ifoddpage-1.1"="16n7s8cmsfd5ylxmz2f87mx6f5szr8na3zygji8izvi4g0pfc1zf"; +"ifoddpage.doc-1.1"="1z7x0qyn7g96isqgkdwwkp45mzplqixgm9d84fhizfzx7sw9r6a7"; +"ifoddpage.source-1.1"="14x0haj3xjsk9dn2djg117sl7x5nbwgbivhjj3ichnxlgrlf1bis"; +"ifthenx-0.1a"="0bp087nfq5hb3a60ayprbz621nmk0acisizkw5i25n4kryi6vc63"; +"ifthenx.doc-0.1a"="1hzz8s2xlz2pij81cfgjad8yaamv8l4iaripj7bbifkq7gy38afj"; +"iitem-1.0"="1sdsc28fw1lrr72s4wwgwk0zxk9720ll5xbvap2na4i3lp4vjghf"; +"iitem.doc-1.0"="0grgh5bslsl67ygvz2cd3xb9adn3w4amhpkkxnh035vkld91fxh8"; +"iitem.source-1.0"="1fk3c5rc8ylf9jg5id4jnm1gjnrvafiivhr0lpfws4ddr2pmir06"; +"image-gallery-1.0j"="097brbh3xf2xi4s151iy8g6abnf0ba4yar78jz607f9dfni95i8c"; +"image-gallery.doc-1.0j"="0f8a7jzj6w25al9c13mxd04bg2c701s0ynsd1rvnqdik6d98s0l0"; +"imakeidx-1.3e"="0w0q18bxpbsqrj97309b9lyfcf4has5ldjvs0dwn45lciav8a7rr"; +"imakeidx.doc-1.3e"="0h2wqdg6navbpzjq38ks2b9lz3hkmgi7v1y8ihbbv3aisyvp5r93"; +"imakeidx.source-1.3e"="0l7q94z5a3lsy4kh7vxyr6mmywc43p681p1vjry1f9vi0s6ljwpy"; +"import-6.2"="0if5vrbx6456ydarw57p1jpkcj2d7csmiffgll6fgxf2kllqga6v"; +"import.doc-6.2"="11hi1yk9xhqks4i3rhc4s8bbaakxbbmddb7j5sym780y45qm79c3"; +"incgraph-1.12"="0ydcq3pk37a6mimv85vm3nrl7b53sgs7m1d78705swk0hfh2z3x7"; +"incgraph.doc-1.12"="0mc5c6g5af1ri0hx66bcx5lnh2hhl0lgdj6xwsjhwkyik49lvagq"; +"indextools-1.5.1"="155l4azvgwbk4h70x6bkbddq8k4jxhh485xa7jajz9vq11lkvhs0"; +"indextools.doc-1.5.1"="11n3knyzdamz9nz00i2rck6gffqrzwcycah0ds2a2wmcm7wl6yvk"; +"indextools.source-1.5.1"="08qifym1c39rk935hdsm7kqxdy3gaphq34bm3w6klr92cz6w0n1p"; +"inline-images-1.0"="1nq64ymrmfiw19bcbb25gmll36xbv58ynzvv140089pw7xn5x7bm"; +"inline-images.doc-1.0"="1rjppia3m0kvf433ansxhmwvii70i4k53iqk9jphhk2xv2gfd16v"; +"inputenx-1.12"="0jjf29lj8ha99r2x0vz85swkr2aq6v2jwis27irsi79syfq8bpbc"; +"inputenx.doc-1.12"="1kkblvi4dhfxsij5lmbdvmnapskvd5yahha5im2nlllh8crypwv5"; +"inputenx.source-1.12"="1681djxj8c43i93ip864bi1p1fpn2dngkvh18zs0234ls0gkwiy1"; +"inputtrc-0.3"="1qy90zwai5ciajsiph6sgmzmfi16qgvx389hvxsfi28wccpm5bh3"; +"inputtrc.doc-0.3"="0fcxac4jsvhnc85p9nwpp44ij0yq4q1lxlw42dzhg88fdkl57srg"; +"inputtrc.source-0.3"="0b6kl9a6ilv0i5xnlcfjgia40ynl28dbz1rvcvak3637fva07ghk"; +"interactiveworkbook-15878"="0dibc16gdam4yxil37y2zsz4cnfiq2grm6qqj512nng4zqnwcdj0"; +"interactiveworkbook.doc-15878"="0nh4zm37xipvmv5h6yxy1ir2gkjy23h22j8dnz7m04w021sgx7i2"; +"interfaces-3.1"="1d2sg377lxrwv0w0zdhxdjsnb8sbkzadpp29h4jcm7v6qpirs1wj"; +"interfaces.doc-3.1"="00dmb0jq7vvf7xfppwmw1pps6453rv438qkpv5qhlamqlvx2b28h"; +"interfaces.source-3.1"="0s5gfwv1izv3y3z3lmfbxdw06830lzy85f7vza4i8zcdwf775pl3"; +"intopdf-0.4.0"="1qd594mdjbzpfcv7km0m5n60h5nqj0mcza8j766h84dp3vw3ni8i"; +"intopdf.doc-0.4.0"="1dwlpcjh71y8v9k0yqmlk9zr7wgyamg77hz0nyb7k0syhaw6q263"; +"intopdf.source-0.4.0"="1g39qdshq616g7s3c31maihwmdiayny5kbm3rf0djmfpgs1rxk8w"; +"inversepath-0.2"="08xivnvbyhaihb24w14b908927fr73kbk66x82nv9j332lpmfgmd"; +"inversepath.doc-0.2"="097fyhn6dj9d8hq26xads2s7vz7hvixwl27psqrqqvhdlq3bvj7n"; +"inversepath.source-0.2"="09d3dzckxrg9vdxh84nx3xzwj3rfarvf0bpda4qib179bgnqrf7d"; +"invoice-48359"="0z2ixjxicphaya7244mi0gdnxnv3qawyxpa1kwv6s0r8li4604k0"; +"invoice.doc-48359"="0ki54z1rlb9xwvsgd2bxv2sb135cc6zh44kpww0mx76vcky4az1r"; +"invoice-class-1.0"="05vbh1iclf9gj6nzradfvnqa7yp7r5c3ccahg3j7qrdkkb0xj8ig"; +"invoice-class.doc-1.0"="0myl8pvvfzd5jrlva1cxkps9g6jr0lpfw79wr3ghv2idz8ba85x0"; +"invoice2-46364"="0646sb8da53x6aybbfijk35cibay4pnryq1xq2nzikdsf8i5x0x1"; +"invoice2.doc-46364"="057a73iw33rpsgpxcg13jlpcfmcmsq68jdz0fa3dhz964nf2xkpz"; +"invoice2.source-46364"="1z4lilb3h8gp64lgw7xbcnqfjf0lmzv760ggdjhmh5ibdc4ic58l"; +"iso-2.4"="04ifwh4vn074cnibyafzq59zjlnlmdfyq03mqwk44r1mgmizizdi"; +"iso.doc-2.4"="1bnh34708psjpbhcddv87axjhxiyfjic0mamlpn3z58qcm0jb2pz"; +"iso.source-2.4"="0gaxih730r70xgy84vbqz1fqbdr1w9fg9d1hszp0kqvqaypfmcyg"; +"iso10303-1.5"="14wjjp2iwb7l8m01cinmpm3g9hk1rpjx4a0rc41y614ah5bmi4ry"; +"iso10303.doc-1.5"="12m0rri6l538iyphsh2abcvllckg566aj1487sa9jc4m56armvj7"; +"iso10303.source-1.5"="1nnfz5r5hk0rf1gvwrgp4m7jb5lln1cf9pnb46x9l9hyiagq5din"; +"isodate-2.28"="0xw8356im72iqi67nspwkhafrwl46gb3i41yapnj0hqb672gk4lj"; +"isodate.doc-2.28"="06m8ic0nsiy5bsymzfhpia9i47kbpwqmnbrvmsp44mw5g2ccjk41"; +"isodate.source-2.28"="14b1ymqd6qbcksnim642py5qs5n6g2sy207apkx9mnhhbqa15an8"; +"isodoc-1.12"="06ikl5zl5l6fmzwak6vq6zcfz4z2scpw6gx7nvdrd6y1s8vp5h27"; +"isodoc.doc-1.12"="0ybkmdz34nxyxsnxjhd1z2riywfkrxv77969mnwxip60lny6mkrs"; +"isodoc.source-1.12"="1yxp0k3bvy4fynvnlpyg482sd2xjb0d5nnkcfxjqq8wkscgr3vxl"; +"isonums-1.0"="0nqzapahfvqg59zxrgjiyywkh8zb8mz9gdc2733r78rxnz81m1ba"; +"isonums.doc-1.0"="1axq0acxk6qhq42ayr0zjs3356ww3ryidvj2wii2c00isw0qip1w"; +"isopt-0.01"="03skmw4hmib197p3cfbhf3mbhq5hrjavwinwc22drqmca370v305"; +"isopt.doc-0.01"="0jxwzfysw4qsfd1694grnzs2jfqcbhm40w1xlgcsrq2ylgcjhr8q"; +"isorot-15878"="19x89d5fvjpn66y8ma1h24dwapw2x6a4nxbw4ixp7xqkycyhy0wg"; +"isorot.doc-15878"="0jrglpxxks1fbwgvmx0w3fjcnsfbf805jv95kawvgz1ix3mm71v3"; +"isorot.source-15878"="0rfc2jdd4f5yds516lr9m28izg3lbf6wwvpsh9hrl466dakgdayz"; +"isotope-0.3"="066b5jw98ynyc15jigxc1idp79i89hwrq19rdizzx90s6xfnxlgn"; +"isotope.doc-0.3"="00w5bxh4dkph9d4z0x8h6akcv1i2a3b5vfr4xbvq1n8k4i8ss7jb"; +"isotope.source-0.3"="0x8vrmprpgpgbxp3n886yajdd9mv27r9shkyz9mp1bd4zakdgc8f"; +"issuulinks-1.1"="07rpm9kcfj3dxsax8kp5r5mvrgg1c5yrpbiirsk44ybjjkhhjscy"; +"issuulinks.doc-1.1"="0qlz8y0sszp1jsnbbgaj9h2zcz1yqk827pwzccfi4wdj4rcpvvam"; +"issuulinks.source-1.1"="051b05k40zs5amjxnqav6ibdvj64wfhcf16a2hlkaf5kpmpkmh54"; +"iwhdp-0.50"="1snry29lnq4cm6ybwqi29lhyvn8g3zmqbsig0kwnywa92dl3mnl0"; +"iwhdp.doc-0.50"="110x1wm1ii7b5r23zng2dx4ly8vqqwr137gfl15a6v6hcr4zxvqg"; +"jlabels-24858"="03fpym9q84g1b0pns6sdsb4jx78aq7sclr5fkm05ckvkk4v3wmsj"; +"jlabels.doc-24858"="09qa8y6axg9pvma507b9w63dwd2jrxnmd64f5rfd7wpznamhbc0w"; +"jslectureplanner-1.12"="1kciz53cg9p1f710j5rw8pilfmbiz755a24dqxckam98jy5g4b8s"; +"jslectureplanner.doc-1.12"="0lcq9dygfjrs63yjwdkjkssxyfx6phmbydh6c8lcfpkg984pfg5c"; +"jumplines-0.2"="1d5w5nh0pkmhjjjq9x2n4r72ygjh2mrbdr23vsrh8cyvj3xym4w1"; +"jumplines.doc-0.2"="1q0mzjyfj8vfp42f8m11g6fyx60mb33g5n4i7pw9r0dfx8y4jvpd"; +"jvlisting-0.7"="0ry7gnzgl2d6id7xgpbdhg8pj920105fd9qyx1a0riagp0pgyryb"; +"jvlisting.doc-0.7"="16z6amx6czmipal3sbqmdsc1v5x1p4nyy5wxalicy1dki1f4zpyn"; +"jvlisting.source-0.7"="13al33s01bw43sa2ffz5zlxgaqvhj8lrcz8y7x9xx43wvvxjmdz9"; +"kalendarium-1.0"="11f8zkjfxbk5w4y49vy712ivfqx66m86jdddygfjskp47gxcxby2"; +"kalendarium.doc-1.0"="0rbac32h90cnp318a0chj1wfzfrvz2y140siqv5slld90f7d5546"; +"kalendarium.source-1.0"="0virfajl7xr8yiksxzmr68dm11m4240drg7xn72gxbs7jfh48wqy"; +"kantlipsum-0.8a"="1k4ilpfxa6a5prm0rgbrjw5jsr55wyadj8aq1r4hl3q953n64mqz"; +"kantlipsum.doc-0.8a"="0pwwrjffc2525krx7p2d2y0zx3zp2yj4x0010ah8k88ix78h47xf"; +"kantlipsum.source-0.8a"="01p1gccy0a7nsyph5l1g370bsk2d9pxc45c87j88g8zjizllfkja"; +"kerntest-1.32"="15695a4q6ikdy6f9149rblfc4fx25hmpyczgr1z1q8x4s5ar7dr4"; +"kerntest.doc-1.32"="1fmpngs3q7pwf4z284gg9b4cfw55afdsnzg6qpanlryk6czbch16"; +"kerntest.source-1.32"="0gwz65xgxii7vriw5sf1zi4r97prf2c3dwawr3ghhgchmblimf8l"; +"keycommand-3.1415"="062i4fr9h2sc1zy3ybyqrq5hw4g3g54gx708rrznkl4zmpf93ppr"; +"keycommand.doc-3.1415"="0ls9fbm0815aar19hg40p91n1iyyfhn68ndhvapmwfsxhi6f2d9j"; +"keycommand.source-3.1415"="11blfbqdn1a00bfdv3nwd7501pd5qrkk7pqn2ffir1461xivz26f"; +"keyfloat-2.01"="1zw3wmhjx6inalww7dy5564w6yv87cjdn8kb06b7qnzgh1xyk3w9"; +"keyfloat.doc-2.01"="1wbb6i1l31193i83x9jd6qggiyklvns6ma0ing2b2gqsmwaisbyg"; +"keyfloat.source-2.01"="11yylandkr8cryv5yvwa4x356vzrgm5wkabcvqasmndid849i55p"; +"keyindex-1.0"="0fsszjcw1r3kws565pgc5j7chifbkf3dh1hnlclwwsjpxbji4n6c"; +"keyindex.doc-1.0"="02n7lxz8pd49q9nf6pavhs01410zj9pbszqqbmk5c1ld077276x7"; +"keyindex.source-1.0"="0k3img6kb6v853wzmhsrrhx7lrh275ssx57b83vk3yx9m831qwmb"; +"keyreader-0.5b"="17cfxcn374q0pgf7bbqwc0yrk6r15d79h39hzbvf7yrgj4r3880y"; +"keyreader.doc-0.5b"="0fp2hv3azi287gz129gqlsirw4dr1d5lqhzxliyzfy8dd9b2cqb7"; +"keystroke-1.6"="0h0ci8pslybspsnpmv73qml22592vp5lr50qqppyhw8qkng22gsg"; +"keystroke.doc-1.6"="1ig565mxjnji3ng8vsc2wa3jyp6mrhma4hnb3shwnrj9g2kvj84w"; +"keyval2e-0.0.2"="05ssgrl08d55in1wkam99bfdfkjhjrda6j96b6nmj61sp97yg3ig"; +"keyval2e.doc-0.0.2"="02ajr27zgfjk5hwmqm05gdapkg3d3rk1k9k3nqm4nbvwhx5sahg5"; +"keyvaltable-2.2"="1wxrxa1qfk9c18vnd75kvw62w3jcjyw8x7z5jbr3854v2s7dr8xa"; +"keyvaltable.doc-2.2"="19262vqgi7d5lyki08rqznpx0442i8z280grs0l8y04hdivlr3mf"; +"keyvaltable.source-2.2"="1j14vyp20r7wnylpmik8zfg5zcbva4rzxckazk21xjapgpy9w951"; +"kix-21606"="0w5qaq50wki5b3s3j7p11akx7mb8z1khchhy6093pzzrny0hd5c0"; +"kix.doc-21606"="1jblprmz9vfriqdmi9ihh3ihi7pc9wf9cp8qfli89iir2xy7lv3d"; +"knowledge-1.25"="1zi402k1sm97fc3wmvwzrwkx1sipik15nb30rm884q721mlamw0x"; +"knowledge.doc-1.25"="0vkjyjn900iwmazsy7jjqb0s0y8xizv2vhfb9a4sd7c4y2lcr0vf"; +"knowledge.source-1.25"="1d73hr632ml7v8y4sphl82vrpjk8z9ync10q82xhykd8wdxfzlnv"; +"koma-moderncvclassic-0.5"="0kgsbg4is158j1ssjwabicw38mh2cd4n1ggxinflb8i18xsmlgh0"; +"koma-moderncvclassic.doc-0.5"="0f070dxww75g36il70gmrx9bn0f0d3mmh26fmzqb5zmf93hyhcsf"; +"koma-script-sfs-1.0"="14qhq2h6pfjy878nkglbif7yjc12g6q32kl4xfc7kk3kf9syp0kf"; +"koma-script-sfs.doc-1.0"="1cjraqcc13bcq451a36i5x2sbwj97zy4srrpaxybmlisvnza7vz9"; +"komacv-1.1.2"="06df0hx1rm87vgsb1g8b00ak77n6zs34c7mb76k22fis41qmm3a2"; +"komacv.doc-1.1.2"="07sxwgrrik3vadlp9a4lk3jmcqnvfzz5ir8l33zi7sjrapr7mxxa"; +"komacv.source-1.1.2"="0vd6ha60dz9ddmf3rkbbw5h602fkch3zifcjip9nyfs7wgnkg3r2"; +"komacv-rg-0.9.2"="0hcf3aw9r3hr01f9109rid9c1c36gmg9z0258zlqgq9l8qs0bryz"; +"komacv-rg.doc-0.9.2"="1g985pnkhlhyf1285w9g1zx86vldyg45r4dyp1dq02pka5nf33fs"; +"komacv-rg.source-0.9.2"="15v5y47jj0393vkikpv5mqdrrygs66b20gsmp03j6v6iih52w7fk"; +"ktv-texdata-05.34"="1md2iv0csmr5f2mcdlb3lacccwifd6iv7yp6123gra5xcp06k4y0"; +"ktv-texdata.doc-05.34"="14sk7x2va8ja65a65fpksj2nd16v6rc1f0828gmm8j81d13cci6y"; +"ktv-texdata.source-05.34"="1ws256l59plnhmw1rycfznwpndni5i47liqhazddwbg2hragfahh"; +"l3build-55426"="1a2lib52a16c42hbcj7n8hddbbb94r5ghhj1kw75czxixlgrqgvz"; +"l3build.doc-55426"="1ka2lkcmq33933gz8r8kvsaarsgczcv8bp5jplmq9mjwnxdgig8d"; +"l3build.source-55426"="0rbkhc3lcf8zniqn4crdqjrmsl3gqyhzb2bpp0sn28sa6wm4x99f"; +"labbook-15878"="1qh16jjmpyqdfndfs91nmbfhwxif5ygk35zlsailngpgnp1r2x7s"; +"labbook.doc-15878"="0za4mp2zq9s1z90sgqcvf6zac7w0wqbf8y5w1qrwmlv6r6kg3s1s"; +"labbook.source-15878"="0w7nff8c2ffrn2ywz1dahd8n4cb959b6zf3ka0s913nv04ifdkgi"; +"labels-.13"="1d1lxzif4f3qxkall0qzsn4lh55ljr45zba0xwzyvfbwighp1vvm"; +"labels.doc-.13"="0fl3as2lwdga814fdlg2pwyw600cvrii9hd0f4vscfzq7lmw01k9"; +"labels.source-.13"="0y6mkg18jqsbqj14h52317d1vvzvn3mv89q2gl4i3i89ka3dfajh"; +"labels4easylist-1.0"="10pfzxw0d856ki2krsdpidnfsk27mg4k0vj3jx7pry5cfirx6m0m"; +"labels4easylist.doc-1.0"="145n7vy3d0vk3cq3qd44l3a6hjmazipm7wmr4aa2knxvs4nyvw2l"; +"labelschanged-1.0"="1z8gjaqqydwf0mkbnlbzd7q49fdj8c83pmcwfhi27w5lnyb897a6"; +"labelschanged.doc-1.0"="1rv3vx641hzfkckkjkf31xdb8zx3sarcdpnsjzhnafzy0y1vg8c0"; +"labelschanged.source-1.0"="0n0fdxj14kb1bk8zj3mnhnj6q5nf6h4swb7lwgn8jv0l5z5qmp25"; +"lastpackage-0.1"="0wjpjd3b48fj4mqqdx38sqalbaa9ab3c6rywyjqhvrd1pxfap2g0"; +"lastpackage.doc-0.1"="1123lz0ki4kww93952wqrhrw9l2cnk4wrrwyi0dxc5w1yfn2gg87"; +"lastpackage.source-0.1"="176fk84mbb6w5ql94381kz05lh8q8im7ri6rfjff7f4ymfjnh2jk"; +"lastpage-1.2m"="1wmfi6qz5d58vfk7yvvaj9dp6hrcnf0zsscgb1y52hprkq5cx1np"; +"lastpage.doc-1.2m"="10fnb5b85r1ypyfx0c3a119da12ay2412kld6rxqckir6nfx9v4r"; +"lastpage.source-1.2m"="1nysnljrg0irgmjddsyhpk8d9s02wr9g0h9ldpdwlxkrvvj82nk8"; +"latex-amsmath-dev-2021-05-01_pre-release_0"="1q29iyi6hiff7qyprffz0i527rhnfvyfxszsc9dpqvpgw20zwdqx"; +"latex-amsmath-dev.doc-2021-05-01_pre-release_0"="19k9bdm04kba8in8vd1xmw045nl4p74r0c73kf18z14b8aa3iw0q"; +"latex-amsmath-dev.source-2021-05-01_pre-release_0"="04cq98iz15f2yr2749yfxlvljzq3hb5fmk6r7mzz806z7pvy0vig"; +"latex-bin-dev.doc-57981"="0kig2hc245vnmhfnpqvxiskbaaqf0fv8j569ihsfr1fv3x94bdzq"; +"latex-firstaid-dev-1.0k"="0spc5czykhc13hfr6fw1lmdxv2m2g0fiymz2s3ch61ad6263p54i"; +"latex-firstaid-dev.doc-1.0k"="0jy0h4njarfv4w1rdl1y35p7i3la0hfafvwnms3c3j8jj2rf3zh5"; +"latex-firstaid-dev.source-1.0k"="0cdbcj16w2h0mqm5j8a5g5z4v0gb8mrgjamw50a2rb7g07qwwkca"; +"latex-graphics-dev-2021-05-01_pre-release_0"="05wyr9z08sld644dfdzj9m6v4j59b75yzj5541lcfkp8rl4ailiq"; +"latex-graphics-dev.doc-2021-05-01_pre-release_0"="1idfhdlhdxd3lbbgvjpb19cg2bfa2244q8nkqqpdqw7zd4vg6afz"; +"latex-graphics-dev.source-2021-05-01_pre-release_0"="1ylzclvgzrhyyfgsch0hh98zbnd9y4jrf0q8fq2xzyhll5nnmzlp"; +"latex-tools-dev-2021-05-01_pre-release_1"="0zfxs0axp7rzw5xibh60cfjywi50slap3y6gqi0nlwhibp7655vb"; +"latex-tools-dev.doc-2021-05-01_pre-release_1"="1ggh78ifrn52yyz1fr4j2k0zkmhizwgfvabrr2bfmpxm2a458yrw"; +"latex-tools-dev.source-2021-05-01_pre-release_1"="0wmp1cvpbbm4xfmbc2mj64k3dby7yr0q3w0axkfw2bv3qlrvp4nr"; +"latex-uni8-0.03"="1sv4n2v0m3lck7x320cwbay23k7r9fh4wm1vxg9m4grphc72n2b0"; +"latex-uni8.doc-0.03"="1y3p08mni1ng6dyp0g98in7hh3mbzqq42249idy90vjhc177rjc1"; +"latexcolors-0.1a"="1wpa7vw8vphdghdv1ap5ilcgzj5n6vyvn4a6lfvswg2d47s5y1a9"; +"latexcolors.doc-0.1a"="10bbk7bs1km97hpzqzzfasxzp0w202y8w7pwyd465ygr4y19wj6l"; +"latexcolors.source-0.1a"="1j7vfvyj2k4q9drmkmh3mfk1g3vs7czn1x16fx9jyinbdxnwblnh"; +"latexdemo-0.1"="1dw7p679126br9gl9pmjcc0f596314h67dzbbq0ypsd2yb0y7x1a"; +"latexdemo.doc-0.1"="0bnh076zi1mqmvf2x24wp45zndyak6y04z3x56ah0p6z96bg29lr"; +"latexdemo.source-0.1"="0ddchhzfg9s15i9qvxban35ncavcn8bj0dyhkvr3m8g9farv5mh6"; +"latexgit-54811"="1kg9cbz6h70496snqqa2h9xfknm70qf96xyvnc829k5v34jskmi1"; +"latexgit.doc-54811"="09rlc9nprx6590snfg7gakycsam37wmmscybvm48vdn271vvla9l"; +"latexgit.source-54811"="1pn4gv4prwsnnr377xg2x3kf3kmi8pxgczbi9knzavkd53653akx"; +"layouts-2.6d"="1ab9azs06k1p0s3n5zjhrykpqac9fi3kr3w31xmh698zpsg3jq4c"; +"layouts.doc-2.6d"="0ydpj4mbjyg6qy2wmj90rqfpkcq30pws5d11kdr1gcwbzqqkgbbh"; +"layouts.source-2.6d"="10mfwi1wv5v0qdwqj1mh5q8izgavlhclnz2aj8h02ijy4kzgfg5w"; +"lazylist-1.0a"="06p4r8q0a0m7pmbbcddxn5xc22f9zhvl2a9q0iv7ibkvgyy6pqja"; +"lazylist.doc-1.0a"="04x6ai73z7cqs7k9vgicxfcnvslr5812dlzqrspafy8w8qfx37jy"; +"lccaps-1.0"="1iy7ijsfpxcfr3d824j66ahcvmc3p21nl0k94x8bhfrq98qzxmrp"; +"lccaps.doc-1.0"="168yq8y5c31d9h31x081wh7aifsq0bs66cvk464wciy91sxyf34y"; +"lccaps.source-1.0"="0q3jn7h2b1dhdshdj3gxwwdg3gfrz6n5c5sflacgpzc16pn9gbca"; +"lcd-0.3"="1r911gvxiwwh7vvjhgi034j3x49n2dxxvf38zsldmqaj4sccfky9"; +"lcd.doc-0.3"="08id9jhafkmhypjy72d79v2yr2jgm6pjf4yhaw5279a4063a4f1r"; +"lcd.source-0.3"="0vkgnhkc1774d3g7r6sv7km81dvdrbvzdlk7jca6q40nnqw4zbw6"; +"lcg-1.3"="1zgpbj9zim5dcc5c2lf6hy33hzzk8cmirqh8kv60bsvha4hwvzi6"; +"lcg.doc-1.3"="0fnpj3mdxd0v1lrkp2ywb184bay0j6vc5m50jlnipjfjhry68n15"; +"lcg.source-1.3"="1al9wmw475g30jw8lwx709r0p4lq6p2p9n1ky69ncyy42zp79ld7"; +"leading-0.3"="1ky6c51dcx0gsj8f6zrwb242d940cjml0gb258ags5xi5iaq40yk"; +"leading.doc-0.3"="1l31zpglr1bz0gif3w7kqzhd37zpcgjig2ly84fcyk805sf7nncd"; +"leading.source-0.3"="0f4ayaz2m0y87ifddl4622rpf858zmh13xafp53nh96b8pyvcip0"; +"leaflet-2.1a"="04fvi31wwpsnkpsni3r6f9m3vr8b6h71f2znb79aban9g1qvnyh6"; +"leaflet.doc-2.1a"="0f82hm37i7w547jpmxkl8a2k4f92bw29vdzq4ywwllk2hdcq3sv6"; +"leaflet.source-2.1a"="0igkl1rjl14raf3xv631c7sn0mc1smyc44mldwgzgnzxxkv5kzzf"; +"lebhart-58503"="04gx4wmrcs6xmw6jh4zd47425f44z9vj6hkrwyj0p0naqvs9wzb3"; +"lebhart.doc-58503"="140sq1pyn8walsyhxrmz6kz87y4dw2gcc5rbwiykz7dgb1diikd7"; +"lectures-1.0.5"="0qdhkf7z1rnxm2ql0ywfk11y3aqp8yr1p9202d4ha6729n5pyima"; +"lectures.doc-1.0.5"="1xakcm4mmhl4ahnvcpn7k748v4j2m8p6d4p455claqhf7xg4jz15"; +"lectureslides-0.1"="17a0zn4hnkr8mp6rhmm5snjq85i023r6fjpmhpzbkw37l40lfjf6"; +"lectureslides.doc-0.1"="1rwcpga5xk5kns62mcrkrcnsmb13klvykzvclnm7w76hnybd0f4l"; +"leftidx-15878"="05fi4rp3s0s9ank7pphdwxnlnanc2r88dxhyxbz64fb26sja25gy"; +"leftidx.doc-15878"="047a5clwf0r43r1j87k2zfv0pa3nrii213y0zhv5r3zkmwvm1qky"; +"leftidx.source-15878"="0a8rzkycppx8qayqw3s7ndzz2xp4zqgx3qd8dp9s5ynlm10020nv"; +"leftindex-0.1beta"="16p8n98cw5kxah37wv263mq0jg4jq9f2dfzjyy06sadjwsbf4psp"; +"leftindex.doc-0.1beta"="1g5ykrfix8d6k2cg3nsh6fp5ibpgfajxgf9qgff4s99ir2fgyhrw"; +"leipzig-2.3"="0wml5k749fgx3vq10v4vc970h6nqm6qflg2z4jajph1h38kj2ryf"; +"leipzig.doc-2.3"="0znm18pkrf592jfgshmr0d7vk4d4yq4wvj9hqsfg9nrjd4l6a66x"; +"leipzig.source-2.3"="1sxqsgahdr0srk52iqdacsqn7sc73iv0n70nsnpvgfsczmxa2djj"; +"lengthconvert-1.0a"="0zjyynjlq48sywr5gyi6nhryrp8hcl41q1djjp73ingi2h2svz47"; +"lengthconvert.doc-1.0a"="1id32l1ipcilhkk4w9w2q8rfjlk99f5jphvq1hjvqdnhz4q1rk69"; +"lengthconvert.source-1.0a"="1zy9bnibswz834k24fk5srl0ahx4i4hlrqv6vnvwb3h8z71izc3b"; +"lettre-3.002"="13h1jsgjp5k82cq4rpx8gd114l49m1pzplksrwjylx0bzimlzgwn"; +"lettre.doc-3.002"="1w82fhhcdgsxwsnprx2p61ygsyh525im8j1zalcw0bji3i6pm06i"; +"lettrine-2.23"="150hglc6slr9ddy0fxs4r89p1x1fmzafr3anxi2c3qi117mljmra"; +"lettrine.doc-2.23"="06ni6clial2kx4gbzp7jd0x30vmzqhlgwdl0dfrgg88a6d2xdsxy"; +"lettrine.source-2.23"="0jcc7h3nphqivw47wllykffgdzx0hbap374hmmmkxrarmbligcrs"; +"lewis-0.1"="0ws9vk38j3m0sprl9lak2sjlq13nalcysk95gv68h90x04jj5zdl"; +"lewis.doc-0.1"="043kmzddal693kl6fds0xl2wwmyzvd9cqs8dmy1jzp0mdi6qw6vn"; +"lhelp-2.0"="0j55ilp7wn1w8vs60k6iangc9h637f2jrnpshh9glryxj9jjgxqn"; +"lhelp.doc-2.0"="1is5s8iqyb41fr2hr1kxf68xrlb8hqw3v1fifl8645dcgp8lac33"; +"lhelp.source-2.0"="0iyp664cy3n04nn4499ryzx00sr1iip1qmdlpvjx010r7hq4dyb7"; +"libgreek-1.0"="02a2jmvyi04d36v1v126z2mmyqn21vv9s7hblf5l8xsrzrgp309s"; +"libgreek.doc-1.0"="1g8bqscj526xlb5r6y3zsrdsh5d3xq7hj4yj6zhddnwang524ikc"; +"libgreek.source-1.0"="1xpppa9c0rk9bhx9pdq274x2zmyrjr0fr0idj935p9a65294ypps"; +"limap-2.2"="1hdv2rlvxbqm2wnn3x2xrmwxpwbs03qnlfj7k1s8mfpp5smmhd2i"; +"limap.doc-2.2"="1qj9ddllgvm9zqjvfdgg2sfdyfzpp8raf8n1l0zrg9vpiy2imdn3"; +"limap.source-2.2"="0l41pd8xl969ax257lrcnkxs0pzb3q1fmiy8ijz9jfrval3rqqbw"; +"linegoal-2.9"="1arnfkijq4324jzyq2sn681rk9ncbgv6zqfrvlbs3vic8wxj5c20"; +"linegoal.doc-2.9"="0mjpbkf6vw0n4ddd9abrah7rxf51gmgayspy6jpnai1wrzv0aby5"; +"linegoal.source-2.9"="18v5r4hj2jpqay98njcyijwvrbc067c49jrhja6i52ddj6h9q4wz"; +"linop-0.1"="1dff205vbsayq2jfyk0vvbz5yks6gy2bm4ylwwk28wmi55fqjycp"; +"linop.doc-0.1"="134jxv5bqklpdhd3wfbqibsp21jspmq9iv3fik2igwsbn20dzw4c"; +"lipsum-2.3"="0d5pm9v9ipmnzn08h18g8k30mqsf48la63m4amq16smbcrjcz31q"; +"lipsum.doc-2.3"="1q2iyvhh36f2jg4m3cfhszb3slfnv7hksf3ckyykfm3h25lj324q"; +"lipsum.source-2.3"="0z9f2cgmimixwml3h51bs6yvz0zjvy1b634hjhpqyy1b64lvsmph"; +"lisp-on-tex-2.0"="0g33w5hwgpw7hd62lij0h5n89n9r9ynlxswb34j0aqf3x7nsdh8m"; +"lisp-on-tex.doc-2.0"="0rgjcldb2rg330cp8m5vxbi380xla73jb36nn94b2awl4g34bpvd"; +"listing-1.2"="0kpf5svycd71r8p61y83wx1k99fwxm95qz5fbnqkfrq3c0113h3p"; +"listing.doc-1.2"="1zd0mxh0gxlvqrwxvycqr5yzs5fns0hrkn6g6b4m1v6njv2f9lna"; +"listingsutf8-1.5"="0scs9dnkl2hj95zgjiggn2ikq2nf62q97nnml3hbvmwdargassmh"; +"listingsutf8.doc-1.5"="1s7k2gr69xlxln2yi5wyvd69l2qa8v33d92b6ahgxxpid3437prz"; +"listingsutf8.source-1.5"="1bq197100f74sal26w0r4iv6ys2qa1ylbwbyw3hm9dlpb6kmdmgq"; +"listlbls-1.03"="19v8vx2ffza3icqlj0y710zc17lls87l3k2mkj6lc28qvz0kfp3f"; +"listlbls.doc-1.03"="0pd3812k1rqnq5hmsrcj32x9fk72jw1j3brcm8ajiczgv5f3gciy"; +"listlbls.source-1.03"="0vic2ffczicfdifdhd34ysdzcxprnafs4k9dpjlnfgfchh9jjwqd"; +"listliketab-15878"="088f2lm5lfbns7hd1m06f3zn1cjcbaw427z7zl5n47ahrvcz9p94"; +"listliketab.doc-15878"="1llrdgxp9mghs51sz4jjhbdllzlr1xgnfskask532zwn1cm6f4vd"; +"listliketab.source-15878"="04xfgaqpcskx5m8byysvd2rji31km9c6cbkfzf3ybj4a5bmbnq58"; +"listofsymbols-0.2"="1qp5y4rbnlpaa3nghlxjn5yzhskvan9rg0g45wqmg6yk9sdll5b2"; +"listofsymbols.doc-0.2"="15sr2n0bsvwz6jqgyspj6kxg511jy3fr18705pyp815hg4maxizp"; +"listofsymbols.source-0.2"="1sjg64imcxxqq8bsqm98954g47nfambr6vsyizkz8zqzmnr5vd80"; +"lkproof-3.1"="12bj60lfqlqvyk020lv1l6iinvqx4cvd6lfz4vhblfx3gs3xmcqf"; +"lkproof.doc-3.1"="05sppy6q0c2iangbzmxv5qxla8slc2k0fx62f6n2fg1ncgvfl7qh"; +"lmake-1.0"="1fk98049965cqqyzdl3yl9iblk87gwwrfccr5jqpdm5v6m8mcwrj"; +"lmake.doc-1.0"="19yqngjn320sng4pg835rffk6d2g3c5wyma46x1jr0bccv8s1990"; +"lmake.source-1.0"="1p002ywz3pxip5v4cd346nmpg0gi7wamlcl7bc6f4zvzqp0cg41g"; +"locality-0.2"="1b6xi8zzc9x8bc54bs2s6ryn7g2zfpy1zsdddlx3j8kvmbmgv6j9"; +"locality.doc-0.2"="0z0vrx1dy5qqgb2kx08qc2r06ljqnfsgiz58hpy6ylnlyay39ipl"; +"locality.source-0.2"="16xp8pc62jzgcmdhqpmfi54y5aaf7mx6bqgwslpwixgwym0i69qy"; +"logbox-1.0"="17qbkfkbz35c1a2v3agrpbkk1bxifacj4ccn3mh2w4kv8z8zvww3"; +"logbox.doc-1.0"="0kc0gldcfy4bshfkl7vprg80ywwsqhac4f81f2f0i6ql4jmlqwsj"; +"logbox.source-1.0"="1cj2gb5apapmhxc9vkypnq17w5fhnwdpp0qhi595gm5j5q1wqcq0"; +"logical-markup-utils-15878"="0nc8kgyplffng9429h0g4hynlwwxpcvnirxg7rj62zcjcg5ijqvv"; +"logical-markup-utils.doc-15878"="0x3j3fy8zd2vydzfa47ra9w8bqvklr2im8aq725nwpxbyyg3m8v5"; +"logpap-0.6"="0xrv4x46m54b4gfa805naab6fgpd72fwqnyjjxw0idy9kb3s3x5v"; +"logpap.doc-0.6"="1zb6qyxrqy07m65i18dcli30gb42y6c3ffr22cpxa7r8xmaprcg4"; +"logpap.source-0.6"="07cm2gcnv6d7pzc9d2v3bdvsmykqf00bbw177mqyjaq1chc0xpna"; +"longfbox-1.0"="1cm2zp8sina312n72bd1xza75yi38n1s2ach2f9sjxdx0m5c3ywx"; +"longfbox.doc-1.0"="1wd6hdarh4nm6x4qn789flnq69gq5p2r2pgybsynbna7ywar0l5x"; +"longfigure-1.0"="09pnqp0jfhsg7i8z241ggnx04j452zsg1zqmwy0i40fp2s36a61c"; +"longfigure.doc-1.0"="08y2a2922zk61iirlw24kdsf473sx0b44pjzxihmpcrf19vg2c12"; +"longfigure.source-1.0"="1p10y4nwz9wj321mf36avl3w6zwvspnb9cc92h9jf4iawnqyp8p8"; +"longnamefilelist-0.2"="1nz5n1g65fs7xxd4l0c9xdr2z46mxhb0fkmf5id4hrifrbl3jxbw"; +"longnamefilelist.doc-0.2"="1v8i6ax2qwz7d7mi0bnpyllbqyksdd749s8pr95jfw1fhi07i5fj"; +"longnamefilelist.source-0.2"="1615gzf3rjfr1nlmpgcrvmlzhif13g3kn210xq8p0vsv20irnqa3"; +"loops-1.3"="0hml4j8l5gdz1c2qfpsqdpha5dqjqx545am8x4vzs57ga7j2va4h"; +"loops.doc-1.3"="1jf63snh8bnyi1j16mjs14nyqr4bj4rjbwd3bs1xd30i54d5584s"; +"lsc-15878"="129vlr2gnirf47vs1drcsml3w4jcwg78hmya4r3nspaqm00b17gd"; +"lsc.doc-15878"="09faqnv9k96nwjcvgmml9f02vdj5hadbmb1lp59xk6jikvybv436"; +"lstaddons-0.1"="1yyfgn2bdlb5gjb2qicx837wl03djpi2cwxzds3bp3n37h52k48c"; +"lstaddons.doc-0.1"="1lxcah5zmmgv25hm6a3yfls7ysgg9dfzdbc3whdvw11mh3pwkiw4"; +"lstaddons.source-0.1"="0bbppx159q28sak5i6hj6zm1kqdgcn61a6kw4gcvhj536vnd947h"; +"lstfiracode-0.1c"="07fdzwb4k0dv2mf6yl31h58i61hmw0gfpgrjdnz3v2rnw1ip8kgq"; +"lstfiracode.doc-0.1c"="17a8sg0srw7096r3h7qa23msi6pq0dagap3a0rcpclp73z3gh3wh"; +"lt3graph-0.1.9"="1w5n9y7pqy5zmn6w9bx58nnawvhp5467d150qxnj3c92gh0qbj5i"; +"lt3graph.doc-0.1.9"="157y7a7gpgm6dc7hawdhxr0v3ns5kibykhkg3wfb5r5fay47jj4n"; +"ltablex-1.1"="11gazci0c064iav6124v4szdbj38anqwnfgh8pfpdq9zff0h9g5n"; +"ltablex.doc-1.1"="0jjd5f3r67lrbl4vyxjakm8l8pdrw9vm1dzhl5305ga8vvwb7gn2"; +"ltabptch-1.74d"="06ww90fh24s6lmzyvmqjh5gcr7vp3lq6cg9q6k6194g4kay6yx5i"; +"ltabptch.doc-1.74d"="0yb41cgqpgcxk27259gfz14v9bpndjg51i9nmwr1qwyvaqd6jvjw"; +"ltxdockit-1.2d"="1krcr5qlz0648ibj5c1jd0y4rf6rg33r0clyvdjm70kq26y1lqww"; +"ltxdockit.doc-1.2d"="19jc49p978z0hrx7p19h33nc65a7vjhlrfszwvr6mln01la3ivmq"; +"ltxguidex-0.2.0"="0qv1p01y18ia4w53dvlfhdrgy1xsicaigcas33xs6yqipr8cwgkp"; +"ltxguidex.doc-0.2.0"="0j4h20bblkwgdjvr2ihfy32mzyb9parbjgiijqf9sfg2k2p7xpib"; +"ltxkeys-0.0.3c"="0yc0c6hh8aiqm695by6229qqhv7ym1ssz6gpysy6hb10qrqbywkx"; +"ltxkeys.doc-0.0.3c"="10v6gw41aa4ndw2x4rwyq9x66hsdl4l4j0682dcfm4cpc903caga"; +"ltxnew-1.3"="1sidvpbqn5b8szbgysi1afbw5lw1cm8ivhq12sig0z4z4ljp3qf5"; +"ltxnew.doc-1.3"="1f69xq5753iszfa2yr6dfmz1agic26j4qx7kkw9j23nhm7f0lvva"; +"ltxnew.source-1.3"="000dh3d8i57vsa46np49ml0sb4j1n3gnpcfi1ghj7pz5bn9br8w5"; +"ltxtools-0.0.1a"="0ldvvkvyw1khfvg80ana7wj20917sjzf0lsp4699hf4jvw71w6x9"; +"ltxtools.doc-0.0.1a"="1j51wpw06jz7xb6qf6nc52r5fl31q6zhsdm3v2ngc1hd03dcxpic"; +"lua-check-hyphen-0.7a"="01q4j9bb19lf838pd7l26rkz1xr7mxcx4fsgf5xd4sdif18h56qk"; +"lua-check-hyphen.doc-0.7a"="0iaihbrppn1ap7bqvn37rk8b6m4lwdi8w4zkshiqya1mphhsfjg2"; +"lua-physical-1.0.3"="1c9dxz9l92gmgy9zgjsq22481k2pphwdglhk3z6c2d7wsihps0kl"; +"lua-physical.doc-1.0.3"="005b7qmyv2rqp2zs5gi8ikxfqhk7cr7havyg9ni0jl5wlwn1a4sh"; +"luatodonotes-0.5"="15syf4k00shgi159j6ja182k24xhfw71zk167wwmy57y7kwm5cam"; +"luatodonotes.doc-0.5"="1jcybpcd500lzkwa33zdmsq3svb9hrh8f56j4qgwm9cq4wb721f3"; +"luatodonotes.source-0.5"="01km6y8ajgaaab9j1bdp4s8gj3iw5b7cfdl1yngp41ph22888aw2"; +"macroswap-1.1"="0p35inib3yiblfhiy1cpvwahiqrr309fks7r515s21ybmw409v05"; +"macroswap.doc-1.1"="0w03lydl6vwslr17h4px8ddjld0dqs5zd15sysv0hvqajw2fs0kh"; +"macroswap.source-1.1"="02zfswma4h70swyy6znvhr54a38wq1px3f5ypz7zy1k26nqi25r7"; +"magaz-0.4"="0ah5blj8qfjqgnmygn35r38nj20sjyi6yjci4j9b90d8pz9w7d6n"; +"magaz.doc-0.4"="041cb5rqk5ldvbcqr8w7jnfi4krlc7g72ygq5j7pi9gy04d98mm0"; +"magicnum-1.7"="1bl7lhjk9glvbcn4lqanb3zprqigvxj07f5nm8zn9vpja90fyn6n"; +"magicnum.doc-1.7"="1as8l73v9bamajin552xb4xqs08ik8sq22kqdc3psisv4f874kk6"; +"magicnum.source-1.7"="1kp0d8wgphbh4mkv1qf9h2c1f2nkzqn9q8fln4v35yx2cay679qs"; +"mailing-15878"="0x2mgcmfmppzqlwkg5jd1zfyvfdjnrvnk8glby93s5nvp6i6g8c1"; +"mailing.doc-15878"="1aif16654381jcczmfn44k8v8x60clq94z4hcwjsqhai6s441hbr"; +"mailing.source-15878"="1cx0pq1qmkn6k09x1r8mx7dmpwvdvprmvwj45p1k7mmfcvq2834d"; +"mailmerge-1.0"="06z9cb353sl9q6a7jbvwwdd0zk3kw5xmww0r3sjiqampxib19i9j"; +"mailmerge.doc-1.0"="1dk2a71x04nbc0rcmd3axhz8yikzlw9ab1nd5k1ki7pmclwkscdr"; +"mailmerge.source-1.0"="1qkmlfc2dvjhrh2xcypnp9wansxrb9wzvniwfb7sll2bxjcfbs8c"; +"makebarcode-1.0"="1ixhl4k89mng2dqfc0wa0fq52xpafp15gghnyx28d9j1163wxr7d"; +"makebarcode.doc-1.0"="088wkffs4b8y0clgcx1impzbxck8klm32dbf6p1jyc2vpi848irk"; +"makebase-0.2"="1nmlgv76zy1ajfzbdv7hizby3hhciw41s10hbnlbrfdl27w14dpp"; +"makebase.doc-0.2"="1vxwgjk3dj853qbvy2fyqzni2qkkjhslf17xvxskq97w8fcqr13j"; +"makebase.source-0.2"="1f8aliax01b9ir5wzk0bjhqzicl26xa63khx84s9haplh183qk2m"; +"makebox-0.1"="1v2xpiabjcgyi1d0ifpvzcll8y01lzs48bs19nalv37jw7hkrr4m"; +"makebox.doc-0.1"="078bz2pism9harcyb9lq8kkrkq984zx2ya47yhpqxnrd85kgcxfb"; +"makebox.source-0.1"="11gjpqmc6dzccv3yc539ki64hzpn8ns0zzjvanw7afbn5bkyrs91"; +"makecell-0.1e"="0238il37zzshzl3qn50hav3wa6rd25k7rp5l93lb9g7r476sgvrj"; +"makecell.doc-0.1e"="0mf4jc9rv66qjnm3ldrpx5lbfw1yfqy0jsvg8d3wdcwvlxpcrvwf"; +"makecell.source-0.1e"="1vkfkfgjnhx5byipkrzb202w9jvmnjc2z3zjih6y61yizccwm543"; +"makecirc-15878"="17y2hm6p280azgjvskyig34jyj90zngswcgxc7xa2h8pljh1fqka"; +"makecirc.doc-15878"="035l3s20mvy61rnmsxy62k6iid8lxzwhbkyxa1hblfnmya7rs0xf"; +"makecookbook.doc-0.85"="1abzwzsm2jh11qj2qr31bznfc344ynjrdagqayrcgifg4725fa0f"; +"makedtx-1.2"="0yir2j268vdaa44flps15l739ngv97lws6n6yk3w4pz4jn5gylyd"; +"makedtx.doc-1.2"="02ir7wf6v6znly9c36z8k0djrzpkd74ssphkggmp8fj338fk41cj"; +"makedtx.source-1.2"="0jwdsfx2l8sz8y90bz3gfi51vswyzmwdvfmnlaa2gplhcjjbv4yy"; +"makeglos-15878"="0jp0207q1p0znw1w86g6m8ifkpgh3hi1yhkzq117kwl5ybswq8w9"; +"makeglos.doc-15878"="18zl45jdpsvvldxvfx79ijldh3g03acw254m6i8a3dxgxj2p76hb"; +"makerobust-2.0"="0nm751w11p7cqg8ihckn338i6908kcn513644c6a1qc9rg847hlp"; +"makerobust.doc-2.0"="0bidk4f0q6486vgwqvifzchkn0xi1l9j65yqwgcdnl3yg6vamqzw"; +"mandi-2.7.5"="0idg4r8wa8xa4025xa20xjcrzvahnrspg4qif4lqywijv8921h25"; +"mandi.doc-2.7.5"="117gassgkzz11c12ba562iipw6winx7fbrwr1s5kmjlcx48xpzqw"; +"mandi.source-2.7.5"="0jsh3czwmvyvpr52zj97kx7h7c2nsi4zl3hmdpmdarhkcwzjfqdp"; +"manfnt-54684"="1fzfcvifh013xs6dm6xq2gpvmf3v0qn8scrbjj3yak2ba98bcy18"; +"manfnt.doc-54684"="15rs74sfnyq2k27bs3dvjiachwamima3q4vp0dp0ic95as2n61gp"; +"manfnt.source-54684"="1v3j47xa7k66dadz8dyy9gm3k4s6465zgqpzb320isjpb77p7r48"; +"manuscript-1.7"="12r1b0hqs1kqdxvyg8lv8yrsdycfxs03j0lwfmlhbg6lmgz32pss"; +"manuscript.doc-1.7"="10dczs60ncdk5z76w5jxgis9m9qilxp8xi53gixki4i82yd4l9va"; +"manuscript.source-1.7"="08fpv1i9vz6fbf9vy48k6y45xz67kbqb5f30c8pxbvyzlicixdjk"; +"manyind-49874"="0c5badlrh2321958z75wi4ggb289hnyy0i17bpf4qw9sjym08pz4"; +"manyind.doc-49874"="1x65nnkmqp2x04n9rg2n8yh324vdbcsbv68xfbb3ppx2462wrls3"; +"marginfit-1.1"="0x8ias8bv1zaavin929782cjvp7aw94r18lqvv10v3vgq20n7kjw"; +"marginfit.doc-1.1"="1cj1fidjvvhhzn9fxbvyh75dfb78wxi83bdxnwbpc6rf3ax5bl03"; +"marginfit.source-1.1"="0rrn2lrqg3a1yz6l88qkh8sljr18p1wx1vxyrzg04pzj21lw8kkh"; +"marginfix-1.2"="0arldbc20d1sncwanx3szam53yv1d5wxgihj8lm4jmda1858bmgy"; +"marginfix.doc-1.2"="0kk9cghi0y1zfk6ya3pfs08npdy7v95i4db5a89v2177cd6z7a78"; +"marginfix.source-1.2"="1k1384nxhiywlvyndnvhj6a35q433ddc019ckf8al2b1ngg13y0w"; +"marginnote-1.4b"="1vyv2n265y8j8r9ch7h9qjhwlmlzmqx62gc4zzm4zxrk0mvigpa4"; +"marginnote.doc-1.4b"="1cl1xrb8d7dpr4mwa56664wdkabzx8zr8cn6kxcn9bgl543ka3bc"; +"marginnote.source-1.4b"="152bwxhnssj40rr72r6cfirvqbnc0h7xnagfrbz58v2xck53qhg1"; +"markdown-2.9.0"="0zspbmkkqzab4mqj4id65gzh2fm3mhc0444r7kan1010jzhfd0hg"; +"markdown.doc-2.9.0"="0d0jpi27g01cr7xsr6qb79b7fkfbxhbnjbwgdl57sblixgmcysfq"; +"markdown.source-2.9.0"="0406cj0wc151f3cj4c9x76g5i34krarp3nmxfqw0626zj03irp6h"; +"mathalpha-1.13"="16r82mxl1lvv77j77hbqiy74xcclklxia8x3da7by1a8j1yvr78b"; +"mathalpha.doc-1.13"="11nqf75xd42rspvfdnw039j9i9akf5zncjnnqw54blb3s6xcrk0i"; +"mathastext-1.3w"="078rlq72ivyavgmghk3nswracjhp3args4z2lv61z22x4q9qhvbi"; +"mathastext.doc-1.3w"="0zpxl6kk0ljyqms0vssh5myd60g58wwqjx24z2n8xlncassbsnn4"; +"mathastext.source-1.3w"="14q68iv2y35p0i3xz59b4nljp2r2a7j6a6ww494nbifsp215xm47"; +"mathexam-1.00"="11rn665k5vg9w9rfgcp602v6cg659d4c22gikkgjpslc7bzrlrkh"; +"mathexam.doc-1.00"="1lv8zdp1fajq1nms16v3nk7f0bc8az525nnjjjzags4rpl8wkzh8"; +"mathexam.source-1.00"="1p0lalc0ny1zb8gc4bbg7z9pm6airbg63l1k0qqmwg10wvxpsjn9"; +"mathfam256-0.5"="0s97k46ysqvgs6a8aq5q8iwab390s90drd3g0ixd8zmv9a4hy1z2"; +"mathfam256.doc-0.5"="1zk42fsknkbzyx4m7xn3yjw9lrdvf6m7crnqsp1q7qb2nv3hn1br"; +"mathfont-1.6"="1cchrbpzjkvdfvn5qnzy9q9x39x9fvggf2hil6msqrri8wahspk2"; +"mathfont.doc-1.6"="1lrb88kx05ckyn9pf9w0d4snjydggfsg9qy3cm95288xxhn8z26f"; +"mathfont.source-1.6"="0vk88801illr345nvxi6adw27m1dj9v1l5s0j137gbyqb53cqdyg"; +"maybemath-15878"="0qb9nr6m819axi9qn8i32fynlmkjvyvc45gyp6pckwj54kxzx06q"; +"maybemath.doc-15878"="078s9v2bly2q802wdidzpvwaqfdkz00wkgyhn6867bkbq89g4aa8"; +"mcaption-3.0"="0bfcl1swwgz83y4f80a1kydmxhdyqxld0d5cjfgxfhnn9dxp3wc9"; +"mcaption.doc-3.0"="1afldwg6dghvkwd8gik8dmag4g2pb6ag3aks26qi0ygph05j9cwz"; +"mcaption.source-3.0"="0i6sd9vm1pn9h570am4lkr2br81bhmqqwwvymb8r37xpmmp9yvsk"; +"mceinleger-15878"="1a16g83g9wd5vdx70bq8zbr4hwm8fk46dpsna97r9fgh44n85pv9"; +"mceinleger.doc-15878"="09z7srskh57mz055ywyxwg4zcx07vq36jdy8z9w6w74af4icpll9"; +"mcexam-0.4"="02qj4fb3xg9h74z9wc2agisp5cp2fbis2h5ci8j09d22ak60rh8b"; +"mcexam.doc-0.4"="0f4d54kf4svyq54qcd1xqpx6zl9h99ahfzz1l72jyjhlqf4v6rj2"; +"mcite-1.6"="18did9achsp32k7wq4q75a9q43jxdm8k40q41j242gndnkn8axw1"; +"mcite.doc-1.6"="1gdsa91a4snk3f22mh06mr811b1kb0vpi30ss84d3mrnsvd1p0ha"; +"mcite.source-1.6"="0q1bv5nx9xf6r1fvgnxb1x720dm0xqrqg3kya0504q8qb0kgxqfj"; +"mciteplus-1.2"="0xbk5zrd9mbk4xid03j7a0c96s311rb1vjawhvk5waqw9y6dn476"; +"mciteplus.doc-1.2"="15aldir7viryb2f8vi0a83vgbdwbp5gcdg0slhp6j6ka6xv7ayhs"; +"mdframed-1.9b"="073gcxy2s8mskf4mvvs1jr8fkijci1ayg0b5r5xzcjw0s5azny1m"; +"mdframed.doc-1.9b"="0m8k7h5c0h1fdrpdf2a4vhgr8saqspk81c0cdjm2cmbsfm8zlc3s"; +"mdframed.source-1.9b"="0p96sl69p5342yy9fgw5cnkfi2xabdwb74mw7i1gbxvj0vx1f2q6"; +"media4svg-0.5"="11017yr6jwy9dy2ann36zxpzcgv816w3ma05i7plha3rdqsyxlay"; +"media4svg.doc-0.5"="15dva4jl5hiq0xcgfwryhz5zyc1v12rvp9mpr6njwzvax96vwnks"; +"media9-1.15"="1kqlxl1ny5xd86w4rnh3xgs1yf75mlgxvddr5skfywqcx23kxxwl"; +"media9.doc-1.15"="0avks17bchaj14k86bkikqphz56zzbjh8bk4mdbq5rm6faq41fb9"; +"media9.source-1.15"="06prhfr2aha2v176g4nm72b1rzl1xxdv5164n5lfdsahaqdb1r4r"; +"medstarbeamer-38828"="1cndcpdvkdvjx07rfan5dd7yg6sv532b6vvd97cm7ag2g1aqcilq"; +"medstarbeamer.doc-38828"="0i995yaqv91h4iv3h7r5m73vb7xvpjkzrh6nddcjjcsv2gvpjcxi"; +"meetingmins-1.6"="0za2aqj7gbmxxdm3hqkq2sqkhl3c1q8a3s778hw164dfpi8jx85r"; +"meetingmins.doc-1.6"="13kqp3561k9pcz7lmh7izmxw8iqq0s1jlhvq12dh00wvr7vwr8dr"; +"meetingmins.source-1.6"="0fkgaqldjdry08wl8al8d0kppbsqqhig83mgwfk20rzpji298b5x"; +"memexsupp-0.1"="0h3n1bnvyxr0ylg05fm819lzhzd7kbip5p5mr9kc5af8pd6yci9k"; +"memexsupp.doc-0.1"="04zwmw6varldbg5cxzk4bv8mbh80i9gdysfxpn1i4xb1la38b0bf"; +"memory-1.2"="1zgfjz995jbji8hycizbp614dn0g13rimh9csgrga86f1ivgcpmx"; +"memory.doc-1.2"="164nnsi25jk25p3kh54w2l8zk0rri50p0s9g4r5f50c3wzxi1g4h"; +"memory.source-1.2"="0mhxxhiqq5miqskb6c4hmjdjki280yyin2dh0md59ai1aprgd4p7"; +"mensa-tex-45997"="0gg38ls6fil67d0ln2yfjbpi2r6cbrnavfl926jbpxjfh4qxvqcq"; +"mensa-tex.doc-45997"="05krm8b1ylr8wjr0xy361whm0kn6mj4y6yrycjj47927xnij5qfz"; +"menu-0.994"="09mnnssvb83l1jhjbb4rb6lbzhwf4y4y0mq5h36dj4h2hp4qfi55"; +"menu.doc-0.994"="1g0ihkjlnf9v90x39mm2jn2ziijildyiqfda5bkm441pjh40x0pc"; +"menu.source-0.994"="091a0akja0y153lhhplb4v0n4z77qvxh9nchlr0v5sm9bbpvpiyd"; +"menucard-0.1"="13dirr45ysvi196wgsrdrcxspynzvrk88rdacrfq84l4imbsh683"; +"menucard.doc-0.1"="0sbgrk1l2b9mdhiymwvp6zci4nb86rn2r06chdbhgy9lzija4wdv"; +"menucard.source-0.1"="1pg4c26pij7p218a0r6mcwbmnsgdj7i63z8z7gq71i8jqpfcmlrg"; +"menukeys-1.6.1"="0cj7fgb05bwacxwh7p326d0gcgvkpxikbqkqgcbqz0fjsa7hl28z"; +"menukeys.doc-1.6.1"="0ks3fdxjc648mcp91i3jiph2zaaxghpkpnaknx7rpcmfyha6hlb4"; +"menukeys.source-1.6.1"="0d89ldwlkz41d4ai2vimpjq5vm4w9zbwgxvbqdx1zssps4fxgqff"; +"metalogox-1.00"="0imfkjfk1fbcpxsa3hfcn9f7i3dq9vmjzhl82v1c7i9h36y60jsm"; +"metalogox.doc-1.00"="04zvsg40zj93399hdn7w5cf1vavdwk2pzji4k647hrp4klcqv94w"; +"metalogox.source-1.00"="02yd2vz2m4iy6ndcibgvpxvfsq8hncclrf9ggfkb376h8x6vcy34"; +"metanorma-0.5.0"="17vg55m4yj3xcfgvmm2kw8a81fblwykgnbcn65drll10b89wx6xp"; +"metanorma.doc-0.5.0"="0z3mr4aw6gqdj4621dlghb4bsc5i44mlg81w81by98783fn4xdyl"; +"metastr-1.1.2"="0ci2qs1iyyn55zl6n12yn20xsff42dim744sjkxml7xad38vpnkz"; +"metastr.doc-1.1.2"="1jhvf4xngi5mjycbrbijn72p8anx15r1n6vh5hrjai95xp9jn88a"; +"metastr.source-1.1.2"="12rv9fayml2kjy7rmdh6d7g4xr2yg3r5ngky467y663p893nxk0w"; +"method-2.0b"="1aafzyca2l34p8jxgdhwm54yw16znd1085lx58wrm2fjw727946k"; +"method.doc-2.0b"="18sjh2kvy1f3c72w6k2m60jf60zbz7bz91xgq20wjigfagdmsqkd"; +"method.source-2.0b"="0ckvvf1h80mlzyqbd12yagfl8hph9l7k35mghr1ri4k317sm3ls1"; +"metre-1.0"="0vfb01vwb6x5wf4sq5j1rrl3jpzw0mwfqy1jkkirxkhbim5gln25"; +"metre.doc-1.0"="0zkr3wymlzxnk2n9h6nz65a1gsg0k4pfabdrkc15wfdn0yczicj1"; +"metre.source-1.0"="15cvprv3zg5nfsd5l5sj2s2hgx5gljn1jqzgcr4lpadpans14pkx"; +"mfirstuc-2.06"="1v7b4g2xqq0icci5kk9w920hqlkl0cw9z7mhpzd6bax8mbkaqih8"; +"mfirstuc.doc-2.06"="10dym0f52kkscvshnd7y9cqmycrsha3vjzqxbypjgklm0fg663bq"; +"mfirstuc.source-2.06"="1jx2pk3c4zg9gcslc2gqnmw6019jk3hd79qa79dc85jcwzdv0chn"; +"mftinc-1.0a"="0yhw7zpmbc3780qm46p5sc2qq71s2vhmfmi3kqscck876h4935fy"; +"mftinc.doc-1.0a"="0yxpbp501d6vwsxpm83zjhypvz3xz51f91q414zxjvsy1cvvprr1"; +"mftinc.source-1.0a"="1zamx3658d8vaik5w30hvia5y0hp119vhvqhj4h5kkwnwmz8hs45"; +"mi-solns-0.6"="1bv7gr2wa11cbsznz414x35n5yy5jw7q9kngnb2h5y73v8bnzvc6"; +"mi-solns.doc-0.6"="1byfb723572whq315zwybwm1bcvcn49km80gn5bi081gy81r75hw"; +"mi-solns.source-0.6"="12xrddxlrngjnk0yk35spk886yd9p3nnz6jrp51dfzw1xz6pkivr"; +"midpage-1.1a"="0hh4r2sgdgzm0nryzqymd66a7hr74rvcsn58y7dc7di6mhikrysn"; +"midpage.doc-1.1a"="0jfw5wd6qbxhf90mpi8fmv0nbazkbg9h65z91613j1ynqqf0087y"; +"mindflow-58475"="18ghcxff1sziazalm9sw367dgifbwqyca4vc6y0a7bf8gb14wq89"; +"mindflow.doc-58475"="0pc1hc1r9wzqfgj0m82rp1yb64j9r2q4dicfs7fvi8846hkfx67l"; +"mindflow.source-58475"="0d4dgx7mp66mr63q66wc5mnkjcncam60gkdgy9j6ag54j7kibbds"; +"minibox-0.2a"="0r94l5sy4n97p895xk33ir3dli1ngy3p67w2d3i7f6hi6czvykm2"; +"minibox.doc-0.2a"="0bzd55wkdxw8spw4706nj0sk478zbnvq9cnkpid638cwb6csb21c"; +"minibox.source-0.2a"="1dm8p6rjivm0xxa7px5dvsnrqs48zwn2kiq3vr6gdqmiy0ld1v93"; +"minidocument-1.0"="1mrzcxa59kpmrkhnnv08z7h48bj74gk2b0q3bvhmvddd6047yxwy"; +"minidocument.doc-1.0"="0dl4l8skhz7fm23mpmgmy593f34w78mm5qwab5bc41sg0xc0lyy3"; +"minidocument.source-1.0"="1n0qf2r1mjp8vx3s750fw5h2q51pp3qxf90gds8bzq2cv6mi61sv"; +"minifp-0.96"="1vpq8mh443hhmnf5cgj37jm362m90zdhm55jzqh1x84dadqpmivf"; +"minifp.doc-0.96"="08f3hp3knyc37a2fy87i11q62dlb35ri197gxm3ghl5h28zvzpfb"; +"minifp.source-0.96"="1l837v8c70s8x1xn4xhag6nkfpayamgzk95fb23qw23xpf6zp2wv"; +"minipage-marginpar-0.2"="1qpymibkrwdbyf2rlvfjj0g8agxisd2ym3xi7lzx3g953g5whg5r"; +"minipage-marginpar.doc-0.2"="06rivjd4x8mdpzv9h1yzkjbs317jvxa78zbv1kzyia7fps74wi1b"; +"minipage-marginpar.source-0.2"="13k27b7avz3v2jadjh84w74rsyh4gz2x22b8j5lv6yvrjnwv09f6"; +"minitoc-62"="0v80ga66rg4cgifmyfa5vq52v5wz48lj4js0ym9197x2w98ra6ry"; +"minitoc.doc-62"="07dah8lz54ccvrgigrvgcmbj76ppxaismbllfwyxcgkrkvqzxqkj"; +"minorrevision-1.1"="1mcgql832xmgpcwha6l0d282mhyva6xmyf75gbb6inwbgg6qkv9m"; +"minorrevision.doc-1.1"="0x9lw8xzmnn015n9hyzajnl9gicafj06gr2msk6vxwk136ayqfiy"; +"minted-2.5"="0n6ni5pl2fxchy2g2s9pbxa48wscviilbqi83pysymq7hdwcw1p0"; +"minted.doc-2.5"="1yyp2kmiw3b52gjnck07pzcz717srn21z15jh6ikx77a0m4nl6la"; +"minted.source-2.5"="0c8gn4ch0yq3pa5x863g6yshl6q44b8jqqv0vm82pqr1s35fh2im"; +"minutes-1.8f"="0yc7dkvbn0g7gm07h9r62ma3aagbgparrlamh462a9ckdc7jzivp"; +"minutes.doc-1.8f"="1m8blswmxhcm2ya966ajknx9arz3yh1sn62wnyxls220af3401ss"; +"minutes.source-1.8f"="12qvfyiscs3y1wk3r2mdq7vgkmz1ldsbg3wz4agib97lc30qqmif"; +"mla-paper-54080"="0yzfqb3x58qzw5lcyw3f6c3xyd98zx7zmz9j2rmv42r5wj1g668p"; +"mla-paper.doc-54080"="0kzi1gnla04shaiysrgyz4ak3l96h11shkrxcj0hbav43ndj2xhl"; +"mleftright-1.2"="14lvlhhjj50v31lgf7ywk5dx7d5gbnivssl15qzpa6s619q2h6l7"; +"mleftright.doc-1.2"="13vvfx4wxvf5liv641lwdm3hdba31rfrwsmirl36qwbrqsrl8xic"; +"mleftright.source-1.2"="004ficd5chakwcklbdx83qp3985s1imlz5knc7f3m51zxgr4lmw5"; +"mlist-0.6a"="044pjvbyabzqashbzag37ymqa9mr0c1qg3p7rb1j91r0y5s8ra8d"; +"mlist.doc-0.6a"="1vlxzzg6f3jmcmp8fjn58gciywc2qgw9v1kxpm7qr3vlv40pdb13"; +"mlist.source-0.6a"="0jim2g5qc9cdks4r3yi67hhszx3kkh26hhc0zgm2kx9syhdjv057"; +"mmap-1.03"="19hnkczxhxcr7pa7880mfgjfhjwiyl2yxhfz67dsrljqsfpi19nl"; +"mmap.doc-1.03"="1f861w6clfn3k8gc6piil6bq6admbyr4kxqnkw8hh29s63rdn76j"; +"mnotes-0.8"="1vzc4p8vki02himcvqja44lv3rhf9wh9gxi6aw39g7qbf3j9k28c"; +"mnotes.doc-0.8"="0wwf1651zb4jigmg2l64wh9j0y68fppfzn4gaq8apn5b47b68vl9"; +"mnotes.source-0.8"="1ihlcxhzms48lmqy169qx2d7cavwwf4k96q93cd4dxrxdph0ccz4"; +"moderncv-2.1.0"="11azbzdfi8fdnb2gwchdywv226j2ii7iz7cn41ls2q5kds41apfj"; +"moderncv.doc-2.1.0"="1214g042annbjmfbdnmxxcdlwyhwzig6lqdd06nfv59qr9gy2bi0"; +"modernposter-1.03.1"="1qc422hbqiyy6b539r7kyrshcja58mifdvs3bva1ikdxanxhnaq1"; +"modernposter.doc-1.03.1"="1z9b3fanm97c3ik1q6v06qfwrgqcqwyi79h5dlhcnpwsm5dxqj0s"; +"moderntimeline-0.11"="10alhs944akmqfslqzi09436mmnjz8nm85r8jpjwpfcx28vfdwnh"; +"moderntimeline.doc-0.11"="1bnz01q5rib9gr724gq6saxvzpg3lfmimh14rw5fn0fcn9bxlwsl"; +"moderntimeline.source-0.11"="0y2kfxcpacslpn1ly6anv0hlil2x6wlsi37w9b8hj7xfx95qh51r"; +"modref-1.0"="0pd0qd9yjhvdl3icrgl40lgyjsgahjw1jgc2ah75bfcwj02qm4v1"; +"modref.doc-1.0"="0caqpnyg5gbv3b6336w59nn0w9ic4p12f5ig2n7r6kg8ydhp53d8"; +"modref.source-1.0"="0n28d6x8w9rh3hah7p1imairyyywssajg7zwssp03dla0xlgxrql"; +"modroman-1"="17ijrx7f87pbkwbyjwigz3jr85fwzq6rr0pz1591fk9i36jhjaal"; +"modroman.doc-1"="044v0nkz0h1c7xsb66kmpqvr5gg4lg1qkx1x2qm9ijdpsbc4zsng"; +"modroman.source-1"="15xy8jpp2ac07qq0nl3nskpv62c59xb8qkl51irvpb0m01d97y39"; +"modular-44142"="0khqcm28cq8cr51wmyv954zy85k9dxvmiszz5w4izxvyk14d56sq"; +"modular.doc-44142"="08qhmna1mbra9395gvaqbaqi3rmyhhckx781x4zw5439z2bpmg39"; +"monofill-0.2"="0kpzszxph3bx34flvhz746xkdpcc9mj0srifki9y8fa6vgsk2rz1"; +"monofill.doc-0.2"="0czdlvrwav8n3p9afa40icddh37md6g39kmy02vcnwmn9k3izp4p"; +"monofill.source-0.2"="1x5raychfhcjibln59x01fay8r25fwxba4lwi0bnd51drvzs76pn"; +"moodle-0.9"="0j7xxp92c4j66h2bg5f6pkcsgqskldbw5d125iahiy5hm3p4lq4q"; +"moodle.doc-0.9"="01cwv06w4f06ykspidm03mbqr97x42gf1qysnrrcxgs3hpfj1vdz"; +"moodle.source-0.9"="108fvgc2fvlqwjabvbky7y8sqwi3hn0f5vc34mi9lzsn2y1j8xr8"; +"moreenum-1.03"="0cjq1a222c813l93yzf9757dcai55vh24r17cv6awv0d1xf6jggf"; +"moreenum.doc-1.03"="1g71dcnbcjb2x8ilhyfbkbb55x8740pz6n9gzdd8h6kyxm879zvl"; +"morefloats-1.0h"="0zdlkd53zl0y69d3manicnd8ch8qls6jxgr4mncqg5r57lqp10kd"; +"morefloats.doc-1.0h"="09xmhl2zaxzyvys63n6r71g6qp281f6y69gy4zbkjwb1n68js1i1"; +"morefloats.source-1.0h"="109wx7axxf1pgpxq34pz9i1cg357il0rbz8h0xqacn2yykh9q565"; +"morehype-r0.83"="1yssb0c3l0sqyv775mjnbba3wv1h6497x125li68q8iwjc529wdr"; +"morehype.doc-r0.83"="14s0bvxj2fjrkcrdp576c0ka1appg9g4ri4mc2isfb73yc6bmgh0"; +"morehype.source-r0.83"="1sljhzy05akipng9lfajapvdm8jf2jf50v1awl38ld0wfkdqvcdq"; +"moresize-1.9"="07vq0wf250ixhrg70vdvaz7zh33zaq5sm32ka8qh1ab590c8w7h8"; +"moresize.doc-1.9"="1qa9y7q1wi7f9klziwgj6dw9c7bh453srljsx9m106nbyd1cvnpr"; +"moresize.source-1.9"="1gzj5bh16afgl8dg5z44h7d4m79i5naj4wl09m17x6snvfz7ifah"; +"moreverb-2.3a"="14srw73gbfr0c3miizzs1rml2ms504hkv970p4dhp1wpk8ywc5f3"; +"moreverb.doc-2.3a"="0bp2lmzbd3zxqhijfqc7im10476xc50yc8amh0vf017ll7prcmjh"; +"moreverb.source-2.3a"="1snpyn7bc4qbmamxybv1j1h407fp597m26v2jq6yzijszfanh3rq"; +"morewrites-49531"="1b6pfqhqn3hadnkb28kcl9k5hc7mynbk1ik7njicrbxwlx3qqm5y"; +"morewrites.doc-49531"="1iqmxgzvrhmfmf6jmc5dckziwzvk1ygyzbr94sp0209x11sw9fb2"; +"morewrites.source-49531"="03dd4cv0x0lw4xbzqpv26nm5q2bn50wbjjgiqnif2wg2smfap9sw"; +"movie15-26473"="1x48h56mw1pzllzz5b8fx5ikhp08gx9jybdn7qk3jvfy13a4r5yr"; +"movie15.doc-26473"="0bhyfgsjwmvvl7lnam0k254w2rzn01wf5gzn38ymmlcbw4ajkkxl"; +"mparhack-1.4"="10zmkhymx023jj7isni49sc06g9g2pjkf6c421rv64jqis34jvzv"; +"mparhack.doc-1.4"="0rcx478bxy70mvzrqp2vp5yl17r3arvywp4bsn3c8652cl92qqlm"; +"mparhack.source-1.4"="0jw5imcp3dd4csjp5pvbqh7pbz119q8f2jgg9j743b80l59rmlnw"; +"mpostinl-1.5"="01p16dzg5izjgd64l4qgrhx0dm99hp5lrn9v2rlghs8m249fwmv8"; +"mpostinl.doc-1.5"="1a1rhz5q1i69bi1blvwzz404h7mgjkjcp9c07dd8w6xri304gi1s"; +"mpostinl.source-1.5"="18rfna80lz3zrf7wynr8zdbiv36k2n6a8wd430r81ybr9233dhxp"; +"msc-1.16"="1svx3k22rlcrgm7fm0xx45f5q40ngrfpvlabfkicdpnh2mwcfy4s"; +"msc.doc-1.16"="0l4941csa7xfxx4p9s7sbfk6xkv5cm2945y6pqvhj01wqcdghmnc"; +"msg-0.51"="1g418z3slb3cjf0wzgwgv0zkq0jnj647zqh6iqvlv42r7bil9001"; +"msg.doc-0.51"="0miycfpf7s74jz831kqbh6qlkkzq31l1x0fkf9d04b8zp26mzilp"; +"msg.source-0.51"="18djwd3g50ys4ckgzc3dp0y344qy86ni327jmyz3lpnqai8w1c8w"; +"mslapa-54080"="0ayfh1yv1a8wsq9qldgcmvq9d12sxwaa7df5p3bhsp0klbqf7pzz"; +"mslapa.doc-54080"="1hiag2x2br0c0qpmm347cyxmi58mwg2x0lyqfakm87f68lbbxdq5"; +"mtgreek-1.1+"="17k0lvghiw4milj4cnf6wjhsj7c1banw550dvlw9spv60lccvqqz"; +"mtgreek.doc-1.1+"="1qkl09lkdl9z6lm5hkn5c2xry7xd0f0ijx6xnyq3l6q99cnbafzq"; +"mtgreek.source-1.1+"="13h8knsfbl91g20gxjw3c0m6j33wh4zkmm32ybfvzlm8q7nf2lhh"; +"multenum-21775"="1jn6xqrc31zzaj9yk244g3sbi8fj2klswbg24fkclgj0cjr1xi5j"; +"multenum.doc-21775"="1pnjjbfwgy6ksdl76n9iiqla2wl0qa4370n49h4xy3rmrnbjmdqs"; +"multiaudience-1.03"="01g9ynwghq4a40jfb8qvcslgc0wa6qsfwfxr2m3cqyp5f7z27mar"; +"multiaudience.doc-1.03"="1bspy5q8n1n1vdd2570vh1xkfp2nrd12v17x9jfqxy5dbhggbfpy"; +"multiaudience.source-1.03"="07c5281w68jna67wsf71xafmk7yjw808ninnkzqs13csl5vkyjwj"; +"multibbl-1.1"="1aj6j8rp94mh210pdwd9d4a5s5z9v5f36wpylwjv4v2ghmyrgyap"; +"multibbl.doc-1.1"="0r4hnp4sgpx9x0hmrl3qlw55xlchav3r8sym2vnv4sqjnx4dc740"; +"multibbl.source-1.1"="1c7cvjabssssy8wq6x6lr909zq4f0bkhdzx1x37n3rxm2ngdqpbs"; +"multicap-15878"="0ky6hrdsc7wl65zk9krv5bf5z5lbiv1xfn4g9q8b3pp6ri874hzc"; +"multicap.doc-15878"="15zkw0sh0lf5vdi219h32nw0icq88cj0vnz9g9j7zb7xqq31f5g9"; +"multicap.source-15878"="0d3gyjr7kwx25gzsl4j5z887c952zxrsh3qk2j0cbs6yahzscxim"; +"multicolrule-1.3a"="01k425dsahhikw9n03dfarnlqc1irz33rm9am6w3gx8pd2d2q6zx"; +"multicolrule.doc-1.3a"="0h5is5lmqqybyp9c8kr0d12x27lgm761dcjhi63i7pv37hk0kylj"; +"multicolrule.source-1.3a"="0blj75rh7vqy8s8c87dqpbz7d279hngzl99272cyskmj8m4y6jpa"; +"multidef-1.10"="13rv808x0bz97cm45r2rjxy0yhmjycswcf89pl7z182acrbs30zq"; +"multidef.doc-1.10"="1jcm11pjx3d8105k12r120nqjjyk0ncmbry8pvkcpwf8kpxcqgp7"; +"multidef.source-1.10"="14y2vk3y8f35wxka65fmj1i235hbb4sviq8g0j300d24nlp32xsz"; +"multienv-1.0"="0j0s86c6xqpww1x46l2vn66l0wflqjsl5q4jqa4089xhzaxzhdy0"; +"multienv.doc-1.0"="02j3gripplimgh9qj3mjy9nlifdi6frj6cawxnjsm35r19m9ia5q"; +"multienv.source-1.0"="1s28zxxvbi5yg6iigdixc5kmn5w7h4hss3xrv04hr2838xpma3wc"; +"multiexpand-1.5"="04v8qz91w4fayy3llr20dqwvdx835wl9fmxpcg45sd3yrik2s4nf"; +"multiexpand.doc-1.5"="0pw7kqc1r0mvnb03fp5l3gpy5m5zvrynaqkg4xsdrhw4gqxlpfy9"; +"multiexpand.source-1.5"="1n1bngipr1sjjqnzsdgyyy08hnk53f81j0fqffjlr5siy4by1p6b"; +"multilang-0.9b"="0zkkfvkybq5hxbdwkwy5n7gal1ir7ixg8342wynk3ga9z6lb9shw"; +"multilang.doc-0.9b"="026d5yxli87f2svfyqmfzbhydwd4c929n2v11wk5prg4zc3vp08k"; +"multilang.source-0.9b"="1v4ql5jxlmpc6458qcqvbsrb9pf3dss60z3i3ylmyp6mx0kjmchr"; +"multirow-2.8"="0bsn4xzliq9gllmac4wqqsnws9slywc0d94abh81awpzv6vy8jwj"; +"multirow.doc-2.8"="070q5s39pfdq5wiq7crhdqhcyjalpd8kydig4djgji975b0xn0bk"; +"multirow.source-2.8"="08q074bixnkvn7hsi1n8vx0r6pqwwkdjsjnxz0n3lam30x4j1jib"; +"mversion-1.0.1"="12mvnkij2q08j50ka3nngmcz0p07lmvqg3jl8fxrfdzyy0h7zhdd"; +"mversion.doc-1.0.1"="1z9d4bcylv4sk79hfzgy36bza0r9lkzw93mis2m6ypgdbsaa3n2a"; +"mversion.source-1.0.1"="01dbma0p4lhygs64aym66j3vp3c0hpbci4x42mpr0yvjnglymbj6"; +"mwe-0.5"="1rk5530j3cnmf46i3gb6wc198ay99pwlbb80ynj33dypfiwsvhcb"; +"mwe.doc-0.5"="0bnw57l8bb6x4k8i4icc8g215bxrccmn39vyhj888ijygdw2hgmv"; +"mwe.source-0.5"="1fl2xlmqdas5rijzrail9yqlqz1s75z9fzkip5zjb8s0gfnbg3qa"; +"mycv-1.5.6"="1nnm6ns6qx6ny4xb7z61pajysfb0nfl7gs5dw292bwi7daxs98xx"; +"mycv.doc-1.5.6"="1d3rra14k69l5pfmcw4fwbkn257935zdiyd2p9gzx0bc28ivsajm"; +"mycv.source-1.5.6"="02ailkp9jr5r70aphfzp6kjm83ni6gigyqn2nr0zlsa098frpxg9"; +"mylatex-56751"="1zihhgy4xaj04qr6rfv73050rvb8a77zglaqgjby5b4a1j5vyw7x"; +"mylatex.doc-56751"="1bdigldcdk3rz4p58w7g4qssbx13jbhqxbavf3x38r71r1pys5x9"; +"mylatexformat-3.4"="0nns88lk6wdq053aljg9k17d3g9fvi75n82swglq3jxmxx2k7r89"; +"mylatexformat.doc-3.4"="09dnsxwdhdnpwf0y7cfj6xh8gws32xn12fc1rh1xiy3ivlynj8c4"; +"mylatexformat.source-3.4"="14rd6zn88zaaznnqh577zgbbmmdmbkzn03201i459v3jzcvijfp7"; +"nag-0.7"="1l31y7mr00s6md7a68cz51yv0qfd26xaj04ax1ph6dqc97r3fv1w"; +"nag.doc-0.7"="0gc56zgva7kziny3ridswnp8rscqi1mg51d8x580pidb11mp7dw2"; +"nag.source-0.7"="1fh9nfjbkvw907ra1crqfhm7hl4k703g80w3c8qvd18r86wmn2i4"; +"nameauth-3.6"="1p4jrwadp6hiv0z3ql92nc7n9qxc9fgg5nig6l6lpk9pd2z5b04b"; +"nameauth.doc-3.6"="1p4nw3w39p6l5mzkb9mz31hgbzrnx2a48vgrnrq5gjwdh8kggwz9"; +"nameauth.source-3.6"="03zn8f859x0dm8jx6cvnzqfm9fvsws62xvpyy1ls50kwjpqyf88c"; +"namespc-15878"="10sbvwc0r3lm90qdxds13iyfcddq1vjx2p8vvs4g3sav4fk8p02k"; +"namespc.doc-15878"="1z34xb5s5fgl4rag0fmc5i5j3jb810f543096mxpq46j98rcp5mz"; +"namespc.source-15878"="0xjcnrrrrw4032sd6wscxvar9y3kd4547rsd79dpkbb0ksmqbqrx"; +"ncclatex-1.5"="00w3g79rn2xa33al7cma09b8l9na6xd5b7w40j8z9day31i2p89p"; +"ncclatex.doc-1.5"="14fvmjnnw8n22c3j2mc44bqrdlsxn28dasfk9zmajvmxgic4w12m"; +"needspace-1.3d"="0abcqdcykpq4wa5a95c8w1bn6cz90zlsy146186v0s54njc5g3mb"; +"needspace.doc-1.3d"="1r9mn0flqdnaca1w2g4lsy0pk5a9l2sjnkpzzg72qgll9dsqqkmq"; +"needspace.source-1.3d"="02j2f9wl2ljyi82dxk7qk71dmjvgl17vp1d3hgvlc54gl5qcwqi0"; +"nestquot-27323"="0l2glc6aykd492rspxphgscx0ykc8cakvqkm8z99jq7xxi80l1x8"; +"newcommand.doc-2.0"="1vlxm26393psl4kjfh533q03sb4klnfq84nld9ggs8l5x08dks58"; +"newenviron-1.0"="0vij59qibxvl81r367yxfl4mgp8fjzd99x3aq008hwh3g1d8ciaq"; +"newenviron.doc-1.0"="1nvra7lh4zvxy70hf4ndj4nl3ij3ar8g2fxrc0951qvixz9jx7mm"; +"newfile-1.0c"="0gah9qbkpib651rjfrakzldi4wd7gv74y8j455n1yi6wnr0yq570"; +"newfile.doc-1.0c"="0vqlij71kfjzbl08sh38rzs9k714xigjc1cdvvpj2m6bhimazp76"; +"newfile.source-1.0c"="0sw9cqids994lscbjif8h7npp4cmzrhrcvccspag2aa78gsvz04i"; +"newlfm-9.4"="12mryj5w7dpn0mdv91grkrd24n2pn68p54bl70bg3pddvz5ab6gy"; +"newlfm.doc-9.4"="0afpxw78vijnhx2rwv94ar6x4ivcrgz7873vdc5n4dafgg18z78s"; +"newlfm.source-9.4"="0z081mn0zf92ana2v99sdyyqjz4lqnm2ymndp76xwih9p1z8233s"; +"newspaper-1.0"="1afj267dlvgcw8028b4c0v9rdj77w47zjgpk0grbapy7wjgpyjb2"; +"newspaper.doc-1.0"="12hlji06sd7bvw7r664cg8ijxabc2q1rb7z516ph18ayjl5vca82"; +"newspaper.source-1.0"="1h8abnmiai3c66cjndm6xawz00z1pfmgwlp6w43amjrk1rm4r5vm"; +"newunicodechar-1.2"="1zr5w047xqg9bi6drl2rw414m9bzpa5r7n5270zr8k8jj74xcv7x"; +"newunicodechar.doc-1.2"="11vk77c83xy40i9vclw4v1h5wnr03mb77fa8s2lhi0p4sq0c3vgr"; +"newunicodechar.source-1.2"="060kbd07al8cwns5877ap7irpf3r3bkw0w62cwvl67y03gcmgr70"; +"newvbtm-1.1"="0d9q6mvczacdxykp381181mnra49qa0y0mngr0dnqp24hfw9j9l6"; +"newvbtm.doc-1.1"="0k6j4xpvjwwvz8cipgrqvrs2dj66n7yzlr9mcfsgd5w6rm1p1h4i"; +"newvbtm.source-1.1"="1p3g9qyq4x0ffv68501zlpf1w0ffm816pa0wqjpqf8pz2jmgcg5y"; +"newverbs-1.6"="1n3qdw6n18kci7j9ib7iniymr78i9dzk6iiyc3pj4iy3n9s0xx3g"; +"newverbs.doc-1.6"="0i8vx3hac230w9a13sm3p8l5bv0sipyfzwfvkk3na53l6izdqsbp"; +"newverbs.source-1.6"="17hy171m0ka9j9spj3p292b0zg445zwxc93jj12y82yyd294rdzd"; +"nextpage-1.1a"="1p9dvw7fqspkg6hk6rdmsb5k5m9mkj0kz5a47wg5dgfqgrqpixf8"; +"nfssext-cfr-43640"="1qp85vnmzsn967iqvzsf7yzsq1a4zxvyim7r0xb8pncak805fs61"; +"nfssext-cfr.doc-43640"="1jac2k7nldxq11rcf53glb5y3haqdsxzzxmgmvyzhbrzmnx0bsms"; +"nicefilelist-0.7a"="0p26s3qbxbiz7nyf13lbjzvgjbw5cm9wwq2ji1i6sfjppv3vl8pi"; +"nicefilelist.doc-0.7a"="08zij33sv0pidl6fhbqypx53clzqjdbfnvrrd0yq8m9b527fcd7z"; +"nicefilelist.source-0.7a"="1d2l47v2qm7mzbkhk7x5wzzibnks7n0hz1g8sjxvabyaiqfpk6nz"; +"niceframe-1.1c"="047y9dh0p51lyrrq5fkvp4dpiszvf2nmx53hccl8hzgr2bs3kbwi"; +"niceframe.doc-1.1c"="14fapa38pffkj1hs58b7r1zkjn3dql9d98jzh13cybyfynd5crjp"; +"niceframe.source-1.1c"="095frb90nryk4m2iia4sq3kfrcfg2k3nq079770xlp720zqy07rc"; +"nicetext-r0.67"="0aqfg8phvhlgvyy71flqsaqwmmc6lsl9vsxpxd61v69hp2qhvggh"; +"nicetext.doc-r0.67"="0c078pfiw1nz11krcgwbdlp2brdy2xmq6rda9yahfjjg54xgdbg5"; +"nicetext.source-r0.67"="112ji0zwy54nqswil8lvvcrq0ai7jsmdagvf2786zg9n14h5kr75"; +"nidanfloat-48295"="15l4rdj7bk1279xjjkgh9a7scfmm6w88civ48shh7gwx8gsvcscb"; +"nidanfloat.doc-48295"="06ccf5yhrqvshj3d8ic3pbnvmdpjxq54i57y3141wgqcj5h062dp"; +"nidanfloat.source-48295"="04q480lddynb2gqz8azmyik8170vl056fhfjsnq8ydqj0rchnnqi"; +"nlctdoc-1.07"="0jgnmp6pfjz2jmlvrvnbqsmxk0bj276044hzdgkxl635ilzkzds6"; +"nlctdoc.doc-1.07"="07yl0i42zzb7xw0wbdwzpm7ibz6imds379ag1s77zii5zvlir1x8"; +"noconflict-1.0"="1flkwyz36xycq4aidj9v6ga29ghbww8ss5dkz4lzsr96nv38q78r"; +"noconflict.doc-1.0"="1v3q7xbss5ra1dizg2mz66zq97cfsv5lgnd136xqbbmn5vphl0dj"; +"noindentafter-0.2.2"="14z62mn7fyfj7m8wk7w8faq7lwixwfaf1mlk9bcc1rrpvm5hqn85"; +"noindentafter.doc-0.2.2"="1r6a40hxbkhm539b0yw4kmmg2wxlbnlrfa0wpkicp2yi2zy9xiif"; +"noitcrul-0.2"="1whs120vlg4cdjmb1x363g92ira9nc8j2h65qnvwv8qrmh2hrwnp"; +"noitcrul.doc-0.2"="0y3j12rb8ks8sjs1ikw3sccq7p7zmixc10nhdy9yg9rzwcgmicva"; +"noitcrul.source-0.2"="1dsjxs73xf79sjq9xynnv78jws1j39l240lvcvpir1k8vnzwfa13"; +"nolbreaks-1.2"="15qa4nf5c9gl3ha4prajqxl2p1ks6fpql03d52prm9vqkwphzgyy"; +"nolbreaks.doc-1.2"="1h9n7ki3iznbzq519cliw03fcn2k40f2rldjkhnp5vlzma81inh3"; +"nomencl-5.5"="04wp75pbkhk90137k93s24sl7iggzp2x36ym02y7x6g2cyfpf6v8"; +"nomencl.doc-5.5"="1qvn7ih059frjnm2cdk3sria70dyraqi9g4c6bw2qw8amcwc1bnd"; +"nomencl.source-5.5"="1ygv511l2sifvbx7iv0xn58s51ifzh19l0cjd8ibb89a8i8s9cxv"; +"nomentbl-0.4"="08jvfyn4vd8qwlnbsqhlxnwnl4qv5b8r32slcbfwshc4kyi2hn9a"; +"nomentbl.doc-0.4"="0g48qyrrj6npsjcnnzn3mgsmd5fq4v5vzzsgxvvx9x15446987cm"; +"nomentbl.source-0.4"="10b41ax3ynpdbn9bawkp43whqjkygh8f2p6qdjiwa47w1acca8zh"; +"nonfloat-1.0"="1ay9s9xrf27sgan2gan86g68i91rwa8spmmj2l13pb3zl5qikw66"; +"nonfloat.doc-1.0"="0jjil5rbxzcpkyid8y5dahab2ca9r77sw2scgrc4mf2h4nhrjfyz"; +"nonfloat.source-1.0"="0vyvpxyrqjqmlw2fj4b9avy7sn79m4q8gcbgzdkzzp8d0rng5i8s"; +"nonumonpart-1"="0dyf0nl16j7vp955g64rbvvjyqq31x5iv7dbkh8cikwvgn9g85s5"; +"nonumonpart.doc-1"="06j6sc8q18mnnnpbj57ykays69n78z0iz1r3vink7qaw4a8fbyba"; +"nonumonpart.source-1"="0p3gicf0fzmk0f7lblydf31pi9x0f6x0k5rvdd2ia8hrjdaqv1dz"; +"nopageno-18128"="098q0visa9g5lh3vp6bp484fglrq8g21v4cb71cnc30f7avkg1v7"; +"nopageno.doc-18128"="0n7p2f039vmd060ncc81yi2hnn7qyk6b7z2hpxh9pp78dwklgx98"; +"normalcolor-r11"="1yvbqc6px76phjgy9cwpqwy035nb61nvcxy32v9xa9wfcp36nw7g"; +"normalcolor.doc-r11"="0919aan1qxp5lfqm902ijn6sflkzv1dgxi12hjfixd8d1d7rlfgs"; +"normalcolor.source-r11"="13lqp3zjnhm1wmf5id1bbr86l5qi13xgij455l38l55is468sv8j"; +"notes-1.0.1"="058316ialcra7m56ww7imzqqhk318abwscw5g60hr73x3x7d9dgq"; +"notes.doc-1.0.1"="1zq11rygqkbx85cf79ixwcv1w971w4hx8zfsv7z16am4mlxcdz5j"; +"notes.source-1.0.1"="1ycxa3m2l13z6a3a4a88wpznvwdb78qyxkh879cvg85apb11rffq"; +"notespages-0.8.1"="1zn3ygkiyqax88azc7vcrkfw5hfzbbq3jkacnv50c8z5xllk2nwz"; +"notespages.doc-0.8.1"="0556azchy0yc8757wcy687vn82q0jmyf7n38vyx3admpawyk1pxk"; +"notespages.source-0.8.1"="052p17fbdpbdpzaai5xn8r0v6lamv7ps78svd27216p71djsfr66"; +"notestex-1.0"="08b59wvl0n718vbzj6azwmj5cn4jk57yzzzzgxkgkjj3kq2926ig"; +"notestex.doc-1.0"="1n7qdz9sf7jdvrrcvixbvk1yjjqdwsr8c4vlw0glwabjyzj9hi3v"; +"notoccite-18129"="0cbvwvgh3rkms6akamnrmzwm6796ly5fa93qsb30bqafgmx56il9"; +"notoccite.doc-18129"="1h14fkdn5kvxagkjx8h6f6a06v7y9z48s87x52cblwykgfm70qxz"; +"nowidow-1.0"="1w18i36ynsyldb9gs0yhv6plyrjs4762y7bglncv7bhqjmyy7y3g"; +"nowidow.doc-1.0"="1l2zq2ain8nhkaa8aagpm22nvg8p1vk2cdgs6pmrydk0hhmjh01h"; +"nowidow.source-1.0"="01qjfpps7ahmrwvg142mspj8gsyx21l3nr75g0v7qsqxbfjjy6gk"; +"nox-1.0"="06036p9059x0lzliq9b2pqahnbp8jlkd1gnq300rq0syj37mjk5f"; +"nox.doc-1.0"="1qfjlzczcnmf3pgqf4qr5v9c6ws6qba9hm28h3xwf2s3099drxjd"; +"ntheorem-1.33"="1mbrpw822ibb7wpzbl3fhnxg4djwy32knn9hqcvw1kpahgfbks66"; +"ntheorem.doc-1.33"="1f1cridxgv2rwv3f305hsd5pm59im1ik8qmpqhq4rpvwph8ny140"; +"ntheorem.source-1.33"="1pkrhkl9iq0giyvk6lqjxx5x681rjl9zmc0kmcypwgbqww59hp0i"; +"numberedblock-1.10"="11v5n8s9glczglmqm4bfykg5v0qdqr2wfnymb15aichqqvbfcgsd"; +"numberedblock.doc-1.10"="0rh954i5167pmwmisn3v26zqqgdrk5bcn2pc16m3wyrdgvq02kzw"; +"numname-18130"="0sj8plvx36i2azwnk9zhxd16x7dxk2419rdzc93pl3f68kxdmy5y"; +"numname.doc-18130"="18iarxgxxi5dj0cj1bf0il74ndn5lng3axf7zz0jwqpl5d84pz6b"; +"numprint-1.39"="0wkijyxl1zzay8vqvsyhk6kf5247qr8k55rz91dn1ph7b597d952"; +"numprint.doc-1.39"="1jra448iyyvc8qgc9z49brb6j9c89fzf5zhgz48k9959bv8izs8r"; +"numprint.source-1.39"="1svwh456nbswkrmj98s91vr2x05fvs58chkr5d5slq14wg1cpa0q"; +"numspell-1.4"="0lzzdhdw5rz36d83v0y0g75h4mjldsjzmd0zdjbv3hxsjplywdyy"; +"numspell.doc-1.4"="0jvywqs9bxrc2bm1f61liqrimbhvm5akl8lyc3xr8gqmk84v82jh"; +"ocg-p-0.4"="1cfg5253i7rb0ng65fwm6v0yhs2l91gv0a3d8bra1bkwz2f1mfmj"; +"ocg-p.doc-0.4"="185fgw41dbw1hsbv5lr84spv1qcfglm0xhrgwk92g0dgh20d0kfd"; +"ocgx-0.5"="0a1mvlgn1vql9w8ziks677ysir9fc904ihxhn2hy5qsk9j8wc5w9"; +"ocgx.doc-0.5"="06d3hdgvwymvxq7vv7ccjiyay6vf2v6c8wznqxyjjb8sv64mzlgd"; +"ocgx.source-0.5"="0z2jgksb5pccxs2bf94vbzb04b1k6a2ssrx3fxc3fwl3z8afqq9q"; +"ocgx2-0.50"="18m9m5nyr8npgv88di7bhr2bajsygrw102ycyy5rd52bqvlcrnhr"; +"ocgx2.doc-0.50"="1ah8qwa28qxjznw111ifhxnka51smqackhkwkzydk40nvjvpzawd"; +"ocr-latex-15878"="1l5s8wlqk4fc9i3fizhbm3c7nafq36w39693xm1x07giqqw8q8cl"; +"ocr-latex.doc-15878"="0ai4kr65ls66ywxncb63jr6gy6lcw6zjvlgsbp4wd6kfjxs27bh7"; +"octavo-1.2"="16pwz513a39630p51n84761asli9kba5z3pmbgfkcz7yfk9iiq22"; +"octavo.doc-1.2"="0rdb58jnyyp12i7ndd6qibs2jc1f0zcw42jh9j48aid6nwslvrbr"; +"octavo.source-1.2"="1f13rhvd2l3v7fdivk1ybw0gnacv9y2pzwnbw8ykmaq3x7m3x2j6"; +"oldstyle-0.2"="14lm3ghfgfqafqivam1dqf3gqgkchnbnc84z5i0whg2p18x9zns5"; +"oldstyle.doc-0.2"="1qj8nbcx1krpha49k4yzyix13vs9s41g96r7kpdmv52vlpfgs4lx"; +"oldstyle.source-0.2"="13c4dxvikdxx7qv7y9rfpgj4fgzp21q71xpmq1jzx7phwrsn6wcw"; +"onlyamsmath-0.20"="158p92zgnmicfwibiyr5qbkwwkxhvfpvngkbpbw6grbdhlwsn63g"; +"onlyamsmath.doc-0.20"="1d2znlhbz509rqzlwqnbz9b64mpbhckh8pv23fqr8058xlbazkh6"; +"onlyamsmath.source-0.20"="08znvq2bzapn0dfa7f4sd08gm5k7m3sh6hkwy17zwkc0987wx487"; +"opcit-1.1"="1g54f5sv05rg1xxpydsakjrlckmh1wq0p15w4q0935iw0aq7rn8g"; +"opcit.doc-1.1"="1rx3ap93f4570d006qci6j6qi88zwxc8504gg554aak1lffazw5m"; +"opcit.source-1.1"="0242ajp415h3y20dyvi2lrp38saq10dgb6hpnmadzs7wrwxhma55"; +"optidef-3.1"="1jvalzi2gid20wn253swvhil05m273x6685n0b5wbrz5kbvzk212"; +"optidef.doc-3.1"="0sdd6rsdfx1fcw1493b12ww5llww6mv0rij3f1ik290c6qbmyr3w"; +"optional-2.2b"="1mv65cqcrjhykpl565z96s57z05635q513qr440crbh61rp93chs"; +"optional.doc-2.2b"="1ks001q2b1yw87q0frhqq6yv77mskng6v1sm6kd8r22cv5g49xbx"; +"options-1.0"="1v2j59zcv5cplh3czd6r7cs4n79yvw3448492bxk446j4lx2mfcx"; +"options.doc-1.0"="1za038prpjb3s74ryr25q7hmz881gr8abmf68h7xdjq6bdk73da5"; +"orcidlink-1.0.3"="0ajvvwlkick7cm54bwp93vbn74a77jc4yb5vpy481pgl3c1f3rs7"; +"orcidlink.doc-1.0.3"="0d4y49d9h7l1h0d187g2pixrk9midqdfm79lyh3mxh2w2l19hv9c"; +"orcidlink.source-1.0.3"="0byrhilaxyisxdkxrb1zzv7r3snihw552n7ypsl67jjmw0593vzw"; +"orientation-1.0"="0qcqyr76wiks50i1zr3skp7bsnjzi6snsyvsm2za3l08kbdi3ixx"; +"orientation.doc-1.0"="02cmfz42sdd1gr4yaha603rppdh4c4wjj0jbcrmwlfgl9a47rj11"; +"outline-18360"="1q5dr9xlsn3fz7bcv08biv5cv71qf8brzgg4468mksh8lc8r2kli"; +"outline.doc-18360"="103sijg9ib5qfwaxkdgf11zsdg2c46dv00hn08sspl56a08j54sl"; +"outliner-0.94"="03j0mshhrchrgpa2z7j7q6n783va5v0w16gp401rzbvvdn0l2qni"; +"outliner.doc-0.94"="0vi80qhq10yy051sfzh6pmn34laghhvx6plnggrwvcmpp4fcw14h"; +"outlines-1.1"="0wzrf2fkf9kh0d3jjbc3kxvsmkynwzg622ghwcabaps097r9z45i"; +"outlines.doc-1.1"="1avkpx77sis4hrrs9dqizq2sz4vjzvn19ks8q7l32qyz6lnxwk2b"; +"outlining-0.1"="0kc3x4zq24f2dzwzypdi4ysgsfi40l54zxpaxdfgd662wxangrsp"; +"outlining.doc-0.1"="177xwyzq3mha4061dxxshszsyysmb6nl5b2grg4m55mn19qlw2f0"; +"outlining.source-0.1"="029wnd1px0wdgffblxcbs33r1ffv761sgma7bap9g2d1n3dwja2c"; +"overlays-2.12"="1xfbb4953ab25dbccfsp9ban67vrq79j443mlglnzqmg1njrckk9"; +"overlays.doc-2.12"="1nm0d47vclan46q0zvigxri5zqmfpv0qkk0arsg836vnv7l53q0g"; +"overpic-1.3"="1szm75fc37634pky5sm2l8b30zqw38n1h0y01w7c5is5s0a9zmgk"; +"overpic.doc-1.3"="1lixa20fskjpbc6clgr4sm74d76bqyyxc6y1drzhm9xnkggd29x1"; +"overpic.source-1.3"="0q48v02rvx1w95c077r7mdxzmvg7za151fxym24qsbdbqd3gr9ja"; +"padcount-1.0"="15p8g5hjwlm80xnm9py3ss6afl6c8rdq8f92z7518hp0yp7d3zfw"; +"padcount.doc-1.0"="1crpv27a9rfmh4dcliqvi7aa4h4lvkv48k5zk0kx6ahhxa2zkzaa"; +"padcount.source-1.0"="0vkk0c7gvzihlmw3f8ni4awj9r6xrysj9rrsbqk6dkngrg02x4xz"; +"pagecolor-1.0i"="0s7x69f89xfs8zlpnqg3igjjp8cdjpbg0666knz1bglvchihaav0"; +"pagecolor.doc-1.0i"="0lkc1s21l352wjgzvg4psi2ivh5lid9q613sccc4nvbbxj3vp8wd"; +"pagecolor.source-1.0i"="0dlrm09asm6y9kwcarn7b3lp5fxs26c3mr6dgxc7dy0k63kqnmpw"; +"pagecont-1.0"="1fh6bplg468dandbyvmwf13sh27r6x4dmrwslldlc9580h8jv02k"; +"pagecont.doc-1.0"="1vrcr5l1facyyf9p8977q0i5m7cn7y40dbmiv99314iyawa3rr1g"; +"pagecont.source-1.0"="1qc105f5v0jiahk8gpgr77lqfaladba4hmqnfizbblzbjhhgg05p"; +"pagenote-1.1a"="0jd80dz0jl2gmfr74lw6jy1x2hj6zlji9az956gkj8bxxc6zir54"; +"pagenote.doc-1.1a"="1s7imj4fi08487xmcsicsa4cknpsgd10dbcyn6vkggm95qn6119w"; +"pagenote.source-1.1a"="07ngnfinv2mki203in54l4gx7r4qx9rm8k4x7856gr7jy1wkw16f"; +"pagerange-0.5"="1nixc1dn9cbdi3pa5yxajii6c9ljgc2jrnknsa7wb66kj5j1lqch"; +"pagerange.doc-0.5"="1vy3c498j95miksm254a1sh7d8bp3g5p7lvncc1xad4g388q6hak"; +"pageslts-1.2f"="1lm8707bl8a9kxrbbr6sap3p66zwjklqv13invm4gcsg92yf7yhi"; +"pageslts.doc-1.2f"="163h2h9n4cvap2c369f2yxv3idij6wzjqwf0wd7w5024h1vvj683"; +"pageslts.source-1.2f"="01nwizj0vlnwzbqyl5dn02vg5xl2aw60wyvp4plm0agg8kxmsi3a"; +"paper-1.0l"="1d8w8aicx5drrgqdcrsb7vdy39xh6xmnnpympy1db5i2mc2nkjca"; +"paper.doc-1.0l"="1r03wy4harxplfhqp0dsqfpp0s4j5gn6k2p43fpw7wndna8lnhyc"; +"paper.source-1.0l"="0c1iv6aynpfi37bg30q235zdpbyhj83rkir4kdg4vl8q27c8gpwg"; +"papercdcase-15878"="0gfkn87avjnfjx2k6hz5k2s9iy2lxwx9x4r0cp1lcwjgjsavf2y3"; +"papercdcase.doc-15878"="1hm0i4vvxhxn0wvsrbxd2lkqspqkq7ik3sxxm1nd575p5l3zgl69"; +"papercdcase.source-15878"="0mkadgjk395z280220zndpbbks331d5hcsxqnarpjmh00mkhdj7f"; +"papermas-1.0h"="0x4h95w4znr0qkbmh18ws13c49fq9wmx1g0rhkwbkg5yxibyhbk1"; +"papermas.doc-1.0h"="0vv07vzfsgmpm748si100rbsfp0ipvnnnqidg6c5b4fgydz2dcdk"; +"papermas.source-1.0h"="1z2wvpy8r0qq0zjf48i2z93iyz6vjnzc0vm8g5pd5zrq961hfj4r"; +"papertex-1.2b"="144zirbvdpq1q8an6i5rngycmlrgicf9skh6mnwyz45n4zyyzyg1"; +"papertex.doc-1.2b"="1aip8lhazpmmvdib6yqivbgjagyyhmava29q9hrlx833385vvnhj"; +"papertex.source-1.2b"="0bfkh8vwqh6jx34fmqfqf2qz5wjpmq9bpzbppf0cphs5frbwg10b"; +"paracol-1.35"="0lbdk9wbs6c6kq0iyf6amc72m1njdf3h8yvcnka9dkhjp228ldf0"; +"paracol.doc-1.35"="0fnby29nnrasv32p9xwwwax57ijzscpnsv43rwajlqwcdhi3s2nj"; +"paracol.source-1.35"="0q9izjw8lrwcbx0cpq66pr33cn02wl4daxsjvlkrjzw8zzrijl64"; +"parades-40042"="1vmjda4cvajsqai47wvl0byi552gdcy0j4m36p58gjn3d9bc8818"; +"parades.doc-40042"="1lz9dsy94x5cvv55nk975fw7dlg4bm6d8ls0p6gy5b58sjd6vcp8"; +"paresse-5.0.1"="0kxlx7p8949msfiafqf0j2ayg41cmgnk1g8023af9rlxbf69swmr"; +"paresse.doc-5.0.1"="1v04rmmmy8lsvmbvnqgiivdr5rxfh97k3fb0zc0rs3jfg0jl290g"; +"paresse.source-5.0.1"="0lvwpyc8fdp3y1h7jrmlymajjd40a8kc4nv94wg6nx5xq2rksd7i"; +"parnotes-3b"="0d8600ssj90rwl9rxd27i23f58lmxyf5r1sn8yrl8fjnq42q447b"; +"parnotes.doc-3b"="089i9fwzjcv98pnqmhca26wpvn71zcgb79y3jg5w8szagli38839"; +"parsa-1.3"="1n2yh9v3d8s32ylicq5vn76m91s6648zgvys6vg8m63pafzl8rlm"; +"parsa.doc-1.3"="0i3d87kajjcw9mallswncp113jz9jn35jkj2y10dmx6z5sv3x3qx"; +"parselines-1.4"="0ymcapxlfyb6xi4k0z1y42cyzan67yg5v4nnc2f1ac35yw4z57pz"; +"parselines.doc-1.4"="0396j4dscv2pqk9vxmz0p4xm4l3v9ln98cwv32r615l1k68vafsg"; +"parselines.source-1.4"="0cg77iddyvl6p818j74ci2zg4zdddp82wddhxqh57qg8vcvi9g5c"; +"pas-cours-1.9"="0gyw81drxs56dwqh6v1gqgs4xcwq78v9isgg38djxq17km075y3g"; +"pas-cours.doc-1.9"="1zn71815y5pkp24l0cd4283zb3i85mqqzbxmhxj19v5s4jx3ywsn"; +"pas-cv-2.01"="01aqcqyw0h459xq18gc0y00z2j13zwdn72qpfmajps7ppadlcbxw"; +"pas-cv.doc-2.01"="0mwgvj4hbq9b6ih6l6hg6gl5qrxyyf0mimwv50vpy1z7bhdq2l6a"; +"pas-tableur-2.01"="0w4760s1z3nqnyf449vmd7x7inhsp08n9i794177rx7kc2yj2l7j"; +"pas-tableur.doc-2.01"="0fish3403ixq2mp3l69qij4c74s999mimh7majfcw58b0y6nizpw"; +"patch.source-42428"="02xfy1fs30nha0l03lqwl8xrpd81855kb5nb660ks83aj187dghy"; +"patchcmd-1.05"="0v0033zpp4w75lbxk8w2byhgy3s6qvm9281xc2c75bryp0ar5pfq"; +"patchcmd.doc-1.05"="0vw698r5q5ai4lx4vrb24x8j9dc7iwaml8scsh9c22cpqn2sn26s"; +"patchcmd.source-1.05"="1cb90y0i5k9s4jj3f9vnj6rhxphjc14p5nm6hllibww3h1khnrxr"; +"pauldoc-0.5"="14p0lnn5hvn6szhgr0ngdc31dbjrfk7r8m8n2jn5n8nirsrdzjxf"; +"pauldoc.doc-0.5"="16ls36m6c8v4x46bz26ysl0ndi9jmby2gl8b9wglw9ba2gf97xjw"; +"pauldoc.source-0.5"="17440237dyqhxpszm6rcpdhb8dib6l9qfqj5ls2m0bk3vqm7xv8q"; +"pawpict-1.0"="0sx3lwgm3d3cm4s5408x5dhf45kngls8izzkqjrqjy074736968d"; +"pawpict.doc-1.0"="17zf7acasv8h9crzg6jw3d2grmhi689476z9x6872h7kzkn3whj1"; +"pawpict.source-1.0"="1vxmq9s2q6sq6qza6lhkd6lmj6pg4bw8qvcpqr8zr12nqcfy4z3g"; +"pax-0.1l"="1d212favd0c9g6hfiy2kc45knsa8x7n3yldkp5xp5xvfa98bckp6"; +"pax.doc-0.1l"="1646yl4nn4fr1i4wjdyikzbr254fxiga72ihf9jkiafjibxrrl8z"; +"pax.source-0.1l"="1g565cpblg4dkdrrrs79qnfd5ips1rm1785nyvjf4m1p4cpffdgg"; +"pbalance-1.0.1"="16i5d309dad5g00kwwsv9yfwvf3qaqs5vb9s80iizk6bicgf35yz"; +"pbalance.doc-1.0.1"="1f87jlzha44v1z2p94faijcpaak85fvnyyp694da4d3d4bvg2f34"; +"pbalance.source-1.0.1"="1iy7xzs5azgprmy4jdfpncsnvksygnqya61gzjiw02ddhr8rmh5d"; +"pbox-1.2"="1b6xli52wbqlhxf2sk4ryighd6jaj6znvpfv6n9s1iq40ag943dc"; +"pbox.doc-1.2"="1qa0h3ahh8q990wbwyrp4glwhdhbcgzz9yp436083w8c9ang0lg4"; +"pbox.source-1.2"="15gqbvrsigqqyzcf8rda0z0kcw5h6cnk1l9pxjh7apz7i3k00i5c"; +"pbsheet-0.1"="04z9iszj9hx7la9zqqqxrsfq3b6asld4zxvrszyjqw7z3fj7pyz3"; +"pbsheet.doc-0.1"="02an134idar5ndk2kk2d446bxawv0xkrwg8xvgxgpp8s1pqdzai5"; +"pbsheet.source-0.1"="0ad7zs28d47p3swvl6kz2v1p2nskrcf8fjwy0igwy8d8qalk0dix"; +"pdf14-0.1"="0gpbf1jxfjl56pn3sj50b6x0z3fqhb7d1dl8dhf31vgcj8sn9n08"; +"pdf14.doc-0.1"="15rgv0fw23c4zbwlx149hhbq711hq39v1nka52mjpl7lgvvzny98"; +"pdf14.source-0.1"="1wm9nlqws9g02zkk3rgrpaic293vfskfrxsn3s2jb3iz0f12bp2w"; +"pdfcolmk-2.0"="09rqw5csr4c63w5z5c019rm8h4plqzwy0icxbzgap048a7x02kqh"; +"pdfcolmk.doc-2.0"="1nslm2frwxqcrm3spr601p2r6ga2b91d7v1v0rbi7h06h14mvxa6"; +"pdfcomment-2.4a"="13cknk58kksg605m2jjkvmkfm47sdk56irj8xa3p0alx8c4cn67m"; +"pdfcomment.doc-2.4a"="011l19b3lhc8zn3dn071gnlg2300174xaqkdn83r631zz45yriv7"; +"pdfcprot-1.7a"="0m4lf1rb2j81ry7v2g9lfqs42rizifd64q7xw9dzhnixp900ldfk"; +"pdfcprot.doc-1.7a"="0b9ac68snrs7fs8g8nqrs62h8jjfyjsa07psk8qc20nvpya3hjq9"; +"pdfcprot.source-1.7a"="00nmdx6l66w895fjir6r2pwrnh0vpn706i9wi5qxx143h75rgifl"; +"pdfmarginpar-0.92"="0mhf21dcz4ndhbh1g0h3kcqza4ni6iigrkif0iryyzg1zcx60d19"; +"pdfmarginpar.doc-0.92"="0arfch7gb07grg0n8ij0wfzbfzc8bv5izvhp3vjz8hl8ha3wyzgd"; +"pdfoverlay-1.2a"="1gyrwbv8xnqd4kb70d070q0siissyvw0v9w84di6v9wb27s8yg97"; +"pdfoverlay.doc-1.2a"="0nj5ahamxmqv1vqibjai30a18429a9f3dhngw3pg1aa9s34f9c9s"; +"pdfoverlay.source-1.2a"="1kh26sl5w11p1vg85spvy4ppw0h8fm8n1bh58jhbmp5d9cgrkw53"; +"pdfpagediff-1.4"="1a4qmaypz1indb2pw4vz0hv8ihanhf9z0azs3zkv2ya6qkc0kphp"; +"pdfpagediff.doc-1.4"="12di5a3976bkilcyfg0imx3w8771ky0acgrag7xp9rpcggbi3r08"; +"pdfpc-0.6.0"="1v4zrirfjyl2ffhpkxyd1pv5vb5m8azfzj3spgp9d39jmkf9w06w"; +"pdfpc.doc-0.6.0"="1hs0ws6v5713wsb57x003dg2yl27gfw794mw4p62bhrghpsgfrkw"; +"pdfpc-movie-1.0"="07d7d7h8zfap39dd3nks1bnpnfpgs8nrzzdsmchy6isqfmfrypgn"; +"pdfpc-movie.doc-1.0"="1la9fvzrlik4ar3fdaxla5gbwpa2v49xrrwc4wy60i7h80vqv80d"; +"pdfpc-movie.source-1.0"="07lw20wp5cqr0pvjsw3ds75n3hggxgcp9rbvw026lj5k54wik1bv"; +"pdfprivacy-1.0"="1l1nqf4ihwfycnb1x44l1dl2h9f3iy1ppvr0l4zb8qcjqhl4j63y"; +"pdfprivacy.doc-1.0"="15w8jwhksfiv0h2iixk07xvvmk1g2j322xqid753bcyks48xffjz"; +"pdfprivacy.source-1.0"="1nqjj51h0pcrjnybj3cqb8zwi0r1ipzzw8ic2clnf3in88pjzjhs"; +"pdfreview-1.2"="0saxaxhma5gdn150l934y0q8x0nigbcn9r7ixr8rwz4d85g05m9a"; +"pdfreview.doc-1.2"="1kdyc7h2dpr4gjzf9g0rx66gsxaiwran9k7vj8942pr3x2d2jbaa"; +"pdfscreen-1.5"="0kkdnwgwc9z1rqsz8cjsmfjdi3ycwi7n7pl2929yvvwixp10rr6f"; +"pdfscreen.doc-1.5"="1zhg4vqfjjmg4z4blrr2zl6jp7m2c24m5diifgn5j3m8nwxp6m2j"; +"pdfslide-15878"="1za0jp9dbrv0c875zddgcvddlk7gm47crmn97k4zx2s7glx24wj7"; +"pdfslide.doc-15878"="1rv7wbzrlgj55n7r6i9bm1vxjvjr38v67lizmbdcxz1lfqbv0rw1"; +"pdfsync-20373"="1wwndjn0058hflw73y8xfsmnspvaz61r55k96fmsdfb7xfncv1vn"; +"pdfsync.doc-20373"="1dz826gclpf2knrgks0lhvm6rs1xjxqpzgbz4nkv1f8li7379y2q"; +"pdfwin-54074"="1mxfvchz2h9wrybvb0ri4iygwn1ljs2jzsr9hi7j7ych0sjq1c3j"; +"pdfwin.doc-54074"="1wn4fj00lpfw6jvfr3144gjvghdjvqxc13ji6kcf8q18vcdjfcbd"; +"pdfx-1.6.3"="1pim1kiilydijs57zcsd1cnhzvcq5y621fb15hwg9y69s624wjwk"; +"pdfx.doc-1.6.3"="1rb38sw6lyvy24hkdyw7xrbm99bplvcp4cfcdr80pdwf51g10faq"; +"pdfx.source-1.6.3"="1y55s7h2cc39vp36ickpkc8dl42rmq77l1d47h1dxximyihl96x9"; +"pecha-0.1"="1ia3q7gygbg4scgja2qf5p7wbgd429cj78b8ffjcz68vgdg86jjy"; +"pecha.doc-0.1"="07b7kmf1if59nrqnsws5hklv0idjjxwp37a16dbjpcfdirb4s2m0"; +"perltex-2.2"="09vc7pbfjl0zjmbra41p5lmr6l6r4gh2x5h9h5hg1i76n4mfkd8d"; +"perltex.doc-2.2"="0sndaglhb92b4jvp0jzpvdiwzc49ijh309aysahrw0pwkdl2lv5d"; +"perltex.source-2.2"="14rv37h9qwgba7dqq8zzvm0dc9y4hmyr6yvvkfbh2il5zs7m8nrn"; +"permute-15878"="17ky79fz5pb9xr4gwrfpnpxj16mzj6f3wnh9dfhddzlmbllw1djs"; +"permute.doc-15878"="0m83nafyxbixsyg37ia535h3axvf2vp6ky0yg1xcv8ppsl72fd8m"; +"permute.source-15878"="0k1h40himliydiqssvmzl18g28w0hfsxc6kv7wn1q41sm54knhay"; +"petiteannonce-1.0001"="0xvpw8lh1zlkc89chbyjsfszr7ix06afh1fajp5iiqiyxb021v7y"; +"petiteannonce.doc-1.0001"="0nnf9bw4jdm3w28957bdfsl9z94a3dxz5kvmjrg0jkrp3r3cyrgv"; +"phffullpagefigure-1.0"="10vdd225whr0y166xbfc8qbm39vmw3ksvcjm7ylkafyp670ckc3a"; +"phffullpagefigure.doc-1.0"="008q8mf85s4dfbjxbc0k9zpwazbvhbfcc0hqvn679v23kxgfphnx"; +"phffullpagefigure.source-1.0"="1xwiygkhf3ggmgl21dsqmpq6238whn20wzhwn8znhh9sxwa58pyl"; +"phfnote-1.0"="0sik9q24cr32xc3v88rbfqp9q6whv8pr2acg95g94r2nh800ldml"; +"phfnote.doc-1.0"="0rdzcdp6xax2p15ilqpk6yc84rag379ik6zivqh9aivcmpsl8ak9"; +"phfnote.source-1.0"="1lf2g3ka3090s9pwv6kryqzczw3bnrrm9g1f826bdr5ic83k85w7"; +"phfparen-1.0"="00is93n463f5iv4gxd18sc3w338h6a38xahrd1r5j8mv2d419wq2"; +"phfparen.doc-1.0"="10ninpjl9ij19kw8y8pvbma34b1y462qdigpslid2g3gyagkrs8v"; +"phfparen.source-1.0"="00bd1j7zn84d0lfkw08mc93q2ayg7j7bq9klcvvcd5m189spj30h"; +"phfqit-2.0"="10m4s3xsyg57dpxnlsxfr6wrr05p2jny6rw386dhgy8dxc1pdazq"; +"phfqit.doc-2.0"="00kr0rirmjkhhbdvwifzxwj0ifbj82kh59skfxpcls0kd08kd74l"; +"phfqit.source-2.0"="1mshxyi4yplr0hc0sfssjm27mi0dr59zkhf4gar3a12y831c4m36"; +"phfquotetext-1.0"="01na6w8kspl4i0i1s4cgnl4r5fdcybqxx7mzdd6mwbd24mh971a2"; +"phfquotetext.doc-1.0"="091rcqssy0snh6m0z2pwpflfvvf7fsrriyb9lq0f5pnpqqhya8ds"; +"phfquotetext.source-1.0"="07q96xkawcsiipr87nbwfawkcqmgch8h695gg8wlq091q2wrp452"; +"phfsvnwatermark-1.0"="1jmq6l0hb895bfqh2qycxpimwdgp44c64cyxs3vnfzxsb4ii4sz8"; +"phfsvnwatermark.doc-1.0"="0bcj2m5x107sswwg54zhyfdfdhxn14klnxkvb1hc56qi4wc4vkwy"; +"phfsvnwatermark.source-1.0"="1q2l9w8lll3i4bjna6csx4kdpai58i25gn1yn0z4p0pbzqvi08xp"; +"phfthm-1.0"="057x1rjr18yw83gsrp9gvgzk3vq95dr2z3pjrdaq3rm0j9m3a2vd"; +"phfthm.doc-1.0"="1xr1588xc5pmnmcxjxpym4qhsq1h8cc08b4b6vyw7w0z5a304z2z"; +"phfthm.source-1.0"="1n33br6n6ffzksqri0xskyj9x9q93lgzr7cy7rsn0c2aksnmca4l"; +"philex-1.3"="01m80gaawlxnga76rkqwwrg9bg0szyd3qi0d3zyvk1n41h6inijx"; +"philex.doc-1.3"="12s81zvlsddzscvlwqm080y6iv1wm5vrffp9aqdlkpcf0fwlriva"; +"phonenumbers-2.2"="1npdf1am3604gk6anrwpkcsjcchg7cb7m6gqijp53mw64mbka1jy"; +"phonenumbers.doc-2.2"="0p1k4i67rvn1458gnlq49v79m5rjadjsvifabjzz1clww4dxlnmp"; +"photo-18739"="0d9mkavi2x4wha1c9zi2fswv7vsi4hr0588gj82vwmwlrb6v8gsa"; +"photo.doc-18739"="0xnxkv1rkz4c7wh7dm8rna2g2zf9i97aaajlfqsr6ls1d9by4zn2"; +"photo.source-18739"="0vxja102ajrygarqfg0y7bmmhx2my66dlnfp7rsc4kldi1g2fs3j"; +"picture-1.6"="1i2775x39n5vxspy555rwn86384yyapl70kcfir96prp1846rfjd"; +"picture.doc-1.6"="09gid4bb2wbmaqday94qj4r44cpk57rxpzg6grdcjg4y1dkjph0b"; +"picture.source-1.6"="150wv3jb6hspwhkjnbxff5izskvqfvhvqxbw773qikjjxsaidqgb"; +"piff-21894"="1q0xdl6ip1706wxprpd85vycyksbnn1ws091gvmpdhn6as4fxg9i"; +"piff.doc-21894"="1sa2l82yndb9pl8bfmnna20ackv9rxp7y6ljjyix3bpksqp20rwq"; +"pkgloader-0.7.0"="1vmpxv6x2dq9b4ddj3xxqzkxz213bvz7qn24jlx04svdrq0cnpjn"; +"pkgloader.doc-0.7.0"="064qsri65nyy25sz8y9avpxyg3rzcspjr1cfc5jp0vfd07905zix"; +"plantslabels-1.0"="16hzr9zavc26mqddsq4yzb2y60r2lh1yjlna1qyaxqrq7fr76g1z"; +"plantslabels.doc-1.0"="0pvy9gaarrwr4f0bzdhj3xgisfmpd73rfcv9mlw87k3l9y2vly0f"; +"plates-0.1"="1238w5267spw6liidzxd550hjdjxsg3d1231l9vf5fmcifllsnmg"; +"plates.doc-0.1"="0w1jn22gd938zqifhbiikgggbly2fjhiwjdh2jq66yax7p76pjc3"; +"plweb-3.0"="0yimmz965gsb0ddvq3ck28x73p9fn08c42f4331088130l43dkx5"; +"plweb.doc-3.0"="0ad3z41r1a3wkwr7lr9hf7n4bcas10fdjky7f9ykam0244r5q4pw"; +"plweb.source-3.0"="1zpnyzxf125qqz6j3m2182yn71nkrlaan1qfwl98v020iia6vyv1"; +"pmboxdraw-1.4"="0a1mp38f2562yq3nzv39ffwhnzwpamy74pvqnigg7hv2v7blkijh"; +"pmboxdraw.doc-1.4"="07f1n2wpfqrd62agh0ddw67fnl5qczw16640h3v5x7yw31dx4n29"; +"pmboxdraw.source-1.4"="0mqg8xkhqy18m2sbp2i2sv58n2hxf05qr215kbmh0b53lbp16pzc"; +"polynom-0.19"="0vn9k3vci15lq0f6r2354ag4bs55jcq6571wvz3k4daym5ka57s1"; +"polynom.doc-0.19"="1cxsw0b5vxy191xy5clf15hb2cpyyqj5ipvgcw9n0hm8ka3g9l1i"; +"polynom.source-0.19"="0qh4w6q9qch3r41ps38yzlv850wcqvf6b0b6vqirk9lq978k387i"; +"polynomial-1.0"="10w1vq7101hnp2ifaa0j9mfccg9y4s3cyms4m63sx54lbpj6rc1r"; +"polynomial.doc-1.0"="1vn0i77hzr72xkj6ka4r8n0g0nbz382z729v269x6p5j9qqmiz21"; +"polynomial.source-1.0"="0hsb8yyk6ssih7fpc6qiwaf40cwn8xx4jgwqgpmfgkc0x1qkpri2"; +"polytable-0.8.6"="02gsan2wakxsw1niq6l82ag2rkkasi1nclf5yad2kl6c5654gp47"; +"polytable.doc-0.8.6"="03k3qz08bfqjyw4ymmibabbaciqz3srd2hll9np7xdphjhf4d2i2"; +"polytable.source-0.8.6"="1sh5wsb5i1f60sqdych0b3zjcli2h4g46znb0q6n68r4ma7xqixm"; +"postcards-21641"="1glfwj94drccwmmsx6icc9vyzq7w8kvq6flkkbg1bp0rrkjf448j"; +"postcards.doc-21641"="0cvhgz34mplpjzzdpy2bxblmz6qxxlshadj8in810g3y22v39khl"; +"poster-mac-1.1"="1b1zq9ay8fxqn9593f8n10zlkirw2b0piic71b9fx6s9a7x82w7a"; +"poster-mac.doc-1.1"="0wc0194ixbrl722a0djm704fmbf49p7vxk5fyv6d3gyznja54fxz"; +"powerdot-1.6"="0m81n5syr8p99wn8x0yf6h3qjc9n5rdmlrd0mg778m2ccmjzim82"; +"powerdot.doc-1.6"="0npmh2sld6kgjnylv9bbrm01ff877mi86qj83kc14bcs1wf8709l"; +"powerdot.source-1.6"="075ab8yw6pdxgr1h1dxw9wicmdhzlhlvqhja4z07j43x2f6cvbjc"; +"ppr-prv-0.13c"="05xs41xfm5hjpx9dzrngaj824rr8cpwcpvzxsyp1xpzlsv3gk1m4"; +"ppr-prv.doc-0.13c"="0rfrxzfm34kn4sgj1dzvdyjx7s7nkyjc785j7pgb609svld6jvyk"; +"ppr-prv.source-0.13c"="0miijdgcsn709kpp0zjyqxyxfgk0f798v748brmqshb6mfxbryzn"; +"practicalreports-2.0.3"="0rv5rsba1xdwcv89fl640yyqqk8c8vf2w647yqz8xawm358la42n"; +"practicalreports.doc-2.0.3"="1a7p22pkmb365haizgg3ainxlr2626mg6p9962cy0933hb59llcv"; +"prelim2e-2.00"="0fws0ssw09yzmzlvkz4sl571yi6yvynnr91s76vsfxk9xrzvkb98"; +"prelim2e.doc-2.00"="0madkchnll3aymjfk002ika9awnxqwglwa30mrvbdd3rvghqnm53"; +"prelim2e.source-2.00"="1bbcnrlhvqldvacxms4jclk5khh618wqkkyyib1fz2c93maxmz6g"; +"preprint-2011"="0qs03jsxjp1cl48lxnvzh7p3pnpxfv8143979pknr06r24g25csd"; +"preprint.doc-2011"="0zkaw9x3ziwddsv03acbmc02isp74ikpdva2azzsl1nzk0c3qs3d"; +"preprint.source-2011"="0y0mk3118yrm95bn22hdwn9qay3j7j1ijkr30hpysf9l11z5ck2c"; +"pressrelease-1.0"="0hrx80i1nfwyhhda415v67qxkgj6fqbg4bicirdn749bwc0anhar"; +"pressrelease.doc-1.0"="05spvrh6dfq16z9jlswzqrwnscnywp482cv3bhak4vavbxs8bf35"; +"pressrelease.source-1.0"="1c7nhvaxs4xlycsx2n6bkyy6rhnzc9ddcnw6cccpgilds546ns4v"; +"prettyref-3.0"="0akbp6wsxn4swk0kwxw27x3lpf5anwk49bb8pvssaj4xy68hyq1h"; +"prettyref.doc-3.0"="1wmvvsz7y0idwfki553qkfhg8j7k5h79nlhmaz6ln448x8gym8y8"; +"prettyref.source-3.0"="1w9qckaw403a8nyqyx8qyqdn3zfkxzgfzj1hdw5vwi2805bbfy1f"; +"preview-12.3"="1jfhsdygkfnsf454rgsvgdh15vi4qa9yhlm7h2chkaid8rq5ig69"; +"preview.doc-12.3"="11xcl7k24ymm12g3s8g3qkwldn6w60km0rvq5xc3draim95qs254"; +"preview.source-12.3"="1hvvv7qbmq47kx94jxyrkwqi8lv95z7khk6hb808kwyjkrq5jzg2"; +"printlen-1.1a"="1h6q95dvpldmrfbpdv9v19p34iwq3jzz7vs0z7b6fnijyybjxnpm"; +"printlen.doc-1.1a"="08p9zwkgjpkh7ip3i54qjdazgnwq79v15hvz4j4y2dvh294nmrgn"; +"probsoln-3.05"="15zsh16v5rs0baqvy9jwn59d95qj6glvc5h054ldb8sy5nwkl3sk"; +"probsoln.doc-3.05"="1l5mq047bpdg21mjdjwfs6ghdh1cb19bf9y5939nlw1wyy1flcfk"; +"probsoln.source-3.05"="1lzai2ynjnfinf38jdqb0bdccrh58jbhnwnpm9ikskxpzy7v262d"; +"program-3.3.14"="0ay2z8ga10zr5p453ss0w5qqqyknsgqd2hifa7lq0gih4rml14pa"; +"program.doc-3.3.14"="102c9fir3hn0m7y3lkj9j0vwf0srbv6inq87lcxwfkvc7yw0rr2m"; +"progress-1.10"="0wgkyvyf24666kg79h7wq1piq6yq2nkw6k5g0ydk3y4gwzzkfhlz"; +"progress.doc-1.10"="0r303dr6yf1r5kk38c1njjra7vgvp9qrblxj7zd8fw1vlq2sc7fg"; +"progressbar-1.0b-4"="1d0d6dy9ssiij19s259d2ns2k5v2ccc45anhz1qm7iqli12ij0m3"; +"progressbar.doc-1.0b-4"="0bxsgvql8hqv4qw1pv18vdxcshphdpbb29mqp3pbbsd4crp4qb5z"; +"proofread-1.04"="0gnn7zkzrszglcqcwz8c4i13apildg7s93rkp1z3h5m2gr9w9v42"; +"proofread.doc-1.04"="05g3k77vczdqk19gigs9b6w8rccvcr0d382ysqn0yg6cgd70bi43"; +"proofread.source-1.04"="1mggrm4cfji364ylra3ffdhwbx6phcxwfzw2mwls00msk7jdzpsg"; +"properties-0.2"="1pxl101mc318ivzszyycwb79rqghx4x8xr9fvq216ambs7gq4sji"; +"properties.doc-0.2"="1arkdafwmhg0hm11as4mb75pjz2mnah1l5msy5xnlk4asbwfc4sb"; +"prosper-1.0h"="1vsjb2r4xnlwwdjbnkpvl42c86rkzs2imsq762n2w6x41i591ics"; +"prosper.doc-1.0h"="1f5w1vb4d7z990mz6iicjakqhszcwirphwv966c66j2jc3yvalfn"; +"protex-41633"="0i3dvmvyxfwjrp6fy5bl1kx2c9vapj19vs97jg3rkfrkdbk0mhdc"; +"protex.doc-41633"="0wpkhhp2asi3761nvl5gp53j3vr4iakfy4rhciv5l1z4gw7d4j29"; +"protocol-1.13"="0kv4ndgdfmwah88sspp4maca6z1l39fg41bf803kapp34nfxqggr"; +"protocol.doc-1.13"="0mz77awxgv9jk97xnl16rs34b1zdqldfi3m2qgdi9y3synrn25x7"; +"protocol.source-1.13"="0q0vxm79xpxkgr7yf12mqkpj69b75smyr9kl5jw2c1j1wqxzxh16"; +"psfragx-1.1"="1kb769ai57d7zg3bp0r0mspz0a2l87qiyg04a87iqk7vxrwv0bd7"; +"psfragx.doc-1.1"="110n7a7jgfmzps5ng4gibxigmm3dpkqlz6jpbnphrw1pnlskwjsv"; +"psfragx.source-1.1"="180yrq0rnsb9cd8j70jym06k543q211fzzswzg0dq8fzn3hk2wwh"; +"pstool-1.5e"="1g8pmd13f73v8bsrcpf4a6hh00pww6isz00gj8cxnj0xnd4p9xwf"; +"pstool.doc-1.5e"="0vwxrcm29w8fiw4mmr5jcxrlc122k4s1wg1sqvmzqypwpvyls59c"; +"pstring-42857"="1f7a26xxxzwfgprhzxq4ay597sln18hjk8cmlzjy342jy45g6dpj"; +"pstring.doc-42857"="0ngxd95s8lzpsgirgrq4dg0p1dwh4l0gs99nhich12v6l19jd29b"; +"pxgreeks-1.0"="1j93gwgk66k3fwkhraapis7ddj8a4bliqh783psdv1054j5fspqi"; +"pxgreeks.doc-1.0"="1md7q2q0b2lhffjm39cxzxf86rw8759zxwj5sbgavzdhyc70ssli"; +"pxgreeks.source-1.0"="04vdi4wf7lw15v05jqycm66j1iiy6g13qrc1ynrnq0df8b0zfs1g"; +"pygmentex-0.10"="12byiwqxbg46wajl8qd55qp5khr0dmpmq38vkv75anc8ffap306c"; +"pygmentex.doc-0.10"="14nv8i6vnpjhdfs09ba0lwqhf1ndfxkhm5p81lfliy7mlpqgqi60"; +"python-0.21"="0qi09d9zyqfimr5p3jlzs2xbhz0gbxz2g5v8vszx0k7ysn791f4m"; +"python.doc-0.21"="0x1nfbv7fmyhzhgy6xsndhd9nja8xbip436kg7ygscjxml6gibgh"; +"qcm-2.1"="17pryjm0r6w559lgkf03aws720zsap95azfbixm7p8lr1gy5nwlq"; +"qcm.doc-2.1"="0wx14xsj4sy6xpcs87bji6xfarfhlzqdzgyyx2p8439m6ay3cpx1"; +"qcm.source-2.1"="1gsfa9bby33a5qgi4p2awr91gn8p4d2qylz32xmzhp0x6fpqhig3"; +"qstest-15878"="1xk4vqqics2iwzxck416za70cksx836qrsm4v8idyg9kscvjr1jp"; +"qstest.doc-15878"="19ddnrz4wjd51h8g0z40db53wh0zlr6m1nfczghc5b26vvcj14y0"; +"qstest.source-15878"="198xvadvk9fb36kxzv1wpis5qb38dqaxsqva6l7l23kz3sb6k849"; +"qsymbols-15878"="11jlwr2pwrxck0xcw2szql0rdynjr2pk4jgzlqkpcardibfr385x"; +"qsymbols.doc-15878"="078qxbmv1zgg73a923sbfqnwmdwg1qkfxra5r8dzi8wlq1cv29ii"; +"qsymbols.source-15878"="01lmlclv9rlkga19mw4ikngdpkxhmhq77kylln8kjhcpa1cylk5c"; +"quicktype-0.1"="16qy6rxxkdkkli1knibhbm28jg80l0qjsn9lsb36b7z5xwxj9f21"; +"quicktype.doc-0.1"="0ic0lkhj3rdpwfsrysm5qidw0gby11kmfnzbh5k2fpkfarwfhxxb"; +"quiz2socrative-1.0"="1s6g0svlkg503r5mqn3iw90qyw5lwpv7dj92yck7ymziv9p59qkz"; +"quiz2socrative.doc-1.0"="0v9x0jxrgiscblh8w9wip07di78glgzd0rn2fp1hpzabi8x94dvc"; +"quotchap-1.3"="1284ldj6pfqq6mz2a62pi81k1jca8xkc6wa1wbrv3kqwfdcc8cwa"; +"quotchap.doc-1.3"="1bnhvp91adi4bhzwddzl16qw6d74in94jq2h16lk06aakcwr72hd"; +"quotchap.source-1.3"="1g2cfb5j1qjqads2m9ad9a8n0j7ihrvd55q9b56jd141a23layb6"; +"quoting-0.1c"="1sghajwgfdc1p0gifii8wz1rvzsiy38f4jpfmh5pys9w6nr9a8bj"; +"quoting.doc-0.1c"="0aknicilv5rn3claf77l5br5mr21yg1dhdc1j1yxigz9k8pljzm6"; +"quoting.source-0.1c"="1h01p11ahr4ykqnhgl0kwc5i68mw9wznswrxy9ab5rpma1agjkzp"; +"quotmark-1.0"="1v48482b57w6f1cx0b5av9cq26zhgcqkwi8yllnl9p8pnrjngc9x"; +"quotmark.doc-1.0"="1jmdv5i67hsbmybjr8j2sv7f7z8bm3a30yy0ycyp6b5c3ycqx04n"; +"quotmark.source-1.0"="02bg50nj945gycxf8kb7s9c87xwszprq3zynrxxpzixrxqd06pf3"; +"ran_toks-57520"="14i202062jq45h0dcwr7pkxpw1crjklwrvv2fbl2p7c9wpd3ch73"; +"ran_toks.doc-57520"="07xs3spnmv4623i61gij565l7asl85519163b2470bidy152p034"; +"ran_toks.source-57520"="01jv80p4hbl4idffr6b9g567wqzwdvlklkjb05kh1360d708lkcv"; +"randtext-15878"="11a4j40zaixjklf4rkzb17cxnfmm6lp9kph3kkp2kalz41qamc0k"; +"randtext.doc-15878"="1g8nwiz06w4a1sdvdfch5yavar11mj5xpk631n5ym2d5g7hp0dm9"; +"rccol-1.2c"="04nw4h7z4k4rnvqh5s602l8h05n85iri3p3cpic4ss71ccn8c2dw"; +"rccol.doc-1.2c"="0q3qb0sbhnbqwgc0i9bw27s317rbz05k6pmvhad3m8mvlsbgh285"; +"rccol.source-1.2c"="0ss2436k5fbd25cynhw13lq4ns4payl8fi8lc96vi0kvn6jmkwrq"; +"rcs-multi-0.1a"="1n60pzx6qrbabksj2aqqf1j4i1b298ldsyjg8z6pmhladq2r3ia2"; +"rcs-multi.doc-0.1a"="06lqyy8igbiyl86b8fsl968sv94xcnl1amppyf8hmr52dhdqcysc"; +"rcs-multi.source-0.1a"="1pdds0kh3p3rkdn2nrpyfrw224q3rfnahypif8n0aijkcxdlw3w0"; +"rcsinfo-1.11"="04j1sq20960w5yyf37pnzvwaknl8f18mx6rmj2s2vch8bcncdzjh"; +"rcsinfo.doc-1.11"="02zyrgcd0m77xp5p95v63b58mv0h0miqlziagwv1rz3ywvmgwhk7"; +"rcsinfo.source-1.11"="1fgmppgp0n4arrilxmrjn7h7pf5jq7gm6drdz6njq8w1l1qxlxg7"; +"readablecv-3.0"="1za8mnyi0vvwfn1i4wcrmba904jxi805f0v3507nfav55h1x343x"; +"readablecv.doc-3.0"="1ixyxxiv5pcyhqx1ddwankc8ymfm83123v8d5i4lpwdr9g9h4jc7"; +"readarray-2.0"="0pcbbbp4q1vqc9p7qwdcml484a03w1836rcr0d33f0rrxy6xgif5"; +"readarray.doc-2.0"="151gnl2p3a45mlrjm2fvql8p6a59alpdfvgykyxwf2dnhpcibz8s"; +"realboxes-0.2"="0xyp6w8kbycaqmrkkrl8701c7shvd9i16vvgs28cvr61nkv3mv4s"; +"realboxes.doc-0.2"="0xd95j7wgv3yzrzq9lvdxpzvvvki2an8kg0zm29yz01m397vmys1"; +"realboxes.source-0.2"="0r0phiq8v15ra9a429j63kyjv3w2p96myr8czijfcb9g4920jvmm"; +"recipe-0.9"="1pnyia45nx32r1ng711k2l3g2h4r6n67nfxvg193z4mz1i20hq85"; +"recipe.doc-0.9"="0hhm5l89naj8vzjnvf2ambpawq7scp9bgpfjzszgb6069c486bvp"; +"recipebook-37026"="0ianmda3ji60acckagmlsmrsvi4sxp3prznvzqkkkvv88w1xbm8n"; +"recipebook.doc-37026"="0fmc59fddgfs4v6lsba04g334xlkhsl1liph7v3yx4qj6l9dxlkp"; +"recipecard-2.0"="195lg2kvww7amwls014s21l2pnyp24c8cfyb3glrxphcvcdhhr6q"; +"recipecard.doc-2.0"="1h13vn2zw880gvzi1pc8j41wa21ygja43hrjmyav4zxziiisrnwq"; +"recipecard.source-2.0"="0fkwvjxjhaywk61j750a05x0s5fgb96q5n3afcq056yf01jbvsxi"; +"rectopma-19980"="1ivjyfhl4g3j1j0xnq31rcnl66z3xwaixyzs8wwmbf1y18lgzyb9"; +"rectopma.doc-19980"="0gfvsjszqrn2r1cm7blk0xnrnv94l1a7ialwhvf733vm1m699lja"; +"refcheck-1.9.1"="0v82jjddvis01n2ngw7yngv4kh2impw77s1yq360sxqjym2m34ng"; +"refcheck.doc-1.9.1"="0ckmd4wnjl0zbyqr5q18whb927sjbz1xgdg1hg5w4ih0g36sra63"; +"refenums-1.1.2"="1dlfd5dx3mqfhn73y04lafcbiprqicv9kfz2ylnd4fhhm62svb7a"; +"refenums.doc-1.1.2"="03d3p9d1f0pr6gk918qiq7p5p6k0cf1zh209akl6a35042a6nms9"; +"reflectgraphics-0.2c"="11kcq0dijnwwxf6d3s0fhk7nfhvn3v36lly2wf21vgsl387dkkaf"; +"reflectgraphics.doc-0.2c"="0iwcljjlk1741kw6cayrbjhqalv74apppw612gh3nhh242nn9bwi"; +"reflectgraphics.source-0.2c"="0hy76c57w4lw0v77qaf064j7xz327fprdijljd7myy02idlszbmv"; +"refman-2.0e"="1adim1622bngp214hsdzjgjkjcv7b24a6aaqzihlms76vfq0hklj"; +"refman.doc-2.0e"="1jpx3yka29lpssvhjl12h1bxj0k996x7a7rf1742wph6w1n5ymmy"; +"refman.source-2.0e"="134hq9c9kdr7rgzmp5jkjccqgfw10zwv33zmj25b91xljn5afc6w"; +"refstyle-0.5"="0nx762gng6bmlrala884r4mjh2vjh4r20yy00bpjzq0il98hs2lh"; +"refstyle.doc-0.5"="16dm6n9mh488li57ighbd3badiavxlmy1ffz2hln6lkd9qp2y6i7"; +"refstyle.source-0.5"="09mxinjwbidd8sr6g8hb4gdq81ifzp67jbw24xc69x82kh48r8pq"; +"regcount-1.0"="19n0gwvh87pb2fanw52rc5j540v9yw10h2r8svczim9sdginy56r"; +"regcount.doc-1.0"="0qnxcyh2vhkylaav056lc2vg24y5h11svzy6hrk6rr3sza9k6z2k"; +"regcount.source-1.0"="1xfk7qs4x302lfi93a1n8nzpsmzmypyb34d8hd7h8y6nm7q2g4y3"; +"regexpatch-0.2f"="0i8dfsr32f4w3lfh88z45sdhvwzqgh52xqfqgj53fvynblpz9msw"; +"regexpatch.doc-0.2f"="0qh2g9sdj971a75dv3jfxi3ga3mf6fmb4azphkdgxmm690dblx35"; +"regexpatch.source-0.2f"="1iq45q093v1n421r37w42815yxjb7iby426a48mvgzyc1c82rd37"; +"register-2.0"="0i084dij80m292c9f57hb0y3gs870520l8awl3wb21ss76vs5501"; +"register.doc-2.0"="0zi950xii9qbscbv5030aw02arc77c8inwxmzkslcmapdqxq5wr4"; +"register.source-2.0"="1jz02c2c5xpinxninb1a2bkgan21gijs48rks4xv17y7k6z9h00v"; +"regstats-1.0h"="0rxapv9sd1i5wvb7ybaq84bjjcy5widjrgsfbkgg2w3zcanb6k61"; +"regstats.doc-1.0h"="08iqkmpa3pg17ik8x49v5xwg8a08806xvp9d2xyamf8ndrcljnh4"; +"regstats.source-1.0h"="00k0b24g1c1kpzpvqka53h6c19pxw5cf4sw0ymgllr21agri6mni"; +"relenc-22050"="13ym795q37rmxhmr0d8834y272si11f0qh7lmhffrpsf4d3bhf74"; +"relenc.doc-22050"="1hb2sdm9lgzfkj2kkbrlb3alnfjq4rw3islgdzkqbcgqp9s06f67"; +"relenc.source-22050"="1gk7nbczw9b897idmsgqx6i8xdmi7wizhb3dyc0hir7qmivaqv6s"; +"relsize-4.1"="06sy6v0jscrj2qs7axm770xv8fkiivvj5lwb8mkf58gd5jwc5bgb"; +"relsize.doc-4.1"="1sgv3x3dky3i7xivh6pzqh3lrqjhb62g0ji0hdgmy9blfrdf3api"; +"repeatindex-0.01"="1z4z6bpfjmgn8mkpcl1rsd9m1jxdx6lx2kz83r43d1ks5zjc6wn7"; +"repeatindex.doc-0.01"="1vcq9vbfw4dwif9q5ki0bq378yd4sg5g2yxr24bjav97shd9iaxk"; +"repltext-1.1"="19h9qfzz9idywv1bi4qpl8yqv73lwj6s6aqxqhb8jlh3b2scp4y7"; +"repltext.doc-1.1"="0nhr1lpbb5nvi7mfzrjxfq7ii2kib8klzcsqg99b4pj3hcwhv93v"; +"repltext.source-1.1"="1phbwgyvdm6a616wzvlc24jm40k4hbyjsnim5g5jr15phlsa6r2f"; +"returntogrid-0.2"="0cfik8imjgrhgilc7005cgy31h1azjk15jrcvd4vpf3g5ml1hpsg"; +"returntogrid.doc-0.2"="1plnz793nhiq9y89x7i51bgp9d18kbi0bpwslg982hf65yklmiwr"; +"rgltxdoc-1.3"="10wpra4vdjvjsq8n6iz33mnl69b13jbslp6ccf5b61va4v66z78l"; +"rgltxdoc.doc-1.3"="0xsz70p88ij6djhlf7n1718fxqcngfxnyl60h3ia0xi1gjzrbk1c"; +"rgltxdoc.source-1.3"="1vzldzdqyiqfaims3a8w378k4bfwxyznmw6028xvwrk7abq1nr4f"; +"rjlparshap-1.0"="1af2a5fmzx1mmk0vprx8w18rqgab0dcm1c7sfvnh7v59lgvkh6rv"; +"rjlparshap.doc-1.0"="1is0ny6a5ndhgl441vrv7ik4i0br90nlcddiabgmshwyn87kiciz"; +"rjlparshap.source-1.0"="19kvfg03r3nr99a9ylk3yr6nnq8r7cvfp3rsi2vi10m19jz60ssl"; +"rlepsf-19082"="0ycf0md4d2bz8003s0q4xi6qdjspi8z1dp5040cm3qm25p7jsrf4"; +"rlepsf.doc-19082"="1asi443gvl34m648ap9j5an6fx5x94s3v4dp8bqvygn615jhd0na"; +"rmpage-0.92"="0y292gcfkj0nk8090iqnlrx9mhvh545im2xms080kz0l1847frpc"; +"rmpage.doc-0.92"="0rq7xjizq8nwg9zk60gjd9vcjvxyc0xaldc4304nyihfjxfyd00b"; +"robustcommand-0.1"="1vxsxdg6122psbplm22l7f193fv7rd3dadcg6ys4ngzy957acvig"; +"robustcommand.doc-0.1"="13d5rsj95yx81bfbansh964dig4hjp5raxagzws58f24l8imvfzn"; +"robustcommand.source-0.1"="1zgnyglhz8i6hgzxlj19kdw31z9kx44zj2vziwkhcpr9clxl8as8"; +"robustindex-49877"="1fl9vr5mynjg8w74sk2jh8vgj5yjpmyhyr107iblmcicgwv1sd9y"; +"robustindex.doc-49877"="0xf592xvmh6xmw08zwwcsn9xyadd9637vicnz95fbfpp03p9qjnq"; +"romanbar-1.0f"="0p4a1g1s22s7jq4ahvpqspx5gkd6nhwifbf1shjp53f38myy0bm5"; +"romanbar.doc-1.0f"="157glkgzh4c5zv15akrlvfl2m03i99hfrm952x919137jkvjbpkd"; +"romanbar.source-1.0f"="0w70p08k9k1bwf9ls4wgnclp4iqj4hzn132ny4s11lzcaj4v8p5l"; +"romanbarpagenumber-1.0"="0m2772qfl5862l6m81rrx4xcbj1s7vhk9x0ywsqnr8qxl1kmv3h3"; +"romanbarpagenumber.doc-1.0"="0mj7kh8jvhscc4clf2199594994xdx557q0nnsk95srwmncq8f50"; +"romanbarpagenumber.source-1.0"="0hq151qq6wb0q1xhbq6jqzxfh3zss9iyya5wxv883a8pd79rancj"; +"romanneg-20087"="0y9nlxbjyiwivw9jkc0vz0lj3b0nvj9dcd4sj0gxgxa1dg853rlp"; +"romanneg.doc-20087"="0bi3b9991x1pvh8s8yrw5031jkvvwkrwah78qfd5rlywh2ylnrr4"; +"romannum-1.0b"="15zjf8wbjif83vnib3y6vqxc138aplb93nfkh95wl2rmahaigmw5"; +"romannum.doc-1.0b"="0a8zsbh28jl761ir6is1l05n9jyvzr31y86qwaa714yxwpzak0s4"; +"romannum.source-1.0b"="1gnvnj1l88l66mrhvd50cx44wws4a45708jmrncb5mnf0i6v7ci5"; +"rotfloat-1.2"="01ycgag2ip0kxdsaymfcndmbhfcc95ppkmwhm3imryibm9112bv3"; +"rotfloat.doc-1.2"="17x7jdnrnm333cq706cdkgzcyscq1k162l0rg3qgvknig6991v64"; +"rotfloat.source-1.2"="0ymb6xbsqqj91b9vkfzdab1ip0xqqj72zm1kd812gjgkpgxc3jfv"; +"rotpages-3.0"="1pqfkyqs8ymfqsvq35cpv438g8a3az6sajh2bszxncl7m3rqa10d"; +"rotpages.doc-3.0"="069jlj27xa7vnl83bx5m4k79lky0ayvcl13gqxlk8an5kdwmdr3j"; +"roundbox-0.2"="0607rknc69dnzwajmgaq1n8ixv884bqp5n9m1g6n2d9frmmh057i"; +"roundbox.doc-0.2"="1vyna8wndg79vman54sv24hbdlv2jnrdkiwyxgzcwc2zv29asxs9"; +"rterface-30084"="0wlscg6lhqar791sz1d63mnprxvaqvjx0mfk1pi1c2zsk0lnpghs"; +"rterface.doc-30084"="1ghwg489y801j2c1s5c7qpv9yyh4g6higapzjw95nmmyf32aka0h"; +"rtkinenc-1.0"="0q024qcai2slxd0ral92pzzl4apqn5gr8gj3vw7whz7432m4z7gj"; +"rtkinenc.doc-1.0"="0kr27a2294bj80f3qria15bjpsvgifgaj27zv9wj11rqr5g4zm7g"; +"rtkinenc.source-1.0"="1kwg3qbk2ldq5mirpvg0cmhd3nyz79jfdbw7y37s2c86g3c5j0i1"; +"rulerbox-1.01"="0srxrij0sxvm04n6zk4vq4qqmxbjz3v425nx191z96fpjcssx2cn"; +"rulerbox.doc-1.01"="030wrw1ry800yixlgb11xbm5834njv3ad9gl4jv08x1pxkj29vcp"; +"rulercompass-1"="0ky611n65rvaii9b5ic498p7divfm71h843bv9h70v363mki9a0q"; +"rulercompass.doc-1"="0wqgnb9czbmymzmv7j48lgdv8s280id5sh8mwv6p0jqn69zcpdd8"; +"rulercompass.source-1"="19943zfp2rm3gdm6w5db01w6r1nl0kn4zkrnnxg4ic4n3gvv76px"; +"runcode-1.0"="0fa32j3ippwdfg7sh02nhnjb1ajmdfa39nm15rb7ss11v7167da6"; +"runcode.doc-1.0"="1j7mf48wdpl23d84rwkmb13c8rjvi4c7v7gvk07rl92xg8pc9vzg"; +"rvwrite-1.2"="0gb5j3hn1s28ar9d30g158xfc2vaavhm8cbmivr1ba32njdmmqcq"; +"rvwrite.doc-1.2"="09n9p9q4pjil70ydk9cjh2gqxdslnhrg9avfhj0vvfacknbmh312"; +"sanitize-umlaut-1.10"="1bzm60z3gyd3s75dc8n7z7rjqr05713lna6i1z9l55fqnbxz0m9g"; +"sanitize-umlaut.doc-1.10"="04vgqh10ydvincbfiqfq5cb77f9mqdlpjgbr8a2dhnb7v02pfiag"; +"savefnmark-1.0"="09i4rxdm2agj06fwggg9jznjwdgvqlafhmf8krncc6vsj8h4ih8n"; +"savefnmark.doc-1.0"="07w3im9nz2s72p502gzryyrccj4g980axvihrk5b5b3w0qzlpn4b"; +"savefnmark.source-1.0"="0wdb9xsrfddi3sw3g4gppv7vn70f3czjplgbr7pj1hna8grig5p8"; +"savesym-1.2"="18z0xwarbkb6cm7n29wasa04d92g2pirlzsr0icnzfip2f4j7524"; +"savetrees-2.4"="0bzr06y314xa1r105vrc9nd37akqcsq58j0qxzlyhc8jvbji9ajc"; +"savetrees.doc-2.4"="0c00z409by0qp0if8ccrah81601w8njlsdylj42achqr1f9q8rvg"; +"savetrees.source-2.4"="101p1q1in7qp2nrkz48c7wqfdrg6mj7iqxwg44aqaib1wb27g5ak"; +"scale-1.1.2"="0al9axcipchrzc9a3dscmv3yvzwz2388w8knr4vw51mn72ws12jj"; +"scale.doc-1.1.2"="1fbbdksmcrd91sixwkkgljnbk08i9jfhc751vzggrj87l38ym67c"; +"scale.source-1.1.2"="19nfy1dcq5bd23dnl9aa8jimyif5sil9lf8b4hspyq7cvzcjcplm"; +"scalebar-1.0"="1q9jqf46j12f9rav2j4ngr52pqfyrc4h9xj66cgb3mcc7nqgmc4w"; +"scalebar.doc-1.0"="042xgbjlibp1273400sg7p6fzdzbnv344dgnrs3y93gk6g7vf8k6"; +"scalebar.source-1.0"="088k5a86279b7iwci0wzxv5wnqifqiwc5kc85701987x5qiaajhm"; +"scalerel-1.8"="0b4ppffs7zcg3y6i3c6dnjb2rl1xm5rz7k5mxm08qj4dpdhyjfpi"; +"scalerel.doc-1.8"="1js1z2fkxy7ixh069hmg5cxm33xjwwg002y64m32wj4ldb7shfk8"; +"scanpages-1.05a"="15q22kfwbw6scnx8q9dj3p0hr0m86lj2asy9fp9s0a15xsbhq1is"; +"scanpages.doc-1.05a"="03lpz3836rwk5nk2sbbyv9s0kvjbw5ld9cvw1n40b5hggivc2sgf"; +"schedule-1.20"="1p36glmixr7qadjj91j9rlzph03rp8hfrrfdqcg1ayyzkinr9a6i"; +"schedule.doc-1.20"="198yxgq4255q9bqjj141d5rvzjxq4rw1363gcwy40yagqs4xhxs1"; +"schedule.source-1.20"="1gc4zpw7ylnnv9k9kbqjf8r83srxbiqmqyy10xnp8gx7xrnbmnyx"; +"schooldocs-1.0"="11pf882l3rp7h14l2w2j3b2gcmxwf6bqv5kc23shzyl4008xx3gs"; +"schooldocs.doc-1.0"="08cswnn7fh5j260f3vyix22x8i6l12waj3z9pfliij8kr39j77w6"; +"schooldocs.source-1.0"="1zijm0iwqcpzrl4ixzmd9dbg0q78nhz6r4rc4ydr9w06xsr4w4g6"; +"scontents-1.9"="0jjc5q254c4qqvhv23r6f92dqh8fgza9kas6vpc7j9kiklkjilmd"; +"scontents.doc-1.9"="1l1206yvlyf59hcjf8y3gsanwxims96jp4k52g3wbr0pqgq3dfh6"; +"scontents.source-1.9"="04wzz12zh694ds8p7x2rmymg352ahkf5hcx1xacz3craf3p0sjcc"; +"scrlayer-fancyhdr-0.2.1"="1fzlwlzkqhzdhnz2gdh399a6kmp9f3czd96s6ydl0k5v47zph90a"; +"scrlayer-fancyhdr.doc-0.2.1"="0y37kwqsaci2wpklz2xhkh7x1f1v1ql84sx90ssd6fpq8saf25za"; +"scrlayer-fancyhdr.source-0.2.1"="0dvilqmf5xfq0djxy0mv8q1bhr94v5m765a6iz3bniyr585zgrvw"; +"scrlttr2copy-0.3a"="1as8ipxhssfx4hqa4s246gfim09nl35dx1wanfc6p0yk79nm5lz1"; +"scrlttr2copy.doc-0.3a"="0hsyiicb359blk6m4kj5gddlzwphxr12hbrwbp34cjfzkbh5ib5m"; +"sdaps-1.9.8"="13n084nchrk9awap3bnywd9b7qnq5zvka71vp96h1yibry4n6qq5"; +"sdaps.doc-1.9.8"="03nbkcb3rjmgnirdyqn6pp85qbqg8p591n2412zxhvjmd74x1295"; +"sdaps.source-1.9.8"="1dggzllm84lpqcl0zbrk9j4hdb1d369rr9wpilk5zjff6p7nvch7"; +"sdrt-1.0"="15p0i40aa82f9lgdiy7wn5vbkbb4z5hzmmr4g52w6jisx8c1w45v"; +"sdrt.doc-1.0"="0y1gxcyms3wprp47y2mlfcc68gijyvyc6h10ivif1yydmxq1b2ki"; +"secdot-1.0"="0pnimi0vfgp5zsp0iwak0r0j562w59cl1fn3pnp1gwjz65q2229i"; +"secdot.doc-1.0"="1v8j3l2bh055b18zxl3287ardn0ns5qjgbqkj08qxz5ls912y2br"; +"secnum-53657"="1xp02rh3wxix7hx05avjxxphzmcqpwhalmzm0mw4rrhwp5jwaajw"; +"secnum.doc-53657"="16m37g00k226wfi1zjdw6yhdvxcwjlzhzz8lbyc53fk17q8k9dzm"; +"secnum.source-53657"="1g0cnxa3xd3lbrwl7pcappnw8mx5ihig7pd47ffxsscdg4h8vvav"; +"sectionbox-1.01"="178z63iys35al6g5lavqgdd1lcadha9rp25bzm41gyg84f2hpljk"; +"sectionbox.doc-1.01"="0mk0ijbrvmvky4awh03y2q14ks4x9hr2pa84ia0380xfx56849kp"; +"sectionbreak-0.1d"="097mwp2iqg6rk1xxlppqnks0j1k45b0hlrg84x12y0cgrkd7cdbn"; +"sectionbreak.doc-0.1d"="0kmfpgcga24kpzm9kwc066a6m4kzw2sfkhr815yc0y2a1agj3zfw"; +"sectsty-2.0.2"="03ixlxxs2ss5lrmkcwilrzi7r46krh21rli07y2j79p8l23n7vrh"; +"sectsty.doc-2.0.2"="12xkczxiw3spyljn1ay9z0xrxdg9ziidnyryri4pkmsh5k60wxw8"; +"sectsty.source-2.0.2"="0h94wh43pf8bphafhcmpsjzj26592c30pih0x3p7csv8dwbv6js4"; +"seealso-1.2"="1mqy9br1fz73q2l6czmhly8j6dnw51d50dkfh9622793z0a2cl71"; +"seealso.doc-1.2"="13sg11r8d8bd9gmscprqai5lbjwfvr17ida17836zagz83b6y16k"; +"seealso.source-1.2"="1yv4zwq6aic2wb5wiz2564mh531i34r9sl87y07yk1ad89kgjbv0"; +"selectp-1.0"="16kcbpvjsdc1ndhhflfmnz0igjyjc5k62gcfly447w7d13qsg2s6"; +"selectp.doc-1.0"="1frpv5dbxfg708xp03hs4vkgqsxjihn3yk3qvcpns6awjlfi2n9d"; +"selinput-1.6"="13pxqr1mzkblniv9rcrr5aslx887xjahjj9f27h7hpx6r4g7hk17"; +"selinput.doc-1.6"="0pbqch586hfwfjbm68g7i56d0jcgg6w26k6g2qlfdbk8mjpc4r4v"; +"selinput.source-1.6"="0na8byym8s2y2jyi1691cnw46izri0y6ybf3g0pmil2hpxy544ry"; +"semantex-0.463"="17qb4jzxx41ixcq8xdvn96qxj7y5hdcjky05lq52d99mrr48d9g8"; +"semantex.doc-0.463"="0qzw56k0lj5kqi4vc2znwsnf3wp9c1hdmc3n3mq9yhbbf5vgbblg"; +"semtex-0.45"="151sfla597g5n0nv676sbv5m4kfpmjli7ddhd1yzsiqa3axw7vhm"; +"semtex.doc-0.45"="1mm9ya9ls0ryfxzkss3lfmslw9wrbcq9d5abf022ifbs5184rgnr"; +"semantic-2.0"="1vf341vlmgc00d6srdwjm0a2spad674439ml9k6ir24pll39ia73"; +"semantic.doc-2.0"="0rr5kbn1yzil4h0j42v48m4mkqk8rzwcn05rkn8vs2s13az6djna"; +"semantic.source-2.0"="0x2qal3q0m886lw5xd9w200fkq4hn34qs2kqsr7i7dcq9xwl57qp"; +"semantic-markup-53607"="10ahkdiwm4h5mwigkzgjiq2xmy1lzgjdif11zajwckv2xng5ckgc"; +"semantic-markup.doc-53607"="14gv3pgdyjjjj8l8vfa2pgzafyqlq0666hbk0cz6497g99z4ga15"; +"semesterplanner-1.0"="1d69y3s4hhv0lpf4ljxg7r5zg0g1fhjw9b30hhpkxvsbfdbl030p"; +"semesterplanner.doc-1.0"="1a7a927gwspc21drqqb72rymyncip4b15w4q9cy654zdp16b5i10"; +"semesterplanner.source-1.0"="0v66xizbjvlzvxdwamny8rggwb0ivwmhlzpjkmm7p26s5l9kd5m1"; +"semioneside-0.41"="0lmr3fxahcln1sf6fg4mkrg8dl3k3670wmz14kpyzd131g73l1iv"; +"semioneside.doc-0.41"="1n7iy5qvd0f1hxp025w9x51llx8cwly4lc107iq5yz9njdwn1g30"; +"semioneside.source-0.41"="0vshjv6nzbp29yza2vj4g8hfx0sbbgnd1s7ck8ms68zcv23534j6"; +"semproc-0.1"="0yvs0kqk3jwq5yw7b8wwycfrg1v5q47mdq3bprx7rb1yh83ip53s"; +"semproc.doc-0.1"="1ycq0qdrhxk9x9gbhigz3vpldc0dfhb3nwmz5v9i45v0l2m5l3bc"; +"semproc.source-0.1"="19v3w2y9406r5bhjchc6rsfb2brrw7f7sb8ikmr8586gdsnwykk4"; +"sepfootnotes-0.3c"="028x18s5c1jxsw97idpj8fmlzs6h46nsgd8zg0awikhdmypl9ac0"; +"sepfootnotes.doc-0.3c"="0mb7fidrjns48c06pk7yfq3csac74a13i3d2cgfdvn7lxz6lp419"; +"seqsplit-0.1"="0m1vlslfac4n7fwhrmcl0swx1rf80ks2p3psrszwd8rz79q6xlc8"; +"seqsplit.doc-0.1"="1wbmr7hayx3kzwmbr1w1hlhyyzz84skbahd03bw0akbgk0qziz1p"; +"seqsplit.source-0.1"="1ibiys9lfj92mklzf4lvdzn192wv843zxkv91grjjba8cvn12w5d"; +"sesstime-1.12"="0nrwgky0rh7lazd41h3jxlb0kgpk5q7hhbgkfdab41zrawjp9y86"; +"sesstime.doc-1.12"="1a353bn7z135bnk2a8q57x4z8d03aimyjfqx3w9x0r81rwzns605"; +"sesstime.source-1.12"="0vrwbbmfwfqpvsfz31yid9rxzdc19749fwhlpimx30arqpd88jhg"; +"sf298-1.3"="05px7n24nn9rlrc02mgsndzxc5a397m6c0n3sbsihq0qy9zl6nqg"; +"sf298.doc-1.3"="0d3fh5dglipskc7cjcdg2n836qnhfcdfkzpalkck7b85kgq0zrbg"; +"sf298.source-1.3"="0afcavg1zs5ldi9fjhsnvsph4xqwy8jkhil8jlcqcqbq39z73pq6"; +"sffms-2.0"="0av956vbxjwf0pywp4hrxag1ypaj59314i3xqinq7xhwwxlr7g6b"; +"sffms.doc-2.0"="1aq8bs7bsbrzzl2bp7mg2ckccazk107ckjl7118m5d2rk0mf09pi"; +"sffms.source-2.0"="0fl3z3f3pm7060cfxn218ycnf1y7id8kcll960h9jvpqkq3dhx26"; +"sfmath-0.8"="05m3whw5xkml48yx93j9h46qmspnr5hwsfszb59l4wy4jfj66zk4"; +"shadethm-53350"="1miq7szfh1nya53vcn9kv3m8jb1sx8p1v7z5m3829ynbyiwr7z9v"; +"shadethm.doc-53350"="1gbjisy9miqp0mrciz793vvhj0a04vaai1ixi6vzplhlx9gknv6i"; +"shadow-20312"="1avy8291hmmvbrqdn4yza9w8w7a7hbwlh38sl7288c6gh1hkyibr"; +"shadow.doc-20312"="0rjfdi2hm07j418q3fvrf5pxflh1nfkhrk58nsa23fixxzaw5nlk"; +"shadowtext-0.3"="1pnnskcw1nq6m3rlvsa69dxq828dx0bgggg8n2p2bxnr9gmnba3c"; +"shadowtext.doc-0.3"="0lfvn68d48yh8smf4w8c1is67chsfnipxc82fx6mal1czlyn73hf"; +"shapepar-2.2"="0siq7d3d5gr91s3bc5873540b1ia73ggkf1y1bs47zb3mh4z9g0b"; +"shapepar.doc-2.2"="08bwm9a4rq70swqibj9s0i4042fnribqz93jx02xd0638wa51pph"; +"shdoc-2.1b"="0casdf6vn89la2vgqy5zcc04nlsrqpiz0zj7mwlf6w2zqcpmr1x6"; +"shdoc.doc-2.1b"="1vzz7q88xq2dg3r1xf4idgvdqs4q4w5lplg9rvi867qa8qcf3ly2"; +"shdoc.source-2.1b"="0wxd21fs45f9d5y2ml3w50d7z8ig25gv34iy3mldarnqi2v64p7z"; +"shipunov-1.2"="01mckfm6ikchmld5r8mdy5x472avh473bfc7lk4rqan8p4wivjrl"; +"shipunov.doc-1.2"="0k6x9nxsqcg74z9i462qix58qycf3wjii5ld13xajn04g52bwvpy"; +"shorttoc-1.3"="0y1sa1l5g19arc5wdnqp0jzvqn51m4gb07acpcp3ajqq7n7yaf3y"; +"shorttoc.doc-1.3"="13nlpmb1asrx8vi08kb6kcqg6szhnzb6667crj9xchbk3zm9iyil"; +"shorttoc.source-1.3"="0a3hl98rl5qadx1mqqla9hw6i1s3324i4la2kwdazhxhvi6nxm0q"; +"show2e-1.0"="0mhpxhvgfnzwwzd9ahyzdhqxzqz9sj6vldrnbjy4n0r4fv6c67pi"; +"show2e.doc-1.0"="0zfir9yzh3mgpkldcak7hzal0mwls90h1m5vxiax6h2izfkrixfm"; +"show2e.source-1.0"="1lnhqxazyz2gfgkgbj7l2140x81bgsxb71y8dagcqazjzdmqgcdl"; +"showcharinbox-0.1"="013an5sq2kxrfs04k51ldc9vkixag1lbicl614sbj3n3ixgk15db"; +"showcharinbox.doc-0.1"="1zdxvlj1jspgkws4xmwa8yy7aaxqwr33lmzkicg6ayy465jmfk9b"; +"showcharinbox.source-0.1"="0b8hq68lbd0xjyd1cj3qsw1rd4rvjsihd6s9ab5v3a0q1sm5kaw3"; +"showdim-1.2"="1pb5qddnvv4kl79fcp20zkcfgxm8p4zix82g9431db3bbavvmkri"; +"showdim.doc-1.2"="1hc208xi8c4ihxb9nsk6y5p6p43yyylqh7jgy8lai2a526xm2hgw"; +"showexpl-0.3s"="0gg8bp3pddkp3z79z8wkh9263gnxhcn6vxhgp2mq7w8i166rrsyc"; +"showexpl.doc-0.3s"="0dv60pc2p19bzr1fj2hqkgyjry9j8ykcgsi0v3xpvzh91ic9v5q9"; +"showexpl.source-0.3s"="002v6m0gzzx4kr8vnw75czn58cmzjnyyfyzi2hvfx9ykh7nmibng"; +"showhyphens-0.5c"="0imf6fpfw30wh3x18c6s62qcf3avyca3sh43nd10rqb51rxq9y7r"; +"showhyphens.doc-0.5c"="0fcjqbpmxccf2r9idx2gzf0vwix0w271qsw74wq0pcnwi0qx41ni"; +"showlabels-1.8"="1sjwjrgsc6wpbk713l127wwbicx7yj291jz91r7babmbjxj433ym"; +"showlabels.doc-1.8"="1q8sa587iv6smdkr2xxb2qq0zc2l9k3mq4kabs3lls0jd238wriq"; +"showlabels.source-1.8"="0h25cly3r6vczm941ig6d51n3qcpb804snns943k7pl2yc41yzw2"; +"sidecap-1.6f"="0ars40rnriqyqiakw7fcd7fq5xz0wmhwgg4m255fawvyyyq5d0n2"; +"sidecap.doc-1.6f"="0873j451nsgbh4jvzjs5ppfyzmrskn7rfh29m7p8la0z686driw8"; +"sidecap.source-1.6f"="178l2mniiniwp5irg31m47janniv182m30llyzp5gplv3vfv93pp"; +"sidenotes-1.00a"="1ip6ybhfihbbzflafcqfhspr1d1x44285msahf7f9ilmhd4536x5"; +"sidenotes.doc-1.00a"="0f4nqbw2y36ymgcj7ywy9gf94pcg09aqk4kjpankksgwmvyjbsxg"; +"sidenotes.source-1.00a"="15kz5d5038vi03siq6lbbf97nng1024hx8zzgrasm304sf2c0ggl"; +"silence-1.5b"="1zixww8d87jymdvxjzjhvhjjr5f8fxhbjwqyzivki2rhw6dpsp2v"; +"silence.doc-1.5b"="01qb2z62da0ji751i3wbhq10rfin23q20r7wr0fzvqv163niy93v"; +"silence.source-1.5b"="1m5xiy5j8l0xy9731mf0jvk4f6bh7d22vbsgpjpvy5r0vxafgxwv"; +"simplecd-1.4"="0d6gw59xd1mqc991yy6k5jva88j66pd69k5sl5jrysl4rw1mxxng"; +"simplecd.doc-1.4"="11fzk8p911v1myphghzpmkj7k62vk4sdicirys1jh8rd2cpnnwcl"; +"simplecd.source-1.4"="16g6fcsr0nw7isqimjq29g0zyf72z11qx9xz36zq8z4khxsl09ln"; +"simplecv-1.6a"="0b7p6d8y7xa8xs9i2qyljk2s992gprsr3a5pjalkkssa5kiz3371"; +"simplecv.doc-1.6a"="02x3nwmxdk9spx5crlaw1xdqlwah04m88zrrw4wdg0qjnhvv4mvr"; +"simplecv.source-1.6a"="05ikxmvflqz5m3qallwgyncda49dzq4fibllgc1j77pdh99cy3vq"; +"simpleinvoice-45673"="1mdc6aij1id1jxlbkwfdvdv87yh55v5qyazfciffpbf91qm87z0s"; +"simpleinvoice.doc-45673"="0lvk87l3xafl4s303rhmksfajnw77qd90yvzhdk126dp1prh7i6p"; +"simplivre-58414"="070a2vjnkd4zz3aanwscf20fmap9sy0bbfvw4wvv2ajf7lcybgch"; +"simplivre.doc-58414"="1ishzi609rl4f611w6axdg9qhx0sr83m3ff8cx5rf473wa0rvnhx"; +"sitem-1.0"="19z6zmwriwrlcpgdgn5yl2bzbz0fkn3p8g5hrwd368bq7wyfc8mi"; +"sitem.doc-1.0"="1wwnqhl3ffqnp5qxddicqwsr7515g6j53rx1rgi9b5z3cv42f5qj"; +"sitem.source-1.0"="0y249krv2h241wy8xbi5xjrxypa56zipi8fbmqbziw9cjjnz993v"; +"skb-0.52"="0k441znw2bn13aiyc6b5hskl76hbhcpilc1xg4jw837dbj2v6qiv"; +"skb.doc-0.52"="0qi7l9ky0y65cmcp32j93lhwlvflvz8didq9c77faq7ffgzz51s8"; +"skb.source-0.52"="1rnraidwhkxlhk09ppa5k0ndqhrra4asbpjwv2j5dgf70wfm5vmh"; +"skdoc-1.5d"="1bqgnqqv5806f375xjny7vjd831ymdnhra2rbgh5hwls7v9hwp4j"; +"skdoc.doc-1.5d"="08g7qrmasrl302pxq94dk13y2bdbg6ipxg4f774kzbp8zwqa2xwv"; +"skdoc.source-1.5d"="1qnyh8gqbk6dhkga2v9gg97q0cbbv8hpcc7nwjskwckc4jxplqwy"; +"skeldoc-0.1.2"="0fnkq85bidvd6m14m90w428ndx54fj2855sxsajfzyid63jrfa9h"; +"skeldoc.doc-0.1.2"="1jgg6h4cdz6ir7ks61lyq9ixczmhdcs34mi4llh767baffvb8340"; +"skeycommand-0.4"="0z5jpznmx09vc5klsvp4hldmlgyp4bwz25gp775kbmad8azad1x2"; +"skeycommand.doc-0.4"="09gmmakvxhvrh7k06vjh6ly1hmax1z5x7vqxyqdwi90ajh2zkmgc"; +"skeyval-1.3"="1an6ghhsq5nibwas1csypz9vmrmsj7jviamig1r9zzjrb5kzs65a"; +"skeyval.doc-1.3"="107higin87d7kca6753f8f61yk3ypk5hkidrbckm1vzn2ci515w9"; +"skills-1.0.0"="15ra36iiz7i9qb4669j32b26hzmjyx0hann3kd12769f2khb3ial"; +"skills.doc-1.0.0"="03j6cj9xg2fhab2a048hb2cs2ddqac6x7zfcf7p9s8zgzyqqi8s5"; +"skrapport-0.12k"="03y0arbbj95jnicmz9d89vsyw178hw1410vy3ydvf8j88j8z57sy"; +"skrapport.doc-0.12k"="03b3zp8w0m5kffx10j7qnikdfy6yznvvzlg5hj30nxam4za51n91"; +"skrapport.source-0.12k"="0vwhckxi676ygxc18rhcsfnr5kp1j5697zyn7ir5qxhm8vdmqf33"; +"slantsc-2.11"="1a05zrd8bqiqgh2bwlll2wspmd4xnvl7p8mz3g4j7nkvx8bp4844"; +"slantsc.doc-2.11"="196sqfqgxc7pfyi75d0nqy151if55k3wlvpq8ai7647rmapn17np"; +"slantsc.source-2.11"="1jw70y8052qvjkr796sz9w0c6kdyammi3gy5v8iq0wwmf38jl8qf"; +"smalltableof-20333"="1g0kh262h9xv5zr2yix9as4ghfsrqnhj8y9gzb66xk90i82pri0j"; +"smalltableof.doc-20333"="1q96blk44d3nv5bihz81a25a43vbf9b86d9w00cl9kkin1zzkf6w"; +"smartref-1.9"="0g8dy72b8q65pw2zmcs2yipclpx3g445v9snjnyxbb3q82asqy5v"; +"smartref.doc-1.9"="1nwl85jj0d97djdqkczdw3544vhazy57fx8psdcvfdncbvpk84jy"; +"smartunits-1.2"="0jiz4mhyf4zaikq0fi4jvan27ngksrv7z5gmch88qj7fapg4xhna"; +"smartunits.doc-1.2"="1cw6k8bvj5xakh909jq3x527jnmma8wa7dwp1za8hsajwmmfzxgp"; +"snapshot-2.14"="0598yminjxp01imxrbzydqjli0i2ws1f9hw6f3qhs7xykfacbaml"; +"snapshot.doc-2.14"="0j614bp2fydpzr2lx9xamn36fn4x0wwi5a58013ds2a8iiha6k1l"; +"snapshot.source-2.14"="0bh7gy9inl30h8y9v072fh2malc07cjwizgxc6wvm07n2x3vidfh"; +"snotez-0.5a"="1dgwmqwxsr0drs1qyh8v6q7v0yxa24jxrg3dm5lyzx39d98mh24s"; +"snotez.doc-0.5a"="07hhfh7d081d1jmzxcnynszwgjp2x683ki6f5q5pj7rzvlnhmm14"; +"soulpos-1.1"="1p9ql9w4q3kihm34gz7wrqf3zlwgdljmwl9lsd7mzc7hxhby7lwx"; +"soulpos.doc-1.1"="0wgf20csnp8xygx6qm20n3rwhnmsdk06h5jfwmcpsm7rnwj5fq9b"; +"soul-2.4"="076n834lx41qw6p661dgq6massdxycq8b3gl4564pkh5c1s98ggp"; +"soul.doc-2.4"="0rgd9ij3hd5934gi2m23hj8rxgqamprlkb3gj921kslx32rixm5y"; +"soul.source-2.4"="03ggiykhjpxnklnzyhc36b3pf83nfa6nn1swxygkn6jnyqcypf8p"; +"soulutf8-1.2"="11phsqx1vqm41d8cvasn53j1zyl4lkwsqnbpk1hmhn7pd6ypv9yh"; +"soulutf8.doc-1.2"="0fkzw127xjxx1z3q9ixqrx93i2j0mn85h7xbfdxkjh6f9k52s333"; +"soulutf8.source-1.2"="1k4xal0bk73z1zkgnfydjh0m8x92s1jx36nqqddfmykycxij7ypl"; +"spacingtricks-1.3"="0y2pipy43fns9fcqmcwsx2k8ikgkznf1nq4cw77rzcgzpizaqhp3"; +"spacingtricks.doc-1.3"="0lh4507lis4m9ggmacqiqcqbqzp42bdcli6q83gc780j669sgxfi"; +"spacingtricks.source-1.3"="19wg8n0mim29pxwf98gz4s292qjazrj7lsnq98idy0cg34gk3d7b"; +"spark-otf-0.05"="0kgfj9kmsyi501a8xl41c9dqw0msqn60wsh99znhh4b1b0hk0qw7"; +"spark-otf.doc-0.05"="01pa2m9q90amkpcpa90z8azhz9hcb2k7i3yh67a7yh2ndi97qn8r"; +"sparklines-1.7"="1mb6c3mial9ashhvmjhynczjpb462j18qyy2an4ckgwgc46pwhp3"; +"sparklines.doc-1.7"="03j6xdkvsv5p71bifmggf69w3s1n7758yii1caz9p9bcqmqbnrk9"; +"sphack-20842"="18vav5d5846hzn6ry7ypnbj9vmxxxxjxm8wpxah9mlml6kjy5hc0"; +"sphack.doc-20842"="0caz10cwphajhni7rq8klh7x9m46hynbrgyr0c7fjqs8jfdva4k7"; +"splitindex-1.2c"="03x58nb9bqd1fn3k9fqq5rdafsna9rbxjhp44dwzig8kp81f0g0i"; +"splitindex.doc-1.2c"="1v2wwls8fgb1rhk91hrjsabxj6plx2bq7h07fyqxvl3982am9wm5"; +"splitindex.source-1.2c"="06ksmac3dxacfq7j4ad7vy9kls2rnay1hww3kgbp2sgadqvwmz0z"; +"spot-1.1"="18ich1w6d68xa2p65lh22yfwdkvgbl9zz9qmd4yx84ljzby49zhg"; +"spot.doc-1.1"="1flizmkafy77g30ffsispr2m4yaqyfw5hvynf7ppph1q07jqdy0v"; +"spot.source-1.1"="01sx1j1sxr1bgi5h48ij02nwawg2wgg1c7mx22q9r4sbn9mprlbr"; +"spotcolor-1.2"="19xicma97v309pbwgdyizrjwwnlas95wq0d2qlyw7m9wrq295lpb"; +"spotcolor.doc-1.2"="1qsdgagx45z4gha0y7z37687jxrc121pr592b1xcy8bhf86nimhm"; +"spreadtab-0.5"="0zgiys6ry7szi6rvrj6kbnlysr8nss66j3xspqwc9j2jdp5c9lp7"; +"spreadtab.doc-0.5"="13c2rgms44wmbqvfi1yi7ini69kjv55bg3czwgx2rn99shafzh4d"; +"spverbatim-1.0"="0s7042ln9l7jvb0vyrmg4h4fdgzy6vaabr62n7zlkr8pf7zd8nvh"; +"spverbatim.doc-1.0"="1rb6gyq7j5m14d8707gkqv1n5ifk1y497mwflhigqgyi9lgcvgxc"; +"spverbatim.source-1.0"="0f3spbpb6icwm84v4lq0skkx53nw3i0b90ik0svd9dhg31y24c43"; +"srbook-mem-45818"="0znvycl1land17f2c9cq09hhhg4b677rixzjc0hsq34c91s3xdq5"; +"srbook-mem.doc-45818"="1nf53sq2ic8y70z0n28kz27lji35slwkxrn8rz0dsaas73ga5k2y"; +"srcltx-1.6"="054b8g0vvhbzazxs8913dzir7qb6x5q5pfsiwdp1z1awkpafwkmv"; +"srcltx.doc-1.6"="0fidv12pgqck21fffgrrz2a0pfsb01fsyld8qhf5r00915aai6h3"; +"srcltx.source-1.6"="1sj23lc6k8kwd11q3sq6wbslwl4fsc3wzp45w4by3mw5k1q5xqcf"; +"sseq-2.01"="01vqjmi5vpd2s00sqqj6nlwgqvz9c43igg09w282khlca471253l"; +"sseq.doc-2.01"="08xq5fjn951hdpbrvzx6p09a173radfh8a4wzhmifd5rca9l7asy"; +"sseq.source-2.01"="0a1rh7s1fjxn3bblqz4lzhd9812d9p71wwww5hg9nnpn3gjvdr6n"; +"sslides-32293"="12vg8fdv0di8vgnw8wj1y6rad6izmczfqzy5pr6gpflzmn14fbq4"; +"sslides.doc-32293"="1dssqc7f6260hl527hhqq8zbiyszb13z3bny3rwjblscl9ia29yf"; +"stack-1.00"="1wadfhja3yji011aawrp3jgiqdxil7lzvkd1pzy9c9y63lzknfg5"; +"stack.source-1.00"="1qv2bvjs01lk9b86rzb7n0lk2a4gr870qsnahyrd9dqdnvvz4n9n"; +"stackengine-4.01"="1hivczypj6glpy2qja23a9f21s9j178l0v2ggk1hlnj1g62p8g4h"; +"stackengine.doc-4.01"="0ypg4nc7y07h68l8frwrl8sc7jz85rhnfj56gdi63chrnqsjwc57"; +"listofitems-1.63"="19qh891v470h4617fj9ajddpf119qh087ng7ay9q73qhk90fhs62"; +"listofitems.doc-1.63"="1s7gl5ai3xdpj05lxhj80hc1i48x2lhcanwh4v3w10yyzf13axyc"; +"standalone-1.3a"="18il89hp4lcxyvcyafh9mfisqsxfr03y8vjjp5d0q222aw1ah2gf"; +"standalone.doc-1.3a"="0z7mvcbrfcvb7livkv5qqv2d3mkgkajzknxlp9ail4wf3k19lb0v"; +"standalone.source-1.3a"="0g1n118l3v6g4amdazpjk4qw1y67j1v39hi35rw487yabz5qlv7n"; +"stdclsdv-1.1a"="1130sj024qfsszjx4adr3bmmr6594d21bcv3ixmw75y85djha1iz"; +"stdclsdv.doc-1.1a"="01li1x0cc820y0m6dmivjabnbhz6v1j696cwx3d08fiw4x7n4jiz"; +"stdclsdv.source-1.1a"="1ypihjm5r0v2isrrv8152fp59ynjn9wmhp0ffx508n7kih9yisbn"; +"stdpage-0.6"="13q3jc6snrscq7bl22myd8rb04q9q5b0a3xvr609j1lxczbs1xnc"; +"stdpage.doc-0.6"="1kr7851lc6lp4aq78xc61nw495qnhnrbsz0w2yyldwfh07h4byzb"; +"stdpage.source-0.6"="0ygk73pk79wgn4qpg0niv3d0a4l8bdhrdvv1a9s8g6ayngfr0nsd"; +"stealcaps-1.0"="1cfq6w2s7yxdsjr2c61zwndcnlhin57y48k8y3lr3m5affhcrac8"; +"stealcaps.doc-1.0"="1jj9g83q6g7pv0k35jfa0wiq8ypqymh9sjjhppnnagd5zxvysr3x"; +"stealcaps.source-1.0"="19pnsn1w7bvpghnc8gg3zw5m29hyacls94gp3lh1aa3avmsks21b"; +"stex-50489"="04ranihj8is2md5ag94iiwak16ld7v1vr98fnzd5jcs28sjxngrc"; +"stex.doc-50489"="1rzss5g5j6avn2946g1dl4cciry6fc5dlcscrx48sz8incf9l84v"; +"stex.source-50489"="05chvd8rb9i17lbrqlwg7nxsqqhsxivcsgxxkv8pxv90zycbd5v7"; +"storebox-1.3a"="0vy7iavq6qqxpmwhm9cz4gxp67nriq230kcf1mr1gq2w0ncy7kjc"; +"storebox.doc-1.3a"="1crb1bkra0y2gjzf9wndr5c3nvc83v57lkdglxb8v1pzpy7halmx"; +"storebox.source-1.3a"="1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1"; +"storecmd-0.0.2"="00xk8l8l99qpsmkdxcpccf8g7av2asa26qrh3bi0kkmapm7agk8x"; +"storecmd.doc-0.0.2"="1n5vw689y9y2kakhkyqv47d5cin7f3xqfz8bc3yncdrmgh4kq82j"; +"stringstrings-1.24"="178qqf3ii5kaw5rpjazvf78mjb0aw4vnqzxpsv9ahbqfxpa16894"; +"stringstrings.doc-1.24"="0x6hcdp3hlfnd0vn3inq92nja4hirvhg9m37zmsh9ilnnz7dk8lp"; +"stringstrings.source-1.24"="1aryr9b5d4jrj6mc9cmbpc11l2mqxlxsc16c5h68ql0i6z0bpsz1"; +"sttools-2.1"="1r8bf4q6q5wz9403wrxr44719scrxjmashv6ivsiv5xvsxw9fbk3"; +"sttools.doc-2.1"="0kmjxdw1k8bswqravr2iw98dxhf18fyryv9dxwvxfddqpappplif"; +"sttools.source-2.1"="07jb7sj9mh7xg32fpymb6bgs8s2ryq1sdd5gyx4137hxlhssclvm"; +"stubs-0.1.1"="1p454rfdp2v4zq3vx1716x2w1cr1a6dkcwnj2hx7w2jn8118vqkb"; +"stubs.doc-0.1.1"="03la45gxcy1l1qik7kgcb518n3yvzwgdi5x3ffzfpj4yp2rq994a"; +"studenthandouts-1.0"="1007rr5m0lbfib30bkb21nvpq1h7didqijg6jsbprmkgsz1xfdkm"; +"studenthandouts.doc-1.0"="0sqfqxypkrcyp8fc60xsb1v9nbw7h1xrdai626dlpknhnm00kzmj"; +"subdepth-0.1"="1l79nf05yrvpzsbsjyrvyhsc4kx7dfbvx57qc1ymzk2zphnfw4fl"; +"subdepth.doc-0.1"="0g8apcawmna380iwys0dvshrdi51k50gavh8wgwybcvfjib82h4w"; +"subdepth.source-0.1"="0ac0l63sisx6ry7m3qlf0f98dn7gml3pfxlyiab8664cv43df2s7"; +"subdocs-0.1"="1mc1zqvqpw5ln494c6afx88gigkby4zlb5i4gbizs75irgyrs01y"; +"subdocs.doc-0.1"="05m9pcg8dhk8rayald2mnzl0wa7z3w8znwzw2b9ifbxz3cp5k4d8"; +"subeqn-2.0b"="17jhiyzv75q79mdkpn6vj60j61wr8yf8qxz63g16dl4xf1xvlqpv"; +"subeqn.doc-2.0b"="107jnszs764j7zr9hywn7dhjdyqd9mb6mwyqcilhgyz8ggpqpz68"; +"subeqn.source-2.0b"="1gwz9pp8jzb7fsj4dg797rsqynjbk8q69m8xjzz4pbmsysi01ijq"; +"subeqnarray-2.1c"="1bj51jrpvid2k3pd8sgrg85aq4iqachah22izpn949zvjvhrk81s"; +"subeqnarray.doc-2.1c"="08aaqv3ca0b6pnj3f6h7c0l2z7spg0hmzaflxrgxbnndn1zh0yhj"; +"subeqnarray.source-2.1c"="1slm6rfgf599d1mkww44kcd3lj88z43dr8i15imamxr0dz05jiav"; +"subfigmat-1.0"="1vx7qh6na1il98gla65c42j8r00ihy277l3s79jab917b3xmrr85"; +"subfigmat.doc-1.0"="09n91ami9skfmrrrl6j7p7wy62ds64zrr0m66c2wn0pnm6lanmxc"; +"subfigure-2.1.5"="02b2y8isk2irxdm7bcmx22v5lbkbhc15jqpx0dhs61dnzb5x7ag6"; +"subfigure.doc-2.1.5"="0lhpw3ayq5p15blz7pwkg2z44g300fd2k42lvyf7zii67x2rgjh9"; +"subfigure.source-2.1.5"="1mvp7i150kxin5819cvyfwwzgwmiq1r89m2ywjhv87rgg1v31kx3"; +"subfiles-2.2"="10nslhm56kp5bmzr2nlbm40rlp3i02zj4z6vxj8w6cj1vv7jrd9j"; +"subfiles.doc-2.2"="08r52aci5ab4cv70kbrqq1ak4ny627ks43nhqk6kn649pcahjqlw"; +"subfiles.source-2.2"="1hmli1qvgpnn2bmllf1w53wjh63zk92dv2wvvi6fzjpq0q6lqhwg"; +"subfloat-2.14"="1ibpaj98ibx67x4kff1p0cnzpxmhs4yyqs2y4vj6as5jx43qnwj9"; +"subfloat.doc-2.14"="18ps2xbqdf7pgyhj848zw1sbk36drwkpa0g1s9mw882ynz16gl9g"; +"subfloat.source-2.14"="01c11mbfyynpa1yi0arlqcaklikr4sr83j69piznabj5jhb45nci"; +"substitutefont-0.1.4"="1djss6q6l864sj8mbvavdxd6fpmcblhb666hyskwciha6naja8xg"; +"substitutefont.doc-0.1.4"="094ywcg880qdryi970cx12hrnkjawhmpz6mmh8p7cxir80ah37n7"; +"supertabular-4.1g"="10r18kzg7p8s2wp1nydvn5f5vfbailcypqb7hkhxyjzpkdfrp12w"; +"supertabular.doc-4.1g"="0cw3vfh4mxd39n2w1yk0nxjq67pb8s0kzv6syr2s4x3p3nrml822"; +"supertabular.source-4.1g"="06r03i93j8rxw6ddiwmshb88q3h1dc3srlh4djwwycjbgp66xx87"; +"suppose-1.2"="0mzw5b2aackc2xjcxbi45m20v3xh1wmh08nnn0kfjs1fdm47wq9z"; +"suppose.doc-1.2"="1v86jg194kpdgbfngaxn1mzwa0r8vxwjprgiw6sxypks6vnqz79x"; +"svg-2.02k"="0h7ciy6qc3awr2317npp2xi958s4rz8kfr137s2rwpabmkriypsg"; +"svg.doc-2.02k"="0c2ibjsnjffp6rr4fk6b74j1vm6vfi0awvhbpz4yc5cvgjw733nc"; +"svg.source-2.02k"="1dh1857r254hiyi0sjdm3271h26wah74b67fvhmkwwr0wxz7w7vr"; +"svgcolor-1.0"="1jjsjh5qsra0pi57k4430j5fcjdsdb9gwrzgf9bhkfrwr1gfsmvs"; +"svgcolor.doc-1.0"="12q998m0irshvh46ndv4zzpxamg6jwaxx8c054av5zgpvb9g5x1d"; +"svn-43"="1yvgad3kgly04sm9cwjmp1g1sbnsa8rqqb6wvsip285x9kc6lfjz"; +"svn.doc-43"="06qfqmcdgdaf9ghlpc2x8w43w2f0sbaylyzcwyb3krw1d8p0zixl"; +"svn.source-43"="1f37y92ikznxblq6nyy2nkhl88d818z6wbkf901cpw8sjf79a35j"; +"svn-multi-2.4d"="1c1gq7li7p3m16xv5ad3s08k5wvzjij72yl8gdpjxlc8z3hxxarw"; +"svn-multi.doc-2.4d"="1fwagcrmfhz8qwajrpj3bh4r64hm1637kxsqrwfxjnxfrk95v9d9"; +"svn-multi.source-2.4d"="1799jhirlv8gvnnfdh4mwsclcsrr8919wl7wn8y88xwdamiib282"; +"svninfo-0.7.4"="1npqdiwj6lnwgfnzb4iiyjl6bl55pjc8mml3gyrvd36j2f6cl1z2"; +"svninfo.doc-0.7.4"="0728psfyzblwp3nciax4hncbf7sw4ww4rmrlz4jyrpmnv80qjp37"; +"svninfo.source-0.7.4"="18rcrh0kkqfz1k84my8adn2a8y7ppjprcy77pfqayix4lyzw6syn"; +"swfigure-0.9.18"="0ryiifcsxkiwgmq2apa1pfabgmw2g52agylf45b622q97akgknjw"; +"swfigure.doc-0.9.18"="1xbbjxm49ja41cbz08b0zvmwgp3dm6asckwjgqj8yv93a2fmxx02"; +"swfigure.source-0.9.18"="116cdphwhm29jp8rbf2p4zmnwj1sb3xby698jgkj52ha45qixs38"; +"syntax-15878"="1gd38myk5lf5fxlx1j8cvjv6pcpcr15r0370ikxf7fczv8s4ab2l"; +"syntax.doc-15878"="0l6rkyidqvvhkrjxs8y316rssayihqimbyqwvmdzqpnfd16rdxpv"; +"syntrace-1.1"="19vx1iz2zxv49znddhcsl7aw4i267fmxhxpszzg2i9z0klm9b3nq"; +"syntrace.doc-1.1"="1dzy8pazcp3lfc009g0n1h0a6q3v99ii43pza3m2gkjvbrb5sk00"; +"syntrace.source-1.1"="0hb5iklz2c7zqrl8zrhkn8k7dj1zgk5gvf4wpr7h32sa83ajqrdr"; +"synttree-1.4.2"="1n2n1q2pwx3fi0dhh3h5dj7s5wrz2r5zpx77fmxjk0c3d45c8wan"; +"synttree.doc-1.4.2"="0rnghg1459nlliwbcy8r60rc9si3ya35c7sl5zqh67sfwla2ixps"; +"synttree.source-1.4.2"="022b2sn42mfdnska1cvqjsafakah9a908rvyw0d326d7lxx8wrx3"; +"tabfigures-1.1"="0fgdwqd2qqqg8k077p6cjdv2ag5z0953jh0d69gjxfn0bc11yyjq"; +"tabfigures.doc-1.1"="1j1klsqcig3gdb4jvcqvm4kzb5zj3fm0mkliflkgm7sla99zw564"; +"tabfigures.source-1.1"="1zkisnxdfdvx7gwgqjddp27sgj3a2qy6mc9vzfx75qf4c6y3q7za"; +"tableaux-42413"="09pi8sm17m1v4h362al448ayhj1h5n0krdaa7zsys00l0w55qm3h"; +"tableaux.doc-42413"="06173sm4yx2a3mfadax16nqj6ggn6yak85l63jiaqdczwyb09kxi"; +"tablefootnote-1.1c"="0i1mj9bq2hj4d7y7za2zj64p5dfdvsfi51147as5kfb6ci90rc56"; +"tablefootnote.doc-1.1c"="071xk16ck9r0jip847ikb2qjyv3ghf1m73w4s619zilvm752c0ak"; +"tablefootnote.source-1.1c"="14vrh8c322skk3rpjpr03fgzbm03khmhf3ifh2fm72yb5cqgbbqr"; +"tableof-1.4b"="0imbkzdjpwj6z0lnw5zdc8hlhgr9hbc63a55pn4rcykb5zvf9hqn"; +"tableof.doc-1.4b"="0grdp4xs7dlrgpnlqmlssicncfrs74bv8gqbw9sa0r39cgd0rjir"; +"tableof.source-1.4b"="0pfzqhcyap7754lisgzdd795vfni4w5jpg8d9yyxv0wg0z2w7cpj"; +"tablestyles-0.1"="05vlmkazizr31l57zm9q4lsw5kinqd4wrmyjgrlgxl130hy3chxx"; +"tablestyles.doc-0.1"="04wiizp4giyh938rfs5j3s9jm6fjz45bxas3nq3lnmh5akcnpy10"; +"tablestyles.source-0.1"="03bxnqry8imwj5ihs7n61b9f689x3c0p6yx0lza71cawh5jx6zh8"; +"tablists-0.0e"="02sffbb22hirw8mdijf7scxbivipmqw828qzdbc49vaxq7ggmzib"; +"tablists.doc-0.0e"="1fwhps6a0j8r5zqcksdqw8gwa55rh2r2la3iz7wc451zk3ddbxpr"; +"tablists.source-0.0e"="1wpir71xwq7xhg41l6sigp55n93v94lashgi6lgr0g9ad8hh3y4j"; +"tabls-3.5"="17bg083653km6v92hifll78vs0p9zwfnj5rbw1pcl2siizf3pfj6"; +"tabls.doc-3.5"="1gnk4blwfikqshqjv4zd4cykp1k6k025h7vnbjrvia11l6kcnavn"; +"tablvar-1.2"="1c3q074gli4k8a9665i9da7rpv8rdqd6x1kffnzm8n3l3nws6y6b"; +"tablvar.doc-1.2"="1jakhzygr71avs9syz6hlrlrabxa0l4061w5x8kzk03bdgygnhc4"; +"tablvar.source-1.2"="0mk3s6fxj1vpi8pr2pvg504wrw13adav02p2l6313d14zfzgp6nj"; +"tabstackengine-2.10"="0zd7gp1k40wg6b5aln30qxbk84ks3ys0d31vlw3wijvh31qbw6xz"; +"tabstackengine.doc-2.10"="1n26fdj1lxwwx1abslxl3vkcvhk6lbnbi0wqi5mhx2n6g6ir8b89"; +"tabto-ltx-1.4"="1ayysa2dfm6q6wli0ldk45mfw9jvj79mdx5kcpiay69xjl96j89v"; +"tabto-ltx.doc-1.4"="0rgk0znx33lk2gafzjbwwvl61xl4kw36h9f66kay0y91cy9ra9n8"; +"tabu-2.9"="1x22myjp1rpg0in3jgjj4wy0xyva8xd5hsy5c1rqqpy67wy83k0a"; +"tabu.doc-2.9"="076ivdvaac2snb4dgkf4hzpnbjqli28hll6s4r6z609c5v34mf1j"; +"tabu.source-2.9"="1pb4kibjcmwn8snfhcm49jjp38i979dac06p471w9bjnsp0khs85"; +"varwidth-0.92"="032izb0vpcwiydg7lli6hnawij95s5ygkwdp4bfk1c9j17d749cr"; +"varwidth.doc-0.92"="1ysrbpv2mmi8fcyhdabvs2jiqj2mkajapjvsf10c8rw6i3yaplnx"; +"tabularborder-1.0a"="1p7iwpalamif71mrznbmsig5g9lxs3l16dcpwj2kzhiixsh78vfv"; +"tabularborder.doc-1.0a"="0rd6k4b00aj398hy247x84jj9c3d0dm00xnaw69p7wvlprzricwc"; +"tabularborder.source-1.0a"="1lrvp6128j70fzwqr61nnwiivgllbbkw7pd53l11sqzqwzxppgi5"; +"tabularcalc-0.2"="057720z8l7ss0kpkg7l16fc2v82xr0wqlxzxbcak5m3hl5k03g7a"; +"tabularcalc.doc-0.2"="0539rar83mprammyilmclcbjxr657z6q2xmmwmlik990imf78lqc"; +"tabularew-0.1"="0g9pbr0vhhjj2lz9bbgwvm49wl8bdwvv1jjggq2dnwwqbr4vc4p8"; +"tabularew.doc-0.1"="1ff62dxvnhi4q1gy8f7qhc0zz1jiayl6f8j96dp0rz38l2is7m86"; +"tabularew.source-0.1"="0sfpx5w61xrmmgip0c746mghhj06r2mn2jmj56zingymm2djiad1"; +"tabulary-0.10"="0z57030pg4pfvghjii8bgqba589cabnj8qsr9w1abpwp3pfy4zbs"; +"tabulary.doc-0.10"="08r21q2h7sjrk875x84lngcqgiy5ijik56ly7g7wyzhq3jyxds0f"; +"tabulary.source-0.10"="0lsdypidawyhzj73c3yjs8k4xy2sds7gz8gazxfy460zndsz675m"; +"tagging-1.1.0.1"="0sws4x1h52cd313apfzydqpj6c8xrb8x5881cfhwir000n48crb6"; +"tagging.doc-1.1.0.1"="1pv7savkzm6jhaliw5ilb7qmhlj3iyiz2w6kxchanwrg4pnqabx7"; +"tagpair-1.1"="08qjcwyjs90sg8agmpmm3122h20898hy6dwkm0lk3dba1j3w5drj"; +"tagpair.doc-1.1"="1dkn4gq6zxfqw9h64h7ggkbyrk9vzyax8gmnk9qk8dccdvf5n2sv"; +"tagpdf-0.80"="0qz31vkvb1i729kvmalrhh33nk3f6wr76jmcykwica0m1yz39nh6"; +"tagpdf.doc-0.80"="0vc3v5chgghf9vx4ljvw1caqf78h8nj49b7c6j88r7gk9dlbazzx"; +"tagpdf.source-0.80"="092rd4g51w9wnny5s5527wqvbi35xqnzzlbnarn43il17hazxvn7"; +"talk-1.1"="0i9whk49bahsm2kbj53pjdh3fpg1ixfyxmfvcp563ylr8j2ibimb"; +"talk.doc-1.1"="0rgil00i39p2agz9fybg0h3xmpq0wxcpjcqpbpzjw5lcf4mpcni5"; +"talk.source-1.1"="0kdrknwwivyxiyn8xqappf3k5l1brkwkkhjqa0l5n0abzafkjcy9"; +"tamefloats-0.42"="0mhiz5lxz0szi8ygmajjmldz1bjf6f1lpyxj3b9zb17h9aw8gr4x"; +"tamefloats.doc-0.42"="0s5cy9m8jpxh81c10fgdvn8wy7pnv7sa25hy8wbv6qkr1qwz8dss"; +"tasks-1.3a"="0n9byy7yai7cpyqghp1warj134r9m83kk9qrzs8plfb604lbznvr"; +"tasks.doc-1.3a"="0fradxaivwq5vvqm37n97rm07ja4p6gxk9zz07yixj3nnsbspczp"; +"tcldoc-2.40"="0gz5v5hi7r6wr8qas79lakwr7gnf8d5kypf7cp62qvrybp0ljgqs"; +"tcldoc.doc-2.40"="1vy7k0f6ri4kbjrhby0napsas9wwlq5by2q1dakbz7r80zr7dc3k"; +"tcldoc.source-2.40"="150p69vd9465icda6p0wp37gg9vl8y3c2ys3b8f9ij9a88x5775j"; +"tcolorbox-4.42"="01xkk2zwxlccrv09z2da28vnpjaq994bwsdsi2c6gf8v4sxb3mda"; +"tcolorbox.doc-4.42"="1cyqf6a805sccm21ihz9b85nncziq92g777yayzrbdxm44llyvn5"; +"tdclock-2.5"="05w49l1kvs73sxchbwrlfs9n6mn7qshx102gkjk4jslhnw9lc48z"; +"tdclock.doc-2.5"="1n0ir0l10p9fai1cssri11bpzpjabpsrpfji6w826l8i3xlqkdkg"; +"technics-1.0"="1fr932788zvxhvkvmq4m9kzc834w4xzdjq4p80kda3fsk7a7iv2v"; +"technics.doc-1.0"="172pqpm2i2wfv3qgvz9hvg8wqz8q7kqy5afmms4xvxhrd0xyaf2l"; +"ted-1.06"="0m9dv66nl6q4kq8jq08ayx4hrkh9r2i7hmr290s5d7bkyicdkgpw"; +"ted.doc-1.06"="08yjlfrblhralk4b9ji4g47cr9r1zj8dp6sjha0169395wn4820l"; +"ted.source-1.06"="1cifrswbfk6714m63kvmrsyvz3q29wd1bgl48f5d9ay7pz07wjyq"; +"templatetools-34495"="1djj67vbfjrhk273yqc9ss38bz9bq1sasxs8bsd47acvfkgq45n6"; +"templatetools.doc-34495"="087ib1pxgryfx03057yfj3mfm3sgy885s5nwy21cmdniwqsk0i3x"; +"templatetools.source-34495"="1cpa3yvrjlh4l8w0bfyznpk6bvg6fmyhplzsz7jxv9s01w642455"; +"termcal-1.8"="1sxzpnrgc7f325w0ww0b92y8ih6jrzpvgp6b5ilvcpyriym89j8d"; +"termcal.doc-1.8"="0nv2s95n2h67j4zd5i2iiz5ygkc1s0xp5wjnnvbb27cxqw1h4sic"; +"termcal.source-1.8"="078bs0l7615z66h5fr1fcd1ydyjbc3lddl1z7j80dngnx5j0vf28"; +"termlist-1.1"="00dw7p9623kxpsvqs1yqk6n95hfl0b166l09djibybxx43fbk6dw"; +"termlist.doc-1.1"="05rbr62rvl0shhdxvscsgqci6b6n60pfzbsmikan6v2bh31d8mbn"; +"termlist.source-1.1"="0dl6bl28wvg9fcdlfqhchcxg98s3d668pm0sp7rmxzz97nf4fi9k"; +"testhyphens-0.7"="1sqq2rf8amsn6zdp8l1vg5v5jxcn7ipp78qbzzkikiamlxv89nkv"; +"testhyphens.doc-0.7"="1nzimg7bz6h9dm7hb9r9fzs130dw5y7cjzmb4rc5dp5a5xhiliv5"; +"testhyphens.source-0.7"="0s92imbkb4p70fd629bbg2cma72ys853qby1nwk6rvdw8gp47pgg"; +"testidx-1.2"="022w2n8zw6vwfbsg3fa38ba4mng3jv2prk9yv7ald23hyhmsnmnv"; +"testidx.doc-1.2"="05w8pfdb733sb15vb7ryi63x5ka4m38jqvq3rlhyxnr7ahrw3inq"; +"testidx.source-1.2"="0h88x6mmid6nmhl4pw9p4p9nlh90p86g1k44a6bbcyzdlxc8n6ac"; +"tex-label-16372"="0flvmmh0lzkwvwksmnb8m4ix6pzw6f18flybkgidkyf9mf0gg8xc"; +"tex-label.doc-16372"="1ppvdq0cj62zk3b0i76lc35r9pizzli7mm4j2zvdabysn0prlyyb"; +"tex-label.source-16372"="0ysjsk73ksninqk2dyrw06arl692x66rsrr8vb4l2ri3m0lyivlf"; +"tex-locale-1.0"="05l4frsxpdmsrbn50q87db878bwpi076wagj5r8kdnmdwmcanr6l"; +"tex-locale.doc-1.0"="0j9m67n83f4h5yhfh3a51s9yhqh6kpjz8y5vlxhyabyf7rcpybd3"; +"tex-locale.source-1.0"="1x0wmqsrbgdgy67gln4jd0518cbd2cxp36gqrjrqgn574qsl5cx9"; +"texlogos-1.3.1"="0rp4l8da3dn6djdjajavxqr5mmi3fsyadcqrpmd9cfggdvb9i8qz"; +"texmate-2"="06hnwj11ify60gx92zqky28spdhppgai5v08l73kiabrryzdn8w5"; +"texmate.doc-2"="13d6rlazx3qx9zwbb60z1f6dk64n6rph610s97hha5kpc0v2vkm9"; +"texmate.source-2"="0faabcm8lyfvzn5jb7vbpkpa31gjb1czkr0g391vbdmx9lrllxar"; +"texments-0.2.0"="0vhwraxncqx74akzmjcww4akisn3zjgi5b6ac8c350flhl0nsh5p"; +"texments.doc-0.2.0"="0xn17gjnb7n3ryc28p8vg2hshcwa660482pzm9byq8k6s3a78yny"; +"texments.source-0.2.0"="1kq5zw31sv0i87h30ahyasqy1qh4m36f0j37f8532s20n5llcq0z"; +"texpower-0.2"="1w1yn4is019rjnj137ckmkas48xblmhpn0gvp8dac2hmsvqfl06f"; +"texpower.doc-0.2"="16j3xy98k9hb3p7bg9inzqmsl07csa6lx1lgym4h6rcjh247llqn"; +"texpower.source-0.2"="0nkbapkzq4knxhs63fiqg0rcxyp72vmd35jz46dha87s2v5w2km5"; +"texshade-1.26"="06rwsg8jzklnrxwahqhp1wybx03p4brxgg9xaaran8lsjfwr3gp6"; +"texshade.doc-1.26"="09368xgwa3vddlbavl7mcbfgag7i89g58nlg27fxcpd3rq36lss2"; +"texshade.source-1.26"="1ffpah2ylppfs4g4ina6x6xd44r8lqzpdni5h79a1kd9nwhi3apg"; +"textfit-5"="0vmffs1a9zspg3hcnd7p0mffa0cw4nnbx8s4vari3n8npmdxrf26"; +"textfit.doc-5"="0dcb63v0yhlhvjmcbsfnw3px6qizmq95rq67i64dgks85d4dhi6m"; +"textfit.source-5"="1h2yql1gy6hvwv0rirm9v996j3clrywsg9dzgnvrkrvnkf1b6dqi"; +"textmerg-2.01"="1bwlcaggagg811sbsi2wrfsz31rd6x92m47aszikmkzfzx4ina7k"; +"textmerg.doc-2.01"="00p7r1y0npb8xfq1mcw5apccb6xznww3ya8q0qgg5irqyxs7d9fc"; +"textmerg.source-2.01"="1972gkv933fmy32ys96qg6p1yp7551mc4cilvnaasnrwyr776f8p"; +"textpos-1.10"="054xx9dxq3d5872rrnyjdqpiwf6jgsnddah8i57l18wrls8l3jyk"; +"textpos.doc-1.10"="1ih0f5rfwys7pi57l5i03g08qh6avza9sy2khwd58bgqyfdk3m7f"; +"textpos.source-1.10"="116aq86hyd3s6mygg1sig4lg3jynpymrngas59497raxd5w7n7c4"; +"textualicomma-1.1"="06myfm4l1k1ms5bmgswbqikg3kkrz6qah97ncjv0s32inkqjcicc"; +"textualicomma.doc-1.1"="157m953qh08i0a8lhrk3228ir2clyk32zd6x9ar2fgbkggjll9ch"; +"textualicomma.source-1.1"="1zp5qj4b8fn5y8a7aylz7bpkg6jnmqifral9l3h5g8ka1727ng9h"; +"texvc-1.1"="12knhsx5y5n6wlzlmzvym6bza5dry1z8qlszka0f93wx8hpvk7cg"; +"texvc.doc-1.1"="1852x7zd684h6jjhq3f465z4q7d75871hh5gc8abvdk9p6srnwsz"; +"texvc.source-1.1"="05532lckvznsv4slyvsn4jrv93y4gxbcy3q3r8c7g0lgya255s9q"; +"theoremref-54512"="1dfv3pz7pjkazp0czzpzhga9j201gwvx785v3qvqasrvpa0vwyyq"; +"theoremref.doc-54512"="0zs8q0xzinp2ih68c75yj9mbjh1pmpqc77xg9hmj8n3gpf1kmmi5"; +"thinsp-0.2"="19d23nm17nybk0dda4l05dsbs1695fk0kl86vc713l19mzw4l7fw"; +"thinsp.doc-0.2"="139v4dmnbhsd3nqlp9qknml0glfmh1f9dg0nnixggf19lsayn27p"; +"thmtools-72"="12nwkxgv50ifzcfidpqbwz9kz25ji4h9dn2n0n0dbp5d56axp93h"; +"thmtools.doc-72"="0dywknaalhw3vfaq8gsmk2iyig5k7k47vc5jq8ihh55bcpw1wr84"; +"thmtools.source-72"="1fz15j6710mwp0wli7cm1g5bmwz1a5v4m4rpfwf866af6b92i8zg"; +"threadcol-1.0"="1whvgb3901wciijafawy5pgnr4adpix2a6ph2v52kwglg68s2ixa"; +"threadcol.doc-1.0"="0dky94vqbqrba5hsvgs1sllwy6cxmr6mlr6zv6qgn1yrrmjxs0by"; +"threadcol.source-1.0"="1qd96xl0h8bnp5mqbh8mprdfbw1bhvp60dhj46hqyl4w7f61jj20"; +"threeparttable-17383"="043vgdllz4k8fcclyw49515rcwl03albnmszbqi7sbsskmxnzck4"; +"threeparttable.doc-17383"="1mlhxgv9q1gnkp383vinybzh95fd49dgz4x14jnjilhjabvhgyid"; +"threeparttablex-0.3"="0ipmhy0jpx38sy1jyyw3ab953cyh95ix4qwrz1ywhi54dn6ahygs"; +"threeparttablex.doc-0.3"="19mk0y6nn6bn7gmn7vvlbijqdcjp2br0s632lmhnyhwz0d4xz6mi"; +"thumb-1.0"="1khi4j0as028c7fhzkdc6dmbgdyj45lbasbv4ksnxmf2kylmbhxz"; +"thumb.doc-1.0"="1h4b21mmp2bx1vp8n3556lxm16x7acy3srs9khgq24nrfkagwrp9"; +"thumb.source-1.0"="0f2z9w9mxfj0b3s9mvch95cv49bkyv6mxmdzmkyc1zr8bwwqdahy"; +"thumbs-1.0q"="15k7rn5fygvsrjln614jndldmq47zq75zqlv71f2gvr8nqgil93n"; +"thumbs.doc-1.0q"="0c70k96v2m6nbx9b8qx09pky9g0s0ipqsxy3fsn8spjjrqkwk0v9"; +"thumbs.source-1.0q"="1ns05c3ji4svj4x9y2qy9hn0f2bvlllbvg98xsr2xv7gylr2pkmw"; +"thumby-0.1"="0q3h6cwbw90adw3c8ggyb707l23qvsfl3dl8zrzhg78dm9l8q3gi"; +"thumby.doc-0.1"="1v1934z064ar7zgjpnpxvmc7bkaq080h0hka0snkj7kwqm6sfry7"; +"ticket-0.4d"="0qpqzff2hj01g2k8nq9vc91l4zvg7kx4p7nf0gd6ji9lf0q5caaw"; +"ticket.doc-0.4d"="07xa7nf2qgvjq5pzaj7k75wzg2ldcpxb47ypx53swssz277ixvp7"; +"titlecaps-1.2"="0rvggjj8rwdk0nln1c2f5ljvimvrk2bg0kqpc007lwajd71aw175"; +"titlecaps.doc-1.2"="1acn8ch0n29isx36ndpdksc5v9cfavn4ganv6a3vdhrrnc6mksr2"; +"titlefoot-15878"="0c0nhhxhb3hmvg3a64lr5npbqsmrmprqqj9pic91j007k4s1in4y"; +"titlepic-1.2"="1pj4mavc06r5ghcvyjjhvn7x2xrccgdfjr3961al7420ymaqb726"; +"titlepic.doc-1.2"="06s1r8xy54129y7fvzaym2vkfbyw2x31r91i8cyxyra0chzh8ngl"; +"titleref-3.1"="1y2aw2m7jg7l9vcr35nd2qpbafyff1bc8acy2cm9k7fcjm4rcr17"; +"titleref.doc-3.1"="0rv9hsx5p460pa3ry50fnrcb0kf08rzdl7bq47n5nhm8frpmczad"; +"titlesec-2.13"="1r0g5yd7ylacn2r78y90vlggy0w6hlngki7f8jhiykji616l1281"; +"titlesec.doc-2.13"="17y6kxsz8kl2y4hdsirz6m7zxsgsb55714whpzrw11rhjdv03363"; +"titling-2.1d"="15iw3giwxg658pzb6basjkp4v92m3qvzk1fcarnzikc649bjcbch"; +"titling.doc-2.1d"="1r75nwakbkwf32qva6icp3pq3y8bgfl6cqw304lcw8p6bih74y5j"; +"titling.source-2.1d"="1jdgyn9zyf5rwbaz004g85rr2jpd5gi5iyn111s0r22ml41ci3hk"; +"tocbibind-1.5k"="1swxyai6gqlz8zjah2qnz9c5dkd1smpk163b56rba0kx7zcmvzc5"; +"tocbibind.doc-1.5k"="189qi2qyp1nasg9w902ydk7rlzxl2qww9w3p5s3p9ywchvm1l9cf"; +"tocbibind.source-1.5k"="08sr335sgs7hrhd6cbdc4dh3f8m9fpplv72fk54y57rx59l8wxbs"; +"tocdata-2.04"="0h5j04ycxrzycc0wa6mrzh03xlg4hrqgqnbm749q6wd0qzx3ic2n"; +"tocdata.doc-2.04"="0m5r2livan96g4p489qrgh3jf7k6fsn551hapj5qv796lljzv1rk"; +"tocdata.source-2.04"="0bwcv3hq5ldjx3bx88sw1ls3svrgql8zrngp8bqfj181b96fcms6"; +"tocloft-2.3j"="1vp3s7q0fcyfj2ksk61gxdjjnwhd62dzfd94yp7y3qfy7x8hyqxq"; +"tocloft.doc-2.3j"="0zjs0ldib6hm3b9msb5x7r64ddknqwf6kkc9cc82hbla9wshq4qq"; +"tocloft.source-2.3j"="1764cq3d9ad5gy3qag6f6wxgnna0dhk3rx186jqjpqyqli8b4lgh"; +"tocvsec2-1.3a"="157m17r777cfqjn5p4j1rbj10ysbyms87jrhk0wjkahag9rgny1b"; +"tocvsec2.doc-1.3a"="0dvzcynpfn9fvfkks5idncgbdqbhxj0vp1d3mfzymhiw4sds31xk"; +"tocvsec2.source-1.3a"="0gjpdjkl73ip3jkhr9sx94mwxz3rvxaacn553xwa9gvk3xh5rav9"; +"todo-2.142"="0chmi45gcs8y2zh24072y37g3z62ixpv8cg7ck7knmkzwfzv5i13"; +"todo.doc-2.142"="0n6dy738cj08laf4cg4y0sadzzzrz9wa9m87hwkya6c95znl0091"; +"todo.source-2.142"="06xpbraybhf1wbl979653waznvgq697jq61xcpz29gn159li0pdb"; +"todonotes-1.1.3"="1i2n4cijpm2s8x2carxh12a2ci4xy276avwc5g8qjl3qckwssn01"; +"todonotes.doc-1.1.3"="1xaq4zvjvy4fx66jlij2gqd468n62w8a4glzylfisplakg50fmib"; +"todonotes.source-1.1.3"="1qf822l6z7askd74n0ndvvlr2y4ap7mzj7nn55zviba95gln0jxv"; +"tokcycle-1.3"="0pqzrn7s3vjdv6f75afrfyqzaz7j00lmp06pbwirixmn9g7qkqlx"; +"tokcycle.doc-1.3"="0slgpw0ml9rxd6zqr8s6cmy4vm8b5c7978a3i7dpabf8hvkd7s2p"; +"tokenizer-1.1.0"="04b3jy76qdvbq9c6yc0lmq99jqcprmcfd602zm6xsr0lwmxrp1cd"; +"tokenizer.doc-1.1.0"="0lpbfdvmib9ykdcwrcd5inpibgkm99avqyn94zadbasr54k62gna"; +"toolbox-5.1"="1qpbidjji1rj056700iyrbhgmqvw8is5kp2mmm5r9f455dmgm390"; +"toolbox.doc-5.1"="17n7dxi0j8razw5s12s4drz22wd63xffx1x6w0a4jhiq87na4jq0"; +"toolbox.source-5.1"="0l9w43kp3h1mbas4pab9qk6b18ny5r1k8vmm9nq2j95gm7z5p77f"; +"topfloat-19084"="0md1db8a7ifx2vg269y2dhcf4l07qa35jg57x4q9nsn8ac9gy4v0"; +"topfloat.doc-19084"="1q7fssdrg5r2i51b722mw6wydd17qd8b41iv9rqa7s8r9brf8f8i"; +"topiclongtable-1.3.2"="1p71kg4882rjzlbq9rfgvppz532s227xs2jmg8zbgplfd3j96mnj"; +"topiclongtable.doc-1.3.2"="1q12jsaxs9d15qc19wjca7xhq6qajdp7573lv9dc6y9il84r1izs"; +"totalcount-1.0a"="0zd8h2sanc98qzhgkzgaxjyzfh969lb2935778c80n0w8g53ipn7"; +"totalcount.doc-1.0a"="1cwk1dnpin4zz0zc4rbf7a1spz5wzvza3nc9d4jrpxqbzgs36nb9"; +"totalcount.source-1.0a"="1cp1fkvs1gbif9brdwxd1dyx81ylshayq6gad4fw6npzqynppk6f"; +"totcount-1.2"="1mj04hqxi81i1pwjrn10ipm6b0xwv2081paa4kvq7yma8g2kmi9p"; +"totcount.doc-1.2"="1c1941vfi2pf0wsbfhhzpahyxjzb4jx4lr85k7g6r8vk64qahy9i"; +"totcount.source-1.2"="1f6r2ci4dqri4fxd5mwmfmqmw2k5jfr5vzf2mazynixxp809mjwq"; +"totpages-2.00"="1z6brrn4kb6w6an8iz6das0yykwj2cbaswa9wy2p3rfc0w95x0ms"; +"totpages.doc-2.00"="0nm7x3rv5rxg40k0xls5d3s5dqrpc8vw9g93sa3jkdn18xkxh2zs"; +"totpages.source-2.00"="1b0glns220jsmn1607d5f44k2lijjp95cd0dkxabdc3p576ipmmv"; +"translations-1.10a"="06dj29zxiggxg3j7mprg7w764i1gr7j39gp92igs0j9cywq8bwqv"; +"translations.doc-1.10a"="169asrvl2r8297a46q4vg141055m0yb81p62q5h08ha0d3zcnvky"; +"transparent-1.4"="1285prqgw1gl2z9rlvamlca10xxy2x8l9aj63q3zvvz97jbza3kr"; +"transparent.doc-1.4"="05zb4vc7ab9am2dl66xkj23cmk7kylcanicf0fcs57znzyy2l444"; +"transparent.source-1.4"="08j4c9c211s18ljacgvp8ck8wn6rdpdy4g057g0czfgdvg9b7w0k"; +"trfsigns-1.01"="0g1xdyhin39sqbgi7x5m5r5786x2822sf49271arhnv58md7ns76"; +"trfsigns.doc-1.01"="1nr4pypsglxi17kpxh6y9xh0b1ky0w41f2i6h5fi7y63h9gjl87z"; +"trfsigns.source-1.01"="0v1yc2zq5kqcbx8dp12nzfipw2cd7f6z2p9wxxydgjd4xp6s8cny"; +"trivfloat-1.3b"="0s74sisq1bg9n593az435chspj55ysx9b0vqywl30mk60hray6zm"; +"trivfloat.doc-1.3b"="09szjgdcy2fc4ddkw09vsa2am5m98mgm606i6s2nrkjgldm0x4ap"; +"trivfloat.source-1.3b"="067ab9d2vc3m950587iqcfismjnl8fp0jxw0ssdsz3gqxys6vgz8"; +"trsym-1.0"="0crl9ik3bd9jwvy6x9sl102bvp5pgj2rq9mywlrcpbxrvvffw1ab"; +"trsym.doc-1.0"="1pd0r5j26xj63qvj7mrifcxjrzazdi702ang8k6npq0cc8v29iar"; +"trsym.source-1.0"="06aavqqczg63yc0s1mwry4nd2ml94424a2qxswcz60y57m68yq61"; +"truncate-3.6"="13hzrndx2myazl7f30i736zs8vk12203hv9rskwncl77hxrqqqpm"; +"truncate.doc-3.6"="0l5hgx3207h54s4n5193zc6ssj6l49xwx2hd9jfpqh1f73kpn6hf"; +"tucv-1.0"="08m364pqd2imqfi5jalxjrwbjnphjihnmlpnpqg8vaz2rsmddlh7"; +"tucv.doc-1.0"="0rfpmrlh7wbpmpqp5j6iai3g9x1zkhqvwfnwjfskknx5an1ad79c"; +"tucv.source-1.0"="1s0shpwhb7q4zhn6kq2010a4d3jwck3liir5jn5h0gzqbsafai11"; +"turnthepage-1.3a"="0zsgmi4akjkhwqas45r7ppbx5c8i5fyvpmk6a8wmpk99ib58pipq"; +"turnthepage.doc-1.3a"="0jkv2zs1m6bggjhf3g71g9cyvrnmgmr549fqsvc4lf8fp9kp3ayn"; +"twoinone-17024"="02na16ki3n7gcbzi45dk6nwna3dqzgxwc73aha1zncm05bnj3n4q"; +"twoinone.doc-17024"="15ldj27nb6pp90abilsybzg7hn0z8xfv7mmwrmwdq20qw8ss75ay"; +"twoup-1.3"="11zxz1wlnqia071kg3d70glp167k2c210gc4r2755sh6m23wp8p7"; +"twoup.doc-1.3"="02zg1rq2ylm9qvgwh530d5l0pq9a377z943s66apyf3jz8z55sj6"; +"twoup.source-1.3"="0lmqla1wrsrzq900c4fhjzbvg7iwbd3y05g40j0lmfrj8w8lqvng"; +"txgreeks-1.0"="1872zrdb80wfkjh2bdblv31k6cm83cmsnqns8f3hwf3vr0ymvb62"; +"txgreeks.doc-1.0"="1gswhcdlf8n4wpnzy0fx4maxvy3n4dcbag9r0igrcvcbqnp9sfcm"; +"txgreeks.source-1.0"="0n4r3zn19z62qkd2njxqj74k60jr59704mnhrlvmmxi9x3b5g5sv"; +"type1cm-21820"="0xdbj0yivyb7advckx6k2iwbn8xqkxrlapjrqrx51jcqhzqshknp"; +"type1cm.doc-21820"="1zw172nb8jym439sz8fb2nnfxmazbnr5mjpmffwkfnasi2f7b4in"; +"type1cm.source-21820"="114wlrzzvlnd1la16mgdp88f7a6h6v8l5ddq72is0hcddw80g2g8"; +"typed-checklist-2.0"="0k5niz1agw13ybzk0yc1wdbnp4wc8fsclcs8xdns3wgj8yk8x3fx"; +"typed-checklist.doc-2.0"="1ppi49lwwzmh6y03xykqz168iv0f88wrmnx0m8ww1d4ah3kq09dc"; +"typed-checklist.source-2.0"="1m4m1bq32z8m2bh28v20fmyw4w5q1r1c6ywsjgkm7zkq44zxg7yk"; +"typeface-0.1"="06i3zhnc42zbzb5lk0pqgiwq0y7wgds4hs27jybizw9y3yhv9nf6"; +"typeface.doc-0.1"="0z9q8q87iybb4b6g1xnnryr5aihic0vdsjq5xv55i3gbgrd15kr2"; +"typeface.source-0.1"="15igfb6xy0g7jykb50086as2drjr76jcprj3kafcf347427026dv"; +"typoaid-0.4.7"="0m7nvdni7nsmbmlbpf51cb3s4s5qaszbn7mw62dfvvawgd2d1y0j"; +"typoaid.doc-0.4.7"="1b24irgw2779j43pc15cwpazx0mdjy2zla9n6lqvmwyhl5xnaswz"; +"typogrid-0.21"="1p3if64qmyhflwlf4gy59wl3xajaza5xpllxy5f3a7n1pzca46rx"; +"typogrid.doc-0.21"="1v9az7ln7z1w3d2bcfn02kxqcwwl4kg4zjri2pmvicc7skzkplr9"; +"typogrid.source-0.21"="147flz7xlwjxbq7wkaw83mxr8qbcqvjknr27a0aaq5zs81jcyy8f"; +"uassign-1.01"="1xwinmh3a8scfgxm40505zn85r0052pcykcs0lcvazn91007dl8i"; +"uassign.doc-1.01"="1b89rvsspkgs60rkmqjad7n2pwwmviiizpqr2si02kwnsqfspqdw"; +"ucs-2.2"="10m8lwdnmff7xqvyakkczlyp3km8hy29vmz3w9mz7n1mjbjkd0q3"; +"ucs.doc-2.2"="03s4inp7iikyr3qx3wx74z0rag1kwm1mlh6ngxrsl4slajg7wsn5"; +"uebungsblatt-1.5.0"="198bz1875qhh366ddvdxj72jpcdinfxsrb2mzirr17fq6liwbwhq"; +"uebungsblatt.doc-1.5.0"="0814xqw1iglvwn5y29fsvgbrm5clhgiz6ivbh8a8rayscbjwixmj"; +"umoline-19085"="0xx4v6w2sw43nqrzdpww561511dcaigsz5blywqg72giw0x2v3la"; +"umoline.doc-19085"="0zpn7ii50w0bfh3cr84w6nk5zj0g8y55r577wnkdmzpm51qxznxc"; +"umoline.source-19085"="00nb73pq0s7xychc84438aa9472mp1h7drafg27wm916f10832cs"; +"underlin-1.01"="0gm9cikysz83sdkhhwd6x9zbs278gwfw8mxh7z22l3c0nvfkxbfa"; +"underlin.doc-1.01"="1rvryx13hyif7hw2wgb88n95qycip95xh92jdy1jm2l6pl3c5q3i"; +"underlin.source-1.01"="1mczvxrhlipisffdi9jv5m3d2i7h34jpm6vi4dbl58cg9sasc4a4"; +"underoverlap-0.0.1-r1"="14cknh021b4qsymflf0mnv8q2vvhgsf2088s1g6pm8ckpx7diq0r"; +"underoverlap.doc-0.0.1-r1"="1h1qvk9m04sp0nm4acj7kfib5cfpch1mkpvs55mnqqsgasgnymjn"; +"undolabl-1.0l"="0arbapmf5dfxaiakj12nkca4qbyyhc3idjjhsahv8brj886jg8zz"; +"undolabl.doc-1.0l"="1sx0q3084dkfx1hkbjfc0cwhj4mim0gpwr448iafs11czi316x6r"; +"undolabl.source-1.0l"="12msg1fh7f978rw1mjsrprqrr1wbvlfai3vg61dzl329a1wc39mq"; +"unitconv-0.01"="07nmxxclxvx28w8w7gmgfs5vqgbkxxavw8c31nk54dvskd6l6zlk"; +"unitconv.doc-0.01"="0yfcqw1fx38kbc4kcw1620h6mydzzxi1y67x1yr6wa0aiwsd6il0"; +"unitipa-0.3"="1wdgnpllyrkacm64z6sbpgfwzsij525y8qf5nx2lw973bpczrxlm"; +"unitipa.doc-0.3"="0ydj67f0gb8v8yhaqyp5i5k1846jkcvl2mp962mrc0c46wd5am7a"; +"unitipa.source-0.3"="1rg62iidfq4wlhmjkq8yf1r6i3sd1j0d92rh02biw1655qazs38j"; +"units-0.9b"="0rblvdf1cgsm4fda44vvldy6my58dnars88wv2blgnzny8s00jhn"; +"units.doc-0.9b"="0nn5y3w25sjxq0bxq07d6453awgm4m4gih5678lfxf9yvnmvigq8"; +"units.source-0.9b"="0mmqp3vhly9v02fv4q4d3bq7zzx8nmm33nlvbn7137jgc7p5vlbd"; +"unravel-0.2h"="07qdrdr98l6la49zqnqy3cbn90lxg5h3wbcxn8dwfsw2g2vf1xk8"; +"unravel.doc-0.2h"="0q8dfnz6rdk1ml1nibivh6lr1g1w2m70dl376myc4dhqh2g8s217"; +"unravel.source-0.2h"="0fnbc9h330vs4fvpnacjy4waa5gzar28kz6k20pvicfizvq5nhgy"; +"upmethodology-20200406"="0a3jlv480lj2h836wj2paqyqh3ia3bc86431gb4gsp1jd8yrn53v"; +"upmethodology.doc-20200406"="1qzqc2mib1pavlmvs8rcn3f7hk21sfmlg4s9i9ss54wdayxgyg2r"; +"upquote-1.3"="1zglh6pb1fq0ipsivhj0knhcwcg04mjkxca5s2adbbfk2xs1iqgy"; +"upquote.doc-1.3"="125756iaikya3v0wk9a712klp39ndw7i68bybnrif2klm4c695lm"; +"upquote.source-1.3"="137lbzacpmkm1fdmp548m6r83mnhclsrcyqk1s0rkp558fpnqpp1"; +"uri-2.0b"="1mmxhxm4y7qsvq4kgdnq2vhid360gcgq0yxbcgw46k56hxd61kln"; +"uri.doc-2.0b"="1zadcddyfrgfbrsyl4461zwz8g3rjwypixvmi5ny8f80z4igal6a"; +"uri.source-2.0b"="1w5hbpzc5xka2z834hnzx16ky0kdx3x4y0xxs61l9gx0ygqkzbpa"; +"ushort-2.2"="0235a399vqry1vdyfyva9anav8axs1pxwf9v4hhhazsf85m23qqn"; +"ushort.doc-2.2"="0r0jib3fclxjaczcbzkb8ywmnz0xkrj02blg0f5i065h2s1qa10b"; +"ushort.source-2.2"="1sp8z5jnb5qlihv2hz0j2gs4rfqpy0ka3npph1dvvjvi5520c94c"; +"uspace-0.04"="1yd3a8fj29f1n7zwqvpp3nm07vpdw0lhkq08l6pnsfwb883cjkqv"; +"uspace.doc-0.04"="0s5scd5j011z6c4x7mmqvz43wan9fgm76zdddlihs27ja2xsvdxi"; +"utf8add-55291"="1js79n29vap5vfqpczrwi54jvsc8c76lj5dcv2agmpi6nsarg2a2"; +"utf8add.doc-55291"="19fwiahqadl9xmbzp3ividqcsf09smg9rrb6pq1d8b7vbh8yybmg"; +"uwmslide-27354"="1kpbdd8q3q0qkz6alvlnl24jjx6shc8z8p36d9grd3idyx0h18r6"; +"uwmslide.doc-27354"="1m41j80x7cj8h87fkyw4mwhvqhxvxx5dql596s7xay8lcwlxq5i6"; +"variablelm-1.1.2"="1z8nkkljglajrjxvw15r91w1x32dc5nswir7rjqmhghhsngv7x4a"; +"variablelm.doc-1.1.2"="1h4a4lqqdrhgwi0dmg6d59v6nc3baarvjdb5mvnji27jxi4yz3jq"; +"varindex-2.3"="1s3ff9i7w7dga61hrkd7m2rfjq7wrkx1b7alx68kxkjcnl92rb9p"; +"varindex.doc-2.3"="1567hz8fpjbjsra7fxg8dlqkd39d0p0a6lj9kpglv31chws6w2sl"; +"varindex.source-2.3"="0gdrsb0n4sr7a4n4wxrvnxh34a6b1wzpqcp2m39rvw9my3h07vhy"; +"varsfromjobname-1.0"="19j2avb7jqb9ndnfskwqfm508maqa6kd9qmqydflcb9hgjkz47xc"; +"varsfromjobname.doc-1.0"="0mcv48nbly7ihd8q8652v2gm6drvpjv42h0jrw9dpzraljzvpgff"; +"vcell-1.0.1"="176j001aqr4dkz4h23ygdiqqycf5kjwywa08hhmlq13bpk5ia14c"; +"vcell.doc-1.0.1"="1sksy8a9y1jdldnj7w8zz7skzwikgwh8gway3078g574janq24nf"; +"vdmlisting-1.1"="10fzab1jn6hk6ah7h9kyv9cyrv2l0gvlmask1c90njhvgqi2526s"; +"vdmlisting.doc-1.1"="0b0vrxv5mlf721mfdvw46ixidgzh0bq88sgrvxb10y05wjcjqiwc"; +"verbasef-1.1"="1bb1ddwlix4v6knmz68yy7i2jsismqdz189p1664q78h12rxcpx3"; +"verbasef.doc-1.1"="1rd4mhi7w3nsvvx0zxv43nd4ldw7if1zadh0xxbzbjaljypmshi4"; +"verbatimbox-3.13"="0sc53aigy5jx7yvxpms4f0s9msn6szkqmy2jm2ydh8ac02f2lqpb"; +"verbatimbox.doc-3.13"="1gbli0qqgff2ph1lc6nhykz3bh8f0sl18rnk39jqs4xpzr7m641d"; +"verbatimcopy-0.06"="07syldn58zwnwxwdsmq63qgr2nb0bkl9di09knska9jk0c50ql1j"; +"verbatimcopy.doc-0.06"="06awpisb1y773xsijrifh0121pq6fdzp2ai0snxny5vrpmyp412n"; +"verbdef-0.2"="1dy1h0vcknnizm2f3zggga85slga5p77aw3ll5ca3kx5qxp1xqhl"; +"verbdef.doc-0.2"="06zh9v72ywrg84wlb96p0y28sn9919pn2xjgqhaii6irdf3hmlma"; +"verbments-1.2"="1iv716hb41cy7bc7bk2420lwdykpccyg6wxvbxb8vk904fsgdk2a"; +"verbments.doc-1.2"="0hzrzb6m8iakip93in80x6k15b08z9xwjrbki12d28xdadqkpqcc"; +"verifiche-4.1"="0pch9ihs7qvqqsq9iswb4zjirll71ld4w7nxdhjbm6v2242dkf8p"; +"verifiche.doc-4.1"="1yghyb6wy5ip9ifpb0hgyhmn81lm9ak76v7dzz84zh3q8vnvqnp9"; +"verifiche.source-4.1"="08rn6x5acqva4hzs3j6wkdr9gjadvl047capkwrvdzaclfg7zffq"; +"version-2.0"="19b4h22lqvgzqqm0pivjjhmpxmijrr5rfy0xc9g9y7czsrp810hb"; +"version.doc-2.0"="17bsgyjvnna790nz3x94wbwslxkkz3958vj2l3jbyphm5vv92fxz"; +"versions-0.55"="07bxhbpsqgdbpwph2w7gam699605m181xmj8jhpcsf4rwcpnjik7"; +"versions.doc-0.55"="0pjz8nk7dnf2jp6yixhi55zbrlmhv477qsx6p52dwkf74vxgv5ki"; +"versonotes-0.4"="0kw6ydfy7fycfrr5i8p38farwjrhkfvdlvmaxcxzk0cgnn7102mh"; +"versonotes.doc-0.4"="13crgm6g52n4d92rmw7w08j1c5l2nnhp17816w4csb3fjsrr83w2"; +"versonotes.source-0.4"="0vvkxga9jzv87dzsv1rac75x147lcf84mkfcx2npz8sbbsc1rj9v"; +"vertbars-1.0c"="0a5fc0a4z482fcxx27wrn20fsdvx9xclsy36623h80pxnfw49aji"; +"vertbars.doc-1.0c"="0y8vfa23ld199r45pqd56rv7b0iskskpaqc08lix2zss6a082iy1"; +"vgrid-0.1"="0yb2hr83xvy19j43kmjrx9kf2cadyairjr45vg5a0pbr9nwpzdsr"; +"vgrid.doc-0.1"="0ymfdbqws78n3mm9cbf7zrcdbn4hb9pzzjsw77hlg023h4hkddh0"; +"vgrid.source-0.1"="0rwsi6lmd4yhgpa6605631ld2bn8pzij7radk8vhwsa1sn19326g"; +"vhistory-1.6.1"="0hli68fad0zj6dp9l9sshz657i30l5xqwhskvkv1zh9mwsrkdh0s"; +"vhistory.doc-1.6.1"="0vjskzdg9523fnj4r4zhg7w6wsldcn9xi4xfk6wplvjsafgfpqhn"; +"vmargin-2.5"="0k0qp68wnfr13i2prx64n463g9xa4cf6y656m2bc735pvsa5ln78"; +"vmargin.doc-2.5"="0l1lv0szznc9l5jz261nkcpq6dq28869s6h616rama40kqpdm0bh"; +"vmargin.source-2.5"="1vwydnpsd5ha4g86dg2q5s012d6l3yrksc580m41q3i67npb8chb"; +"volumes-1.0"="0jl7n29bdwi7m74zb6alp0c4aamic3776n5bd9xcnf5ihfmh9ssv"; +"volumes.doc-1.0"="0052j7zhnbi20x6hsxv68ls2byqci2n4crssb243diid8yc763ac"; +"volumes.source-1.0"="1lvc7fhdblb5ys2blbm0fdib5y311nz4l6xll1zzpsvbwpcc8imp"; +"vpe-0.2"="1w2pxz5dg3q42cdydj10fzf9hmwbc1xy8655s7ngzhnj0vljrj1l"; +"vpe.doc-0.2"="00n8almyx5g71gwxcn05vpfvvisqpr4k1lp123ys810p5n25s31z"; +"vruler-2.3"="1di4a3czay9gj5dbps78iik9r5p0n5vxk9dagc2ak6gdbc3rz1ls"; +"vruler.doc-2.3"="1885iaxgfbc08ldwrzv50jpmczhnjjvhq460vspdp33f3z5i7ifq"; +"vtable-1.0"="1bdf5h2nsw76y2w4gw1ap0ncg9ibydaqdhlpynj4qyy2c9qkb55q"; +"vtable.doc-1.0"="1w144as1s1kfd9a8z92kl8v2qm6il09k5myz9siq5dqxdfs3k9hk"; +"vwcol-0.2"="1wfqcin8xmxrby5mxn9s5j32zmr4ka4k0h9ps4kdddpq238db89n"; +"vwcol.doc-0.2"="1zyndap37lq6jk9pafpzd3q5bib2x7yrnz6wk7wlgmgiyb6smj1b"; +"vwcol.source-0.2"="17apnly4vihdn7dzh6hibgairrnvzadxlv724cgb5lqaci74gnqh"; +"wallcalendar-1.3.1"="04rck2mzvzpm2f934iz4nni9s5w9g7a0qcp3kvp3bsqa6nhhcf6v"; +"wallcalendar.doc-1.3.1"="1b2nn4cwsb6vi29a49cnnazpzffwbpyw48wffklv11frbmk74dnj"; +"wallpaper-1.10"="00cixdnwr4vpfpqfdcbra4gwz0i36kddak8ywv8l4q4d4yd567c9"; +"wallpaper.doc-1.10"="0ngsn8an7gqzkw96sdxb4q24h7bvbjw0gsqk6dzrdphclvsjy8w4"; +"warning-0.01"="1qmymyl01vd3hqvgkzzwffffawbwms0zhs0na7nhvlv59f1316rm"; +"warning.doc-0.01"="1d27zqh4cn9sa5ivp5a47d8dji73dzvirp6pl7cgcihy62ll34v1"; +"warpcol-1.0c"="1dr0ic0pskvw6397q1yy1ibbpl1c1kndqaw5y72zzzy52x4l4j71"; +"warpcol.doc-1.0c"="1jc7rilhf61irh8kgc437mp45ryz0yr63z11r9ixbsj04dmfk2xr"; +"warpcol.source-1.0c"="1lnd9b42xyzfnrz94x10vxrmfy6r2l4wlxbfc1c02fmnchj2wq6c"; +"was-21439"="0g1a285svl2pnvg9g75rgwrr2lhq5dzpf814mkivigsywf02vwqj"; +"was.doc-21439"="1gkk6x7zijd3k10abn0xrchxhv2qbf7ln04civ8lvklwar7wjj60"; +"was.source-21439"="11yqamgxd7zxirlivzwayb3hvn7f52v09ah6ng05phwj4lb4cx9f"; +"webquiz-5.2"="1v3yhi4p102l59lfnyn8yiq8995s6fhr39018m1bbgljvcvm6bl9"; +"webquiz.doc-5.2"="0lwc3r3w2d7lzz39ilncbckmvx536z3wvz84jlnv3flm2dll2z7s"; +"widetable-2.1"="1k1jnl3jbrbcc55cl34wj3znfay2wnf8k8sgdslicvnan2j717zm"; +"widetable.doc-2.1"="1giy0gvhngsmfwc87j9k2p820j6bm2mc2r1kbcl4ci0c3383mify"; +"widetable.source-2.1"="0krkcnxzjrn7lqd0qh8lgjixfpd3c5glvj1ilqhak9ifd3lq8r4s"; +"widows-and-orphans-1.0d"="0pi09xfryird716sfw1gl1fy623br6nrz6szh6gp5rg1vm5m4mi1"; +"widows-and-orphans.doc-1.0d"="0llr7v338qadj3d1d98bl9vq9xzm3ax7disrq1ygiignpq6nsr4z"; +"widows-and-orphans.source-1.0d"="0fpd0h85lrn89y3s7klfhmyzz1h6shkrml8px95l5xwg4q9jdirh"; +"williams-15878"="0pbij6hwk82pmddl199sxin34fk22wzvgfj0dpjsg0i5qrsg0qcl"; +"williams.doc-15878"="0vvz6fsh4vlhwirz27gyni6xnqinhl6iymgmfhlcc808y7fawcvq"; +"willowtreebook-1.01"="1w5fhwfirnjims0n0wdm0mpg36dz329wb639c3ydhnynyvsxssg9"; +"willowtreebook.doc-1.01"="0af76d9zkasgx5jbi6l572irad1d9r7lxszs822x6l8fa8121hgi"; +"withargs-0.3.1"="1b49fag0ivb5srlsxcbmy8ssqsrcbgadkvcxd6xn9l9bk28wpfwr"; +"withargs.doc-0.3.1"="12n87c9181kskqvx7bzvqjimg7agcm8n2z7rxnh1g4kh9bjr57ms"; +"wordcount-1.7"="16vxb87jyj7006akcd7fdvnqihz9rjyw2pl43mdvr5lxp22fpxdx"; +"wordcount.doc-1.7"="1yv9lj7k7m446knp2ghsj0dj95splsc6071w2iarh8cq1xlbj3kz"; +"wordlike-1.2b"="1mdgcdiwnqcsrqrzbl27v56xpnzvxb7gg7a8vass31srk8n10ssq"; +"wordlike.doc-1.2b"="0i9k22hwjkq3pb6z8hiff6zz8l3yjp4vh8x89z5mcbg8iw5gjacd"; +"wordlike.source-1.2b"="1azirdir33aixw7zh9ps9npxy1v8ckgsdjb96ri1ma0cy2z5d1ij"; +"worksheet-1.1"="1rsh38fx4ayai0mlakqgpzxpnwp6ckzjcpiwy7aqlpia0504jgpc"; +"worksheet.doc-1.1"="1hagdjrf472ip4jjkrjv6mgycwjlhbggval7kkk449i0xd9kiz39"; +"wrapfig-3.6"="1axad52pzzsx9d32rivasl5d49dj51adk5kcnb1rr8mz59421rk3"; +"wrapfig.doc-3.6"="1c3xd0ja4063qzag0v07mxkk52yczlcwdbwn84gsfp5hdmd5cibr"; +"wtref-0.4.0"="118ajsdd1d1g1fr23pnq1zrdczl5qgdcrqp4ly6kp8w2iwjhqdn0"; +"wtref.doc-0.4.0"="1nk1w4w8x9xfyr8wdr68gx24vw3arf89ak72rbiwjkspzjl1h9fa"; +"xargs-1.1"="1r4giz5gp4pcnxw12lr8hnsa45yv1lm1ddq6g33rkgs1qjzkhv02"; +"xargs.doc-1.1"="06kfclbfr2kc95c431hn54g0c6vcv7vscsskg9myrp94ilq1qglk"; +"xargs.source-1.1"="0k58hqv0jmk3v2jmx212idnfrs9rxqz93zq34f5kqx8dwhnss9pp"; +"xassoccnt-1.8"="1vrnw8yszs9x1c9mm95a1j3g5zhm61a1l4qibwwvaw85r1r8557n"; +"xassoccnt.doc-1.8"="00jvwvm78l9czk29if8qxckzbavyfx4zmvxr2ax6x5bj2i6vm25q"; +"xbmks-53448"="0pv35b38frgwbi4ijn1x8w5mx48fcy709adlrkzhy641bw4isv86"; +"xbmks.doc-53448"="1nr1m8mhqwkjl9l9pw72ls8xrvg8w2gi8rar4chk3xmh6kphi7ra"; +"xbmks.source-53448"="0waizijqrvg7qigh317vr56bi2b795p5k3h779p0kbl53k3f9f6i"; +"xcntperchap-0.5"="0hqagjlxphvfqmslg91fpxngbm15i3kmawglszj8z585i0j570di"; +"xcntperchap.doc-0.5"="0yf5ak4xr07jzlh8s087c7g8rfa71isziy1z13qy8ifv2882p9qa"; +"xcolor-material-0.1"="0sa38kjyy4iywgd9lwhd1aqw48laqj9h2crcarvjd8hr4xwhrbcw"; +"xcolor-material.doc-0.1"="00jfvs4r7hsclvy49r6waanq1q9vszdi5fhlnbg5arhkf53lzii6"; +"xcolor-material.source-0.1"="1jiyl9vry12fl3y2c6l8z5ic8jaahshbvaha8c98h1h2d8mqk6vx"; +"xcolor-solarized-0.4"="0ggm9s8vqw80jfsmw5jn143xcbrx226rwkarjkfqhnlzx85k2d36"; +"xcolor-solarized.doc-0.4"="1vmr5y6c5mi7hgkb33daamag2y4j6vpiyxnh0cpya824l6miichq"; +"xcolor-solarized.source-0.4"="06f2x0w9k87wd75vm6gjxg2pdrcv3g6406nraq2mnlf9sial9mnh"; +"xcomment-1.3"="0hxbf6hid76d1gm7ngjbrrcb0x7faxsqa44560f93n6arhj1nmwm"; +"xcomment.doc-1.3"="11zcprsby27n8dh78658r6xmmkpqzmx28f6sqc7jhg403jq0j27f"; +"xcookybooky-1.5"="0hx5n7rz2aw460m9cqk2f2p4d3v7fhr02cjf8wk471fp8jwn5bx9"; +"xcookybooky.doc-1.5"="0x9aa92w7b43n49d6m0rlac86f3hsgsrhvq82g3zixvffypyvm1i"; +"xcookybooky.source-1.5"="1z951i4sad1i8bjmw7bgbkanzg04icjj0qfjrshr3m8a67wlxgjz"; +"xcpdftips-1.1"="02g4rm81gf314ds6yzrgasj1ighbyvka7p0vb8mrl78m1ybqjab0"; +"xcpdftips.doc-1.1"="0wcbx6qx288448h2rffv87xgzfj8i30z1v2j6qcp8nlqq21lmw38"; +"xcpdftips.source-1.1"="1h60va01gkm2m9jz521wx93libahh9fi3a8pyb67l6zgjd8dllxi"; +"xdoc-prot2.5"="18nqhig2kiwa1yzk06v65hzriq6la8c31j6f7caxzjrhjkzx0rvm"; +"xdoc.doc-prot2.5"="09i5zcp7qisgf5rj6ys4rqvj8v8lxcxr16ddmzzvibgdc8kpc3za"; +"xdoc.source-prot2.5"="0vxkqg2jl0qfnahfs82764z7npvsyc0ys3qlz6xk61ylhyqvycns"; +"xellipsis-2.0"="1slakkdjh4c88caxcdznir5gkw0v7aahfpqksp4l9as9bsl52980"; +"xellipsis.doc-2.0"="1jlndanic0xc16ba1hg1lswcxa2b20hibd25bs65wyag04rbh8lb"; +"xellipsis.source-2.0"="0768vqhmxgra190g0k3k4hhzgkhkxwwnvwmdpymphsqm9lvxbl95"; +"xfakebold-0.08"="0dd7dj7nrdxrnznly4qvsayfb9n0cd70zr41jm8b7n800rn8z0v0"; +"xfakebold.doc-0.08"="00k39478xw7hldrhdvi2g8gl1745msxhfiln04q64m6ahpabca92"; +"xhfill-1.01"="00lb01b27h1bg8h37rcm7wmqh5pc3gz7rkw0l6xrfai0mb8ypq2k"; +"xhfill.doc-1.01"="0alaqaiz2dfk4sh4xgrxfrwxgisv2p0bfdz7ppiqmli10al1h2gd"; +"xint-1.4d"="0mxv89x10fav03059zrxv40ccc5c4dzmdqda51fivnfkyqvd2ysb"; +"xint.doc-1.4d"="1jhbhhzg80rr4s1k9wf0v83zi11ragvyi9wgvcv7d0qs5h6lhsln"; +"xint.source-1.4d"="1vlgci9gbjknaijpg7hkk9id2lmivf855q2jqpa4i20a3w5cc906"; +"xkcdcolors-1.0.1"="0471difnr81ihdan9qm8a15pgiy33fcc8qpwwigkhqby1f2sl6kl"; +"xkcdcolors.doc-1.0.1"="1s6xza7ci8gazqhrnhqj1c4kqd8b7dbhwy01qds9wjxbwrvxrm9y"; +"xltabular-0.2e"="12skn3ld5cjd8jvh32l1h86mcqmx03v2w04189rkxh2q90kyjmfw"; +"xltabular.doc-0.2e"="1lps5w6p2j0c1bszyrbwdfn9r7mii9k9k6ap9s2ssb2rrfzf291f"; +"xmpincl-2.2"="1sm9ls98cz83nc1s6xymbiirzdawslwd6cr2khh5w265h3kgpgin"; +"xmpincl.doc-2.2"="1k532g5b8fm6ly9whah5133g6yngadb9w6cvf2apwm9hwx1pmnxj"; +"xmpincl.source-2.2"="1972vmvsd3ch9qc78kw8dbf9rm56g6mbd18dvfa118bv2a5m114m"; +"xnewcommand-1.2"="1hqpc8p8bl56gzcmar6m670l6yq5arlh382s3m649lya35yydmms"; +"xnewcommand.doc-1.2"="1r4wlg8368ax3p492qyh0nzxkfgkgvm5bzrbm0jhh9ayk9sp7ryf"; +"xoptarg-1.0"="1ykc3mdg45hhyk5x8lv06zggfv88kyrr1zqnv8s9j8cb5c4r71jj"; +"xoptarg.doc-1.0"="1g42s8mgr7yqdziwza1g241vjgygzddk6ly8md6c22kj8g0sq9jg"; +"xpatch-0.3"="1almf1wif49mi3yqr4qsdffd6m3q8xcma8x9v737ffczsffhs923"; +"xpatch.doc-0.3"="1lxsqxzajkcfw4b9i89bk0gmhrsprkmgqqbj5v34bgvkvh0n5pm0"; +"xpatch.source-0.3"="1cf161h6g6m3q8bq38imvmja7ral7lpyb26byb8nn26lgixkprad"; +"xpeek-0.2"="185jan9h82hrc8bai9h0k09dj2q8p2klqvz042h7xrh2napk060m"; +"xpeek.doc-0.2"="0sag912jjxpiwbsgmp0l4p0kw4jfhp1j3sy0lb4kdxcqrzf3m1aj"; +"xpeek.source-0.2"="144glnmckvjm24smk4d2xmnkfz8n3r4k7zjmsd0iwa004n28il5h"; +"xprintlen-1.0"="0ywzhbp0b40cq395x5bv348f5dbbv29cqvlh6gkznr6qkjm6ai3b"; +"xprintlen.doc-1.0"="0dslr7n1mfbclyxic7pl1i425hbcb925jfbag0sfaal03pbczq7z"; +"xpunctuate-1.0"="0bqv9l0f3fwvzv2hcp2913spilawj21zbhdfgs9k04knda4xb7wm"; +"xpunctuate.doc-1.0"="0r06jwsc38qac0k4b2rmm56phxi0qgmmvlixgk3w3mk51d26jz0f"; +"xpunctuate.source-1.0"="1i5xcn13kr9nbfx8nc34n7qn7zj3p1hggws1yd1bqjpvj2dbssk4"; +"xsavebox-0.16"="0qw2fsic14k7wcb50wpf8apkv97rx9jldgqavvrmk63wzmv3hn7i"; +"xsavebox.doc-0.16"="0vx8k47bj3pqn1j09hz1mimp2jpk44dqyc6wivlrqkhrjqwla4n8"; +"xsavebox.source-0.16"="109n0kvp3a4gb0wqpml2glmb9b6xsagnh4s4kcnwvia72h5fwf0g"; +"xsim-0.20c"="0ckr4ygax1452xqfai6yxrbq6cqk23yvlasrs95nfsiflsl2xrsv"; +"xsim.doc-0.20c"="19ydl87qxpgrqxhfqp9jmvspha2zv7rh1n09dgcqxw4f5hfcylaz"; +"xstring-1.83"="1ckbhk2psw5bn0agpsmy4zc59s8yadja7wr659s39r7r7y8mwcab"; +"xstring.doc-1.83"="1z5z2mcg5c9sd7ykfy6r9ybzvmg3g1aq8k42zvgdx5fhmkrbz0sv"; +"xtab-2.3f"="1cpcs7k8liapv68cghfwj5fw80rz71qrld7l9lsnli50h7ph42sz"; +"xtab.doc-2.3f"="1z3wp3hqy98a4l34kgm604zajdyv0b2vq0jipywmdc12115cw63f"; +"xtab.source-2.3f"="1im5cv88g6n88rxzx8lqcxfmhkihywrv2h9gclmv0jx2mmwvwafv"; +"xurl-0.09a"="1430pz7rliwv0x8mx52v5xznkzjsxh2xxj71106ga6skczcszp4w"; +"xurl.doc-0.09a"="13j7y5j4grjw5zn0rk3ad6yyhadbb4f107zw090dy8wwnvgmfd1v"; +"xwatermark-1.5.2d"="013zwh6gz8npgyvdj8daa6y9pb8554lqvbskchsc366k0m6xrwd8"; +"xwatermark.doc-1.5.2d"="01x4rkl6h9afsbfis3ixbqi9inb1sgvavd0wld9jbwcrmv4qxc76"; +"xytree-1.5"="14f3vxkfmv2s944qpdhxpvbrpxq2p259bnk5sxlcv8lbsk2fvvcx"; +"xytree.doc-1.5"="1aq5lbx0x5v2f4fmhp0bcvasy5569mrbf75xk6m6vjpnls49zjfv"; +"yafoot-1.1"="05b2niwqs6c43gl4ag811ljdd0nasmbdinz6dx2d488nl4jiifaj"; +"yafoot.doc-1.1"="0mbg6y7qsdsq5nwgdh32kd9x3ghvf8qlbrm84rg6269ff0b5achv"; +"yafoot.source-1.1"="1p3zwyg1pf3ad35w25ahlk1r4c18k6vvllcv8ccm952mjg79mj83"; +"yagusylo-1.2"="12p2kxrqa4479wrwcbbxsn5hknr1ai9rf1x76psfs43k9fh1pnn7"; +"yagusylo.doc-1.2"="0g0vx5zjrfxrf595c0kz378n2h9hrlaf9sx1ypw3iv90zns1sp35"; +"yagusylo.source-1.2"="1js0slg00sr0bc0gysxvlp3jwlfa57lldi6q7a8fvqjfg9bkclvm"; +"yaletter-1.1"="13xizdiq8dj7iyjw7a9srhr24c1z6g50r44a7hjz0909z3b58j65"; +"yaletter.doc-1.1"="1jgv50mssx6g94fh5fcysi884w1iah2qdwb0vrkg6952266gdkvw"; +"yaletter.source-1.1"="0byfxy8h76m0jwgd4q0s1ar08sr9ys9jhvsz2l44id321w5276dj"; +"ycbook-46201"="1ajhl8vkd94yajib69s3jw6v2jbbn7h6g92m0yc86gfri3qcff2r"; +"ycbook.doc-46201"="0zf71gmxj1hwywlw5h8klgyrn9mww12hc4bic0l0gmwixvn6k56k"; +"ydoc-0.6alpha"="1yv4cdl0xak9ag4hw18xvzzkn2bnf6dccvd8vz4xl4a2rkzz5fl8"; +"ydoc.doc-0.6alpha"="10v3h8csdl78qax3l2vimy2xni2zg0qjhzgrf7j5h5f5nijw626r"; +"ydoc.source-0.6alpha"="0jai53ykd4q3k56psl6hs8xw07jb47g3h4jbkv9d42ayr5laj2fh"; +"yplan-34398"="1f2kxbb32hxwgin5bn7b78r8sqdj4v1q80sh1c87425zw8jyd73z"; +"yplan.doc-34398"="1ls02mng1jwihz8s505brmaqcjn4abqys6bwl22dy855bw5rgr5k"; +"zebra-goodies-0.8.0"="1f8iv32wgmkzqr75m44hiagz34d9h8qz38ylh3jaq2d9hxf0l1fq"; +"zebra-goodies.doc-0.8.0"="1fz5bz0k6ymj32wc6lkikk0b36b6l9n893xqhbhac4y5gxd1r8z0"; +"zebra-goodies.source-0.8.0"="1as545i691hxy3kqnn72gksgqc9hswz7n48zzhmaz77q6ilnkpkm"; +"zed-csp-17258"="0wr6dxb5ks34x8rzr7s2cnanxc5jawqcq0zhkmxrh8cjqcfkk1w9"; +"zed-csp.doc-17258"="05gm4s4svqa4wds0ichfm6lk39i0y54y33b96bnycrabggqfw77g"; +"ziffer-2.1"="0nalr6i8yqd1iq713gigafnh1k0h8kgiml1zwpk8rjyya606capw"; +"ziffer.doc-2.1"="1cr63lkqi9kpkbpnrwmbppipsmw6wy732wsaha0y9y5ia2934nck"; +"zref-2.32"="0s0306k858i40v3hwvq4z66ip2y023npd4nl4xf31bilqh240p19"; +"zref.doc-2.32"="1rb9jbj2lj8z8iplnjz1qi5qvhn32qvphgmw872qxn9gm0hx82r3"; +"zref.source-2.32"="0lrxqvqj7s8ia0fhzkf00pqgxgi2wnrxdclfc3k865nfj59ybshn"; +"zwgetfdate-15878"="1fgz3z1f9ifcbrwiq166hnff23gmlgp5vn0djm2znci26bcip4s9"; +"zwgetfdate.doc-15878"="0gda7xd1sbiaaspb253xgl47jm6bcn8hj101m6ih69mxrka6sz60"; +"zwpagelayout-1.4d"="1vw3fq52fyn59n4ia99pwdhpah1l4nql88l578zrcmarhjviwvvc"; +"zwpagelayout.doc-1.4d"="1389mx7bln9rgn7iwsjlrpal7gfxv85yvck3xd4f8flspqy0mjiw"; +"addliga-1.0"="1w9wv0wbv8acc7qvcc5pb5kjxmy2nz95cb990mmgc2lxvvsaw2rl"; +"addliga.doc-1.0"="0q41i3cd16ahpklr1ddmzmfs741x5k30vaz7gz7k8jrf0579nv7w"; +"auto-pst-pdf-lua-0.03"="1vh8q7spf251yfc0maaw9xcm1r7w8qyf3vw7nr6gafmv6si2i4fk"; +"auto-pst-pdf-lua.doc-0.03"="0vmwaflyaj4crqb98gc9smngrpk1hlhpq3acfw6bnpdwsm5862mi"; +"barracuda-0.0.10"="07x3j8hcsa0i0gw5rrp5j05i1qhcl91z7543pwzjaxvplakxbj0z"; +"barracuda.doc-0.0.10"="1gyzr84bpnkxn6q2rzwgg6i10qm6sixg0935ai8jqwb3k5bskxs9"; +"bezierplot-1.4"="0iz8zsifxrwbv35jlgq3qb4hdf2sqgj7smcc3bfll655zq0hqmab"; +"bezierplot.doc-1.4"="070nxd9n0i9r7h195lkm45zfpdbaqz4lf0k69qg6qj5adwrdqbvr"; +"checkcites-2.4"="1s2yiqslhli97wh3b1fgnbv6rw59dwyyf4pmfkxx0csn0bgdmvpg"; +"checkcites.doc-2.4"="0hj1phvdqyr43z70nnzk6vqa5x8vpbkb0wvp4jzdk5ry31x08484"; +"chickenize-0.3"="08qxlyxghdzsbrqk9zhj6wr2ffbzd3nq7299z3q7s39z9azrr1z7"; +"chickenize.doc-0.3"="1k4pqd8paq4zqygws1ihpsklxrmsxlqvi3y60zvaghq0r3iiqqqs"; +"chickenize.source-0.3"="1j4sgh23sai4qzhpxibz2zl4a82nfiq7asgcz42ab5qdlz5vnh8n"; +"chinese-jfm-1.1.1"="0lgpg27qnc59i1lkbis5jr3z4fy2cl86x1dm320q5kfjm6z06vla"; +"chinese-jfm.doc-1.1.1"="0bpl9vkjvn3bq1dmrgm4f0kgmbvxrxxhd1alfd4yw30xib24aq31"; +"cloze-1.6"="1w0wydk9kimnihll4r8nx1kp6fccgmhybxl3qzrqxk58x4imp3sk"; +"cloze.doc-1.6"="1pprx0mdxfn8gwdsi03ifscinnvj7p3w8nwir20z5q5121clss95"; +"cloze.source-1.6"="1ijnnfq0xrcnysc9sf54nc9a2xg42jqfiqawb8a5jnc62dx9zwyf"; +"combofont-0.3"="051xpkjszw281gcpacc5s6wpbvwx66hkbr5fpg72205raa454bjf"; +"combofont.doc-0.3"="076niz8w1i6zwq1938iplhcv41qfasqhw8darlr84fr08d3hjwl9"; +"cstypo-0.03"="0lfg2c985h1xlnx1fa3kx1jjrhw7kmgwvalqh5127w20r0lrh8c5"; +"cstypo.doc-0.03"="18yx6l49qk1ayaz13qqw72r8l8z348d20yqdm305nalhqyksv1bb"; +"ekdosis-1.2"="1s2wzjlrbg5yfz54wn9nwfcwx39d1qvp8c26gbr4q3df07s6w7z1"; +"ekdosis.doc-1.2"="1248iz3kjjf3wnfh7zhxv8xljv5mqf8gigxf4i91fkpi0v1wwc9h"; +"ekdosis.source-1.2"="027wx7w1723klnd2nymk6kfch8251vjk608wc0xl9g5h5v6dlsam"; +"emoji-0.2.1"="0kb1xvzk1zgym9ajihrvvap6s39r4ypjp60gn3b91a28g80qkrx6"; +"emoji.doc-0.2.1"="0sba7wi4vb6k1jamc7k42zy6b1fy7z6s17viifwcan2h8z4hpc4v"; +"emojicite-0.3"="08y8qg37m8b3qf2wkbg802kmx359i6ki445ljjnxybs7apvxjpn5"; +"emojicite.doc-0.3"="1iwlxc5ygq7l4qag7yxxas0rpcywmjcv5pcayrk5mz34xr06x5f8"; +"enigma-0.1"="0cl7a0xh9y1lg55wdkj03n3ayyb0853nad04fpgjla6z9c9l1lrm"; +"enigma.doc-0.1"="1cnbi0n8pw2m8xvxk51j4rlyvj112cdz5zjhc9n8znj25iva8in1"; +"innerscript-1.1"="0ig7y528vl2r4dc4xqx16qbl28hy1vfhyk1b0f0ifnrg41hqs61v"; +"innerscript.doc-1.1"="01y491bx14p1b4pylx4v6ilszj3v88j404fxg3wh2pfi1m5cn6sd"; +"innerscript.source-1.1"="1wsj16c896rba9xjm9f0kfbj6hafkb8l0p41412vdzbhqv6zby6y"; +"interpreter-1.2"="1an61a9gdja2h19m13i4024d4x4f741x4yxk983phl97nfadv900"; +"interpreter.doc-1.2"="1vgdgriiwv3lbdwp72pdc7yz5f702xxykqdp4ih1ssx1sl9pcw05"; +"kanaparser-1.0"="1cwik91vx5bzq5jn8xjgr4ffz7n9d2qpx9v9xr298afmadg65h0x"; +"kanaparser.doc-1.0"="0y7j8qp9j33hw80dypc10nr28x2zn174sq1rbbbr8gc7vsvz5pyw"; +"lua-typo-0.32"="0ab8g7s7bcbgri9bil31s10y33vla1zphlgl6b9954gkvr9rvabv"; +"lua-typo.doc-0.32"="1sdj9klzr2vgqwdvklpkcpwbg7s1kbacr8mfp8hi4zfsfzbj8gwg"; +"lua-typo.source-0.32"="1m7pjfkg48n1kngbfr7l0mxkyw1fki2w5qj1vgr6kv4b77r004wi"; +"lua-uca-0.1"="0728k7rjl3g43j2g3mzc02nwmwhsl5rgw8mr2snjiyh55p07wfxl"; +"lua-uca.doc-0.1"="0r9khvjlidjxgjwziw29z5r2pj50h4rivg2zbpl9cv6i2khp3w7r"; +"lua-ul-0.1.2"="0cz8774npl6rxzb5p1w527qki60gasim7slmmd1qzrcvkwf6wa01"; +"lua-ul.doc-0.1.2"="1jaxvbzyfnmaaj1dv7f9yf7vx8jj058qiin38jwbgwm7kyj6rhxa"; +"lua-ul.source-0.1.2"="0cbiv5qlnfp9svwpxc8sf6dnpxh14cn69g6rq6q5d5pplhaaagsc"; +"lua-uni-algos-0.2"="0yx2zskmia6891ksdnyk67f3j4d9dbhgknzyi787v408g6q7hmln"; +"lua-uni-algos.doc-0.2"="1d71cfj4dqq0dyk3a452vzghw4341drcgmyxhhlx4g3kbm2qak85"; +"lua-visual-debug-0.8"="0qnp6zvfdwc2jy642a42npwjwzlz5nl0kq67zc5ajylc8pvd9xbb"; +"lua-visual-debug.doc-0.8"="0iac45h1d6szsgm8xj4nz9xcd6gwz6c3d7bn2kxifyh1lpxnq7hw"; +"luacode-1.2a"="0qk8vadwymhcm7yw3sffdh9i171hl8vg07j1b5gbsl1sa70cpam1"; +"luacode.doc-1.2a"="11d6ak1dvdx64k0i12k4c5kh24f5vqy0ihvj9a5lxa9gqypflrga"; +"luacode.source-1.2a"="1fafh2nq66cz01jsbkb0mk907sppahlswsbb35pa3q5j7iqjzyav"; +"luacolor-1.17"="170b7537yv0c8g2raar6yf5npnbf21blp16vc75v1x1196mblz18"; +"luacolor.doc-1.17"="0vcjrmxqc67j9kkgm3yqs78qndzskqnbjlwgrshdmdms6lij47qj"; +"luacolor.source-1.17"="0m4hzd0rhp9vychlixr46kx7rahqvrrfi2cx5jl53gr0w9gp1l7i"; +"luahyphenrules-1.1"="0msfn7s35xhpacx745w0zbr6g5pbhhm4pccd5cmqdhq6dh0fjw2w"; +"luahyphenrules.doc-1.1"="0y2rxs5mqyw6cyrmgsqqibsw45qjlzsrcwpd74m9l9d4731nyn37"; +"luaimageembed-0.1"="14xmb1cjqvpqwl33qx7376ndsbkql48v6094r66ksr7vlyap5hgp"; +"luaimageembed.doc-0.1"="0r0w2lzxf4avfsv5s6fx64bw300vnmympfdfzz1k05c5c2kjy9x9"; +"luaindex-0.1b"="08kckg0129ksr8pdm0a2yawwb3fa5js3mkp6jd8f90y0w7acrvis"; +"luaindex.doc-0.1b"="02w8s71qdkxznkmqv7c62dhar2x6ia9zsiwd29qxjf51dpwj3mg2"; +"luaindex.source-0.1b"="1v09zszin9f4k3gczrfs86zv019l42d6khacjdb3qjp2gg8w9qn6"; +"luainputenc-0.973"="1wsz8aw4dyhiw5p7gyf26lcixk1a8czr06akd1h6dwj6s5vq4vka"; +"luainputenc.doc-0.973"="0h6wjb0kjdqfrmzikvbddq4w31d55mxlcl5n3phr56fa9i49qmgm"; +"luainputenc.source-0.973"="1yps04v6fvqspq3rip0c6pw5a5y3annwfaij7w27i53419h83lbd"; +"luaintro.doc-0.03"="0xab7yymknvhsh4c30xnhrlvk798mbnl9fbf7njqx8mbmnv869bi"; +"luakeys-0.1"="1ccdb5pr542lxzazw10qf6dldwdy95p7qdlz40vmv3zqyav6zc43"; +"luakeys.doc-0.1"="0brlbzw6inxgqn5arb6m8a5lw2hrxgiqq1jcjndcbd7hxnzkyz3a"; +"lualatex-doc.doc-30473"="12kg6l5lrq791qnh9gzmfbqn693fpnbp1nn8fddd5ybw6gr61qr5"; +"lualatex-doc.source-30473"="0q34k7x3lwhx2m7n0xl3c0jqv3hzz9zpx6hi5dy06k305qjr2lv8"; +"lualatex-math-1.9"="0fhi53ysw6q939d4slq2ryiw5c9bs7kidar62vphm8d7yag6ny7y"; +"lualatex-math.doc-1.9"="159ly8gyrk2jhn1dvg7ppc6fslvkxkwmmvkir11rhfwyvjxxcs7l"; +"lualatex-math.source-1.9"="0yz17h5bp5pybh2d8h8w45x1vl60xqfdfq8jsg1bhqahxd7c3qz8"; +"lualatex-truncate-1.1"="02plqfp0xi406wya3c6cdgj0777m11fzkbk9nbharima6zhsc1nb"; +"lualatex-truncate.doc-1.1"="0gkgbliv8bzpdk27mkff02v1d03vggyq4nk50yawrimz0k7q64bn"; +"lualatex-truncate.source-1.1"="159wcqiyb5rs9a7wfm5mj5vcqh4kr9gv4pv6w0d7vfylkrlh76nf"; +"luamplib-2.20.7"="13xiip2dddnm12r4q5rb2cmsjxl6qg67h1m5bi00rvrhz64x5pzy"; +"luamplib.doc-2.20.7"="0gf6q2jan1h2nbwwr1cg6rl5gbjw98700cdp58d8q2snlmbf3xjh"; +"luamplib.source-2.20.7"="1j9in4gvhr15xq00vplzv8if1fsipyijb0lpdss6vv5jkg45ps38"; +"luapackageloader-0.2"="1ynqy88drl04ld2lycrpvjj3cxddmbycznfamhl1bmn01c1q9784"; +"luapackageloader.doc-0.2"="1fn9kqab5hyvscjqmd34vxjkdcr7bapgw7w3ckwvlsslxrv22rfs"; +"luaprogtable-1.0"="16jmy3cvn7rmzf5i03x51yp5l90kmrdy0iqg8ji4z3xwrf0iq79x"; +"luaprogtable.doc-1.0"="1d0k83dyiml9abnfc3b9l4n6w18lgm37bijr8xj3chyv04v85392"; +"luarandom-0.01"="08pmalwh5w1gih9f29crnwqx40x6npizpr8vnjmjfw3iy442gbhx"; +"luarandom.doc-0.01"="0kgwqk2mh8c2hkv2x1gzl3a04q7azi0aqcv6ab3nf60ipmq81n1s"; +"luatexko-3.0"="113n3ydasq5w93bcw7hjigi4gg3b21n8cxr13nhashix8f2ramm8"; +"luatexko.doc-3.0"="1jz9lx2gnf5jdb60qavahvy1lbivy0qxnp37slizh22rx88s25xc"; +"luatextra-1.0.1"="1dx2hc1md8csvb37lckxj4987zaldfd73c86y0ni8fzd4zg55s7z"; +"luatextra.doc-1.0.1"="02dl0skcr30hh9wgm7bkdv5zvx3czcdkxv3zdqnasdk0b7r7mqh7"; +"luatextra.source-1.0.1"="1yq5i4v2dxayhfzn1yw987i3zjm6gy4fqckx5kybzh8f6jr9167b"; +"luavlna-0.1i"="19qndfkfid3xmqs3jaa5nxdsh7rg4dcrki9dkdfmff1b03z0pfxk"; +"luavlna.doc-0.1i"="1xv8gzjxl0awaqhhs1ls7lvxy48v8k5lsvxq4lzlvd452r8i82k0"; +"luaxml-0.1n"="0fjs7g0m4fi7cdqlkjgp26k3xn7d1rb0y4ih3vpzirsf4g6arar7"; +"luaxml.doc-0.1n"="07fqr933ndv2ni6h8kgl4nq61hzilcb3cr7nqqyzadzdray583xm"; +"newpax-0.51"="1i4ss5q9afxpskqdvz97svq2535i7dx4a7jhbxi1s50qr8f9fba8"; +"newpax.doc-0.51"="1zwpazpzqz3inkfx3vj0nbh8041jjch6daiqb8mcy80gchq3fcw8"; +"newpax.source-0.51"="1lc8j1s43327sy8wxqhmkvp6v4qx66zmsi4fan15w7sljznwd1pg"; +"nodetree-2.2"="0p3lm3sf89w1amlaxknpgrsd0w65sgxa30avxv5lc13ry25hflry"; +"nodetree.doc-2.2"="0xcb6b8a0w3hv98mxd5lh20yi7l7bm8fi230dh7vgv9rdvagz9ja"; +"nodetree.source-2.2"="14p1zfzf1wrw20b8dsb8ppalw5djqrj2k6xw5di3zbggr3zzjcjy"; +"odsfile-0.6"="03x3kfvm31l8lc0n7bic06xf1ypgkd22x4yv331vam9r8kw2i9wf"; +"odsfile.doc-0.6"="0p5iqdqrlxkq7zq5h8jk8csdsghkc71jhdwqhn151n92zxn6lg2w"; +"optex-1.01"="0s83rnrnvl62sb3c8s9zdh3q9gjc1kzz5wdsbz97kkk1w5x2bygk"; +"optex.doc-1.01"="1lkprlmchcwc7fi1hss724fyw28z5ivyjxcg08ramabhak0riy8r"; +"pdfarticle-1.0"="123b9f0nl8wyyxfnbs5krr5ayrgl02hg9z8w87lj6g0lxch7dfhf"; +"pdfarticle.doc-1.0"="1pg4iix7i0m3smy27xk5p03x8m6rq737kyhpf5qzckm276n88fzf"; +"placeat-0.1d1"="0vmvw0k1s023siwsrl4hr32wyla5xmkvz449p7vlfv1n63383c1g"; +"placeat.doc-0.1d1"="0j9xm75xv0lqkqzm4g8aqxy6cs8vxydmm50vsjj4g4aah7n8jygk"; +"placeat.source-0.1d1"="0118s2p8vfam65fwynf3vabqj4kz0kkw9kbq49k7akwwj1wpyd7f"; +"plantuml-0.3.1"="0pr3i90wdf440x5pdxn695xjz4cpc17y12mkvnyd1rxpw09003jr"; +"plantuml.doc-0.3.1"="1z0pgf56601gyhmqqq2mcil4rp1n6r6nsrvxpw0kra6lnvkppisr"; +"selnolig-0.302"="1xrndff5if1jbk5vzycj2alj72r123xjwmyr1lrsjkpkp6jqjg0y"; +"selnolig.doc-0.302"="14ppr67fbhsqi6d5x0f40awac7j3i90kk7mwrjm1ch1572im5dhc"; +"spelling-0.41"="08zkbw4fdfmfz1pxcr96xjhrs8lfbf6sydp8crp8110fikksjv9i"; +"spelling.doc-0.41"="1wm6r4rhkmxmc66zx9nvvdmjaarx789c33vzm26mbd6ylv5qs1is"; +"stricttex-0.2beta"="0igsjl8gsdld0way8nry9r50ibvm0aj8g46ki547c1jhdgmw67fn"; +"stricttex.doc-0.2beta"="11pyyvsxi2d4dfzv4pmapa2ffyp5fky32823fklcffd2i6jnvsbh"; +"typewriter-1.1"="1cgyi8q0w8j6xywby39g4nprg7p7p2dpgfdb58qr5nsppa2i31m8"; +"typewriter.doc-1.1"="0lz81r7jv8frdgb1aglxlr98cngacacjvsa4wjzwr9cvahc1q5r0"; +"uninormalize-0.1"="0ai1w8n010sq2fmwvp7625dfmmlvzx9d67ji34zwxdl2cyjlgsw3"; +"uninormalize.doc-0.1"="1dksyk07zjmwbzgc7c2d5lz7fkvrllbj1nrpb34vd54yxl4azgip"; +"12many-0.3"="1lh034gihn9gmpzf5sz9anrxqlb7qifaasa98dira5vccizs4axd"; +"12many.doc-0.3"="10f5f3xf2bmrf794ipj5xjsv73j7gqmhgg2fjrdmmsvqij7ljjk4"; +"12many.source-0.3"="01nldk50shy8ynkcjz0176rzkrjhxssi7x37bd7x1gbw6pd32m3a"; +"SIstyle-2.3a"="0w3aywnn3l1yis6h6ck1vnmyfl90s3wkr4ixgrgj1plmxlvgqwpp"; +"SIstyle.doc-2.3a"="08r6ngi4xdvqm3pyyg6h47b7zfwq2fb48d4yf114sggd2ncaksll"; +"SIstyle.source-2.3a"="18g7igxi3y1hz988kzd2bkpmdri6qm513pkx1pv72abfgqi3gvks"; +"SIunits-1.36"="0msw4324hfzdq87rqahl6wwv8jlswyz2jbkx0ph22jx5rxyjvwii"; +"SIunits.doc-1.36"="1zikq0h32838mppih4iw40j8gjy1zphbn5ynhb1677ccbi1vxyl8"; +"SIunits.source-1.36"="09a6fa5vjb79mvmrcjfxl2y5jgi6kxxgk6sl4s9grzkd93id9s1f"; +"accents-1.4"="1xl7fkm5gc36mm0bhx7rm9v4g2d9j22gr5fjxjbzmr6byjfgw71k"; +"accents.doc-1.4"="0il1ccxa2ndnfxn2caz9d4mv39y21rh360lynra7q2v5j1cyqrw5"; +"alg-15878"="0lrzrij15s989hy2j9wi1fzkpzvqjfhmgj6ryry0gy7nk3azhhrq"; +"alg.doc-15878"="1lgi63jx57arpz688i22razcrzarl96id8xf45vznh8iraba3sja"; +"alg.source-15878"="0mjrh4mnx8q9x40vr4csj3h3w7wh3hs8hidbklym29d0scd5rkx6"; +"algobox-1.3"="0xplb7wlbizzy95s4pk1nhl2w1b3g80frkd8p4na2rv7awp0da3d"; +"algobox.doc-1.3"="1bp5b0zr6shhaifkqdliw9qa18ym4s68xfk6k2njjnwdqyrxyd01"; +"algobox.source-1.3"="13cwnl7nxxrs0jsvfrvcy7a5pg8a92qnhxjsbarcx3jmg43d4zp5"; +"algorithm2e-5.2"="1iw3yhdk9nk1y41hw1qcpqiqaxadjc0nf6cgb23kd75ah2cpd53n"; +"algorithm2e.doc-5.2"="19xsi1dgxfi06wxls70pvnys20i2na2y7m2hq8y6v947pc5kbb1b"; +"algorithmicx-15878"="111iyi2j8qnzha97r1grxpcbnfkpvcwndczx043c4gw5wqmrknbj"; +"algorithmicx.doc-15878"="1rb46zi4islfbykhr68rnrkj4q966papin0c5m752gh6kzx5r57p"; +"algorithms-0.1"="1va2ic75nf0dfh0dr576lpgqhzqv5203frr37079q648871zqav5"; +"algorithms.doc-0.1"="0fqif0nb9ypd4sw2i9qsxl81h3g4h0gm0yqq67d5n9wrpic8dnjg"; +"algorithms.source-0.1"="14jgc7vnww5xhnd76cwix5c599sfdjil2i916cfpmsd5yn5qqdx3"; +"algpseudocodex-1.0"="0mqlh4jbjvay1qk2vp7wcszdl3m74ph1p6563qqfr9zf6qmz4b16"; +"algpseudocodex.doc-1.0"="1cxxswskyp7s1iql7g2dncskq6adx6s70iy6b6shjng9m77fbzp8"; +"algxpar-0.91"="048yw7nk0bnc05swjbmncrrlns3gij9a4851fbj9civlc8silpby"; +"algxpar.doc-0.91"="13r04cc5d04ya1c6cm2h9a1f5c62ln5b7zlidiw51zg6200rrl2d"; +"algxpar.source-0.91"="0bl51gdyi1i44j2cfz432z5cf63mp4yjr21cc2hwihyfd9vas3z1"; +"aligned-overset-0.1.0"="04gjl08y9wbv5qls9z2plxx5n4abi4nzd8qik88via4xghhqiy7i"; +"aligned-overset.doc-0.1.0"="0il97kycqgqqimqjvjhnhc2mxy2nja20vlspsqrl9zaah71p1b3d"; +"aligned-overset.source-0.1.0"="0zbaa3m06kfkj7kkv6iy71d20n0kqq1dwy63dwfj4l49wv427z08"; +"amscdx-2.2x"="0ncbf7ss4iwyjzp6lgzgzn3azy5iasl03565kgsm1pcbgprqibgy"; +"amscdx.doc-2.2x"="0nfpbma3cawyy7gw6v0w81maz1jgicb2r4cm5gmlipzxwzl747if"; +"amscdx.source-2.2x"="0jg2qk0a9y15hl4w753yhjff28w9wc2vbmd564lkikvg60b9yiqi"; +"amstex-57972"="0l078b9fkaai7kn2szn5hblqp3amlafr7ha0hjcn48657wsjq4jb"; +"amstex.doc-57972"="1s93yy1v49b9r2zfkdinsp0i70bhmjmrm876srvhgqs6k95f4d6c"; +"apxproof-1.2.1"="1ds9qv2a6klgl0vdcca8b1zm3lyf59amcyqpi89l1rj729p4qkvw"; +"apxproof.doc-1.2.1"="11r9acw77v8i04baysvl8cnhfcqn00hbqrd4mfxas6r8yd1jl1ns"; +"apxproof.source-1.2.1"="1ara6fxxbdv84anb2v81hhvhx9sicjmny10267wbz3y1crms1cly"; +"autobreak-0.3"="0dzr4wbwy018f97kzmfvza9i7m9mbpn97mjzi336sgq440v01hrd"; +"autobreak.doc-0.3"="099vqvdh2djk7fm6y4x5m7cma71b2anpqkc3lfzjazpv15kpnlq6"; +"autobreak.source-0.3"="03kqdrwznx3k65nf5z3p2z6d80rki7w4v5lhdfk8rin3112gn68r"; +"axodraw2-2.1.1c"="0dcls4qqm7pl0iyg7mkflqa2rd86wsafshx41xlg62din6fmybwa"; +"axodraw2.doc-2.1.1c"="1l1kwxd8zq5xxhw7zyig0b8nna4fwr6615h4jjwpywcaqsnms6if"; +"axodraw2.source-2.1.1c"="00nq53ahf63lazavijry572yii3jix1df9c604xnqpga9z22bbq2"; +"backnaur-3.1"="1sj9a62s7mqms6i2gv52dls1jncc478ki51wlnp6j5hq34g8sw8s"; +"backnaur.doc-3.1"="0mzpammz9ic3d56ylxl40b3m8rc0s0ilhzx25h1y781kya0n6wb5"; +"backnaur.source-3.1"="06aw2vvmkl1jprdznc5cwmyaw890csjsbkqmy814ddx6py7pxni8"; +"begriff-1.6"="1hl6jb8gg3acsj6rs1z0w5v0i6ivvas87hij4n64jdwgf1lf02ja"; +"begriff.doc-1.6"="0bd8gwf3ifqkjpr8wnrp0xx78169b8yc1ppdnyg9v6n4l1b0x0s9"; +"binomexp-1.0"="1mx2g0s4y5y9abmj2b7smz0xc2nzyvnx4x3f4h5v3w1x1kp5y0hz"; +"binomexp.doc-1.0"="1yi68q48p39v20rzny1603j20n8k6ddpjqi773955wmh1p4mqsb7"; +"binomexp.source-1.0"="00rmdk466a4kc1492b947q1f97d7cwd2svvc9wr6w1agzz8w890r"; +"biocon-15878"="0g6r8rh12pbnbhddcv6sz9h8wnv31q6jqs2xbj5fjj7vcb46z694"; +"biocon.doc-15878"="15wd9arkdxsh8aral3zgl83627yl4f0wdx2r8b6xb5ivvrbwaslj"; +"bitpattern-39073"="1j01vh1jy41714k3hms4nkk8j5c5d4nizgrm5syi20n8pcn3l9pi"; +"bitpattern.doc-39073"="0a9120z9rsq8pqi33iv7f4j79gimjgxfqf5jhnrnmz0hgqdpl2mi"; +"bitpattern.source-39073"="16bjmxm11kh0ww6ymk82qs947zgavm100nsfnjl60hxwjl3yknzn"; +"bohr-1.0"="1fbrgfp1xnxa5cf5yqk9735wp0qwkjkpf8sv8gdjg6a06mpixn6m"; +"bohr.doc-1.0"="1jbmck8ld3rg0nw5rs9lbnr0i34gi2sxncri2fmcdpl8pp3xnw55"; +"boldtensors-15878"="0nywpj03fzn31fffyfy9plxgq9008hhs2v1d3nsy3ggas5kvrm5c"; +"boldtensors.doc-15878"="1vdj6217qwal5005zsmj0jm32s7scii7nmawljqi1j1a7lzlv86b"; +"bosisio-16989"="10dbj6gzv7z1na2bynrdz9971k5fr2vr4njcnsm16nlhyjzypfhh"; +"bosisio.doc-16989"="1a0vyxnhbbdm2hi8gydz0vyasvzzh3k2scyv2kxx4qbwvv4liyk4"; +"bosisio.source-16989"="12f99cgcf4mphvbqi2ffh7nwj627c5cxc9v8xrcg8nwfxr81h7hv"; +"bpchem-1.1"="13l29qi6w99d47cv0ky9hsm6356vk7n88xkxjx5v5pb6vrg8zblw"; +"bpchem.doc-1.1"="0n8w0dvfqal6k8syw9inaykdj2ndmkjqgg0fi7himam2q5qa36y6"; +"bpchem.source-1.1"="1fbbs8lfzr3nih6m623r1wxdm8vgzfli2q97kp5jl998pz0ipwin"; +"bropd-1.2"="0l7ifzaqvqhk2dr31757ias4w4vzpdz15kma0bj2fm7k4sjx7d5y"; +"bropd.doc-1.2"="080g65q0v34rbfl67mpvqfcwfvr5znwv0rys8m3fys1s9d4yyryw"; +"bropd.source-1.2"="1kk38an662s7blxrnk4nhfvr49aymanj3qcm288ca6kfabg84w8a"; +"bussproofs-1.1"="0d783i6srwanhm806hk0y5igbw99rf5x9anl7ib29pijrqvg8kjx"; +"bussproofs.doc-1.1"="10mn4g6dap1rksl5jnsp8pv3n0hhfrb9imldjyrmiika2d0prfp9"; +"bussproofs-extra-0.4"="0ndqiz033c8dxkdknf7hy1d42y0g2hgdb091wxrvpla7ryawcb8v"; +"bussproofs-extra.doc-0.4"="1bg3sh0r7kqkb0hljc5m3x9gn3wkfyjr9b0d8myjwwyf4g9hzi0d"; +"bussproofs-extra.source-0.4"="0p1imkwz82zwzp0p49a2vj7gdywv7mxr3b6nbmvkpz1n2qxs2hsg"; +"bytefield-2.6"="1ag4x4saicjq5jbw26m39gqfj1sv6661slsp6lnk1cyvn3ym2j36"; +"bytefield.doc-2.6"="1rypz5a1ll05f0k1gzjsrbvlpvmj8k4gc3vr99b1crcnsx94pc00"; +"bytefield.source-2.6"="1cgh261syqgb18f6568q7aq6g2pql45iarpwwf413x29v5vz10j8"; +"calculation-1.0"="0v7f5qx319zrwhy85lvk354a7x2vcainiq90y1jkm5cscs23xqjx"; +"calculation.doc-1.0"="1bk9yqx607vp65ifdawaldcsxm065hmyrgzwyy90wkn4kmyq1snq"; +"calculation.source-1.0"="1y5a2n2asfhwm8jylfg5zm5dy4v5s8gjl5ndizwk1ywwl0am2dxx"; +"cascade-1.1"="1gffas6hpj012cd9wvsw5a24bkw8iqxmp64pgj8rhl7xa0n94hr1"; +"cascade.doc-1.1"="1q8hf1bvq0h9qcc5876ddc7hlygqqd1i99drxfk9f07gc99dpg64"; +"cascade.source-1.1"="1y0drfj70ghw71z6054w364bzgzd875i387x0j8p299c88hjp6lm"; +"causets-1.1"="0l7dlry3np34gcgwn14rzzkhhyf8wp69ffanlyqc5n9v1nzzpzjy"; +"causets.doc-1.1"="0afqh4mhixi7lyzii8z3yx9zndm4lzdg24d72y3cqrym4lzf5dsj"; +"ccfonts-1.2"="1rwzpbv0vaf4p77k4hf9ac14l9sw8hsvvqx5diq9dirsfq2js0rb"; +"ccfonts.doc-1.2"="0wccdc79b4qzm3xcwfa8nbbvcp248xgwhh7dszlxw3wh1ggl2lp6"; +"ccfonts.source-1.2"="0avnik79dw3p1wvrg5rlqcaxr3w06mr5jvyms54ha18l2d63yw7q"; +"ccool-3.1"="1dzc7z7q6m58pdjs99170nv0cs8ddi96nkn57qmgqcyvsz5r3wqf"; +"ccool.doc-3.1"="1b7cjrnza7jh4npn31a8311c2m1hgdmpsrs5wcj6lnlkz3g70bsv"; +"ccool.source-3.1"="17dvd32jjh58w75mlccx59ailpwpx89vbzydzjdmzf1x73vf1x63"; +"chemarrow-0.9"="0vy1y1f8czyp36ssicmn1w2px76x47afrfqjfn024jmbs54fwfxq"; +"chemarrow.doc-0.9"="059c8r7vhs6765h0x0ycqhkd65nxb6sqq7xhi7y8jyb7i6q3rbbw"; +"chemarrow.source-0.9"="1ds3yx6mbwjvhzj6ximgglgccndqjbimprf7iszhkz3w5vxq6qz6"; +"chemcompounds-15878"="05rqpsyf12yrhpnzip0ywzflrvsjfdqhpi74iwpwb98d3q82ckai"; +"chemcompounds.doc-15878"="11264rxfhbf36jfkqdfyl2dyqal86bhjbm1zsy9ps8w4fsgdw94a"; +"chemcompounds.source-15878"="044gavw3i9xsa073bwpg11xy75dip172ih6h2p1mbpp8i7bzsrg0"; +"chemcono-1.3"="08cch2gr35wclm1l0j05lfbjskqw43jzz3aj4wi1dhpm31b855q4"; +"chemcono.doc-1.3"="1kcgfx2clh4x59h4scw5mg035wqr2cp5kidn7f6p2aaf5607xid5"; +"chemexec-1.0"="0yj6sygdzs247fpajjl8gk3c6yhk52npbjahgngchqmblhmhlkc0"; +"chemexec.doc-1.0"="0pqksv69yk7vf622x2p2ah735p0a93agfnfyg8hm2jadwjmhzikj"; +"chemformula-4.16"="1cxg6qf8yxgjjj407n983n3lnnldnrwrlwqzisg588apmdjl01df"; +"chemformula.doc-4.16"="117yw6acki6pkb4gybayvw31bmxgkckr0a1gpciyqm75vb8j8gvz"; +"chemgreek-1.1a"="0di3w4yqnjs49im28g2a2qk31d6cqhrbwpq1jcxykk8am7g2sn1c"; +"chemgreek.doc-1.1a"="065mwb7ah9h4qwqp36n0sdlkjv435bwrljz3yzsgym7a4xqvhfwh"; +"chemmacros-5.11a"="113zzfnrbg20ymvb8lp9dy66krymdnvsv13zs974h0xjwhb2kz5z"; +"chemmacros.doc-5.11a"="1rmyhq5fqg13z7b5nalf2d29y85sz8rlj068kxwby9i8xhz0cn6a"; +"chemnum-1.3a"="05z6i3cva4cq45z280ls3y5hrqk9m3a1v5yq51rdj1ilk3yh1a4g"; +"chemnum.doc-1.3a"="0g0q6a845xgpfwkhi31dg6w2rrza8cgxj925rm5m6mg026rd7v03"; +"chemplants-0.9.8"="0dsyymbacp2ffa9lcn7snb1hzxiz3qzqaziij42knpnag4m28fyz"; +"chemplants.doc-0.9.8"="0l4diz19076ijainyh8gck153460bjn4m0jxyjqki3hjs7f15d15"; +"chemschemex-1.2"="1xs0vmk03pmlw7hcnm0llgq7gpg1wlack2k3cry0fnw8jqi6ls8r"; +"chemschemex.doc-1.2"="1gz7sdykvl3s6c5l1vhx2zyjljqrcs2h02s15nly8kjfcmvcncq0"; +"chemschemex.source-1.2"="0wkrpfipgl4yx3d5a5pvfrsxbp3dh9wwm0i34z2y6cra8xd4m58v"; +"chemsec-1.12a"="0rl9aqh35pr0pr82vaq605ii09cxk73mjf3qs1dwcb51hjz51f35"; +"chemsec.doc-1.12a"="1fh5fplxlkzcly15kwzji7ym1ri8q33rs9k6wpbszyr2przn52sy"; +"chemsec.source-1.12a"="053j5riyl07jxzm2l44ns7wyck2y0680p9p73054szd859q86v8h"; +"chemstyle-2.0m"="0a0sd2sv9g68alicfvm28b13kdipyrlck9ipdb3ybjjsi8fn99fg"; +"chemstyle.doc-2.0m"="0gdvvkfjbzf0kdbl5f4j30cvddfbwiashz520g7kpkv460swvz0x"; +"chemstyle.source-2.0m"="06ws8xqy1y609hzfc90l9zn2i1h3a6yq2hxcg1bfsbsqagh11rnz"; +"clrscode-1.7"="0kk8hsrd8rr5vadvh58fdlzpz29cnpr5nhcl5il8fj466dw0igv0"; +"clrscode.doc-1.7"="08wps3rkrx4isg7abr6icfj9pcnhpnpylnk3wvwb42pqah8975xd"; +"clrscode3e-51137"="1f7p04gaccyynqm0wzfz8jinsrrwn6i4amc51s835gxkjv2d8gwv"; +"clrscode3e.doc-51137"="1kryc0ay3bx1maydfha6wm4qw2l9xprnhs3901qbz904l21yawhg"; +"codeanatomy-0.4-Alpha"="00p5rnl1xcyv1bp2db8a5r9ch00iyimdcmqaj7knrgm73i2cvbx4"; +"codeanatomy.doc-0.4-Alpha"="08qh0xd50snbrr92wrd12w3jdingv4ryv6bk5n2sfxk8mcada2ag"; +"codeanatomy.source-0.4-Alpha"="0h4xj1sqimnkk2bdbhayxdsm8qvqsv3qzzpm91acb16ra7kqw1wz"; +"commath-0.3"="0k3s00r4l8bypv1166p8jkdj1wrx4ar4w0y1fggmpzivqicc02g3"; +"commath.doc-0.3"="1n2929g5jhkrrp7fs237h80571m31dd9x0n2dhnqfgynnc9vasrd"; +"commutative-diagrams-1.0.1"="08jd1dzi1y72dhpwng3p11vw8jl98n9h9npyypgc58n2djla8nb6"; +"commutative-diagrams.doc-1.0.1"="1405ya2nynfbzrypjm7i9grp5k53nvrx11wzg3xy82z32cvds0y3"; +"complexity-0.81a"="062xi5wlg3axhrzc9a6nj068z7nskb7qwwk2wr0fzvsflqa9cp0i"; +"complexity.doc-0.81a"="0yzdyn9j1jk0nsw0l4r06cr4brhz1f3lfxc918zalx6h9wnkxi2b"; +"computational-complexity-2.25f"="10as8msnqa06dp3hp945m42rgbaqsja8z4sc79x7n77z6qzmznvl"; +"computational-complexity.doc-2.25f"="0dq56zzw1xzzpm1rdjkqwhr6v93xiv00c1g2rmlmfj5dnbzng7wq"; +"computational-complexity.source-2.25f"="02mapvsz8j1979gy7pmwkdr6wq55v0al71ffl9bi2bl7f5nsz0vc"; +"concmath-17219"="0m98kyji3v4gg1a30phmn7fwssnnbdvyjxvfpl36lnljnicpg28l"; +"concmath.doc-17219"="1392wq35zidk71vxybrwjq79p2gf4spcv0qqb07dsgapbhr2g0aw"; +"concmath.source-17219"="1zn35da4jlplqg7fb5ibzaah2yh1cwjqvzmx45jxg0hnsc7xmlfd"; +"concrete-57963"="06m8d6z5z3dpj9i0nvp50g6pn9j0m4n0n1j3w94nml137qghawyg"; +"concrete.doc-57963"="06z5hh9ksr9jpkfchyh2zp8b827klb4v282ipizrm1dvlv2r1603"; +"conteq-0.1.1"="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df"; +"conteq.doc-0.1.1"="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy"; +"conteq.source-0.1.1"="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8"; +"correctmathalign-1.1"="0dvgaqy8pkk3plhqlxgkxkiwyhfzwcyn391grbqv764mvh4iar69"; +"correctmathalign.doc-1.1"="1fd32yzxj3l4sp5cp9rnwv3175jz5m5hxwlfm10x282g44l7mjid"; +"cryptocode-0.40"="1kmia37x8w4wlx2yaqj2g9mjxmyafhwr8b3l32j3ri44rs3wr2j5"; +"cryptocode.doc-0.40"="1yfzqvcfqdbfz5mvfnlcy11j6bg3vqzirz89jbxmv27bdkdnh0ad"; +"cryptocode.source-0.40"="0c5d5fj72l7b31590119nwf47vwh0d92s90af1w7l78ncr5k37aw"; +"decision-table-0.0.3"="178vrp6436d9an3d1v4p3s8fw1ifi9hz586pbl9qbnbg09x46fyv"; +"decision-table.doc-0.0.3"="0hwi8a89vgpz2zb3dg39gglb16250aiip3j9gk7bayr2gywdd9xa"; +"decision-table.source-0.0.3"="0jki68fx6sw818700gcdz06flr95xfwcvcmdhw8mqxivm7h9rff2"; +"delim-1.0"="0k5h5wk4fn4qzhjcgraqjzf6ggq7rvr8d4c1j2vwxi37fa83642b"; +"delim.doc-1.0"="167hklrsm9dh68nvl6inqck07zfg8w4gr9p5c2n8i6y6v9xlj3q5"; +"delim.source-1.0"="1xh63b78kxngcc3qgzmcfrf4pw2saipw054pzq47vp2ajppp1sq3"; +"delimseasy-2.0"="013r0cgz7ivrjfhmpcf5rdfl2573q35qmw0bhprnamij2jpvggzr"; +"delimseasy.doc-2.0"="02s406bh59qy6g8ckpxhgl0b4xxyr4zf91a6prhzlmbbhf96xbp1"; +"delimset-1.1"="126ax3z4c36z83479zk56jcvdj5r95y182rv42wkm4lm6sy8v24j"; +"delimset.doc-1.1"="1mb85h29fp7nxrkfylfg59jbvjva7lmr7vvgd8nz7k09w1gf4x0b"; +"delimset.source-1.1"="00hp5f5pfad36n4lkmra8mc2n0ynnq9ynnspqfb9378cx3m81cxq"; +"derivative-0.98"="1kcjldvyyrlqh2f3z2x6q0r8km0ly4l1kz7kmpkp0x19dk2lh1r6"; +"derivative.doc-0.98"="07h6jk6yly17zl6a6w3s5l6dykzhvi8dywvhv8krkgakkm5157jf"; +"diffcoeff-3.2"="12k33yfzk814ans730pj9q6h8valvaa11b87f73zn6cd0qyljpwx"; +"diffcoeff.doc-3.2"="04ffwi85qva4r6adddp1hkd28isv5pcrazsj1rdidkagd7gg2q89"; +"digiconfigs-0.5"="1irv3jc87bpnc289r5zh7pgfdgk4bvfwbyv6666kyq8f8yl7m1kh"; +"digiconfigs.doc-0.5"="0fnibq45xgwrha5vfav8lylnb6p2i0brd2k1yp8jm8id6xdsxmq8"; +"dijkstra-0.12"="18gg38x09m7xi80wkpd1sdlk9p1bsnlcx84s7nc1wpar88w4irrk"; +"dijkstra.doc-0.12"="0qr39gb0cwy4kisddkphw8j11j9rpm104af5cpxdcd7w0kljaidf"; +"drawmatrix-1.5.0"="1806y5cdgnj61fy0lilm424x936dz2q5f2j2s3w71kzl5ivyf569"; +"drawmatrix.doc-1.5.0"="16pql717cz27sic494xvmsw2mw9jxn71xka0k8fjys8j52pklqnk"; +"drawmatrix.source-1.5.0"="1x8lc07xccf73vcvywmrqk8ivg5xb1g75gqhff12zgrp2vqzh6g7"; +"drawstack-28582"="1lirkdnsp35l4dwsir1xyf4a2s608ymfc3r0hmgg9phiy9i1664z"; +"drawstack.doc-28582"="127c98z547disxksvhabrpnddrp5ax5dwbgy7nmyja2dg65yax9i"; +"dyntree-1.0"="13imdfv22qsy9jq5vksi9qsx8spcc6h2v9qlc6an9p93cq84fwka"; +"dyntree.doc-1.0"="13wn9lyjqds36ff8lyv125i0qqqqg0az71h7g871zylppfy7iqyc"; +"dyntree.source-1.0"="1r7g555bhgkx29hgp78v31nljg9yaz3fjjy9qbk9kvz6wcphim6l"; +"ebproof-2.1.1"="12dqzyi84jlzm75d77crxbwv2nzyw8raypdj60bjrn6kifav7v0m"; +"ebproof.doc-2.1.1"="1d6g3v3hskgd9wrddkhf7qxg160n6qrfgzxfswajswk0kg2w3675"; +"ebproof.source-2.1.1"="130d3af0n0gjvnm0ad3g6pm8dy1w8zp0q7im3gv1kqbm7k5h0hny"; +"econometrics-1.0"="09zlc6943vf9r2n096x6s0xwbyl4lnpcv8a1hmn81s5czawkrqbs"; +"econometrics.doc-1.0"="1bv3m38gp92cdwhvpwrhs4p34hrmr8800js6myif4r52gnd1q4mb"; +"eltex-2.0"="0k782lxa85dsmqbcw5q8gdny1lygfsv5h2d1d70f6y0df17r57ad"; +"eltex.doc-2.0"="1hshzr96sn318b7ssv6f5md23v997xahm2232c3kns3rzpfssy21"; +"emf-1"="1w7whsff28cf3p0i8hii1lklb8i541di3g4z5iv2rfm4xa5m6i2s"; +"emf.doc-1"="04qq6ljidaqs2i4lxp3m1varm232rhd026qirvr8q10vpkd6grad"; +"endiagram-0.1d"="0vgyl6rbgrq0jslb5k1796hlnzxjpavl5ab6vj6zizinr2rvh0dc"; +"endiagram.doc-0.1d"="1gz8ri82sx9nn2adb7sv434im46cb0ld9r4j9fz07kqn6gxzzr2j"; +"engtlc-3.2"="14lz7dw8wgksbihdvga2yyqa3qxbs382s5pzrfycx9z7503dfy0w"; +"engtlc.doc-3.2"="04lv0x4psfpivxfx5asf40pn0d80cwfwc1pwl21jxihdvc6jhihf"; +"eqexpl-1.1"="0q20g2zh9whs8vpc2mqdxpyk1223jd1ygvchrw2p71d17xhxj45m"; +"eqexpl.doc-1.1"="0bryz6gxw08nx7h1b5as1s52i8zr9l95zlfr4gm98n3yzbr3nzx6"; +"eqnarray-1.3"="13vm2xqfm36a1fpljchnmjnl6m4fia8x5bia0h0yxh7yw740vbzv"; +"eqnarray.doc-1.3"="05vh8d0yyqhn7d45ykrql4dbn07f8yh4jmr6qmx1mkhyiz44c9x6"; +"eqnarray.source-1.3"="109ds6zn3nl17kb4z6m1xpa5ds2iwqaxqbf5jmw54547wv34havy"; +"eqnnumwarn-1.0"="1mv50r9g43si8kmdmf3kgcjmw10kzipq67ssd3vllja4pn9yzmz6"; +"eqnnumwarn.doc-1.0"="1ypvd357npccz8vbbq8ss92cmxphq16isvw4ax0ppgxp2bh7cr4g"; +"euclideangeometry-0.1.8"="1yra81pj5irg2fd4m2d5n9152rlghp8rhhbx3z66syxg20i0mszs"; +"euclideangeometry.doc-0.1.8"="1c06vg35mb637hw1viaq08f2x1mi7nbn1y53h72k6sg01a8yzz9s"; +"euclideangeometry.source-0.1.8"="14054b687yrgdmwx4dgr3srjgm6ibw2fdkwbbndvcr1k27zalib9"; +"extarrows-1.2.0"="151qmfsqqj516ky9j4wbzh1618r769b1bqn4rc5fh51p1s28k8f7"; +"extarrows.doc-1.2.0"="1iw3750iikf6dc6kyid86r7kdzkpi1z4la4zlj63z26fczivif91"; +"extpfeil-0.4"="0n2j976a2607zsgf2cda5vljl497c1562rn7cih11h6vpx76jx9k"; +"extpfeil.doc-0.4"="0irjpxz1zk30myk0h1wjhzcxdpyqjfzxj0lx1nz56v4f157myn50"; +"extpfeil.source-0.4"="1yf2kcx73zp24wrjb59zd1f35809k52cdwym9xlf5fy32rh69y08"; +"faktor-0.1b"="078fxihxiy9bnszy2nj5ca8ys9hhhazkawwi7x2hzwfh3n4dyqz0"; +"faktor.doc-0.1b"="1hj13l2g7za8n3bkxmg04npi5fnp4jv8viyym1076wify7hrwc73"; +"faktor.source-0.1b"="1r8wksjr0q1nm118fzkn527lak31j3sjrbsahpdmvxfir7936njx"; +"fascicules-1"="0zlkjn8kg6vb58xp2xh7jwjk6dmk6knzqh8v7lrdbmzhw9j28vwb"; +"fascicules.doc-1"="1jkhj04gpwcckp9zqanaa9zhplgs2a5xqnn2xf6ir6qifiv3403y"; +"fascicules.source-1"="0d7crimrdcxlh8hd24qfwqnadxfjsfrfnjr4hx5rrj75mm946zmj"; +"fnspe-1.2a"="1w5ibha9cxychlvqrbj2v49kizc7hg14lhn1smky2m9ijqrrdwyn"; +"fnspe.doc-1.2a"="1ix8midc7hy8443fh3vkrl875h1v9hqfwmgjw750gdy9x7y06fmv"; +"fouridx-2.00"="033f2yhslmm70byg4pkw64g976vgssc6yiizmh2f1chlfhsz1qhz"; +"fouridx.doc-2.00"="1k6zirff9bqbz7assfrlq0r83bjqgzblgxix7697lmp6ww2rj4l8"; +"fouridx.source-2.00"="0il905sqxqvqk0fgsns3yb9hjh740h69imykxd84p92fndaha5mn"; +"functan-15878"="0vxwabhbnw3dlxzlqz4yi4l4iw17a0w7lj3gh2q4l3p9lhzr9qmp"; +"functan.doc-15878"="1jxx1inlzrbzm784zwkz55ykdqhn9ncz6cixs2wqh2sx1dih7cwn"; +"functan.source-15878"="1a2x71qhjdr2ayii65qivjmwmxzw6id3vljd8nv3l04xnp6p5dnq"; +"galois-1.5"="1knks42bg72lj8nqdy2iyaqkq5a76yf4zxql24mwxq5fq5xv1vmx"; +"galois.doc-1.5"="1nqhf3si1kljbr0s1sb22kq6nfrp9ycvm6smiyxbw5lyl3spqkxv"; +"galois.source-1.5"="1rlgf9bv4rjkyifz3xvvkv6xnqxl0pl973mq0zqxaiqfkh0i5xwk"; +"gastex-3.0"="08xba3pqif87wn23vacj7amqi97yk2qgsmmawpm3r3iirir2l1d9"; +"gastex.doc-3.0"="1b5qvkpvdlsq85yllixs638p1bwv9xfqy2mkzyckqcwfcdcv7i21"; +"gene-logic-1.4"="0fxddiswkvfzbmcckl6mhyipxjlr0yf0579i792c6rvrqs5avyak"; +"gene-logic.doc-1.4"="1nd4bxrq1g1gxcrs9lvnakaivla37p218pa4ns6jyjmimfl31gxi"; +"ghsystem-4.8c"="02hvpf3idwmm4hjkbvcz0w9n6sb6iy1xcj0iiqa51fzg8kimpkzj"; +"ghsystem.doc-4.8c"="1lld29kqvfgl4fmj70z52l1b5sqcb3fr8d2aim5l88grnypn9gb5"; +"glosmathtools-1.0.0"="07s9jh24m9d9y01kk6z5lw9acri8g8vjmfw0mgdw3mwpffmba5mx"; +"glosmathtools.doc-1.0.0"="1ya15q1nb7xzjxq7cgnl9q8pwfr1xbih6shd89krijr2l3rrycws"; +"gotoh-1.1"="1k3z1b1nyyk4jr2aj60d9p3fvx9ijpi21780wbbzmn5gydmivvm2"; +"gotoh.doc-1.1"="0kcx815006v0azrn7vvbldplg7z4bgsibz921k20pdz2fqy88lnw"; +"gotoh.source-1.1"="04frszj42vxnn5mf0mi5izwqw7mh57w0npp6n77kciyk84qjca7b"; +"grundgesetze-1.02"="0nl7qj5h707mzwr57rz2jqar5p26fg8ba14yp5bm5zvih4s674q6"; +"grundgesetze.doc-1.02"="0a1dfdac2hpfhrmlw5gvvi22jklcv1g9bx50n3pcvhw5jxcsr8zz"; +"grundgesetze.source-1.02"="1mnk3iab43846akkgvkfjfd46kn7ax7wg5hvb08k583bppw8711l"; +"gu-15878"="0h37ilpkqlb6z4fdjldnbwpz2j15izz0wb70n4zmmp2162qqbjni"; +"gu.doc-15878"="1gx36ngw3mbbw9i2xdi2glx80xfvj6pv5frh6fmsqlnvhgni13nf"; +"helmholtz-ellis-ji-notation-1.1"="19szfdy3r6i0ayfr4qjv99dy6h97pqcfr08xhy3v9kzqm4d2b5nb"; +"helmholtz-ellis-ji-notation.doc-1.1"="15d4dil3r44v5xds0n1lnqml7cyncpyr92prb56rfaav669hflbr"; +"helmholtz-ellis-ji-notation.source-1.1"="01zdhy1p6idpksjh1ak1lyw9j536bzr130bjgay471k9d76n38dr"; +"hep-1.0"="016jjvmmc679sk23dy0g09a0s0n176a5pyq18snvi9xajh2c4xw5"; +"hep.doc-1.0"="0czpwbhpgpbij9b97dlb3qq0aa9vyh12p81sdm0hwkj3i16yawav"; +"hepnames-2.0"="0almnyzzdf0q50r6qi7i6c4pp9aakyzdzj2jxkj1y0h5smi602ii"; +"hepnames.doc-2.0"="144wikhsm6mm6f459r4paf0chas0crzvd2rylpynhsmkp9sk3fck"; +"hepparticles-2.0"="076w3wmdywai4pc02k8nk0qyc4vmvn9x6lvidmp4z6as0jir7ydh"; +"hepparticles.doc-2.0"="027pgn4i7n6b2zk8ikyqj4wlkkw1njq4qcfkmy0bgqz3al08zr0b"; +"hepthesis-1.5.2"="165n2pwn04vsln5xy6lkg61c1bp65zyqsd37fmmd3xs7yhv7xc2d"; +"hepthesis.doc-1.5.2"="1cql3rp42bb5c33sdfip69g9rd06107zg6wmsmzkv8c019xwg4y7"; +"hepunits-2.0.0"="11szf1jiralk8jdp45bzksgd76bxcf8xgdk707spbyqf6fzafrz9"; +"hepunits.doc-2.0.0"="071xs04zgnw5ir33qzfn0wxxfsk75d9di0ssl394ksmrm14ny3vi"; +"includernw-0.1.0"="1w51v1v8x7wzibcy40ss7ldra83wbil8w1p978yvs5kzbky3vw2f"; +"includernw.doc-0.1.0"="1zl5fsgzb7nm1wi6ddc3cngqj3apmjwn1wkmsz785nss56vk9f7w"; +"interval-0.4"="04rj730lnkgj4xfm3mldyyf6bb6rr1f3dhms0rnaiq2pzv77cqyw"; +"interval.doc-0.4"="01ngbaw0lbh4dn8kk1vnv49isd7wk8gjh2qvzw6x9yk9nl46gzla"; +"ionumbers-0.3.3"="0pfs5064cya5i6h3bcypsm8fy1bas542kpy742gmbd4rdw8cbxgr"; +"ionumbers.doc-0.3.3"="1sks9qdrl5kivcgn9mgrv3f2gfifmp3icc4wjha4n1va1fqcqcma"; +"ionumbers.source-0.3.3"="1nimrr8b242h11nfxi9si1pg0wc6c0aaa0dl23hjjci89n8y89aq"; +"isomath-0.6.1"="1bzw4l364z6avihhihiprbaslnn49v1rrllf5cj0cg35r3jppz3c"; +"isomath.doc-0.6.1"="1d77wksfk5pidb24cjgak0mv1k09dqmszksrv4q997iwxkwckkna"; +"jkmath-0.1"="00nh8cf002lysvn6qiyy5mcs2n2z5ppr0x5vp1akbz0wwhkhw9h8"; +"jkmath.doc-0.1"="07n2xxfwk0krbiaphfkkfnc8mgc8iqmmmdiz0cj6s7688rlwij0h"; +"jupynotex-0.1"="0dir4hbh5sviw5spsh80cms12rppv3wfqp8cyg5fxkj65mr3akni"; +"jupynotex.doc-0.1"="0xar0qf1czdpzbjn13x2hwrby18qh6s1909nv2q24rl3nrrpzpcc"; +"karnaugh-21338"="0a8bbdd8khib2bfk4n6527d5ggx31gva1fkqbfw2jwc5194rk360"; +"karnaugh.doc-21338"="0n9jqsfn3v78flgqc6ir3w0lymh1j2kl2pcjxq4wnhzgjy8blbq7"; +"karnaugh-map-1.1"="1762fik0bi2530ws92jqfg3bh516wn9pdcyjy6wq2pr3hw33sqfb"; +"karnaugh-map.doc-1.1"="0vpa9xg98ab29lswrwh50i40q7zkkfjcg8jahay7mjbc1w7k882p"; +"karnaugh-map.source-1.1"="0f42riy86dbjcpls7ic4j9z26xqg8310l5r3n28x605jsbm3bwar"; +"karnaughmap-2.0"="01b0ndcd6vcg4y6v4zbi6cymfprv0s4vhh20hwlghh3wy5aknwvl"; +"karnaughmap.doc-2.0"="1xk80qqqpxagvwp1vfh9vgrqihakp7bkd89alb3j9bqaikgdiqdf"; +"karnaughmap.source-2.0"="11b5bjdccy4p3w65268c8im3c6bam9ql60mik8pifwfbn36bhpqd"; +"kvmap-0.3.5"="0ph45hs3x468lhrhsdwikqrw681y9zd3q0b5r088lrb8wsc5pd40"; +"kvmap.doc-0.3.5"="0n0ls3c5w662f95yam6q6rh9gv0vdyzf7rmnkd6dgz5gl1z99q1a"; +"kvmap.source-0.3.5"="0y6mcxixqyqmkk1iq0ys2i174ki4ygss62fx435lwm56xff7mvp3"; +"letterswitharrows-53709"="1d1as1lna9zhxmwvldn64wvkakcnhbr8d76f1cb9lc1s0j6gy493"; +"letterswitharrows.doc-53709"="06awkizz1i7z3g3db5ri67z2nhgccq9cwv97g63q2fbr0zwhps89"; +"letterswitharrows.source-53709"="0a1svwqw035fzrr0n1aybxwx42csdsmkqk8dmygg1nqzkhxcnmw6"; +"lie-hasse-1.0"="1bqc4gpk1f5b7afsqii6ny1xyh4zpc5347v0xv618svjh7dpyzpx"; +"lie-hasse.doc-1.0"="1jfrig40w3ac4j6y8aiwjyvsv9q8lvgvn1977f2yg12lsjdzcpyg"; +"logicproof-33254"="10b55lwrrq1aqmp9njiabqg59xdrd5g8skbcrlhs621s1999dq2g"; +"logicproof.doc-33254"="119zgxwx0q6c4ghpb30mvpdwrpr0xvk54hmj6qfpih0kxj0zp1az"; +"logicproof.source-33254"="19j00a28pz5dp29sx61dnrpqyl24sx9apf2ck334ap5sw7awnc70"; +"longdivision-1.2.0"="12cwjmn61kyzvi4p71n6sndw91x43pkcr959fpwj8wz09frva5j2"; +"longdivision.doc-1.2.0"="0vrx824jwwhq3p2p2yl2q60ssv1zlkj4ji4psypj62kfw3vnyh59"; +"lpform-36918"="033w5cd8z7r02h4r2p8lha6z81qqvky69a7aiahjpd15smss4wjp"; +"lpform.doc-36918"="0vnz4simqdsznciymkqyy0cpbnxfpkd54wdrcn5ra257a37x1f4z"; +"lplfitch-0.9"="1qjj043c943pj0pvzyhs152795zyskcrxkkmp49jxxm0hi8ww51g"; +"lplfitch.doc-0.9"="1nq554c0vjmcdb9xyprjvvvcwrkbbh8s1x0ypkzi0gqds4m4a38p"; +"lplfitch.source-0.9"="0cc04s2ndbs8j2xg4afxxyi2l8mmnxvgfaflak64v6i92n9icfg1"; +"lstbayes-48160"="1kpkr8xd1k1iinrp1ljj1wjphn0c58l8f6hci0axvxdklr02s3h3"; +"lstbayes.doc-48160"="0x288aij80j9vy6bscj3w257nj0y3z1hf0rf9yncs13jsxr8rz05"; +"lstbayes.source-48160"="1hcgcvnki1xkh4ni6jqcazl0rjbhfmm6gbgsp9n5qavdgnv7qzmk"; +"mathcommand-1.03"="1wvswr6dygg8piyrbvmd1vmdcwzy21wr4ij8xc8rl1fg3nkpwscc"; +"mathcommand.doc-1.03"="013i0qbw40n0nj6l93f6n7hqmjj4q7bc7s35imdb79r8favvwp88"; +"mathcommand.source-1.03"="138lqlcadfnydxyaqi20qzacd363avji0c4pygnc0m9xamxxxv7l"; +"mathcomp-0.1f"="0ciipbbi89n9aakg86czfmasfnx0k6rq7f8v0wkxk3zk2m441cb9"; +"mathcomp.doc-0.1f"="16q0b81y748qnyc2gycrb3jhw1i5yphmf6rpivwikzpk2nrg3ndv"; +"mathcomp.source-0.1f"="0xdivrbkhn1fh75ws54i2vxgx3xqaqkpfjir5q84vwxgmxfv4cja"; +"mathfixs-1.01"="1vvyka8kilv92hfsx8ahb200cl50kp1r4qdiaqgzkjag5kfxy1ka"; +"mathfixs.doc-1.01"="0gbh6yicv1mf0llfipqymy930zpq9jqc2ix2gfbjdh909l1y34rw"; +"mathfixs.source-1.01"="1k49pdi4kivk707i7fb2banj0qaqc5qx8zl2l8b41i6q2ir90a4i"; +"mathlig-1.0"="0pyaqwr2h9knxf1axi55vm6wr9xj15d5j5pagb2011k3b830f91b"; +"mathpartir-1.3.2"="1a934cglbiahnmqxjg2695rmp8fxlg3m19zka8ayc743ckv92prd"; +"mathpartir.doc-1.3.2"="1aw9sbhgca7hnshkd2vyzf5lrq2xql25mwp9qyishkzq9ayv7p13"; +"mathpartir.source-1.3.2"="0bn3zragwja3hh32fbrsdsswlf07a8i6qrpnv2c1c47m86xk3764"; +"mathpunctspace-1.1"="1vlbw77bqi0qlm6i6hk0kz1syjzjk41mmj9nhnsbm3l8f5fy44bp"; +"mathpunctspace.doc-1.1"="09m2w7pzcahncazlw16c0bh6v3xgnm7rqf71lpvl8p33krasaj9z"; +"matlab-prettifier-0.3"="1q7i44n15pvpc65k41nw6z8gxj0nwk39mhafnmsibxh41yyxz9ns"; +"matlab-prettifier.doc-0.3"="15x6lbj54597f8wm0vgf0yy0iwh7g7xv7cnllnay651zwg3z7h9l"; +"matlab-prettifier.source-0.3"="0vr8cll1v3hgikrng1rilqb5d3kbggcmdy92hsdnip7dr0hxc39y"; +"matrix-skeleton-1.0"="1ixn62c0jj73wjh41r5p5vazhpkh1pq5lp1hmzlch74cynw509h8"; +"matrix-skeleton.doc-1.0"="04fm0506pvrqw11lpsdpjn3386dnjmn49g7lhjhbz4ny5k42ky56"; +"mattens-1.3"="13rjfhj9im0rag45b8dlp9sxhd8c77m2qhszdxpg1myagzhqi81m"; +"mattens.doc-1.3"="037kj0fhgy66mcpdwi5hkx1gfdsczqb9hd6zdn3gfid0cm3kylsq"; +"mattens.source-1.3"="1brp2vf133py1a1vbi6rz254008pxi2q9ya6igahfbkj8mh20cqy"; +"membranecomputing-0.1"="0rr1wxfv1ry1dvv7bigcvvfv18s1pxq0nng188c5khnab25js6dc"; +"membranecomputing.doc-0.1"="1agmb82bxrzf9dxh93vd2cxjkzlyvl9h91aav29d02774xm7zqhx"; +"memorygraphs-0.1.1"="1ph43wp3h3pz5hh6dp3n6dzmmbn0fw11w3v2fjf6d07a73jqh97j"; +"memorygraphs.doc-0.1.1"="1k8gppgv5kkx7i799mwc9iclp2rv9hgdk2bwnqcyc3j3rmnpyiwa"; +"mgltex-4.2"="11xl6nw76hana2mdcq7m4h6kx6zx91apxcqkgjczcw9f7ip6m3cl"; +"mgltex.doc-4.2"="10jqlxxdp5kszxpwxyjf5mqaz6pzbp559kdzicm6qvif23cfgacx"; +"mgltex.source-4.2"="1pdlxf2qfyzm3pjjpl0wir4sr255lqnspbsvxfy7wz78aii2ik5y"; +"mhchem-52662"="0cp7dfkry418kb0md1bvkv5b7x8m5r5ygj6lnz3arym2fzmmrp7z"; +"mhchem.doc-52662"="1n1zviwdcdlg33lx8k6q3q70ccjqhk15dcbnvxrq6mh7hs5d61d6"; +"mhequ-1.7"="0r670dwmnr70dwxq4si58km2znp1dj6xy40w45q0bdiqzs5rbc8r"; +"mhequ.doc-1.7"="037is4p9k9x9my8migiiw6n5yzrb9zfkhhyjjgmh855fdnsri26r"; +"miller-1.2"="1nk31l9g231c3dk70fqph444z9x5rdjy6g7wazy4ygl3q4gfh6fj"; +"miller.doc-1.2"="1vvxnbbjn325y9s5h7qp6v2z1xy6wwppwqv6iwdak7mf47gww2gf"; +"miller.source-1.2"="0jpyvjpaqz1x5avqy1dzf22qwss7ksbp917ncmgjdxhj82jhy2d7"; +"mismath-1.8"="1c54n9sa0ksprq34f8a9k856a1nmgk1wyakdliibxgf797akwwns"; +"mismath.doc-1.8"="0xp93lv93gdd33y7g7izi92lkzs1gxaqd0wknyg35a0pxjmgpi8n"; +"mismath.source-1.8"="02qga9637ncaxggwpqnhf3720jwxg8jqqf4qfm271illi07hl2z6"; +"multiobjective-1.0"="072zpfc1achwj0b1dv8yskdcbg92a2imnmn9z492l7xxyz889n5x"; +"multiobjective.doc-1.0"="161nkl1q2kc91is8y6h2j71hnbly6hv1fjfmlhb50xypjgrv1ibs"; +"multiobjective.source-1.0"="1nps6rl8di10mr5r1hd71svlj0dxd51bk0plszk094a3r3l6z4z4"; +"natded-0.1"="1vxqyyfrmrkwyzil0a3xvlrmfzyfxdkfl10rlfzgwdwd63bb99kk"; +"natded.doc-0.1"="1anh6k76h573yci4lcw5wyf552zfqdrf75vpg19vrr3nijhj9k8v"; +"nath-15878"="13j02zq77fv4c5f45qn3hgb7v20xi0d0dpj0m2pfdc7fj74k8ib3"; +"nath.doc-15878"="1ppyrz9y2hkv6pq18w4chm90f9x9d3qscw679281si2phmnkl1mn"; +"nicematrix-5.13"="006xrx4jjayz7c8ingrhk2j1s0zd5hgjp954w29ql7bx5skrzf50"; +"nicematrix.doc-5.13"="1phqas7q2c71rbg061rn8ws46y2g6bqafsyz15imi4nxgrwjz6sm"; +"nicematrix.source-5.13"="010d2nr7zaczzv3140r4sf9ry8vij4cfjyxndvz3bxaipqnl8br9"; +"nuc-0.1"="1918fk7bh6pz1grm1655fag16i0ir67ywcx28jsggsly6641nkm9"; +"nuc.doc-0.1"="0r4345bpjdb9f5gmcdjf6zav64gab5f9i4nfql01yg7b7mhk487x"; +"nucleardata-1.1"="0rrxpz66rf6g9cp6ix4rrbjqj9s357qsbv87dhri62iy3alw5bv9"; +"nucleardata.doc-1.1"="0kfi9c6isdlf188zsk2yx38z43zjzxf8fhvl3hm2y87di2kihdax"; +"nucleardata.source-1.1"="1lai682rycff3hm954x482hzn1mq1lrik3g1fwkbm73s99nljyj1"; +"numerica-1.0.0"="14pccmir9j8vyvhky8awcp7y5rs8lc1l3bspw286lvib6k41rs0g"; +"numerica.doc-1.0.0"="1v4lpvkzxlcycphdaqy4bra0x7r04xjxkw334girhgbig34s3r4b"; +"objectz-19389"="0s93jjwcmyjd126wmf2rw3776jgq0ldk40f269cp29968q00sfn3"; +"objectz.doc-19389"="1qxqphnsgh412lizx6jij6qhnlx1d558bzd3klqf950bp2hy3cm6"; +"objectz.source-19389"="1l8afdawrrcnbpqdhjls28ncksg8lzs7g59viqygwixwplha0fb9"; +"oplotsymbl-1.4"="1x5wqngjdmc4751ci5qaivzgqynmmg00kg2clngxjqf48n4fakdd"; +"oplotsymbl.doc-1.4"="0bj6w6h4g991rfddmrxgc02090vay2h2qjx36cb0hfx55gwkmh3b"; +"ot-tableau-44889"="05pg1sn48m2h88wl2gw0lxrf7magnzz70f0ggsidjzdbmg01l7bv"; +"ot-tableau.doc-44889"="0b628crydy3flq7scsv3s6anxx3fpnjhiwq12v6yqjzdanh1f5vn"; +"oubraces-21833"="1rhavggv1c50krafvh7lwnvarh7lh59x7lwkipw24qakq7l2a6mg"; +"oubraces.doc-21833"="1bw3b54cn5dk0j4diq8qxfba0w3p0f78h4kycb2bqd2gq7258vyq"; +"perfectcut-2.3"="1hjppa3dv8a5740nr5jya445y5nb0nb2z1jlkqh386bnvgby8393"; +"perfectcut.doc-2.3"="1ly3zrrrfb3jihf02p2j5ym3m2gnr18pf2v5qg8rsj2l258xlark"; +"physconst-1.1.2"="0078ggfyyr2vh5ni05la8jaxnyxaz2jn0rlahwkw05ng1h5nwl0s"; +"physconst.doc-1.1.2"="0d10kzi278b6yf7dvm3j2nsks43jm6jfjql5jyv51l8bq5grkmr8"; +"physconst.source-1.1.2"="1qvhif2amxfqvwj6vd82f9mjgrk79crnz4sw5v19v02xzxv66fsj"; +"physics-1.3"="06nwz84201w9vky4s877fsiw4pk1kf6iq9yp1jcap7j57nb4l23j"; +"physics.doc-1.3"="09zmpxkrrv9j2ip034vqwblazl4kyprvp24k0f2k0xgc4fja2pqn"; +"physunits-1.2.0"="0fzx8c7sgd6incgwdbzyd3pb9dmdajb3qdfd3mj8sascilr0c2h4"; +"physunits.doc-1.2.0"="0ha1zp0lzx2q10m0wp492sf45pw5cfd98s9pnzn2wxx3k970agf8"; +"physunits.source-1.2.0"="00p7p4hh49i9xwnfd8y7nsgxajjcpdlxw1asyxb8q20x1w1wy2cs"; +"pinoutikz-1.1.2"="1kj24i32ql4jfhzfxyrcj0nmyyhf4ipic7zdzcz71za6njqv3gql"; +"pinoutikz.doc-1.1.2"="15farzmd27gp8ms5vck6xcjs0cx7rp47nww0shs6r0b0l99946m1"; +"pm-isomath-1.0.07"="14rjv3xkjpd5qszczmn1pqn9g70qx1xc137y3wxwi9p39rqwdfbb"; +"pm-isomath.doc-1.0.07"="19vra984m1gkmvbp2ih6nrfgcy9hqg761k0s795x1arwcl36qrc9"; +"pm-isomath.source-1.0.07"="00yi8a1a2rzrxkx4gvy7gmih48xd3pv6l43yz7hj8921n1nz3akc"; +"polexpr-0.7.5"="1wsnbcwgkn81jmrgifkhqyqxgm7bna2psk2dgscai9wfmgpj70ab"; +"polexpr.doc-0.7.5"="0ymb8l7dg6ilv2x9570kf9sy50c6j8d7vpflv7s2k99v682bk5fm"; +"prftree-1.6"="1sdb56cvlfrys3f884hg6qpv1nwd6ywfyiq8168bs78g4q2ah4by"; +"prftree.doc-1.6"="137f5nbcm6p428an3v20j5cx5djvdri12ph07czj13877pjy9ccf"; +"principia-1.2"="1ar643rfr612dx8yam9qwcqj66jqphbqf1rq7d2k2ap7m9k5y95x"; +"principia.doc-1.2"="0qya8p6arna3jqvlys3qs78pnl6q574j92z8b54668s7krja22r5"; +"proba-15878"="15d8n2ik6m5sc4vlp3k2w3h5h8h5s4agijgcnlkmklw3qv172vii"; +"proba.doc-15878"="1m2mbbn1fa616dfxkb7x8azqsvczyifygjmbblsyfkd5kl6f8dwp"; +"proba.source-15878"="0wbnfa1i6vbpbq2a4yhsvpyifiw1pirz72qasxm1nwmgfg5dndx7"; +"proof-at-the-end-51194"="1z6288wnaj3k0ql1797l6c72nrzrvg1x8py46g93q0awlihka6cs"; +"proof-at-the-end.doc-51194"="0vpjp1s66ns81qd03nqkw4782i7pl2va7w4nbngdmn38fs18l2gw"; +"proof-at-the-end.source-51194"="14d7xbxsm61f6z05442jhx47zblpc1d8yi57ns3vcbggaiv23h3q"; +"prooftrees-0.7_svn_8641"="08ijsd4gfkgczfgz3wmlyk6pb61cqdc7f36v5131xv12x6s2kd4l"; +"prooftrees.doc-0.7_svn_8641"="0ldhmf22q3m3nhxw2m1z9f19xzw753qrm0nw8hch6wzk419p29k9"; +"pseudo-1.1.3"="1yiqgp1ymhfjh2c1j8qa64bj6cq74jv6ba1wz3i6akngyvbmgqpf"; +"pseudo.doc-1.1.3"="1w8p88j2i8ngqgqv5pilbi3x9nrcjyiliwgjigk3acq0qv9vns2s"; +"pseudocode-54080"="0x2p2bq7cqajrn8s03dgikxg2nb94hk7mzmi7l911xdgdprlg6qb"; +"pseudocode.doc-54080"="1qzvdp0qmmlljahg6hqn7c67sszvjvp3v8zvg7nwam58by39l3k1"; +"pythonhighlight-43191"="1bf3jf05zyggcbz5c6hr06wd8dhf0q5m1i4i7p026s1b7dxxq1qk"; +"pythonhighlight.doc-43191"="0qw1rnyg5pawmp7hd3b0dyjzmbrlxa0hzg7bxnmvrz1akn1cas3q"; +"qsharp-0.3.1901.1401"="1lrnzvlalznyxmkwrn9nh3x2zz74bakiq09dg374js5yni36igf5"; +"qsharp.doc-0.3.1901.1401"="091kiiicfinn5cxpfhhb66j3hkmv80gsqd1b66xcz4ghxan43ywk"; +"qsharp.source-0.3.1901.1401"="13923qlhbx52x7h3v0iv6y8q0dz8g2ikvfz9m0lh9zwjcwv4mpxy"; +"rank-2-roots-1.0"="1fy1zv4yf2gqz4im40r19m1mmgagkvmfhxpzj44csasdcd2w1415"; +"rank-2-roots.doc-1.0"="0mrj96c11vrp0b6df17fkiwnbnxpis3rwk5ji8wwa1klg5han5kf"; +"rec-thy-3.7"="1pcs8j22l18pnfk1a0yyply6w6fs1rb5jxbz1i1cp42nhdrih6r1"; +"rec-thy.doc-3.7"="1bn4hjvfyyyi4ry9lzh70s1s8vnkh49xm439gy23mkz1ij8qa95h"; +"rest-api-1.4"="04y8xai39hlhj6y78cxq2fqy7fis7mbpwzyk4jmgqd3365738615"; +"rest-api.doc-1.4"="1w33inmwr66p81g66zxqiqccks965060034sx8rmjnjfgwqqgcgn"; +"rest-api.source-1.4"="06c06pbqa8m58r0lcr2xc6zahf6gjdc1r2zfgs3q1b6czy6rns34"; +"revquantum-0.11"="00mcqs4zd33larynscqza6p18a8payrgarwbgdsnnvaqf3c2rjnf"; +"revquantum.doc-0.11"="1nbs15bl80yl7hrav0awm43q4brdfqm83bpyf2zg00yz5pjm1497"; +"revquantum.source-0.11"="0dqxvcd5yinnsal4wydb5ybsldsax18zp016p2yzk212rk61rikd"; +"ribbonproofs-1.0"="1f7j2v5233fvjzlrlfliy18gy890mlr2n2fbqfhh88f2w3z4nw2b"; +"ribbonproofs.doc-1.0"="0gqbakw5jdamy0q4rx8y19xkdnb7v5arpkjmmsxhvv12pk2kb3d3"; +"rmathbr-1.1.1"="1jlafpdjryj0sic2zpn5f90754ydnfbb74x8b3q19klm3n20bsr2"; +"rmathbr.doc-1.1.1"="1nfcd9ypyscqv3ghlaljrnj4rm2md5h5k6yl173n15zrr56sxkfd"; +"rmathbr.source-1.1.1"="08mzgxkwk6frzgd2hq8fz30dliwrkrk23xmqy9p0qjmq9vi7vbf9"; +"sankey-3.0"="1f336mia2nr3sz3xcr878ymm4anyja94lmglz86skvl75jmh8p83"; +"sankey.doc-3.0"="0yb8sm559fqskd06lgkn3zc8zm24p9869f9d1gimfsk373hb6mjf"; +"sankey.source-3.0"="1q73vwvc2f6a820fixyg35mw0wp8z649zn8p6k4bd5hfzg7a3s7j"; +"sasnrdisplay-0.95"="0qhvx1nc7v6l2gq8c3av4sqsjlzm1raw6cmrf2lls7dg4dpz60pm"; +"sasnrdisplay.doc-0.95"="10f3cr5vfdgb7g0yw3pjqdfiaciwb81m2gssn0in1hv8izy09krn"; +"sciposter-1.18"="1pihppjlynvdlsin8brrhl2mg2jif3fa1mvsard686m4ar6id25f"; +"sciposter.doc-1.18"="0cpyz5n70hsp5hjdja3pl1lal1i2akn7xawwcp983mqfgnp8jm7c"; +"sclang-prettifier-0.1"="164sdqd7msilg6jk1ivjzvv49amji4hb5r6wg51vcxmg069apcr5"; +"sclang-prettifier.doc-0.1"="07s0y5dfmp26j0ayz2bhksdybpqb4cn439cvyifxillkq277dqk2"; +"sclang-prettifier.source-0.1"="1y67y73f2whg663hw56fwrn6jhhpdpm81w32kzwc7r6sk79bnq3a"; +"scratchx-1.1"="1rhqiix6dmdf9i8wan5xh0sw9ynawzb080b4izlp06d8vkfzx6rb"; +"scratchx.doc-1.1"="1p263dcjk8mjfxzgppkbkh7l2p89kavdk6llkffkj0z8gvg8xaiy"; +"sesamanuel-0.6"="1a6673xpr0q8v7wr1rrq3n6acydsfsc3q6kmj0qg6hm7lzqc1f2r"; +"sesamanuel.doc-0.6"="164hkrwdgpq5azhr9z2ganiwhzqxfaljm89igzprgcg23cy0l3vh"; +"sesamanuel.source-0.6"="0n1akz8757l5k2rv188rnqd90dkmy3xppzcfwahiy22p4bzaw2aq"; +"sfg-0.91"="0ldw6c8aqqd7m4ahziqv857zkjk3ap12xnnl5k43dcg8n7apb3ix"; +"sfg.doc-0.91"="1d627ks3av63b142f8kd7g0fi1f4xzq0yg219fj8qxja4mm5jrv6"; +"shuffle-1.0"="0laiw8v6izp53c8y0jf4k1nb8brvs36gd937nz2i2cvnpghz98if"; +"shuffle.doc-1.0"="1wd46l86h8vlxpasvhnvjimsfrhrbs56i767v2h7bdl8yp751ycl"; +"shuffle.source-1.0"="13qz2jc0f084acxdsf99fj22kbsjkr6i3y7pqzh1g2jd4d8bbw8m"; +"simplebnf-0.2.0"="0jjymrg2vs6jibfg6k21ckcznzf4ga0zqcvwwghyaqcxbmq7sh91"; +"simplebnf.doc-0.2.0"="05nkaf2p60a7k94vhqs71d75gl5aljyddlf1yjrbdigfmpsyagja"; +"simpler-wick-1.0.0"="0lm22wdxiwasv4igfsyjfi338qc7m985da7a9a6q8cm63hks2alm"; +"simpler-wick.doc-1.0.0"="18hmx8b6zpsc98mmjvimdayqpkffwjjch4sjajbz4csjpza7nl98"; +"simplewick-1.2a"="07rzphj6ffla4qz9pa31xnn25d420lvsnmgj7l78ryxai5amdfvw"; +"simplewick.doc-1.2a"="1ch7yqh3bv2y6282cgvqzm4pf5hgpfvlmpg66zcp44wnkq1sw67d"; +"simplewick.source-1.2a"="070f0zrnrf2sh0dx5dlbz6072b76f8iw03pvywhyryfgghfdfv7d"; +"siunitx-2.8c"="0dz02vigfl2k2l924kcfb912rf91fb054px2vxms3l2c3niq5wld"; +"siunitx.doc-2.8c"="1ds3xr22sn6h9754xczdl1jajcjl3g4cfhc73sq5sxbmbcqsmck9"; +"siunitx.source-2.8c"="0v1zxiylg0hzsww3n1d2p28qb0xslbvnfpz8yh4hjsnb6qzr5prw"; +"skmath-0.5a"="144iwn9hv4d71420878y7dzygmyyyr2l12gsqrbb44mdal68q58p"; +"skmath.doc-0.5a"="0an8w64z7dvbxgagga33zar0m2l44327q4lpz59n75g7c6qswnv5"; +"skmath.source-0.5a"="0finxgy2sj5wpzmjh5zfcq9l3dzka1mlffbgmhzp7yk57rrz9lr4"; +"spalign-42225"="0wy2kliv3mrcqvandk3qbbqjbri6xq69d5jsi80l7qdiij86z3g2"; +"spalign.doc-42225"="0jp34h19q4588rli6k0v5kg47j6i1gjpjgk772fkb7l0f5wln7k3"; +"spalign.source-42225"="02qzd21qzb8s2jsip2fr1jgf11xd7xmiyi7fv0s9ylyfr259c5b1"; +"stanli-3.0"="05mq6zhs6x5qjqk58gwws9lw3p876bd1f8a5c2jvb2azjl7d9r4f"; +"stanli.doc-3.0"="091knxhx7jsjiv4ip0z2jbazvv3xmbvandbraxbipp4zqqakb8bj"; +"statex-1.6"="11qpdrcszbsrasbasmk6h9wg5r2a11pm116i16h7mvw73vjaq76f"; +"statex.doc-1.6"="0dkb7c7wavn3qgndl0g8jpkx1qr00c3iwp6d0r72znggl4cznhsd"; +"statex2-2.1"="1949zszdv000dw1dx1jjznbd79q73fjiqnkq2axdbxffh47ls1dp"; +"statex2.doc-2.1"="0fkzbs76yfyygscazn4dgphs8g1byzg9n3fbdg6pizzncirbgh6c"; +"statistics-2.2"="11szmc6f380si38il9vw78n30yyfmmvgxpp8f8p8kzb373d3hs9f"; +"statistics.doc-2.2"="0z8mx2gar2fn97n3x01dw23l7r4ckqwgfksgmfdj7vhgs51wsv16"; +"statistics.source-2.2"="1dkz9vdcnadd1xd4k9i37a3mpn1bwm4zf3c6bg6rvzxaarrrci4m"; +"statistik-0.03"="1c0469cxfvyg5jl9q1pyzras6fk3f6zbgigaby0iav34imhg7zy6"; +"statistik.doc-0.03"="0fih9k7mpzg25h56x6zzdbdnhybd25b7hlv0pdbnlfb73s7h4mcv"; +"statistik.source-0.03"="0i68y5ynymx339zgxc9r8dgcflm5468gd6cwn9ngpnjvqqbas3kf"; +"statmath-0.1"="0imcx9nx9h5fi53nwg82n2d9s21vlngdab7znyg1z5pdll0df043"; +"statmath.doc-0.1"="10mxwgvjjnk2ci05ikml35q64c82c7dv7rjwajhk03gq8ljq939j"; +"statmath.source-0.1"="1himjc8cn3j5jr073qpp4mfyi2cpr0czf7iykr0w6b7722kkqdh1"; +"steinmetz-1.0"="0g9ll1hsf82wll1ng5lc2v6il3l6pdy3dppz7k7piqqmifzc8ifz"; +"steinmetz.doc-1.0"="0gyyqmllgp6dg2g4nh5q5ycnixlyzc6xfmi3szypmr1rai1dvx2s"; +"steinmetz.source-1.0"="07fj431nraf7f9qcmm5bvk03cblmj15xcsbnhgish4rxqbf7clsj"; +"structmech.doc-1.0"="1s384frn43m2vv0cqf9lm7vkg6911pj5v8d6h5zg9didfgv8pc8z"; +"struktex-2.3c-0-g7d3fc5b"="0qkfh53rhy29zapn4zr6n14nmximfyv8rbgxm16qq3l6mid5jnyc"; +"struktex.doc-2.3c-0-g7d3fc5b"="1nbbqh3g42qvrk478q2v6snl1lbmfjnb07jhx6z53yk87pna8gmb"; +"struktex.source-2.3c-0-g7d3fc5b"="0j3bprncnkp7iar2dh46bqr3v9zdvkk9c2w9kgj523bcyzw48zyx"; +"substances-0.2a"="13nl4xc0spsg4bq3ld0fv0612kac2z017zp8hwck2d8413jwkj8y"; +"substances.doc-0.2a"="0xbrs7qpbs5314j79nzcv408ghhayqxj2n0nfify6isxh85r1ks5"; +"subsupscripts-1.0"="14v5a89iwm2ykjsm3jxgbqsm5nba444yh8mzqf23s23z7fmcmsqb"; +"subsupscripts.doc-1.0"="10swcywyb0jdsjhm0cybvmyc9g2ksxq60bqaqnp23kfxp39g9rq2"; +"subtext-1.1"="030f7sq37qjn99l1z6nx7qbivhczpzhjm7drxhhhsssw4n3mci7k"; +"subtext.doc-1.1"="1m6zyy09a3193w0p91y8g66n8bnm80awzg2g8l195n4p41l8vnkw"; +"susy-19440"="06q7nw6bh9dkknj1jzvy1wljh9vn49z7mbhr5d0ydv10mp9y9zlv"; +"susy.doc-19440"="0dsr3yd5v6i240f7fgpbdlp0dig4dl0376ssd7nbg86scl63k9iy"; +"syllogism-1.2"="01x5kjyfm5ksqig5h2b8sgmn05ws0a65idv1xh5l709yp2i35120"; +"syllogism.doc-1.2"="1zqljwv03f755lzc9fhps5xh2dy6r0jdsvp6a21ka11kqq696vjw"; +"sympytexpackage-0.3"="0d77xd1xl9wc6qbd335kvhq8gbvvqzgqxblhcmyd5khhg3azk6sk"; +"sympytexpackage.doc-0.3"="1y743lffzk65wl5nwi490wnmf4xaxcnkpicmhadcvjcadvhrnlxn"; +"sympytexpackage.source-0.3"="0q3cl06b2mcpn5an1m7c68c4c0swmgacj3afqb38984dcvap5abv"; +"synproof-1.0"="01bx52ckyg4abigyzfcxi83jqdkczvsj9b80rznqz8vm9yrbv951"; +"synproof.doc-1.0"="1kvd3vvj6yx1bfqbi858qglc31dx03ish49q0lai0mp1814n6fqh"; +"t-angles-15878"="1p1h0gz1k4lr7rmadhdgb7l3gp55w12m3p88hy9d4d0ryzld299q"; +"t-angles.doc-15878"="1n01pg82p0yz0b7ph82k5ha7a9j0a4hc0489xq9pf4kbizh7ap4d"; +"tablor-4.07-g"="15xinskbqjj1dmi1fpvb6slg8kk3g66dm70z9f7dx8bzb1v65zwz"; +"tablor.doc-4.07-g"="0lmi8mn5k7b5i0n7bqhagjkkzs2niy9852r8r0vv2c8qfbpm4hpm"; +"tensind-1.1"="05vgqn5wcynyp8gy80icnkrdrgb0wsr3h0db033yx4yk3c8lhwaf"; +"tensind.doc-1.1"="1vns4k813ffccps5vrrpfmb7rm4fmfs8zgs7cnw2hqg08dmzijfn"; +"tensor-2.1"="1lw3dxk7ar07d4mb02rvv5r2zdkx8pz0w3dzf9s2pa2slbjx5dlx"; +"tensor.doc-2.1"="17xg416ccniiwvq0schcmp53a9hdxvds2pfn6q1q5xw78r983r62"; +"tensor.source-2.1"="1xh8fk3z37wc0jhz8jhz12d35xq6a8fsmn64ga4iv7pi1lhvaagq"; +"tex-ewd-15878"="1pmf17bxw6i4a9pfi32fjk0hd3p44kw2scwmr7p38320r6dv7srk"; +"tex-ewd.doc-15878"="0ss7nljpn8k3cz3av5qanc966q90v3qj9qy0akmdzbiy7q8ml7na"; +"textgreek-0.7"="0r7jcv38749xndr6sigy8zw96kwqw63k4m33c09hikawf2728jzd"; +"textgreek.doc-0.7"="12pwr5b8269hrwgpr9g4chw273wv81cfa52wvp3nhkd2cvbhfcp4"; +"textgreek.source-0.7"="0wq69l55462snrkpbpnlg03mrn2yxvibw38lkplgfc65gzaa07sw"; +"textopo-1.5"="10g5i5mg9898q091w9svm7gk4hgd6dja3dwy5dwc7s78pv0qcd68"; +"textopo.doc-1.5"="0r94ivbqmvs9lyw1ipwzcb4f0v9npvyfll7r8c9g627ikk9fmpa4"; +"textopo.source-1.5"="19p7sgz34dkvjqkld38x8li539kx140w1nj9l3ai5chilxz4lvy1"; +"thmbox-15878"="16c6p3n4zc2726adj8z131h03gbzyhmh5bj8hzc286p96131swdw"; +"thmbox.doc-15878"="15mkfzmy0141k5wgspngbwnnldf0i1rvbmq2bkzcpb72v9vcj8fd"; +"thmbox.source-15878"="0lv5mr23wwhig6r9fyy7rlv2cqxlr35y3g89i938w35s9q25xx08"; +"turnstile-1.0"="1br0ny72qsv5fpfw4x0v7q3dqy2jgicyd97ibzpxc04mp967njjr"; +"turnstile.doc-1.0"="1iv8ysamcqzc7lavhskf8kwi29jn9xcda0am0ak9s1c7nz7pb3ly"; +"turnstile.source-1.0"="0aadq0w193hl3rlb1d8xv60yy0fam4aprz4j96dphnanbb9g27ll"; +"ulqda-1.1"="1mpjwq43dj2am9llszy1yzz2jbhdskf14ki881j6q6h5zfwwacdv"; +"ulqda.doc-1.1"="0kkxa9sv2xg6d31bj00wszkchkk6raj2pvqji930098jray3zdc7"; +"ulqda.source-1.1"="1gb2r4zzr3q2kfigrb4j528jmr5paj38swhnp1dlb2dqr8y1szfc"; +"unitsdef-0.2"="1ck9awf9mzjhq0x4c3cpan79imh7ijpffii90955jc78h3bhcwkg"; +"unitsdef.doc-0.2"="15svjszg72axskaa3yg91gvh9y01s1nh5x6nhwqbr9mz3bn3npck"; +"unitsdef.source-0.2"="07v6xpwkag6fp8p331gcfbb0p1ca36rvrs9kbkayc986k6nds688"; +"venn-15878"="0kfq2wnjsbvk0ciwrm4923fpr7whmzyv240r4zps41vzpc4mykiy"; +"venn.doc-15878"="0izj8qsnxj9jgslwzz37xwr9n812y3cxmfs52yd7p4638qid50im"; +"witharrows-2.6c"="0zvrvhyn2c1s8h9a74g0dhnipbpkgzwld3l6ara2zfisx8rhs0dp"; +"witharrows.doc-2.6c"="18nxizvzlfhhsili06h19x1p2jy0dy4h1q6zaap3b013sipljhii"; +"witharrows.source-2.6c"="1815k8n2m6bsdw4ks9az3af4mcazqgxx1mi2mmrp3dypjkysa17x"; +"xymtex-5.06"="01432q9vnzbxzli9bdkdsd7ccvw3ksc76cs3568lsr35bkq1yy1n"; +"xymtex.doc-5.06"="0bx00qsgnndw8kq59nbihlzlnwvdf6gncdl3ljckcdn07i4mhl7i"; +"xymtex.source-5.06"="0gxi985kgkfyybg90f14y2w068ysy5vk4irc8lfvdgil3y8jwi4l"; +"yhmath-1.6"="02p5rzh9n92pjznrqia9b6jnlwmn14189m7fiabvinjakaxmwxwn"; +"yhmath.doc-1.6"="024p61b5i55m6n8fmk4j9r3q7dprp3lcyzkhag0wch6vgjkrajzq"; +"yhmath.source-1.6"="0y74zwc1pkw3dp56jnzzy4zx1ilw5qx9msm1bf55mvdfc045a17s"; +"youngtab-1.1"="18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17"; +"youngtab.doc-1.1"="00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh"; +"youngtab.source-1.1"="1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66"; +"yquant-0.4"="1ifp06l401fvbmlsdqwvywp54jq8iaqmx946bk6gdlx1bs3ywryq"; +"yquant.doc-0.4"="1xq6m3n0cic2pg7jh694z55qms61sbc754yrqv43nx4gqp9hpfa9"; +"ytableau-1.3"="0265mnd3m8dsz89qgalc92jx3h7201617wdxym8nfj7xymn7rq3q"; +"ytableau.doc-1.3"="1lw3llx9jnkil3ji4jv3h0cvb2lgmlqg68mw9jcmi1ymk1qgrkzp"; +"ytableau.source-1.3"="1fd8qxvrx8hmxkjil4f0ry86zdn25220xrp7w4j258nv1j7b2y8x"; +"automata-0.3"="0jqsvxn561fwz44gd0rwxyjwh1nanpmfsvd3kslw87h54hzlizf0"; +"automata.doc-0.3"="1w428b0wyxf0v7bf1yr9dfm4x8q3xas9fgv1q9sxbhgri8daj8px"; +"bbcard-19440"="0snfsyslxnz84a6lgwi21rg0f5vbs6h8yfyywih18vmlbjpba3zx"; +"bbcard.doc-19440"="0rbx7mpns7pgidx3g5pi0r7d638lwykjw0inpldb5g3dz1ipnpvc"; +"blockdraw_mp-15878"="11977c2f4100xfbrs5vcwz3vbijdvybq80zmfansdmxc0w3w6sq6"; +"blockdraw_mp.doc-15878"="1qb23f08wxmw3miys4sn89h48imzcqz720xfs3ihnbk2v75q3rd0"; +"bpolynomial-0.5"="16rzvfjwc5lrr6fvxjwp383ayi4pwhqk4x6k9blqzn0c0cakqmvc"; +"bpolynomial.doc-0.5"="08d7was7ly4wgy04np72f9pn4kz20hgfsprvzlpyp2rfxvixphfc"; +"cmarrows-0.9"="19r3r86vdlkjgx98dsf8c3crq14p8ljdfq6cijqqsvj6p4p6nfy6"; +"cmarrows.doc-0.9"="0svllk1cvjn1mw68yfhbd1na6grp4hlqbybqnmw7igw8ilpshl1b"; +"drv-0.97"="10dqig3wmp340m9h3n4yl6scg1p2a7ccazsqp7p8a4fkfw0cziiz"; +"drv.doc-0.97"="04kgfqhilxpcc0h6rhpw55s1j14wsb5v8b6ykq7ajmacrpmyi50h"; +"dviincl-1.00"="1qb2cl5jbgzjfgwqnvnfbbrbzxi4m64lajvz6pyybnrwv4bax0km"; +"dviincl.doc-1.00"="046c2cl9azgfg7y2022lj8x7yw8kg2pgjdixxk5989ai850k2j9n"; +"emp-23483"="13iaipg8n1njzbnd8s622irizd4cc1cbkyc735mplvwq10q2jxqq"; +"emp.doc-23483"="148l1xq42avnf5gz1sqjcdprnkcbgsii3fm1jiamx18175zygsdc"; +"emp.source-23483"="023jc6v2l580x2d480x11z6rlknjjvx8g3qkcrvdi778h5m5bb94"; +"epsincl-0.2"="0cmjwns5hnlqi1rk6py4s07kbgflm046pycpr1lr5c1dacmiycxj"; +"epsincl.doc-0.2"="06cyyhnphdxigpq4bkg28rx8h9kgmb3ywpbdak6v6ivvlksxgnaa"; +"expressg-1.5"="1hcrzh5xhvzhf7d9gfqfxj7bi89ds5rxa8m6al12mdr5qpffzzkb"; +"expressg.doc-1.5"="0kla1swvhd43xcvns17wlcvq33wvjidhkqnd4i587x9mdn69s8bv"; +"expressg.source-1.5"="07w45g2nbldwnbrbrmdq9pwi3xbi6cl2mqxaiyk78jfgr033rmqf"; +"exteps-0.41"="1pmipr1444l1yai8d9hhrncvimzb5scn80pqij2g90lz160962r0"; +"exteps.doc-0.41"="0ymkwhbl6r64pxhr95wdw10dvn6q95mkz1pwa1nb42sdcljizrsg"; +"featpost-0.8.8"="1p8xb6kmfhhqvxcmgf4bkw60p1py2s1pyn54700zs8vlkbxlqy6f"; +"featpost.doc-0.8.8"="1hy7n0jfdidj3an25j0m5bbv2ks40iviwzwijlk6qqdll0k26z33"; +"feynmf-1.08"="14bl9c8yz1z596281kysyyjbf727pi6mdnwag6gfqs1nsinq0a2i"; +"feynmf.doc-1.08"="1ql099wrlddb4fyfrsirx0vnhcbh0wgwp9yixhvgxfk5pbah8v8n"; +"feynmf.source-1.08"="0f9ghmp0hcmzadsfljfq7pinn69251dwhcdk4n62jrd07qdgqsyl"; +"feynmp-auto-1.1"="1yhvcxiq6ajjmlsvnznzvp35sap1qsnj54zv70dwpl29rkrgrmsp"; +"feynmp-auto.doc-1.1"="1y1pwlplkz2z7lqz84ay7ch1lw4plh4n69isqzsvhilnr31fkf0a"; +"feynmp-auto.source-1.1"="0ja5yqs9szyk4s2mk9cbjf6p98dagwk7pycma84y48kinkl96s0s"; +"fiziko-0.1.3"="1raicsznsws4rykrl9azi9lysb107cfbff6sqpp53y4m326xvn1f"; +"fiziko.doc-0.1.3"="0hfw1l9scfmr5k6jka8v5kajxqzcvdp31j65w3p9dsz9xvlslgc4"; +"garrigues-15878"="0qr2ak20416p5zlavcbihxkjvifzwj3cf03ipsnxlp4a0r3m0hgy"; +"garrigues.doc-15878"="03cx077kcvny07dkg9dpgvdb5vh4z7v0c80rn82vqj1l3i0qrxkn"; +"gmp-1.0"="1c98y5fhnq5w9b6kkpnrag364269s90kccgbqwr33bn9ixhsf0dq"; +"gmp.doc-1.0"="0wir24czbym76b9fcbzd29m0749lbh26n44yfl48k5pxy6pkqjcb"; +"gmp.source-1.0"="1qg01aaf4s939ixzl7wdariaxxg1d5z4s76cz50rpw0p7rgdqbay"; +"latexmp-1.2.1"="03rgabck8mcxnbg1avl638nhxdk6smvyd21v2ns61hx3jn09cpv5"; +"latexmp.doc-1.2.1"="1ad9axqv8h2s2xckrdxcnl8kazpgijrgpxmbwsb3h0hqb3liznsg"; +"mcf2graph-4.62"="167nj1q4kx3lpf75pv3ll8gb1zcml5xsggvsjg4l629jh43c7fs5"; +"mcf2graph.doc-4.62"="0znry4sigsfahr2qd92njgz39yg0ni8vmc5yryv89gfsdalz6lrx"; +"metago-0.9"="0km18bf69rf3rs42b0azc7i8bypy14201vk13yf5ahsypcjcgqns"; +"metago.doc-0.9"="1bx240q75pq9v23gz82i26vrp7z4cb00f9nb3cvvknbndk8y7hy2"; +"metaobj-0.93"="07p2r8975ps1ricqralyw2qz1zq5lmaaf50xqd68qwxmgrs3541z"; +"metaobj.doc-0.93"="17kqa3h13p9vba6sa5s29v29gkm0zbm5wngb0zx1lxwkpkgqaqv5"; +"metaplot-0.91"="01blkf01b89a2f1c7fw6dbp49iw9qw94krv1hiqg7ckkj8j06sp8"; +"metaplot.doc-0.91"="1fm27sy0zz3ppzz95bngipkq4m498g409igx4xcbkmqaghci1pin"; +"metapost-colorbrewer-48753"="154yj9pmwlmdq91kw5xllqah7pkccayv8r1zgvlqgk472x66zrzf"; +"metapost-colorbrewer.doc-48753"="1y0ml5ldridhcg8k811dqq2dh4xsx48cwfkliygq0q1kkl34vdag"; +"metauml-0.2.6"="064cyc53izb7fqc6xfk7pygr2k7wqivx29rkxzrb7sakafwmnkq4"; +"metauml.doc-0.2.6"="10n2xhjfysqihmkrzgcg96vsh0mh76h1jjcxx2nghydihjdggzjr"; +"mfpic-1.10"="1r8xq6npgnlvcyimi0xlqmqa140p94m5x832x0nfm9d550l1zrgi"; +"mfpic.doc-1.10"="07h8j6afl5sd7hz4gw0rkix1c39vdkg8376jgi7ypwvk1xr0wgp0"; +"mfpic.source-1.10"="0ynnc1p2xihrwzfyg46dljbc2f28l152la8f2z2y5zfvd08ir49k"; +"mfpic4ode-0.4"="0jdqbdi2gqb1v4cqahwss1rj44iw0753cq262j8zmaarski351a0"; +"mfpic4ode.doc-0.4"="0sbsb9lysz6hysrpf9dfgm2zn5qcsv7aaf5llmy9kan0m4h84afm"; +"mfpic4ode.source-0.4"="0iya4y3msmyq468zj2msq93xpa01044kmnv4dspz1fmh0324iklm"; +"mp3d-1.34"="18wgwwvh2vj1adbvbl1q6lh0wy0cynfvrx6cgq0m5nqps7b3idra"; +"mp3d.doc-1.34"="032ywwjrv21ypnlidvn95dcnq179pdiail86s4nxxllkjrryc2db"; +"mparrows-0.1"="1hmbpfw1wn13zp8dksnlc86vb19zs0dbwx9hy0sbiyfmb7hidznc"; +"mparrows.doc-0.1"="0ly0sw1c6i3k5nh26a260qw27x6rmv5p2zs11yh5076ziwdxnnlj"; +"mpattern-15878"="045sji1qqwalvmiinqkfm3x4rk2jc7m9nya48brcc0rc5icq7xqn"; +"mpattern.doc-15878"="05b9pr86yy3hl14jymk4g4mf6f5v85b4nv2bc68m02dflvm4wnsj"; +"mpcolornames-0.20"="0bg59x762rfsl3whzqdpajakjnnx5jbh55m73dw23id1g7cs5rsx"; +"mpcolornames.doc-0.20"="1n78abrsj5xj1gd2psgph7x4dm8nscvwmlp6ijz5p6xgphgqs5bf"; +"mpcolornames.source-0.20"="0q74zsx3ni8bzl0k1iwrr19k7f9vkwqfm0bp24m91wlzvh4vlk7r"; +"mpgraphics-0.3"="0ymwcn16n44y47ngdsyb0vvfp9vjnwixhxk67z6ni5d19f23jqli"; +"mpgraphics.doc-0.3"="0q04yj9j9f9j9rndqn9k95jwjm41g1rf5raqlrr1cn14bax0lr4p"; +"mpgraphics.source-0.3"="1hacfhb2dbflvmg0c1lif1hmhxkj3g6j1mdlb3wm43zczgaavnmm"; +"mptrees-17.06"="0cvlsframcnv6i7k7pa2pia8bdl7r8q50dr07p3jw6p5ym8ckc59"; +"mptrees.doc-17.06"="0d1pp6zgq75a1844b6rrkcldfr03pfjl6c9g26f2xbv5np3rpdxp"; +"piechartmp-0.3.0"="1sl8mz26cglbsqmpd8qz0l9yycxgcimi0yhkgnc04n2iik1xc6b3"; +"piechartmp.doc-0.3.0"="0g8sh91ki495mqv7zxxz2q40bk9dl150a9hi7yv0kbpiy45h3af4"; +"repere-19.06"="04y1qz2l2pa3qcmid8s97mp86rpwy4qxjkakhvqdkq6lvgfv6714"; +"repere.doc-19.06"="1mgmfdib0bylyxya3fzpwi53cpqhc1gir6xlva05fmsli2jslzjx"; +"roex-45818"="06mry55hqrakkc7yb7b174cx45n0frk3isxw96p4v77n9pyvlffk"; +"roex.source-45818"="0fwcb1fgz4kxbgcqm34s5glswj43wzg5j56ak5an39lsw0wirs94"; +"roundrect-2.2"="1xjfigxkgcszkcja58jd2w1rhhnccsl665p0k20lssb97wmdzjxg"; +"roundrect.doc-2.2"="0sg1ck97k8pbg2fjf99mhpvd251plphr5pk1dywmjniy9vmhv1ih"; +"roundrect.source-2.2"="02kk3h77drvkqanc04bjlfzg0scprcs78z3m2zf8gs6q8w95k7pv"; +"shapes-1.1"="0ww9akd1cf6nr9jk00qrjc8j0d9ryf7f8hc5ywmnz1q1z6mk1fqd"; +"shapes.doc-1.1"="0qh721vhyny3xmkwiaif3gdmk2bhy67mvyfkc4hxrba8lddnkfqm"; +"shapes.source-1.1"="0g3xfni1lmwdkl2jmprnhl3yxdrmilr6nb59kvznwph10h1c7iqd"; +"slideshow-1.0"="1v39pb9qdivrj26hpjbysg3hbdxfd247a346s5gdffraymiy9lcl"; +"slideshow.doc-1.0"="1s40c102kkaa24w05lmlg1kw8fwlfnd5vwbfqlrf4y8807izbj4s"; +"splines-0.2"="1dynq4y6crzmnn7wcana8klczvzzd2gkya41qpy9w6nxwa2b6kk5"; +"splines.doc-0.2"="0lyg56rnhrq620f083bayssdm36h6wl05d8wld67lf42056kxy8j"; +"splines.source-0.2"="05b9dwykc91q4d7xmvq5hg6vznsy4axpi4w6awr6l6qrrqh6wz71"; +"suanpan-15878"="18nzb8qbs7q233f68983q6988inwc0fm79clnpfpr37z2p7im95v"; +"suanpan.doc-15878"="0xria0g6qzx528dgwb2q23l5iqjzj8xix1215ciz5kmrp2h4fh7n"; +"textpath-1.6"="12f8qn2ncw0drx5r48ddb0xcc6fdm7jpmv5i1n0ihfcqaqa1l8xb"; +"textpath.doc-1.6"="0qhyflskr978qp01apai5r3qjhsj5q4mrvwck60jr79yasxa109k"; +"threeddice-1.0"="1r5cssaj6qxv17n04pgvib12a7b7fnxfk3qbf87mhs1xpxsh6v1s"; +"threeddice.doc-1.0"="0w7f2dfy6sbircp8dbw8s28s4bxbqnmz469c71v3qcaw6hgw3y2y"; +"abc-2.0b"="0fxnxavk76gayahflpa8f61j63x9y6aym7gqnmn6xfgggyab4qmd"; +"abc.doc-2.0b"="0ipxihm9jkb5dvlrk217275p7r6amnkbh352k07s7k7i7rjg9pmd"; +"abc.source-2.0b"="0461ci1zg2wq3f9qypwkxmyi0rciv8p2zk9rcajs0591fwz3drj5"; +"autosp.doc-58211"="16szmbffp9pwzv7zq3l4yvnsfk4m7w57wib7pqpgv1v5fzhlaahs"; +"bagpipe-3.02"="0i3f9f7a38vcsypmf0yv2cdsb1c8n3qin4n8ac73gwdknhhibxjd"; +"bagpipe.doc-3.02"="0fagwknqzl3k6vc2x9axng5zljhc4jhlqd1x59cjkbrwp8xvf8kf"; +"chordbars-1.1"="0n7ycv6wkkd4nr7d6w55375c0ym1pinqjyxx92dwllkmi5w2wr1w"; +"chordbars.doc-1.1"="1hg3kzyyw3ra6qqf9fh2rvv5rn2jaglzjvf10hwkv84a21hlfvq9"; +"chordbox-1.0"="09sghgyq6mv3w0m1vlcf82vjbdkb00gpiqr6iwlimpqjrv09bp3l"; +"chordbox.doc-1.0"="1fykwcz8d0ja7f5px60qf7pfzfcw447mrfpbq8awymr1ilwgmz05"; +"ddphonism-0.2"="09s324nj6g8nlib9wilpy01prixrw1ilwlvl638hgv5rxsspza5y"; +"ddphonism.doc-0.2"="0iirifr55s86nm5512ii0qm8lm4zy3jbrbk333hw27y8m4v9qd4i"; +"figbas-1.0.3"="1bgpchwgj10609ld6i4my2b6ynzlhqrfqi10g7pbqjaypyzbjs6h"; +"figbas.doc-1.0.3"="0ncmqsdvhssd1v77m0jhx48fk6ssxq5yggd29dd7k3jrypaf3bck"; +"gchords-1.20"="130b2svqilpj14jl5slw11b9dqhq1nvdph6y3qcq71pgng5lhjjy"; +"gchords.doc-1.20"="10mbr14bjxcl4p42r0zsqag5sg8yzp1mpi0s7fq7i9197kg8i77b"; +"gregoriotex-6.0.0"="1z3az5in2izkai2bf627zj5966ypv1z9z9510ynallfi5q6yah49"; +"gregoriotex.doc-6.0.0"="15qh7jfz42bj450zngw556z57dzq99cfsna5008yymgqsyvy5jxl"; +"gregoriotex.source-6.0.0"="0p6xm22hr6ka4jm9zrg4yifsc4125g22n4x9zjvmarbxixj04573"; +"gtrcrd-1.1"="095v007lhv0yyni3cqvc14iv9jqi0aqfmlr0zgxh45xfpqbsglnv"; +"gtrcrd.doc-1.1"="1ivw62rpgfyxmlrzvjvmhf4hxfrlgskzq3qr0p6g48ilv3is7sb5"; +"guitar-1.6"="1cjrmz39cpwj6kfq3r9868prd5bx0ppsxdydc7327247n4f270qg"; +"guitar.doc-1.6"="0gqck2vifa7r4wb9q63kw7mp8b33hza1jjyn3kighk2rrjbrg3ah"; +"guitar.source-1.6"="1pfcf4r1vwv80zc1p8fjvf8nqadiijsl8fjaxjanjgzl3zyy25i1"; +"guitarchordschemes-0.7"="0jhqamb3lmpzplvxwy7aydg6sv81b4xl81ss5q1nk66lxki714a1"; +"guitarchordschemes.doc-0.7"="0939llps22ir6bfxqjcbr22kvb6qxid7dzfqjxigl86y8amvv7lf"; +"guitartabs-48102"="1akm3sbrwnbg9mzlm98zpgh187w61g74zdyq6lb21w7bw30jkxbk"; +"guitartabs.doc-48102"="1mrifbwkv0vh4cl1jg92v7006bh3rfrgy7gqpz0byd5nc0vfrm5n"; +"harmony-15878"="11vh6dy95n049bfr46yyb6a5ziawmh3n8dr8l7cqhj4pqmkpgad8"; +"harmony.doc-15878"="00kf7kbrfr2cqv7izx1v90mpa81ncsn0r9jkxkhz8df8fsizaigl"; +"latex4musicians.doc-1.0.1"="1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f"; +"leadsheets-0.6"="0y4g6k85p411qcp5lg9jwz4z7caw4g906xgqf9813xcnry8y82a3"; +"leadsheets.doc-0.6"="052bjwhdl1gb2bsnhm40h4xi7hp6xw3kdwz62rm8lsb446kz7v5r"; +"lilyglyphs-0.2.4"="11mb49rcsi051k7yd7s02k9ca5g4mmifdjx1nqkvs6rl922wcyki"; +"lilyglyphs.doc-0.2.4"="1wl5ppgazb27s3wxgmz1xw8cwwmnnn0s582k5swx8qy91qdl08r0"; +"lilyglyphs.source-0.2.4"="0657barhxkzh3jj3b8rk5rl9i47k2h0p1wa2vxj00fdfqfdjn161"; +"lyluatex-1.0f"="02w276n1kdvx6l2gp9r40r561kfvh2jlivgb20q1xlvwpyjm8f9j"; +"lyluatex.doc-1.0f"="1c68c3hjmlzyd2pz1rgxwwpnlv0s3mmxb9y68ws9n2hnfx6zm5p4"; +"m-tx-0.63c"="1znv3xc5462jmm3ydrcnfj1nj7dld9f617xw3fl2gdwn083ivawh"; +"m-tx.doc-0.63c"="0svgf4a6rgisj614py6l9hm4ij7b4x75jn84s2ydbxzyv61bmmrd"; +"musical-3.1"="0rn4b1m1c58phyj9zzvyxdxbilma1bnncscwmxc8sdgb9iiwmlzm"; +"musical.doc-3.1"="022s1z7d5ins4gpklg9hadlp1gqxpr6862i1g4wp036db0457l78"; +"musicography-53596"="00kc6wq05k3vz07dn2hchq1fgnvmkj4as52v19jjqzakp3a7j8fk"; +"musicography.doc-53596"="0b43y731m3h29j9b9mjijrjs3hf430cc9big7b4jqcvm0kaxsq6z"; +"musixguit-1.2.2"="02cz225x5s3spj0wf9c51ka0i1ysmcrvlpa2b8vxd59f4pwz36am"; +"musixguit.doc-1.2.2"="1g8hay5rdkpa4pjj0lj5gfs7xmqwzmzxnc8k023ahlz38gdczgnz"; +"musixtex-1.31"="17w0rc0sjnwx0mc5k4h7sv46xbc31clg0fnri7zk64363k7f43rb"; +"musixtex.doc-1.31"="02707dmfdqax3lcss4k56qyc2x3fgxypyycndl3lxjzzin87am35"; +"musixtex.source-1.31"="0ari7nwxlyj0lnqhzcpq4vh9xn0kdzqn9c1a5ih5hp1q2zwx2m7l"; +"musixtex-fonts-37762"="13z6qdism1kbs0bmmabl112d3cv536s1vqh0sm8j8yi9l752y1xv"; +"musixtex-fonts.doc-37762"="0vq2mc7q897c9c7x80anbqy68bs897gjfkmdmqm87ykp0xas9kcg"; +"musixtnt-40307"="0g2y52s0151br5vr7hjv5dfcyr96cjxp4n9ya3s1jj81q6q01jjq"; +"musixtnt.doc-40307"="1y933975hv5vzwrgjizq315bkgnhlky21blv9kbnzf6kadic8ys7"; +"octave-45674"="0sw5r5gqvpmrn96rfz8y8hdbrwasv751p7ga5dary1v1kp4brcr0"; +"octave.doc-45674"="1r9wywnqhgrg2jjlzyafhdnyxd3fa17zjbbw1bj2a3r2jzd201h5"; +"piano-1.0"="10gfxklfwf60p54wcbs4l1jpwasxvvbnkjhjpiygnk6mvzjx7dyl"; +"piano.doc-1.0"="0czqrjlfx1i6k02aa1r1crvkw7k2fl17vzqzrkc97msprrymxwgk"; +"pmx-2.94a"="1dwg3v91z6q6hcbv8imrddncxcf9kmyfsra589drnjldcxcl5629"; +"pmx.doc-2.94a"="0v52qrsc2qif5av3jnb7gs6ph6ixmh97j8bscxxhaip4dv2hi6sd"; +"pmxchords-2.0.2"="0yv1c0s3zjy5w65cpv9gmdr13wkfg04jc0g7b1f0mh8ychhdab1a"; +"pmxchords.doc-2.0.2"="0n6g5f4szxsr6zqqp2czi29m1dncfgib1pd90mbrjprvwh0filf2"; +"songbook-4.5"="1qknajn3s4vpw68hwn0mjf9zllhba035gjgiwj807nifhgm2bvpv"; +"songbook.doc-4.5"="08p61v1jgw0s2bdfwgmb1zw5pyldfsy61d09n6qq93wclgaim7lk"; +"songbook.source-4.5"="1xzx3jxp4791imxw6h7gs1ach94k1w33f4p8pd4rvlcnwglnv9s4"; +"songs-3.1"="1q2fddi3z3d6f03y110ah1lc5j64cgg16w4hcxdd1q6sc6ccc61r"; +"songs.doc-3.1"="06y36cnx42yms6b3mnpkvbwrl1rrpjy1jlafycy33ijx0sbpizql"; +"songs.source-3.1"="0airs4wvpv2wmm2398sfy5sh40q0r2skha33999fkk2s9jc99jbb"; +"xml2pmx.doc-57972"="1d3ralqh0b71scd59b4hmm707yfrz1rj28ni2lzkhbb1ql73bvah"; +"xpiano-1.0"="11vk7k3n3np2wxx7gv9rvlgfmipmh1x0bjq5b2yvgsfxii65kwz3"; +"xpiano.doc-1.0"="0hq4v45nacdxygxpjby6s8smlfkkp63yg83zfmwcl3dgxzayb2s3"; +"xpiano.source-1.0"="00xnkxm6ijk1i0h3q0yadklc7f2np19bx3yzq4dzrfavdkxjz8f0"; +"abbr-15878"="1irhcs2zkam6sdl92wk07v5ckg56r6n10hgcjn5im2jpsinsad5k"; +"abbr.doc-15878"="1z45fraywqqnc0v28jxk3bzv9cndwgs7nmlgbf3b8frr4x18mza6"; +"abstyles-15878"="0v4wwf9w542scqx298gcvvngl0ncal0wds5m8h96x9cz7p9wjlph"; +"abstyles.doc-15878"="0zxygi2wfrwlgv9dj69m3v5ily0av65f3qiy9vfpbjlradak48yy"; +"apnum-1.7"="0qqm8np0jr2q3dyxapd49g35vk6ch3k9ar43yq740cfa7gs23ss7"; +"apnum.doc-1.7"="1jjk8a2aif4f7gmbj5laph0q60xpb0yv26j22z4ay2p6yf6a4fy5"; +"autoaligne-1.5"="1y4xlxgcj82g3cvy23wyacm91kx1fnc8b9y0r8vhf6pwvj4fk6h1"; +"autoaligne.doc-1.5"="0srhzzycrh9awp39cgfqzc3z12vxj33qgbnpprx06y6bx94956wv"; +"barr-38479"="09pzipw0qmsh0p5y7m63gwvca92g09r8pq6zhq25k62x3s8y6a4z"; +"barr.doc-38479"="0w4kvjv2zbsg5jppqky6yx0wr7xq61xj2gk5yqi1mbbagnra72rh"; +"bitelist-0.1"="1vbz2c27jjc94i23s1dzl9j0zf0n2935sgxgc5hq3bpaz1qxvm7h"; +"bitelist.doc-0.1"="19p9f9bzn60nf5163rdlw166zpk7qlfwhnc51bpkppb0w4rni2ai"; +"bitelist.source-0.1"="0r3lccpampra8dardrr7sb0swbx72aasaras43q4nx4jv6z2561k"; +"borceux-21047"="0hx755ghdd697fdc48hlvr21la4s9wvsn4v9c0n6sirlansba8ca"; +"borceux.doc-21047"="0fcsjy8yi8zhrl75zb2wb17v1ilpgipdr85vhi4dsjmw18whp03h"; +"c-pascal-1.2"="1gbijcvhkfc9jhdjs07l1mz4p8lchrhnrl1yj2gmzkskp4v2pkbw"; +"c-pascal.doc-1.2"="17ddnb3k2q279xrrsy3y5n8qyk7r8hlrw8vd446a11qiwypjvxy7"; +"catcodes-r0.2"="0sqwy110bqmy1npqqp6m7x4m632zmg4n52snrbzzz87jp59k6kwm"; +"catcodes.doc-r0.2"="19drsfj7f4lfmjhpmivyyzaps3yhxsy5xppgbm67vk4368sgsmpg"; +"catcodes.source-r0.2"="1c9269586s85v3swr33s28wb74xxaxy3mzp4153by2y5hpj250xs"; +"chronosys-1.2"="0ii3r31dii1252bg0xfh4818az1snrzfx7h4ibr6rd5q3a83yisx"; +"chronosys.doc-1.2"="1c120hcadb7xpkspmixhfrdlcmhl79jrf1wc0vsjqbq3wxjq1p55"; +"colorsep-13293"="0nf72pf2bjn8pcps45sn5dcjf1dkrww9wlpp1xbzl1h9i68p3h3h"; +"compare-54265"="0isr7gmskv55cr4f1fa7s478v6fh65q9ijxkmbpxj0448g9817w4"; +"cweb-old-49271"="0vx235zpflqpnrfa9kqq7wmc1rylg5bw1r26knfzvh3w1swbp4ai"; +"dinat-2.5"="0m040ib86lk9ccd4m2r33k8rgdi7dgga80skv2qif43ssws330r2"; +"dinat.doc-2.5"="1hvc4f56mi0drmdqr7qlab68b9dqkmczhj28d3lpyn2l2hx4dncx"; +"dirtree-0.32"="1j91nhdnf4zvqpn6a3jqrcvfpfb0ml18n2g474n5d2k1017mdz4n"; +"dirtree.doc-0.32"="05yd1fkkgyspqxi2ddmq3s0nwnyh1xk55lbzzk6pwxjx1s1cd5k5"; +"dirtree.source-0.32"="1pl4s67bwf5vbf0ccfhd05yrmfss59kng0ys871yq74rxm4abing"; +"docbytex-34294"="19f8kxa8pb7ai7npxxavcw8hbsskmnchi7vynzkbd0imcjvay476"; +"docbytex.doc-34294"="0q3by29jmymrf4pirwmfqxr6bdglh936yb1phficxlpm07ibp8mz"; +"dowith-r0.32"="1ffadlm7fzm72svbpln7lms9dl5pbrv6xjzhwbcsjbwy4smx8s6x"; +"dowith.doc-r0.32"="12sis4raxlfwzdl5jqg6x7fa7wsd9phaawm9ydf91wf7d8md6z2j"; +"dowith.source-r0.32"="1qm2v2lw05jk4nnfns9l1hldamjka6plg2zyly6vi0jlns741hpx"; +"eijkhout-15878"="00y3y01jpgzww1x6zjh748hpvizlrbgrv04p8aq3cm2pzs0g17qk"; +"encxvlna-1.1"="165xjggnbpc9baj9xbdkxzxsb9gdsxffmakffw0gzp82acxgfwsv"; +"encxvlna.doc-1.1"="0jc0wlhmc7f1vrabzk6ql62iian2n8s32r2crq34w2cjglmf69xj"; +"epigram-20513"="1zps5067mgi7xq3fpjvjln8i0rz53j7qn660khraq8ribv4glnpf"; +"epsf-2.7.4"="1i973a2hp5ms1lzgf3g2b73j34xymak9f8wz88fqczcvdfnnag2g"; +"epsf.doc-2.7.4"="0d6jhhvw882kq9l2a4vrfrnxxvkidfjkmp3zm7kj1ir8mk9qvva2"; +"epsf-dvipdfmx-2014"="1p0syahj7liknn447lb83p2rdv8xazpgabk39rjxga05pfn3csh5"; +"epsf-dvipdfmx.doc-2014"="192x6cg0dh0j9dknwb320g73hid9px635p79idr33x2zq3gaaw4r"; +"expkv-1.6"="18wgk5n2w2nfvdy3v5qcgvdwr50j5q28p2c5q2ff2rswljh044b9"; +"expkv.doc-1.6"="0dpaawa3388jslh1yymz4v7cq85n8aw8lpb4hshf35hirack7kih"; +"expkv.source-1.6"="04rzg273ls173kyp5vanmj27bwg59f1yjnl1w9m8ry6ynf8s158b"; +"expkv-cs-0.6"="18788maj4j6724scqyfds2z65f6s0r5i3k0yzbq78mj60kps5gkn"; +"expkv-cs.doc-0.6"="1l72x7z2ba2kbqdvwvnc451scw53qk3jsgpqbg4rj261imjn2i64"; +"expkv-cs.source-0.6"="1bsxi8cij8flqsj81lx87hbgvn1nnf2yvig4yqwgwfg95byzkmbx"; +"expkv-def-0.7"="05wi9b6nds4axc87lw2qf77q5188b82ccbj4v7mzwhmhc10ppvm0"; +"expkv-def.doc-0.7"="15hfzwn6kfwprkrhk0i6y2fbxyizcw697y498k2rylhv6n7gcm9n"; +"expkv-def.source-0.7"="1flgvk5ims1fj56b3y2mxkgs7zmmgphfk3pkslj8cm76wlfam3zh"; +"expkv-opt-0.2"="0qxk3nbwizvczjrqkch6r1d53bxrnnjxkjyakj0rrlbaqpyw4859"; +"expkv-opt.doc-0.2"="05r8p2k94fh4fs6bmf75g4njpppqya51kvqnznzlhf17b82lf5iv"; +"expkv-opt.source-0.2"="1z8plih94z428g95avckmpd29g3byq1r20d37sw379adwfzdcwci"; +"fenixpar-0.92"="1l79py58dih05c4kjb8cngzs3bzpbhc72f4hnz2r7nfwmjp86c56"; +"fenixpar.doc-0.92"="0fbx9wms2n0ff1cdpfavqhjg56przd7hr515vh81g8jgnz68s24l"; +"figflow-21462"="1w2wccxfjbas2yyp8sscxfb875kz3mwqjlma46v4328sd9vw4pwc"; +"figflow.doc-21462"="0nkdz047vypv0b47wbin7nz3cbcriv89w05d6yn26wvq5svlxgw9"; +"fixpdfmag-15878"="0s5ilsmnhvi57x9cqwp7nwpagfribmgkbl0z1ci55aw2a6bff9hn"; +"fltpoint-1.1b"="13zin0r1hcfihji2h33q039mpcf86lw2q017ss8848xpqs41fb0p"; +"fltpoint.doc-1.1b"="1yr5d1hs3bdd20df25c1jyb0hcizwq7bxjbcn804b97sjk2fk8gp"; +"fltpoint.source-1.1b"="19qy8da4ppsd1agh1c3xs9fxsl6z8c60lcyw4dd88mymk7yk4ysd"; +"fntproof-20638"="1gq483namx453zg5yv7acvhy9hb93z68fyfb54ayqkka2n35q80h"; +"fntproof.doc-20638"="1qzxky8jjvnlznm11rjzgxmhib0psv7lfk3nfb8ys2wl0zjcrg2w"; +"font-change-2015.2"="0955bj8r9jzzyyzn3shs3y7iyaxjzs9m3b9l2b33hpd4qxzzp03r"; +"font-change.doc-2015.2"="0khs319ifwl7gfkmv7y27ysqkadz04l7zvcjxn08qzmhsxhjpz6w"; +"fontch-2.2"="09jpw4fc3kk2w1rxs0lm5sfvl8v12y9gch4viy6hva3sh3w8yzin"; +"fontch.doc-2.2"="18si3pz2crkyx075cfnz3ddwbgyccgvyxfzqd70njxqspz8xwf23"; +"fontname-53228"="0ylpryn5wnjnf6acjl6kp67i0vl1dz59xk2xbxb0fqhx5ib1gdgy"; +"fontname.doc-53228"="08vfa7n2bzjsay7b7zaigkq7imlfmq92f4firwc3rx9hfm7hjbn6"; +"gates-0.2"="1vxn3j957za9j6ryf3nhy5r744gr63m78xzvlh0z10sr0bpw46v9"; +"gates.doc-0.2"="0igxfdxyiz280ryivffq6c7y84c16ip1av8wn11j6x62dcsrm58x"; +"getoptk-1.0"="0rh7b66fn37nkcy2y6q8h3j7i8njwdmizn68iy1bg2l080ns1nw4"; +"getoptk.doc-1.0"="0dmjwgv0qghhs7fa0a9jvk2mqbg4m3br1dk2x7q5mxyjzk9878da"; +"gfnotation-2.9"="0n2g1kjig7rg9bkry1hyq9jap95jb9crzxh4yd9jylgrygva6wr4"; +"gfnotation.doc-2.9"="0lfdm66xrvkphqnzmymym0s79bwap5x4h57q6ndb7h97p5pxhfby"; +"gobble-0.2"="1qg0qpgs9llmnajyvycadkvshnw9w5p10ndjhd8b7ddvy2jrp9rn"; +"gobble.doc-0.2"="1nqi3q73zayl5sb4iwip341rhccydhjxvp7c66ac764sx5wxdld9"; +"gobble.source-0.2"="0k42x8ni36gq51aw55ywy36jl89brhsc0177kn56zpvv2zmghqiw"; +"graphics-pln-56823"="0liz3zzg4w5pqfzfsf46209cxjbmb33nlraghjyi5cshpccmn914"; +"graphics-pln.doc-56823"="10vada0gcayyncpb918g1j8yhnyzay4aphq4bipj2jiscqcqaqs1"; +"gtl-0.5"="0hj1xzsny4qx2j6j7ac1b39whjcn3z1m97xyavmz9w7ak4pgnh74"; +"gtl.doc-0.5"="1aj1s3d53y0wsivmavam28zm0q1bxgk4hndr6ifv9fy4m52dw89f"; +"gtl.source-0.5"="1qvyhmywdwyaazcz7kvk321pbsqhcj69852a8zq0hkvgcadrb853"; +"hlist-0.11"="0ac4n38nnimrs14k1s2yizbqvqky905qcv0kgs0aq043kkmpi0v4"; +"hlist.doc-0.11"="1fnqm6kxr79y6bpymafr2s3m8sx5mviys06hcs8sfn2gzagg88bl"; +"hyplain-1.0"="1kpaxdya6m7x4dmrxqzrs6k6agxsg8lcg5yqqdlips887lf609cl"; +"hyplain.doc-1.0"="1q5dh42gpv4n9ps0yqyhcscjn47qz4zf35jlg56xgq2w5229k742"; +"insbox-2.2"="0ylnp3l21zx4y1bwrr33v8d79vlgz5frna9dkg62gz1bhjbw7f7i"; +"insbox.doc-2.2"="07iw7py0p0jfq5np89dx9fdvia3yk5mi0py77xrgb8v4gx7k5g3k"; +"js-misc-16211"="1b26v330702mbd9bviq6sr7pg0338hddzc84z55fsqjd85fp7zcz"; +"js-misc.doc-16211"="0bs30a1m8cbv2824xhj6k3jiv6dmdp6jjzsinhfdwiizc2kzriwv"; +"lambda-lists-31402"="17srvv0v10mczvvmxr6sfhlr8zks589c86v472g4rnmf4bl4my88"; +"lambda-lists.doc-31402"="1yq4kn0nfcgy0qh33qakv7c12lcdzbj4x9xj357yn8c0ijqkx789"; +"langcode-0.2"="1hj7zyjxh64fax5rv32558sp2ss986fxx0fqd5xb9c07s189cs3d"; +"langcode.doc-0.2"="06bygnvh4sdv7mp17c94wx9v1lj4zgih1db6mknc3wiifi5jcx8m"; +"langcode.source-0.2"="1bi25gqx2yi8f6g8hpnqp9f52qnfpyafi0r16scap8w0sbnwrib1"; +"lecturer-23916"="0alcmds4ds3m0rpq6r46ff56x78kv0nbdnfn80s9q638pf1vvnvb"; +"lecturer.doc-23916"="0ksqm6ibcakjf2dir19hr066gg2dxa5blfiikr1j8x966lfdjb09"; +"letterspacing-54266"="0ry7rri76dgbrkzr6na2kkh7bn0jpwkhh9b5qw0cl5xwyp81rddg"; +"librarian-1.0"="1rri0fb9ssj413w1g8c7p79hn72gqzncihhhg3ws3ldl9s3nm54d"; +"librarian.doc-1.0"="1i4m0gp38f64y59zcsyg2j7bb6zycyf9z5yr5wf86l6kh40cc2fq"; +"localloc-56496"="0ynzcib8hsflpjhykfl348pmc508g4i3ig38wjsb3gfm97mlhq24"; +"localloc.doc-56496"="08aiqc04rwinqr510r1wkzz43qq4nks1varmxyjbnw9acndn94ak"; +"localloc.source-56496"="1wcl06i82xkp6m5m311pn1ax42avlp6n54ad1j450apgygdszmik"; +"mathdots-0.9"="1wbxvraw5lp77chgzslrrz022zgqn2fhmzk85cn7ggafip1hr9s1"; +"mathdots.doc-0.9"="1ldl9l92y893dg2ksqn6n82w43a2l8pylz3iq4glcphalhggydcb"; +"mathdots.source-0.9"="0dkpj8cychzl7gg4bp41qqi3y50x0dyz2pxanfli4a2anh2dy06q"; +"metatex-1.1"="14s2my2zs3sx3hy0vapi8zvxb6d15fl7wqsnis58w11a3kni4f1d"; +"metatex.doc-1.1"="0z0s4ys1zsa2s2m4slpjdikzbkw8k8m780gb5mh2j2azc7yxlsdq"; +"midnight-15878"="05hzxlzr19snz16sddzpyh5f7vvs6jcdsqyqvqga17rr8y04sdwz"; +"midnight.doc-15878"="1ky8k2ys88n6hn2q9v9gr71g772gm5zvxlbzmibvajq0hhqm41l8"; +"mkpattern-1.2"="061y05sa0a12x23f68g7rinllkggjfghgmrq2qnan34f1ind1g36"; +"mkpattern.doc-1.2"="0b3ahrhxmm6lwijc7kgvn0k17fm9rkp7i754zrhfj7w4xgq6i50f"; +"modulus-1.0"="03sssw7yg7pa7i3l29l049qavwxphih5jvc86nysdzzng4a4dd7n"; +"modulus.doc-1.0"="1ylrs9705mgb8ijj9fq5w1yyd2fi4ykx8gpf4ckdr78h6rvzkr1h"; +"modulus.source-1.0"="0gm8vwidnls0z31zxcd348xyc4rrvcffncnwmazi9p1zplhg9ggk"; +"multido-1.42"="0rb320bxzg83nq66dx4d2jy3cmz83zdmv7xfw5n1chcswpi6l39p"; +"multido.doc-1.42"="1s8jhzznsqq8kjw19l6gdr12x1p63v3fyzfdrgmd9z66a45d6hsa"; +"multido.source-1.42"="1ypcg93f9n9cv3y6rj92l46b61zaj8wm9cfps1c86w675xs76zaf"; +"namedef-1.0"="06nr8bwymbc3ps7whpxnsnbnl1fayz36hlgcy5isg0gcx8bdspfh"; +"namedef.doc-1.0"="080m0d24cish4an6p4q7rcrqpr2r1yvwvzk431nszhm39h7d8z80"; +"namedef.source-1.0"="03kg4zv07ch01n0nc7qwk99n32ifwf89z2976wg5k12yq51prplh"; +"navigator-1.1"="0ank98y3a7b5dpc6gxqpgshi5qvkbys4nyx41gf6hkinmi094097"; +"navigator.doc-1.1"="15370abnfjvql6gkcamgq8q3p4kycgzlgdla57w2swzwn1bd6x2h"; +"newsletr-15878"="0hl73l6cv94g9k4qnldxad6nl56n9c1r9rkwh2c38sr31d6fn8z5"; +"newsletr.doc-15878"="15bd97zlny5p212naaig42li7ki3f9bfr9b5pqk0vhbf17pik9za"; +"nth-54252"="0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm"; +"ofs-16991"="0g2rxji8g1nafyg1nzpy18vzk20p4p6r754m89naygs1qn5n4h01"; +"ofs.doc-16991"="1v1z08m2ha071kb8zia1wlgkflkzj4hjws8rqnq7asvhi1s2p1rj"; +"olsak-misc-May_2019"="13kixnh85x2qzzfgdhhdk417hjz3aid2q678adlar2ha8a6vbspp"; +"olsak-misc.doc-May_2019"="1cfzdy18f34z3p717jc9mcgs8snhsl6j6x0jw95ff6ds7d2pzfly"; +"outerhbox-1.2"="1867xhxlbskiysifmwlr10lay8khragzi36fm552cwc4vjz2ybcz"; +"path-3.05"="14k9dqvcc2nazjysff0s1jrass14d2r9i9cgfx46ss09cw53h71s"; +"path.doc-3.05"="0kacibdjhmz39klvxr244n42c5vlaz1z71a8vnssmwmdzzwfzs5x"; +"pdf-trans-2.4"="0dr8d6szds3hlrnrw0rb7il23rxw5haz37dg3iacgcdkffnglkis"; +"pdf-trans.doc-2.4"="1dcmcd57zv90jafx3whd0nn9hm5x7aynb5npassjqbglb9lfml87"; +"pitex-24731"="1g91l1z71481hlwz8vmdac0g4vm5d6940gy1ly44qny626k9j079"; +"pitex.doc-24731"="070qn9b6bq4szqa9wqfmb3qbfxcgif79dzbb3qqhvs7fh9bivqdv"; +"placeins-plain-2.0"="1lhc72zdm2cjynx6lf6kafmf00nw17z3mnfhagh41h76cnm338g9"; +"plainpkg-0.4a"="0dq20a8nyyyy1342s8sc1z1i1gdfz49dmv2w9fl5dbnligzxgdfl"; +"plainpkg.doc-0.4a"="145249b9w3jpf9swgc4293r05p7r5ylmxvx1a5qlv3fgni945vms"; +"plainpkg.source-0.4a"="040m08y54xr4966f8b6z38spdhjh197l56am3wpza5qff4nbcj6a"; +"plipsum-4.3"="1byjqmx68gb2xcb4nw429z7wnagv5l0pi3v13dlwp57sgfkxrz0j"; +"plipsum.doc-4.3"="0gmq7rc2r3r50b7w5kqglaqmrqnxv6wav8gz09a2skkir6v1mpgl"; +"plnfss-1.1"="0l4kjidsxzp14ii850m23q3yz1z8my9svqrpd5hi6v7qnv73vdnw"; +"plnfss.doc-1.1"="0iw938rnvcfly3z5v5gikd3svx4mxwfhw0gsyv26m37l5slqvf1w"; +"plstmary-0.5c"="0cda8irxd0gxa18x47v6d1wiwwwh6w30fl9ipxdz112h67l342k0"; +"plstmary.doc-0.5c"="02ql0pxjkp5a803f9ayvr9splfchzk6yhzjfrmh2nxzwgczy9s50"; +"poormanlog-0.05"="0k4j77q0h7c4y3aa21ngkkrida8l0lp9k42489kilxzpx6ppjb4i"; +"poormanlog.doc-0.05"="1p1ri0x1j0r5f22nzhplgb87nr5zpc7gwa12p8xwcx51ncmn2db0"; +"present-2.2.1"="0irxkzfg19h5pn0drgl5dlpz34j1p5jpyii05b2xjz4810gnl79h"; +"present.doc-2.2.1"="0c7pmcjhc3p4ilx3fr6pxc4708kl7iw1lds5ngh8mlrwz0hhsd96"; +"pwebmac-4.6.2"="0syrvzqrrk7d83ddms2mc9wsawmcki14vgffdysi5j5gx0ppagr7"; +"pwebmac.doc-4.6.2"="00k4mp5r63i4jrv2pkf9wkrqkrmfvlj6xhngx54dnl2jk60h7nv9"; +"random-0.2"="1y4dn1i3kmd99b5br7a2j6ppf0ikzp744si5p6m5rmvg4vh1jh69"; +"random.doc-0.2"="1gfcswp2krrfswyjbyhck4pb0lq03jh2mfwzm2iwvd3zlndvccbz"; +"randomlist-1.3"="1kwbg73d8hk4wh69fajl1zqyvkfyfxzyv5xykknpa5s67pxkh9c5"; +"randomlist.doc-1.3"="0r8i0ywq21c1h317b3yx5ixr4b1fllgwams4yy5z13alda4wxqdx"; +"randomlist.source-1.3"="1s86m5hcncfqkwlr8mwdyh3fsnyzisiw5dlg52r499wr77r5z56j"; +"resumemac-15878"="0nixlk46dpyay8zsxrfkcng23rdyx48mnq8s84xs5whlrg369s3d"; +"resumemac.doc-15878"="1yln2mz6awzafpmrlzi3s12zj9m7qfj4laqgjpy4783rxdxy8w57"; +"ruler-1.1"="1ikap9dkdw9lzpda0f2krizqbfkyjxvyddils7clim9nhg77aq71"; +"schemata-1.4"="1idrxgfzwcy31cdw07f1axv9qxiy2m2j039rj7m6gqqjwnzpdyfw"; +"schemata.doc-1.4"="0wc4vcn0gbwwgf5c7cxcb66w66yl4s815d6m1cj3dv2mcm83cjyd"; +"schemata.source-1.4"="1qblgn5msrnnaap7w1r6szdzphf7dgij48g0h7cyj12dxy8gm9a3"; +"shade-1"="1dcpvvk5216znr2i0nn302da6vjixkih5nwix9m3hlmrd69z6hcm"; +"shade.doc-1"="0xs86yjd9f6wlgz0dlc89iryh4rba3752blz07zrxzrm89fdq22c"; +"simplekv-0.2"="0a46f1y88fs70msaydv270z33gxyx7v7dswar50s5syd4sbmid5w"; +"simplekv.doc-0.2"="07aba6adwigls3rakhrsamdcpyghr606mr8m0nlgfg5rjjljnjhz"; +"swrule-54267"="075mshpyi9gxbi3n0hbh3ygidzw1daxy697lhc7cc99i39y8scpi"; +"systeme-0.34"="0agy0h2zq8n6723w27psm3azigf2bsw4s80701xr0zz6kmlyrfg2"; +"systeme.doc-0.34"="1xxycz86kxljxg1np3zd6jzwanvp3f67la1k267z3w39f5i63x1z"; +"tabto-generic-15878"="0i65jflbnhqpqf1w7pkagicic1s39gcl319z7g9zr1g80f9532dv"; +"termmenu-37700"="0rw7a9ydsckjv6lc8q8yc5c4lq45bwczy98c6g6mzdcdl2dnhh81"; +"termmenu.doc-37700"="1r4901slsjhg0kzcy07qkm730g1bax1p2410mhh9ly8cix0hcxr4"; +"termmenu.source-37700"="0fvv10j1s49swvif5prjiqvk699l82js29n09scv0x1ixcy40h14"; +"tex-ps-15878"="0i35b4pp38d1l5rac059znlkazrcqa62qm8brhdmx7zzkbhyysi7"; +"tex-ps.doc-15878"="0kgf7y3nxkw8x42wpc1g5mmmbz28n73vgwd9d6rf6fjpzrycc2zx"; +"tex4ht-58348"="1bqhc6r94lnbz5x9hkb8kqnhpj97qy0rx0kc6wzzlys26i3z6s4h"; +"tex4ht.doc-58348"="1a7cm288jzxjz03v7iz9rzsddx5g6y5qxi1k5kqvhwyjb3fsafn0"; +"texapi-1.04"="09cnhqn4gxf0alkx0276jkpcsd0myypbn94jzsavnjq8jknp6850"; +"texapi.doc-1.04"="0529cncxbw53km02pymj57iphgziri3d9cj54pqmjqjx9qmgwfmm"; +"texdate-2.0"="06bqyfl1vnj4gadqsx94lj8cm1ia3w3bmlsfjwwfaad0al3ncxdp"; +"texdate.doc-2.0"="0kks8hswbwhp8dpjdbwr4nm55md4wgabl5ypzpx5arj41x8halhl"; +"texdate.source-2.0"="0mbcap5nfj5ap8gxn4pyv8w37hcfnq4bm5m6jx43cwkzf2hiwar5"; +"texinfo-5.1"="0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn"; +"timetable-15878"="1lnl8gi2rrzcy688qb8b1ff9yivwxdqmbcfx2ph49aymkxfym97b"; +"tracklang-1.4"="0dlfwsysadr78dkdrm96ibv3gjizwkqbm8m7pjipmp637vjb70ry"; +"tracklang.doc-1.4"="1dygdc8rj4kmh1gwpkpmqkih35yzx262n9f5n06k0ydf5rr96fqm"; +"tracklang.source-1.4"="0hdfmlmazyaxqhy8rv5ng3f4xkpbycbw79cqwbh0mw4nyclsf1aj"; +"treetex-28176"="1gl79r8h5brqmkw5paf26vm6s5ipa0f7g7cxxh3v68qg5cm2dink"; +"treetex.doc-28176"="1prh07qqn92il09fbam3c66czcgi3ssa6kd02mb62mczzf5k594f"; +"trigonometry-43006"="1z4sk50nzdplwarbv7ha3gi5v6g2sh2nf85ipdz2rbj3cnz0j53n"; +"trigonometry.doc-43006"="12pm2720vyk1c79qbgk935nridg3z48cbzmzbx9ak66araz9y901"; +"upca-22511"="1px88kyvr7jkzzcbd32pi7zlak9wwzf3b55yhnh9bi03pk0il33s"; +"upca.doc-22511"="07gsza0vhs52qjj8im4i1fg2v2lch9iwk424ik9c1xak1v7s9d23"; +"varisize-15878"="0sd1znd4c2254fsj6i2snj3ys1h5vss2wzylqcp2pv31kbgpfh0r"; +"varisize.doc-15878"="19w6h5w08iyc2kg61h5q4j4djwwm2x0bhhp6k60kfxnk4glccrmy"; +"xdvi-54338"="10aldzxy02d9phqr9qwpxxwci7vf5q9z7sgxcz50kf44asa28fcm"; +"xdvi.doc-54338"="10fxcamxf5nabfsirwvc289kc1lyb6n7mja7mjpd919f7az1knaj"; +"xii.doc-45804"="19jhzv5hqzj59wrfcr1dsj6z56qfckax694idgf8arri5lnbkdd8"; +"xii-lat.doc-45805"="1nn54xv71kcmn9jbkcslz6a64cvjcay9x96rrxnakdj9qcqd27r5"; +"xlop-0.28"="1clpl22vxgqjpzs0ypgak0d6z0sr6hw3gj18r7sgs2q0jf5m6715"; +"xlop.doc-0.28"="1acnr4yfcakpnr8pb8g26qh7z9xr4dms4nfy50ig7r7azmdpz9py"; +"yax-1.03"="058i478l85ilq0asix6mkdn1kfzh2abqn9ngar6s339db4h81lxy"; +"yax.doc-1.03"="06i376649jszpwgvb0bq8wxchjmhwjfvc78pl5q6q1ic2jpkq5pj"; +"zztex-17.7"="0qh6a0jgrf1b2363dw66m8v8r0yq2sab2qm3wk008pvvlajdj45w"; +"zztex.doc-17.7"="1agivqj1mqnhv3w70a292pypm2w5xcbf67wwfz3ywaaaq5amjbwq"; +"auto-pst-pdf-0.7"="0f212m856rdfzflq1bw3vfpy38d8qylaa3vqnfs595h3x5r0dsx3"; +"auto-pst-pdf.doc-0.7"="1f7kj4rga7x14w8v3cjn7lh95inliy2ms0q9vnfnv95jvp5a7kh8"; +"auto-pst-pdf.source-0.7"="10l3ld4jvpg1982f2a80ssl4hkdzi9szxv3y8l1i13pdfdhirv91"; +"bclogo-3.1"="1lnfpy6fvw51cfy7zc1bpqhgca8mcgnhyvh5l1s3712xl91hsvwq"; +"bclogo.doc-3.1"="0vf9fvm607fzw3rvc93crxjg9ilm6d7x7q5n1qrfmkzmkm5mjj89"; +"dsptricks-1.0"="074z88g37hq9xjlvbncmiccq5klr3x8ffprps8xnzvhk7cdwld2f"; +"dsptricks.doc-1.0"="0jj47j46l587hr11n764wl167rkp7w8q9z16zwnnb63dp0gi18s2"; +"makeplot-1.0.6"="0qp0qgcli40hd2dxgbd8fv9s03r81dlhh48pb8la9sh28qrb9i51"; +"makeplot.doc-1.0.6"="112chsx5wxrc7k4w3qzf23pjgr0np1ip1ylqs2igdcihchz6syyd"; +"makeplot.source-1.0.6"="1zksg7iqb9g6my9zyyrmwkhx04qy0118lxf60cm00njwmsi8w1pq"; +"pdftricks-1.16"="0vji4gmlg9b67yj8gb3aj2291ll1xg9p5vq2kvclj3xpy1vnna8k"; +"pdftricks.doc-1.16"="1hzd05l4yyz5giw9kqxaw410na7k85wj0cyw0bbwzxynpzxqllfa"; +"pdftricks2-1.01"="1dlzm7ivhxvz404nm61kxjn5arqgfw5z184qaxwn28yk6ri07s8a"; +"pdftricks2.doc-1.01"="0k0zr8mv3xq6ibc7s016qnk78b1d22jgyq35jwimj3rm2aykdmww"; +"pedigree-perl-1.0"="0mi97av4zk6vgxwyph81dq5wrwv1smqidfd5jrjjaiqvj60pq6ls"; +"pedigree-perl.doc-1.0"="1knhp254w8a3hqg1kyg009kmym55s8hln9qnzn3lwq4b24929ivy"; +"psbao-1.0"="0il4qhmc00ny1syfhid0mvmcz42sqp58zi8gf5hm6p3dsf5jy0z9"; +"psbao.doc-1.0"="0zrmprbhrbj3m0q0swlnk581ka3mws13dsha60izi7bfqxc6crqc"; +"pst-2dplot-1.5"="00y967mflrd0y38mqyv8r7h489jrl38rgaiq871wf9k3cbmf0f1g"; +"pst-2dplot.doc-1.5"="0j1c2kxc63nf33gi1f146pa6hw7fm5x9h4yc30dqg8hsd2v0bni6"; +"pst-3d-1.10"="0mh6xbrvwxx7nxp4yqm71hhpqjb41g4kinxkj2vmspw9wrwclbj4"; +"pst-3d.doc-1.10"="1dp9l6vwhb306j998hydb07c6ig10ibn7h0wwiaisgabn0s69xqh"; +"pst-3d.source-1.10"="0m9lvgmjzzc2lmp63vnly30j9886qabgbhqwpbbyl035cy6k684n"; +"pst-3dplot-2.06"="01v1qldms53663lib4b8sc7il7iyma7hgk19lmn7i42cid6gx56m"; +"pst-3dplot.doc-2.06"="0xww4khaqai4wx2wlrbyis25qgj7ykfamf7vvg9fvrkdh1cv4pll"; +"pst-abspos-0.2"="0pjh72cjpim4v0ri92b7nbjdmilpfa7d49vsvhfqddq68k02m0yc"; +"pst-abspos.doc-0.2"="1nwjynxlpxgqld6slhhrzlsalp9296nbnj2kzr6a9c9b4sjxxbp1"; +"pst-abspos.source-0.2"="1p9i5bg4jx8s6bb6ilbaa702l2mn911g09pjdmk6mnb405d908fy"; +"pst-am-1.02"="1vk1dpvm5bcnxc6k7kpqq5xb6a227bwhlrwd6mdbdapk58jh876f"; +"pst-am.doc-1.02"="10acmb6wm7z9bpgh76hlsjks9v2rzp0qqbcklrjx3iw0jqdk53vf"; +"pst-am.source-1.02"="06xvv8fh818ldzqccf911hw4wr6nyzxdmghynlsg4hjn54ff3x0l"; +"pst-antiprism-0.02"="1b8yxfyc4cac5992a3cc4xkj0ip35z63rqxdw2jx748qs7c3gyxf"; +"pst-antiprism.doc-0.02"="0d4v65fsk28hyiljr6fpk6yw7sac7n9jmx4bmdfgpkagspb7ygpf"; +"pst-arrow-0.01"="0xq79kh2rvgm1abb3j6c075hbcaw5lz44kbyj5gbd1sypvgzh935"; +"pst-arrow.doc-0.01"="1pr55ipihx9zv3vjv617vlzfg85mihnz6aj6c2gxvj6bwqqbmvri"; +"pst-asr-1.3"="0sk8hchv1p7vrpyjslpc45mhjg7l2r66mlmmvhc0s89q1khm08rf"; +"pst-asr.doc-1.3"="1a6d4g9gqjslnfr8fp0dpw72pp7c14qzq5l5i80kv36w5axks7pd"; +"pst-bar-0.92"="1aj1vvp5gwpnbj7nd2gdja6vpy27wg6m3yx4d7r9jqm6kn0sxd4h"; +"pst-bar.doc-0.92"="050nblwwni28rv31zj871i6kji2b15hvsk5n7f7q2q1hhprygc1k"; +"pst-bar.source-0.92"="0k5dw6a31ppa4qqq923pifcblx9wbldq405pglcd61a94pcixm06"; +"pst-barcode-0.18"="1kq92hkqzclr7lrfb6bdfcfpsp5sqvd85sqgl05ikzgcd9bpsgis"; +"pst-barcode.doc-0.18"="11fab07zcqp7g91hxs9awgmz30gzz0k9hh5j6i36aq58ym7j6pw2"; +"pst-bezier-0.03"="13w3hqzfim53nrh5bn82fb4gxx32gfayiaqjk5dx49xc4l3rvq6z"; +"pst-bezier.doc-0.03"="0xjs89hfkf7ak8izf59sl5gh5lawv04nxlajn7sskh187qwbqkgw"; +"pst-blur-2.0"="09fl784hqyvbvs2w9ymd4rda1dfykc1l8g5dpac00da1788ypzim"; +"pst-blur.doc-2.0"="1x881z1z4ra5bcms1yn2p7svs82h5ckwwvlw30jfdwxp4bgs5y28"; +"pst-blur.source-2.0"="17f9k4vqqk6mrh3dny6qfhb6b45g6sg7w50i3c7d9k0djz2wi5jk"; +"pst-bspline-1.62"="05ys29amaikrm31avlz0kcra9j48nwvqwr5fwl75ljydjf6drdaw"; +"pst-bspline.doc-1.62"="1czq6932fmx76c82ylrbh92qs2nnipll8piah0c7f35xl9y5xgls"; +"pst-calculate-0.02"="1knbqbysc6f3csy1y2vf413cw2jpf722l0hhs20yzm8mi8x279yw"; +"pst-calculate.doc-0.02"="1jyxfqc18whihn8jkp041bvpp1b4f7jwi2zdj8abnmx45d16i6jc"; +"pst-calendar-0.47"="19z0czaw9x8hnb1wm042mnlnhzidklyx49py8jm1gfqfk4bv6yy6"; +"pst-calendar.doc-0.47"="0f1lw3ls3ikp8r4ifplxbxcf5bbapv89k1ajz4cbna2y9axnw1b3"; +"pst-cie-1.06a"="0hy5a65lcfs2dcrr6jfd049zf355cygwpsaq5g946qw5sca30lm1"; +"pst-cie.doc-1.06a"="026x180f9w6i2ndmhpaa8yj8vh0zf0nd1nsii7jbhg2gql0pcsxg"; +"pst-circ-2.17"="0kxg1337z9ijqv05h4hmxz7w2qgriripppg16rzg3l3cssbyj5g0"; +"pst-circ.doc-2.17"="013y3b2sdscbgpf46rjf70rwxfqiigcz3d2wnhflrf7drrgrpahz"; +"pst-coil-1.07"="019hda59xplvwvc2jrk6zjlvx26y2m8l7j42sr8w6ydgs49y1m7x"; +"pst-coil.doc-1.07"="1rlp43hi4fs3gkfaic8r49774g7rgg97mkyxzqmi8qak8fz1v3v8"; +"pst-contourplot-0.6"="1cav44hw38rnyi1yjj5z0yqw2ilbrq328xrj4fdipkfd0km0bf1i"; +"pst-contourplot.doc-0.6"="15p3znj8z0s3d336ib264c3w0m200igsq1aq2bbcj92v43rzffrz"; +"pst-cox-0.98_Beta"="07662sjbviwbplb7mjvvb18v8lf67v997hn78q6gz262z41daf3n"; +"pst-cox.doc-0.98_Beta"="0iwvk4db5girx2fn6fhgx6irx288jw2jnd28j4zh8x3f5hf3xfg9"; +"pst-dart-0.02"="0zlm23bjm7danf07330xsc59lkyi51kh89jpxhgcxikgjm4cq3wz"; +"pst-dart.doc-0.02"="0w00zb309hnv2gz32rkirmvn3c1yy2j167939x4kvp9nr0ccw5cc"; +"pst-dbicons-0.16"="1mq523ngyxlds1jaq1cnwkp6hynlz72imc1sh1f2fch0v91a3kc1"; +"pst-dbicons.doc-0.16"="0j4p340dxlyj53s18xqp81cqwy6awpnw6k4q68yk4zx915v24l0p"; +"pst-dbicons.source-0.16"="1c071qx2ira6hd9mkh07k4kaqhy0a3cbhr6k1b4wkmlfswjynppd"; +"pst-diffraction-2.03"="0ccy05jagh7kpra07bai1j8drwn2701qdfgki925mcifsa74r3y4"; +"pst-diffraction.doc-2.03"="12xx19vaygrby5475la4nzygcbf6cf1mq3g14sxyhg997x9q4ha9"; +"pst-diffraction.source-2.03"="0wf4kpdn7vyaf9cy7dq6qf3lq37fgkcg91njfbqy9n9v8k87fv1x"; +"pst-electricfield-0.14"="0kk0jjlcfyvz5dws08wnm3qlhvgifrby88idssjhgvqgg8zpz3yq"; +"pst-electricfield.doc-0.14"="0zx7x15p6vxj1f9v8id7ba49878xjmbqzh762v1sy1bxygj9yb21"; +"pst-electricfield.source-0.14"="0n1rxq6jx331b0qlnpjy7mh84m9vdlrs8ckr2b3slwcwp63cs0sz"; +"pst-eps-1.0"="14grlhaxxhwmpw3xi3xv7n3bq3zx3qwd9rh707wfgz87iaj7jzvw"; +"pst-eps.doc-1.0"="0dz6543q5g4wsqcwcwablr7w7w5l6dk19m9qpgrhb1w8sg7hgc31"; +"pst-eps.source-1.0"="1cn9yl1prwzjvxwgyzs5jdywyirg9hy8g76cnl62gkk9ndmcpryq"; +"pst-eucl-1.75"="0h23rkrdnpybpqjksy411c028g54a5i8l3wjr85p1jlv4fph3kn9"; +"pst-eucl.doc-1.75"="1rspj40d3rx0xwv0sjy2rbgkkhccrayaj38pbr4l001dbpxk3h7z"; +"pst-exa-0.06"="1s94fbqpgv58zks5jfq3dbzhpw4p3gchhm32498m6bsp52kzzl7w"; +"pst-exa.doc-0.06"="1m7gwxbhnii3s7aqi8v09sq49010yasx6k4p7bx43rhir08v1zjv"; +"pst-feyn-0.01"="0qi5zll29rfc7jkmz4hs0y22if5qjn13whaf7a62rdfvbdp1l87x"; +"pst-feyn.doc-0.01"="184d371rhqn549a9vgvdh92ikzphmdsbskny0dnh0pcgxzwdabzz"; +"pst-fill-1.01"="14rdbc3mpi3mqc9vlwnrnp5lz1d0p55w9gqnkiv7dd8yqfrxvay7"; +"pst-fill.doc-1.01"="0b3swpsp6b323594q9rfrpyzlv4rsalnjs0qpij3fvmngpr6baj8"; +"pst-fill.source-1.01"="12xvv4knjv17b7am4csyy005lhmbxdz8s6kz7w54gcjf7py1kh4v"; +"pst-fit-0.02"="1sqdysxpzdlaph42725hvdgy672mzdmhz7scizb0jr5wnq3rn9x6"; +"pst-fit.doc-0.02"="0lvvy353s1py998a7vr01pgvkl29qp60w2gyrxxwjig7j7ihn5lw"; +"pst-fr3d-1.10"="1m0zz9bqdqw1hzwp06s4hma68wwm5mmswrp9jj3xc9r5xjyq7fk8"; +"pst-fr3d.doc-1.10"="1gpijw1iv0pg30kws1vclsy5yjd7rk0j3qspcjlmkj1bhq3fjrgh"; +"pst-fr3d.source-1.10"="1zvssd11fg4hf53rz4c6imsgi77kfcc7l9hh0ni8jnznlgmdjkf9"; +"pst-fractal-0.11a"="0hv8i75hnbpbf05sw4zjf2gal5pc0bzc4mf92mjdkvgnwbrpy58f"; +"pst-fractal.doc-0.11a"="07i2fma5sj2g63asl7rvaczdcqdfprw8s1z8q13s1v9i2rzq3asd"; +"pst-fun-0.04"="1r1zvnyg5m16fifi5xbzn5iypr4n4d9vbnqi42h6a4m4y1wb3qdh"; +"pst-fun.doc-0.04"="1gb9rz3kz13xzflr7r00dalqri10lbn830v3xcpmb4n29a2bf0qv"; +"pst-fun.source-0.04"="07kpm9irvp7dn0hd1wh08p7lfbgn78jj63yqzzxn1jb4wrb4qkx3"; +"pst-func-0.96"="0avpfmvnxcmqvxk8379gk37pnhg4yq760va1ly9vqbqzz4mxrf8v"; +"pst-func.doc-0.96"="0k9q302b633sc0h460h33h53k78v37a0hpkjkicsv9prxkbvckcz"; +"pst-gantt-0.22a"="1hkrmdwg7kc4xiif4fvhjwbj2ryxlrbyqb7h2n3rk2jmmky4hv7p"; +"pst-gantt.doc-0.22a"="1fqkwzsliv1mg3lyidgcsy652l5d2qy7x1rjix9swvk4vblx4fjs"; +"pst-geo-0.06"="1s6bqzsvq12jmji737lr3yc5l91ksffz1wgqy8i4r258x9s1qmc8"; +"pst-geo.doc-0.06"="1any48dgybc60dsfkcccgbai5rhgqga9q6fm4s8xlc6im2si4aw5"; +"pst-geometrictools-1.1"="025ai7cw5vv9a4n2gdp68gavmplp4cj3s3n14jhk5ga26a411s0n"; +"pst-geometrictools.doc-1.1"="1z2pgbf426p5qqqcpd3iqhdhk5izgxshqilm0bky4b459wagh9wx"; +"pst-ghsb-54074"="1cn63i49wi6ddq59vfk96jq8kbziivfdgyvvvvj4fq4g7qqs6rbp"; +"pst-ghsb.doc-54074"="03j0c92kfklj161wv59f9x4npsbkvmv39xvza5mi7s63m1ma23wl"; +"pst-gr3d-1.34"="10jn2wdc908z2imnpcv03ffm83228fam0cqgmgmcss1774r2nc18"; +"pst-gr3d.doc-1.34"="0985ydi7jfsvlynjs5ddjhyhbh11nficfphy6qnvbv0jj367rabq"; +"pst-gr3d.source-1.34"="1z981d54aclpbq9ggy28qgnsspgwkavalm0j68pj69jxbcfxrpby"; +"pst-grad-1.06"="0bzq77vj333dsgilfw9k7lslhpmk67id6p1z14aw7nfrhyc80082"; +"pst-grad.doc-1.06"="03v585i28dc65xrydsp5jj9nd6kfpmhrjkwm3w89dv0p32xyzh11"; +"pst-graphicx-0.02"="1d7zvrnhch7vj1l9xscg4ynj5alml7pb38zwqns403wvcdnmb1an"; +"pst-graphicx.doc-0.02"="1mly0nr5yc5rdghy04sarhrwlxiwnndk644s4czf862n92ammh5d"; +"pst-infixplot-0.11"="133806cabfd6c44b0sdhchcmqjqswy2q2j2ry5kr78dzdna40y23"; +"pst-infixplot.doc-0.11"="1cd3i5ishy7pawv3ah6486kb63351p1g2d7iwx9zh5vwywi1ymqm"; +"pst-intersect-0.4"="1wbipiav79g5cal64bny5ba872rr4848i32w64bhrl7awsddyq0f"; +"pst-intersect.doc-0.4"="1y45r9pdddh4pbb3bfp6mzss7whapf4bv7zbkrx7wmyjaal73s5y"; +"pst-intersect.source-0.4"="09pbicmzmx0nraf5s8b19grra8p2vvdl903kc582dwn7xvqrk3rn"; +"pst-jtree-2.6"="0082prldszninnbksndf6y5mklvp4zgdyk31v78axp5fl3mq437n"; +"pst-jtree.doc-2.6"="1hgy8iavrhzw6w8r0avf3h9x52fdl3lqshf6mxqpffaq1b0s6xqc"; +"pst-knot-0.2"="1m1bzq66jan3miyp6r9j1pkk7mim9xjn28ldd1nni06v65hdcz48"; +"pst-knot.doc-0.2"="0gfxyryyf75p89y2l1ar5yfy5c6qawbz503bnpnw7n575rhsz36d"; +"pst-labo-2.04"="1wman8073p41gxn5aa0jilpz8jl7zpk69vwid6f0981m3vc1jdk0"; +"pst-labo.doc-2.04"="1zdyp20x78zxqp07dcf6hiynlsq04s5fd2jjgjcs3mbjfz96yi6p"; +"pst-layout-.95"="0199jrw7b58x6qby4k48n8sd2rffxlkhrp334q2dmalqsi701l89"; +"pst-layout.doc-.95"="1346ww24d9c64h03zgz7m7xdsnvkjy27cq4nbjn56bqcrl88982d"; +"pst-lens-1.02"="0220idbrzzslcmlyxxzj52mj9iai0p2ya10ykgkssyd8nfbl2jin"; +"pst-lens.doc-1.02"="02hbbhdnaz6cc5zkp2zmm92kbk0ppzwljivr1grx4g0jqqw8c2h4"; +"pst-lens.source-1.02"="1pwn8wx5w65xdz46qf5mzjkg74q296bkmzwsxw2aml406iksy890"; +"pst-light3d-0.12"="0glqibq1h8ynfkgn9r2p0yvgplydsigg5chj5gl2vq2hsb38sqg3"; +"pst-light3d.doc-0.12"="1njiml3v4vb7jxpnai69b08pdikasjk30g3xp31vixqrzr56i4am"; +"pst-light3d.source-0.12"="0rrgfxsbvfbyc1g1xsakmiiy7f8skmv2bkgq6vbji9y1f5s3b4zl"; +"pst-lsystem-0.02"="02m2g6kjs8fxifsdxld6ivjxch7vj137828xpax8s7abr9f4dyiq"; +"pst-lsystem.doc-0.02"="1apcp1ms40xhypxr4fq6xrh91ff15gplzllh3zs5b1w153xq3w8l"; +"pst-magneticfield-1.16"="0ppqqvvnyr49y7m7y0b4cbzld1r2l5y19y7j9pv1hixd3a8n0ghr"; +"pst-magneticfield.doc-1.16"="06bymmj54rrkv4alh6hdqj25gjwqs1sx1iaw5lv6ih1ys6fnnyar"; +"pst-marble-1.6"="0d7xlygws5f1hipyc2ba7spr2y8h3rprigbrryny3mw2ycdh1yqv"; +"pst-marble.doc-1.6"="18jzc9fpjcrhya1knqsxxmaix8sglfbcsiszxc949pf4zdpm50ym"; +"pst-math-0.65"="0xg3fkk9kmhyqnrp1iyblqc3a7jx7xhy6692nx9ffq3mkg7z9vak"; +"pst-math.doc-0.65"="1gpfqhs2vjbflrriyiwywhq3dd17rf8pdp9g2n02g8ygxgzqhv9r"; +"pst-mirror-1.01"="1z7apfya920d82mqzrivckavxviazngxz0n05yavkzslv07qsil6"; +"pst-mirror.doc-1.01"="046mk74wj1qxkgz7wf8d3cglrds9krm0v2mkl0hqp86n2rr45nnp"; +"pst-moire-2.1"="1i0fs9whsqjb9s7b3g2gm2mparw809nzfvz0ddl61qr6zg7vbdzz"; +"pst-moire.doc-2.1"="10xpgzpi9ihl53gzyvz07jbnz9hk9piv6jcbk5pah57g91ffs70m"; +"pst-node-1.42a"="0ma3q1l68v5dzch9z6z3idixgs8v9vp0rqij4fqafp3lx3vcpdi8"; +"pst-node.doc-1.42a"="00cmh35ciz3vmy814id8i0phj0j4hfjkbsm18wjyxj83spy24pyw"; +"pst-ob3d-0.22"="0pglxl2prdi347qqrjpyk6hr3arhfc4rrcz1mnyz7q5jyamlskp5"; +"pst-ob3d.doc-0.22"="0s0jyb1s21pkmdnz4wdz793lbvidl9qdfh9cfqa0bwx9mmjvhpnb"; +"pst-ob3d.source-0.22"="0v9kih4gxk7aqwynihipm1595iswwkv5y6qj262aikhr6bz8v0sa"; +"pst-ode-0.15"="19kqlpsrrzbisg7wjk2z3a9f1xdl3msx01x861yw9nrqh3qn1ddc"; +"pst-ode.doc-0.15"="1bgc5hi7q0sjjq1qfdkfa80nfb7d4k964k7wx4382b9cg6m87zlr"; +"pst-optexp-6.0"="0j41zdqyv33mdk70i8smkhznz2bn9h4gzamgcrv0744ydibyijg5"; +"pst-optexp.doc-6.0"="1rbz7x37y20xnabd233frd4w1zpssd70mvl8pzzclyr40d8s66vw"; +"pst-optexp.source-6.0"="1sbpjr2d8k7ycg072hvl535lhh0093nnmhvb935p66r7ipcqx2lf"; +"pst-optic-1.02"="1591vaw8y2k99vr0g8dy11grrp98hvgqw5rl9zp501dh3hnf181d"; +"pst-optic.doc-1.02"="0q76b92w32x744y6ri1nf2dnzv00kyw32xyv3l5snvs728qdvayd"; +"pst-osci-2.82"="0gz1ac21gwhv2xqf5ny0zzgi83yg84qlxgx8mdj9xpnnpv6mccig"; +"pst-osci.doc-2.82"="1gdx6a07wg5bmfpx9myf7wxa309j64q5y2q1ikzfgf5czy0mxpa3"; +"pst-ovl-0.07b"="0p4yyrvagfjamwd1f81qyfhz6wwjpqi6nfazyl8ml1fd7qjv1g18"; +"pst-ovl.doc-0.07b"="0pqh9sz0l0j0bzvsva6kba6gm7cssy36i17px2zrr3lc9k6yajf4"; +"pst-pad-0.3b"="09z2dkb2h8hmf46b0h1b235d1yjv42dgx55pj5s4dbpxzgam7ljz"; +"pst-pad.doc-0.3b"="1c597riwdggb0fli4w4ay2iwkqhaiwxy3mcl9diz8lijy0h4fpk8"; +"pst-pad.source-0.3b"="0b2w0pgp8njbndx6x3hq0rwxsr1gwf848l6gk3vrkksq419j2506"; +"pst-pdf-1.2f"="1klgwqpc3m5k5ciiqb070h48r9mp4hmssp4s82k79n6kq45ar33m"; +"pst-pdf.doc-1.2f"="06b1kpazsfn7gv2npfrnrmxlky5mhw6dfyzip2lwd243m08jdagq"; +"pst-pdf.source-1.2f"="04b0kpxmzi42116pxmkdjl87bm6j22wr62w7bka9qww2ifj18na8"; +"pst-pdgr-0.4"="0k7i88srnysbkk62mr3w0fgv3dz8hlz96nlxbrfm4arhxs6ah2pb"; +"pst-pdgr.doc-0.4"="08lj4bd028bzwi25j21h98ma5zw72hiarpcn0nbxwhbbqz865q2m"; +"pst-pdgr.source-0.4"="0q2cadndr14x2sjjdsc07xizrb9cv8i5q8w14lrwr4xkamagav19"; +"pst-perspective-1.05"="0g88w41dpz9607g286ahba11af2a1x9zya4saxhjd75j9il0h4k7"; +"pst-perspective.doc-1.05"="04gim8i8fmy3ysyl1y237cn0xfdsiii2pwkl6y79abz1gscn0pfj"; +"pst-platon-0.01"="1crl7q5r89vl99jj5f6ki8vnz5f5i15x631ra811033xmi32z4yh"; +"pst-platon.doc-0.01"="08d0g6mwkqrc81g5dhk016bi2dvr3jz389f32kx89w6n11iw5pqr"; +"pst-platon.source-0.01"="1c4pmwrfk9yxg8jshhy5y4bwvlwwm6xn39lgr3xdvsl9bn5pfz2b"; +"pst-plot-1.92"="00kczby29pw6kgsva5xfz7db98r39g3z88vwxm851dlv4mmvxadg"; +"pst-plot.doc-1.92"="0axc5gm6icivnrb3ncyy36b6qyllaacifml2p1ik0k0smk9ff8kv"; +"pst-poker-0.03a"="1lbrwf66hsk6pylp0cij3yxzn6y9z7m8wrsjwpz9xgshwqqjffga"; +"pst-poker.doc-0.03a"="0rhp30incxzsg7xv5j5isb6z79xpsbyv1qp1i1ihscwx2xd6iaiz"; +"pst-poly-1.63"="168ydw08wgqsy642w7nf8nyzlmxccpcbdvyc5h8vqc6i8xwrlzyz"; +"pst-poly.doc-1.63"="0ls2nf4h4p1dc00mmplc73bv5vanddvxkmxv5kix9b471xx0y696"; +"pst-pulley-0.02"="12w7rcb0z564xlf17258dx1q290i3p79bv4vhqpq5pp3wxf46c5p"; +"pst-pulley.doc-0.02"="1x3c2n8js6kvnmdrhnm5ng6amkwxmdlbnz4wsh807q5agqmq8q6k"; +"pst-qtree-15878"="1bv3xxysk2jw5n41i0c0zm2kx2r6qpyfqmpaf6dqzm08rn7ax1lw"; +"pst-qtree.doc-15878"="1kkcrdm930lr128ffzcqd3qvh11mrikiar3kqszzscpyfkhi8vc1"; +"pst-rputover-1.0"="0ahx2fjnwgamdb4r6v6q3bg72xpgvpfan3ivvbi0gvvnah98l4zv"; +"pst-rputover.doc-1.0"="18gaman0znqzxdqw0r2czb30l18wh5740skvsclvn28b5wfa0i2k"; +"pst-rubans-1.2"="09lmil6ishwjaybj5nqabxm20xwx8nw1l9dj9bbjxg42h1wz26mi"; +"pst-rubans.doc-1.2"="0l6w0hssg5qmi93inh3n7wk7hps44l8w5xvj4x4rblh3fdlrrb26"; +"pst-rubans.source-1.2"="0phh3kkxrr74y6fim8ak28sdxd5fn11c1nyn3pksd7ddq0qy5gva"; +"pst-shell-0.03"="1j97kcw8w52q1ispkpbwblxza7q8v25288pzxkyc4yf7802a3zj1"; +"pst-shell.doc-0.03"="1i5dbbnzadhc47mg7bdv6vas7ynkx2c4qpz0khcvrz393kszjkdm"; +"pst-shell.source-0.03"="0rc6j6cy5kwh9sq2gp5scxpb58ycjqdycnmnqpy67xha62fnhcsp"; +"pst-sigsys-1.4"="1v3yz2vhazp04xjd0bp4pyyiz0v4yq7hbr9mq0m2s8pg3hisfbwr"; +"pst-sigsys.doc-1.4"="08m72w1jxrafcbr19fp0yvii9aama1rfl9czys6gr3sii9ks6qxa"; +"pst-slpe-1.31"="18f99ravk128r2cg84yxv3cjx2df8fgzq1f054z5g5ig1s5ginws"; +"pst-slpe.doc-1.31"="0g8dhw27n2vf73289y8rah5xakb60cy23993vl3ygz1cgrn356i5"; +"pst-slpe.source-1.31"="1mxninpgycpbakvmc9qc6032mncz890k5ggsfm507jzyfxrdp5lg"; +"pst-solarsystem-0.13"="0n6w3fyggf7favnr90239b6dp2j7q31qi5yjilxdw35s001m1ghj"; +"pst-solarsystem.doc-0.13"="1bm77lqaqbjnhwv6fra0g05ij4l9vj9hh7gs3sljgdmwy4syqq24"; +"pst-solides3d-4.34a"="1sayghfxhng2kh2yn2j095c7bymcfzwa0w6wd31llvp0pqzym1rk"; +"pst-solides3d.doc-4.34a"="1kz4855a4b9pjf35wvdb3b5vi3c7zwv8pf3d38n613yg3gmpmr9h"; +"pst-soroban-1.0"="0fygllzq9gp37nkffgk3am2vygl5d5dwyr4avf1gvh0s698jj8by"; +"pst-soroban.doc-1.0"="16a1w9ci7ivqf30hvr23fv6j6clqjb4y7nmjgcbfz20xzxk3aa1c"; +"pst-soroban.source-1.0"="1h6srvvl3s1prswlj608y7pj5l4zzn13yqrhdv41956ikd1wbb14"; +"pst-spectra-0.91"="0nd87bnxf8giakadg457p10idbnn0m982l0pgyx23495qfxywax5"; +"pst-spectra.doc-0.91"="1y40d08nwnpkmrm0jdj69drpip1gwkd8n9hqmairl1wccs6r6dhk"; +"pst-spinner-1.02"="1nkmvjy19cpxqs3ii3djmrr6yj8naf54a97jbprs37afml3zql2d"; +"pst-spinner.doc-1.02"="1sff7bhnxjj7cmixl9qbfvglya79187gx28swxr7mby9ybf941j0"; +"pst-stru-0.13"="16i39r6vivs0z1l5l48c3vky9bac22n5k7gddfj7vlllfg6llgzs"; +"pst-stru.doc-0.13"="1cl5sq39pfvwhww488kq0cgnlihf63jkhqdd4rciaa8vf55mc6wm"; +"pst-support.doc-15878"="1470n03zanpw35dnfzyjqm7d5lgddrimypz28x0zsk9nqpamnqnv"; +"pst-text-1.02"="1s0dqi2mpzlk8069piv4z7jg370navi4r5z8aysy9vx8n0vm27zf"; +"pst-text.doc-1.02"="0ia6h49lfi9394sfr29wmafbhvgdm5zj7q13zll4d1agakn48j27"; +"pst-thick-1.0"="107cprs3hg9jmkdq00w9wc6bbkqmrdi91zm7bjhih461jmqax88c"; +"pst-thick.doc-1.0"="1irf2v4yg0w5v40m2przdcbhr51qjcrbj0s0i53rq4w4v3gl03hm"; +"pst-thick.source-1.0"="1qwxccyqzhl6mikl6jp9s2asz1aj96l86yq9s8nfacjg14vk5n4c"; +"pst-tools-0.10"="1x5c96fr17krqqhla1bw9qlgd29r6a97nmjcb5xy3qnfhg988mq8"; +"pst-tools.doc-0.10"="15pfzrg0xab8psbbw41lvxk4r8rfi180575cnmj3hvgklnsrx69d"; +"pst-tree-1.13"="0j41snn7zf7nrxkry85g1viac03cryhc6ixrsjqfx6n92l2l2fgi"; +"pst-tree.doc-1.13"="18m5a9gm3sdhz2dzdlxc6k2rjnjazd869gsmq6rg83davgj5hp4a"; +"pst-turtle-0.02"="1b5948sqlh4yaf4j3id2zq9r43v6s3azhbjkww7vmxc53rfcqfpa"; +"pst-turtle.doc-0.02"="1wfka7rwysdd4pyb4nhp1fy4f1lnqg32l6rjmqfd17fzpkmb3035"; +"pst-tvz-1.01"="0ly1mqlv7fx1xjivacx5dwwb1fjhqfplps9n0wzypvbwyd4nbaia"; +"pst-tvz.doc-1.01"="18pcvx7rlvad0a6hp0q8sq5pf1y1rfydyqd11bqn94d56nqw6api"; +"pst-tvz.source-1.01"="00i2akla1ibrk6hc0rby5q9n3ji4zlrs52d77y9iyazj0v3fab5i"; +"pst-uml-0.83"="06bll6q06szfsaib7jf09915qvz0rzf0gp5c9crwb139gbpzvxwq"; +"pst-uml.doc-0.83"="1c0pna78alfhi8i7bqr9zwcxx7sksi3idin5wyqa9dr95a2pwd80"; +"pst-uml.source-0.83"="0q5x7m84qdv8sy7x2nqfbhwp1lryr5vkji4hf74a0ialc617nfvd"; +"pst-vectorian-0.4"="16ljzar4sqq025z9ff4nvsxz4izvm6421jmndlz9908jbycqq8f0"; +"pst-vectorian.doc-0.4"="1b58x9dn16waw2vr24cgrc4kssfavwiryanp9ljdvsq3h0rwwics"; +"pst-vehicle-1.2"="0ibvvjlfnlxdrsfhm35r60r66jms2y674libsqlpk7f5bww19x4v"; +"pst-vehicle.doc-1.2"="034zhw30ii840mzg2ix2gf3xlqrkiffpjfsszw0w9nqqyp8r6vls"; +"pst-venn-0.01"="1i9frqc6b4wg3pb0ks4v0xxsfzs348ddhncr31mhfs39nbj6029d"; +"pst-venn.doc-0.01"="1y2pz45hlm2gd1lvj8p40ldnl04pzccgbsa3asnbpcifkx3gj4s7"; +"pst-vowel-1.0"="1p1adlrg62jsqzkjkl8avb79w26kkd5jdssmkcsd65dg5qfa9x50"; +"pst-vowel.doc-1.0"="0wyl0mvx2d0zd8q0sdmyrqgr72i2igv0669ajv0gz8miv04vr41k"; +"pst2pdf-0.20"="1rm0frzi52i3irfy5703kw38d3f1grby27nryjpb4ziiw6n5yizb"; +"pst2pdf.doc-0.20"="1sll10kps82b47npv2g2r1l3kkm5y75mp2p2pzqsnxxivgl5kp2l"; +"pstricks-3.01a"="0dlfwvlcwl3ygrxrvfhdkpksdicg7zwvijyhkq2f1a456ainz69p"; +"pstricks.doc-3.01a"="1jva7s7fw9kyx1i5l6l9n37k4p5pcypjsjn26ci4p41405z2h2dz"; +"pstricks-add-3.89a"="0b702qc6i9ic26n1wxsl40r0mjck73ibsnpsbwq14lzq5yjw21mc"; +"pstricks-add.doc-3.89a"="0h2wi9604ajmc8801yb382i2fy5krrq0bsqnncwy606j11w834np"; +"pstricks_calcnotes.doc-1.2"="00vgcdf73p4143dfjcvs4b5v4phvisv76ink3iiijl6s6f9zbmy3"; +"uml-0.11"="0gl1063pjxrif7qpq9wxwajpsp32idmnlsq27y668lwpkpm0vmzn"; +"uml.doc-0.11"="0n3flbps3s8lhr9pimdw41kmyrfvn51pddm4d3yc08v96sgg65bn"; +"uml.source-0.11"="0ylzxyl44p0574qvga9arjl84ip8nsafpgabbwjrk2kcbs47jsi2"; +"vaucanson-g-0.4"="10dk1ff3swbnx6l6c30s1ryn2dbyx9harmrcg7whmqdys1mahsbq"; +"vaucanson-g.doc-0.4"="1dlf50f0hpislqkcbr685y5xg7iz2y6zvlzjdkjq3af4qv7ncf5n"; +"vocaltract-1"="0af79zsabml28hwhf2nq19s1sf7p6kljyvz6c2zlbx96a5k9mjs6"; +"vocaltract.doc-1"="1sjvklf54r6znggylk2wyf1fw806v8msc2g24ibv4p1ia3da2giq"; +"IEEEconf-1.4"="1w544ygz9wiw8680f7q6iqpi40nblx7jl208spxmpmyf4p1xfgdn"; +"IEEEconf.doc-1.4"="1s08cgfch5z3giimyrz88p9p88p7967cm2cs6avxls9sm4a9y9aq"; +"IEEEconf.source-1.4"="1ngzyzyk23xsrmnyvxbfk3jafhparpqlg8wp5qcd1n063ln8h4ch"; +"IEEEtran-1.8b"="1s37a8b870d5pjc54cjczcrlli25j6hgnxxxljab4fa2b5b7y4xr"; +"IEEEtran.doc-1.8b"="15xi8241lp45mvnbl6nay60mbdzww811sj6dvqby7236vyi7lr39"; +"aastex-6.3.1"="0w077r2lsir646ix8n40wy5vy0lnw8vdlw1nmc6fvw2hmrf3w4vi"; +"aastex.doc-6.3.1"="1rdpiv6rlcbd06flc3rk7a1y3xi899h53r6binbjd0krvrss48s3"; +"abnt-55471"="0zw8vdmqcb5qddc0rf8qd67fwprwjagzy8s9ildgisb7arqmbj5w"; +"abnt.doc-55471"="00m174q9gxsm23j3fla7m7lj5fbr7iqfw02dz9s6481nfsjh1wgy"; +"abntex2-1.9.7"="1q7r2j7c5p1f0gbrc3sjd5gjq2mhljf1nj5n5760snhwj3qblr66"; +"abntex2.doc-1.9.7"="1id5yj5kh0qgjywbiajaf5hf9ix9jq8178fv2kvp1yslra7r20s2"; +"acmart-1.75"="0mylq7szpa7hz9wzgfj2j5lfd7vh7w3g2vlk84alvplfkgha8ac5"; +"acmart.doc-1.75"="05zh7vx3hz9raa2jgxg1p6pwwk2g8r5lmzp3glv5c50rskcjaj6v"; +"acmart.source-1.75"="0sq2dq2a675wryy3j59c133qzns82a6hvga8zcvqw85hn7f1fifj"; +"acmconf-1.3"="17l1kcwv6wk5p752lmanlx0bmh2py4hfxranapgbdrhjpis4jm9i"; +"acmconf.doc-1.3"="1vyhkwqg0v3pxjnlwzwnmiffh6b3d9nrwnpaqjm24j9d2sc6cxcx"; +"acmconf.source-1.3"="1n8cf6n2fdb88xmnj2m5r3cjz3jlp9n7bn1yr717fsp2ks81pr3f"; +"active-conf-0.3a"="1chi30gbr7xjcs7y3p2y8vfg6hany4wbacdm4drha9pa9m5sxqgw"; +"active-conf.doc-0.3a"="1css89hbdg8zgl7zf2x7vfgbl90x7bjvf0c0m0akjk8fzx936g7k"; +"active-conf.source-0.3a"="0anxqifjlf96z4vvr031v26s73d1a1sgjp8xv9xxv0kia4l7048n"; +"adfathesis-2.42"="0j60iq9nzk5kbs12dqx5jk84n14kdlx93mcypwi9b2gn7kyqzn5i"; +"adfathesis.doc-2.42"="0c6k4xsy0jg95qg45bqk9527kb3k3azyxwpl2zrkw0ld6k47sswz"; +"adfathesis.source-2.42"="17irbcz9wjnc6rj9f736i2hw4qrjwa1gz5z6w7gvq26b68pkxrw4"; +"afparticle-1.3"="0516hjm1v88vk70ggagkj0s00n465y08fr2ys3f2gychrax425a5"; +"afparticle.doc-1.3"="1ajpc55z02q8wgriwzzm4f96dmn5bpi9n81zad6kay7c7vwfa9g5"; +"afparticle.source-1.3"="03cx2ak956rdwdd5ya49fh81vdwrzq9y813r1h8qcp618sr3h14n"; +"afthesis-2.7"="16jyz1skb9l78dwphggq23jm14zwhycmkx3kn0sm13dcfifrkxpd"; +"afthesis.doc-2.7"="091f4flclyahjlxwa640l7vmrfiyb4wqgkh19caq8fld96zkbjir"; +"aguplus-1.6b"="0z7mgsm9pa33gykhwzlmpa3shg7ragrz3jdp8qfakp5ck2mbjysh"; +"aguplus.doc-1.6b"="1105vsng0yramk84pfcg9pvzjbm3cbyp84m6sxr9wadw02z5kj8j"; +"aiaa-3.6"="1z91l7lhi5pnh2ignmskd24asaalhyhdywkl9j6a7dp6cplswhy5"; +"aiaa.doc-3.6"="1sz6inilvyaqhnj1z88rws7xwkhhpw35il4ppxw9kn9pwvnrn0vf"; +"aiaa.source-3.6"="1lsbfp2zvhpyf1vb1ia9hdz1i796dbfqpndcfy8lay48f89n3njg"; +"ametsoc-4.3.2"="1ma0kxya5gxirqh9dliz1g00bgkpfy4jkj1npjgwqvgs335rri81"; +"ametsoc.doc-4.3.2"="1jv1sdd8p9q4qk20k2id5zbnwacxicp7xmj1j9vyp6cm7z6sza8p"; +"anonymous-acm-1.0"="0blyv8pj41qa3fvhwsk9kq8qwp8x0b1iz7vyc3lxcpcv626aqr2h"; +"anonymous-acm.doc-1.0"="1j0fhwv26ziw6rvg1s2x0ry5yq2sfa8a55xvpyrzl6pjmzrj3czm"; +"anufinalexam.doc-26053"="1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396"; +"aomart-1.24"="1dczk7aan6kcczp3jdb2x7lkrbjaxk8vbbqzcjfvrmigh6fdy636"; +"aomart.doc-1.24"="0ka345n7kbqsnpgcyzbswg2g3a328ksvdwvqqkwvxbns1l6g5f99"; +"aomart.source-1.24"="0pzpbn7s9m4s6cy9nd9jg90s3km23nl3ywffp7p2hq8p2ms72rpj"; +"apa-1.3.4"="0g7y5l9908l4aikm0mqgwfcdg19dbllcgdp94cl1aha7h4jq0971"; +"apa.doc-1.3.4"="0bzicm0x6sf78jbrqp66mgfjmcd7kw0rgkv0c6ah9945b9lh4ly5"; +"apa6-2.34"="08gk55f1a52az88nckdljp67vqv5i1k3n6wwxhgqb0m66j0aax8a"; +"apa6.doc-2.34"="1lk20c5lr1l3niccfcagn4pbfqgixivnz6sx1kafvljxg5gw2k8g"; +"apa6.source-2.34"="0qbwizqyyjc72c8sd2p7pyhdcqnv4xzsapjyhyryaifpm7x6dck8"; +"apa6e-0.3"="1da46dhvpwmjvm3ma4zbnfgsc2yiqg9d6rdrw3bd5h2ibs3vnlmg"; +"apa6e.doc-0.3"="17m97m9v0pcs58i3k7sdj9h1vifv3f0cxxyn4fzi8pxvzljwl5qm"; +"apa6e.source-0.3"="1155ic0k6f6gw6zmqq8pv74hcn45skjzyarf9vpkcksj96qr07ba"; +"apa7-2.11"="11ikpp9l7w0iv6bxdl1m4r3zbh9r2rilig56187q7fd1x7x9pngq"; +"apa7.doc-2.11"="0fvfl5ag5d0rdax4aa4x1xz1q6vcvdzlj2k58x08qk6gvv1qqvzr"; +"apa7.source-2.11"="00zyvd1q8zpmqrx244ljh7caxhdfzz0yv7ph8vc0c0x5rrbz5r0s"; +"arsclassica-45656"="13fql9q89zkdhid841hwxyrdbj6bd692lnc52d0yiibrd9gd9f4a"; +"arsclassica.doc-45656"="13cqb49296wzph7msrhpzswlyknvhrjaa81509l4j4mx1snxyk4b"; +"articleingud-0.3"="1ydj9dysf2qgk36ssp8pdr4c6dh5iw27kcw4ykzkx22ih5an0n01"; +"articleingud.doc-0.3"="0mkv9fq0hixkjf40la5na4dh0yqi3adgr8fyi1x74sbyi78gmfhn"; +"articleingud.source-0.3"="1h1w0fxa1cyw5d943mg8na7hxwyq2ki40gql9y0f7fdx31faiavv"; +"asaetr-1.0a"="05ff3l9qhk7bc2k2kk0acpyy4fxdfh3crngj7lgnvwbxa5wh8dn2"; +"asaetr.doc-1.0a"="0whp9d9pas44j775i4vn7zh5ss0yr4q5vbx51kz768zwgs5x8222"; +"ascelike-2.3"="039w1lm3bpfrrb5inrmzklmr9yic7x1fs0lpjl8z49mijvqsv1df"; +"ascelike.doc-2.3"="1hb732idc36m86qgss7wwsyqj6zgirh9qvf7ybpmqz6arwsml46j"; +"asmeconf-1.26"="0czrnypfx3yxcl1l8pmlp10nic8m6q3hd9rq3kc978xas5ijpcbk"; +"asmeconf.doc-1.26"="1awjrmffg318hzfkw8qj0zsm8gfvr06gjmyn1x2wfz71wylvgr66"; +"asmejour-1.15"="0vn60anrwncmiayxl69m89ndh6id7sarm74lymkgq2sfdqm8yhdj"; +"asmejour.doc-1.15"="10zw3qvdd8ax3k8js8k0acsnp7v19faypf403bg7waxi6if5i9iq"; +"aucklandthesis-51323"="1zlsa80vbby0jp46jicygq2fn64f1mgppbw6bq4qm9ncsapdz92j"; +"aucklandthesis.doc-51323"="09n2pdviw6xvh9ymka32pyscn16vgcxbij79nq0hxn6b6msxnlq1"; +"bangorcsthesis-1.5.3"="1n59ivvxhdafbryz22llxbgkpgc38ks5bfkhqcmb3yckk50awyq6"; +"bangorcsthesis.doc-1.5.3"="1jnhnf8vzqwyfnxl4bn666ak1fkfw3igncpv2g9569ky47f3133h"; +"bangorcsthesis.source-1.5.3"="0q5gbp2zbmz9i33xhhpf3ir66jzcqqdr7r6zi9gz3biqr4wm8q3v"; +"bangorexam-1.4.0"="0aq9bswsygpbsjsi3m8gg3gsgwhp8i1hfapdvlf9055i7d09lyxb"; +"bangorexam.doc-1.4.0"="0x5bhac4gryhmld733dk6zhz2z9w7gawy7yv432v57hc9vvbhhw0"; +"bangorexam.source-1.4.0"="18w8zf29fz1ilas7h9nzvn0saj52n825c8vkqsq4np40sa2ccn4w"; +"bath-bst-4.0"="1psaz3dw0qd9z8cp888hyfl68j6rk8nn3pldvalfpyb1bmzr6aza"; +"bath-bst.doc-4.0"="0v4vap8rvcmlkz147y60pc0prc8ggc0v78laags7jnjpw6f887xx"; +"bath-bst.source-4.0"="1m0j1rm20q6h8ywcsf0d63srgbnr93kxacs53jllan4pc7vjd7vc"; +"beamer-FUBerlin.doc-0.02b"="1ragp50ky0p240cyx9cbwhri5k4ghzbvclps9p40wzgjlqf8a5ws"; +"beamer-verona-0.2"="018ckad1q7ffkixvf6q9a5d4fzgpkpf9qv06cfv0rjwp80k7psyg"; +"beamer-verona.doc-0.2"="11vv18n971pcmn8lf2cya7jf55x8zw1d9s4sg2l3q76rdj7l53ra"; +"beilstein-2.1"="1xh2955zfnss2n9g8rsa0m1kad4b4xpsdrjj891kj97hhgd9hpdf"; +"beilstein.doc-2.1"="0k78mwjqqib6hx7c6lcxkzrbg3gfw64a68fj32g0wpvdyj406ssf"; +"beilstein.source-2.1"="120gcmpz53l2pzagh40nsji9g86fq4xvahzhwqqw7p01r03wc0cl"; +"bgteubner-2.11"="0a8zhnl1nxzg5r525sn8sz44crjdm5fmy09glp8cjj7nic5xj32g"; +"bgteubner.doc-2.11"="04nh6c3q2w984x7kmgj023dbpjq9mqciyg4xrypgc4zv8wvcgv1w"; +"bgteubner.source-2.11"="11g65q55cv4s72cpraxw7yj4qskkhqhc0mz0sfy6c8jrq7255ils"; +"br-lex-44939"="0pdhzadajg5vx5da6ildn9k2nfvf1ks4pxjgm32ajpcpfxbjpwk3"; +"br-lex.doc-44939"="001822zh0f18zvf6b51qdh4ykkv6ywqa5pm8q2vsmjv8rayjralg"; +"brandeis-dissertation-3.11"="0lil19vpr4c7lsx4vysszc8knqzp06hb80qxk4q9w3ljg6k096s4"; +"brandeis-dissertation.doc-3.11"="0ngzpw5mwfg2qz3r8gz275wc6i434h5agcpw6h265pdv2hgx9qnp"; +"brandeis-dissertation.source-3.11"="0qdj81sxhj43ajq4zflka7b1cbchl6djz2lqq5psa2z3rf49kv4i"; +"brandeis-problemset-0.5.5"="155al8iph3949h9859w32q6v885f0p6wd18m53rkliqvzc6d9f71"; +"brandeis-problemset.doc-0.5.5"="168ywrm0cnk1l5fmqzpk9mxf4732mjb488gnqiz128dbsshh37yr"; +"brandeis-thesis-3.1"="0h7n5gfm76vzq50g6bkz99l5wbqv97rmcb8wqkpjwqs0sg3m02sc"; +"brandeis-thesis.doc-3.1"="099cwm9spgfdy222kp5m71wf74a744jb39wkhxgmyqmv8jdlz7hh"; +"brandeis-thesis.source-3.1"="1cfg5vk58csi6cpkkiwbikan438zjaac6vw33kxqv73h8af4kz1r"; +"cascadilla-1.8.2"="013x6his54n8q3qp2xx12c0s2fbjca1ffmcb1kjy0yr0qy0y698z"; +"cascadilla.doc-1.8.2"="1l8xpfmdp2sc54qxx0ywh7im342nd3kbmgkx2pfzwmqz3xhpybfd"; +"cesenaexam-0.2"="15n0abwviaz213q00nv6faxc67fyqz44mvp28zcyysrhmrcxw159"; +"cesenaexam.doc-0.2"="0vqxkqgyg79kzfcxh40knxh5a3d2j6q3f778k2npfz70d2kaizj9"; +"cesenaexam.source-0.2"="069n1sk2g5n9cqq9rchk9w5y40igh620a1j5miscgykcczv2y0jw"; +"chem-journal-15878"="01s4sbmc4g96cmnbhx9a6bqjskkrr6saq91cly2pfy5gr256vmnq"; +"chifoot-1.0"="05p6x3l0vpzgxqw4pkl5b8hhkfg4jqv83435z8db140gsk2sz2p0"; +"chifoot.doc-1.0"="02x1z9dbnzvbvwfyqk8axkqhzchd1dfjdqsf4xkajxvjc13dhcwy"; +"chs-physics-report-54512"="19ci498mf3yy0xhmq4ghy8yh138dzs8953ki2mqn9hj6jjx71yfm"; +"chs-physics-report.doc-54512"="1nfmbhp3gqmf2pdallpnrx9hqlb8cwkndfri8i0mh411hrh72jp1"; +"cje-1.06"="1vs4752d8c8jsj2yrrzk5xq43vs5sy4byp4fjgczlxas0vj0v9bb"; +"cje.doc-1.06"="16vyabyjacg4i2a362nf78dp59r1dgyj3k5rcs13ilq62dy67ia1"; +"classicthesis-4.6"="181s8s8yk6y9haxz66ks1v6wwhpff2vs7lxrc8kshg1mn26bya4q"; +"classicthesis.doc-4.6"="1nxj2qflzs40mwnpd02bnbnh0ndm8rx12mr1vyyy6v3sc6g28yn2"; +"cleanthesis-0.4.0"="0wsib3c130m19r4z3ghipvgqvmfhi1cx86670ad3ama3rdmc3zpn"; +"cleanthesis.doc-0.4.0"="0hhvak1l5zc4bj874rd0i6v15v70i3aq2dlv736csvd2b764g6y8"; +"cmpj-3.03"="0hn69a35zkfrgy2gndhqlrclhx13c7515wqw28j4fk6ffpmn6arh"; +"cmpj.doc-3.03"="06yhinxa4s8hswzzh7d9x8v768fzk171fgi6kxgm76hfi4ydlw9w"; +"confproc-0.8"="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i"; +"confproc.doc-0.8"="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994"; +"confproc.source-0.8"="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c"; +"cquthesis-1.50"="143w42d3xw31dy8wdpqx01r8q9vs2an1ixnyil8n0q0af29j49bs"; +"cquthesis.doc-1.50"="1b7k2s3ils5s5yb3fdd6h0is494pss7s76awfn3dj6yxiaps5zvn"; +"cquthesis.source-1.50"="05gypg8zsdpfhp11rk7nii2vdw4rand5lw6ijkm23lbq2b5nwvwj"; +"dccpaper-2.1"="0k9qkl7jqiv3lf6z5f8532l1km1y144xx0dbz85qhdpz4zrbaikp"; +"dccpaper.doc-2.1"="1plk09cyld7xbxj2qppj4svqfdn9brmg6y30bf4iydr5zqznbcw1"; +"dccpaper.source-2.1"="1q0qxwcairm5jrqhwaq5hd5kbmh0vx20aaw9gv3i5f0j4fw4ldrp"; +"dithesis-0.2"="0spbmfqf2i12sp0qvh6875vp2zrgpkrhvbmjzwyxj6mjn1yr7r9b"; +"dithesis.doc-0.2"="0w9xgl8y2w1f7ns2nn9j5rs7hd39w6as2drcjmw4dc0vdbklkayd"; +"ebook-29466"="1jy79jrf8cd1rljg9f3g0hzkihxkpybvbgjnkzd5y6cfz7zaynp4"; +"ebook.doc-29466"="13cj8a88qqgi6kl1d7kb0cizl4i2pjm51hqnz9q03249av3z377q"; +"ebsthesis-1.0"="0vg8n4xrlxyjx88yzlsr82drlrigdnb870p0rxd1nv2ik2i1jzri"; +"ebsthesis.doc-1.0"="0gqh1zxb1w050a9dqnc5vhx1jgmk9kqk9k591s05xckidhnpp2v2"; +"ebsthesis.source-1.0"="0rg2bs23051ravdqv14k6yrrc993xpxf61zi8b94f0rjm3mg8f89"; +"ecothesis.doc-1.2"="1avnq2y5l2bc2lkf2g16p2vh77dabv52jr6jrm4jfm1wdapc6fmq"; +"ejpecp-1.9.0"="1wsbr5cc3msgvwn8p5f0jzbxg1qpx5hqs4xqk8hycxf9cf1gvc5j"; +"ejpecp.doc-1.9.0"="0jviim06vwag6d5kj7f8xmlgracqw0r4b8iv3w8x38yaqgbln7fh"; +"ejpecp.source-1.9.0"="1i826k5pwaj29yjg4kc0zgbay4b4xsjmlv7icn8d39zci4zf6lqg"; +"ekaia-1.06"="009wk5qyv26rdi9gjbaqxcpsyzz6l5w8b0wrg9avspq81hrjkg9h"; +"ekaia.doc-1.06"="1rbcnilarzap8kdsvypjwin1d13xskqq33wg6p0p02b8gaxzf3a8"; +"ekaia.source-1.06"="15fl2jhhv01vl7ggwmddpldkmwdj6gj99851aczv47lj24w093bc"; +"elbioimp-1.2"="1vfg29q8b20zi9lhn9nsr55hgx710ysk0dvfqpipqjf53fjsp0gs"; +"elbioimp.doc-1.2"="066g7g84fna6wy1slyh2sp9hmwjhp57hc3qf59gj5mwqvaaym8bc"; +"elbioimp.source-1.2"="1ysvjlmik0kclmcdf738vhl7xigsq8c6lqpgl3z2daarlqx6b8c1"; +"els-cas-templates-2.1"="1abq2g167zk3j6hv8dmbhaklfyv65j5i91k4mc7xrg2rlgjibdcs"; +"els-cas-templates.doc-2.1"="1xzhiyxd1dz3mmwhlkpf6h7qszgjdyxxbn67kbzvy0vb7s1c6fs6"; +"elsarticle-3.3"="1jjayypcaczxw69dk3v69fj31apics2356l934kmag49rwfzxail"; +"elsarticle.doc-3.3"="0z7iywirs24112fmdl8fm818320s3ilqlgc7xi6nl4idjakhfmi7"; +"elsarticle.source-3.3"="03pw09cw4hd0ixfa88mj7bijj9r3b6a6kg53q4hzzzl97bf6v5yc"; +"elteikthesis-2.1"="0q8s05q36825g2h7lci12zvss38izjshr76fb686h287pl1fylz1"; +"elteikthesis.doc-2.1"="12j0zbg2kq1dqf9b9qg9kifbajhc6p3gh1b4kixljbmvz2hqp7md"; +"emisa-2.3.0"="120aa7a4m1psqx3wclwzghq0fcyxs8djlf79mp2ds56y0mpsqx5m"; +"emisa.doc-2.3.0"="0lfx3hkpgl726bdp7kq874vch5bwpmnpypk7fch4bwqsi2x59iw3"; +"emisa.source-2.3.0"="0jqand86y23qs7yldi656xhl6da09ff8d260qz92dlqpngghpzrx"; +"erdc-1.1"="02sf80cadhv7if8arbjcsgqkb0hhdrlpq6izqgcai6vb7xsc6niy"; +"erdc.doc-1.1"="0nv1yqxjmp4mfksmxm373pmy3zzbfcfvi683dalpslzq2qyz20yv"; +"erdc.source-1.1"="1vpghcpm9a2pvi3plh7pjki7sna3hkzvq2xj9gzmhqxcpw3jskwx"; +"estcpmm-0.4"="1v027r6j4vxxvdccq83irjdj1gf6kzy5i9jb1bhsv7c2gdf3ihyx"; +"estcpmm.doc-0.4"="03q3z9if5hswrr086zi907xmjaijh266l5g9a140q0fivjai4hcx"; +"estcpmm.source-0.4"="1qb1v30ijky1xhh5dahgprp3fhxfm6kvlxgb059429idvm5ap90g"; +"etsvthor-1.0"="19iza3bimr7xxbajmq50iqd6cc1h82kz2lixwphn9568d5k5vjm1"; +"etsvthor.doc-1.0"="13cijd5cx7sks5jdy67hp1a08f4y223l0hxd3w7ljnvd5azzyc1f"; +"facture-belge-simple-sans-tva-2.1"="0n8wwl82w7hn11l3c3fg7nr088v2mv4s2d3ynwahgy18k6953pxm"; +"facture-belge-simple-sans-tva.doc-2.1"="10yh7528nms60ypc2zh9viamk9cihi0a67jcvwzb2i8f88sx4cfq"; +"fbithesis-1.2m"="0qzf6ch5b25qrhzflh8rwrljhlj87i6xaldnpj8j9iq83y1xh4jr"; +"fbithesis.doc-1.2m"="0wvnm716qi0y54h95zlqr7m1q9dgmjnl9f0ghvjgm886hljq752z"; +"fbithesis.source-1.2m"="02zmk6yx4v47ngd6ba6mjn1rnhm2w6p330rfz6nkq8shcky7sy72"; +"fcavtex-1.1"="1rnfrvbm4baslmmakf3s1n37razfzbc6d11b5yfhhdhskq2aci5c"; +"fcavtex.doc-1.1"="05ixrg17jwd315q5c52c4b8smcihj4rzrxjparrgfimivd85i3h6"; +"fcltxdoc-1.0"="0bnz5b9ibr3lh5qazdanlvvpp8d1h2apzkw61qxr6kg9ymmk2w68"; +"fcltxdoc.doc-1.0"="0dvr57jz38v5wflcjjp19rwjbisbzkdc91fji9s1yrv27drawijp"; +"fcltxdoc.source-1.0"="0k54q30f7qp40fh3clxyaa40xhsa28qyavn13km65s1hwvg4hg9g"; +"fei-4.10.1"="0bf9y73y9m7npl2bdnx5xqwxiv1apdpvnlqygvas8xcjx1gs7a4q"; +"fei.doc-4.10.1"="0w8m2mvsp68z6kylnn4waccnyn3fb766jipxcq6mhrgpv5jkxay6"; +"fei.source-4.10.1"="041ay6v82k6pmmxvdjyxj8drgv208fspnnrpmjijnlnn37bjc2k6"; +"ftc-notebook-1.1"="07ng7dgbr1swsx0zwm831wijqjq4x6hnr02354jdy9z59k6d4lyg"; +"ftc-notebook.doc-1.1"="0w9jxcfvkpif1fyd4xgwbfba9b2sf77mqr9symwby31lxqwrbys6"; +"gaceta-1.06"="1yimj3mxyjj36ib4lfdh65sz5w71rlp41hhnzz84kgb5y103wpaj"; +"gaceta.doc-1.06"="0vvadcqjj3hvjll9nqn3mam9ycas0zs810qi2jnq6smpm300c3l9"; +"gammas-1.1"="1wcvzihv3xh52s3ydni4gs3lcp9icmxinqj6znwyy680izmw67ba"; +"gammas.doc-1.1"="1al5rvpfavkc1p7ayknxnrs4r7jzx7f7dbm3hayqwg0d7jdanp8r"; +"gatech-thesis-1.8"="09bkni09mafpmmkw9hmfnn5894cjlpj418f44dpi0yriskx0aqbm"; +"gatech-thesis.doc-1.8"="0z6m0sw0wb87vcrp63kjmmivk6ya75mxh2jjwl31p80q8inyvz0z"; +"gradstudentresume-38832"="1i3rbv9ixnr60yrjzbj31aaq758638k5xvlarkaqsjvacc3wx88f"; +"gradstudentresume.doc-38832"="0nvih6lkbgc7jkkj303119fyxnajl4iha2baz2yhy62h4mq8lhd0"; +"grant-0.0.5"="1whd5f3fc72balvgifnb37583v0882xq51qa0fbb92b0a0c71nid"; +"grant.doc-0.0.5"="0zfz8gj8di6sx9k48zdn5hv5x2fj5rd8dm7x4h2k6xssrj4aw7bx"; +"grant.source-0.0.5"="0pmg6kjzy6wahhz3lk742qzx8m5afz8lqsl05zpkcmi7ris9m9ah"; +"gsemthesis-0.9.4"="1y9wj43qpcgp82sfi5s7izyf284hzkn5py0v145jx03l2kxhv90c"; +"gsemthesis.doc-0.9.4"="0fyadx4x8d64h75fq3xgmfxympcbfjhwwmwg4bpj20d3dbf0rh32"; +"gsemthesis.source-0.9.4"="1i5w77zwb9c4qc90hxz7sna8g2c11mkf3vnkkm3scm6pkbg9z0av"; +"gzt-1.0.1"="1d96hgipk69b0b342knnmahz84px2lh12mvqpy9jg4kb0d3pfhd7"; +"gzt.doc-1.0.1"="137b9cjdvi8f2pyhw036dslxbspq9sy88bgby33yasa7xcnyx9jn"; +"gzt.source-1.0.1"="1492wlfh9f67w1zfpmzy1c1c4iivf91a8fwhi9247yr2yaix06rn"; +"h2020proposal-1.0"="1yz8bz4nmccv0v700zz7x11fjdqhs4hgkz8cd6bnqr3v0n8k4xrf"; +"h2020proposal.doc-1.0"="0yd0iffrvahaci04bmnd20bszgshx28apsij1i35l1wjr1hlnfcz"; +"hagenberg-thesis-56798"="0zfp35s1mmi3qa3r7xwlyynncbrqbgxr1mxbcpf01fszyx5y3lw3"; +"hagenberg-thesis.doc-56798"="1brvzchb8zxnhrz2mksy9a2h0wqsa7k7w6bymi20jrzq3kgblln2"; +"har2nat-1.0"="0zaqsnvg46pdf98gzlxa8l6z8v9l3fd7jmf60nbrfba7jrzpy1bh"; +"har2nat.doc-1.0"="00n5qcljlpw2rq8x921vhsk7xvz8z43gxiq41qfzin696ysn7xj5"; +"hecthese-1.4"="06cpw0cfxmrzgp2ykkmabw9a4w1cy5lykh3c4fvh6i101czv9mv7"; +"hecthese.doc-1.4"="0227fi4qj5383jggcqrl3yj2rgi0chjggbzc6izfz782v0livd92"; +"hecthese.source-1.4"="0igfzr6qn6hnx7m4wzwgsgzfdv17k96m3zn7c71cm0fhqjzx0wpf"; +"hep-paper-1.6"="03b9l3101gzw5m0jhikn8aq18riy8z07yjnlcqnrgqrk72i515ss"; +"hep-paper.doc-1.6"="10af63x3awg87fzd83kqhz3bb1zpkhrm9kyjz42dnkm6pjn969f1"; +"hep-paper.source-1.6"="0m1kwilnja5rvb2xcjhl1kyibird9wz9yyq028kv5x3wbia68ihp"; +"hithesis-2.0.11"="1krjq1saz92ca0xcqzmjz6v0j1iyfx1g50c16bw2sa9kcm589kai"; +"hithesis.doc-2.0.11"="0liw73mp94dh4cfm2q739k4cy9k05fw21187f6iyp9d576hfv8nz"; +"hithesis.source-2.0.11"="1izdz82iv9q0xgg6i000j6sgywhvhhmmkwsi60k1vj7w6rkfa833"; +"hitszbeamer-1.0.0"="0nw7ch41rjp0wz0k508x2kkg4yqfpy6yfcl7n3rb88ps8fiqd786"; +"hitszbeamer.doc-1.0.0"="15kkzvgn1n09i7nnfd9mll1l6xqwrbpc252k54gi791nc30acaip"; +"hitszbeamer.source-1.0.0"="1ysr0z079l5k61v5r77hy2r150did3a1a29k1xppxrjr5ry3f4nk"; +"hitszthesis-3.2"="1cpjy8vdzmina141n5j0jqjls4rnvwabwj4by59j6vx5fq8d9ygz"; +"hitszthesis.doc-3.2"="1zps27q5x5z68d3s5wmhs4ihdhdv5fjr6ra0xyfaznbl1qz7n481"; +"hitszthesis.source-3.2"="0q3rqd2645fv81sw3090gama6wp0w1q4xn86shy9nrmc877z1ja2"; +"hobete-27036"="0825ng1xcpdmjihiffzjrvcvx2fqdz9mryq2bwffas22kf0zlx46"; +"hobete.doc-27036"="0il6kl26r8wmm6jzii7gmr61af84bl9dn4szlnw34dgsdg0an5hh"; +"hu-berlin-bundle-1.1.1"="0fyzil2b9qsi0qrahdias38w2k7flai2p1r8afqimsg16vix5ndj"; +"hu-berlin-bundle.doc-1.1.1"="0j6icx6ffy5lxy11myb1addsd0yz8y1n6fxzgyynqd6zd86w5pc9"; +"hu-berlin-bundle.source-1.1.1"="17x425hywz0gkzpg04v3cghq47ps89ckg4ywim98z4hy3pqvlacx"; +"hustthesis-1.4"="0c5akc97v3fh3skxpgmffywca8kyswmaypkyxdzwrqb1k2z4xknp"; +"hustthesis.doc-1.4"="1llsyhbgdz9k6swry84q539yjsvcxj6hgirqcw4vbvsdxxxsbyn1"; +"hustthesis.source-1.4"="0nqs1ifkhhzspdwg5nbqgpd2309aw9r65cav51vxpn2abss1q6a1"; +"icsv-0.2"="0gv7wrghqivfm8yb3nkm6r8jnvx7klbhr1nbp27cjaliz70aapa4"; +"icsv.doc-0.2"="0dlsqkdmx4nhgs15hhn0nw6vk6h3q3hhhwdymy8nnxraph2mvyl4"; +"icsv.source-0.2"="1fh1znhlacpci7v23aj9zdczhc87sg3l0s1gsvrbgznpadgbzbim"; +"ieeepes-4.0"="0nipchw9hdlc7am3n052bszilwj192pfcnc9p5alqnffrd8c4rdj"; +"ieeepes.doc-4.0"="0ff8xa7w5dmp356klm3lfr9dnfplxjqpq7aiczp6xj092vmjrhdi"; +"ijmart-1.7"="1j4i7f745nk80nghnpajkib2y6ddrzg16h0gn5cd215pibjaml6c"; +"ijmart.doc-1.7"="01ds6p3byc9j5sgjhh7yhbpv36idlp5g9afsqryvhfrwy3r9900g"; +"ijmart.source-1.7"="18saabw9v60rly8qp8vcgj84rjz88gbz4g2sda4i15lsjpmz4dis"; +"ijsra-1.1"="09dszs5ha929aws50zq2k7kia529bxfczs6j8bi0fvjnmf6kx3yy"; +"ijsra.doc-1.1"="0lb3rlqsscmnqn65l1aq5x5ismsplgbm1ks1pn6cs2sxdjy2s0ly"; +"imac-17347"="1v7zpbzgxz42b6zv0y3d2cmzzsal5mmzd3lb1nk779i82dhs6pi1"; +"imac.doc-17347"="0s64w9wkfmrbvkd8mij3y0asrkzcg2k58xjl36vfvcf07aw5wcr6"; +"imtekda-1.7"="1hhxwaykslzmf70lvmrmpnn2kq3xa114lyvazgfg9sccc990gnlf"; +"imtekda.doc-1.7"="0lzkiirxgvl2m0vnqpspr25qk1wyq1bs2sl3zi6704q3fvp6sqbq"; +"imtekda.source-1.7"="19h57cyxs47awil222i5svqgwdmw9mrm16wja9f1j980nzzaq7wn"; +"inkpaper-1.0"="10989ja1vy9ca451gc0v0mrkqi25dwv4fdvw9y4k6z26g7902hap"; +"inkpaper.doc-1.0"="1dmvkq44kyxd5y4l2kc9wvgrhgk4kkfw0qfqzi2faf9xd6jssrhk"; +"iodhbwm-1.2.2"="1d18fjqgingshxvsawkz9idybfz5fdzcd41qxk5hpqms7zcjymi1"; +"iodhbwm.doc-1.2.2"="0iqw7insxma8pmj5v12zjgs72j60z99g7w5kfkb1h6biwlx33s5c"; +"iscram-1.1"="0h6pciksfrabg7wgxsgzciw22cp6gmz9cb3ifdsqb4n4qk9fga6m"; +"iscram.doc-1.1"="1p0p4w7pkyc9xp5af1afmsibbbrylcfrdcbn16adscw8y6wmds05"; +"jacow-2.4"="06w817m1ll5p4bs3jngq8csy7xc97h918r9z5a2n43whc6azpw3v"; +"jacow.doc-2.4"="1vsc0nhdyzjjl4ajynl68cqvkcfal8ndknkb2zrzfmx2iic443g9"; +"jmlr-1.28"="14j317nhlc0ihr6d413ly2n8p2a38q8g25pii2a2j3jvdyyas83s"; +"jmlr.doc-1.28"="162cglkqy9dz0iydzk5f2g6dfwhi574xqw8xhq5i7mrrq111211n"; +"jmlr.source-1.28"="09wxsfm0x3l3y68brdp4jn3lg5w9kg23b1mjsvscls6pi0ac5sw5"; +"jnuexam-1.0"="0550skzwdanpzxa22rv8mx6c1ihr930rfaq51yp82dijgd211sql"; +"jnuexam.doc-1.0"="0ghypsr9h50cxafhca7h8pdvzh8jn02gh889zw6avk5wx5vixav5"; +"jpsj-1.2.2"="0yv7lkv7sr7qhqv0rmyislf0a5rcd125kqwbnfj3696cwhm5aqf4"; +"jpsj.doc-1.2.2"="1bmms10hgyl4gs91i2kpds2mn9x41ks8fjrislj2zl8y3vqdkc81"; +"kdgdocs-1.0"="1p1rcb0lzcsmgyqz5750pl2r73fd18k76gry45zfsr7750kwx7x9"; +"kdgdocs.doc-1.0"="0b2j3mw8z0f3d4pffqw2r9zxpmyvykd36sskkhfg7wa4q521nf3d"; +"kdgdocs.source-1.0"="0sipsvbi9254zpg0bmcfin60szx9q0vnx07a9bdm9ma11qb1djpb"; +"kluwer-54074"="15av38sb3pzffxvrxlbwxzgvhnxhsjhkr3qwrlqswwq1sy4a2ssc"; +"kluwer.doc-54074"="1cx0xya0s27mybl37gw3yx1rmcyvrxnrp8c4012gvmqiyqyx4sjx"; +"kluwer.source-54074"="17w0ybfzs9x8yixzl8cfldqi42sq2jpkyap8i08mvp8krqgviz1n"; +"ksp-thesis-1.0.2"="0hcsni8p92pm3l7mi56jj7mlcv5rvdpzwbv1jv5f1hb6xyx2pn4i"; +"ksp-thesis.doc-1.0.2"="01pbmmwwjzd5cq4xxmx3fknk8d4q3fda3680g344g5s6ra5i45nj"; +"ku-template-0.02"="1f45rknbzb3d3h72vznfzspg7vx9im59w5s5lwv4z0b4sk7n1d18"; +"ku-template.doc-0.02"="04gpy6a0mpjhbl9h2rnflvhxsj5b7x7fwll8z211fl10cnvalcxv"; +"langsci-58476"="031xf53v0w58k29xz1v6lin1yq1ya95raqxzxfcg665mp4ks55l3"; +"langsci.doc-58476"="1547xim0yrill63vw9h93aw7d0w3q5yl3wbg1cigbc3rk2v1a9yp"; +"langsci-avm-0.2.1"="1ayf5xbplhjgf2fcpxzhmdz2sz9bcjdnn64x4pc1k2yrk7zrva89"; +"langsci-avm.doc-0.2.1"="1b780ydqh0v0phapnjk1p044cn4hs4ww9ahx0fm2d0gj77fqsd31"; +"langsci-avm.source-0.2.1"="0rkhl4pkcs6cjvrd3f14l18rwk0ylq15kfc8k1n97bvhwy7azk5v"; +"limecv-0.1.8"="02wknvixw2p6sik6s21c6vpkw3nv0xflgrniiahjm4bali7dk3vi"; +"limecv.doc-0.1.8"="0bqw9ynszgyqq49hgr41n63flvgmrx7mb2ida76yyx0zziv1b6w2"; +"limecv.source-0.1.8"="0syp2l3d5nr9002whpq95ld5wrqj5mgrcd5vvbrva0sm3lbr761m"; +"lion-msc-0.30"="02xxyl35xl6c48x0fdlfkcv4bfhz4hghp1v3ff6pf9yl3cvqlh15"; +"lion-msc.doc-0.30"="0nycprcfi6769r47llwma71hzdb9a6sprdkkk6p898pmk367wbnf"; +"llncsconf-1.1.0"="0c1xjmpr9jb0k7xj6nj5p9qli3lxl98gnyq0dr94m2h31zs5hpdp"; +"llncsconf.doc-1.1.0"="1a4l8piav4ihc628ac3sjxz1v0rkva7in6q10xw3vhwdxsxbkhvz"; +"lni-1.7"="1y1g323qij5xdjw1c4n31lkzldj5bkfg5k1vs0snnqppmznp4afg"; +"lni.doc-1.7"="11q1sfq1ks61fjik6wq99yqpc2z5crxdw87pbv3khb3i0m3hfkqg"; +"lni.source-1.7"="0l1khvrpzwsg26ldxfx97qv8q03g100iq27lp0wr2qqqyrwy7sb6"; +"lps-0.7"="146a42clkjyrg046bz43b2rpvz3i2dvhcsd132bzc76d3x0sqps6"; +"lps.doc-0.7"="1nwn4dff3szxlvw7ydqp1ylw818maj0ij1g08zlz2i1gclizwpa1"; +"lps.source-0.7"="0hzmjvgd9y746d9983y73jnc7pl4y85lk37h5d6j3jznnrdgk7b8"; +"matc3-1.0.1"="1mp6k50lm020xqrq2vwl9xyzr5jwp9p85c6ng3k22g4rqsxhrb3c"; +"matc3.doc-1.0.1"="17xh063gahp5m83vj6x8waqwvf4hrvg3wi80z70r94bag0nqqf2v"; +"matc3.source-1.0.1"="0pq4l1ays56ry5v3ig76h49kn7hdk1gi0wqx9b29vkdvzmzrmq02"; +"matc3mem-1.1"="1asybbjj93wpbcn577cqkbfi2bkiq2hzv5b2lqs31igawaa0vdhg"; +"matc3mem.doc-1.1"="1fgngv22falzvrsynzzj51jaf4gfcw88jwbljywixqb9xcg9igcm"; +"matc3mem.source-1.1"="03x6cm78yhgfljhcfrvn49favgf6h11w96s9agr96xmngzh4z40m"; +"mcmthesis-6.3.1"="1pjllpvmqva7yk4zi4gl91blwbciw4f0fhq7rjc214iglyghl9fr"; +"mcmthesis.doc-6.3.1"="0np4zsrlb5xxlwc37dldrcawd9ldmjqgq1qhbpdz639n3j4gmnq4"; +"mcmthesis.source-6.3.1"="0acxvqka48id5fhr9p07qh01h44vhq3kapczr0i49pyn2ihibnyk"; +"mentis-1.5"="1pjpgn0lmyd7y7qbri8f7s01a1akgdif0s9v56ia2rsimn5fgbzr"; +"mentis.doc-1.5"="1r6799zz3y0iw020wwwl8a7az2j5b894i7w0pqqvsq05g4g00fcs"; +"mentis.source-1.5"="1ajy89hkvcika3aybpz93myylwlgfilg1d432my0jvmsa40ikcdc"; +"mlacls-0.9"="00cm8gvw3q7jl9sxanqrps2xfxpkc5555clc6gg2dh8c3n0hliah"; +"mlacls.doc-0.9"="11248ijy391rzc4srxaci7c7511lyyzc296bdifmpl26lgfvvf97"; +"mlacls.source-0.9"="1rm1ajh2cm7f8mvbyny40li7wwbqiw73cgf5c0jqai81zg58xc40"; +"mluexercise-2.0"="1yhgp5cidpkh4ihz20d1p445q370bh25jwc8ikqdq6g1qnf8sdv8"; +"mluexercise.doc-2.0"="0xcifm779nln96bmx0kvkmnzc9yk2314yc6nn98wm7gqdw2bf21s"; +"mluexercise.source-2.0"="0mq8fa0vd762q2h981mj6is4d5vry2qgggbbmffvmfb4h76z5gh2"; +"mnras-3.1"="18pjsph7xpdvmnpq098vv4gl69k27ad7yxxsb60945zhgw9yjrk0"; +"mnras.doc-3.1"="1ml220k5md4hpj6lcmx297pbmdbyp1dj1j9vb55dcl5ypc6jr3sy"; +"modeles-factures-belges-assocs-1.0.1"="06n2871v6jx29r8qjgcpg4h3qbnc6kw24kfk2f08wbc2rg2xdkxn"; +"modeles-factures-belges-assocs.doc-1.0.1"="1509xrny3xvy7nii0v1rga8ip18g8bv3d6vf8a3qn0cayfa9p248"; +"msu-thesis-2.8"="1aqdhw56gmkqmnwkyxk7q4xjk8k28srdqpf9rlwfrz8vwpicsqrq"; +"msu-thesis.doc-2.8"="1lay1hg2r28y9zmq7r3zs87spiab8zcd3k6smjrbcj9127910s91"; +"mucproc-1.02"="06x3hqdp6d6nm3n296wnj4j4w93cwgjpz0nlw5qj0z44zlghs483"; +"mucproc.doc-1.02"="0y33jak5lzhjp4v5d4pzfj7jlrr87dl6wdnkqcc0p9fr4fd2h1z1"; +"mucproc.source-1.02"="0xzv1m01rj74gg188snznshir510lj5myckfjx7am6sxwlfni63i"; +"mugsthesis-34878"="04r4y2xvwfmfa23cadgkz6v0q5djlhm291dqmnmmqq7lp569037j"; +"mugsthesis.doc-34878"="1wjlcgb5lvfjmxz6dngd76bj6046sr8lfzrnpg4pjbw3s5v2jd1n"; +"mugsthesis.source-34878"="0fyslrcw5f9fzchjlw5pccf32vybh7vn1jl9dpc8y86x8gg7ngf9"; +"muling-0.2"="0mh2iyjikxmcnag0ww3n1zw2j8vyky8q148nhrmjcacbb6q6xgwc"; +"muling.doc-0.2"="1grdqc0i4jiprspfwjq7qlvnbz3z6wzgl9x81r9fxzp6ic6zl86r"; +"muling.source-0.2"="0d69hrm92c3j83jz14zv40rv8hrshaw8gxx8jmgwf4avrq5civgv"; +"musuos-1.1d"="0hfrgx3lk7mf9kzf6n8hswzh116pmllx0k3djbfinvvvhnqy972s"; +"musuos.doc-1.1d"="0zxdnzd8x42z5fpvkarhsvdw3x4bz6qppn0iyjff1fjzwl8q8dzh"; +"musuos.source-1.1d"="0igksc3i5ydqps0g172i2hkb854bnkf7xh4jqvwlimrlnhs7nnkk"; +"muthesis-23861"="0bbv49nnngkpnzq7kq15spn4x67yigpyfk8ymcgv647z0bvbladf"; +"muthesis.doc-23861"="1nx1qbgp67n73k54ppyi4li4flnsyi8jmy1lil0gaza38m5y8aak"; +"mynsfc-1.01"="1pv51wyvrwb4aadwa4wdq8cjlvbxgcl4h146lrjafvyqayr8r8rz"; +"mynsfc.doc-1.01"="04h49pz1w3wqh7rxd0zzrcwi5m2hpcx33pay0iaybq6vf73ajr1v"; +"mynsfc.source-1.01"="0iisnbgaijc17nqrd4pqfvl6h81v9h72m3f0f57rkq7995k37mya"; +"nature-1.0"="0b1ra8babjwpn7v22rjc22pjrjczh1wflhq9ihbj5ag3d10sil6s"; +"nature.doc-1.0"="053m69fwgcfpa5gcp3dnf7k37175jcsclfkh87lb0zwcymjghlw5"; +"navydocs-1.1"="0isw46fzvk85i3mimwsc3x7wg8g7ifbi23i0d4v676nd92j1i72n"; +"navydocs.doc-1.1"="1aiyz3z489bdsx4rh79gxbdb986hff75qik97fq0xrpk3w6x6cjq"; +"navydocs.source-1.1"="0x1n44brcy38fnfp03j9xl1awfawwa8d0c5cg739yr404qbq8dp4"; +"nddiss-3.2017.2"="0d1maznv4yqpjzxm90vdl68h6h7zr7m0k24dirq2nc1cky6l0j1z"; +"nddiss.doc-3.2017.2"="1apqd332kj67rpa09md0gb025kx4d7arvqj7f4l8krgsizxfxcck"; +"nddiss.source-3.2017.2"="0x2abanmpp7sv4qbwl6in3yp9k99fx453f2fn8xw9b0z053ivvp3"; +"ndsu-thesis-46639"="1bjrvsdmv68zlm2xd9v4jpkg39zvjhcrd7435r0jh0sffai4pdlc"; +"ndsu-thesis.doc-46639"="01jfadx1dcmm3q8pdwpxmxfmmp94xm9y0r77220ffrlf1iczadkg"; +"nih-15878"="1rlhnhdz58qqjv563wjpp11ppyqa5smjpzjdzfcra0wd6cxv9384"; +"nih.doc-15878"="16klyjxzxj4mipql71admicnzlnasnv9hb5pl52wyk4ic8ggdgwh"; +"nihbiosketch-54191"="17gggbkag8y4fjvj248wc8kqiklsqmilcyisx9lwcf5irngql646"; +"nihbiosketch.doc-54191"="17lfnfkgjdhj8i5zv08v6lgxrrjg8hzbbq9ihnpcbhj2scn96g7s"; +"nostarch-1.3"="181a6pjdr7ffsngv7j84ddps84csv7ir3wr49qjax3lr5fhiw7qi"; +"nostarch.doc-1.3"="1sjd4yz3j70pncr47ryis4w4459lbs4jpbb75wdzvgygv9qxz3w2"; +"nostarch.source-1.3"="0f6qrlydiajnla9n4mqnv8f1iyl0f8ip98hbx6dzmmjz0k5i9bhj"; +"novel-1.52"="1xlglq5lifj088v3skmvzpsg44s0a3jnz6y3j4mw92wfbmzwnzhp"; +"novel.doc-1.52"="13pbk3amwpxzrhnsv779pcyf2aiih2iqicbp1ajc5fyyr3mr52z2"; +"nrc-2.01a"="01pczvyzfc2vnrfsab180fg0nz13cmry0dvdxmq3lxzp75ji5aqj"; +"nrc.doc-2.01a"="0l6lpvddg25k8dynqr26gj7fnaq7k6zbzp5p62684sz9351pvz6c"; +"nrc.source-2.01a"="0lzfw45m3mw7yd9sx6lya6cvan696p74wrxgvmqa73prc2lhmbv8"; +"nwejm-1.0.1"="1f33ykxdzgx2c9w97albyaisf3lv69x5d1jgjrnvbd6r3xrwlvls"; +"nwejm.doc-1.0.1"="0asg8g8gvgb290z1if71sj440k4fyiydmvq9420vmh4w11kyg3l7"; +"nwejm.source-1.0.1"="1x47sgablq02j47i1cgin5dl16qcgf0k2qkaabgrza7l3jr67jq7"; +"onrannual-1.1"="0bj29lk2nlsmky82ablxl0r6k6wl627zrsv9g97hydgdmi5nxasz"; +"onrannual.doc-1.1"="08c3xmyiz91623lnps3iahi5ga9941nc6bvxmdihadxhm2lk769z"; +"opteng-1.0"="07a6dja6s7c1759i9afgacx4v0fli98s6mcq5zig689hpkw841fg"; +"opteng.doc-1.0"="1125aj55p7n6b03mn6p6845yvx2jbjkwwldgwiixypklndqsf6cm"; +"oup-authoring-template-1.0"="0bamzc98y8vb7s0sw45ampcijva64j0y7p8v8y7l0rby77hra8pz"; +"oup-authoring-template.doc-1.0"="1z5ac2fxzh5fjrl2d4di50lk39rwrwl36irad6k1jm4zxm5260a3"; +"philosophersimprint-1.5"="1cdnlyf9cf591bqp1dqdxl10i3im014vhxv77m8mviklayjyq1lw"; +"philosophersimprint.doc-1.5"="17j2zh4p8xhf619slqpm6bzycwd9zpr8qj066c4wm63la6fy7lyx"; +"philosophersimprint.source-1.5"="1zdcwyknfjxw3vmlipklrvfadw5ahh4i4ns95kyqs1x57c7wgamp"; +"pittetd-1.618"="1s8865g4fv04ha7vls9frkkmx8dyn0l7z1rqvh3dkyy7fdgq4vff"; +"pittetd.doc-1.618"="1jkdny3kqljfjnf9ywpz7xqvfka8kwi33jy3z2yiq1fvp8k60ar5"; +"pittetd.source-1.618"="07k0ilmwkg3wvgfpqyqc60hn5mlsj8z5lsx8mq8h3igwm4j8krzi"; +"pkuthss-1.9.0"="111qribw5ycq7q88l41cpm25vp7zak6cp29ivim637qx2qxzhwap"; +"pkuthss.doc-1.9.0"="0w970jgsa4a5ahx1bjk3y0gkmrcb576xmasp53z1sr342lr8qbrk"; +"powerdot-fuberlin-0.02a"="1gx04y9ysvwzghy38k6izhs9gm1hzssnb5zh8qjjh8v99mk6cqwa"; +"powerdot-fuberlin.doc-0.02a"="03ci0lcgw777kfmnzas13q75n03z8v2im1wzrd8hpbcwq18mmn2v"; +"powerdot-tuliplab-1.0.0"="08f25qa5fdacsd8i0bs8y0p3k0zjgja0qp4ak0x3bixz7yivg5nx"; +"powerdot-tuliplab.doc-1.0.0"="04b546i32k1cs6armmnvr8aqbfvs0ysarlsjmsci9xdrz3clm5w5"; +"pracjourn-0.4n"="1idcncspb2dcmrfsr8bf1ar413mc51lliq9xgpv0ybsiv91yd4lj"; +"pracjourn.doc-0.4n"="1hks8p9vksn88daqyn7rnsaza4i05dgfb3ngd5yrvvw0v40s3acj"; +"pracjourn.source-0.4n"="1jbicfqvvyi4nnmpqafzlzlx459v5cyv62wmq67c2692am8a04v8"; +"procIAGssymp-51771"="0fc3r6h5h5vq5af131ij5zq5mpm9yl220nnq0hr4q4krxzmc0hnk"; +"procIAGssymp.doc-51771"="0nz98xjwlx1srfakqymgyxr3smqlrk2qgk6ikwbdqs07prpiszay"; +"proposal-40538"="1y5i7xl1z706fcv82s5dyx1ksfvp9dq2m0shwy3an2r94qszcwmg"; +"proposal.doc-40538"="1haa55hhz11j9m3lxp84yzlpyalrc3hlb7wxvmngqhn2j2mi0b3c"; +"proposal.source-40538"="1n3z0rvhnc76grih3jy5h5ax7rffxjwmafd92fnp10jinr9riapx"; +"prtec-1.06"="09izjx2g6gyckmgzrvg9bzlwz1yvwr0nc40s6wsbb898wa6cswxx"; +"prtec.doc-1.06"="1cv2knhl8xrsyzcywypr6dqgdxqss0r9mxl6wv4clpzpsyvmfzbg"; +"ptptex-0.91"="1p3bahmdkxbdgczvx52qhyn2w0wmdzr8061idf0kpbwvl0nkw75p"; +"ptptex.doc-0.91"="1ldg6ljwf0iivd0cxb22sld2q2afwfb83ac5r6jxjcfr5ac7dv0q"; +"qrbill-1.02"="1n8rv168mhkml0xrf1l7vg9a56wqpyn428j8mlpyaksd6imbd95s"; +"qrbill.doc-1.02"="1xpg81mbpaps61cx25cd8dix1c7i2piyqfyvhy7a11z7n11ad6bw"; +"qrbill.source-1.02"="00pfbhadhk6ji7k4fmasqi60ms6pl5w26yamxszbl3j1057vrx17"; +"quantumarticle-5.1"="15h1aflvl5mgcd9l096l3s56pp1ryjjm83xcaqfc67kyxgjxkapf"; +"quantumarticle.doc-5.1"="15vwy9m5b1vv2mr4wwqsfqqx0zrwgffbh6f9q8bbm55xdgshyrr2"; +"resphilosophica-1.35"="00qqwp5n5a8hpz4zpcmh3avbm0wh2csdwdf450hmqnhpv2hn2z18"; +"resphilosophica.doc-1.35"="1s5r4s8ja16vsz3ssqk0klfm1vfxrxbcj45mlszq5r3k5gsa1y5b"; +"resphilosophica.source-1.35"="0nkxh1yc6nnjlh5bmf9w5k6hzg62f4i7x7nbf2019vlwvqn7r4yp"; +"resumecls-0.4.1"="19cw19c4a3zn5gvsngcxj6xvh2qq5n5am0sdmg9zajy9lqqp5nnf"; +"resumecls.doc-0.4.1"="17z14r8yj33mjjkydzaad1bm5nhvrv5154n5n6snjszd13vgdyh5"; +"resumecls.source-0.4.1"="1mm53893g9nqp3wdks6qa22k4pk71v09rg98nm1i1bz5ppn6kj18"; +"revtex-4.2e"="1kph9xdp7ax4pv24ixxrsivhk9xqd5ln23c96cnn4qwvs65jygj1"; +"revtex.doc-4.2e"="1s7i1lr8ra692jwjx2bf61h1jfndqwpqfqjr91v28vh3w7cg0m7a"; +"revtex.source-4.2e"="0vishjx0cymhnb4lsnx05zdghfs9h2bhbz2jwsbdma81p66lx4jx"; +"revtex4-4.0a"="1v1km5grdg72mqf7sha1laprwhhwplrklax9mabhg13q4c9k8dlk"; +"revtex4.doc-4.0a"="1709bsjlka0d8x405fyac8vpmklf92qhw0qgmzvbhynhq4sc85b7"; +"revtex4.source-4.0a"="031vqkbg38iwi92yhvd5xdmmkbjhrr9lm7ncmlwgizf1y0ib7wpa"; +"revtex4-1-4.1s"="13azycwjj9ihirfkcgmjrpvjha4wngmgkm6irh3388zwjs2sh7sj"; +"revtex4-1.doc-4.1s"="057yf32dsx1j3b89wl9jqrafvib8p0x6l3w3zk1c98p9vp8c0lm8"; +"revtex4-1.source-4.1s"="03dy16s50bkgj2l2zkm3z6mzf9qwhrax7cxll2p0rxxwfgvpgh8a"; +"rutitlepage-2.3"="1h6z0p6m4a1ivr57165w48b9rp5jiad37cdp2z9akk3pxdg3ywq6"; +"rutitlepage.doc-2.3"="0d8gi3ks8wjjbc6zhw4gmpsx44pr93iw7bw9ak5xfnm04p9vw81r"; +"rutitlepage.source-2.3"="098n2wkddrc7f74jlbrfvxzvplyj05dr1i7czah2ciw2z93m53z1"; +"ryersonsgsthesis-1.0.3"="0zn3hp9ipjq3624h1kdz1r55wxhawylxkmh6fi7v6cz37cnn36wx"; +"ryersonsgsthesis.doc-1.0.3"="08bylz7p9ygmzy6m8h7w33l4lch9iqnaqnb3nxw30d5gp0rsb3j9"; +"ryethesis-1.36"="18d9lw5inr4fxxk4x4xjxnnvbp2agz25c9h328gi1c3afsmi4lsr"; +"ryethesis.doc-1.36"="1jy3vsin13lpd8q5piia1klc08nfmhnx0hp9hl8gnz86h53mc5xa"; +"ryethesis.source-1.36"="0chmpps2q20bkwf7p0yxwp1y6mak5hga459vpji5sl754nzbvxb6"; +"sageep-1.0"="0yavixnkhy1y69l38xj6pbihzm83ncvnsl6pyr3l310hif6r0wcg"; +"sageep.doc-1.0"="0z2n1511lr2m39vn4bdamw8xbxlw92p5hrsxzrnjlrg39ysymsyd"; +"sageep.source-1.0"="19547avrh6yv2v86w8f7b0pbvh8xvwa5z8q69bxcvhwj0jqjicps"; +"sapthesis-4.1"="05lql3yqxpld4f1j0745aglvnfn7jr3914m4s5579s5q99aa2m5j"; +"sapthesis.doc-4.1"="1vjmq2r7a55v1msj2ca1lpz855zbiaiv485204bwh3hq6k3vajrj"; +"schule-0.8.2"="0qvq3029ghky49vq85wkpdd58ha20gag33drbmahnbmfa541fqb9"; +"schule.doc-0.8.2"="0906b4pl0rkkk9nbp4p0ds16zdw318xr9gh8al22yjf31f31dww6"; +"scientific-thesis-cover-4.0.2"="1ggghh7w9grb1l1r7xg1igdw79jswcanyn49rpnwiq5rj4a09r2j"; +"scientific-thesis-cover.doc-4.0.2"="1slsn30sbhxlvr73fk9infwjkw66p5sgv0ydkmarkp1ncybqzr6s"; +"scientific-thesis-cover.source-4.0.2"="1qlxpsy3rdb10xxv1nsn817srdfywq6z1zgb4vb0hy3qnbd2rjwv"; +"scrjrnl-0.1"="1p858dfbqas8x4ddpw81mf59p47iqj30yban2g70rims1wqy4f45"; +"scrjrnl.doc-0.1"="1rfx2x3kir9qxp74halcwrn9zg8c4lm72jljspw040gpvjpiydm0"; +"scrjrnl.source-0.1"="0b48zv36kn7bg2n94yl2dzwh9ba1fx7phpzljqpn44ybj1ng966w"; +"sduthesis-1.2.1"="1i8rdk8m8bc5lk35p7qd4pqddi3knpq1ylbxv67ij7g8sgrl9xwg"; +"sduthesis.doc-1.2.1"="0i7f9zjxs297hx3hd6cm70hkkc50wb1pcr83xk54cy72yqiq119p"; +"sduthesis.source-1.2.1"="1j6asblirf0x4f5zp8zbmpm7ak5nsilqf4ksxr4bgrca70vfava3"; +"seuthesis-2.1.2"="0yfan3cpx7h7hrnqncn152ccawlrsaccj0c53kzza0wnkr3hc9rc"; +"seuthesis.doc-2.1.2"="1hnrl455lz61y9ybhmrvxjb66y5816sq3yqb76zszrscxh5a8h5f"; +"seuthesis.source-2.1.2"="0dw7ipk6l0mwgrwrj9sxg8vidwmmy22vmpwm6j2ksnznz0238yf7"; +"seuthesix-1.0.1"="07vjbiycd00r1daqg8m0b6g9k97ja0wn3s4zx7774av6p2hdhllj"; +"seuthesix.doc-1.0.1"="0j1vphdi9z6anvw7d3a20nasrdfgg8vrn9jh9wi787f9vy2xzdlz"; +"seuthesix.source-1.0.1"="09qpilk53k37c8dzc3q3pgvm6yf7i7a09ln0yn586wslvm2dmmhr"; +"shortmathj-0.5.0"="19rscnl84f9x6r7kajj6wjh80di5y1mc4g4nybafnisap76r3c06"; +"shortmathj.doc-0.5.0"="1kzzbkv36hj2wc9kz1wjr5dlgx3r21vlyj7sy8m8i72yfnmajgbx"; +"shtthesis-0.3.2"="0kyhf8pb542mlpf1jd14lral76vlkya1iv3jyw59x11vw9c911vi"; +"shtthesis.doc-0.3.2"="02xqm4dkikb18ha2z0r63i41czjmxm7sr2gzpcgcvf7ql3n49cp2"; +"soton-0.1"="03vldli7z2bsvznmqw5y6gi81ln5v54jbiqm53z464v76kp9w29f"; +"soton.doc-0.1"="1i7b5i8vv88cjxvcm1adlxikqwvbzpzkiiksdn36in8msj23vjkm"; +"sphdthesis-1.0"="1a0a4mwf14f4076gwiqhgdq436l5fxw588rigif0mcpnmmmlkxwz"; +"sphdthesis.doc-1.0"="0b6cgkwb4v4v78nvwg2n1zgc3ww9fnkh43s4qb3g3pdjc399dj3s"; +"spie-3.25"="11s8phbfna7wwx1gji1mpl93arvxlgfpxif4c46xia5spn4i44ji"; +"spie.doc-3.25"="05myxi72wcagb55fk8p8461vag4yl79ilyhfri8il4i72419ip22"; +"sr-vorl-1.1"="1qvq1pb4hr8gqwjcjy71p9mqina8d0zp8gqq2xgnc9p0kgch4wa3"; +"sr-vorl.doc-1.1"="16xbvgc2cyxsbbxg3xi0p8v6p9zcw6wj4l6rsns4hmlnljlgpsm7"; +"sr-vorl.source-1.1"="174bmffj961fsyz8m35y6ps634612sv8dn0ihvlmbyxx7apbj4bf"; +"srdp-mathematik-1.9.0"="1igzl2ws9lg0nbnq20j48zb2zaaay8k8x2bhw1gdiq98qpc028pl"; +"srdp-mathematik.doc-1.9.0"="13gh9xx6qd45r6a27bsr4v088fnrljvba61b74wn676vx87028sl"; +"stellenbosch-11a"="07j555jrcg91nk6rgr6c9dq8y9b3i0677j339hlcb6mk7949nz3m"; +"stellenbosch.doc-11a"="0xrpmbzaa4y3v86zzdws9al13v723k5yjbxgnd9l985fgq5w21bz"; +"stellenbosch.source-11a"="16mmz7pq4y9blxskrxjq8w15zq9vrbcr6nj8ynfy13b7wxvqqrcn"; +"suftesi-3.0.2"="16ys7hdias3f5si5pwk60af86mpdbvmnpmyxnfvj4va6427qf84v"; +"suftesi.doc-3.0.2"="1rkwx6aiq8mip4qyf9aq1fqsp63wz3203mrkny0qgkmgcb07hc8w"; +"suftesi.source-3.0.2"="04c5r1rk628f0fpdxmya47rg33x8jngis44z10apkc1grsqszjf0"; +"sugconf-58752"="1x2nrvqnl65jk3amclgwrk2x1dscncxajdf074a2d410w1vikrck"; +"sugconf.doc-58752"="16w8nfyixsr7l2dn1lbwcscbs6m4mczql9gmg9wi16nr8d7pm8si"; +"tabriz-thesis-1.1"="1jrxxmd38369qrhg2a8w4j9m3ldp08wrblbpmc08f35zwlrackbs"; +"tabriz-thesis.doc-1.1"="1rzl7y6p7n46r7ljcycr4k40qxbih06bli90mdjwn96vn60m1jym"; +"technion-thesis-template-1.0"="1w004bdgaag02kqhsdksw7qy93lyjihhlbxiccavp7m2aj1h9xly"; +"technion-thesis-template.doc-1.0"="1fa280wcainx6z15w199fbvzn8ya3zplgfw41mmvp8cv3y2njnq6"; +"texilikechaps-1.0a"="1z9nvv2y2nzpkpxyf18p426wcl0g6gbg7qppq70b285kdbczbijd"; +"texilikecover-0.1"="04bljvhvmrxh1a4sfqw57yysaw03c5ldi1bq63mlqqvd9p3hmyck"; +"thesis-ekf-4.1"="1liag94i7zc29m4j5vcilzwv13bspwzgslhkf92w807r1k20qi7c"; +"thesis-ekf.doc-4.1"="1ijgnpikan6zk5pc5b5x0sxi7rg8zbyw03q93m0pkd4lz4wf6126"; +"thesis-ekf.source-4.1"="00zchl3hj4a3ir226ph4521x9phpfwbw2jbr9sp1qfyy5vj80fnd"; +"thesis-gwu-1.7.0"="16vb94z3svvnsxmv43d3xy6rz8ki3dmk01iz553q949f4dfig1l7"; +"thesis-gwu.doc-1.7.0"="0xfl7s0i4ni5lwxlsmlldl96jnhfxjyay99w3qc3vc4az9vdqfmc"; +"thesis-qom-0.42"="1iflj5y6vlgrgibp3mrafh3xrz5hzqd5p1iyqc8q10lqr3b5qfyb"; +"thesis-qom.doc-0.42"="1cz04c6qnd88cv2s5qfg0bvc4qcbzhdj0hkxx4xhskqjjj17vhxj"; +"thesis-titlepage-fhac-0.1"="1s9g6h020ahv404mxsfvqic2im68qnvb425cyvz0bj2rwn1fwnc8"; +"thesis-titlepage-fhac.doc-0.1"="0pjvm3d2l9715q50nbbza5l6vzhj6zaf9payimk1lr6k94357v1s"; +"thesis-titlepage-fhac.source-0.1"="0bhf68pc8c41ih92sajva48m9fq7a05x4y9qqanbidvmb6jmvhbn"; +"thuaslogos-1.2"="0p5xs731fjvd413rg4lcp289ijk1lxa5f0c9arj949f6s0pgdqfj"; +"thuaslogos.doc-1.2"="03a24gn5zzr6ma9q391s0vsg7qqn53kbmpw86a3wlyycsrz9ipl7"; +"thucoursework-2.6"="18f3gbydg1z6hiaidqw3j9yqybzvcp9ykq5a7frbd3ww051rz9xq"; +"thucoursework.doc-2.6"="0pq5i3kd19ng122nf1gd97xsc8gd58l5gplg7iswfjykdk5zv562"; +"thucoursework.source-2.6"="016r76nsk9lnr2zkkwz27r2i35j154rlnk5izd11rlmsyw3ix7l0"; +"thuthesis-7.2.2"="0ck6z0fkcsrw22f3qh3lpdw3gma9gmq51ppi4rwd2qnayl2ffs1h"; +"thuthesis.doc-7.2.2"="1xr0m24dxi6i4fbhh5mjs2b54xnpd0xm00ssix9sqv366skkaxg5"; +"thuthesis.source-7.2.2"="0ncw054rzd2byc4sqj83pmg4yyxsckr2bh0rp2spc8bp9j49zir6"; +"timbreicmc-2.0"="0inffnb824kv9lswj46b8p0zb36f4s3pfix4m7x7v0d216xa75pw"; +"timbreicmc.doc-2.0"="05x699cyrkfnygbwfifzz4ih0g5nm7pzlj6ygkh6pysyzxkb5w94"; +"timbreicmc.source-2.0"="0hznll8725wbjmayxilg0hvjw2vf63wj4cxmznvfly9lk8z5zh5m"; +"tlc-article-1.0.17"="1kzizgzmi7swzhjq9dasz392wga0w1qdb4x3x812lbshzg235vyh"; +"tlc-article.doc-1.0.17"="0w07p4rv12ila4ix4pymysbig3yl1apb6cxmb2cp9ziwv9c2184j"; +"topletter-0.3.0"="13ggrw7s7k476sp8fzbj5if20wa1x75m68ip17f1srihnfks3903"; +"topletter.doc-0.3.0"="0f45rz9n6fsg2c429n3hmzqx4cqv9jvrhwgmbfhznn6zrlip3qy8"; +"topletter.source-0.3.0"="0p6gvk4xj7bsazb7ipfgp6by60br9lyha53lj0z7rz16f7f2ar0w"; +"toptesi-6.4.06"="00qd8ap3dgrj16g831458m2kp0jivvbvmya2xzcyp560njsvqqca"; +"toptesi.doc-6.4.06"="09hnbj0g7x76m9lnn47z3cjjnlbbfmapmln3hi6ykb6lh534c4wa"; +"toptesi.source-6.4.06"="1nr54n7hsij9rjn54wgnij16xgay0dda2h6vl2qc44s8yz892jc2"; +"tuda-ci-3.13a"="0f5a9pxrflq3y7q76xscfp5mnzx5k5jv2kqx193r98azzsp958js"; +"tuda-ci.doc-3.13a"="02z3mp8jcks8wbnsq9z8v0n4p89m7i4bywp222wc7p23n37813dk"; +"tudscr-2.06l"="18ajhs99l6f6jh76izkn6g3xllnc739hcdgz0qqr6q4d5i36xplh"; +"tudscr.doc-2.06l"="12mfhhri2pp9cc1pc2sqhx7jbqrcq5js6frsilnkar55v7jnkd38"; +"tudscr.source-2.06l"="16wj8pwsm3f5fcgw498qay8icq0hqrajp1n9bilybc56h5b5m1c5"; +"tugboat-2.24"="1jq8zpm76rbamkpq1dhsj7il40h46bfpxhmh7mrfd2a9pxkzviia"; +"tugboat.doc-2.24"="1s2b5zs6b7dvwwq4gwwb03vjdmdwmyfhn8n31wqdjs338ia7ndsz"; +"tugboat.source-2.24"="0idn2zayjwa00hyhlpn16mqvm7aa04n2gcqk9mx9cksrydhj7733"; +"tugboat-plain-1.25"="1nq7lzyxy4nazdbdxk62jcsk76ysvqaqwi9vb5iwkl2c6bpgw3lz"; +"tugboat-plain.doc-1.25"="1bvgxf460pdxp312n0yv9l95jiq5hr0mkmphf7925d2w3n724rrh"; +"tui-1.9"="0liczx2jcdks6r5040r7dqcyrcj225xq0035ccdb9kjmp0rmc90b"; +"tui.doc-1.9"="1m73fc2nj7qsy144fmbqhld3hx431ry64jv5p7h0r4p0giadwxgc"; +"turabian-0.1.0"="0fjqr88a51699p57d9mpkpf2hn9rrmdchsxhpjng8hkx3yjl647g"; +"turabian.doc-0.1.0"="193qbhcgh63kfnrivzjyyk8vp66wb5k4791qdii7brp59xsy6l7a"; +"uaclasses-15878"="015wxmrjfykv7j2bvmb42491i137h513q826f5czmcf1c8gk8bl9"; +"uaclasses.doc-15878"="0x6krd94wrdwc1zkyvqzznwvnvxx4agwinr5fhshav6r8jfsn4rg"; +"uaclasses.source-15878"="06nsdpmp8qqsrcbbcdpm82gcc3z8y5dlhv2lgwr4i01srwkd91r6"; +"uafthesis-12.12"="0fj2rfdzldav8m1ac7wv8n1k8pcgj4yy4zxx0g8sg1mb5i7if0k6"; +"uafthesis.doc-12.12"="0g096y6dvxfzbjrvvwpb92z4hrxp1p9jvbgkap5gra61msacqawq"; +"uantwerpendocs-3.2"="0cfgvai7y520h99ljxi3jlavis7sl5qlgkw49xk8ng24v6js93d9"; +"uantwerpendocs.doc-3.2"="1ra4930lc9bx36qj3l48lmx7dbi6mk58xwci15l6mk34wbxhvq0r"; +"uantwerpendocs.source-3.2"="1h473sc1g98sca046jv4hs3p8dv6md1hvyfzang8yipm6yp4m6cq"; +"ucalgmthesis-52527"="17pqf8p5wq7szg81iqmimgz8hac49yqlla40g5lf9s8f2pjagjmz"; +"ucalgmthesis.doc-52527"="1fzb7b9v81y0q8pqpvrpsbrk64831pf393hca1j17amsnv5al0c2"; +"ucbthesis-3.6"="19g7wv3iypbkcxhlybizkis6yivgn6z0mvz4rgsi72zaahpxmg7y"; +"ucbthesis.doc-3.6"="0nlpc0vm12h7pni3lw3jqq7fsh273nc63abw8yzw69crh3fspyqg"; +"ucdavisthesis-1.3"="0kdrwdk7mg3yd7hm2xmq63kgikr2p2izibfgw1whai921za4wlm4"; +"ucdavisthesis.doc-1.3"="1chajx1i2zmfh4ypnf8jspwr8kjwbfv7z07qrfasrf73r775yxnh"; +"ucdavisthesis.source-1.3"="08525i86hrv1387jn9ayz3mpwnh4z8kvjvb590y7gqv3cdvrsa2b"; +"ucsmonograph-1.3.0"="1jkcyhrh5zf8p205xgs10azhp69vrz613ln9ssrb4485b7a25b3d"; +"ucsmonograph.doc-1.3.0"="1hhr0z3sy8vn6cv2i7g8nfpnsdpyrsbqrclc8j8g6qidh83x2y5q"; +"ucsmonograph.source-1.3.0"="0x465kyz3chdcj705v9gc8s0w3pmawaza93pcm8nxy3k7dwx920j"; +"ucthesis-3.2"="1mqj65aps995issvi1vgn7f7pvxq39pwxaqqwh7pxnki26k8czrv"; +"ucthesis.doc-3.2"="1hv02nxak4laz9az2kr5lvd97l4mcnixdmpysiz6xqvc13ivkjl7"; +"uestcthesis-1.1.0"="0dsdzhf9pp2x4xbprii9rvl0h0jwwwd03va8mg7c3cjgr2nvy1dl"; +"uestcthesis.doc-1.1.0"="11z3ac2pnxg8qqy4shmdks7h33257nbkgj4h1rq49gc2ssqmp8pc"; +"uhhassignment-1.0"="0pb7hw9krpri3ky7hfshjkkbk36cilf31iv00l5iynsnrw70lwyy"; +"uhhassignment.doc-1.0"="1106wbx02mbnkgzwwiypfz7fg1a3rmwyhlgnsxf4z081q891p3fm"; +"uhhassignment.source-1.0"="1ck8c7jx3qkxnm0a82qfql92s05bg5p352fw1yv3y7v86z2kh6ad"; +"uiucredborder-1.00"="1zklnahb3inyf5qnavccqvkc02iwqw8mz7w1iam0lz2jmzgc1c41"; +"uiucredborder.doc-1.00"="1lxyssdc3sxsfhizm3f74lxcgpkaskljqpybwl1zw8m347p1qf85"; +"uiucredborder.source-1.00"="1rbxxliaaggn4rk6093lhmndas1xy111z9bjrgjrhjhxw19lc0ib"; +"uiucthesis-2.25"="19fif7a2xb3qrmkg8yfjg1hpisif4znc64765d6jrqgb9fqqzlnz"; +"uiucthesis.doc-2.25"="1w20kjwdgppl39axgwks373j3dsnidamhvqy1wn3yilzfb9vjjxj"; +"uiucthesis.source-2.25"="185mzcsh598dxnf2sb4mmvc3qy4pi43qrlim5jhn3n90qvwp62cw"; +"ulthese-5.3"="0wbdhwnjydq4v66jlfrjz0d9845060wk847z6y0jx1q69gvcn3qi"; +"ulthese.doc-5.3"="08l2769vnkzbma0p97i7sdslvnd31fcxv6sadcqmqww3vdn1xl6m"; +"ulthese.source-5.3"="023vd313y72i3zqv8rmdbxah580id2vgi4i91nh4fqrmfkm7n8zw"; +"umbclegislation-2016-6-8"="1lsvsxjhjlfxlqvlmy4pqbgsr2jv3imzgv7zfa2p3gj382hj1qlb"; +"umbclegislation.doc-2016-6-8"="1a3cjb20ycjs1nsghc9fsiz4kc8f6awah0bksqyh2ik4fnkydxb2"; +"umich-thesis-1.20"="0k1jl1v6nqyg4ld1f470x96pjm68hs5fnl3kab383363mly5ypy0"; +"umich-thesis.doc-1.20"="182vclnb9yja2jgh6j2b2f7421w0xi567s0jrzaqvbnaik5sk5x6"; +"umthesis-0.2"="0iby3d7f8mm4p5z4jgnxzqnfmwhsws6hg3yb2l0mrknlj98ww4yx"; +"umthesis.doc-0.2"="0vf8ikxi8706hc0sv1h53wzpd4mfiz607hzbhwq607k4hc71iz8f"; +"unam-thesis-0.5"="05lb63wclgxqr7jn7c38plhg3r806b7888zyifcivv85q143j191"; +"unam-thesis.doc-0.5"="0kxdr723xvg0lzhmzwpyik9vxy584y41pmwy8bi7197gz1hgdlzz"; +"unamth-template.doc-2.0"="018vpcbxfzch8qsrrqakcxxir53nalvj39l2kn45kn26p5nfkfbn"; +"unamthesis-2.1"="0wqi46mdjsl06q7hyvy4wpihvrr040f5g23bgc6lm6lq11jadj6l"; +"unamthesis.doc-2.1"="1l71n80psc2hzjs1lnfgpfpg13355sk9ld86104dkyrl645qx07r"; +"unifith-1.2"="02s92p2c57iz05dsc9al1f83scd2cxarxscsg9zn38yy1kbiqf31"; +"unifith.doc-1.2"="1daj6hs3jsawp08mw3071c3sb9w60dkb0w8bwav177s80c08vd7z"; +"unitn-bimrep-45581"="0vv9vc9cvw3bjfndlfyr69kpziymlgalyvc11av9kq2x5b4jlc5b"; +"unitn-bimrep.doc-45581"="1wyiar6xjhsjcfnxhlz8y1l9xvlcpgmkh360am85llfqlnar5w5f"; +"univie-ling-1.13"="0qpcgq3myfcm6zqn7vvl32hs4v9miqv2ryl29dkwq9rk83rkih6k"; +"univie-ling.doc-1.13"="04cw8kg5zhgd2fsd44vkgv1isb0ca1726mfpr8j5qha1kqs6wha3"; +"unizgklasa-1.0"="0clwxzngdy6n7iwk9zrn21i1frmahdf0s9qq2nqlhk4h6rxwb8jb"; +"unizgklasa.doc-1.0"="1q7q2fpgpjdsmbfj9zijccqpl2m6n0dch72wl05a64hxg117jbl4"; +"unswcover-1.0"="05nkk3xgpjcdlsk8xrj0mn5r3kwzi15awish2hd205v1rnbjiaz6"; +"unswcover.doc-1.0"="1jsxc55wrfczcc9mnf5yl2yqbbzbk10jcdly5z5nyfvg51427adw"; +"uothesis-2.5.6"="1wgs3fxg01cxcpnhk43ik12sjdip77fkxdaik6w4w926i8z0np7s"; +"uothesis.doc-2.5.6"="1zmpx6biaxlm7fys5a3qahglpbqgn6ml07z6q8vplyqgn213hd6d"; +"uothesis.source-2.5.6"="137c9av6i6b6hg97wmqd2iwqzd1dq6lvg2992wnbm2bp2m9r20zl"; +"uowthesis-1.0a"="0iv9s5dfmbrhxbx4kqbhxjf23rln4ymcx4kkk5fmc67qi51i8jnq"; +"uowthesis.doc-1.0a"="1xcqs2h6qs2lca74mg1jvqza77xrph53bk9dwkk0bprhkxn1all1"; +"uowthesistitlepage-3.0.1"="17xh2myc3xj2zwbc7jjdmnfqhmhzkqj3dwwn2q04hcyr4bm7vnfz"; +"uowthesistitlepage.doc-3.0.1"="1gm1clfvd0g45fpgf6h4nmyy2vrc0d9lqfy9h3nn2pnh0ki2z0ir"; +"urcls-2.1"="15hnqy2fxqblr9db4h2r38v1h4iwhk5kcm8qm9war1c1pgwg2a6l"; +"urcls.doc-2.1"="0axb3cpbqbksrixhksdhbjyqyic0176lyxxk5di268jbr58203xp"; +"uspatent-1.0"="043az1c7bs194w7frr768pwaliiaikfibxh6zqiznc85ax6q3d94"; +"uspatent.doc-1.0"="1q04i3q9693ykpgsx1fl11w0y0kxffqyljns1qy04935s5b8vskv"; +"ut-thesis-3.0.1"="0ras7l4xhd4smys0fwp8hymzadrvyh4js8k1fcclvci3aprhh64y"; +"ut-thesis.doc-3.0.1"="0mm90mryz38kw3zjbmgc9lhknkzjmgglf69q5l9g1hsk1djgca7a"; +"ut-thesis.source-3.0.1"="15y2hzfgzg961lp4zmwivl8var64d392kzs1rvv89d1axf0k0xl7"; +"utexasthesis-1.0"="0j8jjy8i5i9lgy7m9wnvj36ms597amnvb9a0ac2a2wh7vqf3dxgd"; +"utexasthesis.doc-1.0"="0131pn2531bwmsv3ak1kf9nc4v86icxjg19d28sqfmlnfvl73v4y"; +"uwthesis-6.13"="0x6j9savd25v7s1nxzs0yqv10i1bbd89pnb0ldjmwilrfr78yw9c"; +"uwthesis.doc-6.13"="1plbn6dkqwl4bdvsyskzylww9j8akxh120yrnkfamk56ij9dd0py"; +"vancouver-0.8"="0vsvg7aplpj9gjlgn9mcx6r2fzli53bqmd2cdjf8l6kv2b9smmjb"; +"vancouver.doc-0.8"="1zm7bnlwns945nzngv7x851fcmbzc400v81d52fg9p1q8k5f8458"; +"wsemclassic-1.0.1"="0zpqx8gi2yf8cm5rmvchz0jprfwcc0gjkwcrygrvlqhqqn7qmc07"; +"wsemclassic.doc-1.0.1"="0h7vz6pza8bv8y8ihfplbsq8ip9ds2z63s7j7qh84vf325ci5chm"; +"wsemclassic.source-1.0.1"="1522cvwkw0ryvhgdqqd7k8lrbrayrmm3h31c77v7x8a81cry2bj9"; +"xduthesis-1.00"="08cxhw5lhklv7vxl30fhwmlgq4kmv53a8qppcmsap1v8jc8vjrdk"; +"xduthesis.doc-1.00"="1j8pqz4l85qiziry85w7a23i6s577nb2cpbq4v5jgvp5l8x8lhzk"; +"xduthesis.source-1.00"="0zdlq46z2l3y5zydal9nsawv7nhhp113hdia15d9fd23j8gq4jdp"; +"xmuthesis-0.4.1"="05z3pbc9gqfnzp4y4a5p6bmprsr1r63w9l442hgk3pshswc2dflp"; +"xmuthesis.doc-0.4.1"="0dqmbdz0ydlq1hkz0s3lr12sia1qj7p912carwq4pjg9rrw98z7s"; +"xmuthesis.source-0.4.1"="1c3a90gpb2siww65yc2l3kf91bf5xvxk9iq1s9cnx1ngxjbs7835"; +"yathesis-1.0.7"="139kcsylhr597r1jga5izsr1ysj29asjawp7z9d2sz85qf9hapyn"; +"yathesis.doc-1.0.7"="0f2lkj60gqyps85ajvxz59ncb9pbcv2i0cpmcncq5cv5x66irl97"; +"yathesis.source-1.0.7"="15rz47rdjs6br84jvj9i5nvng23d009d3l2a3dr0gw1w142iq0zb"; +"yazd-thesis-0.3"="1bhjqd6k4lqk4sypssmrsjl9lqrbha9d0n42qbaq1mg5whpl2b8x"; +"yazd-thesis.doc-0.3"="0krsm9s3ym6f3d323scvxn8cf1wjqppglhmzbxwn0cpjq5nl01pg"; +"york-thesis-3.6"="04c8g1wkl795caadm8kqfy6kdqqgwlk46lijpmyiiykbb8z54wq7"; +"york-thesis.doc-3.6"="0zp6pfr3giqm4nbsidg06q0c3x9gr4bk3g8qq7wxl9a2pgk3z45p"; +"york-thesis.source-3.6"="0105amrybkm78pwb9hrd7n8r69sj6lkh1zm7c9sskibb13lqrk9p"; +"texworks.doc-54074"="0n0ydn8v42q3wcxmhjv5nwmmzf5yfg77qlc1v5bmkpb04dn4055y"; +"arabxetex-1.2.1"="15c8nmmv87x87dbjwm1q0acf7pbbh8w9gpiw77fs2i51gab592xy"; +"arabxetex.doc-1.2.1"="1ns1y2lf87gspaablh4lm3kj33ggpfp7hcxbdv4vxf8hhfc4pp7d"; +"arabxetex.source-1.2.1"="077r71723zlzfjmc471a8hbxs1v2g6j2xpiim3g2klxsj589bxfn"; +"awesomebox-0.6"="0bjnvgqj4g1i6djzzzdjdrnlvli3dm1v2w2mi59s5s8pyc5pag60"; +"awesomebox.doc-0.6"="1m1cjic1dqf2zvym1ma83xy66b5irqma2fb6fy0qnl31f9bfg6x2"; +"bidi-atbegshi-0.1"="0lcg9h78shrfk11dqjr9mccyh8n2264vyl4fnjl0cyc0ccsciv25"; +"bidi-atbegshi.doc-0.1"="1xzb3v8fc82p2s3hwkfxz7jz1za2cy4slyp490dbwzq9hrrvs5wl"; +"bidicontour-0.2"="1yj7vl5z4xh8i420y1ycz21rw0yy83z0v9nlvi8k3ph2qis7lp8m"; +"bidicontour.doc-0.2"="085xfi5w350vbp4vnq8kgbilnz3jxwf4g0incvziy5hxh4isqirz"; +"bidipagegrid-0.2"="1nh14lla3xv9zikqqpnw7nb26kshjd186ijlz9snz19nkgddq28x"; +"bidipagegrid.doc-0.2"="0jgd9mfwar486gl7imm1m87a167c06cdhxg9qqp8m8nk6xdys8f9"; +"bidipresentation-0.3"="0kpwhs3dvmjhpv2n6kjly5cpj56gnwv3iyhiiwffd4bphzyrnyjb"; +"bidipresentation.doc-0.3"="0hp0zbr5mpwsrd4rh3rc8qmy4srp93838k38phmsm6dwgqkda2z3"; +"bidishadowtext-0.1"="0jpz5a5q9c9c569ssyzk48y77msvfkd5csdvv0cd0r62ivrai5jh"; +"bidishadowtext.doc-0.1"="1bcbz6fiydj6dx8xzkrdsrm2vgcvn1jj4fk2jh1333la6rygvvav"; +"businesscard-qrcode-1.2"="0xv56yqqj8y4270955srbiw7qy8bm9r3ih0zazlkrxnrxyh82jlk"; +"businesscard-qrcode.doc-1.2"="0nfvak5730q4ci88dyqln97ljhjbwxn3gk34rq2b5rk5cy2inabi"; +"cqubeamer-1.0"="1r63ahd6m6ll0phqaxc02hnbrf3f6xjdghrhn7wdqxnf8n9k34ff"; +"cqubeamer.doc-1.0"="0rgfjw69is9i06blv1dr2ki6d8lgfwg3w57r3620r7yffj7z9hpy"; +"fixlatvian-1a"="1qm1jj803a7zgqbjn4q4sg4mn3pvd600pfkqabjvp0ck24r1pw1p"; +"fixlatvian.doc-1a"="160bb2khxfhl4g48a5cbj8xdxslgxvav1c0wiq3w1ajla278qj28"; +"fixlatvian.source-1a"="1zfdr8kahxgkhxzg925lgls50prcgyp6hz1vhis1241f9rd6r3qs"; +"font-change-xetex-2016.1"="1xjxrpqfxll7wfkgm5ksjfavk7zr5a36qfjm5aw5a92wgqzpmbrp"; +"font-change-xetex.doc-2016.1"="00ikhz2nafa2ck1j6vb564ij61lnqa64l9xnl4h7v12g11j0h2k1"; +"fontbook-0.2"="12dcha7gkyl4ycizd2469i628l8qvh1xzacg7bv7b55q0dip2hlb"; +"fontbook.doc-0.2"="1ywxxp2ygc6xjrjsmq1ax4p9v0z3hpmbcgsnqm3vdnnda1c0gn33"; +"fontbook.source-0.2"="04ny0n1wgs27ky6fpf0i8ivhkj6ypad537mlx7rz39kkjpl6mz96"; +"fontwrap-15878"="185mzghp8xckdq7z6cdwznrg1pswflvfy61bhsnpaxx8wagny1zk"; +"fontwrap.doc-15878"="01knmxqj88g87ljvxmf8rr72i2gh9qdmx7zsbwyjmibiw71l6pcm"; +"interchar-0.2"="040zhi6rq7l8s04zcq2vfxricbvakkxnx0bzihbj1ss21pmyrv82"; +"interchar.doc-0.2"="18lpyq26zc9b2ypcb98k578wyg2fp1fllsfyrp67b4v9lnz1m7q6"; +"na-position-1.2"="1amvifgadhq73avh1dq9mj2v4s5r3hlr6a3z4wcbhw32jd31ncbx"; +"na-position.doc-1.2"="0pcn0r0p0z7lxyfsvcnl9skm5aa5xi6362vydpx9kv8m11gl7pjb"; +"philokalia-1.2"="08z5hrp8a0551s0qfj02l79cpkdnsll5k60di132addymsl2p0lw"; +"philokalia.doc-1.2"="0pgy5y3b6ramrkr8r7bvw5byviy50fprjsj4cj5h3l888inj8kkx"; +"philokalia.source-1.2"="168r0ygbvwbwxlqvjqqma0q3w4172jpif1sr8p54h70crqx2310j"; +"ptext-1.1"="137amhihk598rhaf0qmbahd9spqivzqrmi53y6q3mlzhlrxg0p1r"; +"ptext.doc-1.1"="12crg85znvmpr5yhvr4yr6riw037zwcpwpavp1vb1nnd9zy99ya5"; +"realscripts-0.3d"="0ph678nf5k03xl63z66gkmg5f8agxy201y6bvabhdnb1zhvfrfmm"; +"realscripts.doc-0.3d"="1kmlaym3vxb9mx0jp7wvmsk13i30wyyazhny5zzk14bwx8rk3kf4"; +"realscripts.source-0.3d"="1qzqr2q2bkq4pchin1xivg8gwx5qkgip4kq74rswfz5a5iimyh0n"; +"simple-resume-cv-43057"="09xsryzpnq33wja6fkrxy4ajrci6xcn0bx0mbsw37h0q0h65rp9z"; +"simple-resume-cv.doc-43057"="0gbf0rg3v1ivw631yl133iamh7kadclr089rby72al50xwnbi559"; +"simple-thesis-dissertation-43058"="16byfnhfd1j14911xs1448yampvvplxy8l54by4qwq01wp7pjjmf"; +"simple-thesis-dissertation.doc-43058"="1wrxjkgbvps1wyicwlhkx59xwb3vcy1n0wf7r7dllw11r7hdg6f4"; +"tetragonos-1"="0l8b3kjk0jk70mmmv37zrdb16id6yrjvgsgsmji7pzdqiixy7jh5"; +"tetragonos.doc-1"="1g2zcx3b1pfc9dh76p5iprdgsxp0yndp7rn5ksbq4s9k4m7ikpzp"; +"ucharclasses-2.4"="1w04lfm8bjgrg9qndfz2zwhd7yakrlps1kk29ldvvd0200ns7db4"; +"ucharclasses.doc-2.4"="1arp54hwrfjm7x1d5cz5qvc4r83x9kdla5z81p7ld2zixjdsbph5"; +"unicode-bidi-0.01"="1prl0i2a9dg5yc2yl1x1k0zmz9lww051w1zwy8cbyvk3rd765a72"; +"unicode-bidi.doc-0.01"="0ab0gym9sjllmqdclkjfbc4fh9n20999mv7z2gylfybirm0n7i7c"; +"unisugar-0.92"="1dx088b21apj2rpij4pxa9srx29irzsfmlp9vn8fjpm1ag60md98"; +"unisugar.doc-0.92"="1mnpbd68i0112hhcgiwc2j5jkwffrfdqlrdl896ybd0cpwq5d8sp"; +"xebaposter-2.51"="058zna623x9x87yb9wgdkc88gigwapxbyff3dwsdqaam28rakm0h"; +"xebaposter.doc-2.51"="1lgzp70wr3rfw552dniwnlqf4bqpjvfmacy6gjiyj4blf3wgni9p"; +"xechangebar-1.0"="03d1wmvldpfk6y52sd2pvw3ipglbl8cc851rqlz5jgk82c2frxg0"; +"xechangebar.doc-1.0"="0cnc62nff1vljwkk6gb6r0cwxq17b2yl4v9ilb7kxapaa6apbp14"; +"xecolor-0.1"="0ws34zr158nkpghiwlvigb44zzi5qymfqxzsnayw78i6zpqal55x"; +"xecolor.doc-0.1"="0hz9kk36ap7szbsd0jp6a59lnaxgnmwl0jg8gmz8s1pjf77jf5ww"; +"xecyr-1.2"="1qqfdi6pxlkx6pxi2q61i0diwmsy9n95x4bvj9r3pgaf851p7cjx"; +"xecyr.doc-1.2"="08b2xahg1agfczvqpdkvi3641g3pd2w2yc245bnyk0nccfcnf3k1"; +"xeindex-0.3"="06ipq7m9mnal497j3awdspqim3fs7v695pf2x7v4l92vqz3hh1sa"; +"xeindex.doc-0.3"="1pa1fa8vjgbzmgphx3fmm93dd5wr3adxrrld5xibk2qrp7fgkbsr"; +"xesearch-0.2"="1rszh3svj87vw5lskxv8bvnkzzj6k9rbikl6rr87ry9apmymsklg"; +"xesearch.doc-0.2"="0cb73d981aa0s0hg2ynrg3zybsaw28f5b29zmqgvzqidi8vxfbhl"; +"xespotcolor-2.1"="0w7nns136gfz1dvq6iplk0jbza85lpzlpvsxf1bzjhqw5sk6v4p9"; +"xespotcolor.doc-2.1"="1fai2v8x4g9cmda5m6nvf6g8w6qg64qfdq1rvjlz1qiqmy71c8jy"; +"xespotcolor.source-2.1"="14yachqawnmpldkwc3f3q4krj2sr1kad7wzy1lfxwqggvpbdcjkh"; +"xetex-itrans-4.2"="17476frf0r4w50bfbk6g6ic40kv3x3i6qpl642glb3vyzyjd5dbg"; +"xetex-itrans.doc-4.2"="0bs67djfa9pi1k2900y2ybnv6lgjd031cyczks0jjzfnav2g4df6"; +"xetex-pstricks-17055"="0i37r4lk1l36cch6kjz12mfzgpg6hd7n903fzbj9h7mwmjwnrylk"; +"xetex-pstricks.doc-17055"="17kiv64h94hf83ailbw29wf15r7gv9yq06h3l53c38rn0n20vdz9"; +"xetex-tibetan-0.1"="0r8xgnagsqrkxr0ij0mcv30vhf7c3amyf9lk895lgwsvz6cysmma"; +"xetex-tibetan.doc-0.1"="0p5l36zb8l3h4x8sjk8cwxj5psvfa4j0kg6jb93sj1ln3yfrwfr2"; +"xetexfontinfo-15878"="1sc0lm5w94320f5abv2hw2bzqprhk73fjv2lkv380fgkpdfi7pdv"; +"xetexfontinfo.doc-15878"="14mc9snykdwzcmq013bs8vzn5w80lblpg05jk57g7fl2z9x6xl38"; +"xetexko-3.1"="1q2kzx54b3fshqsdblw03kx2qp57qjnps9hf3cbdm3l4gq2h0qcx"; +"xetexko.doc-3.1"="1vlf5raawir2bi9nnpa1q2d9fxaq1cf3ixwfmhcgpqa1kd55ynzv"; +"xevlna-1.1"="16ayk70kxk2s23r6nxva1hkb1z7aw7zz1zhmcis1bsijx657kw25"; +"xevlna.doc-1.1"="09aaf3mpbh07mix5xvr20zybbbrbgbwcmkd5q0rfsd0ac8cm72fh"; +"zbmath-review-template-1.0"="14fpdxb26lcyhfiy189a4135i8x5vb7fq6d35vcj13vjrxsk5np9"; +"zbmath-review-template.doc-1.0"="16chwapj61zf74ma9794i96afnhnpm8h73lx0rj4rbkd6d37zl00"; } From d01ca28f9e355d89ffb49b47887544c253c31f5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Jul 2021 23:15:53 +0200 Subject: [PATCH 0086/1522] python3Packages.sqlalchemy: 1.4.20 -> 1.4.21 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e..51ecf9f37c4 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.20"; + version = "1.4.21"; src = fetchPypi { inherit pname version; - sha256 = "1l5miq1nzvg51yqw3pnaq17dgibhgx2m0il2ha79gwpyd8k3mviq"; + sha256 = "1iwggnq2n7wd6vqqvym1fjnzrgs648saba1cs6nvw4pn9m7hbs87"; }; propagatedBuildInputs = [ From f5074933b7280ce32e1a756e6468a5321cb885de Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 15 Jul 2021 20:08:33 -0500 Subject: [PATCH 0087/1522] bintools: disable -pie when -r or -Ur are used (#128674) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bintools: disable -pie when -r or -Ur are used ld’s -r allows you to partially link object files. When -pie is passed with -r, though, we get: ld: -r and -pie may not be used together Most build systems are intelligent enough to pass -no-pie before -r, but we might as well support those that don’t. Note: -pie is not enabled by default in Nixpkgs, but it is when you are using musl. So this solution is really only useful for musl toolchains. * bintools-wrapper: Add incremental -i check for pie --- pkgs/build-support/bintools-wrapper/add-hardening.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 5e49b7bd905..4d289a334b7 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -37,7 +37,7 @@ fi for flag in "${!hardeningEnableMap[@]}"; do case $flag in pie) - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static " || "$*" =~ " -r " || "$*" =~ " -Ur " || "$*" =~ " -i ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningLDFlags+=('-pie') fi From 2e36e8ad73cfcdbb759e52190f52fc02eff6af0d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 15 Jul 2021 22:19:54 +0200 Subject: [PATCH 0088/1522] asciidoc: support cross-compilation Be explicit in patchShebangs by suggestion of SuperSandro2000. Enable strictDeps to enforce better support in the future. --- pkgs/tools/typesetting/asciidoc/default.nix | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index ce3b142fbc5..cc45455eeaf 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -40,6 +40,8 @@ # java is problematic on some platforms, where it is unfree , enableJava ? true + +, buildPackages }: assert enableStandardFeatures -> @@ -157,7 +159,9 @@ stdenv.mkDerivation rec { sha256 = "1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"; }; + strictDeps = true; nativeBuildInputs = [ python3 unzip autoreconfHook ]; + buildInputs = [ python3 ]; # install filters early, so their shebangs are patched too postPatch = with lib; '' @@ -262,7 +266,20 @@ stdenv.mkDerivation rec { -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -i a2x.py '') + '' - patchShebangs . + patchShebangs --host \ + asciidoc.py \ + a2x.py \ + tests/testasciidoc.py \ + filters/code/code-filter.py \ + filters/latex/latex2img.py \ + filters/music/music2png.py \ + filters/unwraplatex.py \ + filters/graphviz/graphviz2png.py + + # Hardcode the path to its own asciidoc. + # This helps with cross-compilation. + substituteInPlace a2x.py \ + --replace "find_executable(ASCIIDOC)" "'${placeholder "out"}/bin/asciidoc'" # Note: this substitution will not work in the planned 10.0.0 release: # @@ -273,6 +290,10 @@ stdenv.mkDerivation rec { # --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980" substituteInPlace Makefile.in \ --replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980" + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # We want to use asciidoc from the build platform to build the documentation. + substituteInPlace Makefile.in \ + --replace "python3 a2x.py" "python3 ${buildPackages.asciidoc}/bin/a2x.py" ''; preInstall = "mkdir -p $out/etc/vim"; From 982d06127188c2bc6c669b2a8982c46187c910f3 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 16 Jul 2021 08:53:41 +0200 Subject: [PATCH 0089/1522] asciidoc: enable tests with doCheck --- pkgs/tools/typesetting/asciidoc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index cc45455eeaf..0618a55df44 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -290,6 +290,12 @@ stdenv.mkDerivation rec { # --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980" substituteInPlace Makefile.in \ --replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980" + + # Fix tests + for f in $(grep -R --files-with-matches "2002-11-25") ; do + substituteInPlace $f --replace "2002-11-25" "1970-01-01" + substituteInPlace $f --replace "00:37:42" "00:00:01" + done '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' # We want to use asciidoc from the build platform to build the documentation. substituteInPlace Makefile.in \ @@ -299,6 +305,9 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/vim"; makeFlags = lib.optional stdenv.isCygwin "DESTDIR=/."; + checkInputs = [ sourceHighlight ]; + doCheck = true; + meta = with lib; { description = "Text-based document generation system"; longDescription = '' From 4fb27ce7b4d6c0d11dee93d2a217ad6695d60381 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Jul 2021 10:04:03 +0200 Subject: [PATCH 0090/1522] python3Packages.setuptools: 54.2.0 -> 57.2.0 --- .../python-modules/setuptools/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 0e144c5b009..2c8f5d898dc 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -14,12 +14,7 @@ let pname = "setuptools"; - version = "54.2.0"; - - bootstrap = fetchurl { - url = "https://raw.githubusercontent.com/pypa/setuptools/v52.0.0/bootstrap.py"; - sha256 = "sha256-HzhlnJvMskBfb3kVnYltdnjS63wt1GWd0RK+VQqrJQ8="; - }; + version = "57.2.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -29,7 +24,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZHJZiwlWLHP4vf2TLwj/DYB9wjbRp0apVmmjsKCLPq0="; + sha256 = "sha256-zFmndVoATNxfvDsacY+gj5bzIbbd/8ldbsJj4qOawTA="; name = "${pname}-${version}-source"; }; @@ -38,8 +33,7 @@ let ]; buildPhase = '' - cp ${bootstrap} bootstrap.py - ${python.pythonForBuild.interpreter} bootstrap.py + ${python.pythonForBuild.interpreter} setup.py egg_info ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar # Here we untar the sdist and retar it in order to control the timestamps From 1e1f7f77852af1c40c1f309abbeba6a6c60ce7d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Jul 2021 10:04:15 +0200 Subject: [PATCH 0091/1522] python3Packages.pip: 21.0.1 -> 21.1.3 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index f7979966703..50783f4eeb6 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "21.0.1"; + version = "21.1.3"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-Yt5xqdo735f5sQKP8GnKM201SoIi7ZP9l2gw+feUVW0="; + sha256 = "sha256-zfMz9p4I6Kmw849xuvnmGWHmWtajDntFW1jjDilKkgk="; name = "${pname}-${version}-source"; }; From 6fc6e325e6fc6d28a3e2a862e398e773e7442179 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Fri, 16 Jul 2021 00:53:45 +0200 Subject: [PATCH 0092/1522] firecracker: 0.24.3 -> 0.24.4 Updated firecracker to v0.24.4. This required updating the buildPhase to point to new compilation result paths. Formatting changes were performed by `nix-update --format` --- .../virtualization/firecracker/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a8fbb1d09c1..b0cfe8d5973 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,17 +1,17 @@ { fetchurl, lib, stdenv }: let - version = "0.24.3"; + version = "0.24.4"; suffix = { - x86_64-linux = "x86_64"; + x86_64-linux = "x86_64"; aarch64-linux = "aarch64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; dlbin = sha256: fetchurl { - url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; + url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; sha256 = sha256."${stdenv.hostPlatform.system}"; }; @@ -22,15 +22,15 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-i6NMVFoLm4hQJH7RnhfC0t+0DJCINoP5b/iCv9JyRdk="; - aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; + x86_64-linux = "sha256-EKndfLdkxn+S+2ElAyQ+mKEo5XN6kqZLuLCsQf+fKuk="; + aarch64-linux = "0zzr8x776aya6f6pw0dc0a6jxgbqv3f37p1vd8mmlsdv66c4kmfb"; }; configurePhase = ":"; - buildPhase = '' - mv firecracker-* firecracker - mv jailer-* jailer + buildPhase = '' + mv release-v${version}/firecracker-v${version}-${suffix} firecracker + mv release-v${version}/jailer-v${version}-${suffix} jailer chmod +x firecracker jailer ''; @@ -48,9 +48,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Secure, fast, minimal micro-container virtualization"; - homepage = "http://firecracker-microvm.io"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; + homepage = "http://firecracker-microvm.io"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ thoughtpolice endocrimes ]; }; } From 885e42e78f0120f904924eff5c794672dd9e5a1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:11:06 +0200 Subject: [PATCH 0093/1522] python3Packages.pyroma: 3.1 -> 3.2 --- pkgs/development/python-modules/pyroma/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index c8fc988b96c..72a114b8ab1 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,22 +1,20 @@ { lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools +, docutils, pygments, setuptools, requests }: buildPythonPackage rec { pname = "pyroma"; - version = "3.1"; + version = "3.2"; src = fetchPypi { inherit pname version; - sha256 = "45ad8201da9a813b5597bb85c80bbece93af9ec89170fc2be5ad85fa9463cef1"; + sha256 = "sha256-+MGB4NXSkvEXka/Bj30CGKg8hc9k1vj7FXHOnSmiTko="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pygments < 2.6" "pygments" - ''; + propagatedBuildInputs = [ docutils pygments setuptools requests ]; - propagatedBuildInputs = [ docutils pygments setuptools ]; + # Tests require network access + doCheck = false; meta = with lib; { description = "Test your project's packaging friendliness"; From b86f54b571dc29bd491daeb23aafef18c3e60a94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:22:08 +0200 Subject: [PATCH 0094/1522] python3Packages.pyroma: enable tests --- .../python-modules/pyroma/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 72a114b8ab1..03eea0b8b5e 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,24 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools, requests +{ lib +, buildPythonPackage +, fetchFromGitHub +, docutils +, pygments +, setuptools +, requests +, pytestCheckHook }: buildPythonPackage rec { pname = "pyroma"; version = "3.2"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-+MGB4NXSkvEXka/Bj30CGKg8hc9k1vj7FXHOnSmiTko="; + src = fetchFromGitHub { + owner = "regebro"; + repo = pname; + rev = version; + sha256 = "0ln9w984n48nyxwzd1y48l6b18lnv52radcyizaw56lapcgxrzdr"; }; - propagatedBuildInputs = [ docutils pygments setuptools requests ]; + propagatedBuildInputs = [ + docutils + pygments + setuptools + requests + ]; - # Tests require network access - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "pyroma/tests.py" ]; + + disabledTests = [ + # PyPI tests require network access + "PyPITest" + ]; + + pythonImportsCheck = [ "pyroma" ]; meta = with lib; { description = "Test your project's packaging friendliness"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From dc4ffe1e1d9433cfec59420f0ed8b37767a68a7b Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 14:14:50 +0900 Subject: [PATCH 0095/1522] haskellPackages: stackage-lts 18.1 -> 18.2 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 2098609cd69..a9741a2fdc0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.1 +# Stackage LTS 18.2 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -207,7 +207,7 @@ default-package-overrides: - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - - barbies ==2.0.2.0 + - barbies ==2.0.3.0 - base16 ==0.3.0.1 - base16-bytestring ==1.0.1.0 - base16-lens ==0.1.3.2 @@ -601,7 +601,7 @@ default-package-overrides: - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - - digest ==0.0.1.2 + - digest ==0.0.1.3 - digits ==0.3.1 - dimensional ==1.4 - di-monad ==1.3.1 @@ -703,7 +703,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.0 + - esqueleto ==3.5.2.1 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -794,7 +794,7 @@ default-package-overrides: - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.6 - - foldl ==1.4.11 + - foldl ==1.4.12 - folds ==0.7.6 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 @@ -896,7 +896,7 @@ default-package-overrides: - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.8 - - ghc-source-gen ==0.4.0.0 + - ghc-source-gen ==0.4.1.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.2 - ghc-trace-events ==0.1.2.3 @@ -978,7 +978,7 @@ default-package-overrides: - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 - - hasbolt ==0.1.5.0 + - hasbolt ==0.1.6.1 - hashable ==1.3.0.0 - hashable-time ==0.2.1 - hashids ==1.0.2.4 @@ -1121,7 +1121,7 @@ default-package-overrides: - hspec-golden ==0.1.0.3 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - - hspec-junit-formatter ==1.0.0.4 + - hspec-junit-formatter ==1.0.0.5 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 @@ -1218,7 +1218,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.10.2.0 + - ihaskell ==0.10.2.1 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -2024,7 +2024,7 @@ default-package-overrides: - safe-coloured-text-terminfo ==0.0.0.0 - safecopy ==0.10.4.2 - safe-decimal ==0.2.1.0 - - safe-exceptions ==0.1.7.1 + - safe-exceptions ==0.1.7.2 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - safe-json ==1.1.1.1 @@ -2562,7 +2562,7 @@ default-package-overrides: - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.1 + - vector-builder ==0.3.8.2 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.3 - vector-instances ==3.4 From eb19dcff7f36ace86a1cc070aa2131027b66e054 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 14:15:15 +0900 Subject: [PATCH 0096/1522] all-cabal-hashes: 2021-07-07T20:16:30Z -> 2021-07-17T04:19:10Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c15f3a011a2..4af4c43fbc2 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "360e4a3b93ab9fc49673c9d91eebd963ddd7e132", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/360e4a3b93ab9fc49673c9d91eebd963ddd7e132.tar.gz", - "sha256": "0pzi0kjlma36s0z5wfcghn6h6lwx61vvq8f7322nz80fs4drpn64", - "msg": "Update from Hackage at 2021-07-07T20:16:30Z" + "commit": "3076b20df211e808ff2f1571ffe7f260e6174124", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3076b20df211e808ff2f1571ffe7f260e6174124.tar.gz", + "sha256": "11qpvgvl8skv2ckr6x6a4mlm1i9ng21iylw3v2ig009w8af46qhn", + "msg": "Update from Hackage at 2021-07-17T04:19:10Z" } From 1a9b069849eecdaa432b4370d2bd5c1bbeccc59c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 14:16:20 +0900 Subject: [PATCH 0097/1522] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1204 ++++++++++++----- 1 file changed, 894 insertions(+), 310 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c895053704b..11f6931574a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8995,6 +8995,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "HQu" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, conversion + , data-default-class, erf, gauge, gsl, hmatrix, hmatrix-gsl + , hmatrix-gsl-stats, hspec, hspec-expectations, ieee754 + , math-functions, mersenne-random-pure64, monad-loops, mtl, random + , random-fu, random-source, rvar, sorted-list, statistics, stm + , text, time, vector, vector-algorithms + }: + mkDerivation { + pname = "HQu"; + version = "0.0.0.5"; + sha256 = "1izaamiw14gl4wciq99bh6ynra0kxav0b65zpm36q72brchr3z0r"; + libraryHaskellDepends = [ + base bytestring cassava containers conversion data-default-class + erf hmatrix hmatrix-gsl hmatrix-gsl-stats ieee754 math-functions + mersenne-random-pure64 monad-loops mtl random random-fu + random-source rvar sorted-list statistics stm text time vector + vector-algorithms + ]; + librarySystemDepends = [ gsl ]; + testHaskellDepends = [ base hspec hspec-expectations ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "quantitative finance library"; + license = lib.licenses.mit; + }) {inherit (pkgs) gsl;}; + "HROOT" = callPackage ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree @@ -11855,8 +11881,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "Kawaii-Parser"; - version = "1.0.1"; - sha256 = "032kglqc4pfhig7wqqsps0g490ajp1yffl4h4lr3qs98vi7vl4x6"; + version = "2.0.0"; + sha256 = "1b0b6hr128jahwlivl0w27s11l51p6y5xjijjlgqhb17yjicxfl1"; libraryHaskellDepends = [ base containers mtl ]; description = "A simple parsing library"; license = lib.licenses.bsd3; @@ -14133,16 +14159,18 @@ self: { }) {}; "NanoID" = callPackage - ({ mkDerivation, base, bytestring, extra, mwc-random - , optparse-applicative + ({ mkDerivation, aeson, base, bytestring, cereal, extra, mwc-random + , optparse-applicative, text }: mkDerivation { pname = "NanoID"; - version = "2.1.0"; - sha256 = "0ila2yrdva18y20wm533hkqmmb2mrh1j212jp2ck6p6yiwam687j"; + version = "3.1.0"; + sha256 = "0f3sadmnwdqbvl86gdaqgzixgk4zly39afhc2m5mws1j18y9v738"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring extra mwc-random ]; + libraryHaskellDepends = [ + aeson base bytestring cereal extra mwc-random text + ]; executableHaskellDepends = [ base bytestring mwc-random optparse-applicative ]; @@ -21891,8 +21919,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.9.0.0"; - sha256 = "1i5xa299vkvvs4j9mxzyfbw3wgcraihyk9x6wxk0plgj385zl3hr"; + version = "1.0.0.1"; + sha256 = "1lhcmcjhr6p3ac50lpmppdvj80vx2wi8xjljd9s9mbiy5kf4pc63"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21912,19 +21940,19 @@ self: { }) {}; "Z-IO" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, hashable - , hspec, hspec-discover, HUnit, primitive, QuickCheck + ({ mkDerivation, base, bytestring, containers, exceptions, foldl + , hashable, hspec, hspec-discover, HUnit, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.8.1.1"; - sha256 = "05d4dbvzdr2sall0sj9yh8hv09lh1af4bqfhnbss2jlj1jc1y1dr"; + version = "1.0.0.0"; + sha256 = "0mam287629rlcq8l04ykm8y4lad9vry403a4svq226d51v2p7mni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions primitive stm time unix-time + base containers exceptions foldl primitive stm time unix-time unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; @@ -32283,6 +32311,8 @@ self: { pname = "arch-web"; version = "0.1.0"; sha256 = "1wiy4swpi3ca8sri2drycfr6i674da2kgiplfng7jcjlxr5nmdpz"; + revision = "1"; + editedCabalFile = "0g6mngy0b18n0w247ff2fyqxhdb6pxz6jywzypiq54w3f4vdqxr9"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -36936,6 +36966,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aws-transcribe-ws" = callPackage + ({ mkDerivation, aeson, am-test, async, base, base16-bytestring + , binary, bytestring, crc, cryptohash-sha256, lens, stm, text, time + , websockets, wuss + }: + mkDerivation { + pname = "aws-transcribe-ws"; + version = "0.0.1.0"; + sha256 = "151mlkgbb1lnhqwb4xwriqyj05fsz2dam3sr65j4zh476dmyv6bk"; + libraryHaskellDepends = [ + aeson async base base16-bytestring binary bytestring crc + cryptohash-sha256 lens stm text time websockets wuss + ]; + testHaskellDepends = [ + aeson am-test async base base16-bytestring binary bytestring crc + cryptohash-sha256 lens stm text time websockets wuss + ]; + description = "Websocket streaming to Amazon Transcribe service"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {am-test = null;}; + "aws-xray-client" = callPackage ({ mkDerivation, aeson, aeson-qq, async, base, bytestring , criterion, deepseq, generic-arbitrary, hspec, http-types, lens @@ -37808,8 +37861,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "2.0.2.0"; - sha256 = "0x9wn7whn36b4vsaq008zpcw47rs78dfqcysk8x7yhprxbzn7mi2"; + version = "2.0.3.0"; + sha256 = "0br4pd4vswyqfjkp5bj6svmqxwn3pfprrwxjmqda1z62dli5ps4m"; libraryHaskellDepends = [ base distributive transformers ]; testHaskellDepends = [ base distributive QuickCheck tasty tasty-hunit tasty-quickcheck @@ -37818,6 +37871,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "barbies-layered" = callPackage + ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec + , hspec-discover, transformers + }: + mkDerivation { + pname = "barbies-layered"; + version = "0.1.0.0"; + sha256 = "1cxiwgl5rfdvf29f18hymh33ycylz94baj2v4fm8z10kiibi9snv"; + libraryHaskellDepends = [ barbies base transformers ]; + testHaskellDepends = [ barbies base doctest hspec ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Barbies with layered clothes"; + license = lib.licenses.asl20; + }) {}; + "barbies-th" = callPackage ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { @@ -54989,6 +55057,21 @@ self: { broken = true; }) {}; + "circus" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, mtl, syb + , text + }: + mkDerivation { + pname = "circus"; + version = "0.1.0.0"; + sha256 = "07pdn24llhi7lrxvdcn097dw7d7a4z3yn7z1srymiafb5csg8vlf"; + libraryHaskellDepends = [ + aeson base bytestring containers mtl syb text + ]; + description = "Types and a small DSL for working with netlistsvg"; + license = lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -56690,13 +56773,13 @@ self: { "closed-intervals" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio - , doctest-lib, QuickCheck, time, utility-ht + , doctest-lib, filtrable, QuickCheck, time, utility-ht }: mkDerivation { pname = "closed-intervals"; - version = "0.1.1.0"; - sha256 = "0wmxacb9msr7bip5pz9qwgvg9kgvpyylps6xhsg85blhd2bplmbi"; - libraryHaskellDepends = [ base containers time ]; + version = "0.2.0.0"; + sha256 = "0d9zv0chib2z8q6pnssm2k8cy5lh4sszq5bqypwsbwa76mhz7yxw"; + libraryHaskellDepends = [ base containers filtrable time ]; testHaskellDepends = [ base containers doctest-exitcode-stdio doctest-lib QuickCheck time utility-ht @@ -68001,12 +68084,12 @@ self: { license = lib.licenses.mit; }) {}; - "d10_0_3_0_1" = callPackage + "d10_1_0_0_1" = callPackage ({ mkDerivation, base, hedgehog, template-haskell }: mkDerivation { pname = "d10"; - version = "0.3.0.1"; - sha256 = "0fw6hl0ikfxgqhns18f0h3hs2ihi2d09jpjvmgrzddf3d8lrrlnh"; + version = "1.0.0.1"; + sha256 = "0jaql1ql1pm0s6xd0mmi0gadx7z0ms62q46rxy4ida8k4v76r7cl"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hedgehog template-haskell ]; description = "Digits 0-9"; @@ -73108,8 +73191,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.3"; - sha256 = "1p15iia1zg9hm462wbhbcrk70zaphpsbkdbksfxizyfcw9c0v9qf"; + version = "0.2.3.4"; + sha256 = "0yvfmm8wkix8icsfqm9wd81000dlfgmwjzbnhspzd6a9wpd73i6p"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -73799,6 +73882,8 @@ self: { pname = "dhall"; version = "1.39.0"; sha256 = "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"; + revision = "2"; + editedCabalFile = "1rk59l8vi09ac657lwhks9q6cib7c62sbp64rr8xkfv1lvdafnzi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74028,6 +74113,8 @@ self: { pname = "dhall-nix"; version = "1.1.21"; sha256 = "0yqqjq8yqswcaiqrrgx37rlwvxgciwhvird34hsaq4fr3kbjgv4h"; + revision = "1"; + editedCabalFile = "0pnnlm299sw7jgz6a1bg18nvc2qfgylinc90b3da0cpvaardp6wz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74052,6 +74139,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.5"; sha256 = "10gvkw2rdmz7pgr9675xqnhkgi8pwjid77mwsriid81d703z2b6j"; + revision = "1"; + editedCabalFile = "1ddxs8phyysgj3pw5vbmnjr5fibvra9z9ihsri3f4c07iry3vlv2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75374,8 +75463,8 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.2"; - sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4"; + version = "0.0.1.3"; + sha256 = "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; @@ -80763,8 +80852,8 @@ self: { }: mkDerivation { pname = "dynamic-pipeline"; - version = "0.1.0.5"; - sha256 = "0smj2fk7dj0kxfgs00n52bpkvrb4yx0h2bkwabjkag96a867f9gr"; + version = "0.3.0.0"; + sha256 = "1izwdj4wdvrdqhd0zy2z1bv1yj1nbn8narwcv8ky77iakid6wzv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85462,8 +85551,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.2.0"; - sha256 = "06z5n0nbyrdvzlfqmx3jvh76kkss3bis19k5ppqkifsfgwi07rzw"; + version = "3.5.2.1"; + sha256 = "1hx3v9cb5w0zckgi83qa1ibfs44172syj89p36xsiphxqhlgaa0s"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -86158,6 +86247,23 @@ self: { broken = true; }) {}; + "eved" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , http-api-data, http-client, http-media, http-types, mtl, text + , wai + }: + mkDerivation { + pname = "eved"; + version = "0.0.2.1"; + sha256 = "1rsnn3xm9s4fiybhsxhd8ldiwl8kzzvljqjg5s66vx2rfrqg42vl"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive http-api-data http-client + http-media http-types mtl text wai + ]; + description = "A value level web framework"; + license = lib.licenses.bsd3; + }) {}; + "eveff" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { @@ -87787,12 +87893,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "express_1_0_0" = callPackage + "express_1_0_2" = callPackage ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "1.0.0"; - sha256 = "1aymnlq1nkw7qvrydmy0447ls5lnnjkhvpgicr56p2v65xrd37qx"; + version = "1.0.2"; + sha256 = "1j8gbrbs6hyby2fn4qr6ijrjc6gwjrp7sysidfl07mfx5z6ig4ql"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -90543,26 +90649,26 @@ self: { "ffmpeg-light" = callPackage ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg - , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale - , mtl, transformers, vector + , JuicyPixels, libavcodec, libavdevice, libavformat, libswresample + , libswscale, mtl, stm, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; - version = "0.13.0"; - sha256 = "1xvhpzd3kf2xn6s94lmpkxp9nv1jy20pr3x2qmqhc2gjxx9vcqg1"; + version = "0.14.0"; + sha256 = "022xikz4gml9w52agq6q9dwx8ldbs1pwxhp3xbi79ysskivj14x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring either exceptions JuicyPixels mtl transformers + base bytestring either exceptions JuicyPixels mtl stm transformers vector ]; libraryPkgconfigDepends = [ - ffmpeg libavcodec libavdevice libavformat libswscale + ffmpeg libavcodec libavdevice libavformat libswresample libswscale ]; description = "Minimal bindings to the FFmpeg library"; license = lib.licenses.bsd3; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; - libavformat = null; libswscale = null;}; + libavformat = null; libswresample = null; libswscale = null;}; "ffmpeg-tutorials" = callPackage ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm @@ -93743,28 +93849,6 @@ self: { }) {}; "foldl" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, doctest, hashable, mwc-random - , primitive, profunctors, semigroupoids, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "foldl"; - version = "1.4.11"; - sha256 = "05i87pqldk1xfpx66nh1lhn75x3g7s8kvhf9k9yll33a6ggawwxl"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroupoids text transformers - unordered-containers vector - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ Gabriel439 ]; - }) {}; - - "foldl_1_4_12" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, primitive , profunctors, random, semigroupoids, text, transformers @@ -93783,7 +93867,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -99176,6 +99259,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-lens_2_2_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, lens, profunctors, text + }: + mkDerivation { + pname = "generic-lens"; + version = "2.2.0.0"; + sha256 = "0n61hrfciryl33w6vxd5p1yqjfxl02n717dahlvb6fxlg9339nxp"; + libraryHaskellDepends = [ + base generic-lens-core profunctors text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-lens-core" = callPackage ({ mkDerivation, base, indexed-profunctors, text }: mkDerivation { @@ -99187,6 +99289,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-lens-core_2_2_0_0" = callPackage + ({ mkDerivation, base, indexed-profunctors, text }: + mkDerivation { + pname = "generic-lens-core"; + version = "2.2.0.0"; + sha256 = "0nj6ldwfidbyid85076gy8f5sa02xnbdhn51pkyg4dfqqz4r4hg8"; + libraryHaskellDepends = [ base indexed-profunctors text ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -99293,6 +99407,26 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "generic-optics_2_2_0_0" = callPackage + ({ mkDerivation, base, doctest, generic-lens-core, HUnit + , inspection-testing, optics-core, text + }: + mkDerivation { + pname = "generic-optics"; + version = "2.2.0.0"; + sha256 = "1iy7m5rs7rhk38zipwc018vcbkvlkpyr0rljkms6v0ajsvgkb783"; + libraryHaskellDepends = [ + base generic-lens-core optics-core text + ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing optics-core + ]; + description = "Generically derive traversals, lenses and prisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "generic-optics-lite" = callPackage ({ mkDerivation, base, generic-lens-lite, optics-core }: mkDerivation { @@ -99365,6 +99499,19 @@ self: { license = lib.licenses.mit; }) {}; + "generic-random_1_5_0_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.5.0.0"; + sha256 = "033cs5vkx57ny035ngndhg3n32jbzyp98li9559gyiz8glp79pzg"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Generic random generators for QuickCheck"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -100822,6 +100969,8 @@ self: { pname = "ghc-api-compat"; version = "8.6"; sha256 = "1pxnb5qrf9fz7ghy68xvpdc44fh2kz3f9i5cn66ch7k0ah8j2w3s"; + revision = "1"; + editedCabalFile = "01i6h8358n148nzjx6k774d2i2hm6dhgpx162ppkmwmim17f3zyn"; libraryHaskellDepends = [ ghc ]; doHaddock = false; description = "GHC-API compatibility helpers"; @@ -101786,6 +101935,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_1_9" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.1.9"; + sha256 = "1m7pwrwf45hc8nscl9kzzw9n0blnfpx7dl38kv8hvshaqbbg0v4q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + description = "Library for parsing GHC time and allocation profiling reports"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-prof-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }: mkDerivation { @@ -101901,8 +102072,8 @@ self: { }: mkDerivation { pname = "ghc-source-gen"; - version = "0.4.0.0"; - sha256 = "0ch3nahhbm0lvz0x5dlmiv07rd0a6398bf046byx36fwrkqglswh"; + version = "0.4.1.0"; + sha256 = "09rd6p8bprmj9nbdhh2909hw5il9gapj0cm3i7aiin200v80k84y"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck @@ -104350,8 +104521,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210630"; - sha256 = "0mxzddaf7ra807aazx9gd4rl5565xzky0hwiyby0a06yqnf02266"; + version = "8.20210714"; + sha256 = "0pkzqa8qmckv4fcc9pndlplz4w0ndlqkp18hx6pyycckycljdyzy"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -110037,18 +110208,18 @@ self: { , containers, criterion, deepseq, doctest, input-parsers , markdown-unlit, monoid-subclasses, parsers, QuickCheck , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat - , text, transformers, witherable-class + , text, transformers, witherable }: mkDerivation { pname = "grammatical-parsers"; - version = "0.5.1"; - sha256 = "1y5w49bcfbadchy580q5dnkgl0k5daqykc2jhz8yai94pr43ishg"; + version = "0.5.2"; + sha256 = "1xnm5j0lznabscpswzvxjccwxb6c8js7jg3z1ddd60gffq69wpip"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base containers input-parsers monoid-subclasses parsers - rank2classes transformers witherable-class + rank2classes transformers witherable ]; executableHaskellDepends = [ base containers monoid-subclasses parsers rank2classes @@ -110056,7 +110227,7 @@ self: { testHaskellDepends = [ base checkers containers doctest monoid-subclasses parsers QuickCheck rank2classes size-based tasty tasty-quickcheck - testing-feat + testing-feat witherable ]; testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ @@ -113827,6 +113998,26 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.2"; + sha256 = "1aj82n2ay16zman829gq7s9dkg3qyyavca8hhjfibx8hzg6pmnap"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -113973,8 +114164,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "5"; - editedCabalFile = "0vr2fcgp3pjjnp0sy7mvbabqh92215alw62f70pjys9i4z1ks977"; + revision = "7"; + editedCabalFile = "16bnd1m2cp4i6hs2krivvf8fxr5hrx2mx0hygw4zkvgbfzwl42wy"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -114207,8 +114398,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.6.7"; - sha256 = "1n7njjw7mc7c460zy3gfdk5x5xbmvna5f6ivc3qakabsh7n1l5d1"; + version = "0.7"; + sha256 = "0jp0120m11390bbrcarrqvavqj6fbjfm44wnhn8c6n6yfr29im24"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117363,26 +117554,6 @@ self: { }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hspec, mtl, network - , QuickCheck, text - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.5.0"; - sha256 = "0q0nd8d22knf6b1xwqz3gxmpymbvlx1p20hyahd5qr1yhjgpch0b"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default mtl network text - ]; - testHaskellDepends = [ - base bytestring containers hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_6_1" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring , connection, containers, criterion, data-binary-ieee754 , data-default, deepseq, deepseq-generics, hspec, mtl, network @@ -117405,7 +117576,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hasbolt-extras" = callPackage @@ -117485,8 +117655,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.2"; - sha256 = "1sh4903x05fwci7nmlqd0f2wjjs5b9bqckmgrkjpnawcnsbby1ds"; + version = "0.5.0.3"; + sha256 = "0ca6vpin2vavff94lw8an5sisni5ncz9cvidy48dvw5y5hlj2yv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120996,24 +121166,28 @@ self: { }) {}; "hasklepias" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec - , interval-algebra, lens, lens-aeson, QuickCheck, safe, text, time - , unordered-containers, vector, witherable + ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log + , containers, flow, ghc-prim, hspec, interval-algebra, lens + , lens-aeson, mtl, process, QuickCheck, safe, tasty, tasty-hspec + , tasty-hunit, text, time, unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.8.3"; - sha256 = "01lq7q9gq7b5zi2bwlc6wpj914l660cl5wlvbznimhfnkr1aqrgm"; + version = "0.12.0"; + sha256 = "0zjlzd6c5plyi803vpx0f4js9b2zys8pd6ikbdya2ifmgxfwj2zh"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers flow interval-algebra lens - lens-aeson QuickCheck safe text time unordered-containers vector - witherable + aeson base bytestring cmdargs co-log containers flow ghc-prim + interval-algebra lens lens-aeson mtl process QuickCheck safe tasty + tasty-hunit text time unordered-containers vector witherable ]; testHaskellDepends = [ aeson base bytestring containers flow hspec interval-algebra lens - QuickCheck text time unordered-containers vector + QuickCheck tasty tasty-hspec tasty-hunit text time + unordered-containers vector ]; - description = "Define features from events"; + description = "embedded DSL for defining epidemiologic cohorts"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -121230,8 +121404,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.53.4"; - sha256 = "04q5a2hf198949z3dlswjq384ymlasq0my1a7n1v3kfr47hr1cjx"; + version = "0.53.6"; + sha256 = "04f9aybim3nv5xhlcawcm9jgbf4ql8v3lqgw8yvk5snrzy30yf1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121276,8 +121450,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.53.4"; - sha256 = "034yb730i2f2dklqk6fcygg7c1h1l0zpm0xh6zkp4a7wjb77f4jp"; + version = "0.53.7"; + sha256 = "150nprl5i8v5api6h7svdwdskzjiy7ljrwmz3zfil1h05b2qz3l6"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -124744,6 +124918,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.2"; sha256 = "0h9givw1l83l8z59w6y1rjcnply297b2iag3qhy1rmcjyq3d6m0m"; + revision = "1"; + editedCabalFile = "1z8b4mn4y0lnna5acp7fryqpq2355bgi7rzivg34fgfnf3fmwa0a"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -124864,6 +125040,17 @@ self: { broken = true; }) {}; + "hedgehog-optics" = callPackage + ({ mkDerivation, base, hedgehog, optics-core }: + mkDerivation { + pname = "hedgehog-optics"; + version = "1.0.0.1"; + sha256 = "0ybpq4c74w8y3wnfmy7macana4zlr4w1m2s0kk88yq67cvzfgb5w"; + libraryHaskellDepends = [ base hedgehog optics-core ]; + description = "Hedgehog properties for optics laws"; + license = lib.licenses.mit; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -126261,15 +126448,15 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.46.0"; - sha256 = "1pqs4hcjy1gipdp63d8jcy035n96rfx14x0s67ihmh16s11i85bz"; + version = "0.47.0"; + sha256 = "1rhs3vyf7kwzlyyc0xjp696vh11wm3jz8k27w01blniris5kch9l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory fgl filepath free haskeline lens lens-aeson + deepseq directory fgl filepath free haskeline here lens lens-aeson megaparsec memory monad-par mtl multiset operational optparse-generic process QuickCheck quickcheck-text regex-tdfa restless-git rosezipper s-cargot sbv scientific semver-range @@ -129573,6 +129760,8 @@ self: { pname = "hledger"; version = "1.22"; sha256 = "1w7akdl9pn77s3fnb5wq3f7k2xpxnf91ann8qy5gpq66nszm6pqc"; + revision = "1"; + editedCabalFile = "1b0pdsav3xhcfyn814ddfn58l9nhan9yfafksn0y0ckfwyqgbcmd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129723,6 +129912,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hledger-iadd_1_3_15" = callPackage + ({ mkDerivation, base, brick, containers, directory, free + , hledger-lib, hspec, hspec-discover, megaparsec, microlens + , microlens-th, optparse-applicative, QuickCheck, text, text-zipper + , time, transformers, unordered-containers, vector, vty + , xdg-basedir + }: + mkDerivation { + pname = "hledger-iadd"; + version = "1.3.15"; + sha256 = "1jnym3jfixyrldl83jjy3syx6n411gd8dr2jh69lx5wbq8qddpfm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers directory free hledger-lib megaparsec + microlens microlens-th optparse-applicative text text-zipper time + transformers unordered-containers vector vty xdg-basedir + ]; + executableHaskellDepends = [ + base brick directory free hledger-lib megaparsec microlens + optparse-applicative text text-zipper time transformers + unordered-containers vector vty xdg-basedir + ]; + testHaskellDepends = [ + base free hledger-lib hspec megaparsec QuickCheck text text-zipper + time transformers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A terminal UI as drop-in replacement for hledger add"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hledger-interest" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: @@ -129810,6 +130032,8 @@ self: { pname = "hledger-lib"; version = "1.22"; sha256 = "06qddk2nhjq3g02in3hcxz4hfwq9fcb3356shzbljx7ssmzjakzm"; + revision = "1"; + editedCabalFile = "1l51rzm7119vd69qyzw020hc4ss47gsra9vh6qsj7ws6jnyckclz"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -129916,6 +130140,8 @@ self: { pname = "hledger-ui"; version = "1.22"; sha256 = "1izidpxwygghq0c3z7pygf9c9qlsydw89gs6475hsd4qiqc06gjr"; + revision = "1"; + editedCabalFile = "1l5jizxh7cz26s0zkr9l25r44fizpysg9bh4ykc043l30dfi5fi2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130002,6 +130228,8 @@ self: { pname = "hledger-web"; version = "1.22"; sha256 = "0miy111zz8yqw0i87sn91aiplznc7fbirznpar8y5mch8z4wn4bs"; + revision = "1"; + editedCabalFile = "18ps7rk7by475d2s95s1iblv04i6y8ks4q0a4s6q38a79g9qk50g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130654,6 +130882,8 @@ self: { pname = "hls-tactics-plugin"; version = "1.2.0.0"; sha256 = "0djyskzsv1hz92p6x62nf78j1f0x9nl55fl5mzc29lncqib8g8ak"; + revision = "2"; + editedCabalFile = "0ywqrd6wxbmblmf7m58cj5yarcl4869fdzrlnm0gia6qc1qa0y8j"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -131420,9 +131650,9 @@ self: { "hnix" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, comonad, containers, criterion, data-fix, deepseq - , deriving-compat, Diff, directory, exceptions, filepath, free - , gitrev, Glob, hashable, hashing, haskeline, hedgehog + , bytestring, comonad, containers, criterion, cryptonite, data-fix + , deepseq, deriving-compat, Diff, directory, exceptions, filepath + , free, gitrev, Glob, hashable, hashing, haskeline, hedgehog , hnix-store-core, hnix-store-remote, http-client, http-client-tls , http-types, lens-family, lens-family-core, lens-family-th, logict , megaparsec, monad-control, monadlist, mtl, neat-interpolation @@ -131435,17 +131665,15 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.13.1"; - sha256 = "12mqwhvxk0w0fjbdl3ignayp08nm31qi028wq5qrkcyxw29ff1k7"; - revision = "1"; - editedCabalFile = "01dmzpcqav7p764dpicih8jm0g6yiiqgww8b5m6c0bfvvgfqyx2h"; + version = "0.14.0.1"; + sha256 = "1d8rsbifx29560c3kj4l688snxb6sz391m1pkkcfdakizwjzz983"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad - containers data-fix deepseq deriving-compat directory exceptions - filepath free gitrev hashable hashing hnix-store-core + containers cryptonite data-fix deepseq deriving-compat directory + exceptions filepath free gitrev hashable hashing hnix-store-core hnix-store-remote http-client http-client-tls http-types lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl neat-interpolation optparse-applicative @@ -134258,6 +134486,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hq" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, conversion + , data-default-class, erf, gsl, hmatrix, hmatrix-gsl + , hmatrix-gsl-stats, hspec, hspec-expectations, ieee754 + , math-functions, mersenne-random-pure64, monad-loops, mtl, random + , random-fu, random-source, rvar, sorted-list, statistics, stm + , text, time, vector, vector-algorithms + }: + mkDerivation { + pname = "hq"; + version = "0.1.0.11"; + sha256 = "093hckgsivd6fnpihrvqaq3hba78wgczaj2yyrlkskdx1hqdqbbw"; + libraryHaskellDepends = [ + base bytestring cassava containers conversion data-default-class + erf hmatrix hmatrix-gsl hmatrix-gsl-stats ieee754 math-functions + mersenne-random-pure64 monad-loops mtl random random-fu + random-source rvar sorted-list statistics stm text time vector + vector-algorithms + ]; + librarySystemDepends = [ gsl ]; + libraryPkgconfigDepends = [ gsl ]; + testHaskellDepends = [ base hspec hspec-expectations ]; + description = "Quantitative Library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) gsl;}; + "hquantlib" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl , hmatrix-special, hquantlib-time, HUnit, mersenne-random-pure64 @@ -134554,20 +134808,20 @@ self: { }) {GeoIP = null;}; "hs-aws-lambda" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive + ({ mkDerivation, aeson, base, base64, bytestring, case-insensitive , containers, deepseq, http-client, http-types, safe-exceptions - , text, unliftio + , text, time, unliftio, vector }: mkDerivation { pname = "hs-aws-lambda"; - version = "0.1.0.4"; - sha256 = "1brykgglhslvgh3jrklr4m3mjcrzp0yq90xxyqh3h0prmswnx9y7"; + version = "0.2.0.0"; + sha256 = "0s79riyqx8aaaqcq83izidwx46jhgggmag5z2shx9hbmw8bx64cq"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers deepseq - http-client http-types safe-exceptions text unliftio + aeson base base64 bytestring case-insensitive containers deepseq + http-client http-types safe-exceptions text time unliftio vector ]; - testHaskellDepends = [ base ]; - description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations"; + testHaskellDepends = [ base time ]; + description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations. Now with API Gateway support!"; license = lib.licenses.publicDomain; }) {}; @@ -138121,8 +138375,8 @@ self: { }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.0.0.4"; - sha256 = "1fyxx847d37ib0dhdn4n7y6sk7d0xw1zcind39m3hmbvxvx3j648"; + version = "1.0.0.5"; + sha256 = "0s5k3svkhzn0l2r39vvs50d8hfqljal04l2cx3c5ymnkjfi49mdv"; libraryHaskellDepends = [ base conduit directory exceptions hashable hspec hspec-core resourcet temporary text xml-conduit xml-types @@ -145683,41 +145937,6 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , cmdargs, containers, directory, exceptions, filepath, ghc - , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec - , hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, mtl, parsec, process, random, raw-strings-qq - , setenv, shelly, split, stm, strict, text, time, transformers - , unix, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "ihaskell"; - version = "0.10.2.0"; - sha256 = "061gpwclcykrs4pqhsb96hrbwnpmq0q6fx9701wk684v01xjfddk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cereal cmdargs containers - directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths - haskeline hlint http-client http-client-tls ipython-kernel mtl - parsec process random shelly split stm strict text time - transformers unix unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory ghc ipython-kernel - process strict text transformers unix unordered-containers - ]; - testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit - raw-strings-qq setenv shelly text transformers - ]; - description = "A Haskell backend kernel for the IPython project"; - license = lib.licenses.mit; - }) {}; - - "ihaskell_0_10_2_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , cmdargs, containers, directory, exceptions, filepath, ghc , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec @@ -145750,7 +145969,6 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -146565,8 +146783,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.5"; - sha256 = "0jgnsbd38gw20h1lv39bh3n9bhawkjq90ajalgjyy5pih434mphf"; + version = "0.1.2.6"; + sha256 = "1j2q1mqxfgcb8r6388xanmp5i1sdh6w52s08nd94g5lpg93mjz2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146593,8 +146811,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.3.0.3"; - sha256 = "1rv6piiyy0f9l2pmwlc3j47g2lnz7sbipb5jdn1m76z4j66y05n9"; + version = "0.3.0.5"; + sha256 = "0c8pyw5nx8b05wqdczy892n0knsniysrxllg2y8q5905mns8h7pc"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -151906,8 +152124,8 @@ self: { }: mkDerivation { pname = "jenkinsPlugins2nix"; - version = "0.3.0.1"; - sha256 = "0jqapzgq0z346af1626zl67dnnpr6i7bsqrhxhiz32w70kjhisa1"; + version = "0.4.0.0"; + sha256 = "0s2k4irml4hahnv9qzsw1vvlqc651gmwgiscz97pcgb25v5slmcz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153692,8 +153910,8 @@ self: { }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.4"; - sha256 = "18lqkcq69k3hjbqzxycdgrfrd2a5m3ahxwja0yw8xi9x6mw33cxi"; + version = "0.3.5"; + sha256 = "08w59nhb13vbimcad42k2n9mfd501wqc8zvdqzrxi0c2lkx0gfkx"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -172625,6 +172843,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "megaparsec_9_1_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "9.1.0"; + sha256 = "0rbs0nwr3ffhn10gl9sxqd2q8n6pn96ggf0dyz23myfskzar1fn1"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "megaparsec-tests" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-expectations, hspec-megaparsec @@ -172651,6 +172890,31 @@ self: { license = lib.licenses.bsd2; }) {}; + "megaparsec-tests_9_1_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "9.1.0"; + sha256 = "0hz76bszcxk4p548nvalkh1vyrkwkp3scv2bhdmpb1d853whdskp"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175980,6 +176244,21 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "mmorph_1_2_0" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.2.0"; + sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "mmsyn2" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -178691,6 +178970,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.1.1"; + sha256 = "13nc9qcwz10y1gxdp277gqq675pbcxav35fwqnbyrvz9hx1m545x"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -180997,6 +181296,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "multi-containers_0_2" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover }: + mkDerivation { + pname = "multi-containers"; + version = "0.2"; + sha256 = "0vvkdy74xr7jv0w33lrzfvzsjwsfmwlhlbyfql3pi6rb9r4x690v"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A few multimap variants"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "multi-except" = callPackage ({ mkDerivation, base, dlist-nonempty, hspec, semigroupoids }: mkDerivation { @@ -183619,6 +183932,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "nat-optics" = callPackage + ({ mkDerivation, base, hedgehog, optics-core, text }: + mkDerivation { + pname = "nat-optics"; + version = "1.0.0.1"; + sha256 = "1ba5lnb70gdaa9hwfcg2r0x76h2mxknn49rwplmbgcyxyh79x4jl"; + libraryHaskellDepends = [ base optics-core text ]; + testHaskellDepends = [ base hedgehog optics-core text ]; + description = "Refinement types for natural numbers with an optics interface"; + license = lib.licenses.mit; + }) {}; + "nat-sized-numbers" = callPackage ({ mkDerivation, base, deepseq, doctest, hedgehog, QuickCheck }: mkDerivation { @@ -188620,6 +188945,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_6_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text + , time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.6.0.3"; + sha256 = "1xv1khi5pv84haasrf24lyyi41zc5biyqlgahzlg4n3mci2zz9ik"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-redis" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis , nri-env-parser, nri-observability, nri-prelude, resourcet @@ -188627,8 +188980,8 @@ self: { }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.0"; - sha256 = "00im3rnb7w45xm60l42kzrj3sc9dg3098w988fdhdschwk34zqpc"; + version = "0.1.0.1"; + sha256 = "0nvkq4h7fdc9jifk3dd2sac6bwk4ks4bda8slln8dqwgxbh31ln2"; libraryHaskellDepends = [ aeson async base bytestring conduit hedis nri-env-parser nri-observability nri-prelude resourcet safe-exceptions text @@ -188645,15 +188998,16 @@ self: { "nri-test-encoding" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, filepath - , nri-prelude, servant, servant-auth-server, servant-server, text + , nri-prelude, nri-redis, servant, servant-auth-server + , servant-server, text }: mkDerivation { pname = "nri-test-encoding"; - version = "0.1.0.0"; - sha256 = "11vk1f99xbqs678rxldxh9qfwailinxpjl6q6pvikb8f32rrb74y"; + version = "0.1.1.0"; + sha256 = "0k21hyd0kbgdg3kmfwy20vf21r6963ygybz1v84wjmfzqbc5fcq5"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring filepath nri-prelude servant - servant-auth-server servant-server text + aeson aeson-pretty base bytestring filepath nri-prelude nri-redis + servant servant-auth-server servant-server text ]; description = "A library to simplify writing golden tests for encoding types"; license = lib.licenses.bsd3; @@ -192735,8 +193089,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.4.0.1"; - sha256 = "029bizcajhmvkgmr7yb95bbhi00bnvhnlx4crbx06wridhz2lp23"; + version = "0.4.0.2"; + sha256 = "05jpgf4lyq4pg4j98cl2jlax1jjy27knsgjqcbbg38p1n33m7gki"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -193621,8 +193975,8 @@ self: { }: mkDerivation { pname = "ory-kratos"; - version = "0.0.5.10"; - sha256 = "0cn52z8d4l7z08xnz8dxiazbd109zsnl7qpy38biwvfsmzh9s46w"; + version = "0.0.6.0"; + sha256 = "02hk0agzjj1y928wb2i0cl2lq0bwrn9iqny4m67csgnxjpain1il"; libraryHaskellDepends = [ aeson base containers exceptions http-api-data http-client http-client-tls http-types mtl network-uri servant servant-client @@ -194437,6 +194791,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "pagerduty-hs" = callPackage + ({ mkDerivation, aeson, base, exceptions, HUnit, lens, tasty + , tasty-hunit, tasty-quickcheck, text, wreq + }: + mkDerivation { + pname = "pagerduty-hs"; + version = "0.1.0.1"; + sha256 = "1hvqkd4pr1qi7akmd0kzj371wssdzaw32jjh2khd1p6x4dmry381"; + libraryHaskellDepends = [ aeson base exceptions lens text wreq ]; + testHaskellDepends = [ + aeson base exceptions HUnit lens tasty tasty-hunit tasty-quickcheck + text wreq + ]; + description = "An interface to the PagerDuty API"; + license = lib.licenses.bsd3; + }) {}; + "pagination" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: mkDerivation { @@ -195233,8 +195604,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.2"; - sha256 = "1gn3bl9nls9rqn2mdxdiaik740l2g8ji7djn6626j4jnmvwkcwks"; + version = "0.4.3"; + sha256 = "1z40rjmcbs7d0f9aksgdm2w4l3jyglgm5iap4z110mfkmrvwrlfx"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -196730,6 +197101,22 @@ self: { broken = true; }) {}; + "parser-unbiased-choice-monad-embedding" = callPackage + ({ mkDerivation, base, containers, doctest, Earley + , lexer-applicative, regex-applicative, srcloc + }: + mkDerivation { + pname = "parser-unbiased-choice-monad-embedding"; + version = "0.0.0.3"; + sha256 = "0p8w52f5bmf1y9b6zw5sc8dhhbm4lf8ld59j52a50piyyyl9y0xi"; + libraryHaskellDepends = [ base containers Earley srcloc ]; + testHaskellDepends = [ + base doctest lexer-applicative regex-applicative + ]; + description = "Parsing library with unbiased choice and support for embedding arbitrary monad"; + license = lib.licenses.bsd3; + }) {}; + "parser241" = callPackage ({ mkDerivation, base, containers, hspec, mtl }: mkDerivation { @@ -196878,6 +197265,8 @@ self: { pname = "parsley"; version = "1.0.0.1"; sha256 = "0z4w6hwa0yj34xsqp63kqy3wkk51k343fv8ijbk0s4w4hdx7d7jb"; + revision = "1"; + editedCabalFile = "0bv13k090bn5jy1qi3palrp7sri1xbd6xvh7ymhd9l0431yfzadv"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; @@ -196905,6 +197294,8 @@ self: { pname = "parsley-core"; version = "1.3.0.0"; sha256 = "0qx5q7a9hkj9swpwlxh24c19pf9i6yvlmp44xiwshflz4cf1n8dq"; + revision = "1"; + editedCabalFile = "03a4l7ai39kii4qdxv78wgknj3iz2n2g2055rk3mi0wsiy280jfg"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -201117,8 +201508,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.4.1.1"; - sha256 = "1xk4vj7bj93s8r9l09z2w9h0sbkd73qcv441jisa04m0s6hlhgby"; + version = "0.4.2.1"; + sha256 = "1h95v0vspx9dziqnki4553b7sblpq33l9h3a86xwim0rv7mpqsjs"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -202075,6 +202466,8 @@ self: { pname = "pipes"; version = "4.3.16"; sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; + revision = "1"; + editedCabalFile = "1b2hkxrb3sv2jgxw3pwhzkskdbgwmli1ckmnycba4llajn9yczmh"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers void ]; @@ -205007,6 +205400,39 @@ self: { broken = true; }) {}; + "polysemy_1_6_0_0" = callPackage + ({ mkDerivation, async, base, Cabal, cabal-doctest, containers + , criterion, doctest, first-class-families, free, freer-simple + , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm + , syb, template-haskell, th-abstraction, transformers, type-errors + , unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.6.0.0"; + sha256 = "1s2hmfp1ii5q8qpxiqm825ykh4fpcq06wphfqbhp7p3sxkkr3c68"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + async base containers first-class-families mtl QuickCheck stm syb + template-haskell th-abstraction transformers type-errors unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + inspection-testing mtl QuickCheck stm syb template-haskell + th-abstraction transformers type-errors unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + async base containers criterion first-class-families free + freer-simple mtl QuickCheck stm syb template-haskell th-abstraction + transformers type-errors unagi-chan + ]; + description = "Higher-order, low-boilerplate free monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "polysemy-RandomFu" = callPackage ({ mkDerivation, base, hspec, hspec-discover, polysemy , polysemy-plugin, polysemy-zoo, random-fu, random-source, text @@ -205036,8 +205462,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.2.3"; - sha256 = "0awsnl207i1fi7qv4cqhfa22r2diq7js6s06xgwgxbzd0wmq2j9g"; + version = "0.1.3.1"; + sha256 = "1fk8sh5nd6zg017pvra2k0sh13g8yq5rw8wvkb0zkyz5qk4a7ybc"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-plugin polysemy-time relude text @@ -205059,8 +205485,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.1.0.2"; - sha256 = "0kzb1lp5a94ahb25rzscxam77ms45jy0v0czvmwidlg0b082zwbw"; + version = "0.1.0.3"; + sha256 = "1ml4f4g59sdvy5m81rivglc3sg3cg3spj0bf9mgdnvbrvlzxv3b9"; libraryHaskellDepends = [ async base containers polysemy polysemy-time relude stm stm-chans string-interpolate template-haskell text time unix @@ -205076,17 +205502,15 @@ self: { }) {}; "polysemy-extra" = callPackage - ({ mkDerivation, base, containers, exceptions, extra, polysemy - , polysemy-zoo - }: + ({ mkDerivation, base, containers, polysemy, polysemy-kvstore }: mkDerivation { pname = "polysemy-extra"; - version = "0.1.7.0"; - sha256 = "1cr4gmsxf07754gz1jlv8jr7a4zgs9w5v3s8g8hz1lhps090cdf4"; + version = "0.2.0.0"; + sha256 = "0w8spy9l66ys1x9riwy8cwvywzqxkcbhzrqyia85jgl6mgp96zis"; libraryHaskellDepends = [ - base containers exceptions extra polysemy polysemy-zoo + base containers polysemy polysemy-kvstore ]; - description = "Extra Input and Output functions for polysemy.."; + description = "Extra Input and Output functions for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -205133,8 +205557,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.4.0.3"; - sha256 = "0sp4s8spf0nzqs8cw9swnsxd2wxa0g4cnz236n7m6z73450ih3c7"; + version = "0.4.0.6"; + sha256 = "1h35qv4gnjkgn37q6gvdn3www83azq7gj6d1zza0g6dmil0vvlr4"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive composition containers data-default either http-client http-client-tls @@ -205148,7 +205572,7 @@ self: { relude servant servant-client servant-server string-interpolate tasty tasty-hedgehog template-haskell text time warp ]; - description = "Polysemy effect for http-client"; + description = "Polysemy Effect for Http-Client"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -205159,8 +205583,8 @@ self: { }: mkDerivation { pname = "polysemy-keyed-state"; - version = "0.1"; - sha256 = "00jcb0rd7s8yvflqx6xjas10lgh0dmg4ywb18cbkm8xd0pdn0d2j"; + version = "0.1.1"; + sha256 = "0851hj58ka7gjpai9ld2mqrba6gy040wzdwj1bjzzdwrgdj85246"; libraryHaskellDepends = [ base constraints constraints-extras polysemy some StateVar trivial-constraint @@ -205174,6 +205598,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-kvstore" = callPackage + ({ mkDerivation, base, containers, polysemy }: + mkDerivation { + pname = "polysemy-kvstore"; + version = "0.1.2.0"; + sha256 = "1wa9rn948gaaz4z7pk0k2k023rap1ia3xxaxyqw5wzalfb2bm2zx"; + libraryHaskellDepends = [ base containers polysemy ]; + description = "KVStore effect for polysemy"; + license = lib.licenses.mit; + }) {}; + "polysemy-kvstore-jsonfile" = callPackage ({ mkDerivation, aeson, base, containers, exceptions, extra, path , polysemy, polysemy-zoo, unliftio-path @@ -205199,8 +205634,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.2.2.1"; - sha256 = "09dcw78gbw14fxa46w6xsw7b9xn9cqvvh9ngdnyjjv58vgd0k3yk"; + version = "0.2.2.2"; + sha256 = "16xr9ym9ahc4452v5rdna8i5xsm7z50zjkjxa6kl6ql3vxrqfj2m"; libraryHaskellDepends = [ ansi-terminal base polysemy polysemy-conc polysemy-time relude string-interpolate template-haskell text time @@ -205210,7 +205645,7 @@ self: { polysemy-time relude string-interpolate tasty tasty-hedgehog template-haskell text time ]; - description = "Polysemy effects for logging"; + description = "Polysemy Effects for Logging"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -205222,8 +205657,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.2.2.1"; - sha256 = "0k8zabqc31vgk2dqxmbxk2dkmirdqxypfr8h6k0svgi66jbqbmv8"; + version = "0.2.2.2"; + sha256 = "1w3jyl8qb491v2a0lbkffpg7yx04mwhxsv1zqk7894145rryxkpn"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -205233,7 +205668,7 @@ self: { polysemy-conc polysemy-log polysemy-test polysemy-time relude tasty tasty-hedgehog text time ]; - description = "polysemy-log interpreter for co-log"; + description = "Colog Adapters for Polysemy-Log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -205245,8 +205680,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.2.2.1"; - sha256 = "0rvikvzxk0qqbwx58w8fwmj3xkdf7i0zwz3w8brn79k3bq3m9bf5"; + version = "0.2.2.2"; + sha256 = "0p1sz7w247fqvxjmz0bjh34nbvb8p9pc4wimklcmkvghqzny5qkz"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -205255,7 +205690,7 @@ self: { base di-polysemy hedgehog polysemy polysemy-conc polysemy-log polysemy-test polysemy-time relude tasty tasty-hedgehog text time ]; - description = "polysemy-log interpreter for di"; + description = "Di Adapters for Polysemy-Log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -205361,6 +205796,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-plugin_0_4_0_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , ghc, ghc-tcplugins-extra, hspec, hspec-discover + , inspection-testing, polysemy, should-not-typecheck, syb + , transformers + }: + mkDerivation { + pname = "polysemy-plugin"; + version = "0.4.0.0"; + sha256 = "0r3cy26smq3z1lw1pjjgankgal5m166c4cflm4chrw4bi056ipss"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra polysemy syb transformers + ]; + testHaskellDepends = [ + base containers doctest ghc ghc-tcplugins-extra hspec + inspection-testing polysemy should-not-typecheck syb transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-readline" = callPackage ({ mkDerivation, base, exceptions, haskeline, polysemy , polysemy-plugin @@ -205398,8 +205857,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.1.0.3"; - sha256 = "02nlhkhzjr5zg8q4ff0an1vxm5vxwkq1d83j4980xkq20582sfvl"; + version = "0.1.0.4"; + sha256 = "0z7d40vimdl5dr05cxr9c88fayg6cx2km537z81c67sxdv79mgzp"; libraryHaskellDepends = [ base polysemy relude transformers ]; testHaskellDepends = [ base hedgehog polysemy polysemy-plugin polysemy-test relude tasty @@ -205417,8 +205876,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.3.1.4"; - sha256 = "0cysny71f92d4ncx0mjglc3wjc7yna2x6113rq8kk4s5z0zsqj7z"; + version = "0.3.1.6"; + sha256 = "0c4yfxk23cf16dzd46ddr4kk2529rmmz3r2k0531kyh4yx1w5536"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy @@ -205443,8 +205902,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.2.3"; - sha256 = "0hxh9i3rw434igzx41nzbgglnvgvvgrxbgwz7cb25srj4911n69j"; + version = "0.1.3.1"; + sha256 = "10gcqvgarhniracxks43rhphhls1v5hbg4k5ankbzjixjmm34gpv"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -209791,14 +210250,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_12_0" = callPackage + "process_1_6_13_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.12.0"; - sha256 = "1zw551zrnq70ip9dsc564aw1zf90l48jf59rxhjgx4d00ngs165x"; + version = "1.6.13.0"; + sha256 = "01kvwr6mrs025q7dblj2vgmx8ms97rdcmar8zgzaxwzqql0jsgwp"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -211706,8 +212165,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.2.0"; - sha256 = "0irhlscjq3anfhzn2qs28w4k6z48p557a060iqpimjw2kjkyrr4d"; + version = "0.1.2.1"; + sha256 = "15ghl4zdf4hz27kkfky4m405abmarzr8j7fqi07ax7mswwwha9f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215255,6 +215714,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "quotet" = callPackage + ({ mkDerivation, base, exceptions, mtl, template-haskell, th-compat + }: + mkDerivation { + pname = "quotet"; + version = "0.0.0.1"; + sha256 = "030d1r5skmv0gayryy89yfxr5cq4qs01anbhaclil92g07ffblhz"; + libraryHaskellDepends = [ + base exceptions mtl template-haskell th-compat + ]; + description = "Monad transformer for Quote from template-haskell"; + license = lib.licenses.cc0; + }) {}; + "qux" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , language-qux, llvm-general, mtl, optparse-applicative, pretty @@ -215912,8 +216385,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "5"; - editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh"; + revision = "6"; + editedCabalFile = "1hzfz9b1cxrsya8i53yx145iypaakfsfjix7l8girhx7vbz0cm8r"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -216402,6 +216875,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "rank2classes_1_4_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest + , markdown-unlit, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.4.2"; + sha256 = "0b32mgqzwj9hzz29fhvzidw40iygkbra5ng7z7l9kpp15pbak0pp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + testToolDepends = [ markdown-unlit ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -222233,8 +222728,8 @@ self: { pname = "req"; version = "3.9.1"; sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; - revision = "1"; - editedCabalFile = "0g2g8l1nhmqxgk2ylvavv7rw6bq73d3awd21l438mzzljqj4kvh8"; + revision = "2"; + editedCabalFile = "15mlnrkm3nbjvzpd81fs4bjk8yibk4cm2qcim5ymilas9zpiglm3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -222501,23 +222996,24 @@ self: { }) {}; "reserve" = callPackage - ({ mkDerivation, base, base-compat, bytestring, directory, hspec - , http-conduit, http-kit, http-types, network, process, QuickCheck - , unix, warp + ({ mkDerivation, base, bytestring, directory, hspec, http-conduit + , http-kit, http-types, interpolate, mockery, network, process + , QuickCheck, streaming-commons, unix, warp }: mkDerivation { pname = "reserve"; - version = "0.1.1"; - sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2"; + version = "0.1.2"; + sha256 = "1fdqdxnj2177s0qlyprrsrhykgm93zwm6lgmsjp3ax4j4c42cpaf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base base-compat bytestring directory http-kit http-types network - process unix + base bytestring directory http-kit http-types network process + streaming-commons unix ]; testHaskellDepends = [ - base base-compat bytestring directory hspec http-conduit http-kit - http-types network process QuickCheck unix warp + base bytestring directory hspec http-conduit http-kit http-types + interpolate mockery network process QuickCheck streaming-commons + unix warp ]; description = "Reserve reloads web applications"; license = lib.licenses.mit; @@ -225181,15 +225677,16 @@ self: { ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , containers, criterion, deepseq, hashable, integer-gmp, mtl , scientific, template-haskell, text, time, unordered-containers + , vector }: mkDerivation { pname = "ron"; - version = "0.11"; - sha256 = "1sdgjxz609m1ddcby29g5sd9bmh20wav3q4ab4bmsfl5ar2yq53i"; + version = "0.12"; + sha256 = "0hmnvlla8zm8jhn56qbaqs248dq4b4sf48kz7dcggz150i624aa9"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl scientific template-haskell text time - unordered-containers + unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; description = "RON"; @@ -226819,10 +227316,10 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.7.1"; - sha256 = "0gkxacfiqp55xzbmpz5i5c4kqma8jal49q7c8gl9n9qq5c5dvxjb"; + version = "0.1.7.2"; + sha256 = "15a80s87f603w8l7fnaba2cyqx62042vvcidpjzyga2685wpyqv9"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; - testHaskellDepends = [ base hspec void ]; + testHaskellDepends = [ base hspec transformers void ]; description = "Safe, consistent, and easy exception handling"; license = lib.licenses.mit; }) {}; @@ -226916,6 +227413,8 @@ self: { pname = "safe-json"; version = "1.1.1.1"; sha256 = "0wp955ak673jjcjwqmliwv3dk723kf0nl4rwvzqmlgfg9c57n2j3"; + revision = "1"; + editedCabalFile = "0bwdim4vslpgnh77b5lgxmfrh2xaza1rgqgnh2xz73b4jb8lg2p4"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -236253,6 +236752,18 @@ self: { license = lib.licenses.mit; }) {}; + "shake-plus_0_3_4_0" = callPackage + ({ mkDerivation, base, extra, path, rio, shake }: + mkDerivation { + pname = "shake-plus"; + version = "0.3.4.0"; + sha256 = "0022npwhvzlpz6d6xl75kx0f7ydr8fqqcy04zkv70gwsv0gp5zbm"; + libraryHaskellDepends = [ base extra path rio shake ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "shake-plus-extended" = callPackage ({ mkDerivation, aeson, base, binary-instances, comonad, extra , http-conduit, ixset-typed, ixset-typed-binary-instance @@ -238363,8 +238874,8 @@ self: { }: mkDerivation { pname = "simple-parser"; - version = "0.5.0"; - sha256 = "0qkgk7gxk69ns4067viz59wbp5hz05j1d26hv0wmbkhixsxa56s3"; + version = "0.6.0"; + sha256 = "0bj6x3zd3xp2gxx2z20d7c49vws91y728cjbh5ycz2rahg3gr39m"; libraryHaskellDepends = [ base containers list-t mmorph mtl nonempty-containers scientific text text-builder @@ -247318,6 +247829,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "static-text_0_2_0_7" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen + , markdown-unlit, tasty, tasty-hunit, template-haskell, text + , vector + }: + mkDerivation { + pname = "static-text"; + version = "0.2.0.7"; + sha256 = "1mphxd0wpr4qwyznff96qn5b1xb2x9k956aghap6nnabnyhgvqr4"; + libraryHaskellDepends = [ + base bytestring template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-driver-gen markdown-unlit tasty + tasty-hunit template-haskell + ]; + testToolDepends = [ markdown-unlit ]; + description = "Lists, Texts, ByteStrings and Vectors of statically known length"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "staticanalysis" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -249520,8 +250053,8 @@ self: { }: mkDerivation { pname = "streamly-bytestring"; - version = "0.1.2"; - sha256 = "1j9lpggz23idlkj8rvb8bqg29xfzb7cmzf3lhyc43i5w73jslkv3"; + version = "0.1.3"; + sha256 = "00iqbzijxs112sd9423q35w0v8cx9wpq1y2kfikc3sacqvfwx0cs"; libraryHaskellDepends = [ base bytestring streamly ]; testHaskellDepends = [ base bytestring directory filepath hspec hspec-discover @@ -250678,18 +251211,18 @@ self: { }) {}; "strong-path" = callPackage - ({ mkDerivation, base, exceptions, filepath, path, tasty + ({ mkDerivation, base, exceptions, filepath, hspec, path, tasty , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell }: mkDerivation { pname = "strong-path"; - version = "1.0.0.0"; - sha256 = "0xpflbqzdbf7pk2v5c5acd5j4ijldklx0vvypw36zvy50ld4ffpz"; + version = "1.0.1.1"; + sha256 = "0jxn7ixqgz70csjw6f73v7j8pdwaj51qxy59hl62f6763bf4z392"; libraryHaskellDepends = [ base exceptions filepath path template-haskell ]; testHaskellDepends = [ - base filepath path tasty tasty-discover tasty-hspec + base filepath hspec path tasty tasty-discover tasty-hspec tasty-quickcheck ]; testToolDepends = [ tasty-discover ]; @@ -253253,14 +253786,19 @@ self: { }) {}; "symantic-base" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, hashable, template-haskell + , transformers, unordered-containers + }: mkDerivation { pname = "symantic-base"; - version = "0.0.2.20200708"; - sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d"; - libraryHaskellDepends = [ base ]; - description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; - license = lib.licenses.gpl3Only; + version = "0.1.0.20210703"; + sha256 = "1jwk22d028k34h468218fx0czmr9ksc8fm2462am82av20azb07h"; + libraryHaskellDepends = [ + base containers hashable template-haskell transformers + unordered-containers + ]; + description = "Commonly useful symantics for Embedded Domain-Specific Languages (EDSL)"; + license = lib.licenses.agpl3Plus; }) {}; "symantic-cli" = callPackage @@ -253465,26 +254003,35 @@ self: { }) {}; "symantic-parser" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc-prim, hashable, process, strict, tasty - , tasty-golden, template-haskell, text, transformers, unix - , unordered-containers + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , criterion, deepseq, directory, filepath, ghc-prim, hashable + , megaparsec, ormolu, pretty, process, random, strict + , symantic-base, tasty, tasty-golden, template-haskell, text + , transformers, unix, unordered-containers }: mkDerivation { pname = "symantic-parser"; - version = "0.1.0.20210201"; - sha256 = "0c7vqxd0dagn7l3k4khbqvwg51y6a40m0f5qf587vj4rpjalc473"; + version = "0.2.0.20210703"; + sha256 = "16mpc4s9y41a9hqxvx9jfnv1nrnpzk342bylh9091qd34gw657il"; libraryHaskellDepends = [ - array base bytestring containers ghc-prim hashable template-haskell - text transformers unordered-containers + array attoparsec base bytestring containers deepseq directory + filepath ghc-prim hashable megaparsec pretty process strict + symantic-base tasty tasty-golden template-haskell text transformers + unix unordered-containers ]; testHaskellDepends = [ base bytestring containers deepseq directory filepath hashable process strict tasty tasty-golden template-haskell text transformers unix unordered-containers ]; + testToolDepends = [ ormolu ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring containers criterion deepseq megaparsec + random template-haskell text transformers + ]; + doHaddock = false; description = "Parser combinators statically optimized and staged via typed meta-programming"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.agpl3Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255896,8 +256443,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.11.0"; - sha256 = "0bwv4ma7dzyyygsvnyfp4siidr9an729y4zq85158dwwv74y4nkm"; + version = "1.11.1"; + sha256 = "1rznf0dw7wypb3al3g3k5r8w837p9dmkjzma5zwvhq5wnr9yppsg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260302,8 +260849,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.7.0"; - sha256 = "0ph9vyx88mwh4d6n0wxbhicjc1x3d645kglw82nr5ggapgsab2a1"; + version = "0.0.7.3"; + sha256 = "0gbcqkarmy095avbcp4gnb906a4n2x3lllhqwlnamaa164nv9s2h"; libraryHaskellDepends = [ base binary lens semigroupoids semigroups text ]; @@ -262035,6 +262582,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_7_8" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.8"; + sha256 = "0l8k4f89rhmvd0ys7klgi57k0313ki1vr256mkc60xc6a6gb3g93"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -265452,12 +266022,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "transformers_0_5_6_2" = callPackage + "transformers_0_6_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.6.2"; - sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n"; + version = "0.6.0.2"; + sha256 = "1d907i06lgmis4s1mhjn6f4f3991vpycv9pl61h4xn2hwxasq3k2"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -265586,8 +266156,8 @@ self: { ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-either"; - version = "0.1.1"; - sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7"; + version = "0.1.2"; + sha256 = "1vb6jr2lpj6mqx9bv0ziqs6586gj6xka218qagxsm7w52w0hvz1v"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Either monad transformer"; license = lib.licenses.bsd3; @@ -265597,8 +266167,8 @@ self: { ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-except"; - version = "0.1.1"; - sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm"; + version = "0.1.2"; + sha256 = "00zxpip9nhli7ic1zaks7c4hj851dhdgkkwq5qw9vamr6whgh9cr"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; license = lib.licenses.bsd3; @@ -267654,8 +268224,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.3.1"; - sha256 = "0s9mplfbv2y8p745pzhmd7il1ykvndrbfs86c4w7r01lgy7dplxf"; + version = "2.4.1"; + sha256 = "0gh0cr3f19jsfq6025y1lq0mcg8cd920xd3x7jmd1cjlyjbkslsf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -267673,8 +268243,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.3.1"; - sha256 = "10n9p8d59baqkb1qmgl3wdybv1jyk343l4jrbjjcm0s8rbp842xm"; + version = "2.4.1"; + sha256 = "14pvmxq0dp8lwbmkvch4c6v4rblc8a2ybkm7q3hhr1qaj2pyiv0b"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive random transformers uglymemo vector @@ -270870,6 +271440,19 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-data" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unicode-data"; + version = "0.1.0.1"; + sha256 = "1rxybzbls2l732gj5ql0ccmlzsmcncaw22g0l9bc2ism0i2qf2gz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + description = "Access Unicode character database"; + license = lib.licenses.asl20; + }) {}; + "unicode-general-category" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , file-embed, hspec, QuickCheck, text @@ -273268,10 +273851,8 @@ self: { }: mkDerivation { pname = "urlencoded"; - version = "0.4.2.0"; - sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139"; - revision = "5"; - editedCabalFile = "1c9af5bzz5lkppqgd4bfynjxdqwps59n391fiw73nx3aq2nr7m0i"; + version = "0.5.0.0"; + sha256 = "0d1vj7w297cf9sk9x942za00f7ihqzcgbgjdbn7r9g0hz7qyl6nn"; libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; @@ -275386,23 +275967,6 @@ self: { }) {}; "vector-builder" = callPackage - ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-builder"; - version = "0.3.8.1"; - sha256 = "1fd0zwycp7aprj5q1c7na97a7wqivyr2fmy8ms16fh4wln62x50y"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Vector builder"; - license = lib.licenses.mit; - }) {}; - - "vector-builder_0_3_8_2" = callPackage ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector }: @@ -275417,7 +275981,6 @@ self: { ]; description = "Vector builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-bytes-instances" = callPackage @@ -281959,6 +282522,25 @@ self: { license = lib.licenses.isc; }) {}; + "witch_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit + , template-haskell, text, time + }: + mkDerivation { + pname = "witch"; + version = "0.3.4.0"; + sha256 = "0ykdd47kfan9zr656l6q3cmp3npxq44ykjci2q51bphlawiwh496"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit text time + ]; + description = "Convert values from one type into another"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -287092,6 +287674,8 @@ self: { pname = "yap"; version = "0.2"; sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; + revision = "1"; + editedCabalFile = "04q5xgnqy67klf0rzmap454gq4kwy0ly7a9ggfywg1ad15dxwb5v"; libraryHaskellDepends = [ base ]; description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = lib.licenses.bsd3; From bdf47ab600a0b2c75b1d7ef2b43195cd91ad60ca Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 14:40:38 +0900 Subject: [PATCH 0098/1522] haskell-updates: add explanation for adding new NixOS/haskell member --- pkgs/development/haskell-modules/HACKING.md | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 1161bd828f2..34678328c74 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -287,3 +287,26 @@ Here are some additional tips that didn't fit in above. - The Haskell team members generally hang out in the Matrix room [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org). + +- This is a checklist for things that need to happen when a new + member is added to the Nixpkgs Haskell team. + + 1. Add the person to the + [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) + team. You may need to ask someone in the NixOS organization + to do this, like [@domenkozar](https://github.com/domenkozar). + This gives the new member access to repos like + [cabal2nix](https://github.com/NixOS/cabal2nix). + + 1. Add the person to the `haskell` team in + [`maintainers/team-list.nix`](../../../maintainers/team-list.nix). + This team is responsible for some important packages in + [release-haskell.nix](../../top-level/release-haskell.nix). + + 1. Update the + [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) + and work the new member into the `haskell-updates` rotation. + + 1. Optionally, have the new member add themselves to the Haskell + section in [`CODEOWNERS`](../../../.github/CODEOWNERS). This + will cause them to get pinged on most Haskell-related PRs. From b939816cb7a447e8586e8e9e5bfcc122f39d6ed8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 14:47:22 +0900 Subject: [PATCH 0099/1522] maintainers/team-list.nix: add expipiplus1 to the haskell team --- maintainers/team-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 939cf159212..a39567f572c 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -114,8 +114,9 @@ with lib.maintainers; { haskell = { members = [ - maralorn cdepillabout + expipiplus1 + maralorn sternenseemann ]; scope = "Maintain Haskell packages and infrastructure."; From 62b7217ee2c945963e1af942f6745d7470d7f3b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 21:05:25 +0200 Subject: [PATCH 0100/1522] python3Packages.iso8601: 0.1.14 -> 0.1.16 --- pkgs/development/python-modules/iso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index d0a74f400bb..3a255ac047e 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "iso8601"; - version = "0.1.14"; + version = "0.1.16"; src = fetchPypi { inherit pname version; - sha256 = "8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79"; + sha256 = "sha256-NlMvd8yABZTo8WZB7a5/G695MvBdjlCFRblfxTxtyFs="; }; checkInputs = [ From 0c2e21bc2b6b332ba00217812554290170db7593 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Jul 2021 09:31:42 +0000 Subject: [PATCH 0101/1522] factorio: 1.1.35 -> 1.1.36 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 98c58191f16..8a5a4d3899a 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_alpha_x64-1.1.35.tar.xz", + "name": "factorio_alpha_x64-1.1.36.tar.xz", "needsAuth": true, - "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", + "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", + "version": "1.1.36" } }, "demo": { @@ -46,12 +46,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_headless_x64-1.1.35.tar.xz", + "name": "factorio_headless_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", + "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/headless/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/headless/linux64", + "version": "1.1.36" } } } From 1669ae6a68532695ce8539a50d3b259a24fbcc93 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Jul 2021 09:32:43 +0000 Subject: [PATCH 0102/1522] factorio-demo: 1.1.35 -> 1.1.36 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 8a5a4d3899a..500181ff70e 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -28,12 +28,12 @@ "version": "1.1.35" }, "stable": { - "name": "factorio_demo_x64-1.1.35.tar.xz", + "name": "factorio_demo_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", + "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/demo/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/demo/linux64", + "version": "1.1.36" } }, "headless": { From cd1fedf77b8ca85f559d93c847e53eea5ebedc6c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 19:21:38 +0900 Subject: [PATCH 0103/1522] git-annex: bump hash for latest version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9594c0788c7..09943b46e46 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0nvaaba06dgkl2kfq6ldmj0v6mm2dh7wfky6lsxxy5kskbncyqjr"; + sha256 = "0jnxh12vkrssz0lj4fpkqw7nxwyc1kisvvpm85cd4zf525m5sgg3"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From b1aca54121a42ed656b8445afc01cf37bf7a322a Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 19:31:05 +0900 Subject: [PATCH 0104/1522] all-cabal-hashes: 2021-07-17T04:19:10Z -> 2021-07-17T11:52:29Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 4af4c43fbc2..d785554cad3 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3076b20df211e808ff2f1571ffe7f260e6174124", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3076b20df211e808ff2f1571ffe7f260e6174124.tar.gz", - "sha256": "11qpvgvl8skv2ckr6x6a4mlm1i9ng21iylw3v2ig009w8af46qhn", - "msg": "Update from Hackage at 2021-07-17T04:19:10Z" + "commit": "f57720a9e3e77366ac003b0eb65ae17372c39979", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f57720a9e3e77366ac003b0eb65ae17372c39979.tar.gz", + "sha256": "1lqghm6ximlfb5jrdf5399wj3jwmry6znqyz46hhn2w26li9m6jc", + "msg": "Update from Hackage at 2021-07-17T11:52:29Z" } From 627eee1f66f115ac1be9ac1afe2963d39d02b840 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 17 Jul 2021 21:47:45 +0900 Subject: [PATCH 0105/1522] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 64 ++++++++++++++----- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 11f6931574a..38aa561bead 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45328,6 +45328,8 @@ self: { pname = "bound"; version = "2.0.3"; sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; + revision = "1"; + editedCabalFile = "16hy32ccjrch3zw45282m630p5hk1hziapmmk8a5nis2mlkq6z2h"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -80852,8 +80854,8 @@ self: { }: mkDerivation { pname = "dynamic-pipeline"; - version = "0.3.0.0"; - sha256 = "1izwdj4wdvrdqhd0zy2z1bv1yj1nbn8narwcv8ky77iakid6wzv5"; + version = "0.3.1.1"; + sha256 = "1ypri47m7xn84lbcn0wj0z3l9y1a51kh5ldmgnza236d9hffw343"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197948,6 +197950,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-formatting" = callPackage + ({ mkDerivation, base, formatting, path }: + mkDerivation { + pname = "path-formatting"; + version = "0.1.0.0"; + sha256 = "0jfl2ggvghnkwhp8p8r1dswjb5dpng8hifzhjh2a982bmlsln9c6"; + libraryHaskellDepends = [ base formatting path ]; + description = "Formatting for path"; + license = lib.licenses.mit; + }) {}; + "path-io" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat @@ -221447,27 +221460,26 @@ self: { }) {}; "rel8" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, contravariant, hasql, hedgehog, lifted-base - , monad-control, opaleye, profunctors, scientific, semialign + ({ mkDerivation, aeson, base, bifunctors, bytestring + , case-insensitive, comonad, containers, contravariant, hasql + , hasql-transaction, hedgehog, mmorph, opaleye, pretty + , product-profunctors, profunctors, scientific, semialign , semigroupoids, tasty, tasty-hedgehog, text, these, time , tmp-postgres, transformers, uuid }: mkDerivation { pname = "rel8"; - version = "1.0.0.1"; - sha256 = "1kwvib3chqw5xrz6v7z0jy75mgyhqqb755xzn02zz2hvjwfcqc6v"; - revision = "1"; - editedCabalFile = "04lq11nxq5n6l6hlgqi78xbfknvx7s5mycwzcp2a0p99kcn3x9a4"; + version = "1.1.0.0"; + sha256 = "1p67r6l89hnl54sgqxsy5w66cx4xxwcxkidm9n1fbc2gzkd4dzbm"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive contravariant hasql opaleye - profunctors scientific semialign semigroupoids text these time - transformers uuid + aeson base bifunctors bytestring case-insensitive comonad + contravariant hasql opaleye pretty product-profunctors profunctors + scientific semialign semigroupoids text these time uuid ]; testHaskellDepends = [ - base bytestring case-insensitive containers hasql hedgehog - lifted-base monad-control scientific tasty tasty-hedgehog text time - tmp-postgres uuid + base bytestring case-insensitive containers hasql hasql-transaction + hedgehog mmorph scientific tasty tasty-hedgehog text time + tmp-postgres transformers uuid ]; description = "Hey! Hey! Can u rel8?"; license = lib.licenses.bsd3; @@ -238800,6 +238812,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-media-timestamp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "simple-media-timestamp"; + version = "0.2.0.0"; + sha256 = "1v4svw4s07m538dyma2bmfxkpw8mr6z8gh6cs75cvgpjzbvxqvs1"; + libraryHaskellDepends = [ base ]; + description = "A very simple timestamp"; + license = lib.licenses.mit; + }) {}; + + "simple-media-timestamp-formatting" = callPackage + ({ mkDerivation, base, formatting, simple-media-timestamp }: + mkDerivation { + pname = "simple-media-timestamp-formatting"; + version = "0.1.0.0"; + sha256 = "05km174zc9as8aa4l18fgwnjl19068kqr1chvmnn7r3b8ms00z57"; + libraryHaskellDepends = [ base formatting simple-media-timestamp ]; + description = "Formatting for simple-media-timestamp"; + license = lib.licenses.mit; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { From e7ab66c5d35f6c0d8cca3da1f40f0f39ce39b09c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 17 Jul 2021 21:30:18 +0200 Subject: [PATCH 0106/1522] rtmpdump: support cross-compilation --- pkgs/tools/video/rtmpdump/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 3f71f8abc5a..720bf7732c8 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -28,7 +28,10 @@ stdenv.mkDerivation { }) ]; - makeFlags = [ "prefix=$(out)" ] + makeFlags = [ + "prefix=$(out)" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" From dc48d23a0f578d069f10d13671abe552d85a2050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 17 Jul 2021 23:38:46 +0200 Subject: [PATCH 0107/1522] Convert phases that contain ":" to dont* = true --- pkgs/development/python-modules/bootstrapped-pip/2.nix | 2 +- pkgs/development/python-modules/bootstrapped-pip/default.nix | 2 +- pkgs/misc/vim-plugins/build-vim-plugin.nix | 4 ++-- .../darwin/apple-source-releases/libunwind/default.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix index 5a6333d656a..2d06b44b507 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/2.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/2.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ python ]; - buildPhase = ":"; + dontBuild = true; installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 42eb1cccee3..81aca3f3c57 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ python ]; - buildPhase = ":"; + dontBuild = true; installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index 6960b790539..c490f943d43 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -54,7 +54,7 @@ rec { })); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ - buildPhase = ":"; - configurePhase =":"; + dontBuild = true; + dontConfigure = true; } // attrs); } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 5021d3cd7fe..0d378f6089f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,7 +1,7 @@ { lib, appleDerivation }: appleDerivation { - buildPhase = ":"; + dontBuild = true; # install headers only installPhase = '' From f271ec3880550606f41d1cd09cf13d6d04c8887b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 17 Jul 2021 22:42:54 +0200 Subject: [PATCH 0108/1522] rtmpdump: remove ? null from inputs, format, fix version number --- pkgs/tools/video/rtmpdump/default.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 3f71f8abc5a..664866f7f2d 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchgit, fetchpatch, zlib -, gnutlsSupport ? false, gnutls ? null, nettle ? null -, opensslSupport ? true, openssl ? null +{ lib +, stdenv +, fetchgit +, fetchpatch +, zlib +, gnutlsSupport ? false +, gnutls +, nettle +, opensslSupport ? true +, openssl }: -# Must have an ssl library enabled assert (gnutlsSupport || opensslSupport); -assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport; -assert opensslSupport -> openssl != null && !gnutlsSupport; with lib; stdenv.mkDerivation { pname = "rtmpdump"; - version = "2019-03-30"; + version = "unstable-2019-03-30"; src = fetchgit { url = "git://git.ffmpeg.org/rtmpdump"; @@ -44,9 +48,9 @@ stdenv.mkDerivation { meta = { description = "Toolkit for RTMP streams"; - homepage = "http://rtmpdump.mplayerhq.hu/"; - license = licenses.gpl2; - platforms = platforms.unix; + homepage = "https://rtmpdump.mplayerhq.hu/"; + license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; } From 0f2eefd0bdd85779b7b4fce1fe4e203a58334b8b Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 17 Jul 2021 22:28:42 +0200 Subject: [PATCH 0109/1522] gsettings-desktop-schemas: support cross-compilation --- .../libraries/gsettings-desktop-schemas/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index e9814a43b24..b4dc200f980 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -19,17 +19,19 @@ stdenv.mkDerivation rec { sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; }; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ glib meson ninja pkg-config python3 + gobject-introspection ]; - buildInputs = [ - glib - gobject-introspection + mesonFlags = [ + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; postPatch = '' From fca4c19c2b5400c5ba241db307efe99f01f59ffa Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 8 Jul 2021 13:47:23 +0300 Subject: [PATCH 0110/1522] haskellPackages: allow hnix-store-{core,remote} 0.5 These were blocked due to mutual desigion during me<>`sternenseemann` discussion. https://github.com/haskell-nix/hnix/issues/952 In short: I shipped my own work (to support GHC 9.0) in the 0.5 releases of `hnix-store-{core,remote}`. These packages are really used only by `hnix` itself, and instead of maintaining them in Nixpkgs & reacting on `hnix` release, we decided to hold them back & switch to these versions when `hnix` provides support for them. I just (today) released `hnix` 0.14 & it requires `hnix-store-{core,remote}` 0.5. If you would look at dependency tree: https://packdeps.haskellers.com/reverse/hnix-store-core https://packdeps.haskellers.com/reverse/hnix-store-remote It shows that `hnix` currently is the only alive use of these projects. --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c63942afe1a..24d565e16a0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -85,9 +85,6 @@ default-package-overrides: - dual-tree < 0.2.3.0 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 - # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952 - - hnix-store-core < 0.5 - - hnix-store-remote < 0.5 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. From b254189ee679e7a923bb244176539f90b602b08b Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 8 Jul 2021 14:09:16 +0300 Subject: [PATCH 0111/1522] haskellPackages: add myself as a maintainer for packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 24d565e16a0..e1b9a35390b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -117,6 +117,10 @@ extra-packages: package-maintainers: abbradar: - Agda + Anton-Latukha: + - hnix + - hnix-store-core + - hnix-store-remote berberman: - nvfetcher - arch-web From 65cdac5e48cdd5f7b6675a54ea2a95fd4874bb49 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 8 Jul 2021 17:41:09 +0300 Subject: [PATCH 0112/1522] haskellPackages: regenerated hackage-packages.nix --- .../haskell-modules/hackage-packages.nix | 54 ++----------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38aa561bead..0df29f3b4b2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -131701,41 +131701,10 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Anton-Latukha ]; }) {}; "hnix-store-core" = callPackage - ({ mkDerivation, algebraic-graphs, attoparsec, base - , base16-bytestring, base64-bytestring, binary, bytestring, cereal - , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, directory, filepath, hashable, hspec - , lifted-base, monad-control, mtl, nix-derivation, process, saltine - , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit - , tasty-quickcheck, temporary, text, time, unix - , unordered-containers, vector - }: - mkDerivation { - pname = "hnix-store-core"; - version = "0.4.3.0"; - sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77"; - libraryHaskellDepends = [ - algebraic-graphs attoparsec base base16-bytestring - base64-bytestring bytestring cereal containers cryptohash-md5 - cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory - filepath hashable lifted-base monad-control mtl nix-derivation - saltine text time unix unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring base64-bytestring binary - bytestring containers directory filepath hspec process tasty - tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary - text unix - ]; - testToolDepends = [ tasty-discover ]; - description = "Core effects for interacting with the Nix store"; - license = lib.licenses.asl20; - }) {}; - - "hnix-store-core_0_5_0_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -131765,27 +131734,10 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Anton-Latukha ]; }) {}; "hnix-store-remote" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , hnix-store-core, mtl, network, nix-derivation, text, time - , unordered-containers - }: - mkDerivation { - pname = "hnix-store-remote"; - version = "0.4.3.1"; - sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl"; - libraryHaskellDepends = [ - attoparsec base binary bytestring containers hnix-store-core mtl - network nix-derivation text time unordered-containers - ]; - description = "Remote hnix store"; - license = lib.licenses.asl20; - }) {}; - - "hnix-store-remote_0_5_0_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , cryptonite, hnix-store-core, mtl, network, nix-derivation, text , time, unordered-containers @@ -131801,7 +131753,7 @@ self: { ]; description = "Remote hnix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Anton-Latukha ]; }) {}; "hnn" = callPackage From f93409efb946fdde8db163ccb55d9b190248a40a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 11:16:29 +0200 Subject: [PATCH 0113/1522] haskellPackages.hnix: build with relude 1.0.0.1 and semialign 1.2 hnix needs these versions since 0.13, but we previously patched it to use the versions tracked in stackage because that reduces the risk of multiple versions of a package being propagated in the dependency tree and breaking a build. One major release later, patching hnix has become quite cumbersome, so we'll bite the bullet for now and return to this approach if any problems come up. --- .../haskell-modules/configuration-common.nix | 45 +++---------------- 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 09943b46e46..872a7786c5c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -178,48 +178,13 @@ self: super: { digit = doJailbreak super.digit; hnix = generateOptparseApplicativeCompletion "hnix" - (overrideCabal super.hnix (drv: { + (overrideCabal (super.hnix.override { + # needs newer version of relude and semialign than stackage has + relude = self.relude_1_0_0_1; + semialign = self.semialign_1_2; + }) (drv: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` doCheck = false; - # 2021-05-12: Revert a few dependency cleanups which depend on release - # that are not in stackage yet: - # * Depend on semialign-indexed for Data.Semialign.Indexed - # (remove when semialign >= 1.2 in stackage) - # * Readd dependencies to text and unordered-containers. - # (remove when relude >= 1.0.0.0 is in stackage, see - # https://github.com/haskell-nix/hnix/issues/933) - libraryHaskellDepends = [ - self.semialign-indexed - ] ++ drv.libraryHaskellDepends; - patches = [ - # depend on semialign-indexed again - (pkgs.fetchpatch { - url = "https://github.com/haskell-nix/hnix/commit/16fc342a4f2974f855968472252cd9274609f177.patch"; - sha256 = "0gm4gy3jpn4dqnrhnqlsavfpw9c1j1xa8002v54knnlw6vpk9niy"; - revert = true; - }) - # depend on text again - (pkgs.fetchpatch { - url = "https://github.com/haskell-nix/hnix/commit/73057618576e86bb87dfd42f62b855d24bbdf469.patch"; - sha256 = "03cyk96d5ad362i1pnz9bs8ifr84kpv8phnr628gys4j6a0bqwzc"; - revert = true; - }) - # depend on unordered-containers again - (pkgs.fetchpatch { - url = "https://github.com/haskell-nix/hnix/commit/70643481883ed448b51221a030a76026fb5eb731.patch"; - sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; - revert = true; - }) - # allow relude < 1.0 again - (pkgs.fetchpatch { - url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch"; - sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86"; - revert = true; - }) - ] ++ (drv.patches or []); - # make sure patches are not broken by cabal file revisions - revision = null; - editedCabalFile = null; })); # Fails for non-obvious reasons while attempting to use doctest. From ff83117733481f168602a3903f360ebecaa328a8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 11:40:50 +0200 Subject: [PATCH 0114/1522] haskellPackages.nix-linter: unbreak for hnix 0.14 Change to pname is necessary in order to not confuse jailbreak-cabal. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/tools/analysis/nix-linter/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 872a7786c5c..c3607406f3d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1921,4 +1921,8 @@ EOT assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; doJailbreak super.graphql; + # Too strict bounds on hnix + # https://github.com/Synthetica9/nix-linter/issues/56 + nix-linter = doJailbreak super.nix-linter; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index f01886c883b..6d758c2c30b 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -20,8 +20,8 @@ }: mkDerivation rec { - pname = "nix-linter-unstable"; - version = "2021-06-16"; + pname = "nix-linter"; + version = "unstable-2021-06-16"; src = fetchFromGitHub { owner = "Synthetica9"; From db84219ded13e3b5276c6a0a2b02b9c7be697fe0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 12:05:34 +0200 Subject: [PATCH 0115/1522] haskellPackages.{rel8,tmp-postgres}: unbreak 1.1.0.0 brings us compatibility with opaleye >= 7.3.0.0, so we can get rid of the old version as well. tmp-postgres was incorrectly marked as broken (maybe due to a flaky failure) and can be unmarked. --- .../haskell-modules/configuration-common.nix | 6 ---- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 31 ------------------- 4 files changed, 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 09943b46e46..0ca7c092112 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1944,12 +1944,6 @@ EOT # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 matrix-client = dontCheck super.matrix-client; - # Flakey tests - # upstream https://github.com/circuithub/rel8/issues/86 - rel8 = dontCheck (super.rel8.override { - opaleye = dontCheck super.opaleye_0_7_2_0; - }); - # Release 1.0.0.0 added version bounds (was unrestricted before), # but with too strict lower bounds for our lts-18. graphql = assert pkgs.lib.versionOlder self.parser-combinators.version "1.3.0"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 302c2722ee0..c02f6b4dc18 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4805,7 +4805,6 @@ broken-packages: - Titim - tkhs - tkyprof - - tmp-postgres - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c63942afe1a..45d0bdcd0cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,7 +115,6 @@ extra-packages: - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 - - opaleye < 0.7.3.0 # 2021-07-11: for rel8 <= 1.0.0.1, see https://github.com/circuithub/rel8/issues/95#issuecomment-877616118 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38aa561bead..68c7a075a83 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -191329,35 +191329,6 @@ self: { broken = true; }) {}; - "opaleye_0_7_2_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void - }: - mkDerivation { - pname = "opaleye"; - version = "0.7.2.0"; - sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time time-locale-compat - transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "opaleye" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec @@ -264395,8 +264366,6 @@ self: { ]; description = "Start and stop a temporary postgres"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmpl" = callPackage From a08ee2292caa8a676332c695d7d46bd38c235931 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 18 Jul 2021 00:08:00 +0100 Subject: [PATCH 0116/1522] rsync: add patch for CVE-2020-14387 --- pkgs/applications/networking/sync/rsync/base.nix | 9 ++++++++- pkgs/applications/networking/sync/rsync/default.nix | 7 ++++--- pkgs/applications/networking/sync/rsync/rrsync.nix | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 3479458088e..39ce5d3a7ea 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl }: +{ lib, fetchurl, fetchpatch }: rec { version = "3.2.3"; @@ -12,6 +12,13 @@ rec { url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; }; + extraPatches = [ + (fetchpatch { + name = "CVE-2020-14387.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd"; + sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x"; + }) + ]; meta = with lib; { description = "Fast incremental file transfer utility"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 54417e6ef4b..0aa250ca265 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt +{ lib, stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt , enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null , enableLZ4 ? true, lz4 ? null , enableOpenSSL ? true, openssl ? null @@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null; assert enableZstd -> zstd != null; let - base = import ./base.nix { inherit lib fetchurl; }; + base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in stdenv.mkDerivation rec { name = "rsync-${base.version}"; @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" + ++ base.extraPatches; buildInputs = [libiconv zlib popt] ++ lib.optional enableACLs acl diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 83eb4658d2f..8ed09c190af 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, perl, rsync }: +{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }: let - base = import ./base.nix { inherit lib fetchurl; }; + base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in stdenv.mkDerivation { name = "rrsync-${base.version}"; @@ -15,6 +15,8 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; + patches = base.extraPatches; + postPatch = '' substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync ''; From 56bef7d298bf86987d6ac2fd12ed53a132f95265 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 19 Jun 2021 17:36:57 +0200 Subject: [PATCH 0117/1522] networkmanager: nixpkgs-fmt, reorder flags flag ordering is now based on how the build system presents them --- .../networking/networkmanager/default.nix | 149 ++++++++++++++---- 1 file changed, 115 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 4f3b7a3204d..a61c819a7c4 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,14 +1,57 @@ -{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala -, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit -, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt -, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 -, openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }: +{ lib +, stdenv +, fetchurl +, substituteAll +, intltool +, pkg-config +, fetchpatch +, dbus +, gnome +, systemd +, libuuid +, polkit +, gnutls +, ppp +, dhcp +, iptables +, python3 +, vala +, libgcrypt +, dnsmasq +, bluez5 +, readline +, libselinux +, audit +, gobject-introspection +, modemmanager +, openresolv +, libndp +, newt +, libsoup +, ethtool +, gnused +, iputils +, kmod +, jansson +, gtk-doc +, libxslt +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, openconnect +, curl +, meson +, ninja +, libpsl +, mobile-broadband-provider-info +, runtimeShell +}: let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "networkmanager"; version = "1.30.4"; @@ -23,34 +66,45 @@ in stdenv.mkDerivation rec { # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. mesonFlags = [ - "-Ddhclient=${dhcp}/bin/dhclient" + # System paths + "--sysconfdir=/etc" + "--localstatedir=/var" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + # to enable link-local connections + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Ddbus_conf_dir=${placeholder "out"}/share/dbus-1/system.d" + "-Dkernel_firmware_dir=/run/current-system/firmware" + + # Platform + "-Dsession_tracking=systemd" + "-Dlibaudit=yes-disabled-by-default" + "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" + + # Features + # Allow using iwd when configured to do so + "-Diwd=true" + "-Dpppd=${ppp}/bin/pppd" + "-Diptables=${iptables}/bin/iptables" + "-Dmodem_manager=true" + "-Dnmtui=true" "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" + "-Dqt=false" + + # Handlers + "-Dresolvconf=${openresolv}/bin/resolvconf" + + # DHCP clients + "-Ddhclient=${dhcp}/bin/dhclient" # Upstream prefers dhclient, so don't add dhcpcd to the closure "-Ddhcpcd=no" "-Ddhcpcanon=no" - "-Dpppd=${ppp}/bin/pppd" - "-Diptables=${iptables}/bin/iptables" - # to enable link-local connections - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dresolvconf=${openresolv}/bin/resolvconf" - "-Ddbus_conf_dir=${placeholder "out"}/share/dbus-1/system.d" - "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dkernel_firmware_dir=/run/current-system/firmware" - "--sysconfdir=/etc" - "--localstatedir=/var" - "-Dcrypto=gnutls" - "-Dsession_tracking=systemd" - "-Dmodem_manager=true" - "-Dnmtui=true" + + # Miscellaneous "-Ddocs=true" - "-Dtests=no" - "-Dqt=false" - "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" - # Allow using iwd when configured to do so - "-Diwd=true" - "-Dlibaudit=yes-disabled-by-default" # We don't use firewalld in NixOS "-Dfirewalld_zone=false" + "-Dtests=no" + "-Dcrypto=gnutls" ]; patches = [ @@ -66,17 +120,44 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info - bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson + systemd + libselinux + audit + libpsl + libuuid + polkit + ppp + libndp + curl + mobile-broadband-provider-info + bluez5 + dnsmasq + gobject-introspection + modemmanager + readline + newt + libsoup + jansson ]; propagatedBuildInputs = [ gnutls libgcrypt ]; nativeBuildInputs = [ - meson ninja intltool pkg-config - vala gobject-introspection dbus + meson + ninja + intltool + pkg-config + vala + gobject-introspection + dbus # Docs - gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs + gtk-doc + libxslt + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + pythonForDocs ]; doCheck = false; # requires /sys, the net From 12a3812314424748b5c57317b2d755a918af3386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 6 Jul 2021 07:02:20 +0200 Subject: [PATCH 0118/1522] prusa-slicer: 2.3.1 -> 2.3.2 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index a6e81375de5..9b7a0ae6519 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.3.1"; + version = "2.3.2"; nativeBuildInputs = [ cmake @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "1lyaxc9nha1cd8p35iam1k1pikp9kfx0fj1l6vb1xb8pgqp02jnn"; + sha256 = "1r1nw1v9lxdia615xf7f95my7wpk253c6jxlnq0ic3aakr47nmx9"; rev = "version_${version}"; }; From f100dd6ce0170c220c617e9466bb72977fcf2220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 18 Jul 2021 19:59:26 +0200 Subject: [PATCH 0119/1522] prusa-slicer: 2.3.2 -> 2.3.3 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 9b7a0ae6519..88086ef1363 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.3.2"; + version = "2.3.3"; nativeBuildInputs = [ cmake @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "1r1nw1v9lxdia615xf7f95my7wpk253c6jxlnq0ic3aakr47nmx9"; + sha256 = "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm"; rev = "version_${version}"; }; From 937dae1dad9437d59c175d7c05f3e0bbc860bc41 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 18 Jul 2021 14:24:07 +0200 Subject: [PATCH 0120/1522] imagemagick: 7.1.0-2 -> 7.1.0-4 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 0fd76235f52..31611063389 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-2"; + version = "7.1.0-4"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-0nTz9UBspROrNj72amyZmFYK/y9Xg4+qNt4raZiK3AI="; + sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 4fc50527f8830b7b36a4a4d36d3a27601b9cca74 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 14:49:47 +0900 Subject: [PATCH 0121/1522] stdenv: typo --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 066ef6ed9eb..2a1e0cfc6de 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -487,7 +487,7 @@ activatePackage() { # build platform are included here. That would be `depsBuild*`, # and legacy `nativeBuildInputs`, in general. If we aren't cross # compiling, however, everything can be put on the PATH. To ease - # the transition, we do include everything in thatcase. + # the transition, we do include everything in that case. # # TODO(@Ericson2314): Don't special-case native compilation if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then From f3d9711f050ede32d9180c74eee18da64ae2cbf8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 19 Jul 2021 14:50:01 +0900 Subject: [PATCH 0122/1522] stdenv: add link to clarify --- pkgs/build-support/setup-hooks/auto-patchelf.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 511371931de..70b1fc802b5 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -29,6 +29,7 @@ isExecutable() { isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" # not using grep -q, because it can cause Broken pipe + # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag [ -n "$isExeResult" ] } From e4e631ebb81da8b76f9159736b63c727c05aa4db Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Jul 2021 12:51:53 +0200 Subject: [PATCH 0123/1522] applications/networking: /s/name/pname&version/ --- .../apache-directory-studio/default.nix | 28 +++++++++---------- .../browsers/captive-browser/default.nix | 4 +-- .../browsers/chromium/ungoogled.nix | 2 +- .../browsers/firefox-bin/default.nix | 6 ++-- .../networking/browsers/vivaldi/widevine.nix | 2 +- .../networking/cluster/kubectl/default.nix | 3 +- .../networking/cluster/kuttl/default.nix | 1 - .../networking/cluster/pig/default.nix | 6 ++-- pkgs/applications/networking/gns3/gui.nix | 2 +- .../networking/ids/daq/default.nix | 7 +++-- .../instant-messengers/bitlbee/default.nix | 5 ++-- .../instant-messengers/gtmess/default.nix | 7 +++-- .../pidgin-plugins/otr/default.nix | 5 ++-- .../pidgin-plugins/pidgin-osd/default.nix | 5 ++-- .../purple-facebook/default.nix | 5 ++-- .../purple-plugin-pack/default.nix | 5 ++-- .../instant-messengers/ratox/default.nix | 3 +- .../silc-client/default.nix | 10 +++---- .../telepathy/gabble/default.nix | 5 ++-- .../telepathy/haze/default.nix | 4 +-- .../telepathy/logger/default.nix | 6 ++-- .../telepathy/salut/default.nix | 4 +-- .../networking/iptraf/default.nix | 7 +++-- .../networking/irc/ii/default.nix | 5 ++-- .../networking/irc/quassel/default.nix | 2 +- .../scripts/weechat-matrix-bridge/default.nix | 3 +- .../networking/mailreaders/mmh/default.nix | 4 +-- .../mailreaders/msgviewer/default.nix | 15 ++++------ .../networking/mumble/overlay.nix | 3 +- .../networking/offrss/default.nix | 7 +++-- .../networking/p2p/opentracker/default.nix | 3 +- .../networking/pcloud/default.nix | 5 ++-- .../networking/siproxd/default.nix | 5 ++-- .../networking/sniffers/etherape/default.nix | 5 ++-- .../networking/sync/rsync/default.nix | 3 +- .../networking/sync/rsync/rrsync.nix | 3 +- pkgs/applications/networking/znc/modules.nix | 20 ++++++------- 37 files changed, 113 insertions(+), 102 deletions(-) diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 18f9a7990c3..970949d691e 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,6 +1,18 @@ { lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: -let +stdenv.mkDerivation rec { + pname = "apache-directory-studio"; + version = "2.0.0-M15"; + versionWithDate = "2.0.0.v20200411-M15"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz"; + sha256 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37"; + } + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + desktopItem = makeDesktopItem { name = "apache-directory-studio"; exec = "ApacheDirectoryStudio"; @@ -10,20 +22,6 @@ let genericName = "Apache Directory Studio"; categories = "Java;Network"; }; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; -in -stdenv.mkDerivation rec { - pname = "apache-directory-studio"; - inherit version; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz"; - sha256 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37"; - } - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; buildInputs = [ glib libsecret ]; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index b302be4e013..335223883fa 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "captive-browser"; + pname = "captive-browser"; version = "2019-04-16"; - goPackagePath = name; + goPackagePath = pname; src = fetchFromGitHub { owner = "FiloSottile"; diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 299b19f2f4f..a8e84dae196 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "ungoogled-chromium-${version}"; + pname = "ungoogled-chromium"; version = rev; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d16c625e2db..5ef51028136 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -80,12 +80,12 @@ let source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - name = "firefox-${channel}-bin-unwrapped-${version}"; + pname = "firefox-${channel}-bin-unwrapped"; in stdenv.mkDerivation { - inherit name; + inherit pname version; src = fetchurl { inherit (source) url sha256; }; @@ -189,7 +189,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 81c95418e69..3b0dbe8e936 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "widevine"; + pname = "widevine"; version = "4.10.1582.1"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index c550a0e2f2b..fec93d8878e 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -1,7 +1,8 @@ { stdenv, kubernetes, installShellFiles }: stdenv.mkDerivation { - name = "kubectl-${kubernetes.version}"; + pname = "kubectl"; + version = kubernetes.version; # kubectl is currently part of the main distribution but will eventially be # split out (see homepage) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 0c8f7f1574c..dfa06cc6968 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchFromGitHub}: buildGoModule rec { - name = "kuttl"; pname = "kuttl"; version = "0.9.0"; cli = "kubectl-kuttl"; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index ded8a2ea493..a4270fbcea3 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: stdenv.mkDerivation rec { - - name = "pig-0.17.0"; + pname = "pig"; + version = "0.17.0"; src = fetchurl { - url = "mirror://apache/pig/${name}/${name}.tar.gz"; + url = "mirror://apache/pig/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd"; }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 5f5594c0537..a88ff36a8ca 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -10,8 +10,8 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; }; in python.pkgs.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "gns3-gui"; + inherit version; src = fetchFromGitHub { owner = "GNS3"; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 26ae9e7a581..dc40337bd72 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.2.2"; + pname = "daq"; + version = "2.2.2"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index c5a718c3a70..4ecc449fe85 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -5,10 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "bitlbee-3.6"; + pname = "bitlbee"; + version = "3.6"; src = fetchurl { - url = "mirror://bitlbee/src/${name}.tar.gz"; + url = "mirror://bitlbee/src/bitlbee-${version}.tar.gz"; sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index fec5462c47a..3474e572931 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}: -stdenv.mkDerivation { - name = "gtmess-0.97"; +stdenv.mkDerivation rec { + pname = "gtmess"; + version = "0.97"; src = fetchurl { - url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz"; + url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz"; sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c7bad49ceba..52204d5c79c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.2"; + pname = "pidgin-otr"; + version = "4.0.2"; src = fetchurl { - url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; + url = "https://otr.cypherpunks.ca/pidgin-otr-${version}.tar.gz"; sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index 4c7cb2c46bf..d50a3ed5c30 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -2,11 +2,12 @@ , autoreconfHook } : stdenv.mkDerivation rec { - name = "pidgin-osd-0.2.0"; + pname = "pidgin-osd"; + version = "0.2.0"; src = fetchFromGitHub { owner = "edanaher"; repo = "pidgin-osd"; - rev = name; + rev = "${pname}-${version}"; sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index a45f91ec57f..b1078c864de 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -10,12 +10,13 @@ let }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.5"; + pname = "purple-facebook"; + version = "0.9.5"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.5-9ff9acf9fa14"; + rev = "v${version}-9ff9acf9fa14"; sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index edc047c78ba..ef9ce5bca74 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, pidgin, intltool, python } : stdenv.mkDerivation rec { - name = "purple-plugin-pack-2.7.0"; + pname = "purple-plugin-pack"; + version = "2.7.0"; src = fetchurl { - url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2"; sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 1851a60216b..58cd952edbb 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -7,7 +7,8 @@ let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); in stdenv.mkDerivation { - name = "ratox-0.4.20180303"; + pname = "ratox"; + version = "0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 83cc80ccaf0..417cb4dbb84 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -4,14 +4,12 @@ # Enabling the plugin and using it with a recent irssi, segafults on join: # http://marc.info/?l=silc-devel&m=125610477802211 -let - basename = "silc-client-1.1.11"; -in -stdenv.mkDerivation { - name = basename + lib.optionalString enablePlugin "-irssi-plugin"; +stdenv.mkDerivation rec { + pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin"; + version = "1.1.11"; src = fetchurl { - url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; + url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2"; sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index deb01f1ef22..3b1775a7ba8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,10 +2,11 @@ , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.4"; + pname = "telepathy-gabble"; + version = "0.18.4"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 11acf05c19e..27df1273c08 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "telepathy-haze"; - name = "${pname}-0.8.0"; + version = "0.8.0"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index a6b1a5256f4..ad7a588d9ce 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -2,11 +2,11 @@ , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { - project = "telepathy-logger"; - name = "${project}-0.8.2"; + pname = "telepathy-logger"; + version = "0.8.2"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2"; sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 38ee5579b5a..882fae1c3b5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.8.1"; + version = "0.8.1"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz"; sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index 344af6a0312..2881991bf82 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "iptraf-3.0.1"; +stdenv.mkDerivation rec { + pname = "iptraf"; + version = "3.0.1"; src = fetchurl { - url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz"; + url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz"; sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 22d03af0faf..93056ef399f 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.8"; + pname = "ii"; + version = "1.8"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index b72e28929e3..7869333479e 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -32,7 +32,7 @@ let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { - name = "quassel${tag}-${version}"; + pname = "quassel${tag}"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 24cf26fbaf5..282603f9924 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2018-11-19"; + pname = "weechat-matrix-bridge"; + version = "unstable-2018-11-19"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 5fcc060ffbf..fe74e922230 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }: let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e"; in stdenv.mkDerivation rec { - pname = "mmh-unstable"; - version = "2019-09-08"; + pname = "mmh"; + version = "unstable-2019-09-08"; src = fetchurl { url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 646fa4e2050..5e9e17b47fd 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: -let +stdenv.mkDerivation rec { version = "1.9"; - name = "msgviewer-${version}"; - uname = "MSGViewer-${version}"; - -in stdenv.mkDerivation { - inherit name; + pname = "msgviewer"; + uname = "MSGViewer"; src = fetchurl { - url = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip"; + url = "mirror://sourceforge/msgviewer/${uname}-${version}/${uname}-${version}.zip"; sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz"; }; @@ -17,8 +14,8 @@ in stdenv.mkDerivation { dir=$out/lib/msgviewer mkdir -p $out/bin $dir unzip $src -d $dir - mv $dir/${uname}/* $dir - rmdir $dir/${uname} + mv $dir/${uname}-${version}/* $dir + rmdir $dir/${uname}-${version} cat <<_EOF > $out/bin/msgviewer #!${runtimeShell} -eu exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index bc960ac12d4..7cf5b3a7551 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -4,7 +4,8 @@ let binPath = lib.makeBinPath [ which file ]; in stdenv.mkDerivation { - name = "mumble-overlay-${mumble.version}"; + pname = "mumble-overlay"; + version = mumble.version; inherit (mumble) src; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index a6816d042e0..19dba8d5fae 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, curl, libmrss, podofo, libiconv }: -stdenv.mkDerivation { - name = "offrss-1.3"; +stdenv.mkDerivation rec { + pname = "offrss"; + version = "1.3"; installPhase = '' mkdir -p $out/bin @@ -22,7 +23,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz"; + url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${version}.tar.gz"; sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index f08e5c42e1d..ac0aeba9721 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libowfat, zlib, nixosTests }: stdenv.mkDerivation { - name = "opentracker-2018-05-26"; + pname = "opentracker"; + version = "unstable-2018-05-26"; src = fetchgit { url = "https://erdgeist.org/gitweb/opentracker"; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index e1936bf06a7..6cd05a7c318 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -28,16 +28,15 @@ let pname = "pcloud"; version = "1.9.3"; code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy"; - name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { - url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip"; + url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU="; }; appimageContents = appimageTools.extractType2 { - inherit name; + name = "${pname}-${version}"; src = "${src}/pcloud"; }; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 2a91eb35d80..742e6eab858 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { - name = "siproxd-0.8.2"; + pname = "siproxd"; + version = "0.8.2"; src = fetchurl { - url = "mirror://sourceforge/siproxd/${name}.tar.gz"; + url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz"; sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; }; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index db54231ecf2..067175bdb48 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,9 +2,10 @@ popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.20"; + pname = "etherape"; + version = "0.9.20"; src = fetchurl { - url = "mirror://sourceforge/etherape/${name}.tar.gz"; + url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz"; sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y="; }; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 54417e6ef4b..239ea651854 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -18,7 +18,8 @@ let base = import ./base.nix { inherit lib fetchurl; }; in stdenv.mkDerivation rec { - name = "rsync-${base.version}"; + pname = "rsync"; + version = base.version; mainSrc = base.src; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 83eb4658d2f..d904794d948 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -4,7 +4,8 @@ let base = import ./base.nix { inherit lib fetchurl; }; in stdenv.mkDerivation { - name = "rrsync-${base.version}"; + pname = "rrsync"; + version = base.version; src = base.src; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index a72618d935d..562372b1bb7 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -2,7 +2,7 @@ let zncDerivation = a@{ - name, src, module_name, + pname, src, module_name, buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... } : stdenv.mkDerivation (a // { @@ -18,7 +18,7 @@ let in { backlog = zncDerivation rec { - name = "znc-backlog-${version}"; + pname = "znc-backlog"; version = "git-2017-06-13"; module_name = "backlog"; @@ -38,7 +38,7 @@ in { }; clientbuffer = zncDerivation rec { - name = "znc-clientbuffer-${version}"; + pname = "znc-clientbuffer"; version = "git-2020-04-24"; module_name = "clientbuffer"; @@ -58,7 +58,7 @@ in { }; clientaway = zncDerivation rec { - name = "znc-clientaway-${version}"; + pname = "znc-clientaway"; version = "git-2017-04-28"; module_name = "clientaway"; @@ -78,7 +78,7 @@ in { }; fish = zncDerivation rec { - name = "znc-fish-${version}"; + pname = "znc-fish"; version = "git-2017-06-26"; module_name = "fish"; @@ -98,7 +98,7 @@ in { }; ignore = zncDerivation rec { - name = "znc-ignore-${version}"; + pname = "znc-ignore"; version = "git-2017-04-28"; module_name = "ignore"; @@ -118,7 +118,7 @@ in { }; palaver = zncDerivation rec { - name = "znc-palaver-${version}"; + pname = "znc-palaver"; version = "2020-07-18"; module_name = "palaver"; @@ -138,7 +138,7 @@ in { }; playback = zncDerivation rec { - name = "znc-playback-${version}"; + pname = "znc-playback"; version = "git-2015-08-04"; module_name = "playback"; @@ -158,7 +158,7 @@ in { }; privmsg = zncDerivation rec { - name = "znc-privmsg-${version}"; + pname = "znc-privmsg"; version = "git-2015-02-22"; module_name = "privmsg"; @@ -176,7 +176,7 @@ in { }; push = zncDerivation rec { - name = "znc-push-${version}"; + pname = "znc-push"; version = "git-2016-10-12"; module_name = "push"; From 9136bd1e2fdcd17e46558d700499331406592010 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 16:09:29 +0000 Subject: [PATCH 0124/1522] libuv: 1.41.0 -> 1.41.1 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index b630fca1670..9d4059d0f69 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.41.0"; + version = "1.41.1"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; + sha256 = "sha256-cE/Hg9YRYwpjzFg8hp97iuK/fWDTB4tTYYqpLpJgsUg="; }; patches = [ From 88fbddc149cc27eff53ba5846923b41937d617b4 Mon Sep 17 00:00:00 2001 From: Azure Zanculmarktum Date: Tue, 20 Jul 2021 02:21:02 +0700 Subject: [PATCH 0125/1522] nixos/tests: add kbd-update-search-paths-patch --- nixos/tests/all-tests.nix | 1 + nixos/tests/kbd-update-search-paths-patch.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/tests/kbd-update-search-paths-patch.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 746139c4816..770aff2abbd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -204,6 +204,7 @@ in k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; + kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {}; kea = handleTest ./kea.nix {}; keepalived = handleTest ./keepalived.nix {}; keepassxc = handleTest ./keepassxc.nix {}; diff --git a/nixos/tests/kbd-update-search-paths-patch.nix b/nixos/tests/kbd-update-search-paths-patch.nix new file mode 100644 index 00000000000..2967ee48903 --- /dev/null +++ b/nixos/tests/kbd-update-search-paths-patch.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "kbd-update-search-paths-patch"; + + machine = { pkgs, options, ... }: { + console = { + packages = options.console.packages.default ++ [ pkgs.terminus_font ]; + }; + }; + + testScript = '' + command = "${pkgs.kbd}/bin/setfont ter-112n 2>&1" + (status, out) = machine.execute(command) + pattern = re.compile(r".*Unable to find file:.*") + match = pattern.match(out) + if match: + raise Exception("command `{}` failed".format(command)) + ''; +}) From 6f89feaeddacab8ad30909dae968bba5b9a066e7 Mon Sep 17 00:00:00 2001 From: Azure Zanculmarktum Date: Tue, 20 Jul 2021 03:10:17 +0700 Subject: [PATCH 0126/1522] kbd: update search-paths.patch --- pkgs/os-specific/linux/kbd/default.nix | 6 +- pkgs/os-specific/linux/kbd/search-paths.patch | 85 +++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kbd/search-paths.patch diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index c7a59e59cab..23a523b15d7 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { "--disable-nls" ]; + patches = [ + ./search-paths.patch + ]; + postPatch = '' # Renaming keymaps with name clashes, because loadkeys just picks @@ -62,7 +66,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config flex ]; passthru.tests = { - inherit (nixosTests) keymap kbd-setfont-decompress; + inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch new file mode 100644 index 00000000000..3b337ca7cc2 --- /dev/null +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -0,0 +1,85 @@ +Add /etc/kbd to the list of directories to search for the console +fonts, screen mappings, Unicode maps, keytable files, etc. + +Without this patch, kbd will only look inside +/nix/store/-kbd-x.x.x/share. + +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -109,6 +109,9 @@ static const char *const include_dirpath1[] = { + NULL + }; + static const char *const include_dirpath3[] = { ++ "/etc/kbd/" KEYMAPDIR "/include/", ++ "/etc/kbd/" KEYMAPDIR "/i386/include/", ++ "/etc/kbd/" KEYMAPDIR "/mac/include/", + DATADIR "/" KEYMAPDIR "/include/", + DATADIR "/" KEYMAPDIR "/i386/include/", + DATADIR "/" KEYMAPDIR "/mac/include/", +--- a/src/libkfont/context.c ++++ b/src/libkfont/context.c +@@ -13,6 +13,7 @@ + /* search for the map file in these directories (with trailing /) */ + static const char *const mapdirpath[] = { + "", ++ "/etc/kbd/" TRANSDIR "/", + DATADIR "/" TRANSDIR "/", + NULL + }; +@@ -28,6 +29,7 @@ static const char *const mapsuffixes[] = { + /* search for the font in these directories (with trailing /) */ + static const char *const fontdirpath[] = { + "", ++ "/etc/kbd/" FONTDIR "/", + DATADIR "/" FONTDIR "/", + NULL + }; +@@ -42,6 +44,7 @@ static char const *const fontsuffixes[] = { + + static const char *const unidirpath[] = { + "", ++ "/etc/kbd/" UNIMAPDIR "/", + DATADIR "/" UNIMAPDIR "/", + NULL + }; +@@ -55,6 +58,7 @@ static const char *const unisuffixes[] = { + /* hide partial fonts a bit - loading a single one is a bad idea */ + const char *const partfontdirpath[] = { + "", ++ "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", + DATADIR "/" FONTDIR "/" PARTIALDIR "/", + NULL + }; +--- a/src/loadkeys.c ++++ b/src/loadkeys.c +@@ -27,6 +27,7 @@ + + static const char *const dirpath1[] = { + "", ++ "/etc/kbd/" KEYMAPDIR "/**", + DATADIR "/" KEYMAPDIR "/**", + KERNDIR "/", + NULL +--- a/src/resizecons.c ++++ b/src/resizecons.c +@@ -104,6 +104,7 @@ static void vga_set_verticaldisplayend_lowbyte(int); + + const char *const dirpath[] = { + "", ++ "/etc/kbd/" VIDEOMODEDIR "/", + DATADIR "/" VIDEOMODEDIR "/", + NULL + }; +--- a/src/setfont.c ++++ b/src/setfont.c +@@ -48,8 +48,8 @@ usage(void) + " -v Be verbose.\n" + " -C Indicate console device to be used.\n" + " -V Print version and exit.\n" +- "Files are loaded from the current directory or %s/*/.\n"), +- DATADIR); ++ "Files are loaded from the current directory or %s/*/ or %s/*/.\n"), ++ DATADIR, "/etc/kbd"); + exit(EX_USAGE); + } + From 03100da5a714a2b6c5210ceb6af092073ba4fce5 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Mon, 19 Jul 2021 23:03:36 +0200 Subject: [PATCH 0127/1522] nvidia_x11: 460.73.01 -> 470.57.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2cf9cddef4d..d763c1576cd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "460.73.01"; - sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i"; - settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0"; - persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5"; + version = "470.57.02"; + sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0="; + settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk="; + persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo="; } else legacy_390; From 4d66e6e499fbcbc8f9c55377e5259fac73c14d5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 01:47:27 +0000 Subject: [PATCH 0128/1522] disfetch: 1.24 -> 2.2 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index d66d413fcc3..27407987d85 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.24"; + version = "2.2"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "sha256-Uoc5xSyLXXEqdyYn71NK8c8A/1wQ6djYn/HHJwGg5vc="; + sha256 = "sha256-93nh1MDE2YO53lH2jDdKxgHh6v2KkAFo2Oyg+6ZpD+M="; }; dontBuild = true; From 1e2484a27c6c130751ed70695f9a20e5bf042502 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 19 Jul 2021 19:50:58 +0700 Subject: [PATCH 0129/1522] treewide: remove unnecessary enableParallelBuilding when using cmake --- pkgs/applications/audio/mixxx/default.nix | 2 -- pkgs/applications/audio/tageditor/default.nix | 2 -- pkgs/development/compilers/terra/default.nix | 1 - pkgs/test/cuda/cuda-library-samples/generic.nix | 1 - 4 files changed, 6 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6f0d34b870a..a3df5196cdc 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -110,8 +110,6 @@ mkDerivation rec { wavpack ]; - enableParallelBuilding = true; - qtWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 02e23084cf5..320a26b8172 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { tagparser ]; - enableParallelBuilding = true; - meta = with pkgs.lib; { homepage = "https://github.com/Martchus/tageditor"; description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index ac1851a683b..3174744fdde 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; doCheck = true; - enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; outputs = [ "bin" "dev" "out" "static" ]; diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index f1ce243bfa6..350decef22d 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -16,7 +16,6 @@ let version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; nativeBuildInputs = [ cmake addOpenGLRunpath ]; buildInputs = [ cudatoolkit ]; - enableParallelBuilding = true; postFixup = '' for exe in $out/bin/*; do addOpenGLRunpath $exe From 4ce8c34049634e385179317c8ef9783c20897a81 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 19 Jul 2021 20:01:58 +0700 Subject: [PATCH 0130/1522] treewide: remove unnecessary enableParallelBuilding when using qmake --- pkgs/applications/audio/dfasma/default.nix | 2 -- pkgs/applications/audio/fmit/default.nix | 2 -- pkgs/applications/audio/iannix/default.nix | 2 -- pkgs/applications/editors/focuswriter/default.nix | 2 -- pkgs/applications/editors/texmaker/default.nix | 2 -- pkgs/applications/editors/tiled/default.nix | 2 -- pkgs/applications/graphics/ktikz/default.nix | 1 - pkgs/applications/graphics/yacreader/default.nix | 2 -- pkgs/applications/misc/nixnote2/default.nix | 2 -- pkgs/applications/misc/openbrf/default.nix | 1 - pkgs/applications/misc/qlcplus/default.nix | 2 -- pkgs/applications/misc/qtpass/default.nix | 2 -- pkgs/applications/misc/subsurface/default.nix | 2 -- pkgs/applications/networking/browsers/qtchan/default.nix | 1 - .../networking/instant-messengers/tensor/default.nix | 2 -- pkgs/applications/networking/irc/communi/default.nix | 2 -- pkgs/applications/networking/remote/x2goclient/default.nix | 2 -- pkgs/applications/radio/qradiolink/default.nix | 2 -- pkgs/applications/radio/qsstv/default.nix | 2 -- pkgs/applications/science/physics/xflr5/default.nix | 2 -- pkgs/applications/science/robotics/apmplanner2/default.nix | 2 -- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 1 - .../applications/terminal-emulators/cool-retro-term/default.nix | 2 -- pkgs/applications/video/shotcut/default.nix | 1 - pkgs/development/libraries/qmlbox2d/default.nix | 1 - pkgs/development/libraries/qmltermwidget/default.nix | 2 -- pkgs/development/libraries/qscintilla/default.nix | 1 - pkgs/development/libraries/qtinstaller/default.nix | 1 - pkgs/development/tools/build-managers/qbs/default.nix | 2 -- pkgs/development/tools/minizinc/ide.nix | 1 - pkgs/development/tools/phantomjs2/default.nix | 2 -- pkgs/development/tools/qtcreator/default.nix | 2 -- pkgs/games/pokerth/default.nix | 2 -- pkgs/games/qgo/default.nix | 2 -- pkgs/misc/emulators/firebird-emu/default.nix | 2 -- pkgs/tools/graphics/nifskope/default.nix | 2 -- pkgs/tools/misc/qt5ct/default.nix | 2 -- pkgs/tools/networking/cmst/default.nix | 2 -- pkgs/tools/text/glogg/default.nix | 1 - 39 files changed, 68 deletions(-) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 3d4e5e5e5b9..97870c478eb 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -47,8 +47,6 @@ in mkDerivation rec { substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; - enableParallelBuilding = true; - meta = with lib; { description = "Analyse and compare audio files in time and frequency"; longDescription = '' diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 967c984bc50..7e376c89d36 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -38,8 +38,6 @@ mkDerivation rec { PREFIXSHORTCUT=$out" ''; - enableParallelBuilding = true; - meta = { description = "Free Musical Instrument Tuner"; longDescription = '' diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index f37150994fc..31f0bbbb4c7 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Graphical open-source sequencer"; homepage = "https://www.iannix.org/"; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index d47c315f613..d39c29dc6a5 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -12,8 +12,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ hunspell qtbase qtmultimedia ]; - enableParallelBuilding = true; - qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 75f22da2516..80220241eb6 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { "METAINFODIR=${placeholder "out"}/share/metainfo" ]; - enableParallelBuilding = true; - meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index fe32da4a42f..4fdb4a44b24 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ python qtbase qttools ]; - enableParallelBuilding = true; - meta = with lib; { description = "Free, easy to use and flexible tile map editor"; homepage = "https://www.mapeditor.org/"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 7cdf32cc8e7..d176ce38f0a 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; buildInputs = [ qtbase poppler ]; - enableParallelBuilding = true; qmakeFlags = [ "DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications" diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 5c727dbbaab..8fdd805803b 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -18,8 +18,6 @@ mkDerivation rec { buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; - enableParallelBuilding = true; - meta = { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index cbb7a110c4c..b55497a168c 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; postPatch = '' diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index e815fd7a39f..663a7bf43ea 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -13,7 +13,6 @@ mkDerivation { buildInputs = [ qtbase vcg glew ]; - enableParallelBuilding = true; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index d387468bcdd..9096a56a421 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -39,8 +39,6 @@ mkDerivation rec { variables.pri ''; - enableParallelBuilding = true; - postInstall = '' ln -sf $out/lib/*/libqlcplus* $out/lib ''; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index faa19914749..37fab140321 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -24,8 +24,6 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - enableParallelBuilding = true; - patches = [ # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d5a7d6f0fd6..ba3880aa201 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -64,8 +64,6 @@ let mv lib $out/ ''; - enableParallelBuilding = true; - meta = with lib; { inherit (src.meta) homepage; description = "QtLocation plugin for Google maps tile API"; diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 9a4d61a50ae..9786fad2fdc 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -11,7 +11,6 @@ mkDerivation rec { sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; }; - enableParallelBuilding = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase ]; qmakeFlags = [ "CONFIG-=app_bundle" ]; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 5bbdc6460c6..172d11f6b85 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - buildInputs = [ qtbase qtquickcontrols ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index ab698ea9c56..9148a26567d 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ libcommuni qtbase ]; - enableParallelBuilding = true; - dontWrapQtApps = true; preConfigure = '' diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index d40d8032c29..dfed1f59075 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -24,8 +24,6 @@ mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; - enableParallelBuilding = true; - installTargets = [ "install_client" "install_man" ]; qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 2dbd9f1aba9..2f31761537d 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -68,8 +68,6 @@ gnuradio3_8.pkgs.mkDerivation rec { gnuradio3_8.qt.wrapQtAppsHook ]; - enableParallelBuilding = true; - meta = with lib; { description = "SDR transceiver application for analog and digital modes"; homepage = "http://qradiolink.org/"; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index 555264ac485..7b27bb2eac0 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -10,8 +10,6 @@ mkDerivation rec { sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake pkg-config diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 5ae56528f96..85e20f38b66 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -9,8 +9,6 @@ mkDerivation rec { sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; meta = with lib; { diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 0f5e7e6daa8..b65c2352139 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -30,8 +30,6 @@ mkDerivation rec { --replace /usr $out ''; - enableParallelBuilding = true; - meta = { description = "Ground station software for autonomous vehicles"; longDescription = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1b9304d49e7..2759723841c 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -17,7 +17,6 @@ mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland ]; - enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; nativeBuildInputs = [ pkg-config qmake qttools ]; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 97812decbf3..049452c7e3a 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -29,8 +29,6 @@ mkDerivation rec { ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; - enableParallelBuilding = true; - meta = { description = "Terminal emulator which mimics the old cathode display"; longDescription = '' diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3a9c4809c62..6ea41b4d925 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -34,7 +34,6 @@ mkDerivation rec { sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; }; - enableParallelBuilding = true; nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index fe0616b7d7a..e1e69b9f10b 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; }; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 7914af08df6..bd6ebbd8e37 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_ROOT=$(out)" ]; - enableParallelBuilding = true; - dontWrapQtApps = true; meta = { diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 28c16e32535..fc2ef6c09a6 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -34,7 +34,6 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so ''; - enableParallelBuilding = true; dontWrapQtApps = true; postPatch = '' diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index ce69c855ac2..0fd21a1a296 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; setOutputFlags = false; - enableParallelBuilding = true; NIX_QT_SUBMODULE = true; dontWrapQtApps = true; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index d2d382f28d3..280173dc0c0 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript ]; - enableParallelBuilding = true; - meta = with lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index ef7dcb35321..3be33656431 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -16,7 +16,6 @@ mkDerivation rec { sourceRoot = "source/MiniZincIDE"; - enableParallelBuilding = true; dontWrapQtApps = true; postInstall = '' diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 3d0db49aedc..448e7dd4406 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -75,8 +75,6 @@ in stdenv.mkDerivation rec { __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - enableParallelBuilding = true; - dontWrapQtApps = true; installPhase = '' diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 2b0227407da..5926b3fda5e 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -45,8 +45,6 @@ mkDerivation rec { doCheck = true; - enableParallelBuilding = true; - buildFlags = optional withDocumentation "docs"; installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 349dd5d85cb..1c9879f8beb 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -61,8 +61,6 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index ea8c8aaeac8..cc28ebc63f3 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -43,6 +43,4 @@ mkDerivation { ''; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia qttranslations ]; - enableParallelBuilding = true; - } diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index c766df9e3c0..f2817bde85c 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -12,8 +12,6 @@ mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtdeclarative ]; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 0a053a3ad32..a5475dbfba1 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - # Inspired by install/linux-install/nifskope.spec.in. installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 5b88030849d..00d46de8f96 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -20,8 +20,6 @@ mkDerivation rec { "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Qt5 Configuration Tool"; homepage = "https://www.opendesktop.org/content/show.php?content=168066"; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index aa61d42d3d0..fb50316f713 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ qtbase ]; - enableParallelBuilding = true; - postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do substituteInPlace $f --replace /etc $out/etc --replace /usr $out diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 6bdd6dea029..306c25498ad 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -20,7 +20,6 @@ mkDerivation rec { buildInputs = [ boost ]; qmakeFlags = [ "VERSION=${version}" ]; - enableParallelBuilding = true; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications From d3c911fef221049e8a78b2dea7a395bdd6b4f7f5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 19 Jul 2021 20:02:56 +0700 Subject: [PATCH 0131/1522] the-powder-toy: remove unnecessary enableParallelBuilding --- pkgs/games/the-powder-toy/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 1dec8da537a..4d15fedb7ab 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - enableParallelBuilding = true; - meta = with lib; { description = "A free 2D physics sandbox game"; homepage = "http://powdertoy.co.uk/"; From 3ba8bc012cfa3db8c15ca38aaaaf562dd501ff8b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 20 Jul 2021 04:20:00 +0000 Subject: [PATCH 0132/1522] libuv: 1.41.1 -> 1.42.0 https://github.com/libuv/libuv/releases/tag/v1.42.0 --- pkgs/development/libraries/libuv/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 9d4059d0f69..a3de139fb44 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,25 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.41.1"; + version = "1.42.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-cE/Hg9YRYwpjzFg8hp97iuK/fWDTB4tTYYqpLpJgsUg="; + sha256 = "0f6mfbg750q26fa85nhmw2m0gyp8jcp1kyx9zn6lgi8bha5b7kny"; }; - patches = [ - (fetchpatch { - # Fixes out-of-bounds read in uv__idna_toascii() function - name = "CVE-2021-22918.patch"; - url = "https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae.patch"; - sha256 = "0fbjy0jh7r9nrd27ag1k6am6d8p5ih7p0ywvjn53nq4cyqdqxhi7"; - }) - ]; - postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent From a50de52f991f21ab46b84dd012ff8c46cb9d59cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 06:34:22 +0000 Subject: [PATCH 0133/1522] jbang: 0.72.0 -> 0.77.0 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index b0d2cb71953..f179ef13ba9 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.72.0"; + version = "0.77.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; + sha256 = "sha256-EOseHe0CrSzOI/NgPk0Q24nzeOSV6X8GVFNPstou/Ng="; }; nativeBuildInputs = [ makeWrapper ]; From 9d69d3e488a78b0a31b631fdaff839320c06efdc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 08:58:29 +0000 Subject: [PATCH 0134/1522] abcm2ps: 8.14.11 -> 8.14.12 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 08f8e03885e..da9fb934ce2 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.11"; + version = "8.14.12"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw"; + sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk="; }; configureFlags = [ From 8948eeeb6af8976a5d7c99f882f82607d862f882 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 10:27:14 +0000 Subject: [PATCH 0135/1522] btrfs-progs: 5.12.1 -> 5.13 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index aad633f3ba4..158c7d59399 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.12.1"; + version = "5.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-lQhG/qRU+0scOfD6RUmDZEVy35HfXAYEezNb8tVHN1k="; + sha256 = "sha256-Tikh0iA9Jl4qlBu9brB37dXjmBHi1p6MEbLwPc9eWEM="; }; nativeBuildInputs = [ From fa7b6abbf03d6ac623ea668edd50b22c47840802 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 20 Jul 2021 18:32:59 +0800 Subject: [PATCH 0136/1522] nix-linter: 2021-06-16 -> 0.2.0.3 --- pkgs/development/tools/analysis/nix-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index 6d758c2c30b..1a6539520d7 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nix-linter"; - version = "unstable-2021-06-16"; + version = "0.2.0.3"; src = fetchFromGitHub { owner = "Synthetica9"; repo = "nix-linter"; - rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344"; - sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3"; + rev = "38c4a14681cf3a1e6f098d8b723db503910a28d8"; + sha256 = "16igk4xnm4mg9mw0zg2zk6s44axia3fs6334fasvjy0c7cjwk4c7"; }; isLibrary = false; From 3199c9188a3c979faad4c9c216333854541e9e4c Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 20 Jul 2021 18:34:43 +0800 Subject: [PATCH 0137/1522] haskellPackages.nix-linter: remove unnecessary jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 460146969b1..3afae5da3c2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1915,8 +1915,4 @@ EOT assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; doJailbreak super.graphql; - # Too strict bounds on hnix - # https://github.com/Synthetica9/nix-linter/issues/56 - nix-linter = doJailbreak super.nix-linter; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 2eb88e243fa0ed9a488cf381527eb892151bd8f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 14:21:35 +0000 Subject: [PATCH 0138/1522] dendrite: 0.3.11 -> 0.4.0 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 5f070aa398c..5e6556029c0 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.3.11"; + version = "0.4.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "15xqd4yhsnnpz5n90fbny9i8lp7ki2z3fbpbd8cvsp49347rm483"; + sha256 = "sha256-BzQp466Zlp7n56n4SUH4cDRTt8EUWGw3q1dxIBB3TBM="; }; - vendorSha256 = "1l1wydvi0yalas79cvhrqg563cvs57hg9rv6qnkw879r6smb2x1n"; + vendorSha256 = "sha256-ak7fWcAXbyVAiyaJZBGMoe2i2nDh4vc/gCC9nbjadJ0="; passthru.tests = { inherit (nixosTests) dendrite; From fef688899e5882f13efb5f01d54febad37023252 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 20 Jul 2021 17:35:31 +0200 Subject: [PATCH 0139/1522] haskellPackages.streamly-bytestring: Pin to 0.1.2 to stay compatible with stackage LTS --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f2ea5692514..da3c5acc483 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -85,6 +85,8 @@ default-package-overrides: - dual-tree < 0.2.3.0 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 + # streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot + - streamly-bytestring == 0.1.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f215947d2c8..1dff648c282 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -250004,6 +250004,28 @@ self: { }) {}; "streamly-bytestring" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , gauge, hspec, hspec-discover, quickcheck-instances, random + , streamly, temporary + }: + mkDerivation { + pname = "streamly-bytestring"; + version = "0.1.2"; + sha256 = "1j9lpggz23idlkj8rvb8bqg29xfzb7cmzf3lhyc43i5w73jslkv3"; + libraryHaskellDepends = [ base bytestring streamly ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-discover + quickcheck-instances random streamly temporary + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge random streamly + ]; + description = "Library for streamly and bytestring interoperation"; + license = lib.licenses.bsd3; + }) {}; + + "streamly-bytestring_0_1_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , gauge, hspec, hspec-discover, quickcheck-instances, random , streamly, temporary @@ -250023,6 +250045,7 @@ self: { ]; description = "Library for streamly and bytestring interoperation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "streamly-cassava" = callPackage From b3d13e03624a9d66ee06e5ccf8023ca6836d980d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 16:56:31 +0000 Subject: [PATCH 0140/1522] freetds: 1.2.21 -> 1.3 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 56f0e03921b..b79fb2fd06d 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.21"; + version = "1.3"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; + sha256 = "sha256-j5ecrU2DUJBubDZF9wRxr0eNCHWe2TzToxQn8HkrX5c="; }; buildInputs = [ From 21ba59294db9a3a0e4f7f1b39400a2f53b1d5186 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 20 Jul 2021 19:51:21 +0200 Subject: [PATCH 0141/1522] convos: 6.24 -> 6.26 --- pkgs/applications/networking/irc/convos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 8ff5c50b8a7..762fdf78ce3 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.24"; + version = "6.26"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx"; + sha256 = "1wh3ryhd4b7nanh0yp2nycmhky5afw8lpfx34858p6wfimsv9794"; }; nativeBuildInputs = [ makeWrapper ] From 67402af78cbfeef915b46ce7e3d17a2de01ee2f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jul 2021 22:23:05 +0200 Subject: [PATCH 0142/1522] python3Packages.bitstring: 3.1.7 -> 3.1.9 --- pkgs/development/python-modules/bitstring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index ed67f2be5c5..ab94ad344ff 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstring"; - version = "3.1.7"; + version = "3.1.9"; src = fetchPypi { inherit pname version; - sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"; + sha256 = "1rv0x3vicjz7df6jq13aypgfqqjvlz0b92ya9li8a5qicczqm155"; }; meta = with lib; { From 6b98e950cc60540c2dcdd05f572844996cbcbbd2 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 18 Jun 2021 22:35:27 +0200 Subject: [PATCH 0143/1522] networkmanager: 1.30.4 -> 1.32.4 allow the use of the nftables backend --- .../networking/networkmanager/default.nix | 11 +- .../networking/networkmanager/fix-paths.patch | 126 ++++++++++++------ 2 files changed, 91 insertions(+), 46 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index a61c819a7c4..94d9dff1f84 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -14,6 +14,7 @@ , ppp , dhcp , iptables +, nftables , python3 , vala , libgcrypt @@ -53,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.30.4"; + version = "1.32.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-YFC3JCEuo85zhhEzWb6pr6H2eaVPYNmZpZmYkuZywZA="; + sha256 = "sha256-Kay9QceLfvh/+I/sU2DR6vi1tvy5BVXXORq8XjaSMVg="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { "-Diwd=true" "-Dpppd=${ppp}/bin/pppd" "-Diptables=${iptables}/bin/iptables" + "-Dnft=${nftables}/bin/nft" "-Dmodem_manager=true" "-Dnmtui=true" "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" @@ -173,7 +175,7 @@ stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p ${placeholder "out"}/lib - ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 + ln -s $PWD/src/libnm-client-impl/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 ''; passthru = { @@ -188,7 +190,8 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); + changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz maxeaubrey ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index cb9d3c3a0d2..8c7c4b2fa4d 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -1,26 +1,5 @@ -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 15c47c3ec..4d1913aa6 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host, - NULL, - }; - -- path = nm_utils_file_search_in_paths("openconnect", -- "/usr/sbin/openconnect", -- DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, -- NULL, -- NULL, -- error); -- if (!path) -- return FALSE; -+ path = "@openconnect@/bin/openconnect"; - - if (!g_spawn_sync(NULL, - (char **) NM_MAKE_STRV(path, "--authenticate", host), diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2..a43d61864 100644 +index e398cb9f2f..a43d61864f 100644 --- a/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules @@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" @@ -32,7 +11,7 @@ index e398cb9f2..a43d61864 100644 LABEL="nm_drivers_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 91ebd9a36..5201a56c3 100644 +index e23b3a5282..c7246a3b61 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ @@ -44,23 +23,11 @@ index 91ebd9a36..5201a56c3 100644 #ExecReload=/bin/kill -HUP $MAINPID ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure -diff --git a/libnm/meson.build b/libnm/meson.build -index d0846419c..a7adb2cc6 100644 ---- a/libnm/meson.build -+++ b/libnm/meson.build -@@ -280,7 +280,6 @@ if enable_introspection - output: 'nm-settings-docs-gir.xml', - command: [ - generate_setting_docs_env, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 040dd0b4d..98aea3aa9 100644 +index 21863b9533..c9b709659d 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_ip4_config_best_default_route_get(priv->ip_config_4); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -77,11 +44,31 @@ index 040dd0b4d..98aea3aa9 100644 log_domain = LOGD_IP6; } } -diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c -index 9075c30dd..4b140e92b 100644 ---- a/src/core/nm-core-utils.c -+++ b/src/core/nm-core-utils.c -@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a +diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build +index 21a01e0b04..091c98428f 100644 +--- a/src/libnm-client-impl/meson.build ++++ b/src/libnm-client-impl/meson.build +@@ -162,7 +162,6 @@ if enable_introspection + input: libnm_core_settings_sources, + output: 'nm-propery-infos-' + info + '.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), + info, + '@OUTPUT@', +@@ -219,7 +218,6 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), + '--lib-path', meson.current_build_dir(), + '--gir', '@INPUT@', +diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c +index 6435dcc482..214d01194e 100644 +--- a/src/libnm-platform/nm-platform-utils.c ++++ b/src/libnm-platform/nm-platform-utils.c +@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new(4); @@ -90,3 +77,58 @@ index 9075c30dd..4b140e92b 100644 g_ptr_array_add(argv, "--use-blacklist"); g_ptr_array_add(argv, (char *) arg1); +diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c +index 72691e34c2..95495b6585 100644 +--- a/src/libnmc-base/nm-vpn-helpers.c ++++ b/src/libnmc-base/nm-vpn-helpers.c +@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, + gs_free const char **output_v = NULL; + const char *const * iter; + const char * path; +- const char *const DEFAULT_PATHS[] = { +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, +- }; + +- path = nm_utils_file_search_in_paths("openconnect", +- "/usr/sbin/openconnect", +- DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, +- NULL, +- NULL, +- error); +- if (!path) +- return FALSE; ++ path = "@openconnect@/bin/openconnect"; + + if (!g_spawn_sync(NULL, + (char **) NM_MAKE_STRV(path, "--authenticate", host), +diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build +index 8f07ae634e..a1326b3403 100644 +--- a/src/libnmc-setting/meson.build ++++ b/src/libnmc-setting/meson.build +@@ -6,7 +6,6 @@ if enable_docs + input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], + output: 'settings-docs-input.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), + '@OUTPUT@', + nm_property_infos_xml['nmcli'], +diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build +index b2e455bbbd..a12ebf212a 100644 +--- a/src/tests/client/meson.build ++++ b/src/tests/client/meson.build +@@ -6,7 +6,6 @@ test( + args: [ + build_root, + source_root, +- python.path(), + ], + timeout: 120, + ) From aa7608d7de402ad19919623797654e03ed907523 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 18 Jul 2021 18:49:40 +0200 Subject: [PATCH 0144/1522] nixos/networkmanager: add firewallBackend option --- nixos/modules/services/networking/networkmanager.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 064018057cd..4be9fc952a8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -49,6 +49,7 @@ let rc-manager = if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"; + firewall-backend = cfg.firewallBackend; }) (mkSection "keyfile" { unmanaged-devices = @@ -244,6 +245,15 @@ in { ''; }; + firewallBackend = mkOption { + type = types.enum [ "iptables" "nftables" "none" ]; + default = "iptables"; + description = '' + Which firewall backend should be used for configuring masquerading with shared mode. + If set to none, NetworkManager doesn't manage the configuration at all. + ''; + }; + logLevel = mkOption { type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; default = "WARN"; From 8ccb61d5266c7e1ece1d244db64366882203f1be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 23:25:09 +0000 Subject: [PATCH 0145/1522] gnuchess: 6.2.8 -> 6.2.9 --- pkgs/games/gnuchess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 9f7d1684a5c..c150ba4ffee 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.8"; + version="6.2.9"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="0irqb0wl30c2i1rs8f6mm1c89l7l9nxxv7533lr408h1m36lc16m"; + sha256="sha256-3fzCC911aQCpq2xCx9r5CiiTv38ZzjR0IM42uuvEGJA="; }; buildInputs = [ flex From 7c1347975e6605eecd6e7fbcb4b6cf2875a46826 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 21 Jul 2021 10:27:26 +0900 Subject: [PATCH 0146/1522] haskell-updates: add documentation for onboarding new member --- pkgs/development/haskell-modules/HACKING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 34678328c74..37bd5544fe1 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -295,9 +295,17 @@ Here are some additional tips that didn't fit in above. [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) team. You may need to ask someone in the NixOS organization to do this, like [@domenkozar](https://github.com/domenkozar). - This gives the new member access to repos like + This gives the new member access to the GitHub repos like [cabal2nix](https://github.com/NixOS/cabal2nix). + 1. Add the person as a maintainer for the following packages + on Hackage: + - https://hackage.haskell.org/package/cabal2nix + - https://hackage.haskell.org/package/distribution-nixpkgs + - https://hackage.haskell.org/package/hackage-db + - https://hackage.haskell.org/package/jailbreak-cabal + - https://hackage.haskell.org/package/language-nix + 1. Add the person to the `haskell` team in [`maintainers/team-list.nix`](../../../maintainers/team-list.nix). This team is responsible for some important packages in From d46e72d04392a20abd88a75bf14dda325ef9bab6 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 21 Jul 2021 12:41:24 +0800 Subject: [PATCH 0147/1522] maintainers/scripts/haskell: Better env clearing while regenerating --- maintainers/scripts/haskell/mark-broken.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 71568ef6f20..97dd5be8aaa 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -30,9 +30,10 @@ EOF # clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh -env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh +clear="env -u HOME -u NIXPKGS_CONFIG" +$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh +$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config From 96e6ee3ea9c394dcef25468e1fc7d7ec827fce21 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 21 Jul 2021 13:55:09 +0900 Subject: [PATCH 0148/1522] all-cabal-hashes: 2021-07-17T11:52:29Z -> 2021-07-21T05:42:12Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d785554cad3..98b19c54a30 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "f57720a9e3e77366ac003b0eb65ae17372c39979", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f57720a9e3e77366ac003b0eb65ae17372c39979.tar.gz", - "sha256": "1lqghm6ximlfb5jrdf5399wj3jwmry6znqyz46hhn2w26li9m6jc", - "msg": "Update from Hackage at 2021-07-17T11:52:29Z" + "commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/51c018b566e360a908addb7fcabf98fc0fbaafbe.tar.gz", + "sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85", + "msg": "Update from Hackage at 2021-07-21T05:42:12Z" } From ce807c7c424a77fd30c8bc5be88b8b8d002663b9 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 21 Jul 2021 15:04:06 +0900 Subject: [PATCH 0149/1522] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 952 ++++++++++++++++-- 1 file changed, 845 insertions(+), 107 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1dff648c282..3f1f0b010fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17235,8 +17235,8 @@ self: { }: mkDerivation { pname = "RtMidi"; - version = "0.5.0.0"; - sha256 = "0yb52a4c03x28nbq8shpzqsczr04ngi0fa1hw0mflhql5rzd7yy5"; + version = "0.5.0.1"; + sha256 = "13fzqfq47zx3anpc1y9ypfa2h7bxzzj95zd7hpm3niykjrl9zadr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; @@ -23941,6 +23941,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad-delcont" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "ad-delcont"; + version = "0.3.0.0"; + sha256 = "1gdnvl4f4m95jp2p2wdival48d3j4ymizxwp9phf0f698baxs28k"; + libraryHaskellDepends = [ base transformers ]; + description = "Reverse-mode automatic differentiation with delimited continuations"; + license = lib.licenses.bsd3; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -40640,15 +40651,16 @@ self: { }) {}; "binary-generic-combinators" = callPackage - ({ mkDerivation, base, binary, generic-arbitrary, hspec, QuickCheck + ({ mkDerivation, base, binary, byte-order, generic-arbitrary, hspec + , QuickCheck }: mkDerivation { pname = "binary-generic-combinators"; - version = "0.4.2.0"; - sha256 = "1z1ngjcssb0nrkyd1chklmv19xf2qz7vqh2idsvkxa67ryp5g4a3"; + version = "0.4.3.0"; + sha256 = "1ng2jg3qpwplx9yjpmkj232rflyjnc3fymzjifqdwmvvzsdf9v4v"; libraryHaskellDepends = [ base binary QuickCheck ]; testHaskellDepends = [ - base binary generic-arbitrary hspec QuickCheck + base binary byte-order generic-arbitrary hspec QuickCheck ]; description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive"; license = lib.licenses.bsd3; @@ -44342,8 +44354,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.6.0.0"; - sha256 = "1rywy6r5wachz3y9vw1iy5b46fvlxcv5s33lrriffimqprkglbcj"; + version = "0.7.0.0"; + sha256 = "1h22r8l1hsdlzjcg7bdv5m9mlscpilcfg0brar0dy5rs7wghs4wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50251,8 +50263,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.30.3"; - sha256 = "0r6vrcdqqf6a8rihjgppmp625ws5vmsmq98i177xfg14hsal49pp"; + version = "0.1.30.4"; + sha256 = "038df356by37c1wj5i0a31hihxad44bbks1fb6xbx2abzp3343ji"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -55163,6 +55175,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "citeproc_0_4_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific + , text, timeit, transformers, unicode-collation, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.4.1"; + sha256 = "094x2fkhqizy26rzfz5qqjsnifmc95fyiasvnma32mak7j360xzy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types safe scientific text + transformers unicode-collation uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -57835,8 +57874,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.3.6"; - sha256 = "01qgxzh9gnajpaqwbvk027y8q8zalxk3d9axxyq6l30mxgjjacsk"; + version = "0.4.0"; + sha256 = "0f9v482xarv91d4bpffyjam4l16qq21z2q2vycpdjb5ximinwdv7"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -59621,8 +59660,8 @@ self: { ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "compactable"; - version = "0.1.2.3"; - sha256 = "1qw47ps6bnp6xwaksqq7plry0ivsm18f0vf79yi1n755w6p49648"; + version = "0.1.2.4"; + sha256 = "13lynjbwr78jy3j0zx6g2rk8qvyzkgw1smriqm6sslp3nn0v1g4r"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = lib.licenses.bsd3; @@ -72204,8 +72243,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "5"; - editedCabalFile = "1iqgza1larap5n4f1z7d7ag1s3b0zzlvgb91lrwwa5khgw2m7mrg"; + revision = "6"; + editedCabalFile = "1qwnpdjsrqzn18pjmvv9aqz3l12fbdcimf62wkj33yfh69rx4s42"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -73884,8 +73923,8 @@ self: { pname = "dhall"; version = "1.39.0"; sha256 = "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"; - revision = "2"; - editedCabalFile = "1rk59l8vi09ac657lwhks9q6cib7c62sbp64rr8xkfv1lvdafnzi"; + revision = "3"; + editedCabalFile = "1yhslq8i3407yaw30vgyffmmmq61f4g3ik4ikjhhplcbl6hb57l6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73972,8 +74011,8 @@ self: { pname = "dhall-docs"; version = "1.0.6"; sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; - revision = "1"; - editedCabalFile = "1m8ms4y4pxiays620k4zjf7hnfk103y990pnhnb6hr0h70n7i157"; + revision = "2"; + editedCabalFile = "1z41z96qawc1i818ycp1ycdpxnysynipjjbi1pmrrgglv89hqjlq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74089,6 +74128,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.15"; sha256 = "0bq6k92g22vdym9zyj95gx052yyzvgr1jv7yszlcj8p5angbxdqy"; + revision = "1"; + editedCabalFile = "0l1y8c02i4ydh3y67br1727al9xahpld879pinwgyv45f30n1jcb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74141,8 +74182,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.5"; sha256 = "10gvkw2rdmz7pgr9675xqnhkgi8pwjid77mwsriid81d703z2b6j"; - revision = "1"; - editedCabalFile = "1ddxs8phyysgj3pw5vbmnjr5fibvra9z9ihsri3f4c07iry3vlv2"; + revision = "2"; + editedCabalFile = "1kb2bn9v6p6ma016gaq3332vpcd6rdalrmcvxzzys4vaa0l6nl68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74164,6 +74205,8 @@ self: { pname = "dhall-openapi"; version = "1.0.1"; sha256 = "1n34amb97dqpvz0s3mhqb46gjq1ix1gicsq700z6v6y7xssrgbz2"; + revision = "1"; + editedCabalFile = "03axb4pqa5p8fkdqxjz1xni8fxg66xr3pshfs2p3y13bgn0kn5z2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78391,6 +78434,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "doctemplates_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific + , tasty, tasty-golden, tasty-hunit, temporary, text + , text-conversions, unordered-containers, vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.10"; + sha256 = "1nwav01dqxhbbmf4si8ks70lmhkldmy70m1dw89xrndvcgcynmrx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers doclayout filepath HsYAML mtl parsec safe + scientific text text-conversions unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion doclayout filepath mtl text + ]; + description = "Pandoc-style document templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery @@ -80848,22 +80918,22 @@ self: { }) {}; "dynamic-pipeline" = callPackage - ({ mkDerivation, async, base, bytestring, HList, hspec + ({ mkDerivation, async, base, bytestring, containers, HList, hspec , hspec-discover, lens, optparse-applicative, QuickCheck, relude , trifecta, unagi-chan }: mkDerivation { pname = "dynamic-pipeline"; - version = "0.3.1.1"; - sha256 = "1ypri47m7xn84lbcn0wj0z3l9y1a51kh5ldmgnza236d9hffw343"; + version = "0.3.1.2"; + sha256 = "02dnji253nvszgma7yzn7ghkz7gy4a24qa54l0pbm3mnf9xmwn31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring HList lens relude unagi-chan ]; executableHaskellDepends = [ - async base bytestring HList lens optparse-applicative relude - trifecta unagi-chan + async base bytestring containers HList lens optparse-applicative + relude trifecta unagi-chan ]; testHaskellDepends = [ async base bytestring HList hspec lens QuickCheck relude unagi-chan @@ -84676,8 +84746,8 @@ self: { }: mkDerivation { pname = "epi-sim"; - version = "0.4.2"; - sha256 = "0hwamynf66abhnipjdb292zpsf80hafpjjdv0yfq712qgjb9mgvp"; + version = "0.7.0"; + sha256 = "0i06wlrgpyh19q25mc3ndrhrhkyjfdg91v4pzbmgwgzpbvasgx42"; libraryHaskellDepends = [ aeson base bytestring hspec mwc-random primitive statistics vector ]; @@ -85221,6 +85291,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "error-or_0_2_0_0" = callPackage + ({ mkDerivation, base, containers, mtl, text }: + mkDerivation { + pname = "error-or"; + version = "0.2.0.0"; + sha256 = "0wpw8ms1rxc8zhdcr078bang10jl2wkd0ji944knzcvspfnx9hib"; + libraryHaskellDepends = [ base containers mtl text ]; + description = "Composable, hierarchical errors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "error-or-utils" = callPackage ({ mkDerivation, base, containers, error-or, text }: mkDerivation { @@ -85232,6 +85314,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "error-or-utils_0_2_0" = callPackage + ({ mkDerivation, base, containers, error-or, text }: + mkDerivation { + pname = "error-or-utils"; + version = "0.2.0"; + sha256 = "1z92js5khx49yd0zydjabdn0m2901zv5586r2vsbx7sd3rfvx2ff"; + libraryHaskellDepends = [ base containers error-or text ]; + description = "Utilities using ErrorOr datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "error-util" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -86256,8 +86350,8 @@ self: { }: mkDerivation { pname = "eved"; - version = "0.0.2.1"; - sha256 = "1rsnn3xm9s4fiybhsxhd8ldiwl8kzzvljqjg5s66vx2rfrqg42vl"; + version = "0.0.3.0"; + sha256 = "12wz0khrvj85vkk7bsq65gsikqmzahmlpmi08vdalnsfxqlflc6r"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-api-data http-client http-media http-types mtl text wai @@ -86270,8 +86364,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "eveff"; - version = "1.0.0.1"; - sha256 = "0668345qdais176w8vbmjklys64ys36m4ppkiyqbad866n0zg7n9"; + version = "1.0.0.2"; + sha256 = "1fplciayjmvb9vp5pgi7zf656jf93zay7fz992z8jc9jz2a6k8k4"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "Efficient effect handlers based on evidence translation"; license = lib.licenses.mit; @@ -87895,12 +87989,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "express_1_0_2" = callPackage + "express_1_0_4" = callPackage ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "1.0.2"; - sha256 = "1j8gbrbs6hyby2fn4qr6ijrjc6gwjrp7sysidfl07mfx5z6ig4ql"; + version = "1.0.4"; + sha256 = "0yv7gn7pj6ya4ijvwsh6gqn02qm4xn3ri98q10zd0zvjipmn20db"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -105417,19 +105511,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-conduit - , http-types, tasty, tasty-hunit, temporary, text, time - , transformers, unix, unliftio, unliftio-core + "gitlab-haskell_0_3_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-client + , http-conduit, http-types, tasty, tasty-hunit, temporary, text + , time, transformers, unix, unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.0"; - sha256 = "0krcan8i9lkickl77r9dyf93k96yxj5zp0asmzq86ds13m8f3s9i"; + version = "0.3.0.1"; + sha256 = "103wkbfnx8n5klaacqfl4vyg6rwszac04rpg7p7hka1m7jsrikwf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring connection http-conduit http-types temporary - text time transformers unix unliftio unliftio-core + aeson base bytestring connection http-client http-conduit + http-types temporary text time transformers unix unliftio + unliftio-core ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A Haskell library for the GitLab web API"; @@ -106642,6 +106737,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "gmail-simple" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, bytestring + , containers, cryptonite, http-api-data, http-conduit, http-media + , jwt, text, time, unordered-containers + }: + mkDerivation { + pname = "gmail-simple"; + version = "0.1.0.2"; + sha256 = "03zqp5gl3jxn2y5mx3qpb9xxj1zsbsbqapz9jdmvfrxdsb1xsa56"; + libraryHaskellDepends = [ + aeson base base64 blaze-html bytestring containers cryptonite + http-api-data http-conduit http-media jwt text time + unordered-containers + ]; + description = "Simple library for Google Mail (GMail)"; + license = lib.licenses.bsd3; + }) {}; + "gmap" = callPackage ({ mkDerivation, array, AvlTree, base, COrdering, QuickCheck , random @@ -119903,6 +120016,8 @@ self: { pname = "haskell-src-meta"; version = "0.8.7"; sha256 = "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in"; + revision = "1"; + editedCabalFile = "1xf1rrbqa6fsr072xv4j4h687kk3glr9vlf16as6pdfaq7h5mz73"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -124857,6 +124972,35 @@ self: { broken = true; }) {}; + "heddit" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring + , case-insensitive, conduit, conduit-extra, config-ini, containers + , exceptions, filepath, generic-lens, hashable, hspec + , http-api-data, http-client, http-client-tls, http-conduit + , http-types, microlens, mtl, random, scientific, split, text, time + , unliftio, unordered-containers, uri-bytestring + }: + mkDerivation { + pname = "heddit"; + version = "0.0.3"; + sha256 = "04kdhsxlna5l6h6wxyvxacxvmklhv19h5r802qac34gkpfvld851"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring case-insensitive conduit + conduit-extra config-ini containers exceptions filepath + generic-lens hashable http-api-data http-client http-client-tls + http-conduit http-types microlens mtl random scientific split text + time unliftio unordered-containers uri-bytestring + ]; + testHaskellDepends = [ + aeson base bytestring containers generic-lens hspec microlens + ]; + description = "Reddit API bindings"; + license = lib.licenses.bsd3; + }) {}; + "hedgehog" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, deepseq, directory, erf @@ -147011,6 +147155,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "inbox_0_2_0" = callPackage + ({ mkDerivation, async, base, error-or, text, time }: + mkDerivation { + pname = "inbox"; + version = "0.2.0"; + sha256 = "1f4jrkgrziq10xx344avpxyxxizxrhk8mwr127a5m6gr7vyqimak"; + libraryHaskellDepends = [ async base error-or text time ]; + description = "Inbox for asychronous messages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inc-ref" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -148096,6 +148252,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "input-parsers_0_2_3" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , monoid-subclasses, parsec, parsers, text, transformers + }: + mkDerivation { + pname = "input-parsers"; + version = "0.2.3"; + sha256 = "1ck2y3bl60bgzqg43kfcff1y84qygmanay1x8cjlxam60mip1w7v"; + libraryHaskellDepends = [ + attoparsec base binary bytestring monoid-subclasses parsec parsers + text transformers + ]; + description = "Extension of the parsers library with more capability and efficiency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -149064,8 +149237,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.8.2"; - sha256 = "1xa9rlb9klf0bnig0ccryjxcbz023hwy1wnxp4vwn5ggb0fbmzys"; + version = "0.8.3"; + sha256 = "0bqsynrzkgl8350spwja96c3hx20srdd9a9g0971jmbrws8kvlpj"; libraryHaskellDepends = [ base containers QuickCheck safe time witherable ]; @@ -156865,6 +157038,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "krank_0_2_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF + , req, safe-exceptions, text, unordered-containers + }: + mkDerivation { + pname = "krank"; + version = "0.2.3"; + sha256 = "0y78njv85s7mcza541gdax5l9651vm78k78ay42phcfvniv82hgx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl optparse-applicative pcre-heavy pretty-terminal + process PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers + ]; + description = "Krank checks issue tracker link status in your source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "krapsh" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring , binary, bytestring, containers, cryptohash-sha256, deepseq @@ -167042,6 +167246,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "logict-sequence" = callPackage + ({ mkDerivation, base, logict, mtl, sequence, type-aligned }: + mkDerivation { + pname = "logict-sequence"; + version = "0.1.0.1"; + sha256 = "15cxn5v3afm5688x972vvd6j7d7x889jwdhnlilpy1c2nzfl9w3i"; + libraryHaskellDepends = [ base logict mtl sequence type-aligned ]; + description = "A backtracking logic-programming monad with asymptotic improvements to msplit"; + license = lib.licenses.mit; + }) {}; + "logict-state" = callPackage ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { @@ -167633,8 +167848,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.11.0"; - sha256 = "0mnxch3bz5hpbykfpgjvq521a596g59lkzydijwqccj9cganmr55"; + version = "0.12.0"; + sha256 = "0cx879gb37gbldzhkmkz9bcdq4zkjisqrc7x1i85wqr5xjcaphvb"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -171092,6 +171307,8 @@ self: { pname = "massiv"; version = "0.6.1.0"; sha256 = "0j3br93kxxyb1q5mdf440f8l8d2lc0gi9vhc3h3ri94ls4ix099v"; + revision = "1"; + editedCabalFile = "10k8az97kvwbs9ac1dwvrhlawr0v89ksb4wji8c8i3kas1vmnhqh"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive scheduler unliftio-core vector @@ -171114,6 +171331,8 @@ self: { pname = "massiv-io"; version = "0.4.1.0"; sha256 = "1g20n4h1x03i7q36a6d65v2ylmrr6m8s2g91jnpx1lj7a91hc5c7"; + revision = "1"; + editedCabalFile = "1vq7ka61nzzzqa050sfmlbmlhayj92ak9w83121lnacvaqs5ndan"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -171135,6 +171354,8 @@ self: { pname = "massiv-persist"; version = "0.1.0.0"; sha256 = "0w3hm8mzk2vsd0myk7sl1cckl2yhr7b1y9qb9nzph5gw99hsc761"; + revision = "1"; + editedCabalFile = "197br71xz738xnivpcmicgyw06r2f5lbbbaqzvnsz9ycbnvwhmav"; libraryHaskellDepends = [ base bytestring deepseq massiv persist primitive ]; @@ -171176,6 +171397,8 @@ self: { pname = "massiv-serialise"; version = "0.1.0.0"; sha256 = "0780lggn343k64ph3c27zhkkx0gmk9zfvv5pxz6zl1817xfqzc83"; + revision = "1"; + editedCabalFile = "134405ffzdjc6nq23iwz5khs0r2r6z23y4y08by8qznj97j38am0"; libraryHaskellDepends = [ base deepseq massiv serialise vector ]; testHaskellDepends = [ base doctest hspec massiv massiv-test QuickCheck serialise @@ -171197,6 +171420,8 @@ self: { pname = "massiv-test"; version = "0.1.6.1"; sha256 = "0f2f401flik0sj1wqlzghhr0dxbz2lyvlb4ij38n3m2vgpkgkd57"; + revision = "1"; + editedCabalFile = "1fmja3adixmljm4f90s8ckg26wr89hmhdwl6sr0nmlpz9x2w25q0"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -171668,22 +171893,23 @@ self: { }) {}; "matrix-client" = callPackage - ({ mkDerivation, aeson, base, base64, bytestring, doctest - , exceptions, hashable, hspec, http-client, http-client-tls, retry - , SHA, text, time, unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring + , doctest, exceptions, hashable, hspec, http-client + , http-client-tls, http-types, retry, SHA, text, time + , unordered-containers }: mkDerivation { pname = "matrix-client"; - version = "0.1.0.0"; - sha256 = "10w1q846b4jnyg9yb87d69ixfyhl205ryrib6a53pbk0bx6zn59w"; + version = "0.1.1.0"; + sha256 = "13ncklhrwb10g6pki1zsli1gnja01ic9scil4f5nky8hdmaw9jq2"; libraryHaskellDepends = [ aeson base base64 bytestring exceptions hashable http-client - http-client-tls retry SHA text time unordered-containers + http-client-tls http-types retry SHA text time unordered-containers ]; testHaskellDepends = [ - aeson base base64 bytestring doctest exceptions hashable hspec - http-client http-client-tls retry SHA text time - unordered-containers + aeson aeson-pretty base base64 bytestring doctest exceptions + hashable hspec http-client http-client-tls http-types retry SHA + text time unordered-containers ]; description = "A matrix client library"; license = lib.licenses.asl20; @@ -176155,6 +176381,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.3"; sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s"; + revision = "1"; + editedCabalFile = "0wkmi06n57ppm5n4x0l4mc6any21q70pb1v01ssv386hrc67bxwv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -179295,8 +179523,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.14.0"; - sha256 = "1rajgkgmckiy54mdilbq21df5h3ij9a1n1v6jahgrgy9hyyg8qcv"; + version = "1.15.0"; + sha256 = "174wdjcwkfks7cl3hapm342bf7dgvnfhn6ma6fgdvjd7cag5h8z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179311,9 +179539,8 @@ self: { with-utf8 wl-pprint-text ]; executableHaskellDepends = [ - aeson base-noprelude bytestring data-default fmt haskeline - megaparsec morley-prelude named optparse-applicative text vinyl - with-utf8 + aeson base-noprelude bytestring fmt haskeline megaparsec + morley-prelude named optparse-applicative text vinyl with-utf8 ]; testHaskellDepends = [ base-noprelude bytestring Cabal doctest morley-prelude @@ -179326,12 +179553,12 @@ self: { }) {}; "morley-prelude" = callPackage - ({ mkDerivation, base-noprelude, universum }: + ({ mkDerivation, base-noprelude, lens, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.4.0"; - sha256 = "1g2ng8d5s32xwflbcfl1fsr2c2lzyh3vvyqslk76w9jn3nln164l"; - libraryHaskellDepends = [ base-noprelude universum ]; + version = "0.4.1"; + sha256 = "19d9nxvdr26rmn197rhiwx7nryp6awsmyx6dz1lp9v2f376gs5dh"; + libraryHaskellDepends = [ base-noprelude lens universum ]; description = "A custom prelude used in Morley"; license = lib.licenses.mit; }) {}; @@ -194351,6 +194578,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "packcheck_0_6_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.6.0"; + sha256 = "0n050lpbcykzhaxwjxyh65crp2iyn3bvdagybap9prqid0zj4k8z"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + description = "Universal build and CI testing for Haskell packages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar @@ -194722,8 +194963,8 @@ self: { }: mkDerivation { pname = "pagerduty-hs"; - version = "0.1.0.1"; - sha256 = "1hvqkd4pr1qi7akmd0kzj371wssdzaw32jjh2khd1p6x4dmry381"; + version = "0.2.0.0"; + sha256 = "0znjxcf4a6x71sfykmgdx4zlmdghc864yis6rl5q7y85qq9s324i"; libraryHaskellDepends = [ aeson base exceptions lens text wreq ]; testHaskellDepends = [ aeson base exceptions HUnit lens tasty tasty-hunit tasty-quickcheck @@ -194968,6 +195209,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.1"; + sha256 = "1jj011az45zpd201f3dwb90m22p60nv5bmpbh39li885xwv46qyq"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -201332,8 +201632,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.2.0.0"; - sha256 = "0cvn2l0ds5nyz4inx354l8r9m4bkqjic7plpjgvhih8f4b53j6ln"; + version = "0.3.2.0"; + sha256 = "1r52qjghqv54f2brk132cabjrd3c96jnx96c78irlks5vd0cgblk"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)"; license = lib.licenses.mit; @@ -201382,8 +201682,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.4.2.0"; - sha256 = "02lv4w9v8jf7v6dkrwwmy79h7yphmk37n54r9whii6kicns80ff2"; + version = "0.5.0.0"; + sha256 = "0p7zsk9d6p4srjr0vk18r454p72v49kjpdh7hk3iwh9vh9mbjrbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201535,8 +201835,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.2.0.0"; - sha256 = "1y7cki8c07q9423b54cjvy9k6a9byarpww3px50bc91ivirda6zr"; + version = "0.3.0.0"; + sha256 = "1m836lvnmzsf918jh9kx5vb8hirrjfskcbg1jyz2nar6yqijkr8z"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -205468,15 +205768,15 @@ self: { }) {}; "polysemy-fskvstore" = callPackage - ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo + ({ mkDerivation, base, bytestring, path, polysemy, polysemy-kvstore , rio, unliftio-path }: mkDerivation { pname = "polysemy-fskvstore"; - version = "0.1.0.0"; - sha256 = "1hg552w21hgq5jvcbrw1kn1870xdyf44a3xqd87nrj9s9k2j4pk2"; + version = "0.1.1.0"; + sha256 = "1jpiqq65lv1dp7h2wdl2b2czpax6wqwlv4fqh8vhg26pw49mc2lr"; libraryHaskellDepends = [ - base bytestring path polysemy polysemy-zoo rio unliftio-path + base bytestring path polysemy polysemy-kvstore rio unliftio-path ]; description = "Run a KVStore as a filesystem in polysemy"; license = lib.licenses.mit; @@ -205547,15 +205847,15 @@ self: { "polysemy-kvstore-jsonfile" = callPackage ({ mkDerivation, aeson, base, containers, exceptions, extra, path - , polysemy, polysemy-zoo, unliftio-path + , polysemy, polysemy-kvstore, unliftio-path }: mkDerivation { pname = "polysemy-kvstore-jsonfile"; - version = "0.1.0.0"; - sha256 = "1lbjq1hlq6cf6px5f6zqi04sl0yz0rpyq2m2y16zknjz3wi7zqvi"; + version = "0.1.1.0"; + sha256 = "1aibvhr6fsz4d02rj74pa0hwhkqzmxbp64gxf5r3q6l67ij2faw3"; libraryHaskellDepends = [ - aeson base containers exceptions extra path polysemy polysemy-zoo - unliftio-path + aeson base containers exceptions extra path polysemy + polysemy-kvstore unliftio-path ]; description = "Run a KVStore as a single json file in polysemy"; license = lib.licenses.mit; @@ -205805,6 +206105,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-socket" = callPackage + ({ mkDerivation, base, bytestring, polysemy, polysemy-plugin + , socket + }: + mkDerivation { + pname = "polysemy-socket"; + version = "0.0.1.0"; + sha256 = "18ja1z7sl1xzfvhm43pazjsx76w944m4b3wp6yl4wichxwqka9jj"; + libraryHaskellDepends = [ + base bytestring polysemy polysemy-plugin socket + ]; + description = "Socket effect for polysemy"; + license = lib.licenses.mit; + }) {}; + "polysemy-test" = callPackage ({ mkDerivation, base, containers, either, hedgehog, path, path-io , polysemy, polysemy-plugin, relude, string-interpolate, tasty @@ -205854,17 +206169,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-uncontrolled" = callPackage + ({ mkDerivation, base, polysemy, polysemy-methodology + , polysemy-plugin + }: + mkDerivation { + pname = "polysemy-uncontrolled"; + version = "0.1.0.0"; + sha256 = "137zw5366c4h7q8w7cj7h4wc4njf1n2f7kabyrl6bqav1fjb96lx"; + libraryHaskellDepends = [ + base polysemy polysemy-methodology polysemy-plugin + ]; + description = "Uncontrolled toy effect for polysemy"; + license = lib.licenses.mit; + }) {}; + "polysemy-video" = callPackage - ({ mkDerivation, base, formatting, path, path-utils, polysemy, text + ({ mkDerivation, base, formatting, path, path-formatting, polysemy + , simple-media-timestamp, simple-media-timestamp-formatting, text , turtle }: mkDerivation { pname = "polysemy-video"; - version = "0.1.2.0"; - sha256 = "1q6acrcxin32ykhzrmd562xb45d972c37sqydh9mz1xp49764fy9"; + version = "0.2.0.1"; + sha256 = "1lbjjq6q3i6v41ssqy69p4iwvybidrmxcxwjzddbxcrmymr0rmlc"; libraryHaskellDepends = [ - base formatting path path-utils polysemy text turtle + base formatting path path-formatting polysemy + simple-media-timestamp simple-media-timestamp-formatting text + turtle ]; + description = "Experimental video processing DSL for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -210186,14 +210520,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_13_0" = callPackage + "process_1_6_12_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.13.0"; - sha256 = "01kvwr6mrs025q7dblj2vgmx8ms97rdcmar8zgzaxwzqql0jsgwp"; + version = "1.6.12.0"; + sha256 = "1zw551zrnq70ip9dsc564aw1zf90l48jf59rxhjgx4d00ngs165x"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -210431,6 +210765,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "procex" = callPackage + ({ mkDerivation, async, base, bytestring, containers, unix + , utf8-string + }: + mkDerivation { + pname = "procex"; + version = "0.1.0.0"; + sha256 = "08pd4v8jxhfy6i9vry0hlssqhlzx1wmi64kmhb0qwxagrj3r6dsx"; + libraryHaskellDepends = [ + async base bytestring containers unix utf8-string + ]; + testHaskellDepends = [ base ]; + description = "Ergonomic process launching with extreme flexibility and speed"; + license = lib.licenses.asl20; + }) {}; + "procrastinating-structure" = callPackage ({ mkDerivation, base, procrastinating-variable }: mkDerivation { @@ -211873,6 +212223,32 @@ self: { license = lib.licenses.mit; }) {}; + "protobuf-simple_0_1_1_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, directory, filepath, hspec, mtl, parsec + , QuickCheck, quickcheck-instances, split, text + }: + mkDerivation { + pname = "protobuf-simple"; + version = "0.1.1.1"; + sha256 = "1j4grl8dvzhrj88q2ig6slsdj60lcw29r1ls123zk66fgj19f8l6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl parsec split text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 filepath + hspec parsec QuickCheck quickcheck-instances split text + ]; + description = "Simple Protocol Buffers library (proto2)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "protocol" = callPackage ({ mkDerivation, base, freer-indexed, singletons }: mkDerivation { @@ -220733,6 +221109,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-posix_0_96_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, regex-base }: + mkDerivation { + pname = "regex-posix"; + version = "0.96.0.1"; + sha256 = "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7"; + libraryHaskellDepends = [ + array base bytestring containers regex-base + ]; + description = "POSIX Backend for \"Text.Regex\" (regex-base)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-posix-clib" = callPackage ({ mkDerivation }: mkDerivation { @@ -221505,6 +221895,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "relational-query_0_12_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-constraint-compat, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.3.0"; + sha256 = "1acbz0zy4bb8r7q2nw96jgpi45y8gy4j1qik4fn8ndqw8l3fpzvl"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text + th-constraint-compat th-reify-compat time time-locale-compat + transformers + ]; + testHaskellDepends = [ + base bytestring containers product-isomorphic quickcheck-simple + transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -228417,6 +228833,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-webdriver_0_1_0_6" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, directory + , exceptions, filepath, http-client, http-client-tls, http-conduit + , lifted-base, microlens, microlens-aeson, monad-control + , monad-logger, mtl, network, process, random, regex-compat, retry + , safe, safe-exceptions, sandwich, string-interpolate, temporary + , text, time, transformers, unix, unordered-containers, vector + , webdriver + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.1.0.6"; + sha256 = "1x8f9jvfcqwhjly9gnqsb9lv9b8dvyj4rd21x9alsqk44jlxhzkf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers data-default directory exceptions filepath + http-client http-client-tls http-conduit lifted-base microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver + ]; + executableHaskellDepends = [ + aeson base containers data-default directory exceptions filepath + http-client http-client-tls http-conduit lifted-base microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver + ]; + testHaskellDepends = [ + aeson base containers data-default directory exceptions filepath + http-client http-client-tls http-conduit lifted-base microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -234594,8 +235054,8 @@ self: { }: mkDerivation { pname = "servant-serf"; - version = "0.1.0"; - sha256 = "08x4d595czal5j5dgd08bps4swsrh547nnmk4i006jjvbl0315nf"; + version = "0.1.1"; + sha256 = "0n4970bx48hwxixqgq1jayprcaq82mm2462iclyzkbfxl6v01zrd"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -238746,6 +239206,17 @@ self: { license = lib.licenses.mit; }) {}; + "simple-media-timestamp-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, simple-media-timestamp }: + mkDerivation { + pname = "simple-media-timestamp-attoparsec"; + version = "0.1.0.0"; + sha256 = "0zkwb24blzmhb6y9yy2cjsgsv1l756wgpcp90drb5ga73qix0k5g"; + libraryHaskellDepends = [ attoparsec base simple-media-timestamp ]; + description = "Attoparsec parser for simple-media-timestamp"; + license = lib.licenses.mit; + }) {}; + "simple-media-timestamp-formatting" = callPackage ({ mkDerivation, base, formatting, simple-media-timestamp }: mkDerivation { @@ -238825,21 +239296,22 @@ self: { }) {}; "simple-parser" = callPackage - ({ mkDerivation, base, containers, list-t, mmorph, mtl - , nonempty-containers, scientific, tasty, tasty-hunit, tasty-th - , text, text-builder + ({ mkDerivation, base, bytestring, containers, errata, list-t + , mmorph, mtl, nonempty-containers, scientific, tasty, tasty-hunit + , tasty-th, text, text-builder }: mkDerivation { pname = "simple-parser"; - version = "0.6.0"; - sha256 = "0bj6x3zd3xp2gxx2z20d7c49vws91y728cjbh5ycz2rahg3gr39m"; + version = "0.8.0"; + sha256 = "0k2sj1n42kkfvr0g8sdhz5vasv0h38hgs04r8fjy5gpxmrzni472"; libraryHaskellDepends = [ - base containers list-t mmorph mtl nonempty-containers scientific - text text-builder + base bytestring containers errata list-t mmorph mtl + nonempty-containers scientific text text-builder ]; testHaskellDepends = [ - base containers list-t mmorph mtl nonempty-containers scientific - tasty tasty-hunit tasty-th text text-builder + base bytestring containers errata list-t mmorph mtl + nonempty-containers scientific tasty tasty-hunit tasty-th text + text-builder ]; description = "Simple parser combinators"; license = lib.licenses.bsd3; @@ -240308,6 +240780,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "skylighting_0_11" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.11"; + sha256 = "12m119j65yngryrx23jiz6c86wihqp47ysv0wnmqfgc6cbv0k97r"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -240339,6 +240833,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_11" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.11"; + sha256 = "1pgi0xfwbvgpgdcka3z3zl1hg1y4n3s2r9561gzclydyldb2jxc3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath mtl safe text transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -244823,6 +245349,23 @@ self: { broken = true; }) {}; + "speculate_0_4_12" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.12"; + sha256 = "0v5c8nzad1y5wjrnjswq4hyahkfmmb4npzhrrkdg5brwv6c784v7"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -246011,6 +246554,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "srt" = callPackage + ({ mkDerivation, base, simple-media-timestamp, text }: + mkDerivation { + pname = "srt"; + version = "0.1.1.0"; + sha256 = "1a3bpb3xz6m4igirmqg1yndyb1733jfwyarmmnizjw0m8v01sik0"; + libraryHaskellDepends = [ base simple-media-timestamp text ]; + description = "The data type for SRT files"; + license = lib.licenses.mit; + }) {}; + + "srt-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, mtl, simple-media-timestamp + , simple-media-timestamp-attoparsec, srt, text + }: + mkDerivation { + pname = "srt-attoparsec"; + version = "0.1.0.0"; + sha256 = "1j096cz1frig4hizlwnraqsdhbrq44ypwyc4s0gbk9vg77sgq6sz"; + libraryHaskellDepends = [ + attoparsec base mtl simple-media-timestamp + simple-media-timestamp-attoparsec srt text + ]; + description = "Attoparsec parser for the SRT format"; + license = lib.licenses.mit; + }) {}; + "sscan" = callPackage ({ mkDerivation, async, base, brick, directory, filepath, microlens , microlens-th, process, temporary, text, time, vty @@ -246463,6 +247033,101 @@ self: { license = lib.licenses.bsd3; }) {}; + "stack_2_7_3" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , async, attoparsec, base, base64-bytestring, bytestring, Cabal + , casa-client, casa-types, colour, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify + , generic-deriving, hackage-security, hashable, hi-file-parser + , hpack, hpc, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, memory, microlens, mintty + , mono-traversable, mtl, mustache, neat-interpolation, network-uri + , open-browser, optparse-applicative, pantry, path, path-io + , persistent, persistent-sqlite, persistent-template, pretty + , primitive, process, project-template, QuickCheck, raw-strings-qq + , regex-applicative-text, retry, rio, rio-prettyprint, semigroups + , smallcheck, split, stm, streaming-commons, tar, template-haskell + , temporary, text, text-metrics, th-reify-many, time, tls + , transformers, typed-process, unicode-transforms, unix + , unix-compat, unliftio, unordered-containers, vector, yaml + , zip-archive, zlib + }: + mkDerivation { + pname = "stack"; + version = "2.7.3"; + sha256 = "0i2v5i6bg90n6i4clcaww8m8702d3y5z8r03xdizdisjhf0zijj7"; + configureFlags = [ + "-fdisable-git-info" "-fhide-dependency-versions" + "-fsupported-build" + ]; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib + ]; + executableHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib + ]; + testHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mintty + mono-traversable mtl mustache neat-interpolation network-uri + open-browser optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template QuickCheck raw-strings-qq regex-applicative-text + retry rio rio-prettyprint semigroups smallcheck split stm + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib + ]; + doCheck = false; + preCheck = "export HOME=$TMPDIR"; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + description = "The Haskell Tool Stack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "stack-all" = callPackage ({ mkDerivation, aeson, base, bytestring, config-ini, directory , extra, filepath, http-query, process, simple-cmd, simple-cmd-args @@ -250661,6 +251326,8 @@ self: { pname = "string-interpolate"; version = "0.3.1.1"; sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; + revision = "1"; + editedCabalFile = "1grn08zg3n26d58al25hvg6czbliabrlf1srlhymjdvkvd4a5i4y"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -260829,8 +261496,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.7.3"; - sha256 = "0gbcqkarmy095avbcp4gnb906a4n2x3lllhqwlnamaa164nv9s2h"; + version = "0.0.7.4"; + sha256 = "0xsqikhbv1900sl6d431cb5d393d6a5rk58284ximpgz6j1qxgab"; libraryHaskellDepends = [ base binary lens semigroupoids semigroups text ]; @@ -266006,6 +266673,8 @@ self: { pname = "transformers"; version = "0.6.0.2"; sha256 = "1d907i06lgmis4s1mhjn6f4f3991vpycv9pl61h4xn2hwxasq3k2"; + revision = "1"; + editedCabalFile = "0g536mmdq72j72jy6437q64vsxj8yba0mamm15xirs67j551azn1"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -272726,6 +273395,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_19" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.19"; + sha256 = "052m0vr6444r5adzyzr3aqj07p9ay5y2sqfsczwj52bc66qqyy36"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -273318,8 +274013,8 @@ self: { }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.2.7"; - sha256 = "0knwn11c3kdh1xbpa8l6kgskis9fcsjr06hxay3rl4yiqprf80xn"; + version = "0.2.9"; + sha256 = "0wdw03pl5bx8vsi3kg4l902ah2l1v4x8922g9malyqyh3bvqfham"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277824,8 +278519,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.11.2"; - sha256 = "1pvszf89q1b7r5a1lzdvc28cylmlgnvvss5nw6497iclzh6hs82i"; + version = "3.11.3"; + sha256 = "1mcami1hksn0kkr0wi9hk6hjd8ns4f65fqk7bh7c8zvj1z3i3zhy"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -289208,6 +289903,24 @@ self: { broken = true; }) {}; + "yesod-gitrev_0_2_2" = callPackage + ({ mkDerivation, aeson, base, githash, process, template-haskell + , yesod-core + }: + mkDerivation { + pname = "yesod-gitrev"; + version = "0.2.2"; + sha256 = "048g2pp2pgdhhv9g9wazwh4mjavdvrmrs2z5lks42bccsfgg00h8"; + libraryHaskellDepends = [ + aeson base githash template-haskell yesod-core + ]; + testHaskellDepends = [ base process template-haskell yesod-core ]; + description = "A subsite for displaying git information"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-goodies" = callPackage ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form @@ -289421,6 +290134,31 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-page-cursor_2_0_0_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.9"; + sha256 = "13wvivls1yqaanvkc9bpbiwx6qxa78ffgivm4qws4fyicqp628ak"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { From 1d71ffb1099d4fc45c5ebc5bacbf2f863c526dc8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 21 Jul 2021 16:09:47 +0900 Subject: [PATCH 0150/1522] haskellPackages.focuslist: disable checks because doctests incorrectly fail --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3afae5da3c2..ece345208af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -188,6 +188,7 @@ self: super: { })); # Fails for non-obvious reasons while attempting to use doctest. + focuslist = dontCheck super.focuslist; search = dontCheck super.search; # see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60 From bb524f5145f412261674e928e880c691fd6d634b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 12:25:56 +0000 Subject: [PATCH 0151/1522] geoipupdate: 4.7.1 -> 4.8.0 --- pkgs/applications/misc/geoipupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index e85ada2253f..d92c4d04913 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-nshQxr6y3TxKsAVSA9mzL7LJfCtpv0QuuTTqk3/lENc="; + sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk="; }; - vendorSha256 = "sha256-fqQWFhFeyW4GntRBxEeN6WSOo0G+1hH9vSEZmBKglz8="; + vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY="; doCheck = false; From ea125a5fd91af24c4405725c9c048f788bd70d12 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 18 Jul 2021 18:50:20 +0200 Subject: [PATCH 0152/1522] nixos/nftables: set nm's firewallBackend when on when enabled, switch networkmanager's firewallBackend option to nftables --- nixos/modules/services/networking/nftables.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index cb75142965e..72f37c32253 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -103,6 +103,7 @@ in }]; boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; + networking.networkmanager.firewallBackend = mkDefault "nftables"; systemd.services.nftables = { description = "nftables firewall"; before = [ "network-pre.target" ]; From 87cfb513c1454a2db75db9483d713eeca4341766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Jul 2021 20:12:38 +0200 Subject: [PATCH 0153/1522] gpgme: apply the recent patch for all platforms See commit 16105403b. --- pkgs/development/libraries/gpgme/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c8dad069dcc..e138c824a44 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; }; - patches = - # TODO: apply unconditionally on a rebuild; probably included in > 1.16.0 - lib.optional (stdenv.is32bit && stdenv.isLinux) (fetchpatch { + patches = [ + (fetchpatch { # probably included in > 1.16.0 name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"; sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; }) - ++ [ (fetchpatch { # gpg: Send --with-keygrip when listing keys name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; From 3f694b0ac82d4b272989b5d746db1906fb942326 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Jul 2021 02:16:20 +0200 Subject: [PATCH 0154/1522] python3Packages.sqlalchemy: 1.4.21 -> 1.4.22 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 51ecf9f37c4..c8cb10fc565 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.21"; + version = "1.4.22"; src = fetchPypi { inherit pname version; - sha256 = "1iwggnq2n7wd6vqqvym1fjnzrgs648saba1cs6nvw4pn9m7hbs87"; + sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; }; propagatedBuildInputs = [ From cb0e81b5b6c60ad25493ba5a95be58ec0ef9058e Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 22 Jul 2021 03:37:52 +0300 Subject: [PATCH 0155/1522] mc: add libX11 with patchelf --- pkgs/tools/misc/mc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 6cbe693fb60..56844efc6ce 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -57,9 +57,14 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - preFixup = '' + postFixup = '' # remove unwanted build-dependency references sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc + + # libX11.so is loaded dynamically so autopatch doesn't detect it + patchelf \ + --add-needed ${libX11}/lib/libX11.so \ + $out/bin/mc ''; meta = with lib; { From 3d1077dd455f83ea2d68612332cfc521a04c98f9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 21 Jul 2021 22:01:50 -0300 Subject: [PATCH 0156/1522] flameshot: Add nix-update-script support Signed-off-by: Otavio Salvador --- pkgs/tools/misc/flameshot/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 838572d9297..f9136f14e61 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,4 +1,12 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }: +{ mkDerivation +, lib +, fetchFromGitHub +, qtbase +, cmake +, qttools +, qtsvg +, nix-update-script +}: mkDerivation rec { pname = "flameshot"; @@ -11,6 +19,12 @@ mkDerivation rec { sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2"; }; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; From 6fdc7e6a88d766f5e944015ef2234e9f05d56607 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 10:50:52 +0700 Subject: [PATCH 0157/1522] coreaction: init at 4.2.0 --- pkgs/misc/coreaction/default.nix | 33 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/misc/coreaction/default.nix diff --git a/pkgs/misc/coreaction/default.nix b/pkgs/misc/coreaction/default.nix new file mode 100644 index 00000000000..c7fbfcd3d8f --- /dev/null +++ b/pkgs/misc/coreaction/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: + +mkDerivation rec { + pname = "coreaction"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtsvg + qtbase + libcsys + libcprime + ]; + + meta = with lib; { + description = "A side bar for showing widgets from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..625fe3126c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23469,6 +23469,8 @@ in copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; + corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { From ac20e17cc83cba8599266ba2268054e62c2b7803 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 22 Jul 2021 06:18:46 +0200 Subject: [PATCH 0158/1522] gitlab: 14.0.5 -> 14.1.0 --- .../version-management/gitlab/data.json | 12 +- .../version-management/gitlab/gitaly/Gemfile | 6 +- .../gitlab/gitaly/Gemfile.lock | 50 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitaly/gemset.nix | 46 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 46 +- .../gitlab/rubyEnv/Gemfile.lock | 124 +++-- .../gitlab/rubyEnv/gemset.nix | 194 ++++--- .../version-management/gitlab/yarnPkgs.nix | 472 ++++++++++-------- 10 files changed, 501 insertions(+), 457 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b214b663ae6..c46aaffbbd2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.0.5", - "repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs", + "version": "14.1.0", + "repo_hash": "1a61jc8rsbdbyh891nwygl7qlsj0lm8v59s66hn22csg0dvn6qk6", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.0.5-ee", + "rev": "v14.1.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.0.5", - "GITLAB_PAGES_VERSION": "1.40.0", + "GITALY_SERVER_VERSION": "14.1.0", + "GITLAB_PAGES_VERSION": "1.41.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.0.5" + "GITLAB_WORKHORSE_VERSION": "14.1.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 20f1034fc90..7eaf3c0f218 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.6' +gem 'activesupport', '~> 6.1.3.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -13,13 +13,13 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.17.1' +gem 'gitlab-labkit', '~> 0.20.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.14.0' +gem 'google-protobuf', '~> 3.17.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index af6a3ce8142..cab76b5c1e5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.6) - actionview (= 6.0.3.6) - activesupport (= 6.0.3.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.3.2) + actionview (= 6.1.3.2) + activesupport (= 6.1.3.2) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.6) - activesupport (= 6.0.3.6) + actionview (6.1.3.2) + activesupport (= 6.1.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.6) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) crass (1.0.6) diff-lcs (1.3) dotenv (2.7.6) @@ -45,7 +45,7 @@ GEM activesupport (>= 4.2.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.13.1) + ffi (1.15.3) gemojione (3.3.0) json github-linguist (7.12.1) @@ -65,16 +65,16 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.17.1) + gitlab-labkit (0.20.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 2.0) + pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.14.0) + google-protobuf (3.17.3) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) grpc (1.30.2) @@ -94,7 +94,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.9.1) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -105,7 +105,7 @@ GEM mime-types-data (3.2020.1104) mini_mime (1.0.2) mini_portile2 (2.5.1) - minitest (5.14.2) + minitest (5.14.4) msgpack (1.3.3) multipart-post (2.1.1) nokogiri (1.11.5) @@ -121,8 +121,8 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (2.0.3) - google-protobuf (~> 3.15.5) + pg_query (2.1.0) + google-protobuf (>= 3.17.1) proc_to_ast (0.1.0) coderay parser @@ -199,8 +199,8 @@ GEM thread_safe (0.3.6) thrift (0.14.1) timecop (0.9.1) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) unparser (0.4.7) abstract_type (~> 0.0.7) @@ -216,15 +216,15 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.6) + activesupport (~> 6.1.3.2) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.17.1) + gitlab-labkit (~> 0.20.0) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.14.0) + google-protobuf (~> 3.17.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ced652e68d9..bdc5eb92249 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,17 +21,17 @@ let }; }; in buildGoModule rec { - version = "14.0.5"; + version = "14.1.0"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM="; + sha256 = "sha256-k9Vz/b5ZKz93/7nzEA5mnQI8U++CB3E9b8gJBefl2b0="; }; - vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; + vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 91e5217c271..9a3ea0a0b55 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz"; + sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5"; + sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z"; + sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -122,10 +122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; crass = { groups = ["default"]; @@ -208,10 +208,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.3"; }; gemojione = { dependencies = ["json"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469"; + sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r"; type = "gem"; }; - version = "0.17.1"; + version = "0.20.0"; }; gitlab-markup = { groups = ["default"]; @@ -289,10 +289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; + sha256 = "0vmll4nnkha3vsqj1g76pwni6x7mp2i81pka4wdwq8qfhn210108"; type = "gem"; }; - version = "3.14.0"; + version = "3.17.3"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -383,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; + sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -451,10 +451,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; msgpack = { groups = ["default"]; @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag"; + sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -913,15 +913,15 @@ version = "0.9.1"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; unicode-display_width = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e237c4fd480..39bb89722e5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.0.5"; + version = "14.1.0"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 03b275e11d2..6657b6a1249 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -35,7 +35,7 @@ gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.12.1' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-activedirectory-v2', '~> 0.1' +gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' @@ -124,7 +124,7 @@ gem 'fog-aws', '~> 3.9' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google' +gem 'fog-google', '~> 1.15', require: 'fog/google' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -157,14 +157,14 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' -gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 +gem 'rdoc', '~> 6.3.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'asciidoctor-kroki', '~> 0.4.0', require: false +gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' @@ -197,7 +197,7 @@ gem 'acts-as-taggable-on', '~> 7.0' # Background jobs gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' -gem 'redis-namespace', '~> 1.7.0' +gem 'redis-namespace', '~> 1.8.1' gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' # Cron Parser @@ -229,7 +229,7 @@ gem 'js_regex', '~> 3.4' gem 'device_detector' # Redis -gem 'redis', '~> 4.0' +gem 'redis', '~> 4.1.4' gem 'connection_pool', '~> 2.0' # Redis session store @@ -258,7 +258,7 @@ gem 'asana', '~> 0.10.3' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.9.1' +gem 'kubeclient', '~> 4.9.2' # Sanitize user input gem 'sanitize', '~> 5.2.1' @@ -286,16 +286,16 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2' gem 'rack-proxy', '~> 0.6.0' gem 'sassc-rails', '~> 2.1.0' -gem 'autoprefixer-rails', '10.2.0.0' +gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' -gem 'addressable', '~> 2.7' +gem 'addressable', '~> 2.8' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem 'gitlab-license', '~> 1.5' +gem 'gitlab-license', '~> 2.0' # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' @@ -305,16 +305,12 @@ gem 'sentry-raven', '~> 3.1' # PostgreSQL query parsing # -# We need this fork until https://github.com/pganalyze/pg_query/pull/212 -# and https://github.com/pganalyze/pg_query/pull/213 are -# released. gitlab-labkit will need to be updated to use the pg_query -# version. -gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query' +gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.18.0' +gem 'gitlab-labkit', '~> 0.20.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -335,13 +331,9 @@ gem 'peek', '~> 1.1' gem 'snowplow-tracker', '~> 0.6.1' # Metrics -group :metrics do - gem 'method_source', '~> 1.0', require: false - gem 'webrick', '~> 1.6.1', require: false - - # Prometheus - gem 'prometheus-client-mmap', '~> 0.12.0' -end +gem 'method_source', '~> 1.0', require: false +gem 'webrick', '~> 1.6.1', require: false +gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client' group :development do gem 'lefthook', '~> 0.7.0', require: false @@ -402,7 +394,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.1.2', require: false + gem 'gitlab-dangerfiles', '~> 2.2.2', require: false end group :development, :test, :coverage do @@ -480,7 +472,7 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.0.0.pre.rc2' +gem 'gitaly', '~> 14.1.0.pre.rc3' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -489,14 +481,14 @@ gem 'grpc', '~> 1.30.2' gem 'google-protobuf', '~> 3.17.1' -gem 'toml-rb', '~> 1.0.0' +gem 'toml-rb', '~> 2.0' # Feature toggles gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.5.4' +gem 'gitlab-experiment', '~> 0.6.1' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 62222b56396..2ac92ce9ae7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -72,7 +72,7 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.1.0) akismet (3.0.0) @@ -85,10 +85,10 @@ GEM faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) - asciidoctor (2.0.12) + asciidoctor (2.0.15) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.4.0) + asciidoctor-kroki (0.5.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) @@ -98,9 +98,9 @@ GEM attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.1) - autoprefixer-rails (10.2.0.0) - execjs - awesome_print (1.8.0) + autoprefixer-rails (10.2.5.1) + execjs (> 0) + awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.1.0) aws-partitions (1.345.0) @@ -222,7 +222,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.2.3) + danger (8.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -336,7 +336,7 @@ GEM tzinfo eventmachine (1.2.7) excon (0.71.1) - execjs (2.7.0) + execjs (2.8.1) expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -374,7 +374,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.15.1) + ffi (1.15.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -405,6 +405,12 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types + fog-google (1.15.0) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) + google-api-client (>= 0.44.2, < 0.51) + google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -447,7 +453,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.0.0.pre.rc2) + gitaly (14.1.0.pre.rc3) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -455,9 +461,10 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.1.2) - danger-gitlab - gitlab-experiment (0.5.4) + gitlab-dangerfiles (2.2.2) + danger (>= 8.3.1) + danger-gitlab (>= 8.0.0) + gitlab-experiment (0.6.1) activesupport (>= 3.0) request_store (>= 1.0) scientist (~> 1.6, >= 1.6.0) @@ -468,22 +475,15 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-fog-google (1.13.0) - addressable (>= 2.7.0) - fog-core (<= 2.1.0) - fog-json (~> 1.2) - fog-xml (~> 0.1.0) - google-api-client (>= 0.44.2, < 0.51) - google-cloud-env (~> 1.2) - gitlab-labkit (0.18.0) + gitlab-labkit (0.20.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - gitlab-pg_query (~> 2.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) + pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) - gitlab-license (1.5.0) + gitlab-license (2.0.0) gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) @@ -491,9 +491,6 @@ GEM addressable (~> 2.7) omniauth (~> 1.9) openid_connect (~> 1.2) - gitlab-pg_query (2.0.4) - google-protobuf (>= 3.17.1) - gitlab-rdoc (6.3.2) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) gitlab-styles (6.2.0) @@ -525,7 +522,7 @@ GEM retriable (>= 2.0, < 4.0) rexml signet (~> 0.12) - google-cloud-env (1.4.0) + google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) google-protobuf (3.17.1) googleapis-common-protos-types (1.0.6) @@ -611,7 +608,7 @@ GEM hana (1.3.6) hangouts-chat (0.0.5) hashdiff (1.0.1) - hashie (3.6.0) + hashie (4.1.0) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (3.0.0) @@ -671,9 +668,8 @@ GEM hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jsonpath (1.0.5) + jsonpath (1.1.0) multi_json - to_regexp (~> 0.2.1) jwt (2.1.0) kaminari (1.2.1) activesupport (>= 4.1.0) @@ -695,7 +691,7 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.9.1) + kubeclient (4.9.2) http (>= 3.0, < 5.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -755,7 +751,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -793,7 +789,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.4) + nokogiri (1.11.5) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -803,7 +799,7 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.4) - oauth2 (1.4.4) + oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) @@ -826,8 +822,8 @@ GEM train-core wmi-lite (~> 1.0) oj (3.10.6) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) @@ -837,8 +833,8 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-activedirectory-v2 (0.1.1) - omniauth-oauth2 + omniauth-azure-activedirectory-v2 (1.0.0) + omniauth-oauth2 (~> 1.7) omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) omniauth (~> 1.0) @@ -867,9 +863,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-salesforce (1.0.5) @@ -915,6 +911,8 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) + pg_query (2.1.0) + google-protobuf (>= 3.17.1) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1018,11 +1016,12 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) + rdoc (6.3.2) re2 (1.2.0) recaptcha (4.13.1) json - recursive-open-struct (1.1.2) - redis (4.1.3) + recursive-open-struct (1.1.3) + redis (4.1.4) redis-actionpack (5.2.0) actionpack (>= 5, < 7) redis-rack (>= 2.1.0, < 3) @@ -1030,7 +1029,7 @@ GEM redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) - redis-namespace (1.7.0) + redis-namespace (1.8.1) redis (>= 3.0.4) redis-rack (2.1.2) rack (>= 2.0.8, < 3) @@ -1256,7 +1255,7 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) - sys-filesystem (1.1.6) + sys-filesystem (1.1.9) ffi sysexits (1.2.0) temple (0.8.2) @@ -1279,10 +1278,9 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) - to_regexp (0.2.1) toml (0.2.0) parslet (~> 1.8.0) - toml-rb (1.0.0) + toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) tpm-key_attestation (0.9.0) @@ -1395,17 +1393,17 @@ DEPENDENCIES acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 7.0) - addressable (~> 2.7) + addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-kroki (~> 0.4.0) + asciidoctor-kroki (~> 0.5.0) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) - autoprefixer-rails (= 10.2.0.0) + autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) aws-sdk-core (~> 3) @@ -1467,6 +1465,7 @@ DEPENDENCIES fog-aliyun (~> 0.3) fog-aws (~> 3.9) fog-core (= 2.1.0) + fog-google (~> 1.15) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) @@ -1476,21 +1475,18 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.0.0.pre.rc2) + gitaly (~> 14.1.0.pre.rc3) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.1.2) - gitlab-experiment (~> 0.5.4) + gitlab-dangerfiles (~> 2.2.2) + gitlab-experiment (~> 0.6.1) gitlab-fog-azure-rm (~> 1.1.1) - gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.18.0) - gitlab-license (~> 1.5) + gitlab-labkit (~> 0.20.0) + gitlab-license (~> 2.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.4.0) - gitlab-pg_query (~> 2.0.4) - gitlab-rdoc (~> 6.3.2) gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1531,7 +1527,7 @@ DEPENDENCIES kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.1) + kubeclient (~> 4.9.2) lefthook (~> 0.7.0) letter_opener_web (~> 1.4.0) license_finder (~> 6.0) @@ -1559,7 +1555,7 @@ DEPENDENCIES omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) - omniauth-azure-activedirectory-v2 (~> 0.1) + omniauth-azure-activedirectory-v2 (~> 1.0) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) @@ -1578,6 +1574,7 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) + pg_query (~> 2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) @@ -1598,10 +1595,11 @@ DEPENDENCIES rainbow (~> 3.0) rblineprof (~> 0.3.6) rbtrace (~> 0.4) + rdoc (~> 6.3.2) re2 (~> 1.2.0) recaptcha (~> 4.11) - redis (~> 4.0) - redis-namespace (~> 1.7.0) + redis (~> 4.1.4) + redis-namespace (~> 1.8.1) redis-rails (~> 5.0.2) request_store (~> 1.5) responders (~> 3.0) @@ -1651,7 +1649,7 @@ DEPENDENCIES thin (~> 1.8.0) thrift (>= 0.14.0) timecop (~> 0.9.1) - toml-rb (~> 1.0.0) + toml-rb (~> 2.0) truncato (~> 0.7.11) u2f (~> 0.2.1) unf (~> 0.1.4) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 215f1467fed..236245ca001 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -176,14 +176,14 @@ }; addressable = { dependencies = ["public_suffix"]; - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; aes_key_wrap = { groups = ["default"]; @@ -242,10 +242,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9"; + sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; type = "gem"; }; - version = "2.0.12"; + version = "2.0.15"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w"; + sha256 = "04jzsicaynwyy4l3w69x1qqww4av57army5xiapvv2b6g5s8nb32"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -328,20 +328,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p9j0sxw0nm27x7wj0n8a9zikwb0v8b6varr601rcgymsjj2v7wy"; + sha256 = "1vlqwy2qkp39ibp7llj7ps53nvxav29c2yl451v1qdhj25zxc49p"; type = "gem"; }; - version = "10.2.0.0"; + version = "10.2.5.1"; }; awesome_print = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; + sha256 = "0vkq6c8y2jvaw03ynds5vjzl1v9wg608cimkd3bidzxc0jvk56z9"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.2"; }; awrence = { groups = ["default"]; @@ -963,10 +963,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nv02gq90nngnfa6hgiyyk60a31xfayk67va98k41gy9arhdkz5g"; + sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l"; type = "gem"; }; - version = "8.2.3"; + version = "8.3.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1460,10 +1460,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; expression_parser = { groups = ["default"]; @@ -1659,10 +1659,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1762,6 +1762,17 @@ }; version = "2.1.0"; }; + fog-google = { + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01mky1gqgg8vijr2avyspc9l4asjzkr5xc31x4c4ff7jzf00g11g"; + type = "gem"; + }; + version = "1.15.0"; + }; fog-json = { dependencies = ["fog-core" "multi_json"]; groups = ["default"]; @@ -1941,10 +1952,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpp1zdwjmglsycliag6v9844jnhpvkblry9i14a16gspqdsfam4"; + sha256 = "0kf335cnps9ix3jfnfq99zlp7wrf6p9lip7cxicxylvn682i7l4y"; type = "gem"; }; - version = "14.0.0.pre.rc2"; + version = "14.1.0.pre.rc3"; }; github-markup = { groups = ["default"]; @@ -1979,15 +1990,15 @@ version = "0.10.5"; }; gitlab-dangerfiles = { - dependencies = ["danger-gitlab"]; + dependencies = ["danger" "danger-gitlab"]; groups = ["danger" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vcxzbsvgis47ifgd82rjn12587qcw6q2q0n0y3cg5snag6fqdb"; + sha256 = "1x5qlncyc090vyvgpj5f186109gfyv4jcbyibbyq3mcd38brqgc2"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store" "scientist"]; @@ -1995,10 +2006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18xc1785b9h0vwlqgi2m0mhjim6jaqqpi8nnl4hh8mbjd4d6kf1j"; + sha256 = "0d1w5vd3001469bk5cqac5d9l44f6sbqbzw5z4xiflyi7fdad9jf"; type = "gem"; }; - version = "0.5.4"; + version = "0.6.1"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -2011,37 +2022,26 @@ }; version = "1.1.1"; }; - gitlab-fog-google = { - dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ybmiclsdpkp1l91z6d4qkhha6cik6kgf4kzs3a2c26mhnnj6gxy"; - type = "gem"; - }; - version = "1.13.0"; - }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d18fx54dq2a2ngdix3dchbk4xpxfpqz1rkr2hi1kvi6idq4k6qp"; + sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r"; type = "gem"; }; - version = "0.18.0"; + version = "0.20.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qcbdrxqwbri0kgiamrvx9y7cii3smf94g6scgn2l369m6955x1"; + sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz"; type = "gem"; }; - version = "1.5.0"; + version = "2.0.0"; }; gitlab-mail_room = { groups = ["default"]; @@ -2084,27 +2084,6 @@ }; version = "0.4.0"; }; - gitlab-pg_query = { - dependencies = ["google-protobuf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17whjbrmyh1wn3badapa1xhdcjpdrxgn7vz705fpi1p9r8q0a2vj"; - type = "gem"; - }; - version = "2.0.4"; - }; - gitlab-rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9"; - type = "gem"; - }; - version = "6.3.2"; - }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; groups = ["default"]; @@ -2188,10 +2167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; google-protobuf = { groups = ["default"]; @@ -2456,10 +2435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh"; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; type = "gem"; }; - version = "3.6.0"; + version = "4.1.0"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -2748,15 +2727,15 @@ version = "0.2.12"; }; jsonpath = { - dependencies = ["multi_json" "to_regexp"]; + dependencies = ["multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bwgk17dwraaf6grv6v99xjjy3ds1sqsf1v49fnlyfjkniy6ap8q"; + sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.0"; }; jwt = { groups = ["default"]; @@ -2861,10 +2840,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ygwvdrdhqmvqj3g7hsrgwimr1xcphk9d6qjdxr0iynqaahn0l7"; + sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4"; type = "gem"; }; - version = "4.9.1"; + version = "4.9.2"; }; launchy = { dependencies = ["addressable"]; @@ -3147,10 +3126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.1"; }; minitest = { groups = ["development" "test"]; @@ -3406,10 +3385,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b"; + sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; type = "gem"; }; - version = "1.11.4"; + version = "1.11.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3459,10 +3438,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhakjh30vi8scqwnhd1c9qkac9r8hh2lr0dbs5ynwmrc5djxknm"; + sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.7"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -3502,10 +3481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.1"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3546,10 +3525,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bgdyzjh7x9knkzaa6bl9f5fvh05nd0gqxrqassww0vqh5qgyfpy"; + sha256 = "1pv9pxff3g4cva76zzsx8fibb08c9av51lxksh73mbl9rrxdgkgd"; type = "gem"; }; - version = "0.1.1"; + version = "1.0.0"; }; omniauth-azure-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; @@ -3656,10 +3635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; + sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -3882,6 +3861,17 @@ }; version = "1.2.3"; }; + pg_query = { + dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx"; + type = "gem"; + }; + version = "2.1.0"; + }; plist = { groups = ["default"]; platforms = []; @@ -4316,6 +4306,16 @@ }; version = "1.8.0"; }; + rdoc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; + type = "gem"; + }; + version = "6.3.2"; + }; re2 = { groups = ["default"]; platforms = []; @@ -4342,10 +4342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12manni00r5qn50z8w316pnm8mqn858i5kj6s9sr9sfl8qx8ws5g"; + sha256 = "0nnyr6qsqrcszf6c10n4zfjs8h9n67zvsmx6mp8brkigamr8llx3"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; RedCloth = { groups = ["default"]; @@ -4362,10 +4362,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh"; + sha256 = "0j0p82yb2a0z2sv38jq9xdzs0kvbslpyfdxky9f3znpy3igxj6yh"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.4"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -4395,10 +4395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wb4x8bg2d0plv3izpmi1sd7nd1ix8nxw7b43hd9bac08f4w62mx"; + sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -5352,10 +5352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq"; + sha256 = "03y0mnn5mp9ydi5jc4d3y0gnk5fxwljzzfzj9rg7q94kslwi1kx4"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.9"; }; sysexits = { groups = ["default" "development" "test"]; @@ -5511,16 +5511,6 @@ }; version = "0.8.3"; }; - to_regexp = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v"; - type = "gem"; - }; - version = "0.2.1"; - }; toml = { dependencies = ["parslet"]; groups = ["default" "development" "test"]; @@ -5538,10 +5528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; + sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh"; type = "gem"; }; - version = "1.0.0"; + version = "2.0.1"; }; tomlrb = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 2af33d3184f..519625a1930 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,11 +778,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; - sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; }; } { @@ -794,11 +794,11 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_8.4.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_9.0.2.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.4.0.tgz"; - sha1 = "094fa4d41676a71146f82e1b19257a7ceabefd88"; + name = "_gitlab_eslint_plugin___eslint_plugin_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-9.0.2.tgz"; + sha1 = "c7e0c8744001227d88624eb533047f3d5dd8d419"; }; } { @@ -818,11 +818,11 @@ }; } { - name = "_gitlab_svgs___svgs_1.199.0.tgz"; + name = "_gitlab_svgs___svgs_1.202.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.199.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.199.0.tgz"; - sha1 = "0512a854018defc4e286b8ecb2143958bb535146"; + name = "_gitlab_svgs___svgs_1.202.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.202.0.tgz"; + sha1 = "dbfad291fc5f597f0d31ca6a694fa8e78af57847"; }; } { @@ -834,11 +834,11 @@ }; } { - name = "_gitlab_ui___ui_29.35.0.tgz"; + name = "_gitlab_ui___ui_31.5.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_29.35.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.35.0.tgz"; - sha1 = "bb04d1e4f8796134bc406adaa869c1b5b1fdcaf2"; + name = "_gitlab_ui___ui_31.5.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.5.0.tgz"; + sha1 = "45b7866b790e7d5a1b67b39000c047991036b437"; }; } { @@ -850,11 +850,19 @@ }; } { - name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; path = fetchurl { - name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.3.0.tgz"; - sha1 = "f21550d4ce406ee5f99447a02abf36250ecc922d"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; + }; + } + { + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + path = fetchurl { + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; }; } { @@ -1114,11 +1122,11 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.57.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.57.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.57.tgz"; - sha1 = "aed4649a51745deef5e4ee79b9a4fdc092471237"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.58.tgz"; + sha1 = "7adc78c0a420e7527c68782e2f0c9c62652df02d"; }; } { @@ -1154,67 +1162,67 @@ }; } { - name = "_tiptap_core___core_2.0.0_beta.75.tgz"; + name = "_tiptap_core___core_2.0.0_beta.86.tgz"; path = fetchurl { - name = "_tiptap_core___core_2.0.0_beta.75.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.75.tgz"; - sha1 = "8295dfa7ca4b22de61e9c68a102763343b26e03a"; + name = "_tiptap_core___core_2.0.0_beta.86.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.86.tgz"; + sha1 = "11b575aee4ad2f30f73114c786da5cd13dde30e0"; }; } { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.13.tgz"; - sha1 = "72a26dd54e5edb9abc4488ad7c1f0a43d4089bd5"; + name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.14.tgz"; + sha1 = "f49872981aecdd21341c4d5db32ab68cba945756"; }; } { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.13.tgz"; - sha1 = "d6b8f3797a6f7932ae38b9d761cc1effa886b715"; + name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.14.tgz"; + sha1 = "6bf9ea70f7e24e6d674c7780471fcb6a7a4b91f4"; }; } { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz"; + name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.24.tgz"; path = fetchurl { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.20.tgz"; - sha1 = "248c70910bf232ed5fb9eb3a7c084bc592d2341d"; + name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.24.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.24.tgz"; + sha1 = "e6db5bc0386ccdbd483e57296b22eb6dd55914ba"; }; } { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.13.tgz"; - sha1 = "8b2c4ec8decc5562ae9bb5d97b0a99e0b27f9794"; + name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.14.tgz"; + sha1 = "29b9bfa2e908cdb01943242f75daf82115f5afd1"; }; } { - name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz"; + name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.32.tgz"; path = fetchurl { - name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.25.tgz"; - sha1 = "eb5f721fa8a4035244b7883e3cfc770f17fae27f"; + name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.32.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.32.tgz"; + sha1 = "ef9ff6883f2d669e6be79c69f26749641462e1ea"; }; } { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz"; + name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.16.tgz"; path = fetchurl { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.15.tgz"; - sha1 = "3fb0f04c38f8276195a1a958cc7d3399b52dc46a"; + name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.16.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.16.tgz"; + sha1 = "7788ee1af04eb84fe194261bb1bb835dbe7ad59e"; }; } { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_code___extension_code_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.13.tgz"; - sha1 = "fa2d14c61fe213c2c40b196e1b1b7a8862cec987"; + name = "_tiptap_extension_code___extension_code_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.14.tgz"; + sha1 = "679a741589d63006140605553be7c6148c000814"; }; } { @@ -1226,83 +1234,83 @@ }; } { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz"; + name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.17.tgz"; path = fetchurl { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.14.tgz"; - sha1 = "b5e4137d4be1afe14a8f67d932af5e6d3df7cb56"; + name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.17.tgz"; + sha1 = "3ca59c264b49a91c1a5b2ce8de3e898903d0a5bc"; }; } { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz"; + name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.18.tgz"; path = fetchurl { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.16.tgz"; - sha1 = "109226c060351b83916441cd58d631eff47d6bb2"; + name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.18.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.18.tgz"; + sha1 = "4d9b7f58c73f6c718a74503c5ff514b06f615e27"; }; } { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz"; + name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.18.tgz"; path = fetchurl { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.17.tgz"; - sha1 = "774037fddab50379b21a58cab91bfd988b9b793f"; + name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.18.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.18.tgz"; + sha1 = "67c2266ec21c90f003e989862b709475f5427fea"; }; } { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.13.tgz"; - sha1 = "36b5433e70e8eac121d6d26871ff60527b500442"; + name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.14.tgz"; + sha1 = "dce00c49dc614caac82720b930501a59b38d5584"; }; } { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.13.tgz"; - sha1 = "7d6f4a0e28af47ad1a1e455af01dbd1997a9f948"; + name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.14.tgz"; + sha1 = "63df6d7282afd3c2db2253af2e538c3bf2800751"; }; } { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz"; + name = "_tiptap_extension_history___extension_history_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.12.tgz"; - sha1 = "a25607aab594998d6b46576724d56701a2833689"; + name = "_tiptap_extension_history___extension_history_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.14.tgz"; + sha1 = "7990a592a521ca4147e733eed78fcb738ed6ba95"; }; } { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz"; + name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.17.tgz"; path = fetchurl { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.16.tgz"; - sha1 = "7f8a3e14de2fc8bbb52816a697450a61d8797689"; + name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.17.tgz"; + sha1 = "25c15bfab5794a3f1bcf6f4df03bef56ddac80aa"; }; } { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_image___extension_image_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.13.tgz"; - sha1 = "58a2e66533e2ef63e67aeb7980fe642b75fa17a0"; + name = "_tiptap_extension_image___extension_image_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.14.tgz"; + sha1 = "31eae69cce3d81af81a1c0fbd253beca3c253429"; }; } { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.13.tgz"; - sha1 = "8b0810e41dc5c3bfb0640d638b0b40464cd81fea"; + name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.14.tgz"; + sha1 = "5b56a806ef6507dc2001eaeeeb234ee0b25d8544"; }; } { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz"; + name = "_tiptap_extension_link___extension_link_2.0.0_beta.18.tgz"; path = fetchurl { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.17.tgz"; - sha1 = "5a3c28762cf332bb4de0fb13ce6973b11496697a"; + name = "_tiptap_extension_link___extension_link_2.0.0_beta.18.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.18.tgz"; + sha1 = "792c671daf3db79873b8425e68da43dd19af230b"; }; } { @@ -1314,27 +1322,59 @@ }; } { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.13.tgz"; - sha1 = "4df2264e1405f73848cd2fedcea95f3064911cd7"; + name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.14.tgz"; + sha1 = "54487f8b9246226586d0190d07a449a97536436a"; }; } { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz"; + name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.15.tgz"; path = fetchurl { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.14.tgz"; - sha1 = "6b8c64166f3b581a1f8e1ae415b895e5bd2952d1"; + name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.15.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.15.tgz"; + sha1 = "89483a2f438d8412287d441c890304985c2ac07f"; }; } { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz"; + name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.16.tgz"; path = fetchurl { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.15.tgz"; - sha1 = "c274ae85b1067f80d45a1cb30d0cad24733c9be7"; + name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.16.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.16.tgz"; + sha1 = "cccce9713824e05ebde895f84f747b8bbed45f7d"; + }; + } + { + name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz"; + path = fetchurl { + name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.0.0-beta.13.tgz"; + sha1 = "c01eada4859d5ea487d61e68cc7fab7ed2e4842a"; + }; + } + { + name = "_tiptap_extension_table_header___extension_table_header_2.0.0_beta.15.tgz"; + path = fetchurl { + name = "_tiptap_extension_table_header___extension_table_header_2.0.0_beta.15.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.0.0-beta.15.tgz"; + sha1 = "884d16f104671ee672f1f629f4e4fef0b096bfbb"; + }; + } + { + name = "_tiptap_extension_table_row___extension_table_row_2.0.0_beta.13.tgz"; + path = fetchurl { + name = "_tiptap_extension_table_row___extension_table_row_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.0.0-beta.13.tgz"; + sha1 = "3f9a61112afcde750228f4437ae3cd7b82d02f74"; + }; + } + { + name = "_tiptap_extension_table___extension_table_2.0.0_beta.25.tgz"; + path = fetchurl { + name = "_tiptap_extension_table___extension_table_2.0.0_beta.25.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.0.0-beta.25.tgz"; + sha1 = "57accf19c07e96bd0db868eb791da20bd423af36"; }; } { @@ -1346,11 +1386,11 @@ }; } { - name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz"; + name = "_tiptap_vue_2___vue_2_2.0.0_beta.39.tgz"; path = fetchurl { - name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.34.tgz"; - sha1 = "df9309eb812b50a85315c4623ac222db751fc97a"; + name = "_tiptap_vue_2___vue_2_2.0.0_beta.39.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.39.tgz"; + sha1 = "f6d75af99b072848381f0c443b50ec09186eb43b"; }; } { @@ -1498,11 +1538,11 @@ }; } { - name = "_types_lowlight___lowlight_0.0.2.tgz"; + name = "_types_lowlight___lowlight_0.0.3.tgz"; path = fetchurl { - name = "_types_lowlight___lowlight_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.2.tgz"; - sha1 = "bb517f1486477a8c59dea11be0dfaf96d629d35d"; + name = "_types_lowlight___lowlight_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.3.tgz"; + sha1 = "433b03dd63894dde17860063f4c90a688431194b"; }; } { @@ -1586,27 +1626,27 @@ }; } { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.1.tgz"; + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.2.tgz"; path = fetchurl { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.1.tgz"; - sha1 = "3ba98dd861ff2a62559e70f453f996a1ef5ec55d"; + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.2.tgz"; + sha1 = "476b90a661f32d6d6a21599f53fcd71e36c65a1f"; }; } { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; path = fetchurl { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz"; - sha1 = "989e98c734e01e2ed4cab39992e60a1b0646cab6"; + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz"; + sha1 = "7df7d373edb33ea8da12084bfd462cf84cd69761"; }; } { - name = "_types_prosemirror_history___prosemirror_history_1.0.2.tgz"; + name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; path = fetchurl { - name = "_types_prosemirror_history___prosemirror_history_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.2.tgz"; - sha1 = "f90a009a0dcd71393faa69ce705593dec76347a1"; + name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz"; + sha1 = "f1110efbe758129b5475e466ff077f0a8d9b964f"; }; } { @@ -1626,11 +1666,11 @@ }; } { - name = "_types_prosemirror_model___prosemirror_model_1.13.0.tgz"; + name = "_types_prosemirror_model___prosemirror_model_1.13.1.tgz"; path = fetchurl { - name = "_types_prosemirror_model___prosemirror_model_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.13.0.tgz"; - sha1 = "d05937e918c3cac2cf49630ccab04a65fc5fffd6"; + name = "_types_prosemirror_model___prosemirror_model_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.13.1.tgz"; + sha1 = "53df04ee174a7e1dc12747005b1b4c02565adcc4"; }; } { @@ -1642,27 +1682,27 @@ }; } { - name = "_types_prosemirror_state___prosemirror_state_1.2.6.tgz"; + name = "_types_prosemirror_state___prosemirror_state_1.2.7.tgz"; path = fetchurl { - name = "_types_prosemirror_state___prosemirror_state_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.6.tgz"; - sha1 = "bb0169084239a8393b354c6fda5420fc347d6bab"; + name = "_types_prosemirror_state___prosemirror_state_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.7.tgz"; + sha1 = "cd55062e4043a31e3426f47668f1d7038b5d8dfb"; }; } { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz"; + name = "_types_prosemirror_transform___prosemirror_transform_1.1.4.tgz"; path = fetchurl { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz"; - sha1 = "cf30d275976978d1c0317d0659145426fc49ce6f"; + name = "_types_prosemirror_transform___prosemirror_transform_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.4.tgz"; + sha1 = "c3565e81b2ef3ce3254e6927d6f63eb8d7bb20d0"; }; } { - name = "_types_prosemirror_view___prosemirror_view_1.17.1.tgz"; + name = "_types_prosemirror_view___prosemirror_view_1.17.2.tgz"; path = fetchurl { - name = "_types_prosemirror_view___prosemirror_view_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.17.1.tgz"; - sha1 = "0895df5a57ae6e68d4f3f8020d9be4ef52192980"; + name = "_types_prosemirror_view___prosemirror_view_1.17.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.17.2.tgz"; + sha1 = "3aff71a0802bdfc310404db8a37ced2db69fd74f"; }; } { @@ -2882,11 +2922,11 @@ }; } { - name = "browserslist___browserslist_4.16.1.tgz"; + name = "browserslist___browserslist_4.16.6.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.1.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz"; - sha1 = "bf757a2da376b3447b800a16f0f1c96358138766"; + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; }; } { @@ -3066,11 +3106,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz"; - sha1 = "3482a407d261da04393e2f0d61eefbc53be43b95"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598"; }; } { @@ -3698,11 +3738,11 @@ }; } { - name = "core_js_compat___core_js_compat_3.6.4.tgz"; + name = "core_js_compat___core_js_compat_3.15.2.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz"; - sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17"; + name = "core_js_compat___core_js_compat_3.15.2.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz"; + sha1 = "47272fbb479880de14b4e6081f71f3492f5bd3cb"; }; } { @@ -4722,11 +4762,11 @@ }; } { - name = "dompurify___dompurify_2.2.9.tgz"; + name = "dompurify___dompurify_2.3.0.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.9.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz"; - sha1 = "4b42e244238032d9286a0d2c87b51313581d9624"; + name = "dompurify___dompurify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz"; + sha1 = "07bb39515e491588e5756b1d3e8375b5964814e2"; }; } { @@ -4826,11 +4866,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.762.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz"; - sha1 = "8b884f50296c2ae2a9997f024d0e3e57facc2b94"; + name = "electron_to_chromium___electron_to_chromium_1.3.762.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.762.tgz"; + sha1 = "3fa4e3bcbda539b50e3aa23041627063a5cffe61"; }; } { @@ -5258,11 +5298,11 @@ }; } { - name = "eslint___eslint_7.28.0.tgz"; + name = "eslint___eslint_7.31.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.28.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; - sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; + name = "eslint___eslint_7.31.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz"; + sha1 = "f972b539424bf2604907a970860732c5d99d3aca"; }; } { @@ -8441,14 +8481,6 @@ sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; }; } - { - name = "lodash___lodash_4.17.20.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -9074,19 +9106,27 @@ }; } { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_4.0.0.tgz"; path = fetchurl { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz"; - sha1 = "eb4bbb1c5e5bfb554541c1ae1542e74c2a9f43fd"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-4.0.0.tgz"; + sha1 = "95be3f48f4220999b909266a9997727f0deab947"; }; } { - name = "monaco_editor___monaco_editor_0.20.0.tgz"; + name = "monaco_editor___monaco_editor_0.24.0.tgz"; path = fetchurl { - name = "monaco_editor___monaco_editor_0.20.0.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz"; - sha1 = "5d5009343a550124426cb4d965a4d27a348b4dea"; + name = "monaco_editor___monaco_editor_0.24.0.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.24.0.tgz"; + sha1 = "990b55096bcc95d08d8d28e55264c6eb17707269"; + }; + } + { + name = "monaco_editor___monaco_editor_0.25.2.tgz"; + path = fetchurl { + name = "monaco_editor___monaco_editor_0.25.2.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.25.2.tgz"; + sha1 = "119e2b15bbd968a1a99c03cac9c329316d7c37e9"; }; } { @@ -9266,11 +9306,11 @@ }; } { - name = "node_releases___node_releases_1.1.70.tgz"; + name = "node_releases___node_releases_1.1.73.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.70.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz"; - sha1 = "66e0ed0273aa65666d7fe78febe7634875426a08"; + name = "node_releases___node_releases_1.1.73.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz"; + sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"; }; } { @@ -9745,6 +9785,14 @@ sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258"; }; } + { + name = "papaparse___papaparse_5.3.1.tgz"; + path = fetchurl { + name = "papaparse___papaparse_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.1.tgz"; + sha1 = "770b7a9124d821d4b2132132b7bd7dce7194b5b1"; + }; + } { name = "parallel_transform___parallel_transform_1.1.0.tgz"; path = fetchurl { @@ -10386,11 +10434,11 @@ }; } { - name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz"; + name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.8.tgz"; - sha1 = "61aec59ac101b7990ec59726199f2a31ef0cd8ca"; + name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz"; + sha1 = "406a6589966e6cd80809cea2d801fb998639b37d"; }; } { @@ -10442,19 +10490,27 @@ }; } { - name = "prosemirror_model___prosemirror_model_1.14.1.tgz"; + name = "prosemirror_model___prosemirror_model_1.14.2.tgz"; path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.1.tgz"; - sha1 = "d784c67f95a5d66b853e82ff9a87a50353ef9cd5"; + name = "prosemirror_model___prosemirror_model_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.2.tgz"; + sha1 = "4e8c39cfff4e097631af4495e125d9a8a9773116"; }; } { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + name = "prosemirror_schema_basic___prosemirror_schema_basic_1.1.2.tgz"; path = fetchurl { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz"; - sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1"; + name = "prosemirror_schema_basic___prosemirror_schema_basic_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.1.2.tgz"; + sha1 = "4bde5c339c845e0d08ec8fe473064e372ca51ae3"; + }; + } + { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; + path = fetchurl { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz"; + sha1 = "e7ad9e337ea3d77da6d6a4250f3d7bd51ae980a4"; }; } { @@ -10473,6 +10529,14 @@ sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e"; }; } + { + name = "prosemirror_test_builder___prosemirror_test_builder_1.0.4.tgz"; + path = fetchurl { + name = "prosemirror_test_builder___prosemirror_test_builder_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.0.4.tgz"; + sha1 = "68d1d1cedcd90cc2fdd976d736ce87b7a5f1e873"; + }; + } { name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz"; path = fetchurl { @@ -10482,11 +10546,11 @@ }; } { - name = "prosemirror_view___prosemirror_view_1.18.7.tgz"; + name = "prosemirror_view___prosemirror_view_1.18.9.tgz"; path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.18.7.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.7.tgz"; - sha1 = "d9843337a1649f532401589899b724e7e87e83c0"; + name = "prosemirror_view___prosemirror_view_1.18.9.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.9.tgz"; + sha1 = "29bc11759438aecc5b7fadaa8520165c84c2144a"; }; } { From 5870dfba88f173dc1e5487483ba0477dedc0ca45 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 Dec 2019 20:58:01 +0000 Subject: [PATCH 0159/1522] postgresql: use postgresql_13 instead of postgresql_11 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 217d37e1701..ea71d9c2b24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20072,9 +20072,11 @@ in postgresql_13 postgresql_14 ; - postgresql = postgresql_11.override { this = postgresql; }; + postgresql = postgresql_13.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql11Packages = pkgs.postgresqlPackages; + postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; + postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; + postgresql13Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From f863703dd296665ab9a653910bc2be8524c020c6 Mon Sep 17 00:00:00 2001 From: "Jason R. McNeil" Date: Wed, 14 Jul 2021 20:58:21 -0700 Subject: [PATCH 0160/1522] php: Use default llvm compiler-rt versions 5-10 were marked as broken on aarch64-darwin in #127979, preventing PHP from building. Original rationale from c72c6a48ca2c for llvm 6.x is that 7.x wasn't working for all packages, php being one, so it was locked to 6.x --- 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 ed1329180b2..159b85d8db4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12568,14 +12568,14 @@ in # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; From dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 22 Jul 2021 10:22:59 +0200 Subject: [PATCH 0161/1522] rsync: format, remove ? null (#131005) --- .../networking/sync/rsync/default.nix | 60 ++++++++++--------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 7ce0ffb6089..88304e56a40 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt -, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null -, enableLZ4 ? true, lz4 ? null -, enableOpenSSL ? true, openssl ? null -, enableXXHash ? true, xxHash ? null -, enableZstd ? true, zstd ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, libiconv +, zlib +, popt +, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl +, acl +, enableLZ4 ? true +, lz4 +, enableOpenSSL ? true +, openssl +, enableXXHash ? true +, xxHash +, enableZstd ? true +, zstd , enableCopyDevicesPatch ? false , nixosTests }: -assert enableACLs -> acl != null; -assert enableLZ4 -> lz4 != null; -assert enableOpenSSL -> openssl != null; -assert enableXXHash -> xxHash != null; -assert enableZstd -> zstd != null; - let base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in @@ -25,17 +31,17 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; - srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; + srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc; patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" ++ base.extraPatches; - buildInputs = [libiconv zlib popt] - ++ lib.optional enableACLs acl - ++ lib.optional enableZstd zstd - ++ lib.optional enableLZ4 lz4 - ++ lib.optional enableOpenSSL openssl - ++ lib.optional enableXXHash xxHash; - nativeBuildInputs = [perl]; + buildInputs = [ libiconv zlib popt ] + ++ lib.optional enableACLs acl + ++ lib.optional enableZstd zstd + ++ lib.optional enableLZ4 lz4 + ++ lib.optional enableOpenSSL openssl + ++ lib.optional enableXXHash xxHash; + nativeBuildInputs = [ perl ]; configureFlags = [ "--with-nobody-group=nogroup" @@ -44,13 +50,13 @@ stdenv.mkDerivation rec { # links them even. "--with-included-zlib=no" ] - # Work around issue with cross-compilation: - # configure.sh: error: cannot run test program while cross compiling - # Remove once 3.2.4 or more recent is released. - # The following PR should fix the cross-compilation issue. - # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. - # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" ; passthru.tests = { inherit (nixosTests) rsyncd; }; From 94848bd430750f523706a42371bb0b268e75c695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 11:29:02 +0200 Subject: [PATCH 0162/1522] fetchgitlab: add deepClone, fetchSubmodules, leaveDotGit arguments --- pkgs/build-support/fetchgitlab/default.nix | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 77512510a7c..5b9dbd71c59 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -1,22 +1,26 @@ -{ fetchzip, lib }: +{ fetchgit, fetchzip, lib }: # gitlab example { owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null +, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false , ... # For hash agility } @ args: -with lib; - let - slug = concatStringsSep "/" - ((optional (group != null) group) ++ [ owner repo ]); + slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]); + escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; + escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev; + passthruAttrs = removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]; - escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug; - escapedRev = replaceStrings ["+" "%" "/"] ["%2B" "%25" "%2F"] rev; + useFetchGit = deepClone || fetchSubmodules || leaveDotGit; + fetcher = if useFetchGit then fetchgit else fetchzip; + + fetcherArgs = (if useFetchGit then { + inherit rev deepClone fetchSubmodules leaveDotGit; + url = "https://${domain}/${slug}.git"; + } else { + url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; + }) // passthruAttrs // { inherit name; }; in -fetchzip ({ - inherit name; - url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; - meta.homepage = "https://${domain}/${slug}/"; -} // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; } +fetcher fetcherArgs // { meta.homepage = "https://${domain}/${slug}/"; inherit rev; } From ba2e617fafdad4a0e235d9f6cc4fa931da1cf4c3 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Thu, 22 Jul 2021 13:18:15 +0200 Subject: [PATCH 0163/1522] haskellPackages.hevm: unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c02f6b4dc18..4bd34a1bccb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2023,7 +2023,6 @@ broken-packages: - heterogeneous-list-literals - hetris - heukarya - - hevm - HExcel - hexchat - hexif From 8229cab5fd6e49f226a3be2d569354c32f6191eb Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 10:52:52 +0700 Subject: [PATCH 0164/1522] libcsys: init at 4.2.0 --- .../misc/coreaction/default.nix | 10 +++++- .../development/libraries/libcsys/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+), 1 deletion(-) rename pkgs/{ => applications}/misc/coreaction/default.nix (61%) create mode 100644 pkgs/development/libraries/libcsys/default.nix diff --git a/pkgs/misc/coreaction/default.nix b/pkgs/applications/misc/coreaction/default.nix similarity index 61% rename from pkgs/misc/coreaction/default.nix rename to pkgs/applications/misc/coreaction/default.nix index c7fbfcd3d8f..be9d02bf339 100644 --- a/pkgs/misc/coreaction/default.nix +++ b/pkgs/applications/misc/coreaction/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: mkDerivation rec { pname = "coreaction"; @@ -11,6 +11,14 @@ mkDerivation rec { sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; }; + patches = [ + ## Fix Plugin Error: "The shared library was not found." "libbatery.so" + (fetchpatch { + url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch"; + sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f"; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/libcsys/default.nix b/pkgs/development/libraries/libcsys/default.nix new file mode 100644 index 00000000000..cec6e501bb5 --- /dev/null +++ b/pkgs/development/libraries/libcsys/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }: + +mkDerivation rec { + pname = "libcsys"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + udisks2 + ]; + + meta = with lib; { + description = "Library for managing drive and getting system resource information in real time"; + homepage = "https://gitlab.com/cubocore/libcsys"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 625fe3126c6..c4682691206 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6371,6 +6371,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; From 629b168587c8825cd3c93480706a06416ae125cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 21 Jul 2021 10:00:27 -0300 Subject: [PATCH 0165/1522] libsForQt5.qtstyleplugin-kvantum: 0.20.0 -> 0.20.1 --- .../development/libraries/qtstyleplugin-kvantum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 80998e6ef19..4589a2fde18 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "133m5ifs8ylhdh78m99n0y76q0nix68xsqfwcsrak4yr1n5pj9qp"; + sha256 = "0rj7zfm2h6812ga1xypism8a48jj669nh10jmhpf2mjriyaar3di"; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; broken = lib.versionOlder qtbase.version "5.14"; maintainers = [ maintainers.bugworm ]; From 4b577a328361b6b5af389eaf794d65f75ccee187 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 22 Jul 2021 14:41:09 +0200 Subject: [PATCH 0166/1522] amdvlk: 2021.Q3.1 -> 2021.Q3.2 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 3978f380a3b..e7cbd0f006d 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q3.1"; + version = "2021.Q3.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA="; + sha256 = "q860VD6hUs1U9mlkj/vqkLT/4zqGqQl4JI/flyDwhC8="; }; buildInputs = [ From db7aa804f52a66925b9880fe953eb5d323036719 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 9 May 2020 15:22:04 +0200 Subject: [PATCH 0167/1522] apio: init at 0.7.4 I use this package for programming a TinyFPGA BX. It will probably not work with FPGAs which are not TinyFPGA boards, without modification. --- pkgs/development/tools/misc/apio/default.nix | 69 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/tools/misc/apio/default.nix diff --git a/pkgs/development/tools/misc/apio/default.nix b/pkgs/development/tools/misc/apio/default.nix new file mode 100644 index 00000000000..b810910f7fe --- /dev/null +++ b/pkgs/development/tools/misc/apio/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, click +, semantic-version +, requests +, colorama +, pyserial +, wheel +, setuptools +, tinyprog +, pytestCheckHook +}: + +buildPythonApplication rec { + pname = "apio"; + version = "0.7.5"; + format = "flit"; + + src = fetchFromGitHub { + owner = "FPGAwars"; + repo = "apio"; + rev = "v${version}"; + sha256 = "sha256-9f0q6tELUDo6FdjPG708d7BY3O5ZiZ0FwNFzBBiLQp4="; + }; + + postPatch = '' + substituteInPlace apio/managers/scons.py --replace \ + 'return "tinyprog --libusb --program"' \ + 'return "${tinyprog}/bin/tinyprog --libusb --program"' + substituteInPlace apio/util.py --replace \ + '_command = join(get_bin_dir(), "tinyprog")' \ + '_command = "${tinyprog}/bin/tinyprog"' + + # semantic-version seems to not support version numbers like the one of tinyprog in Nixpkgs (1.0.24.dev114+gxxxxxxx). + # See https://github.com/rbarrois/python-semanticversion/issues/47. + # This leads to an error like "Error: Invalid version string: '1.0.24.dev114+g97f6353'" + # when executing "apio upload" for a TinyFPGA. + # Replace the dot with a dash to work around this problem. + substituteInPlace apio/managers/scons.py --replace \ + 'version = semantic_version.Version(pkg_version)' \ + 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' + ''; + + propagatedBuildInputs = [ + click + semantic-version + requests + colorama + pyserial + wheel + setuptools # needs pkg_resources at runtime (technically not needed when tinyprog is also in this list because of the propagatedBuildInputs of tinyprog) + + tinyprog # needed for upload to TinyFPGA + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "--offline" ]; + + meta = with lib; { + description = "Open source ecosystem for open FPGA boards"; + homepage = "https://github.com/FPGAwars/apio"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c15ef4e4414..127d8a721aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,6 +1147,8 @@ in arduino-mk = callPackage ../development/arduino/arduino-mk {}; + apio = python3Packages.callPackage ../development/tools/misc/apio { }; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; argtable = callPackage ../development/libraries/argtable { }; From 8dac270302a61b8d46aef2c8ff99fb59793db99f Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 22 Jul 2021 16:00:39 +0300 Subject: [PATCH 0168/1522] Revert "llvm_12: disable failing 'DebugInfo/X86/vla-multi.ll' on armv7l" This reverts commit 68bc5b42240c796849212757008b1320acd04670. 9a761a4fc8f0b07c6162e334b34c69ddd9c754e8 removes 'DebugInfo/X86/vla-multi.ll' on all platforms. --- pkgs/development/compilers/llvm/12/llvm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 361c6798385..7ac5031c36b 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -98,7 +98,6 @@ in stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-debugloc.ll rm test/DebugInfo/X86/convert-inlined.ll rm test/DebugInfo/X86/convert-linked.ll - rm test/DebugInfo/X86/vla-multi.ll rm test/tools/dsymutil/X86/op-convert.test '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) From 7d20323b117efe1821baaa12c2e2bc641c580568 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Jul 2021 12:35:15 +0200 Subject: [PATCH 0169/1522] top-level/release-haskell.nix: add agda packages and test to jobset Since the agda compiler is updated via haskellPackages.Agda, we are quite likely to cause regressions in agdaPackages when the language is changed via compiler updates. Thus we should build agdaPackages (which is very small) as part of the haskell-updates jobset and track if basic agda functionality (compiler and standard library) is working. --- pkgs/top-level/release-haskell.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5ca21134275..151a415f476 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -91,6 +91,9 @@ let tests.haskell = packagePlatforms pkgs.tests.haskell; + nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda; + agdaPackages = packagePlatforms pkgs.agdaPackages; + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { # remove musl ghc865Binary since it is known to be broken and # causes an evaluation error on darwin. From c64ddc2071939288c03e6e10701b11d0198a7df6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Jul 2021 12:37:11 +0200 Subject: [PATCH 0170/1522] agdaPackages.iowa-stdlib: don't try to build on Hydra It's marked as broken which always creates a lot of clutter in hydra evaluation error pages, so we'll just set hydraPlatforms = [] for now. --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 1383cff9e55..ff92e6a0610 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -26,6 +26,8 @@ mkDerivation (rec { platforms = lib.platforms.unix; # broken since Agda 2.6.1 broken = true; + # remove once unbroken + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ alexarice turion ]; }; }) From b866f9e5e9ab5f46dc25976af177364c7247e163 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 20:42:25 +0700 Subject: [PATCH 0171/1522] corearchiver: init at 4.2.0 --- pkgs/tools/archivers/corearchiver/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/archivers/corearchiver/default.nix diff --git a/pkgs/tools/archivers/corearchiver/default.nix b/pkgs/tools/archivers/corearchiver/default.nix new file mode 100644 index 00000000000..217520dde99 --- /dev/null +++ b/pkgs/tools/archivers/corearchiver/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }: + +mkDerivation rec { + pname = "corearchiver"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libarchive-qt + libarchive + ]; + + meta = with lib; { + description = "Archiver from the C Suite to create and extract archives"; + homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..e17ddf5e9c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1399,6 +1399,8 @@ in codeql = callPackage ../development/tools/analysis/codeql { }; + corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; From de7687e739478df4780e78c0d01f9f4f4f7088bd Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 20:49:03 +0700 Subject: [PATCH 0172/1522] libarchive-qt: init at 2.0.4 --- .../libraries/libarchive-qt/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libarchive-qt/default.nix diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix new file mode 100644 index 00000000000..920cc7efa08 --- /dev/null +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, cmake, ninja }: + +mkDerivation rec { + pname = "libarchive-qt"; + version = "2.0.4"; + + src = fetchFromGitLab { + owner = "marcusbritanicus"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-onTV9dgk6Yl9H35EvA6/8vk1IrYH8vg9OQNVgzkt4q4"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + libarchive + bzip2 + zlib + xz + ]; + + meta = with lib; { + description = "A Qt based archiving solution with libarchive backend"; + homepage = "https://gitlab.com/marcusbritanicus/libarchive-qt"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e17ddf5e9c6..fc78cd3d094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16139,6 +16139,8 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; + libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; + libasr = callPackage ../development/libraries/libasr { }; libass = callPackage ../development/libraries/libass { }; From e4852c8f0f0253a8e6851116ccccd77f9bcc6482 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 21:29:02 +0700 Subject: [PATCH 0173/1522] coregarage: init at 4.2.0 --- pkgs/applications/misc/coregarage/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/coregarage/default.nix diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/coregarage/default.nix new file mode 100644 index 00000000000..6d665479764 --- /dev/null +++ b/pkgs/applications/misc/coregarage/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: + +mkDerivation rec { + pname = "coregarage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libarchive + libarchive-qt + ]; + + meta = with lib; { + description = "A settings manager for the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..19c65e95937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3890,6 +3890,8 @@ in qtbase = qt5.qtbase; }; + coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; + c14 = callPackage ../applications/networking/c14 { }; certstrap = callPackage ../tools/security/certstrap { }; From 2a5c3b6d7869ee6fc6b11acae12b6a22e835ae03 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 21:14:56 +0700 Subject: [PATCH 0174/1522] corefm: init at 4.2.0 --- pkgs/applications/misc/corefm/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/corefm/default.nix diff --git a/pkgs/applications/misc/corefm/default.nix b/pkgs/applications/misc/corefm/default.nix new file mode 100644 index 00000000000..9ad99e3aa06 --- /dev/null +++ b/pkgs/applications/misc/corefm/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }: + +mkDerivation rec { + pname = "corefm"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PczKIKY9uCD+cAzAC6Gkb+g+cn9KKCQYd3epoZK8bvA="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A lightwight filemanager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corefm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..c8b7bcebabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23133,6 +23133,8 @@ in cheesecutter = callPackage ../applications/audio/cheesecutter { }; + corefm = libsForQt5.callPackage ../applications/misc/corefm { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; From af84eacb05c5210ef1bb2520ed9e6e40c063d605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 22 Jul 2021 16:28:09 +0200 Subject: [PATCH 0175/1522] agdaPackages: Don't build broken packages on hydra --- pkgs/build-support/agda/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index ed7d11a1314..44d5ebb9f52 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -46,6 +46,7 @@ let defaults = { pname + , meta , buildInputs ? [] , everythingFile ? "./Everything.agda" , libraryName ? pname @@ -76,6 +77,7 @@ let find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + runHook postInstall ''; + meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta; }; in { From 6721ae424aeb0ddb4feeabed1eadcbcce6b7c1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 22 Jul 2021 16:35:01 +0200 Subject: [PATCH 0176/1522] agdaPackages.iowa-stdlib: Remove hydraPlatforms They are set automatically in the agda packages builder. --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index ff92e6a0610..1383cff9e55 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -26,8 +26,6 @@ mkDerivation (rec { platforms = lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - # remove once unbroken - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ alexarice turion ]; }; }) From 349ff1b29e9995b36799c215b475bbb0ba351a45 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 22 Jul 2021 18:27:16 +0200 Subject: [PATCH 0177/1522] linux_zen: 5.12.14 -> 5.12.19 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index f646e380ac3..caf65508210 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.12.14"; - suffix = "zen1"; + version = "5.12.19"; + suffix = "zen2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-xmU2HNigSMb+xGkQ9XShBKfRxVHPHsz88JoTI2KsShQ="; + sha256 = "sha256-l+KIlaXoq/Nzf7mUom9DUjaAsn7UxeKGL6MbYN7mBZk="; }; extraMeta = { From b15b762d871e1cc4fd08fbea11261de5d78fcd71 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 22 Jul 2021 18:30:43 +0200 Subject: [PATCH 0178/1522] linux_lqx: 5.12.17 -> 5.12.19 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index f701c2846f4..23a6b0b2d36 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.12.17"; + version = "5.12.19"; suffix = "lqx2"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-i0Ha9H1VVRKlmomWz1+UmKBH9CSlmHAZm0kwz0Kamqg="; + sha256 = "sha256-r2DvKLlm1a1VuJwC81tRuRwCd6H21T3MsBAC3b9TUbs="; }; extraMeta = { From 91a16d53e7e5c2b8a44a64f03b653889eb1af561 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 21 Jul 2021 16:54:52 -0300 Subject: [PATCH 0179/1522] minio-certgen: init 0.0.2 --- pkgs/tools/security/minio-certgen/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/security/minio-certgen/default.nix diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix new file mode 100644 index 00000000000..f87fffc4f95 --- /dev/null +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "minio-certgen"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "minio"; + repo = "certgen"; + rev = "v${version}"; + sha256 = "sha256-HtzcoEUMt3LpQNyT0wGcmc4Q70QqHx7QpjrDh4YSO/Q="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + meta = with lib; { + description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; + downloadPage = "https://github.com/minio/certgen"; + license = licenses.bsd3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22ea10d466a..0c23f637b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7055,6 +7055,8 @@ in minio-client = callPackage ../tools/networking/minio-client { }; + minio-certgen = callPackage ../tools/security/minio-certgen { }; + minissdpd = callPackage ../tools/networking/minissdpd { }; inherit (callPackage ../tools/networking/miniupnpc From da58fe1b2c1f0f5ffa05627fe824ad1d226ab7a2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Jul 2021 19:36:58 +0200 Subject: [PATCH 0180/1522] cosign: add the sget client to the package Since Cosign v0.5.0 a client is available to securely fetch blobs from registries [0]. [0] https://github.com/sigstore/cosign/commit/eab1d40249b840e09a03e75acf91bc45f6522461 --- pkgs/tools/security/cosign/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index bdc32570dfa..36781679c20 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; - subPackages = [ "cmd/cosign" ]; + excludedPackages = "\\(copasetic\\)"; preBuild = '' buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) From 0b48ee16b300c63871f167240d9fa39f0ad32287 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 23:52:06 +0000 Subject: [PATCH 0181/1522] icinga2: 2.12.4 -> 2.12.5 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 44c512196c6..00f7b510346 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.4"; + version = "2.12.5"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-SJBOZzLbmW4525G3w6BVS53kOd2bJ5rEbwwb4Lo5q8I="; + sha256 = "sha256-sEmxKX+q7hPXQWEqbywgsEG5/bSE5AkNKurL3UGQFLA="; }; patches = [ From 4290a48b95ddf437745f19cacab9e60e31f8f84c Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 22 Jul 2021 14:25:44 -0400 Subject: [PATCH 0182/1522] assign-lb-ip: init at 2.2.0 --- .../cluster/assign-lb-ip/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/cluster/assign-lb-ip/default.nix diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix new file mode 100644 index 00000000000..f0c06fa181a --- /dev/null +++ b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "assign-lb-ip"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "Nordix"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PkMXjFP2brULCnD6mGz9wCufMpiwsmulDpINiwmkeys="; + }; + + vendorSha256 = "sha256-j9SweQq45sYk0lH6zkFrmWRlVhhMO8rLJGQxS6smAVw="; + + meta = with lib; { + description = "Assigns loadBalancerIP address to a Kubernetes service for testing purposes"; + homepage = "https://github.com/Nordix/assign-lb-ip"; + license = licenses.asl20; + maintainers = [ maintainers.starcraft66 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73d0db70084..78f513dff18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23108,6 +23108,8 @@ in aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; + assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; + astroid = callPackage ../applications/networking/mailreaders/astroid { }; aucatctl = callPackage ../applications/audio/aucatctl { }; From c586c0a053a714c9214cc58555b8ccbeb4a66d43 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 22 Jul 2021 16:35:28 -0400 Subject: [PATCH 0183/1522] python3Packages.meshio: 4.3.10 -> 4.4.6 --- pkgs/development/python-modules/meshio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 2c293b3b9c2..e9b74d02b07 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "4.3.10"; + version = "4.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki"; + sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy"; }; propagatedBuildInputs = [ From 26f2495d4012638d06f08561fbfec23177bd680a Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Thu, 8 Jul 2021 19:35:19 +0100 Subject: [PATCH 0184/1522] bic: init at v1.0.0 --- pkgs/development/interpreters/bic/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/interpreters/bic/default.nix diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/development/interpreters/bic/default.nix new file mode 100644 index 00000000000..c27270f7a95 --- /dev/null +++ b/pkgs/development/interpreters/bic/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, readline +, autoreconfHook +, autoconf-archive +, gmp +, flex +, bison +}: + +stdenv.mkDerivation rec { + pname = "bic"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "hexagonal-sun"; + repo = pname; + rev = "v${version}"; + sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw"; + }; + + buildInputs = [ readline gmp ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + bison + flex + ]; + + meta = with lib; { + description = "A C interpreter and API explorer"; + longDescription = '' + bic This a project that allows developers to explore and test C-APIs using a + read eval print loop, also known as a REPL. + ''; + license = with licenses; [ gpl2Plus ]; + homepage = "https://github.com/hexagonal-sun/bic"; + platforms = platforms.unix; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a6ad9fe9d3..f5468b34678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1316,6 +1316,8 @@ in bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bic = callPackage ../development/interpreters/bic { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; bitwarden = callPackage ../tools/security/bitwarden { }; From 14930cbad413269eaa4aa210575ccfba0504f708 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sat, 10 Jul 2021 23:24:23 +0100 Subject: [PATCH 0185/1522] maintainers: add hexagonal-sun --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 162f9d1b4c9..c840796391b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4207,6 +4207,12 @@ githubId = 131599; name = "Martin Weinelt"; }; + hexagonal-sun = { + email = "dev@mattleach.net"; + github = "hexagonal-sun"; + githubId = 222664; + name = "Matthew Leach"; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; From 3bf6f645e592b3a7a6b48a7bea446dd7b44ac1d4 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 22 Jul 2021 17:44:16 -0300 Subject: [PATCH 0186/1522] linkerd_edge: 21.7.3 -> 21.7.4 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 883d16319b1..47c6cc5bcda 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.3"; - sha256 = "sha256-fEkqZ/4BQVnmOKUrrLmi6DKlMVNeqvW95bxbZX0o7iI="; - vendorSha256 = "sha256-NqOmmeEGWvy/LYfSpIdnJZX4lGweCgiL008ed05XIFs="; + version = "21.7.4"; + sha256 = "sha256-yorxP4SQVV6MWlx8+8l0f7qOaF7aJ1XiPfnMqKC8m/o="; + vendorSha256 = "sha256-2ZDsBiIV9ng8P0cDURbqDqMTxFKUFcBxHsPGWp5WjPo="; }; } From 4ebfdf3b88d036b5ebaf3833014ef03f940273d5 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Thu, 22 Jul 2021 22:22:30 +0200 Subject: [PATCH 0187/1522] python3Packages.synergy: init at 0.5.1 --- .../python-modules/synergy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/synergy/default.nix diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix new file mode 100644 index 00000000000..53af1552ac3 --- /dev/null +++ b/pkgs/development/python-modules/synergy/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, numpy +, scipy +, matplotlib +, plotly +, pandas +}: + +buildPythonPackage rec { + pname = "synergy"; + version = "0.5.1"; + disabled = pythonOlder "3.5"; + + # Pypi does not contain unit tests + src = fetchFromGitHub { + owner = "djwooten"; + repo = "synergy"; + rev = "v${version}"; + sha256 = "1c60dpvr72g4wjqg6bc601kssl5z55v9bg09xbyh9ahch58bi212"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + plotly + pandas + ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "synergy" ]; + + meta = with lib; { + description = "A Python library for calculating, analyzing, and visualizing drug combination synergy"; + homepage = "https://github.com/djwooten/synergy"; + maintainers = [ maintainers.ivar ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a31cb4893ee..8a3f7f7661d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8436,6 +8436,8 @@ in { syncer = callPackage ../development/python-modules/syncer { }; + synergy = callPackage ../development/python-modules/synergy { }; + synologydsm-api = callPackage ../development/python-modules/synologydsm-api { }; systembridge = callPackage ../development/python-modules/systembridge { }; From 57c3d06e2c3846d4ad7585936b4e4538982a1603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 15:53:24 +0200 Subject: [PATCH 0188/1522] liblapack: 3.9.1 -> 3.10.0 --- .../science/math/liblapack/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 79e494a053b..f81a02303a6 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,23 +1,20 @@ -{ - lib, stdenv, - fetchFromGitHub, - gfortran, - cmake, - shared ? true +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, cmake +, shared ? true }: -let - inherit (lib) optional; -in stdenv.mkDerivation rec { pname = "liblapack"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "sha256-B7eRaEY9vaLvuKkJ7d2KWanGE7OXh43O0UbXFheUWK8="; + sha256 = "sha256-ewYUM+M7jDO5LLnB4joiKkqgXjEDmWbFZbgad8x98gc="; }; nativeBuildInputs = [ gfortran cmake ]; @@ -30,8 +27,7 @@ stdenv.mkDerivation rec { "-DLAPACKE=ON" "-DCBLAS=ON" "-DBUILD_TESTING=ON" - ] - ++ optional shared "-DBUILD_SHARED_LIBS=ON"; + ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"; doCheck = true; @@ -58,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; + maintainers = with maintainers; [ ]; license = licenses.bsd3; platforms = platforms.all; }; From 264e63477da228071f03a0b4bfd17a9f612e7bc1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 22 Jul 2021 13:51:57 +0200 Subject: [PATCH 0189/1522] pkgs.haskell.package-list: init This commit introduces a maintainer script to upload our current list of haskell-packages to hackage. --- .../upload-nixos-package-list-to-hackage.sh | 21 +++++++++++++++++++ pkgs/development/haskell-modules/HACKING.md | 8 +++++++ .../haskell-modules/package-list.nix | 19 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 4 files changed, 50 insertions(+) create mode 100755 maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh create mode 100644 pkgs/development/haskell-modules/package-list.nix diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh new file mode 100755 index 00000000000..f887f0c4293 --- /dev/null +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -0,0 +1,21 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix curl gnused -I nixpkgs=. + +# On Hackage every package description shows a category "Distributions" which +# lists a "NixOS" version. +# This script uploads a csv to hackage which will update the displayed versions +# based on the current versions in nixpkgs. This happens with on simple http +# request. + +# For authorization you just need to have any valid hackage account. This +# script uses the `username` and `password-command` field from your +# ~/.cabal/config file. + +# e.g. username: maralorn +# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression.) +# Those fields are specified under `upload` on the `cabal` man page. + +package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" +username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") +password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") +curl -u "$username:$($password_command)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 37bd5544fe1..98ab03a0edd 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -241,6 +241,14 @@ When you've double-checked these points, go ahead and merge the `haskell-updates After merging, **make sure not to delete the `haskell-updates` branch**, since it causes all currently open Haskell-related pull-requests to be automatically closed on GitHub. +## Update Hackage Version Information + +After merging into master you can update what hackage displays as the current +version in NixOS for every individual package. +To do this you run `maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh`. +See the script for how to provide credentials. Once you have configured that +running this takes only a few seconds. + ## Additional Info Here are some additional tips that didn't fit in above. diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix new file mode 100644 index 00000000000..64f4be3a772 --- /dev/null +++ b/pkgs/development/haskell-modules/package-list.nix @@ -0,0 +1,19 @@ +{ runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: +let + pkgLine = name: pkg: + let + version = pkg.version or ""; + in + if version != "" then + ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'' + else ""; + all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); +in +runCommand "hackage-package-list" { } + # This command will make a join between all packages on hackage and haskellPackages.*. + # It creates a valid csv file which can be uploaded to hackage.haskell.org. + # The call is wrapped in echo $(...) to trim trailing newline, which hackage requires. + '' + mkdir -p $out/bin + echo -n "$(tar -t -f ${all-cabal-hashes} | sed 's![^/]*/\([^/]*\)/.*!"\1"!' | sort -u | join -t , - ${all-haskellPackages})" > $out/nixos-hackage-packages.csv + '' diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b872f3286e1..86a09b4a1fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -42,6 +42,8 @@ let in { lib = haskellLib; + package-list = callPackage ../development/haskell-modules/package-list.nix {}; + compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; From ee05c8e8b588b53b1f28378124413387e9f7b65d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:24:08 +0200 Subject: [PATCH 0190/1522] python3Packages.bitstring: enable tests --- .../python-modules/bitstring/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index ab94ad344ff..52bc9bae865 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -1,14 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: buildPythonPackage rec { pname = "bitstring"; version = "3.1.9"; - src = fetchPypi { - inherit pname version; - sha256 = "1rv0x3vicjz7df6jq13aypgfqqjvlz0b92ya9li8a5qicczqm155"; + src = fetchFromGitHub { + owner = "scott-griffiths"; + repo = pname; + rev = "bitstring-${version}"; + sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa"; }; + checkPhase = '' + cd test + ${python.interpreter} -m unittest discover + ''; + + pythonImportsCheck = [ "bitstring" ]; + meta = with lib; { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; From 98fa0f29bc394e3f9048ae18376b4ce08254fe7e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 22 Jul 2021 23:55:38 +0100 Subject: [PATCH 0191/1522] python3Packages.tensorflow: 2.4.1 -> 2.4.2 --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index bbdecc8bdcd..e87c8aca40e 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.4.1"; + version = "2.4.2"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -110,7 +110,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-J62QfP45g5nxN9Nqa1tAGyc4vD2JKh50ddHLrd6/qsY="; + sha256 = "07a2y05hixch1bjag5pzw3p1m7bdj3bq4gdvmsfk2xraz49b1pi8"; }; patches = [ From 216a9ca75d0714333330ab1e949bc6f3bc3eecf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 00:49:33 +0000 Subject: [PATCH 0192/1522] astc-encoder: 3.0 -> 3.1 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 8cf35b36c0c..10bd5d3edf4 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-+vYEO2zS144ZuVN8b4/EpvTcakC9U0uc/eV4pB7lHiY="; + sha256 = "sha256-WWxk8F1MtFv1tWbSs45fmu4k9VCAAOjJP8zBz80zLTo="; }; nativeBuildInputs = [ cmake ]; From d943e6aa12bc335fe6f84f30205ab67a90c8ff35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 01:02:40 +0000 Subject: [PATCH 0193/1522] bedops: 2.4.39 -> 2.4.40 --- pkgs/applications/science/biology/bedops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/applications/science/biology/bedops/default.nix index 407ed0c01f7..e7379ee382a 100644 --- a/pkgs/applications/science/biology/bedops/default.nix +++ b/pkgs/applications/science/biology/bedops/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedops"; - version = "2.4.39"; + version = "2.4.40"; src = fetchFromGitHub { owner = "bedops"; repo = "bedops"; rev = "v${version}"; - sha256 = "sha256-vPrut3uhZK1Eg9vPcyxVNWW4zKeypdsb28oM1xbbpJo="; + sha256 = "sha256-rJVl3KbzGblyQZ7FtJXeEv/wjQJmzYGNjzhvkoMoBWY="; }; buildInputs = [ zlib bzip2 jansson ]; From 934002f7a46fb820fde152274dd989bbed3188e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 06:08:46 +0000 Subject: [PATCH 0194/1522] finalfusion-utils: 0.12.0 -> 0.13.0 --- .../science/machine-learning/finalfusion-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 6655b415d2a..4c04b3c0736 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfusion-utils"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; rev = version; - sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41"; + sha256 = "sha256-ME0qDSFD8G492+7ex7VQWh9P76a+tOCo+SJ9n9ZIYUI="; }; - cargoSha256 = "0dj3xpinzzdfgy06wkp336sp1nyqk7nnvd3hwhyysripmz9apdgg"; + cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0="; # Enables build against a generic BLAS. cargoBuildFlags = [ From 6412d3aaee28d16c6544530266207cc934dd2428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 06:39:01 +0000 Subject: [PATCH 0195/1522] flow: 0.155.1 -> 0.156.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index f602f1b1813..abd6a1b691e 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.155.1"; + version = "0.156.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE="; + sha256 = "sha256-aV5qcXxNLljeM3MrXg8ptAST8ARCb3kR83oy5G9fbak="; }; installPhase = '' From aaac6c0119a917264c8659ce4e254a52a32a854f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 08:40:03 +0000 Subject: [PATCH 0196/1522] grpcurl: 1.8.1 -> 1.8.2 --- pkgs/tools/networking/grpcurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index ec181c17e9e..734a751daf0 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-BxmoIGhuAt/uhHLNdMiSrNVWAoxAAMKPJ/NsXjf2ynk="; + sha256 = "sha256-/no8bRGoKibtcjaITUuzwAbX+gPHNJROSf79iuuRwe4="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-EnstvJk2kZ1Ft5xY1dO14wnmT//2K72OnDMZqeaOeQI="; + vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 15fe01a0dccad62da1ab0972ba112ceafa32416a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 09:05:22 +0000 Subject: [PATCH 0197/1522] helmfile: 0.139.9 -> 0.140.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 7fda9c74c9b..1f32d5f1cd8 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.9"; + version = "0.140.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-MHvfDeN4r9jwnXANHTpMEQUIoAZ+uXAmDtl8wdcpjHI="; + sha256 = "sha256-Y1BlvUudxEZ1G893dwYU+R6k2QAYohx4+0yysYaUM0E="; }; vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8="; From 48617f15e123dd82dd46b03ddff6ad77dc6e1cfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 09:26:26 +0000 Subject: [PATCH 0198/1522] hugo: 0.85.0 -> 0.86.0 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a0491a09884..e8c927b79a6 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.85.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IW41e4imaXKcXJKa7dAB60ulvRrk3qvF1//Lo55TLVI="; + sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50="; }; vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; From b1c24e561e235fd42270d6046f16b129e594f14c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 11:32:17 +0200 Subject: [PATCH 0199/1522] libaom: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/libaom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index ef76f61efa9..4a78f3c5e51 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "3.1.1"; + version = "3.1.2"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "11fy2xw35ladkjcz71samhcpqlqr3y0n1n17nk90i13aydrll66f"; + sha256 = "1c7yrhb56qj5c3lz54n1f9cbrvdr32g2yrrdiiy72sib8ycq9hz2"; stripRoot = false; }; From 23e2cf23bcee0567e22a0f7dc0859f988cd7e500 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 09:35:35 +0000 Subject: [PATCH 0200/1522] hydroxide: 0.2.18 -> 0.2.19 --- pkgs/applications/networking/hydroxide/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index d47560c4e87..a8c6e87ab20 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s8EmoVZUUeaKTaINXvKO5tSdPUS3MlhEucwnmTTC3Wk="; + sha256 = "sha256-FKZdsFEUlXk0w11v7Y6sKiu4bOjmau2yAifcTpN0J+U="; }; vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY="; From 040fabf509ed2a10098fee4a3244ff4f3daa1934 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 11:59:27 +0200 Subject: [PATCH 0201/1522] element-web: 1.7.31 -> 1.7.33 ChangeLogs: * https://github.com/vector-im/element-web/releases/tag/v1.7.33 * https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1 * https://github.com/vector-im/element-web/releases/tag/v1.7.32 * https://github.com/vector-im/element-web/releases/tag/v1.7.32-rc.1 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index d9aec35b04b..0a0363860d1 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.31"; + version = "1.7.33"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "1p0vg5bkri7qiqv5yic56hjjbb5zvhvyzsm5zi7fx3yb7zdxmr3f"; + sha256 = "sha256-MhbXvl+FUCL6D6y2Oa5Kf5ie9fU85wEO/tQe881CD8I="; }; installPhase = '' From ffdee608ba14768d37fb41315d70d6d500df9f7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 10:01:18 +0000 Subject: [PATCH 0202/1522] jackett: 0.18.455 -> 0.18.459 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a324dcb58bd..ccda9bcddb9 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.455"; + version = "0.18.459"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE="; + sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk="; }; nativeBuildInputs = [ makeWrapper ]; From 07620c8697c4150ee71cfd26462d04666e781fbd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 12:13:29 +0200 Subject: [PATCH 0203/1522] element-desktop: 1.7.31 -> 1.7.33 ChangeLogs: * https://github.com/vector-im/element-desktop/releases/tag/v1.7.33 * https://github.com/vector-im/element-desktop/releases/tag/v1.7.32 --- .../element/element-desktop-package.json | 36 +- .../element/element-desktop-yarndeps.nix | 544 ++++++++++++++++++ .../element/element-desktop.nix | 13 +- 3 files changed, 580 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 063c64fa377..e9f1c0d4eb5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -1,8 +1,8 @@ { "name": "element-desktop", "productName": "Element", - "main": "src/electron-main.js", - "version": "1.7.31", + "main": "lib/electron-main.js", + "version": "1.7.33", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -18,18 +18,24 @@ "mkdirs": "mkdirp packages deploys", "fetch": "yarn run mkdirs && node scripts/fetch-package.js", "asar-webapp": "asar p webapp webapp.asar", - "start": "electron .", - "lint": "eslint src/ scripts/ hak/", + "start": "yarn run build:ts && yarn run build:res && electron .", + "lint": "yarn lint:types && yarn lint:js", + "lint:js": "eslint src/ scripts/ hak/", + "lint:types": "tsc --noEmit", "build:native": "yarn run hak", - "build32": "electron-builder --ia32", - "build64": "electron-builder --x64", - "build": "electron-builder", + "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink", + "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32", + "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64", + "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal", + "build": "yarn run build:ts && yarn run build:res && electron-builder", + "build:ts": "tsc", + "build:res": "node scripts/copy-res.js", "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild", "docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build": "scripts/in-docker.sh yarn run build", "docker:install": "scripts/in-docker.sh yarn install", "debrepo": "scripts/mkrepo.sh", - "clean": "rimraf webapp.asar dist packages deploys", + "clean": "rimraf webapp.asar dist packages deploys lib", "hak": "node scripts/hak/index.js" }, "dependencies": { @@ -42,7 +48,14 @@ "request": "^2.88.2" }, "devDependencies": { + "@types/auto-launch": "^5.0.1", + "@types/counterpart": "^0.18.1", + "@types/minimist": "^1.2.1", + "@typescript-eslint/eslint-plugin": "^4.17.0", + "@typescript-eslint/parser": "^4.17.0", "asar": "^2.0.1", + "chokidar": "^3.5.2", + "electron": "12.0.11", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -60,7 +73,8 @@ "npm": "^6.14.11", "rimraf": "^3.0.2", "semver": "^7.3.4", - "tar": "^6.1.0" + "tar": "^6.1.0", + "typescript": "^4.1.3" }, "hakDependencies": { "matrix-seshat": "^2.2.3", @@ -68,14 +82,14 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "12.0.11", + "electronVersion": "12.0.14", "files": [ "package.json", { "from": ".hak/hakModules", "to": "node_modules" }, - "src/**" + "lib/**" ], "extraResources": [ { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 733cfa3a11a..59669ebc48b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -129,6 +129,14 @@ sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; }; } + { + name = "_electron_get___get_1.12.4.tgz"; + path = fetchurl { + name = "_electron_get___get_1.12.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz"; + sha1 = "a5971113fc1bf8fa12a8789dc20152a7359f06ab"; + }; + } { name = "_electron_universal___universal_1.0.5.tgz"; path = fetchurl { @@ -417,6 +425,30 @@ sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; }; } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.7.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; + sha1 = "94c23db18ee4653e129abd26fb06f870ac9e1ee2"; + }; + } { name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { @@ -433,6 +465,14 @@ sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; }; } + { + name = "_types_auto_launch___auto_launch_5.0.1.tgz"; + path = fetchurl { + name = "_types_auto_launch___auto_launch_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/auto-launch/-/auto-launch-5.0.1.tgz"; + sha1 = "388a047edc0e754d8e8978cbd9ed4672b36be2c4"; + }; + } { name = "_types_color_name___color_name_1.1.1.tgz"; path = fetchurl { @@ -441,6 +481,14 @@ sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; }; } + { + name = "_types_counterpart___counterpart_0.18.1.tgz"; + path = fetchurl { + name = "_types_counterpart___counterpart_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.1.tgz"; + sha1 = "b1b784d9e54d9879f0a8cb12f2caedab65430fe8"; + }; + } { name = "_types_debug___debug_4.1.5.tgz"; path = fetchurl { @@ -465,6 +513,14 @@ sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } + { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; + }; + } { name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { @@ -473,6 +529,14 @@ sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } + { + name = "_types_minimist___minimist_1.2.1.tgz"; + path = fetchurl { + name = "_types_minimist___minimist_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz"; + sha1 = "283f669ff76d7b8260df8ab7a4262cc83d988256"; + }; + } { name = "_types_node___node_13.7.1.tgz"; path = fetchurl { @@ -489,6 +553,14 @@ sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; }; } + { + name = "_types_node___node_14.17.4.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; + sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; + }; + } { name = "_types_plist___plist_3.0.2.tgz"; path = fetchurl { @@ -521,6 +593,62 @@ sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; }; } + { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz"; + sha1 = "c045e440196ae45464e08e20c38aff5c3a825947"; + }; + } + { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz"; + sha1 = "3869489dcca3c18523c46018b8996e15948dbadc"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.1.tgz"; + sha1 = "5181b81658414f47291452c15bf6cd44a32f85bd"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz"; + sha1 = "fd3c20627cdc12933f6d98b386940d8d0ce8a991"; + }; + } + { + name = "_typescript_eslint_types___types_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.1.tgz"; + sha1 = "d0f2ecbef3684634db357b9bbfc97b94b828f83f"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz"; + sha1 = "af882ae41740d1f268e38b4d0fad21e7e8d86a81"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.1.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz"; + sha1 = "162a515ee255f18a6068edc26df793cdc1ec9157"; + }; + } { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { @@ -729,6 +857,14 @@ sha1 = "ae101a62bc08a597b4c9ab5b7089d456630549fe"; }; } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } { name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; path = fetchurl { @@ -817,6 +953,14 @@ sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; }; } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } { name = "asap___asap_2.0.6.tgz"; path = fetchurl { @@ -985,6 +1129,14 @@ sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; }; } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } { name = "bl___bl_4.0.3.tgz"; path = fetchurl { @@ -1017,6 +1169,14 @@ sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; }; } + { + name = "boolean___boolean_3.1.2.tgz"; + path = fetchurl { + name = "boolean___boolean_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; + sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; + }; + } { name = "boxen___boxen_1.3.0.tgz"; path = fetchurl { @@ -1041,6 +1201,14 @@ sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; }; } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { @@ -1233,6 +1401,14 @@ sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } + { + name = "chokidar___chokidar_3.5.2.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; + sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + }; + } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -1505,6 +1681,14 @@ sha1 = "d9678a9d8f04de8bf5cd475105da8fdae49c2ec4"; }; } + { + name = "config_chain___config_chain_1.1.13.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + }; + } { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { @@ -1545,6 +1729,14 @@ sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; }; } + { + name = "core_js___core_js_3.15.1.tgz"; + path = fetchurl { + name = "core_js___core_js_3.15.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.1.tgz"; + sha1 = "6c08ab88abdf56545045ccf5fd81f47f407e7f1a"; + }; + } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -1673,6 +1865,14 @@ sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; }; } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } { name = "debug___debug_3.2.7.tgz"; path = fetchurl { @@ -1825,6 +2025,14 @@ sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; }; } + { + name = "detect_node___detect_node_2.1.0.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; + sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + }; + } { name = "dezalgo___dezalgo_1.0.3.tgz"; path = fetchurl { @@ -1841,6 +2049,14 @@ sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; }; } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } { name = "dmg_builder___dmg_builder_22.11.4.tgz"; path = fetchurl { @@ -2009,6 +2225,14 @@ sha1 = "4f36d09e3f953d87aff103bf010f460056050aa8"; }; } + { + name = "electron___electron_12.0.11.tgz"; + path = fetchurl { + name = "electron___electron_12.0.11.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-12.0.11.tgz"; + sha1 = "555dc1cf663e320f2f2cbdf89319352b08fc59f2"; + }; + } { name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { @@ -2025,6 +2249,14 @@ sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; }; } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } { name = "encoding___encoding_0.1.13.tgz"; path = fetchurl { @@ -2097,6 +2329,14 @@ sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } + { + name = "es6_error___es6_error_4.1.1.tgz"; + path = fetchurl { + name = "es6_error___es6_error_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; + sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + }; + } { name = "es6_promise___es6_promise_4.2.8.tgz"; path = fetchurl { @@ -2137,6 +2377,14 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } { name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; path = fetchurl { @@ -2169,6 +2417,14 @@ sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } + { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; + }; + } { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { @@ -2305,6 +2561,14 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + }; + } { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -2337,6 +2601,14 @@ sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; }; } + { + name = "fast_glob___fast_glob_3.2.6.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz"; + sha1 = "434dd9529845176ea049acc9343e8282765c6e1a"; + }; + } { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; path = fetchurl { @@ -2353,6 +2625,22 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fastq___fastq_1.11.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; + sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } { name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { @@ -2385,6 +2673,14 @@ sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; }; } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } { name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; path = fetchurl { @@ -2553,6 +2849,14 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -2681,6 +2985,14 @@ sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; }; } + { + name = "global_agent___global_agent_2.2.0.tgz"; + path = fetchurl { + name = "global_agent___global_agent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; + sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; + }; + } { name = "global_dirs___global_dirs_0.1.1.tgz"; path = fetchurl { @@ -2697,6 +3009,14 @@ sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; }; } + { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + path = fetchurl { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; + sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + }; + } { name = "global___global_4.3.2.tgz"; path = fetchurl { @@ -2721,6 +3041,22 @@ sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; }; } + { + name = "globalthis___globalthis_1.0.2.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; + sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + }; + } + { + name = "globby___globby_11.0.4.tgz"; + path = fetchurl { + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + }; + } { name = "got___got_6.7.1.tgz"; path = fetchurl { @@ -2977,6 +3313,14 @@ sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; }; } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } { name = "image_q___image_q_1.1.1.tgz"; path = fetchurl { @@ -3113,6 +3457,14 @@ sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { @@ -3241,6 +3593,14 @@ sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; }; } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { @@ -3929,6 +4289,14 @@ sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; }; } + { + name = "matcher___matcher_3.0.0.tgz"; + path = fetchurl { + name = "matcher___matcher_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; + sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + }; + } { name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; path = fetchurl { @@ -3953,6 +4321,22 @@ sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } { name = "mime_db___mime_db_1.42.0.tgz"; path = fetchurl { @@ -4281,6 +4665,14 @@ sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; }; } + { + name = "npm_conf___npm_conf_1.1.3.tgz"; + path = fetchurl { + name = "npm_conf___npm_conf_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; + sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + }; + } { name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; path = fetchurl { @@ -4729,6 +5121,22 @@ sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; }; } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { @@ -4745,6 +5153,14 @@ sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; }; } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } { name = "pify___pify_2.3.0.tgz"; path = fetchurl { @@ -5009,6 +5425,14 @@ sha1 = "30b3505f6fca741d5ae541964d1b3ae9dc2a0de8"; }; } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + }; + } { name = "qw___qw_1.0.1.tgz"; path = fetchurl { @@ -5129,6 +5553,14 @@ sha1 = "8d45407b4f870a0dcaebc0e28670d18e74514309"; }; } + { + name = "readdirp___readdirp_3.6.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; + sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; + }; + } { name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; path = fetchurl { @@ -5265,6 +5697,14 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { @@ -5281,6 +5721,22 @@ sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; }; } + { + name = "roarr___roarr_2.15.4.tgz"; + path = fetchurl { + name = "roarr___roarr_2.15.4.tgz"; + url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; + sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + }; + } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -5329,6 +5785,14 @@ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } { name = "semver_diff___semver_diff_2.1.0.tgz"; path = fetchurl { @@ -5385,6 +5849,14 @@ sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } + { + name = "serialize_error___serialize_error_7.0.1.tgz"; + path = fetchurl { + name = "serialize_error___serialize_error_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; + sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + }; + } { name = "set_blocking___set_blocking_2.0.0.tgz"; path = fetchurl { @@ -5449,6 +5921,14 @@ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } { name = "slice_ansi___slice_ansi_1.0.0.tgz"; path = fetchurl { @@ -5793,6 +6273,14 @@ sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; } + { + name = "sumchecker___sumchecker_3.0.1.tgz"; + path = fetchurl { + name = "sumchecker___sumchecker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; + sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + }; + } { name = "supports_color___supports_color_5.5.0.tgz"; path = fetchurl { @@ -5961,6 +6449,14 @@ sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; }; } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } { name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { @@ -5985,6 +6481,22 @@ sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + }; + } + { + name = "tsutils___tsutils_3.21.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; + }; + } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -5993,6 +6505,14 @@ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; } + { + name = "tunnel___tunnel_0.0.6.tgz"; + path = fetchurl { + name = "tunnel___tunnel_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; + sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + }; + } { name = "tweetnacl___tweetnacl_0.14.5.tgz"; path = fetchurl { @@ -6009,6 +6529,14 @@ sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; }; } + { + name = "type_fest___type_fest_0.13.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; + sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + }; + } { name = "type_fest___type_fest_0.16.0.tgz"; path = fetchurl { @@ -6049,6 +6577,14 @@ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; } + { + name = "typescript___typescript_4.3.4.tgz"; + path = fetchurl { + name = "typescript___typescript_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz"; + sha1 = "3f85b986945bcf31071decdd96cf8bfa65f9dcbc"; + }; + } { name = "uid_number___uid_number_0.0.6.tgz"; path = fetchurl { @@ -6609,6 +7145,14 @@ sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; }; } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } { name = "zip_stream___zip_stream_4.1.0.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index f8f4d31d6ec..18338fc0797 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.31"; + version = "1.7.33"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "14vyqzf69g4n3i7qjm1pgq2kwym6cira0jwvirzdrwxkfsl0dsq6"; + sha256 = "sha256-1JmuKyJt6Q80lLXXrFw+h6/0JzWcr0qMIU9mTO+K56I="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; @@ -24,6 +24,15 @@ in mkYarnPackage rec { nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + runHook preBuild + export HOME=$(mktemp -d) + pushd deps/element-desktop/ + npx tsc + popd + runHook postBuild + ''; + installPhase = '' # resources mkdir -p "$out/share/element" From 67e3992d7a0317a96114bb78aca077e422a06bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Jul 2021 12:30:29 +0200 Subject: [PATCH 0204/1522] python3Packages.pysyncthru: run tests --- .../python-modules/pysyncthru/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index d3fed5dc4b5..3fc0600f6d7 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -1,7 +1,7 @@ { lib , isPy27 , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiohttp , demjson , python @@ -13,10 +13,11 @@ buildPythonPackage rec { disabled = isPy27; - src = fetchPypi { - pname = "PySyncThru"; - inherit version; - sha256 = "13564018a7de4fe013e195e19d7bae92aa224e0f3a32373576682722d3dbee52"; + src = fetchFromGitHub { + owner = "nielstron"; + repo = "pysyncthru"; + rev = "release-${version}"; + sha256 = "122zxwqwx03vaxbhmp3cjibjnkirayz0w68gvslsdr7n9nqv3pgz"; }; propagatedBuildInputs = [ @@ -28,9 +29,6 @@ buildPythonPackage rec { ${python.interpreter} -m unittest ''; - # no tests on PyPI, no tags on GitHub - doCheck = false; - pythonImportsCheck = [ "pysyncthru" ]; meta = with lib; { From 00f50b6164fc9a1216d1e2008d5b2bfc2bee5fe3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 13:32:20 +0200 Subject: [PATCH 0205/1522] python3Packages.GitPython: 3.1.18 -> 3.1.19 --- pkgs/development/python-modules/GitPython/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index eda574e69cb..bd3084ae91b 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "GitPython"; - version = "3.1.18"; - disabled = isPy27; # no longer supported + version = "3.1.19"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b"; + sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q"; }; patches = [ @@ -30,12 +30,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ gitdb ddt - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; # Tests require a git repo doCheck = false; + pythonImportsCheck = [ "git" ]; meta = with lib; { From cf7232d88a81e692bab66cdd14f7cb99b2bce748 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 12:06:58 +0000 Subject: [PATCH 0206/1522] bftpd: 5.7 -> 5.9 --- pkgs/servers/ftp/bftpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index f8a9875914d..c441771157c 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.7"; + version = "5.9"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "sha256-pUPOYqgJKntQZRRodcyYeFNLCdxKhT8sK1bi3jl6b0s="; + sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; }; preConfigure = '' From 4b69fe1dc91d5836996712726569d8c668fd3de8 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Thu, 22 Jul 2021 07:48:34 -0400 Subject: [PATCH 0207/1522] frilouz: init at 0.0.2 --- .../python-modules/frilouz/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/frilouz/default.nix diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix new file mode 100644 index 00000000000..320912c7dd1 --- /dev/null +++ b/pkgs/development/python-modules/frilouz/default.nix @@ -0,0 +1,38 @@ +{ lib +, astunparse +, buildPythonPackage +, fetchFromGitHub +, isPy3k +}: + +buildPythonPackage rec { + pname = "frilouz"; + version = "0.0.2"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "QuantStack"; + repo = "frilouz"; + rev = version; + sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw"; + }; + + checkInputs = [ astunparse ]; + + preCheck = "cd test"; + + checkPhase = '' + runHook preCheck + python -m unittest + runHook postCheck + ''; + + pythonImportsCheck = [ "frilouz" ]; + + meta = with lib; { + homepage = "https://github.com/QuantStack/frilouz"; + description = "Python AST parser adapter with partial error recovery"; + license = licenses.bsd3; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cab2a4f0c7..e7fa90a71c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2734,6 +2734,8 @@ in { freezegun = callPackage ../development/python-modules/freezegun { }; + frilouz = callPackage ../development/python-modules/frilouz { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; fritzprofiles = callPackage ../development/python-modules/fritzprofiles { }; From 8d5b6bdc8634e8dfd2579c34ba5ee771be5cadcb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 13:47:44 +0000 Subject: [PATCH 0208/1522] buildah-unwrapped: 1.21.3 -> 1.21.4 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 13ae74db977..c92b229f05a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.3"; + version = "1.21.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8="; + sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA="; }; outputs = [ "out" "man" ]; From 6596a5a34bd4d4252a5fc3256bb007a25069559b Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 23 Jul 2021 16:21:04 +0200 Subject: [PATCH 0209/1522] python39Packages.pyls-flake8: switch to tag --- pkgs/development/python-modules/pyls-flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix index 495c54d5859..113cf8f24e1 100644 --- a/pkgs/development/python-modules/pyls-flake8/default.nix +++ b/pkgs/development/python-modules/pyls-flake8/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emanspeaks"; repo = "pyls-flake8"; - rev = "3df8606ad821100e64743f457c77c20170bde722"; + rev = "v{version}"; sha256 = "14wkmwh8mqr826vdzxhvhdwrnx2akzmnbv3ar391qs4imwqfjx3l"; }; From 183c7ebcaed1d2822a92b3029087a1e9d29c53a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 17:02:31 +0200 Subject: [PATCH 0210/1522] pythonPackages: normalise prompt_toolkit --- pkgs/applications/misc/haxor-news/default.nix | 4 ++-- pkgs/applications/misc/topydo/default.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 2 +- .../networking/instant-messengers/pantalaimon/default.nix | 4 ++-- pkgs/development/python-modules/aiosmb/default.nix | 4 ++-- pkgs/development/python-modules/click-repl/default.nix | 4 ++-- pkgs/development/python-modules/clickhouse-cli/default.nix | 4 ++-- pkgs/development/python-modules/clintermission/default.nix | 4 ++-- pkgs/development/python-modules/coconut/default.nix | 4 ++-- pkgs/development/python-modules/ipython/5.nix | 4 ++-- pkgs/development/python-modules/ipython/7.16.nix | 4 ++-- pkgs/development/python-modules/ipython/default.nix | 4 ++-- pkgs/development/python-modules/jupyter_console/5.nix | 4 ++-- pkgs/development/python-modules/jupyter_console/default.nix | 4 ++-- pkgs/development/python-modules/msldap/default.nix | 4 ++-- pkgs/development/python-modules/papis/default.nix | 4 ++-- pkgs/development/python-modules/ptpython/default.nix | 4 ++-- pkgs/development/python-modules/pykoplenti/default.nix | 4 ++-- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- pkgs/development/python-modules/questionary/default.nix | 4 ++-- pkgs/development/python-modules/softlayer/default.nix | 6 +++--- pkgs/development/tools/database/litecli/default.nix | 2 +- pkgs/development/tools/database/pgcli/default.nix | 4 ++-- pkgs/shells/xonsh/default.nix | 2 +- pkgs/tools/admin/awscli2/default.nix | 4 ++-- pkgs/tools/admin/mycli/default.nix | 2 +- pkgs/tools/misc/piston-cli/default.nix | 2 +- pkgs/tools/networking/http-prompt/default.nix | 2 +- pkgs/tools/security/onlykey-cli/default.nix | 2 +- pkgs/tools/security/xcat/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- pkgs/top-level/python2-packages.nix | 2 +- 33 files changed, 55 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index fc9607e7be6..f5a723f5901 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -7,7 +7,7 @@ let self = py; # not compatible with prompt_toolkit >=2.0 - prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { name = "${oldAttrs.pname}-${version}"; version = "1.0.18"; src = oldAttrs.src.override { @@ -37,7 +37,7 @@ buildPythonApplication rec { colorama requests pygments - prompt_toolkit + prompt-toolkit six ]; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 3ea3511308b..c591c969ca9 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { arrow icalendar glibcLocales - prompt_toolkit + prompt-toolkit urwid watchdog ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 47bf0eb106b..76146708821 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles - prompt_toolkit py-cpuinfo + prompt-toolkit py-cpuinfo ]; # Requires network access diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 21467534993..7cfa889d280 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, - prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, + prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, setuptools, fetchpatch, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -40,7 +40,7 @@ buildPythonApplication rec { Logbook matrix-nio peewee - prompt_toolkit + prompt-toolkit setuptools ] ++ lib.optional enableDbusUi [ dbus-python diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 88c793f9cb5..535dd22c515 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -4,7 +4,7 @@ , colorama , fetchPypi , minikerberos -, prompt_toolkit +, prompt-toolkit , pycryptodomex , pythonOlder , six @@ -27,7 +27,7 @@ buildPythonPackage rec { asysocks colorama minikerberos - prompt_toolkit + prompt-toolkit pycryptodomex six tqdm diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index ec4cffe0d39..84665ecb095 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }: buildPythonPackage rec { pname = "click-repl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"; }; - propagatedBuildInputs = [ click prompt_toolkit ]; + propagatedBuildInputs = [ click prompt-toolkit ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 07ddca0680a..68d69023e25 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , click -, prompt_toolkit +, prompt-toolkit , pygments , requests , sqlparse @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - prompt_toolkit + prompt-toolkit pygments requests sqlparse diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix index 04e97f4c669..a0e5dcb7142 100644 --- a/pkgs/development/python-modules/clintermission/default.nix +++ b/pkgs/development/python-modules/clintermission/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }: +{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt-toolkit }: buildPythonApplication rec { pname = "clintermission"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv"; }; - propagatedBuildInputs = [ prompt_toolkit ]; + propagatedBuildInputs = [ prompt-toolkit ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 55eadddaa1d..e964f2abaaa 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -7,7 +7,7 @@ , mypy , pygments , pytestCheckHook -, prompt_toolkit +, prompt-toolkit , tkinter , watchdog }: @@ -23,7 +23,7 @@ buildPythonApplication rec { sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3"; }; - propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ]; + propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ]; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a75ceaa0b76..45096bf7781 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -19,7 +19,7 @@ , requests , simplegeneric , traitlets -, prompt_toolkit +, prompt-toolkit , pexpect , appnope }: @@ -51,7 +51,7 @@ buildPythonPackage rec { checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; propagatedBuildInputs = [ - backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit + backports_shutil_get_terminal_size decorator pickleshare prompt-toolkit simplegeneric traitlets requests pathlib2 pexpect ] ++ lib.optionals stdenv.isDarwin [ appnope ]; diff --git a/pkgs/development/python-modules/ipython/7.16.nix b/pkgs/development/python-modules/ipython/7.16.nix index 9700737f485..d0ca5eef7cd 100644 --- a/pkgs/development/python-modules/ipython/7.16.nix +++ b/pkgs/development/python-modules/ipython/7.16.nix @@ -13,7 +13,7 @@ , decorator , pickleshare , traitlets -, prompt_toolkit +, prompt-toolkit , pexpect , appnope , backcall @@ -43,7 +43,7 @@ buildPythonPackage rec { decorator pickleshare traitlets - prompt_toolkit + prompt-toolkit pygments pexpect backcall diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index cd68bb62a12..e036a337864 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -14,7 +14,7 @@ , matplotlib-inline , pickleshare , traitlets -, prompt_toolkit +, prompt-toolkit , pexpect , appnope , backcall @@ -45,7 +45,7 @@ buildPythonPackage rec { matplotlib-inline pickleshare traitlets - prompt_toolkit + prompt-toolkit pygments pexpect backcall diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix index 440f22b1332..2072b24a378 100644 --- a/pkgs/development/python-modules/jupyter_console/5.nix +++ b/pkgs/development/python-modules/jupyter_console/5.nix @@ -5,7 +5,7 @@ , jupyter_client , ipython , ipykernel -, prompt_toolkit +, prompt-toolkit , pygments }: @@ -23,7 +23,7 @@ buildPythonPackage rec { jupyter_client ipython ipykernel - prompt_toolkit + prompt-toolkit pygments ]; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 22e057a5654..2858f008c2c 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -5,7 +5,7 @@ , jupyter_client , ipython , ipykernel -, prompt_toolkit +, prompt-toolkit , pygments , pythonOlder }: @@ -24,7 +24,7 @@ buildPythonPackage rec { jupyter_client ipython ipykernel - prompt_toolkit + prompt-toolkit pygments ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 649276ef252..f0e6e5abaa9 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -4,7 +4,7 @@ , asn1crypto , asysocks , minikerberos -, prompt_toolkit +, prompt-toolkit , tqdm , winacl , winsspi @@ -23,7 +23,7 @@ buildPythonPackage rec { asn1crypto asysocks minikerberos - prompt_toolkit + prompt-toolkit tqdm winacl winsspi diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 72eb9a185d7..1805172f4d7 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -2,7 +2,7 @@ , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions -, prompt_toolkit, pygments, stevedore, tqdm, lxml +, prompt-toolkit, pygments, stevedore, tqdm, lxml , python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser click python-slugify habanero isbnlib - prompt_toolkit pygments typing-extensions + prompt-toolkit pygments typing-extensions stevedore tqdm lxml python-doi # optional dependencies diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 65915c85869..2e8bde6f536 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -4,7 +4,7 @@ , importlib-metadata , isPy3k , jedi -, prompt_toolkit +, prompt-toolkit , pygments }: @@ -22,7 +22,7 @@ buildPythonPackage rec { appdirs black # yes, this is in install_requires jedi - prompt_toolkit + prompt-toolkit pygments ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 98182ddf68c..ba39dc536e2 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , click , fetchFromGitHub -, prompt_toolkit +, prompt-toolkit , pycryptodome , pythonOlder }: @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click - prompt_toolkit + prompt-toolkit pycryptodome ]; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 46b60419ad8..b96c5f8d15d 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -5,7 +5,7 @@ , click , fetchFromGitHub , mock -, prompt_toolkit +, prompt-toolkit , pygments , pyserial , pyserial-asyncio @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click - prompt_toolkit + prompt-toolkit pygments pyserial pyserial-asyncio diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index d7f93b3a47e..27619b78545 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry -, prompt_toolkit +, prompt-toolkit , pytest-cov , pytestCheckHook }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - prompt_toolkit + prompt-toolkit ]; checkInputs = [ diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 78ecb3face3..d2131136271 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -5,7 +5,7 @@ , ptable , click , requests -, prompt_toolkit +, prompt-toolkit , pygments , urllib3 , pytest @@ -20,9 +20,9 @@ buildPythonPackage rec { version = "5.8.4"; disabled = isPy27; - propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; + propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt-toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 75e600ccb51..b2a96ab0dc5 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { cli-helpers click configobj - prompt_toolkit + prompt-toolkit pygments sqlparse ]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index cc7524e3a43..62db92380ae 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -6,7 +6,7 @@ , click , configobj , humanize -, prompt_toolkit +, prompt-toolkit , psycopg2 , pygments , sqlparse @@ -34,7 +34,7 @@ buildPythonApplication rec { click configobj humanize - prompt_toolkit + prompt-toolkit psycopg2 pygments sqlparse diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index a2cc4206620..c73cb287202 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; - propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; + propagatedBuildInputs = with python3Packages; [ ply prompt-toolkit pygments ]; meta = with lib; { description = "A Python-ish, BASHwards-compatible shell"; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index d84c1816fec..762eab4eb0b 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -11,7 +11,7 @@ let sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY="; }; }); - prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "2.0.10"; src = oldAttrs.src.override { inherit version; @@ -62,7 +62,7 @@ with py.pkgs; buildPythonApplication rec { docutils groff less - prompt_toolkit + prompt-toolkit pyyaml rsa ruamel_yaml diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index ca845cce145..e128b9803c2 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { configobj importlib-resources paramiko - prompt_toolkit + prompt-toolkit pyaes pycrypto pygments diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 5e1ca0242bc..6f40c08dd16 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; + propagatedBuildInputs = with python3Packages; [ rich prompt-toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 3732fbd879f..3f42fa83c64 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { click httpie parsimonious - (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) + (python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {}) pygments six ]; diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index b342f203b44..51cb815db6f 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { # Requires having the physical onlykey (a usb security key) doCheck = false; propagatedBuildInputs = - with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ]; + with python3Packages; [ hidapi aenum six prompt-toolkit pynacl ecdsa cython ]; meta = with lib; { description = "OnlyKey client and command-line tool"; diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/tools/security/xcat/default.nix index 516585f8912..f5fa23d1900 100644 --- a/pkgs/tools/security/xcat/default.nix +++ b/pkgs/tools/security/xcat/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { cchardet click colorama - prompt_toolkit + prompt-toolkit xpath-expressions ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 294c90f6656..0622f791bf3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -53,6 +53,7 @@ mapAliases ({ lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 + prompt_toolkit = prompt-toolkit; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec635408..92b1da99446 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5603,7 +5603,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; + prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { }; property-manager = callPackage ../development/python-modules/property-manager { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 48ddb18291a..64330664852 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -403,7 +403,7 @@ with self; with super; { progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { }; pyamf = callPackage ../development/python-modules/pyamf { }; From a70d00f984e17bb30cdad556b250b702da720d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 17:03:03 +0200 Subject: [PATCH 0211/1522] pythonPackages.prompt-toolkit: cleanup, use pytestCheckHook --- .../{prompt_toolkit => prompt-toolkit}/1.nix | 23 +++++++++++-------- .../default.nix | 22 ++++++++++-------- 2 files changed, 26 insertions(+), 19 deletions(-) rename pkgs/development/python-modules/{prompt_toolkit => prompt-toolkit}/1.nix (73%) rename pkgs/development/python-modules/{prompt_toolkit => prompt-toolkit}/default.nix (72%) diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt-toolkit/1.nix similarity index 73% rename from pkgs/development/python-modules/prompt_toolkit/1.nix rename to pkgs/development/python-modules/prompt-toolkit/1.nix index bc39a8c9229..e1b9695071a 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt-toolkit/1.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , docopt , six , wcwidth @@ -9,22 +9,24 @@ }: buildPythonPackage rec { - pname = "prompt_toolkit"; + pname = "prompt-toolkit"; version = "1.0.18"; src = fetchPypi { - inherit pname version; + pname = "prompt_toolkit"; + inherit version; sha256 = "dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126"; }; - checkPhase = '' - rm prompt_toolkit/win32_types.py - py.test -k 'not test_pathcompleter_can_expanduser' - ''; - checkInputs = [ pytest ]; propagatedBuildInputs = [ docopt six wcwidth pygments ]; - meta = { + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_pathcompleter_can_expanduser" + ]; + + meta = with lib; { description = "Python library for building powerful interactive command lines"; longDescription = '' prompt_toolkit could be a replacement for readline, but it can be @@ -33,6 +35,7 @@ buildPythonPackage rec { with a nice interactive Python shell (called ptpython) built on top. ''; homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; - license = lib.licenses.bsd3; + maintainers = with maintainers; [ ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix similarity index 72% rename from pkgs/development/python-modules/prompt_toolkit/default.nix rename to pkgs/development/python-modules/prompt-toolkit/default.nix index 266ac3c90c3..9aed0211a95 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -1,27 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , six , wcwidth }: buildPythonPackage rec { - pname = "prompt_toolkit"; + pname = "prompt-toolkit"; version = "3.0.19"; src = fetchPypi { - inherit pname version; + pname = "prompt_toolkit"; + inherit version; sha256 = "08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f"; }; - checkPhase = '' - py.test -k 'not test_pathcompleter_can_expanduser' - ''; - checkInputs = [ pytest ]; propagatedBuildInputs = [ six wcwidth ]; - meta = { + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_pathcompleter_can_expanduser" + ]; + + meta = with lib; { description = "Python library for building powerful interactive command lines"; longDescription = '' prompt_toolkit could be a replacement for readline, but it can be @@ -30,6 +33,7 @@ buildPythonPackage rec { with a nice interactive Python shell (called ptpython) built on top. ''; homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; - license = lib.licenses.bsd3; + maintainers = with maintainers; [ ]; + license = licenses.bsd3; }; } From d455fa6f3c95a316d03a562f09160cad70bfc651 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 23 Jul 2021 16:36:01 +0200 Subject: [PATCH 0212/1522] python3Packages.softlayer: remove duplicated checkInputs --- pkgs/development/python-modules/softlayer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index d2131136271..f0ec10fafb9 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt-toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ]; checkPhase = '' pytest From 30f42bd4a4b0bdc0dc5fe3c1b94528426e5ab97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Jul 2021 16:55:15 +0200 Subject: [PATCH 0213/1522] pythonPackages.requests-unixsocket: switch to pytestCheckHook --- .../requests-unixsocket/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index f98b68c13a0..946e406c8bf 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, pbr, requests -, pytest, waitress }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, requests +, pytestCheckHook +, waitress +}: buildPythonPackage rec { pname = "requests-unixsocket"; @@ -14,10 +19,10 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest waitress ]; - checkPhase = '' + checkInputs = [ pytestCheckHook waitress ]; + + preCheck = '' rm pytest.ini - py.test ''; meta = with lib; { From 6ea6734f7152793bf5fc06bf78220c682f5f7b46 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 20 May 2021 07:59:34 +0800 Subject: [PATCH 0214/1522] nixos/iwd: add settings option --- .../from_md/release-notes/rl-2111.section.xml | 9 ++++++ .../manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/networking/iwd.nix | 32 +++++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3695997f717..ac38a13bb3d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -688,6 +688,15 @@ + + + The + networking.wireless.iwd + module has a new + networking.wireless.iwd.settings + option. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index cc5b6bf81ee..5dbcf3631de 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -179,3 +179,5 @@ pt-services.clipcat.enable). - NSS modules which should be queried after `resolved`, `files` and `myhostname`, but before `dns` should use the default priority - NSS modules which should come after `dns` should use mkAfter. + +- The [networking.wireless.iwd](options.html#opt-networking.wireless.iwd.enable) module has a new [networking.wireless.iwd.settings](options.html#opt-networking.wireless.iwd.settings) option. diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 99e5e78badd..8835f7f9372 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -4,8 +4,31 @@ with lib; let cfg = config.networking.wireless.iwd; + ini = pkgs.formats.ini { }; + configFile = ini.generate "main.conf" cfg.settings; in { - options.networking.wireless.iwd.enable = mkEnableOption "iwd"; + options.networking.wireless.iwd = { + enable = mkEnableOption "iwd"; + + settings = mkOption { + type = ini.type; + default = { }; + + example = { + Settings.AutoConnect = true; + + Network = { + EnableIPv6 = true; + RoutePriorityOffset = 300; + }; + }; + + description = '' + Options passed to iwd. + See here for supported options. + ''; + }; + }; config = mkIf cfg.enable { assertions = [{ @@ -15,6 +38,8 @@ in { ''; }]; + environment.etc."iwd/main.conf".source = configFile; + # for iwctl environment.systemPackages = [ pkgs.iwd ]; @@ -27,7 +52,10 @@ in { linkConfig.NamePolicy = "keep kernel"; }; - systemd.services.iwd.wantedBy = [ "multi-user.target" ]; + systemd.services.iwd = { + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + }; }; meta.maintainers = with lib.maintainers; [ mic92 dtzWill ]; From 23aa24109dbb6191012fdc4107380bc100a5d3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 22 Jul 2021 20:01:41 -0300 Subject: [PATCH 0215/1522] mojave-gtk-theme: 2020-11-29 -> 2021-07-20 - update version - run installPhase hooks - fix license - make relative symlinks for duplicated files --- pkgs/data/themes/mojave/default.nix | 67 +++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 7959753f05e..bf2014344a6 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, glib +, gtk-engine-murrine +, gtk_engines +, inkscape +, jdupes +, optipng +, sassc +, which +}: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-11-29"; + version = "2021-07-20"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "07lcg28y0scpii29j85343kmcga4wyaayjpx9a118z838mnvb757"; + sha256 = "08j70kmjhvh06c3ahcracarrfq4vpy0zsp6zkcivbw4nf3bzp2zc"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; @@ -19,40 +31,61 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - nativeBuildInputs = [ glib inkscape optipng sassc which ]; + nativeBuildInputs = [ + glib + inkscape + jdupes + optipng + sassc + which + ]; - buildInputs = [ gtk_engines ]; + buildInputs = [ + gtk_engines + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + # These fixup steps are slow and unnecessary. + dontPatchELF = true; + dontRewriteSymlinks = true; postPatch = '' patchShebangs . - for f in render-assets.sh \ - src/assets/gtk-2.0/render-assets.sh \ - src/assets/gtk-3.0/common-assets/render-assets.sh \ - src/assets/gtk-3.0/windows-assets/render-assets.sh \ - src/assets/metacity-1/render-assets.sh \ - src/assets/xfwm4/render-assets.sh + for f in \ + render-assets.sh \ + src/assets/cinnamon/thumbnails/render-thumbnails.sh \ + src/assets/gtk-2.0/render-assets.sh \ + src/assets/gtk/common-assets/render-assets.sh \ + src/assets/gtk/thumbnails/render-thumbnails.sh \ + src/assets/gtk/windows-assets/render-alt-assets.sh \ + src/assets/gtk/windows-assets/render-alt-small-assets.sh \ + src/assets/gtk/windows-assets/render-assets.sh \ + src/assets/gtk/windows-assets/render-small-assets.sh \ + src/assets/metacity-1/render-assets.sh \ + src/assets/xfwm4/render-assets.sh do substituteInPlace $f \ --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng done - - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" ''; installPhase = '' - name= ./install.sh -d $out/share/themes + runHook preInstall + name= ./install.sh --theme all --dest $out/share/themes install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* + jdupes -l -r $out/share + runHook postInstall ''; meta = with lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; From 2a8936a081666a032f35717cb273b41d84f43ed1 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 23 Jul 2021 18:44:56 +0200 Subject: [PATCH 0216/1522] hydrus: Add dandellion to maintainers --- pkgs/applications/graphics/hydrus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index a3b043adbe5..710c2620f1b 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -108,6 +108,6 @@ pythonPackages.buildPythonPackage rec { description = "Danbooru-like image tagging and searching system for the desktop"; license = licenses.wtfpl; homepage = "https://hydrusnetwork.github.io/hydrus/"; - maintainers = [ maintainers.evanjs ]; + maintainers = with maintainers; [ dandellion evanjs ]; }; } From cfe66d16b798d58bb2b857fc50ea68999306d710 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 23 Jul 2021 18:47:11 +0200 Subject: [PATCH 0217/1522] hydrus: 441 -> 447 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 710c2620f1b..37edc37337a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "441"; + version = "447"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "13h4qcz0iqba4mwyvgmdqh99jy22x7kw20f3g43b5aq3qyk9ca2h"; + sha256 = "0a9nrsbw3w1229bm90xayixvkpvr6g338w64x4v75sqxvpbx84lz"; }; nativeBuildInputs = [ From f33e6372ac813f314c80a6411173d365a0d4990f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Jul 2021 18:44:58 +0200 Subject: [PATCH 0218/1522] all-packages: move most throws into aliases.nix --- pkgs/top-level/aliases.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 23 +---------------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ece1dde076..465c2aebfce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -101,6 +101,8 @@ mapAliases ({ buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 + buildkite-agent2 = throw "buildkite-agent2 has been discontinued. Please use buildkite-agent (v3.x)"; # added 2018-09-26 + buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 @@ -339,6 +341,7 @@ mapAliases ({ hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 ht-rust = xh; # added 2021-02-13 htmlTidy = html-tidy; # added 2014-12-06 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 iana_etc = iana-etc; # added 2017-03-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 @@ -389,6 +392,7 @@ mapAliases ({ kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 + leksah = throw "To use leksah, refer to the instructions in https://github.com/leksah/leksah."; # added 2019-04-28 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 @@ -528,6 +532,7 @@ mapAliases ({ oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 ofp = throw "ofp is not compatible with odp-dpdk"; opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 @@ -548,6 +553,7 @@ mapAliases ({ parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 @@ -890,13 +896,16 @@ mapAliases ({ virtmanager-qt = virt-manager-qt; # added 2019-10-29 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 + way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 + winstone = throw "winstone is not supported anymore. Alternatives are Jetty or Tomcat."; # added 2019-05-14 winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 xp-pen-g430 = pentablet-driver; # added 2020-05-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..4721eb84366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7945,8 +7945,6 @@ in pdfarranger = callPackage ../applications/misc/pdfarranger { }; - pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available"; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -13222,9 +13220,7 @@ in buck = callPackage ../development/tools/build-managers/buck { }; - buildkite-agent = buildkite-agent3; - buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; - buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -15837,11 +15833,6 @@ in inherit (callPackage ../development/tools/misc/hydra { }) hydra-unstable; - hydra-flakes = throw '' - Flakes support has been merged into Hydra's master. Please use - `pkgs.hydra-unstable` now. - ''; - hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; @@ -18188,9 +18179,6 @@ in lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - leksah = throw ("To use leksah, refer to the instructions in " + - "https://github.com/leksah/leksah."); - libgme = callPackage ../development/libraries/audio/libgme { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -20393,8 +20381,6 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; - xinetd = callPackage ../servers/xinetd { }; zookeeper = callPackage ../servers/zookeeper { @@ -24189,8 +24175,6 @@ in }; wireshark-qt = wireshark; - # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -26226,8 +26210,6 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; - ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -27899,9 +27881,6 @@ in wapiti = callPackage ../tools/security/wapiti { }; - way-cooler = throw ("way-cooler is abandoned by its author: " + - "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( From e4f37c10d189535531f5c29d947ca27ab0a7adfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Jul 2021 18:45:29 +0200 Subject: [PATCH 0219/1522] top-level: a bit of cleanup, formatting --- pkgs/top-level/aliases.nix | 27 ++++++++------------------- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 465c2aebfce..4dcede94988 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -387,7 +387,7 @@ mapAliases ({ kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 krename-qt5 = krename; # added 2017-02-18 kerberos = libkrb5; # moved from top-level 2021-03-14 - keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; @@ -974,12 +974,9 @@ mapAliases ({ ocamlPackages_4_03 ocamlPackages_latest; - # added 2019-08-01 - mumble_git = pkgs.mumble; - murmur_git = pkgs.murmur; - - # added 2020-08-17 - zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + mumble_git = pkgs.mumble; # added 2019-08-01 + murmur_git = pkgs.murmur; # added 2019-08-01 + zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17 # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; @@ -994,16 +991,10 @@ mapAliases ({ ocaml_4_03 = ocamlPackages_4_03.ocaml; }) // { - # added 2019-10-28 - gnatsd = nats-server; - - # added 2020-01-10 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; - # added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; - - # added 2020-02-09 - dina-font-pcf = dina-font; + gnatsd = nats-server; # added 2019-10-28 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 + dina-font-pcf = dina-font; # added 2020-02-09 # added 2019-04-13 # *-polly pointed to llvmPackages_latest @@ -1019,9 +1010,7 @@ mapAliases ({ dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; - todolist = throw "todolist is now ultralist."; # added 2020-12-27 /* Cleanup before 21.05 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4721eb84366..50eb51f1075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31397,10 +31397,8 @@ in nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + - (lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) - "ugrade your Nix installation to a newer version and ") + - "use `nix repl` instead. " + - "Also see https://github.com/NixOS/nixpkgs/pull/44903" + (lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") + + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; From b856b195409121457e7c52ad8177dc73a15c423c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 19:07:52 +0200 Subject: [PATCH 0220/1522] element-desktop: try to fix localization issues I know that the en_EN.json vs. en-us.json is a nasty hack, but I don't really understand where this `en-us.json` is supposed to be coming from. --- .../networking/instant-messengers/element/element-desktop.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 18338fc0797..a45ead37efb 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -29,6 +29,8 @@ in mkYarnPackage rec { export HOME=$(mktemp -d) pushd deps/element-desktop/ npx tsc + yarn run i18n + node ./scripts/copy-res.js popd runHook postBuild ''; @@ -41,6 +43,7 @@ in mkYarnPackage rec { cp -r './deps/element-desktop/res/img' "$out/share/element" rm "$out/share/element/electron/node_modules" cp -r './node_modules' "$out/share/element/electron" + cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json # icons for icon in $out/share/element/electron/build/icons/*.png; do From f1100e94e1b94327cdf8233dedb7065009b75e6f Mon Sep 17 00:00:00 2001 From: Jeffrey Harmon <16364318+SquarePear@users.noreply.github.com> Date: Fri, 23 Jul 2021 13:15:50 -0400 Subject: [PATCH 0221/1522] ffmpeg-full: enable libdrm --- pkgs/development/libraries/ffmpeg-full/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 98d8ef434e0..432fcdff937 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -74,6 +74,7 @@ , libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) +, libdrm ? null # libdrm support , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) , libmfx ? null # Hardware acceleration vis libmfx @@ -348,6 +349,7 @@ stdenv.mkDerivation rec { #(enableFeature (libcaca != null) "libcaca") #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") + (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") (enableFeature (libiconv != null) "iconv") (enableFeature (libjack2 != null) "libjack") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") @@ -432,6 +434,7 @@ stdenv.mkDerivation rec { ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva + ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx From b93d96a4ca5a2cbd646306a7d958d02d4d090957 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Fri, 23 Jul 2021 19:41:15 +0200 Subject: [PATCH 0222/1522] Tautulli: 2.7.3 -> 2.7.5 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index cecdce5aa96..7a48a9b2478 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.7.3"; + version = "2.7.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "1ig2vq19sb6n2x2w2zbf54izynaqay9l8xq1zds116v0z729wlkh"; + sha256 = "h4IRPUaqgb/AgqKJJEsHBydJOH2i//fpWzMFa0VM2ns="; }; installPhase = '' From 8c422bb2a29cdcbb398fa26957290894272b4279 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 23 Jul 2021 11:11:53 -0700 Subject: [PATCH 0223/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 238 ++++++++++++------------- pkgs/misc/vim-plugins/overrides.nix | 2 +- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 3 files changed, 121 insertions(+), 121 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b31924a9de4..65ec5d22090 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587"; - sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm"; + rev = "530b38de342a21cce330a32af0c1b66671d335c2"; + sha256 = "1qvdywgn79fvjdyk2bj7ym9fa65l96dcnp69yhravb9rinrawb5i"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8"; - sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr"; + rev = "a33313899a56b936c889f9faaad798d429997042"; + sha256 = "1mqcwvmnn4lbl4901gh5rsfagcx464zdaw0rq0sn0fkyx4ydq9s0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-20"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42"; - sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq"; + rev = "b9b2b1c0991ab1a5d3b5822296c341815da00f6c"; + sha256 = "1f6g0vhd8x90j75f60j4k7ii1zi9y0nhzrahk5h04gr2qm9pnvsf"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -569,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-20"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a"; - sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g"; + rev = "479b4ac1d09cec838a232e49ad54b79f2217ad4c"; + sha256 = "0lxpcyvgii8xal6s16aw6y4430709xsba3kn1jwm1lbnrz5mhqwb"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -786,12 +786,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-07-19"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d"; - sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l"; + rev = "8dedf17ad815ce78122c22d25e93777e3f2d8cfe"; + sha256 = "0061x13jznqqvpci1f6x9r0qrn2bakvvp2ai1nbrb1ynvbgkh3mf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1316,12 +1316,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "63d7052686732a910b7355761193fdb55a521cd3"; - sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv"; + rev = "dea0e244bca3a89479e9225b531a319cd812cd52"; + sha256 = "0gf1x10ix3p6ls1g1cbx57fxd5ln13p3abhv52wqy2gkdl3syvw4"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1486,12 +1486,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-07-14"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be"; - sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj"; + rev = "f734d08b7d8c59be372f0364cbdbb2e3b8884574"; + sha256 = "1gfswql15fpndxmkqgw5l3c15kpv2892bhmcc8hg3wwi6d8c8g3i"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1510,12 +1510,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2020-03-23"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; - sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; + rev = "b5977da87ab7725d5bd9f46fd691eca433503835"; + sha256 = "1j5b2nhmc4kq23dzhwsspwqx9shxpqp57175j0zr53phx01q3qcr"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -1714,15 +1714,15 @@ final: prev: }; fzf-checkout-vim = buildVimPluginFrom2Nix { - name = "fzf-checkout.vim"; - version = "2021-07-21"; + pname = "fzf-checkout-vim"; + version = "2021-06-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; }; - meta.homepage = "https://github.com/stsewd/fzf-checkout.vim"; + meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; fzf-lsp-nvim = buildVimPluginFrom2Nix { @@ -1871,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0"; - sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj"; + rev = "22a1d6db29a2c6b485a48512d2c38ac84d6a78bb"; + sha256 = "1dxz6zjhf2z4n2pqdk95ifdj379fravfr55k401plgy223hmpkip"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2460,12 +2460,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-07-03"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "64a941e317fb9a432d8924eb3a124627c71c0d18"; - sha256 = "10d6fr2kasm13js7k85a9mm6q7ga6b3h6z9mys6wwaphzsm7vli1"; + rev = "321f1995211b05d5abd73732262432e70eba1218"; + sha256 = "1bg0vjf6pnbjmj76mzcbcrm7gdhsxqi040xspyizfykj72qjqyd4"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2736,12 +2736,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07"; - sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629"; + rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743"; + sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3252,12 +3252,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2021-05-26"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "cae4f19aeac40037039e914932da850443b7729f"; - sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh"; + rev = "a626942b2a87a865c73e1d62391ef7e85ddf8bce"; + sha256 = "0145gxpaq8zidrsksq1d40y5g3l2f1ac5z9n5p21b32x512d4diz"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -3420,12 +3420,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783"; - sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j"; + rev = "4308ebe128e25704bc1b1ef20133d68d8fba2db0"; + sha256 = "07wcm7gjv48b1z33qixb52bvq7qj44dalmzjbms2wlg00zgq38kf"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3456,12 +3456,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4"; - sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws"; + rev = "2c2aec89bb85cc38e9fd6f83a93bb748ae462a01"; + sha256 = "11qfbn54h7ckggf9va2qawpl81mbm985lr893gvimfkwl6v3zqlp"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-19"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066"; - sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh"; + rev = "5a86b4f83c1f17b27a02c191dcebb0441c0531bb"; + sha256 = "1c4jcdjmafkpcq2vma39vsdm93al8yi3q8n6i4hfvmw8lvsxcfy6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3552,12 +3552,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc"; - sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58"; + rev = "789c204cbec3ec060eb345a8820c3788c0ac4335"; + sha256 = "14h1h47fijw4r76pdav6p3nrl4chhf6l4vmml89chill34lspdab"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3588,12 +3588,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-16"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "ef97a9b17c655d8b603c5fa9abf6fbb623a1dad4"; - sha256 = "0lrna8ryw391dpvi64x3q2gj484mf5s6wlqqg6a52a5s3ganh41n"; + rev = "73529ce61611c9ee3821e18ecc929c422416c462"; + sha256 = "1r55z5abg7ha3xh84ypbbnc3fs7a1718zqmypc49f3wa6ln2rjxz"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3612,12 +3612,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f"; - sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc"; + rev = "9dc887db1c266aab2ebddf3845d22587f15e92a6"; + sha256 = "10klagr9ybk96ayhsxd1qp2mjpkrv0a70lh571ixmdf90a6zkg4y"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3792,12 +3792,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "0e11e0322c1730559cb74f728300de2912bf9a61"; - sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; + rev = "895f8e2485267640ccd11fe3fbf1ab5fe178bc4c"; + sha256 = "1jmg13618r9yxidb2y6fs1y342qqnqa19m1srfkczsxgqr89wrsh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3816,12 +3816,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84"; - sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84"; + rev = "65a059b34d5bc77db01372c589f582b17524a2f9"; + sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3876,12 +3876,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-19"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c"; - sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy"; + rev = "fabcc1ac8392cc9a5beae8020b6c80538a725077"; + sha256 = "1a3871n3kwvwgz40a74c74lyy5p2l4rih75asb6rnjrrknkk47fb"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4032,12 +4032,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-17"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "b6a904b341c56c5386bdd5c991439a834d061874"; - sha256 = "1ja6k5cw6v5nhi91s643r6c38a15rgi4n8cb0k5pc5q252q8km04"; + rev = "fdf005f5697742da121391d31ad42a47842264f9"; + sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4189,12 +4189,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-07-09"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "080d24394b9abc93b6cd7635cb96c7d6601759a3"; - sha256 = "19xc61xfdyi21k9wbs63iynkfysqi3v28897bqig8myjr1mifbpb"; + rev = "a695e5d653e3a864e11a5ad777e1274eaae90494"; + sha256 = "0ahvklrll8wswzzhqqc6qqp1f023njrkqbry439l8s21zsnq63dh"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4369,12 +4369,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2021-05-18"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "097b098e62d6499967e44091689c104165ad5e22"; - sha256 = "12qizfs7d0xh10vzm7spcqsi53k3iqvbfp5nhb3qh3xdsavzyp0m"; + rev = "48b6bc12b560d3013cd30c7959e235993374c24b"; + sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -4429,12 +4429,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2021-05-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "dacb2ba386d982d4466aa469799376c38ddcfd2a"; - sha256 = "1b8zb6k92iwmvdny5g16d5y5zl8fc235vlgvxrnipcfj4m3ch0yy"; + rev = "6bd1b891ecf6c5c054442c6934965714d5ffe834"; + sha256 = "1a5dw5y359jbvd3yr9sjxjbjwqrgvmwdv9y1jifqk7s5p0y0b4jg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -4477,12 +4477,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6"; - sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac"; + rev = "a0be4f89830210c5203ea2bee1373041400a59d1"; + sha256 = "1f5s9shmlpixw6lkywbnbfcqhqvaczmbhys243pn96pv4bsy09r5"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4839,12 +4839,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "d313ed0f8f39a7fd09da65c4f02191368680387f"; - sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw"; + rev = "e47e911d4fba1c584cfb31dd710c1f2a03961561"; + sha256 = "0bb1bsswffp45g38fn41dcbr5dx2gfaz1xhr470h5ln7ywkwv2hi"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4939,10 +4939,10 @@ final: prev: src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "7414f30365a342e1d89072d474a35913643b6eec"; - sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + rev = "6a51c637dd8deb4c1e398932651b3a635d1694e2"; + sha256 = "1hxdklzbci1cxaq6mvy6f2zih8cxyp4s8y6yrnz9w2587pxh0c7j"; }; - meta.homepage = "https://github.com/simrat39/symbols-outline.nvim"; + meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { @@ -5165,12 +5165,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "664690029fdb302bee8d3f27a458383e8477add7"; - sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz"; + rev = "79644ab67731c7ba956c354bf0545282f34e10cc"; + sha256 = "0v7qpblbgs298aj0p5fs4q8b8zc36ib427aq78c0500988p6hr3d"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5298,12 +5298,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1"; - sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza"; + rev = "4b06ca24de8aeb8b512727a27f2d1b3ba7b20ff6"; + sha256 = "0lyqbwjyb0sczzqhfd7nmg3hzqn9pqxbrg14szg56a14mmm59mxf"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -5334,12 +5334,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-07-16"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "059ea2b999171f50019291ee776dd496799fdf3a"; - sha256 = "06v2jvlw8rjlarx89kfb7ys8y0jkm1f7c4vnws60nfbqgp9c9k98"; + rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4"; + sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5850,12 +5850,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-06-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "d616fcf8a747f86bd3b26004b83ea5b7c7526df1"; - sha256 = "1292613i7yi38jsl1sly5i9bdi7bzaw2pg67gkymq2ln7zcpvims"; + rev = "80ba8b13a9699db20754623a0933095be65fc203"; + sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6042,12 +6042,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b"; - sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw"; + rev = "111ef624c0d39fe5fcf869fba01c16036e106fbd"; + sha256 = "0xgdvk362fk6491pk5dv46a2cg77gk57gk6dvhzf3ldi5zshckfj"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6822,12 +6822,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "de6495ae846b2c5913fa85d5464c036c0acdfa34"; - sha256 = "184cbh2jxwpp4zgvlfhs4qx1mr4vyq5vvv6lvk8lcng40dxfr9fg"; + rev = "a7c54990f031ab93b556ceb25c5afb8a45c3311a"; + sha256 = "0ld8p75av2v9ki5sh7rh8cxj99k6lydhy6jp9x19fk8bzxsgff02"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7592,12 +7592,12 @@ final: prev: vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2020-07-01"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323"; - sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w"; + rev = "447c69b59fadcf04f96d99873126953eae7aa235"; + sha256 = "0cglf4kfb07jwz1v14gl83rnfjm4c1b69nih3g7yj001ddyj5amx"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; @@ -8325,14 +8325,14 @@ final: prev: vim-prettier = buildVimPluginFrom2Nix { pname = "vim-prettier"; - version = "2021-07-21"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8"; sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf"; }; - meta.homepage = "https://github.com/prettier/vim-prettier"; + meta.homepage = "https://github.com/prettier/vim-prettier/"; }; vim-prettyprint = buildVimPluginFrom2Nix { @@ -8565,12 +8565,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-07-18"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "482e2cec5a742920eddf644f2f1efcb15f03967c"; - sha256 = "18b3hhb1sfgip80dp7wicrsqs59narj49qlmpnfhsy29imsxzb72"; + rev = "5516e301a5c3cacac008342006a712f5fa80f6a1"; + sha256 = "0fwy02mj0gafgv01qpgfyi5n0i0lrfzy8nw93hrpqwc97pckh1pp"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9767,12 +9767,12 @@ final: prev: vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { pname = "vimway-lsp-diag-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "onsails"; repo = "vimway-lsp-diag.nvim"; - rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07"; - sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm"; + rev = "28c23ed9dc499410b4bd0ac040e48c76560b18b7"; + sha256 = "1fdmg6xhhqdhk4hykhhxw55d11gcb932b2iz2sk7f4bps8c2lgg9"; }; meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; }; @@ -9972,12 +9972,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-07-05"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c83c240e1397291bf1babcba173253d7f753a0b6"; - sha256 = "0lr2vl9rdjr2lgbs5vlbcjw3zrwv66w5bijlpk1xy45ccbrbq2nw"; + rev = "8411859f48c8066a3b6f29c1a8e3bfa2d0653551"; + sha256 = "0yx2aig7pk8f99d539p85q3csb3l7bf2575r24w3fvchwj8w2pqy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a63d0544128..60bd11803ca 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -643,7 +643,7 @@ self: super: { libiconv ]; - cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a"; + cargoSha256 = "sha256-J5BCLcwOPB+EfOmdITCHgec9XDkm2oCGfRo/sKjEOIg="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3f1963101ce..d55ce357892 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -645,8 +645,8 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml -stsewd/fzf-checkout.vim stevearc/aerial.nvim +stsewd/fzf-checkout.vim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive From 3bb38198e94c9076acac411caae0f1c15ad1e96e Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Fri, 23 Jul 2021 20:39:38 +0200 Subject: [PATCH 0224/1522] webkitgtk: 2.32.1 -> 2.32.3 Relevant security advisory: https://webkitgtk.org/security/WSA-2021-0004.html CVEs: CVE-2021-1817, CVE-2021-1820, CVE-2021-1825, CVE-2021-1826, CVE-2021-21775, CVE-2021-21779, CVE-2021-21806, CVE-2021-30661, CVE-2021-30663, CVE-2021-30665, CVE-2021-30666, CVE-2021-30682, CVE-2021-30689, CVE-2021-30720, CVE-2021-30734, CVE-2021-30744, CVE-2021-30749, CVE-2021-30758, CVE-2021-30761, CVE-2021-30762, CVE-2021-30795, CVE-2021-30797, CVE-2021-30799 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 40f51d6f48a..563c13b26f2 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.1"; + version = "2.32.3"; outputs = [ "out" "dev" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k"; + sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw="; }; patches = lib.optionals stdenv.isLinux [ From a3f4b6f890d627b8216565133dde7ba9936f78a8 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sun, 11 Jul 2021 17:29:43 +0100 Subject: [PATCH 0225/1522] hamlib: 3.3 -> 4.2 --- pkgs/development/libraries/hamlib/4.nix | 64 +++++++++++++++++++ pkgs/development/libraries/hamlib/default.nix | 50 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/hamlib/4.nix diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix new file mode 100644 index 00000000000..cad69e8b418 --- /dev/null +++ b/pkgs/development/libraries/hamlib/4.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, perl +, swig +, gd +, ncurses +, python3 +, libxml2 +, tcl +, libusb-compat-0_1 +, pkg-config +, boost +, libtool +, perlPackages +, pythonBindings ? true +, tclBindings ? true +, perlBindings ? true +}: + +stdenv.mkDerivation rec { + pname = "hamlib"; + version = "4.2"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1m8gb20i8ga6ndnnw187ry1h4z8wx27v1hl7c610r6ky60pv4072"; + }; + + nativeBuildInputs = [ + swig + pkg-config + libtool + ]; + + buildInputs = [ + gd + libxml2 + libusb-compat-0_1 + boost + ] ++ lib.optionals pythonBindings [ python3 ncurses ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; + + configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] + ++ lib.optionals pythonBindings [ "--with-python-binding" ]; + + meta = with lib; { + description = "Runtime library to control radio transceivers and receivers"; + longDescription = '' + Hamlib provides a standardized programming interface that applications + can use to send the appropriate commands to a radio. + + Also included in the package is a simple radio control program 'rigctl', + which lets one control a radio transceiver or receiver, either from + command line interface or in a text-oriented interactive interface. + ''; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + homepage = "http://hamlib.sourceforge.net"; + maintainers = with maintainers; [ relrod ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 98b49461005..cd56b04c034 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,5 +1,22 @@ -{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, - boost, libtool, perlPackages }: +{ lib +, stdenv +, fetchurl +, perl +, swig +, gd +, ncurses +, python3 +, libxml2 +, tcl +, libusb-compat-0_1 +, pkg-config +, boost +, libtool +, perlPackages +, pythonBindings ? true +, tclBindings ? true +, perlBindings ? true +}: stdenv.mkDerivation rec { pname = "hamlib"; @@ -10,13 +27,26 @@ stdenv.mkDerivation rec { sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; - buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkg-config boost libtool ]; + nativeBuildInputs = [ + swig + pkg-config + libtool + ]; - configureFlags = [ "--with-perl-binding" "--with-python-binding" - "--with-tcl-binding" "--with-rigmatrix" ]; + buildInputs = [ + gd + libxml2 + libusb-compat-0_1 + boost + ] ++ lib.optionals pythonBindings [ python3 ncurses ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; - meta = { + configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] + ++ lib.optionals pythonBindings [ "--with-python-binding" ]; + + meta = with lib; { description = "Runtime library to control radio transceivers and receivers"; longDescription = '' Hamlib provides a standardized programming interface that applications @@ -26,9 +56,9 @@ stdenv.mkDerivation rec { which lets one control a radio transceiver or receiver, either from command line interface or in a text-oriented interactive interface. ''; - license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; homepage = "http://hamlib.sourceforge.net"; - maintainers = with lib.maintainers; [ relrod ]; - platforms = with lib.platforms; unix; + maintainers = with maintainers; [ relrod ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9f9561022..63e1c73e7ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15692,7 +15692,9 @@ in gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; - hamlib = callPackage ../development/libraries/hamlib { }; + hamlib = hamlib_3; + hamlib_3 = callPackage ../development/libraries/hamlib { }; + hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; From 70c06e4c2bf7f90e0b723263e600a52c88e8d5df Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Fri, 23 Jul 2021 20:11:15 +0100 Subject: [PATCH 0226/1522] fldigi: use hamlib 4.2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63e1c73e7ff..c1756d307d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23850,7 +23850,9 @@ in flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { }; + fldigi = callPackage ../applications/radio/fldigi { + hamlib = hamlib_4; + }; flink = callPackage ../applications/networking/cluster/flink { }; From e057fb2ffd5823d8af130d88a3ae20ea69a39e38 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Fri, 23 Jul 2021 20:12:03 +0100 Subject: [PATCH 0227/1522] cqrlog: use hamlib 4.2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1756d307d0..162a29c7f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23440,7 +23440,9 @@ in python3Packages = python37Packages; }; - cqrlog = callPackage ../applications/radio/cqrlog { }; + cqrlog = callPackage ../applications/radio/cqrlog { + hamlib = hamlib_4; + }; crun = callPackage ../applications/virtualization/crun {}; From 60354bc4ea0b6ed4fd58b53e51438e0eb384de62 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Fri, 23 Jul 2021 20:12:39 +0100 Subject: [PATCH 0228/1522] direwolf: use hamlib 4.2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 162a29c7f66..53727238adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23520,7 +23520,9 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/radio/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { + hamlib = hamlib_4; + }; dirt = callPackage ../applications/audio/dirt {}; From a7fe887c538a25674a2960489895a992fe841d21 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Fri, 23 Jul 2021 20:13:14 +0100 Subject: [PATCH 0229/1522] gpredict: use hamlib 4.2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53727238adb..2e3ea88125c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5471,7 +5471,9 @@ in gpp = callPackage ../development/tools/gpp { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { + hamlib = hamlib_4; + }; gptfdisk = callPackage ../tools/system/gptfdisk { }; From 0708fe494be218d06141a1269c89077de61cbea7 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 19 Jul 2021 12:00:00 +0000 Subject: [PATCH 0230/1522] cadical: install library --- .../science/logic/cadical/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index ca5e6b5c419..6758eeb6605 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -11,14 +11,30 @@ stdenv.mkDerivation rec { sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf"; }; + outputs = [ "out" "dev" "lib" ]; doCheck = true; - dontAddPrefix = true; + + # the configure script is not generated by autotools and does not accept the + # arguments that the default configurePhase passes like --prefix and --libdir + configurePhase = '' + runHook preConfigure + + ./configure + + runHook postConfigure + ''; installPhase = '' + runHook preInstall + install -Dm0755 build/cadical "$out/bin/cadical" install -Dm0755 build/mobical "$out/bin/mobical" - mkdir -p "$out/share/doc/${pname}-${version}/" - install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/" + install -Dm0644 src/ccadical.h "$dev/include/ccadical.h" + install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a" + mkdir -p "$out/share/doc/${pname}/" + install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/" + + runHook postInstall ''; meta = with lib; { From 88fc4c24b17b833777a1016d86137c3913981eb1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 23 Jul 2021 22:10:53 +0200 Subject: [PATCH 0231/1522] postgresql: fix build with clang on linux --- 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 5d0a9cfa857..1f9a1ffc018 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,7 +33,7 @@ let inherit sha256; }; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ From 3a075ab4d6b28ebe8cf7c732ff6b7efecb850e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Jul 2021 22:46:18 +0200 Subject: [PATCH 0232/1522] libxlsxwriter: 1.0.9 -> 1.1.1 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.1.0 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.1.1 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index dfeaeed8ca8..3681cb4ac5d 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.9"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-6MMQr0ynMmfZj+RFoKtLB/f1nTBfn9tcYpzyUwnfB3M="; + sha256 = "1bi8a1pj18836yfqsnmfp45nqhq2d9r2r7gzi2v1y0qyk9jh6xln"; }; nativeBuildInputs = [ From 711d2d525bcc20c2ee1a6d2ffc202133b1018647 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 22:52:19 +0200 Subject: [PATCH 0233/1522] python3Packages.hap-python: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/hap-python/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index cba02387be5..c4811677655 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -4,7 +4,6 @@ , cryptography , curve25519-donna , ecdsa -, ed25519 , fetchFromGitHub , h11 , pyqrcode @@ -17,15 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.1"; + version = "3.5.2"; disabled = pythonOlder "3.6"; - # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-ZHTqlb7LIDp8MFNW8MFg6jX7QwaxT40cLi3H13ONLCI="; + sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd"; }; propagatedBuildInputs = [ @@ -33,7 +31,6 @@ buildPythonPackage rec { cryptography curve25519-donna ecdsa - ed25519 h11 pyqrcode zeroconf From 953909341ea62291a4c4a9483214f9a12d58ec99 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 23 Jul 2021 22:32:14 +0200 Subject: [PATCH 0234/1522] trash-cli: 0.21.6.30 -> 0.21.7.23 Also add an installation check. --- pkgs/tools/misc/trash-cli/default.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index dbc00e13e1a..301f6163d76 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.6.30"; + version = "0.21.7.23"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7"; + sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l"; }; propagatedBuildInputs = [ python3Packages.psutil ]; @@ -18,8 +18,27 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - # Skip `test_user_specified` since its result depends on the mount path. - disabledTests = [ "test_user_specified" ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Create a home directory with a test file. + HOME="$(mktemp -d)" + touch "$HOME/deleteme" + + # Verify that trash list is initially empty. + [[ $($out/bin/trash-list) == "" ]] + + # Trash a test file and verify that it shows up in the list. + $out/bin/trash "$HOME/deleteme" + [[ $($out/bin/trash-list) == *" $HOME/deleteme" ]] + + # Empty the trash and verify that it is empty. + $out/bin/trash-empty + [[ $($out/bin/trash-list) == "" ]] + + runHook postInstallCheck + ''; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; From 43ced3efad28bcd68ef4fc08e7e53994c79e7877 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 23:01:54 +0200 Subject: [PATCH 0235/1522] python3Packages.channels: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/channels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 0f5e708d091..3535f3a44d4 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "3.0.3"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f"; + sha256 = "0xcbpfisgawqa34ccgz56wzid0ycp3c8wjcppmz8sgd2hx4skngx"; }; # Files are missing in the distribution From 184178c221991d4adfffa5b17724dbd374d3a522 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 05:10:18 +0000 Subject: [PATCH 0236/1522] erlang: 24.0.3 -> 24.0.4 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 7f4b49c5c32..b4e9ebba797 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.3"; - sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; + version = "24.0.4"; + sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM="; } From 82147a26802fb2cc5b40e8fe561e97261184612b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Jul 2021 00:11:04 +0200 Subject: [PATCH 0237/1522] abcm2ps: correct license --- pkgs/tools/audio/abcm2ps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index da9fb934ce2..b94d514e8ec 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://moinejf.free.fr/"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; maintainers = [ maintainers.dotlambda ]; From e0ea7f76280ecfcadf5bc5715a5f24f6a0a4aea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Jul 2021 00:23:53 +0200 Subject: [PATCH 0238/1522] python3Packages.jeepney: 0.6.0 -> 0.7.0 https://gitlab.com/takluyver/jeepney/-/blob/0.7/docs/release-notes.rst --- pkgs/development/python-modules/jeepney/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index cea428a9ffd..2acf0361bcb 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"; + sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; }; checkInputs = [ From 77e72c43ce0721985ee2ed70098f4d620fb45494 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Sat, 24 Jul 2021 00:28:46 +0200 Subject: [PATCH 0239/1522] plex: 1.23.5.4841-549599676 -> 1.23.5.4862-0f739d462 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 1d527fb203c..6bde2ed5a57 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.5.4841-549599676"; + version = "1.23.5.4862-0f739d462"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q"; + sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb"; + sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc"; }; outputs = [ "out" "basedb" ]; From 18f1aed44862c252175ec0a5a7d726c965fceec8 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Sat, 24 Jul 2021 00:41:28 +0200 Subject: [PATCH 0240/1522] git-annex-remote-googledrive: 1.3.0 -> 1.3.2 --- .../git-and-tools/git-annex-remote-googledrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix index 89b2a5f23b0..66dc5ece90a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "git-annex-remote-googledrive"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "118w0fyy6pck8hyj925ym6ak0xxqhkaq2vharnpl9b97nab4mqg8"; + sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ]; From 85a9a16aa99e8fdf38e37dbf07a076ab0559e56f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 23 Jul 2021 10:22:24 +0900 Subject: [PATCH 0241/1522] vscode-extensions.eugleo.magic-racket: init at 0.5.7 --- pkgs/misc/vscode-extensions/default.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6507a603b86..8c8ab911cc3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -513,6 +513,28 @@ let }; }; + eugleo.magic-racket = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; + description = "The best coding experience for Racket in VS Code "; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; + homepage = "https://github.com/Eugleo/magic-raket"; + license = licenses.agpl3Only; + + }; + mktplcRef = { + name = "magic-racket"; + publisher = "evzen-wybitul"; + version = "0.5.7"; + sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU="; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json + ''; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; From c23ff491f26a55b4adabb108f457caad4955dc15 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 24 Jul 2021 02:07:21 +0300 Subject: [PATCH 0242/1522] turbogit: 2.0.0 -> 3.0.1 --- pkgs/development/tools/turbogit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turbogit/default.nix b/pkgs/development/tools/turbogit/default.nix index 7d3e88f6cb4..30ce29ffe66 100644 --- a/pkgs/development/tools/turbogit/default.nix +++ b/pkgs/development/tools/turbogit/default.nix @@ -1,16 +1,16 @@ { fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }: buildGoModule rec { pname = "turbogit"; - version = "2.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "b4nst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs="; + sha256 = "sha256-A1hVpapp6yIpUVnDQ1yLLHiYdLcQlr/JcTOmt5sr3Oo="; }; - vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8="; + vendorSha256 = "sha256-1AEcBq7wiENWQ5HZEEXpIgA6Bf2T28zm/MwYTke/f9s="; subPackages = [ "." ]; From c3822ddb5819def049f956564a8f97e540bd11ef Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 23 Jul 2021 17:13:20 -0700 Subject: [PATCH 0243/1522] gst_all_1: get all dependencies via callPackage The use of `rec` would bypass callPackage's machinery for gstreamer interdependencies and hinder overrides via overlays. --- .../libraries/gstreamer/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index a86308ea3ce..d1c7233f0d4 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,29 +1,27 @@ { callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: -rec { +{ gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; - gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; }; + gst-plugins-base = callPackage ./base { inherit Cocoa OpenGL; }; - gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; }; + gst-plugins-good = callPackage ./good { inherit Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; + gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; - gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; }; + gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; - gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; + gst-rtsp-server = callPackage ./rtsp-server { }; - gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + gst-libav = callPackage ./libav { }; - gst-devtools = callPackage ./devtools { inherit gstreamer gst-plugins-base; }; + gst-devtools = callPackage ./devtools { }; - gst-editing-services = callPackage ./ges { inherit gst-plugins-base gst-plugins-bad gst-devtools; }; + gst-editing-services = callPackage ./ges { }; - gst-vaapi = callPackage ./vaapi { - inherit gst-plugins-base gstreamer gst-plugins-bad; - }; + gst-vaapi = callPackage ./vaapi { }; # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af5b0a0275d..1607fb293ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15533,7 +15533,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg; }; + callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; }); inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); From 12fe964ba7355b3df3222e61752f025410b71ba9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 00:23:06 +0000 Subject: [PATCH 0244/1522] cvs-fast-export: 1.57 -> 1.58 --- .../version-management/cvs-fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index a14af17c01c..7c8d8ce11bc 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.57"; + version = "1.58"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "0y1fzsicga19nsarpmn2ms69sq26b2d3d8a1169qbqz1kzr0jji8"; + sha256 = "sha256-jY/GURa6WzULwpnoqBmzVQdK4WH95tf59v07y8gHeWM="; }; strictDeps = true; From e09de920492eb6120a77463d8e2b7d36977036c9 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 23 Jul 2021 22:11:57 -0300 Subject: [PATCH 0245/1522] temporal: 1.11.1 -> 1.11.2 --- pkgs/applications/networking/cluster/temporal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 55f1a5a2c09..534a132af5a 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM="; + sha256 = "sha256-DskJtZGp8zmSWC5GJijNbhwKQF0Y0FXXh7wCzlbAgy8="; }; - vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI"; + vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite From 8f941e7c911e62e70f23c0f82071cd11cb1e8436 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 24 Jul 2021 10:37:29 +0900 Subject: [PATCH 0246/1522] vscode-extentions.betterthantomorrow.calva: init at 2.0.205 --- pkgs/misc/vscode-extensions/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8c8ab911cc3..c8faa5cb7f7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal, clojure-lsp }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -206,6 +206,23 @@ let }; }; + betterthantomorrow.calva = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "calva"; + publisher = "betterthantomorrow"; + version = "2.0.205"; + sha256 = "sha256-umnG1uLB42fUNKjANaKcABjVmqbdOQakd/6TPsEpF9c"; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json + ''; + meta = with lib; { + license = licenses.mit; + }; + }; + bodil.file-browser = buildVscodeMarketplaceExtension { mktplcRef = { name = "file-browser"; From 6ada8de2c753cab2486d851bd4203db2bf4486cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 12:47:13 +0000 Subject: [PATCH 0247/1522] bluejeans-gui: 2.22.0.87 -> 2.23.0.39 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index adc19f5dcfd..bca1a1affc0 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.22.0.87"; + version = "2.23.0.39"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo="; + sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From d205df5d4496d307ca46d255b746cd6338b7ad85 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:44:30 -0400 Subject: [PATCH 0248/1522] =?UTF-8?q?vulkan-headers:=201.2.162.0=20?= =?UTF-8?q?=E2=86=92=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f065b83bcc8..fc9ec8e8f19 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.162.0"; + version = "1.2.176.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq"; + sha256 = "07i5p73f5n1qxd435495a3c6ss6j9f4gljq5h4i8b5p5isgh6zvd"; }; meta = with lib; { From 16f50144f4e7dcca2a191f8694ac322d68c76ca1 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:44:49 -0400 Subject: [PATCH 0249/1522] =?UTF-8?q?vulkan-loader:=201.2.162.0=20?= =?UTF-8?q?=E2=86=92=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/vulkan-loader/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b3882a91942..c8457129b5f 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config -, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb +, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.162.0"; + version = "1.2.176.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi"; + sha256 = "0b0gn4p1nz4m1lmfm8hf8xyw2fkk6c7iq6c9lg57i8z0l8crwa57"; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; cmakeFlags = [ "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]; From 3fd04aa8075741d72ff7216fcca000ad38adea66 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:45:03 -0400 Subject: [PATCH 0250/1522] =?UTF-8?q?vulkan-validation-layers:=201.2.162.0?= =?UTF-8?q?=20=E2=86=92=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vulkan-validation-layers/default.nix | 72 ++++++++++--------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index adec30a14c5..ee6ad74753f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,31 +1,29 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake -, writeText -, python3 +, glslang +, libX11 +, libxcb +, libXrandr , spirv-headers , spirv-tools , vulkan-headers -, vulkan-loader -, glslang -, pkg-config -, xlibsWrapper -, libxcb -, libXrandr , wayland }: -# vulkan-validation-layers requires a custom glslang version, while glslang requires -# custom versions for spirv-tools and spirv-headers. The git hashes required for all -# of these deps is documented upstream here: -# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json let + # vulkan-validation-layers requires a custom glslang & robin-hood-hashing + # version, while glslang requires custom versions for spirv-tools and spirv-headers. + # + # The git hashes required for all of these deps is documented upstream here: + # https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json localSpirvHeaders = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d"; - sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q"; + rev = "75b30a659c8a4979104986652c54cc421fc51129"; + sha256 = "1yzdp3m50zxabkg93j1lmazs45wjp20szvxiv8ifgcdjxmyzi5ji"; }; }); localGlslang = (glslang.override { @@ -33,8 +31,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "c9c1f54330d13a0bec1aa3f08d436249d8e35596"; - sha256 = "0r5whsw9x8j4199xwxv293ar2ga73pm2s7rngw732ylh6rw3bkly"; + rev = "c79edd260c2b503f0eca57310057b4a100999cc5"; + sha256 = "01qq5g2a8c5ljn1j6yqh3v90kbhavibh45dcnasixvpf5q7k2ary"; }; }); argSpirv-headers = localSpirvHeaders; @@ -42,15 +40,20 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "dd69df7f3dac26362e10b0f38efb9e47990f7537"; - sha256 = "1iafbh524avsjg4pjiq156b62pck2rwlfl2pjnml8sjy285506rk"; + rev = "e56beaee736863ce48455955158f1839e6e4c1a1"; + sha256 = "062v3zq88dvgpy3xlb86lj4skk9472jh7hv835d8gs8zbyy0s3aw"; }; }); + robin-hood-hashing = fetchFromGitHub { + owner = "martinus"; + repo = "robin-hood-hashing"; + rev = "eee46f9985c3c65a05b35660c6866f8f8f1a3ba3"; + sha256 = "0h2ljqxnc1gr3p3iqk627n65c7pixpzxhd9vaybr24f90f069lmw"; + }; in - stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.2.162.0"; + version = "1.2.176.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -61,36 +64,39 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1mpqmxh9zm20jdar59lp4yjpqfzxn2pwds6bkvnzihfy0pymf15k"; + sha256 = "1mp110a686lwl6wfplg79vwnlrvbz2pd5mjkgyg9i3jyfs65lr33"; }; + # Include absolute paths to layer libraries in their associated + # layer definition json files. + postPatch = '' + sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt + ''; + nativeBuildInputs = [ - pkg-config cmake - python3 ]; buildInputs = [ - localGlslang - localGlslang.spirv-headers - vulkan-headers - vulkan-loader + libX11 libxcb libXrandr + vulkan-headers wayland ]; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${localGlslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}" + "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" + # Hide dev warnings that are useless for packaging + "-Wno-dev" ]; - # Include absolute paths to layer libraries in their associated - # layer definition json files. - patchPhase = '' - sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt - ''; + # Tests require access to vulkan-compatible GPU, which isn't + # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER. + doCheck = false; meta = with lib; { description = "The official Khronos Vulkan validation layers"; From 7f02a73cdd330c433762531db762fe32a4571aa2 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:45:19 -0400 Subject: [PATCH 0251/1522] =?UTF-8?q?vulkan-extension-layer:=202020-11-20?= =?UTF-8?q?=20=E2=86=92=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index f2ea439e0c9..9c7f484630d 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "2020-11-20"; + version = "1.2.176.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "7474cb8e1f70e9f4a8bf382708a7f15465453af5"; - sha256 = "1lxkgcnv32wqk4hlckv13xy84g38jzgc4qxp9vsbkrgz87hkdvwj"; + rev = "sdk-${version}"; + sha256 = "04zybnha7qnw9dqqlhb4q77d7pb8dq7b5y8qvid2dnjwf6ymirdn"; }; nativeBuildInputs = [ cmake jq ]; From 073b8ce7388a5a6eb0b6a1f6e2597511167585d2 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:46:16 -0400 Subject: [PATCH 0252/1522] =?UTF-8?q?vulkan-tools:=201.2.162.0=20=E2=86=92?= =?UTF-8?q?=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/vulkan-tools/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 907404ec7f4..7f78b5b87c0 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,20 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader, - vulkan-headers, glslang, pkg-config, xlibsWrapper, libxcb, - libXrandr, wayland }: +{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb +, libXrandr, vulkan-headers, vulkan-loader, wayland }: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.162.0"; + version = "1.2.176.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz"; + sha256 = "15jkjn3ildam4ad2x0d8ysm3i2l6nrvqv0h44spkipf13bqiq5wg"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; @@ -23,9 +22,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ # Don't build the mock ICD as it may get used instead of other drivers, if installed "-DBUILD_ICD=OFF" - "-DGLSLANG_INSTALL_DIR=${glslang}" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" + # Hide dev warnings that are useless for packaging + "-Wno-dev" ]; meta = with lib; { From ddd5302e6cd004a83640f32de97dc1410c52b2f7 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:46:30 -0400 Subject: [PATCH 0253/1522] =?UTF-8?q?vulkan-tools-lunarg:=201.2.162.0=20?= =?UTF-8?q?=E2=86=92=201.2.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graphics/vulkan-tools-lunarg/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d0f920a4ba..d3c66957e7b 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -1,26 +1,44 @@ -{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi -, libxcb, pkg-config, python3, symlinkJoin, vulkan-headers, vulkan-loader -, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm -, xlibsWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, jq +, expat +, libX11 +, libXdmcp +, libXrandr +, libffi +, libxcb +, wayland +, xcbutilkeysyms +, xcbutilwm +, vulkan-headers +, vulkan-loader +, symlinkJoin +, vulkan-validation-layers +, writeText +}: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.162.0"; + version = "1.2.176.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5"; + sha256 = "0p527nml2aj10rra2588dhvjmz63i6b69mc84x9s5wp85sazxxl1"; fetchSubmodules = true; }); - nativeBuildInputs = [ cmake pkg-config python3 jq ]; + nativeBuildInputs = [ cmake python3 jq ]; buildInputs = [ expat + libX11 libXdmcp libXrandr libffi @@ -28,7 +46,6 @@ stdenv.mkDerivation rec { wayland xcbutilkeysyms xcbutilwm - xlibsWrapper ]; cmakeFlags = [ @@ -40,6 +57,8 @@ stdenv.mkDerivation rec { paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; } }" + # Hide dev warnings that are useless for packaging + "-Wno-dev" ]; preConfigure = '' @@ -63,7 +82,6 @@ stdenv.mkDerivation rec { ''; # Same as vulkan-validation-layers - libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; dontPatchELF = true; # Help vulkan-loader find the validation layers From 2b4516bd31b7bb3bdf950c9737ec930fe600b4cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 03:22:43 +0000 Subject: [PATCH 0254/1522] fluxctl: 1.23.0 -> 1.23.1 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index bba0b74172a..d8a6306a1f5 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-CJY7XjHJ6suJrjhnG+w5oM1FtVnegcbkCVGjyoBtBag="; + sha256 = "sha256-PcDipeW+ebGm6w/htjyx1/PXaanh2gp3EyHkcLY9peo="; }; - vendorSha256 = "sha256-aC6E+PpuUqFhZKvQT5AuxpPmHfhjCwHzwFHDzk5wazw="; + vendorSha256 = "sha256-CxGa95x742vS+8WxK/I2ZbEn2mJPwpXa5zm3xBNbX4U="; nativeBuildInputs = [ installShellFiles ]; From 51b73b63202af2eb4c71e3019c1e42d69cdf18e0 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 24 Jul 2021 11:08:32 +0800 Subject: [PATCH 0255/1522] vulkan: 1.2.176 -> 1.2.182 Updates - vulkan-headers - vulkan-loader - vulkan-validation-layers - vulkan-extension-layer - vulkan-tools - vulkan-tools-lunarg Also adds some additional asserts for version matching to these packages --- .../libraries/vulkan-headers/default.nix | 4 +-- .../libraries/vulkan-loader/default.nix | 15 +++++---- .../vulkan-validation-layers/default.nix | 32 ++++++++++--------- .../vulkan-extension-layer/default.nix | 15 +++++---- .../graphics/vulkan-tools-lunarg/default.nix | 4 +-- pkgs/tools/graphics/vulkan-tools/default.nix | 18 +++++++---- 6 files changed, 48 insertions(+), 40 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index fc9ec8e8f19..e9b9112c8fd 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.176.0"; + version = "1.2.182.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "07i5p73f5n1qxd435495a3c6ss6j9f4gljq5h4i8b5p5isgh6zvd"; + sha256 = "03j0kzq2qxhy0y82l10m8am26zrms2sjrdb1dcbpv9zh5vkxhcla"; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index c8457129b5f..21239b9b436 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,14 +3,15 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.176.0"; + version = "1.2.182.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - sha256 = "0b0gn4p1nz4m1lmfm8hf8xyw2fkk6c7iq6c9lg57i8z0l8crwa57"; - }; + src = (assert version == vulkan-headers.version; + fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "sdk-${version}"; + sha256 = "0gmr9q3a6s8xvaa74fs9zbi9c305i2b3rx768qvl79nhbdj8nc02"; + }); nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index ee6ad74753f..eac704b4a9c 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -18,12 +18,13 @@ let # # The git hashes required for all of these deps is documented upstream here: # https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json + # and https://github.com/KhronosGroup/glslang/blob/master/known_good.json localSpirvHeaders = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "75b30a659c8a4979104986652c54cc421fc51129"; - sha256 = "1yzdp3m50zxabkg93j1lmazs45wjp20szvxiv8ifgcdjxmyzi5ji"; + rev = "dafead1765f6c1a5f9f8a76387dcb2abe4e54acd"; # pin + sha256 = "1kj6wcx9y7r1xyg8n7ai2pzrg9ira7hbakr45wh5p4zyxh0m45n8"; }; }); localGlslang = (glslang.override { @@ -31,8 +32,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "c79edd260c2b503f0eca57310057b4a100999cc5"; - sha256 = "01qq5g2a8c5ljn1j6yqh3v90kbhavibh45dcnasixvpf5q7k2ary"; + rev = "dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07"; # pin + sha256 = "0pxgbq6xapw9hgrzb3rk5cylzgg1y1bkqz5wxzwqls63pwga5912"; }; }); argSpirv-headers = localSpirvHeaders; @@ -40,32 +41,33 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "e56beaee736863ce48455955158f1839e6e4c1a1"; - sha256 = "062v3zq88dvgpy3xlb86lj4skk9472jh7hv835d8gs8zbyy0s3aw"; + rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; # pin + sha256 = "0wwj7q509pkp8wj7120g1n2ddl4x2r03ljf5czd9794ji6yraidn"; }; }); robin-hood-hashing = fetchFromGitHub { owner = "martinus"; repo = "robin-hood-hashing"; - rev = "eee46f9985c3c65a05b35660c6866f8f8f1a3ba3"; - sha256 = "0h2ljqxnc1gr3p3iqk627n65c7pixpzxhd9vaybr24f90f069lmw"; + rev = "3.11.2"; # pin + sha256 = "0103mnqpmka1smy0arnrbihlvi7i8xr5im0px8wn4faw4flikkcm"; }; in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.2.176.0"; + version = "1.2.182.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". outputs = ["out" "headers"]; outputInclude = "headers"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-ValidationLayers"; - rev = "sdk-${version}"; - sha256 = "1mp110a686lwl6wfplg79vwnlrvbz2pd5mjkgyg9i3jyfs65lr33"; - }; + src = (assert version == vulkan-headers.version; + fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ValidationLayers"; + rev = "sdk-${version}"; + sha256 = "1fnmb7vbm7y1x67bf1xiwdrpj9j4lkvhk9xhb6hp6x2aryvcyrnc"; + }); # Include absolute paths to layer libraries in their associated # layer definition json files. diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 9c7f484630d..aa90fced901 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.2.176.0"; + version = "1.2.182.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-ExtensionLayer"; - rev = "sdk-${version}"; - sha256 = "04zybnha7qnw9dqqlhb4q77d7pb8dq7b5y8qvid2dnjwf6ymirdn"; - }; + src = (assert version == vulkan-headers.version; + fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ExtensionLayer"; + rev = "sdk-${version}"; + sha256 = "0by2kp48jbd55xk26rmlvc4wm77g1zvidx8czn1587ng2yzi7acr"; + }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index d3c66957e7b..3b33328485e 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.176.0"; + version = "1.2.182.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - sha256 = "0p527nml2aj10rra2588dhvjmz63i6b69mc84x9s5wp85sazxxl1"; + sha256 = "1b7762fcbakfvj2b2l68qj25pc7pz9jhfabf1x80b9w3q205hl2f"; fetchSubmodules = true; }); diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 7f78b5b87c0..161384c3ad0 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,14 +3,18 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.176.0"; + version = "1.2.182.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Tools"; - rev = "sdk-${version}"; - sha256 = "15jkjn3ildam4ad2x0d8ysm3i2l6nrvqv0h44spkipf13bqiq5wg"; - }; + # It's not strictly necessary to have matching versions here, however + # since we're using the SDK version we may as well be consistent with + # the rest of nixpkgs. + src = (assert version == vulkan-headers.version; + fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Tools"; + rev = "sdk-${version}"; + sha256 = "028l2l7jx4443k8207q8jmjq1mnnm9kgyl2417jrkrvylcbv8ji9"; + }); nativeBuildInputs = [ cmake ]; buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ]; From 5a00bdb25240add977cff5670ec92f6447600248 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0256/1522] gonic: 0.12.2 -> 0.13.1 --- pkgs/servers/gonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 1ff50079ebd..de4e3282554 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -12,12 +12,12 @@ buildGoModule rec { pname = "gonic"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; - rev = "7d420f61a90739cd82a81c2740274c538405d950"; - sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5"; + rev = "v${version}"; + sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn"; }; nativeBuildInputs = [ pkg-config ]; From d328124ca503caec6ddf3409c4af43fd15e14ebb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0257/1522] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index a32cfbe0df6..957fe10d48f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb4br24c7awarvcdmairg9g9xs37nlc98fp5abhq3b426zlzskg"; + sha256 = "08c0mgsmw7xf3hwbnlsdmn3z5z84ldhw7w98n0lkvfizvvjn0mx2"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; atomos = { groups = ["default"]; @@ -239,10 +239,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "161azhqndf9gvnsvsx0k2x2kpalsgmlz233hvwc7ckbiral7q86s"; + sha256 = "1s7dr3jf5a2jg2dd23f97hsd29qj2cfah5rkjvhgb40z3k75vgy3"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; camping = { dependencies = ["mab" "rack"]; @@ -858,10 +858,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl"; + sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a"; type = "gem"; }; - version = "0.84.0"; + version = "0.85.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; @@ -869,10 +869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; faraday-em_http = { groups = ["default"]; @@ -929,10 +929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -1055,10 +1055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02618y5gw8sbn258w298894if1xkn5gg7q6wj1sw0bx469xgj256"; + sha256 = "1mp4dgd7i26xp1n3ggagdc5xh52wm7gsmmq7mykfjm6bqvh0v302"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gio2 = { dependencies = ["gobject-introspection"]; @@ -1066,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wflbi8yhrxv84q6lzrrqvdhpwrcklspkyzwyi47690wlbjff6cl"; + sha256 = "0gkik2d0c9xfljip17pafkln52wykrjvz9cf25da6hnxp73fvzwb"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gitlab-markup = { groups = ["default"]; @@ -1087,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aba6j1ixlb5bg2542dhm16c880vdk9cqn70247vhixzc3by0463"; + sha256 = "0daspjbnw3banifms1xshxzh4v4784zm3fqda1civqczyj62dw1n"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; globalid = { dependencies = ["activesupport"]; @@ -1109,10 +1109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rfjkgk5wxs19qah531k6ki6384iqf7b8cbdqc9l6ff9gvkf8cmw"; + sha256 = "1p2qn9cbdh3fav7x3ygp8jh7cr2yz4pqs6m979k43dj1vk49vb12"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1379,10 +1379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wqpp3m4zwy7l8n8z8d4krvf38q1gfx9lnsyipnfsapspsmsgdb6"; + sha256 = "0yky836g80jfvyhxn052q9fqrnhn72dsc2j10nirq7qylbq1jl7g"; type = "gem"; }; - version = "1.4.19"; + version = "1.5.5"; }; libv8 = { groups = ["default"]; @@ -1420,10 +1420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1772,10 +1772,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xaqx3i4cx7xb5m5qfm7jclq3yyrj8abaqif0q1i72259g5klb8c"; + sha256 = "09rkarch6kd20cc9xj9v3yfvs7v2k8bxfzwi8vp56h4rcwmsy7m1"; type = "gem"; }; - version = "3.4.5"; + version = "3.4.6"; }; parallel = { groups = ["default"]; @@ -1793,10 +1793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxsi1i5z506xfzhiyavlasf8777h55ab40phvp7pfv9npmd5pnj"; + sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; type = "gem"; }; - version = "3.0.1.1"; + version = "3.0.2.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -2256,10 +2256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045iralskypd95f42jdgbzp0alv2q0qlvya4qm6bkahg2rfb8s1x"; + sha256 = "1lk8ppn0a2b94fymlra80sygwn63pxyqy4cj4c3ic2697ll3mihj"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.4"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2267,10 +2267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hnrfy928mwpa0ippqs4s8xwghwwp5h853naphgqxcd53l33chlv"; + sha256 = "0dbbll8k2xqdfpirzpfl3gi4asplay25mg91510i7qb601xbjpcy"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2350,10 +2350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; RubyInline = { dependencies = ["ZenTest"]; @@ -2528,10 +2528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi"; + sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; type = "gem"; }; - version = "0.42.3"; + version = "0.43.0"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; From 07c3231e2329df64823cc2d194b244c510ae46d8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0258/1522] python39Packages.pglast: 3.0 -> 3.3 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 8184c6d0d18..d4a07857e3a 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.0"; + version = "3.3"; # PyPI tarball does not include all the required files src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd"; + sha256 = "0l7nvbs1x1qil6mc0rxk7925i5xr3nbqnv0vakx3yv911kj3yhgv"; }; disabled = !isPy3k; From 04393d5dfdbad5a5f28ceecd9ae1414f062c180e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0259/1522] gonic: fix build on darwin --- pkgs/servers/gonic/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index de4e3282554..57623a8026b 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub +{ lib, stdenv, buildGoModule, fetchFromGitHub , pkg-config, taglib, alsa-lib -, zlib +, zlib, AudioToolbox, AppKit # Disable on-the-fly transcoding, # removing the dependency on ffmpeg. @@ -21,7 +21,9 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsa-lib zlib ]; + buildInputs = [ taglib zlib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; # TODO(Profpatsch): write a test for transcoding support, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 107722e6e10..569b2fc471d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24581,7 +24581,9 @@ in gollum = callPackage ../applications/misc/gollum { }; - gonic = callPackage ../servers/gonic { }; + gonic = callPackage ../servers/gonic { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; + }; googleearth = callPackage ../applications/misc/googleearth { }; From 42c93277173914779537fcbf0a8458e503ab6f5a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0260/1522] pythonPackages.youtube-transcript-api: init at 0.4.1 --- .../youtube-transcript-api/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/youtube-transcript-api/default.nix diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix new file mode 100644 index 00000000000..6829df668b2 --- /dev/null +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, httpretty, pytestCheckHook }: + +buildPythonPackage rec { + pname = "youtube-transcript-api"; + version = "0.4.1"; + + # PyPI tarball is missing some test files + src = fetchFromGitHub { + owner = "jdepoix"; + repo = "youtube-transcript-api"; + rev = "v${version}"; + sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ mock httpretty pytestCheckHook ]; + + pythonImportsCheck = [ "youtube_transcript_api" ]; + + meta = with lib; { + description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video"; + homepage = "https://github.com/jdepoix/youtube-transcript-api"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9708579cabc..554ede74f07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9462,6 +9462,8 @@ in { youtube-search = callPackage ../development/python-modules/youtube-search { }; + youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { From c39cde2537dd8093ff4b51812529130537c10b87 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 04:20:00 +0000 Subject: [PATCH 0261/1522] xonsh: 0.9.27 -> 0.10.1 https://github.com/xonsh/xonsh/releases/tag/0.10.0 https://github.com/xonsh/xonsh/releases/tag/0.10.1 --- pkgs/shells/xonsh/default.nix | 41 ++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index a2cc4206620..5f2175d8c32 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , glibcLocales @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.27"; + version = "0.10.1"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { - owner = "xonsh"; - repo = "xonsh"; - rev = version; - sha256 = "09w6bl3qsygfs2ph2r423ndnbd74bzf67vp8587h2dkkfxlzjbad"; + owner = "xonsh"; + repo = "xonsh"; + rev = version; + sha256 = "03ahay2rl98a9k4pqkxksmj6mcg554jnbhw9jh8cyvjrygrpcpch"; }; LC_ALL = "en_US.UTF-8"; @@ -31,15 +31,31 @@ python3Packages.buildPythonApplication rec { patchShebangs . ''; - doCheck = !stdenv.isDarwin; + disabledTests = [ + # fails on sandbox + "test_colorize_file" + "test_loading_correctly" + "test_no_command_path_completion" + # fails on non-interactive shells + "test_capture_always" + "test_casting" + "test_command_pipeline_capture" + "test_dirty_working_directory" + "test_man_completion" + "test_vc_get_branch" + ]; - checkPhase = '' - HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks and not test_command_pipeline_capture and not test_git_dirty_working_directory_includes_untracked and not test_dirty_working_directory and not test_vc_get_branch' - HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 - HOME=$TMPDIR pytest -k 'test_ptk_highlight' + disabledTestPaths = [ + # fails on non-interactive shells + "tests/prompt/test_gitstatus.py" + "tests/completers/test_bash_completer.py" + ]; + + preCheck = '' + HOME=$TMPDIR ''; - checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; + checkInputs = [ glibcLocales git ] ++ (with python3Packages; [ pytestCheckHook pytest-subprocess ]); propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; @@ -49,7 +65,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt vrthra ]; - platforms = platforms.all; }; passthru = { From ff6578550b24ba57153ce5cdcf4d07595ffe0c2f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Jul 2021 00:45:27 -0400 Subject: [PATCH 0262/1522] python3Packages.boost-histogram: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/boost-histogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index f644c8c9c20..d66b80d00c7 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.0.2"; + version = "1.1.0"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2"; + sha256 = "370e8e44a0bac4ebbedb7e62570be3a75a7a3807a297d6e82a94301b4681fc22"; }; buildInputs = [ boost ]; From aa8373ab1b98b700c411eac1fe9e3d858a802909 Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 24 Jul 2021 06:50:01 +0200 Subject: [PATCH 0263/1522] nixos-icons: fix icons not installed when documentation disabled --- nixos/modules/misc/documentation.nix | 3 +-- nixos/modules/services/x11/xserver.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index c88cc693061..7e04f0f16a9 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -258,8 +258,7 @@ in environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages - ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ] - ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]); + ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; services.getty.helpLine = mkIf cfg.doc.enable ( "\nRun 'nixos-help' for the NixOS manual." diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 4dde4476d2c..52af552cd13 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -651,6 +651,7 @@ in pkgs.xterm pkgs.xdg-utils xorg.xf86inputevdev.out # get evdev.4 man page + pkgs.nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; From f78a3ef8355de25c380d1ed3c073f178f3940d0d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:00:58 +0900 Subject: [PATCH 0264/1522] release-haskell: move location of muslGHCs so that musl always comes before static This is just a small reorganization. --- pkgs/top-level/release-haskell.nix | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1dc728b2da2..2c1d9ec37b5 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -294,6 +294,23 @@ let (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)); }; + + muslGHCs = pkgs.releaseTools.aggregate { + name = "haskell-pkgsMusl-ghcs"; + meta = { + description = "GHCs built with musl"; + maintainers = with lib.maintainers; [ + nh2 + ]; + }; + constituents = accumulateDerivations [ + jobs.pkgsMusl.haskell.compiler.ghc8102Binary + jobs.pkgsMusl.haskell.compiler.ghc884 + jobs.pkgsMusl.haskell.compiler.ghc8104 + jobs.pkgsMusl.haskell.compiler.ghc901 + ]; + }; + staticHaskellPackages = pkgs.releaseTools.aggregate { name = "static-haskell-packages"; meta = { @@ -313,21 +330,6 @@ let jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; - muslGHCs = pkgs.releaseTools.aggregate { - name = "haskell-pkgsMusl-ghcs"; - meta = { - description = "GHCs built with musl"; - maintainers = with lib.maintainers; [ - nh2 - ]; - }; - constituents = accumulateDerivations [ - jobs.pkgsMusl.haskell.compiler.ghc8102Binary - jobs.pkgsMusl.haskell.compiler.ghc884 - jobs.pkgsMusl.haskell.compiler.ghc8104 - jobs.pkgsMusl.haskell.compiler.ghc901 - ]; - }; } ]; From cae27cfeb470fa84b1ca90d92127b1ffaf60a47c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:04:43 +0900 Subject: [PATCH 0265/1522] release-haskell: disable aarch64 builds from staticHaskellPackages These aarch64 builds appear to be timing out. --- pkgs/top-level/release-haskell.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2c1d9ec37b5..4d048b31535 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -321,13 +321,24 @@ let ]; }; constituents = [ + # aarch64-linux + # + # TODO: Times out on Hydra + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux + + # x86_64-darwin + # # TODO: reenable darwin builds if static libiconv works + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-darwin + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-darwin + # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-darwin + + # x86_64-linux jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; } From e8bdec3e3234afe6b4e8dc73aa4ec7eccf6d70c0 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:14:30 +0900 Subject: [PATCH 0266/1522] release-haskell: stop building aarch64 and darwin static haskell packages The statically-linked Haskell packages on Darwin are not currently working because libiconv is not building statically on Darwin. The statically-linked Haskell packages on aarch64 are timing out on Hydra. --- pkgs/top-level/release-haskell.nix | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4d048b31535..c2e81ddbb42 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -101,17 +101,6 @@ let ghc865Binary = {}; }; - # test some statically linked packages to catch regressions - # and get some cache going for static compilation with GHC - # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages.integer-simple.ghc8104 = { - inherit (staticHaskellPackagesPlatforms) - hello - random - lens - ; - }; - # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda @@ -218,6 +207,23 @@ let ; elmPackages.elm = pkgsPlatforms.elmPackages.elm; + + # Test some statically linked packages to catch regressions + # and get some cache going for static compilation with GHC. + # Use integer-simple to avoid GMP linking problems (LGPL) + pkgsStatic.haskell.packages.integer-simple.ghc8104 = + removePlatforms + [ + "aarch64-linux" # times out on Hydra + "x86_64-darwin" # TODO: reenable when static libiconv works on darwin + ] + { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104) + hello + lens + random + ; + }; }) (versionedCompilerJobs { # Packages which should be checked on more than the From b0a42925f191a3900932e47565f960893b11012d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:17:02 +0900 Subject: [PATCH 0267/1522] release-haskell: stop building musl integer-simple GHCs integer-simple GHCs appear to be broken when linking against musl and non-static-linking. --- pkgs/top-level/release-haskell.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c2e81ddbb42..55824ff1000 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -94,13 +94,6 @@ let nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda; agdaPackages = packagePlatforms pkgs.agdaPackages; - pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - # TODO: remove ghc865Binary altogether and use ghc8102Binary - ghc865Binary = {}; - }; - # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda @@ -208,6 +201,18 @@ let elmPackages.elm = pkgsPlatforms.elmPackages.elm; + # GHCs linked to musl. + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; + + # remove integer-simple because it appears to be broken with + # musl and non-static-linking. + integer-simple = {}; + }; + # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL) From 5b6f2ae03d2eef42a8ac00a3e567fc20d2c310c3 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:18:30 +0900 Subject: [PATCH 0268/1522] release-haskell: build a few haskell packages with musl This is helpful to get a small cache going for people who want musl-enabled packages. --- pkgs/top-level/release-haskell.nix | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 55824ff1000..233da8ee1b6 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -81,8 +81,16 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; - staticHaskellPackagesPlatforms = - packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104; + removeMany = itemsToRemove: list: lib.foldr lib.remove list itemsToRemove; + + removePlatforms = platformsToRemove: packageSet: + lib.mapAttrsRecursive + (_: val: + if lib.isList val + then removeMany platformsToRemove val + else val + ) + packageSet; jobs = recursiveUpdateMany [ (mapTestOn { @@ -213,6 +221,21 @@ let integer-simple = {}; }; + # Get some cache going for MUSL-enabled GHC. + pkgsMusl.haskellPackages = + removePlatforms + [ + "aarch64-linux" # aarch64 does not appear to be supported + "x86_64-darwin" # musl only supports linux + ] + { + inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) + hello + lens + random + ; + }; + # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL) From cdac06c9bbd6f1f71b9afac48ec67fe91226ea6d Mon Sep 17 00:00:00 2001 From: Guilherme Silva Date: Sat, 24 Jul 2021 02:46:44 -0300 Subject: [PATCH 0269/1522] Agda cubical 2.6.2 fix (#131280) Co-authored-by: Ben Siraphob --- pkgs/development/libraries/agda/cubical/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 74bdf0b2135..8e654444dd6 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -13,6 +13,8 @@ mkDerivation rec { LC_ALL = "en_US.UTF-8"; + preConfigure = ''export AGDA_EXEC=agda''; + # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. nativeBuildInputs = [ ghc glibcLocales ]; From a6700d75f38cda83367a8af84651a2a72ce0f3ef Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 24 Jul 2021 09:33:10 +0200 Subject: [PATCH 0270/1522] vbox-image: add new option to set free space in image --- nixos/modules/virtualisation/virtualbox-image.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 272c696807a..853dd642a76 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -18,6 +18,13 @@ in { The size of the VirtualBox base image in MiB. ''; }; + baseImageFreeSpace = mkOption { + type = with types; int; + default = 30 * 1024; + description = '' + Free space in the VirtualBox base image in MiB. + ''; + }; memorySize = mkOption { type = types.int; default = 1536; @@ -129,6 +136,7 @@ in { inherit pkgs lib config; partitionTableType = "legacy"; diskSize = cfg.baseImageSize; + additionalSpace = cfg.baseImageFreeSpace; postVM = '' From 528fb6cc692d4fbe25f754a304d4cb5daa317fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Jul 2021 09:33:51 +0200 Subject: [PATCH 0271/1522] python3Packages.pysyncthru: 0.7.3 -> 0.7.5 --- pkgs/development/python-modules/pysyncthru/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index 3fc0600f6d7..b23f571dd39 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.3"; + version = "0.7.5"; disabled = isPy27; From 407953e9df712b6d89295f1c402e8778a249a748 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 01:20:02 +0700 Subject: [PATCH 0272/1522] Initial implementation of m68k cross-compile --- lib/systems/doubles.nix | 4 +++- lib/systems/examples.nix | 4 ++++ lib/systems/inspect.nix | 1 + lib/systems/parse.nix | 2 ++ lib/tests/systems.nix | 2 +- pkgs/build-support/bintools-wrapper/default.nix | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 61ba7dad7cc..b8d154ad635 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -28,6 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" + "m68k-linux" # MMIXware "mmix-mmixware" @@ -39,7 +40,7 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" - "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" + "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" "m68k-none" "x86_64-none" # OpenBSD @@ -74,6 +75,7 @@ in { riscv = filterDoubles predicates.isRiscV; vc4 = filterDoubles predicates.isVc4; or1k = filterDoubles predicates.isOr1k; + m68k = filterDoubles predicates.isM68k; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 6a8f4e091aa..ce7515bc9cc 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -144,6 +144,10 @@ rec { libc = "newlib"; }; + m68k = { + config = "m68k-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d2b7271210c..a74847d4340 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -26,6 +26,7 @@ rec { isAvr = { cpu = { family = "avr"; }; }; isAlpha = { cpu = { family = "alpha"; }; }; isOr1k = { cpu = { family = "or1k"; }; }; + isM68k = { cpu = { family = "m68k"; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 2b789fd8ecb..8a8b0888149 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -95,6 +95,8 @@ rec { mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; + m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; }; powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 36f82b783b4..378dc537598 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5d2f2f977a7..0674c88924e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -208,6 +208,7 @@ stdenv.mkDerivation { else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" + else if targetPlatform.isM68k then "m68k" else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" From 15873b09f8664e2344fbadba9be8498adcc5a611 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 23 Jul 2021 22:31:27 -0600 Subject: [PATCH 0273/1522] pidgin-indicator: init at 1.0.1 --- .../pidgin-indicator/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix new file mode 100644 index 00000000000..9afdee8cda1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix @@ -0,0 +1,33 @@ +{ autoreconfHook +, fetchFromGitHub +, glib +, intltool +, lib +, libappindicator-gtk2 +, libtool +, pidgin +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "pidgin-indicator"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "philipl"; + repo = pname; + rev = version; + sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; + + meta = with lib; { + description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; + homepage = "https://github.com/philipl/pidgin-indicator"; + maintainers = with maintainers; [ imalison ]; + license = licenses.gpl2; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..394cf8ea69a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26445,6 +26445,8 @@ in plugins = []; }; + pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; + pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; From e159380cc282c72c3ab2f7ca338135b74a81afd1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 15:15:44 +0700 Subject: [PATCH 0274/1522] regenkfs: init at unstable-2020-10-17 --- .../tools/knightos/regenkfs/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/knightos/regenkfs/default.nix diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix new file mode 100644 index 00000000000..1e8b992dfe0 --- /dev/null +++ b/pkgs/development/tools/knightos/regenkfs/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "regenkfs"; + version = "unstable-2020-10-17"; + + src = fetchFromGitHub { + owner = "siraben"; + repo = "regenkfs"; + rev = "652155445fc39bbe6628f6b9415b5cd6863f592f"; + sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; + }; + + cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; + cargoBuildFlags = [ "--features=c-undef" ]; + + meta = with lib; { + description = "Reimplementation of genkfs in Rust"; + homepage = "https://github.com/siraben/regenkfs"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..b00ec0ddaf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11615,6 +11615,8 @@ in knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; + regenkfs = callPackage ../development/tools/knightos/regenkfs { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kimg = callPackage ../development/tools/knightos/kimg { }; From fb03ece3ed3e4280c39ab1e37a43b04d71b18742 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 15:16:00 +0700 Subject: [PATCH 0275/1522] remkrom: init at unstable-2020-10-17 --- .../tools/knightos/remkrom/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/knightos/remkrom/default.nix diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix new file mode 100644 index 00000000000..837006d1bf8 --- /dev/null +++ b/pkgs/development/tools/knightos/remkrom/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "remkrom"; + version = "unstable-2020-10-17"; + + src = fetchFromGitHub { + owner = "siraben"; + repo = "remkrom"; + rev = "86a0b19c1d382a029ecaa96eeca7e9f76c8561d6"; + sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; + }; + + cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; + + meta = with lib; { + description = "Reimplementation of mkrom in Rust"; + homepage = "https://github.com/siraben/remkrom"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b00ec0ddaf4..6bb82eb85b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11625,6 +11625,8 @@ in knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; + remkrom = callPackage ../development/tools/knightos/remkrom { }; + knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; From 4e5b3b49e4f34e657fabdb106da9f81ce5d6f096 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 09:22:42 +0000 Subject: [PATCH 0276/1522] jmol: 14.31.44 -> 14.31.46 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 5d2158843ed..efea1669254 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.44"; + version = "14.31.46"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-MHfqoQzUEL7nje7Y/hbaA8iktxfN7464TJXum5B6OCc="; + sha256 = "sha256-U8k8xQws0vIJ3ZICzZXxSbtl7boCzRqG9mFSTXvmCvg="; }; patchPhase = '' From d05a1ab1e4c21a956d883af2252818c4ca486d1e Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 22 Sep 2020 11:29:21 +0200 Subject: [PATCH 0277/1522] nixos/syncoid: split in multiple systemd services --- nixos/modules/services/backup/syncoid.nix | 169 ++++++++++++++++------ nixos/tests/sanoid.nix | 5 +- 2 files changed, 127 insertions(+), 47 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index b764db1f14e..888ef20f642 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -5,14 +5,15 @@ with lib; let cfg = config.services.syncoid; - # Extract pool names of local datasets (ones that don't contain "@") that - # have the specified type (either "source" or "target") - getPools = type: unique (map (d: head (builtins.match "([^/]+).*" d)) ( - # Filter local datasets - filter (d: !hasInfix "@" d) - # Get datasets of the specified type - (catAttrs type (attrValues cfg.commands)) - )); + # Extract the pool name of a local dataset (any dataset not containing "@") + localPoolName = d: optionals (d != null) ( + let m = builtins.match "([^/@]+)[^@]*" d; in + optionals (m != null) m); + + # Escape as required by: https://www.freedesktop.org/software/systemd/man/systemd.unit.html + escapeUnitName = name: + lib.concatMapStrings (s: if lib.isList s then "-" else s) + (builtins.split "[^a-zA-Z0-9_.\\-]+" name); in { # Interface @@ -77,6 +78,14 @@ in { ''; }; + service = mkOption { + type = types.attrs; + default = {}; + description = '' + Systemd configuration common to all syncoid services. + ''; + }; + commands = mkOption { type = types.attrsOf (types.submodule ({ name, ... }: { options = { @@ -99,13 +108,7 @@ in { ''; }; - recursive = mkOption { - type = types.bool; - default = false; - description = '' - Whether to also transfer child datasets. - ''; - }; + recursive = mkEnableOption ''the transfer of child datasets''; sshKey = mkOption { type = types.nullOr types.path; @@ -145,6 +148,14 @@ in { ''; }; + service = mkOption { + type = types.attrs; + default = {}; + description = '' + Systemd configuration specific to this syncoid service. + ''; + }; + extraArgs = mkOption { type = types.listOf types.str; default = []; @@ -170,11 +181,15 @@ in { # Implementation config = mkIf cfg.enable { - users = { + users = { users = mkIf (cfg.user == "syncoid") { syncoid = { group = cfg.group; isSystemUser = true; + # For syncoid to be able to create /var/lib/syncoid/.ssh/ + # and to use custom ssh_config or known_hosts. + home = "/var/lib/syncoid"; + createHome = false; }; }; groups = mkIf (cfg.group == "syncoid") { @@ -182,35 +197,99 @@ in { }; }; - systemd.services.syncoid = { - description = "Syncoid ZFS synchronization service"; - script = concatMapStringsSep "\n" (c: lib.escapeShellArgs - ([ "${pkgs.sanoid}/bin/syncoid" ] - ++ (optionals c.useCommonArgs cfg.commonArgs) - ++ (optional c.recursive "-r") - ++ (optionals (c.sshKey != null) [ "--sshkey" c.sshKey ]) - ++ c.extraArgs - ++ [ "--sendoptions" c.sendOptions - "--recvoptions" c.recvOptions - "--no-privilege-elevation" - c.source c.target - ])) (attrValues cfg.commands); - after = [ "zfs.target" ]; - serviceConfig = { - ExecStartPre = let - allowCmd = permissions: pool: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user (concatStringsSep "," permissions) pool - ]; - in - (map (allowCmd [ "hold" "send" "snapshot" "destroy" ]) (getPools "source")) ++ - (map (allowCmd [ "create" "mount" "receive" "rollback" ]) (getPools "target")); - User = cfg.user; - Group = cfg.group; - }; - startAt = cfg.interval; - }; + systemd.services = mapAttrs' (name: c: + nameValuePair "syncoid-${escapeUnitName name}" (mkMerge [ + { description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}"; + after = [ "zfs.target" ]; + startAt = cfg.interval; + # syncoid may need zpool to get feature@extensible_dataset + path = [ "/run/booted-system/sw/bin/" ]; + serviceConfig = { + ExecStartPre = + map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "bookmark,hold,send,snapshot,destroy" pool + # Permissions snapshot and destroy are in case --no-sync-snap is not used + ]) (localPoolName c.source) ++ + map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "create,mount,receive,rollback" pool + ]) (localPoolName c.target); + ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] + ++ optionals c.useCommonArgs cfg.commonArgs + ++ optional c.recursive "-r" + ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] + ++ c.extraArgs + ++ [ "--sendoptions" c.sendOptions + "--recvoptions" c.recvOptions + "--no-privilege-elevation" + c.source c.target + ]); + User = cfg.user; + Group = cfg.group; + StateDirectory = [ "syncoid" ]; + StateDirectoryMode = "700"; + # Prevent SSH control sockets of different syncoid services from interfering + PrivateTmp = true; + # Permissive access to /proc because syncoid + # calls ps(1) to detect ongoing `zfs receive`. + ProcSubset = "all"; + ProtectProc = "default"; + + # The following options are only for optimizing: + # systemd-analyze security | grep syncoid-'*' + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ["/dev/zfs"]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RootDirectory = "/run/syncoid/${escapeUnitName name}"; + RootDirectoryStartOnly = true; + BindPaths = [ "/dev/zfs" ]; + BindReadOnlyPaths = [ builtins.storeDir "/etc" "/run" "/bin/sh" ]; + # Avoid useless mounting of RootDirectory= in the own RootDirectory= of ExecStart='s mount namespace. + InaccessiblePaths = ["-+/run/syncoid/${escapeUnitName name}"]; + MountAPIVFS = true; + # Create RootDirectory= in the host's mount namespace. + RuntimeDirectory = [ "syncoid/${escapeUnitName name}" ]; + RuntimeDirectoryMode = "700"; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall listed by: + # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' syncoid … + # awk >perf.syscalls -F "," '$1 > 0 {sub("syscalls:sys_enter_","",$3); print $3}' perf.log + # systemd-analyze syscall-filter | grep -v -e '#' | sed -e ':loop; /^[^ ]/N; s/\n //; t loop' | grep $(printf ' -e \\<%s\\>' $(cat perf.syscalls)) | cut -f 1 -d ' ' + "~@aio" "~@chown" "~@keyring" "~@memlock" "~@privileged" + "~@resources" "~@setuid" "~@sync" "~@timer" + ]; + SystemCallArchitectures = "native"; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + }; + } + cfg.service + c.service + ])) cfg.commands; }; - meta.maintainers = with maintainers; [ lopsided98 ]; + meta.maintainers = with maintainers; [ julm lopsided98 ]; } diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index c691bfc08ef..cac6d8101f5 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -44,7 +44,7 @@ in { # Sync snapshot taken by sanoid "pool/sanoid" = { target = "root@target:pool/sanoid"; - extraArgs = [ "--no-sync-snap" ]; + extraArgs = [ "--no-sync-snap" "--create-bookmark" ]; }; # Take snapshot and sync "pool/syncoid".target = "root@target:pool/syncoid"; @@ -92,8 +92,9 @@ in { # Sync snapshots target.wait_for_open_port(22) source.succeed("touch /mnt/pool/syncoid/test.txt") - source.systemctl("start --wait syncoid.service") + source.systemctl("start --wait syncoid-pool-sanoid.service") target.succeed("cat /mnt/pool/sanoid/test.txt") + source.systemctl("start --wait syncoid-pool-syncoid.service") target.succeed("cat /mnt/pool/syncoid/test.txt") ''; }) From 2dd405c33472fc8616121f96d5316fec3867554d Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 24 Jul 2021 10:10:04 +0000 Subject: [PATCH 0278/1522] exploitdb: 2021-07-22 -> 2021-07-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9509288b581..ccb93c95f89 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-22"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams="; + sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ="; }; installPhase = '' From f51551891180f58ea1a14e252bd29c5b65ac3d9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 10:53:26 +0000 Subject: [PATCH 0279/1522] kodiPackages.inputstream-adaptive: 2.6.20 -> 2.6.22 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 784e0f7faf0..0230b6bcf2d 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.20"; + version = "2.6.22"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5"; + sha256 = "sha256-WSFbDuUgw0WHWb3ZZVavwpu1TizU9lMA5JAC5haR7c0="; }; extraNativeBuildInputs = [ gtest ]; From f2356e8dcbe63b70a92a123b6a773c62ca6844d9 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sat, 24 Jul 2021 09:16:13 +0200 Subject: [PATCH 0280/1522] squashfsTools: 4.4 -> 4.5 I had to update the 4k alignment patch for this. While it does apply, and the result compiles, and even appears to work fine superficially, I do not know if there have been any changes to squashfs internals that now require other places to take the alignment flag into account. Will do more testing soon. --- ...1-Mksquashfs-add-no-hardlinks-option.patch | 76 ------------------- .../tools/filesystems/squashfs/4k-align.patch | 62 +++++++-------- pkgs/tools/filesystems/squashfs/default.nix | 8 +- 3 files changed, 33 insertions(+), 113 deletions(-) delete mode 100644 pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch diff --git a/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch b/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch deleted file mode 100644 index 0d6804a647b..00000000000 --- a/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d925c9a11ee2e88ac8aac03f51892746f2bcf8cd Mon Sep 17 00:00:00 2001 -From: Phillip Lougher -Date: Thu, 25 Feb 2021 23:12:10 +0000 -Subject: [PATCH] Mksquashfs: add -no-hardlinks option - -Normally Mksquashfs will detect hardlinks (multiple files with the -same inode) and hardlink them in the Squashfs image. - -But often hardlinks are used in the original filesystem -to save space, when files are discovered to be duplicate. -In this special case the only reason the files are -hardlinked is to save space, and where the filesystem -doesn't handle duplicate files (different inode, same -data). - -Squashfs does handle duplicate files, and so add -an option to ignore hardlinks and instead -store them as duplicates. - -Signed-off-by: Phillip Lougher ---- - squashfs-tools/mksquashfs.c | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index a45b77f..d4dc359 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -312,6 +312,9 @@ struct dir_info *root_dir; - FILE *log_fd; - int logging=FALSE; - -+/* Should Mksquashfs detect hardlinked files? */ -+int no_hardlinks = FALSE; -+ - static char *read_from_disk(long long start, unsigned int avail_bytes); - void add_old_root_entry(char *name, squashfs_inode inode, int inode_number, - int type); -@@ -3093,11 +3096,11 @@ struct inode_info *lookup_inode3(struct stat *buf, int pseudo, int id, - - /* - * Look-up inode in hash table, if it already exists we have a -- * hard-link, so increment the nlink count and return it. -- * Don't do the look-up for directories because we don't hard-link -- * directories. -+ * hardlink, so increment the nlink count and return it. -+ * Don't do the look-up for directories because Unix/Linux doesn't -+ * allow hard-links to directories. - */ -- if ((buf->st_mode & S_IFMT) != S_IFDIR) { -+ if ((buf->st_mode & S_IFMT) != S_IFDIR && !no_hardlinks) { - for(inode = inode_info[ino_hash]; inode; inode = inode->next) { - if(memcmp(buf, &inode->buf, sizeof(struct stat)) == 0) { - inode->nlink ++; -@@ -5447,7 +5450,9 @@ int main(int argc, char *argv[]) - comp = lookup_compressor(COMP_DEFAULT); - - for(i = source + 2; i < argc; i++) { -- if(strcmp(argv[i], "-mkfs-time") == 0 || -+ if(strcmp(argv[i], "-no-hardlinks") == 0) -+ no_hardlinks = TRUE; -+ else if(strcmp(argv[i], "-mkfs-time") == 0 || - strcmp(argv[i], "-fstime") == 0) { - if((++i == argc) || !parse_num_unsigned(argv[i], &mkfs_time)) { - ERROR("%s: %s missing or invalid time value\n", argv[0], argv[i - 1]); -@@ -5893,6 +5898,7 @@ printOptions: - "files larger than block size\n"); - ERROR("-no-duplicates\t\tdo not perform duplicate " - "checking\n"); -+ ERROR("-no-hardlinks\t\tdo not hardlink files, instead store duplicates\n"); - ERROR("-all-root\t\tmake all files owned by root\n"); - ERROR("-root-mode \tset root directory permissions to octal \n"); - ERROR("-force-uid \tset all file uids to \n"); --- -2.30.0 - diff --git a/pkgs/tools/filesystems/squashfs/4k-align.patch b/pkgs/tools/filesystems/squashfs/4k-align.patch index e73c0678875..db0af95601c 100644 --- a/pkgs/tools/filesystems/squashfs/4k-align.patch +++ b/pkgs/tools/filesystems/squashfs/4k-align.patch @@ -1,6 +1,7 @@ -This patch has been edited to apply to squashfs 4.4, commit -52eb4c279cd283ed9802dd1ceb686560b22ffb67. Below is the original -message body of the patch. +This patch is an old patch; see below for the original message body. The patch +has been updated twice: Once to apply to squashfs 4.4, commit +52eb4c279cd283ed9802dd1ceb686560b22ffb67, and later to apply to squashfs 4.5, +commit 0496d7c3de3e09da37ba492081c86159806ebb07. From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001 From: Amin Hassani @@ -20,24 +21,23 @@ increased_size = (number_of_unfragmented_files_in_image + number of fragments) * The 4k alignment can be enabled by flag '-4k-align' --- - squashfs-tools/mksquashfs.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + squashfs-tools/mksquashfs.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index a45b77f..07b1c06 100644 +index aaa4b00..eb2fb23 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c -@@ -102,7 +102,9 @@ int old_exclude = TRUE; - int use_regex = FALSE; - int nopad = FALSE; +@@ -99,6 +99,8 @@ int nopad = FALSE; int exit_on_error = FALSE; -+int do_4k_align = FALSE; long long start_offset = 0; + int sleep_time = 0; ++int do_4k_align = FALSE; +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) long long global_uid = -1, global_gid = -1; -@@ -1546,6 +1548,9 @@ void unlock_fragments() +@@ -1553,6 +1555,9 @@ static void unlock_fragments() * queue at this time. */ while(!queue_empty(locked_fragment)) { @@ -47,7 +47,7 @@ index a45b77f..07b1c06 100644 write_buffer = queue_get(locked_fragment); frg = write_buffer->block; size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); -@@ -2478,6 +2483,9 @@ void *frag_deflator(void *arg) +@@ -2460,6 +2465,9 @@ static void *frag_deflator(void *arg) write_buffer->size = compressed_size; pthread_mutex_lock(&fragment_mutex); if(fragments_locked == FALSE) { @@ -57,18 +57,26 @@ index a45b77f..07b1c06 100644 fragment_table[file_buffer->block].size = c_byte; fragment_table[file_buffer->block].start_block = bytes; write_buffer->block = bytes; -@@ -2877,6 +2885,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent, - long long sparse = 0; - struct file_buffer *fragment_buffer = NULL; +@@ -2850,6 +2858,10 @@ static struct file_info *write_file_blocks(int *status, struct dir_ent *dir_ent, + struct file_info *file; + int bl_hash = 0; + // 4k align the start of each file. + if(do_4k_align) + ALIGN_UP(bytes, 4096); + - if(pre_duplicate(read_size)) - return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); + if(pre_duplicate(read_size, dir_ent->inode, read_buffer, &bl_hash)) + return write_file_blocks_dup(status, dir_ent, read_buffer, dup, bl_hash); -@@ -4972,6 +4984,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad) +@@ -5975,6 +5987,7 @@ static void print_options(FILE *stream, char *name, int total_mem) + fprintf(stream, "actions from \n"); + fprintf(stream, "-false-action-file \tas -false-action, but read "); + fprintf(stream, "actions from \n"); ++ fprintf(stream, "-4k-align\t\tenables 4k alignment of all files\n"); + fprintf(stream, "\nFilesystem filter options:\n"); + fprintf(stream, "-p \tAdd pseudo file definition\n"); + fprintf(stream, "-pf \tAdd list of pseudo file definitions\n"); +@@ -6198,6 +6211,7 @@ static void print_summary() "compressed", no_fragments ? "no" : noF ? "uncompressed" : "compressed", no_xattrs ? "no" : noX ? "uncompressed" : "compressed", noI || noId ? "uncompressed" : "compressed"); @@ -76,23 +84,15 @@ index a45b77f..07b1c06 100644 printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : "not "); printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, -@@ -5853,6 +5866,8 @@ print_compressor_options: +@@ -7499,6 +7513,9 @@ print_compressor_options: root_name = argv[i]; } else if(strcmp(argv[i], "-version") == 0) { - VERSION(); + print_version("mksquashfs"); ++ + } else if(strcmp(argv[i], "-4k-align") == 0) { + do_4k_align = TRUE; } else { ERROR("%s: invalid option\n\n", argv[0]); - printOptions: -@@ -5904,6 +5919,7 @@ printOptions: - ERROR("\t\t\tdirectory containing that directory, " - "rather than the\n"); - ERROR("\t\t\tcontents of the directory\n"); -+ ERROR("-4k-align\t\tenables 4k alignment of all files\n"); - ERROR("\nFilesystem filter options:\n"); - ERROR("-p \tAdd pseudo file " - "definition\n"); + print_options(stderr, argv[0], total_mem); -- -2.23.0 - +2.32.0 diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index cddb1722584..2c8cd317f66 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -10,23 +10,19 @@ stdenv.mkDerivation rec { pname = "squashfs"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; rev = version; - sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; + sha256 = "1nanwz5qvsakxfm37md5i7xqagv69nfik9hpj8qlp6ymw266vgxr"; }; patches = [ # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch - # Add -no-hardlinks option. This is a rebased version of - # c37bb4da4a5fa8c1cf114237ba364692dd522262, can be removed - # when upgrading to the next version after 4.4 - ./0001-Mksquashfs-add-no-hardlinks-option.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd lz4 lzo ]; From 1154036a26266ac4df5887681edcd6560265eaca Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 19 Jun 2021 20:14:34 +0200 Subject: [PATCH 0281/1522] terraform-providers.google, google-beta: v3.62.0 -> v3.76.0 --- .../cluster/terraform-providers/providers.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3afce9ce1ab..3a8e02b2715 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -373,19 +373,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "repo": "terraform-provider-google", - "rev": "v3.62.0", - "sha256": "0x0qp8nk88667hvlpgxrdjsgirw8iwv85gn3k9xb37a3lw7xs4qz", - "vendorSha256": "0w6aavj1c4blpvsy00vz4dcj8rnxx6a586b16lqp6s1flqmlqrbi", - "version": "3.62.0" + "rev": "v3.76.0", + "sha256": "1j3q07v4r0a3mlkmpqw8nav5z09fwyms9xmlyk6k6xkkzr520xcp", + "vendorSha256": "1ffxfracj4545fzh6p6b0wal0j07807qc2q83qzchbalqvi7yhky", + "version": "3.76.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "repo": "terraform-provider-google-beta", - "rev": "v3.47.0", - "sha256": "1nk0bg2q7dg65rn3j5pkdjv07x0gs7bkv1bpfvlhi9p4fzx9g4by", - "vendorSha256": "0c2q4d2khsi3v9b659q1kmncnlshv4px6ch99jpcymwqg3xrxda2", - "version": "3.47.0" + "rev": "v3.76.0", + "sha256": "1bdhk4vfn8pn7ql5q8m4r8js8d73zyp3dbhrmh4p07g7i5z57pjq", + "vendorSha256": "0cwvkzw45b057gwbj24z9gyldjpyfgv3fyr5x160spj0ksfn0ki0", + "version": "3.76.0" }, "grafana": { "owner": "grafana", From 252f4c6ed3d5e124ef8b0e36ae3ff2efdab77cca Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Sat, 24 Jul 2021 13:40:07 +0200 Subject: [PATCH 0282/1522] apktool: don't hardcode (wrong) build-tools version --- pkgs/development/tools/apktool/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 33721e60b0e..a093dd31c10 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -18,13 +18,16 @@ stdenv.mkDerivation rec { sourceRoot = "."; - installPhase = '' - install -D ${src} "$out/libexec/apktool/apktool.jar" - mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ - --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" - ''; + installPhase = + let + tools = builtins.head build-tools; + in '' + install -D ${src} "$out/libexec/apktool/apktool.jar" + mkdir -p "$out/bin" + makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ + --add-flags "-jar $out/libexec/apktool/apktool.jar" \ + --prefix PATH : "${tools}/libexec/android-sdk/build-tools/${tools.version}" + ''; meta = with lib; { description = "A tool for reverse engineering Android apk files"; From 09b931bd40fccad6d846750a3244bddf8e027227 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 21 Jul 2021 21:07:07 +0100 Subject: [PATCH 0283/1522] octaveFull: fix linker error on Darwin See https://trac.macports.org/ticket/61865. --- pkgs/development/interpreters/octave/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 0a87c1ddcf0..825b035d7a6 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -184,6 +184,9 @@ let enableParallelBuilding = true; + # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; From be8d8a9efba330011c848a0f86b7b4a815d34ec2 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:19:34 +0900 Subject: [PATCH 0284/1522] ghc: mark integer-simple builds as broken when hostplatform is musl --- pkgs/development/compilers/ghc/8.10.4.nix | 4 ++++ pkgs/development/compilers/ghc/8.8.4.nix | 4 ++++ pkgs/development/compilers/ghc/9.0.1.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index 10ca2f6662c..07784c42647 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -309,6 +309,10 @@ stdenv.mkDerivation (rec { maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; + + # integer-simple builds are broken when GHC links against musl. + # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. + broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 23826614716..bb2267c930d 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -319,6 +319,10 @@ stdenv.mkDerivation (rec { maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; + + # integer-simple builds are broken when GHC links against musl. + # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. + broken = enableIntegerSimple && hostPlatform.isMusl; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index d2ae51c66de..30a7f7a4f40 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -296,6 +296,10 @@ stdenv.mkDerivation (rec { maintainers = with lib.maintainers; [ marcweber andres peti ]; timeout = 24 * 3600; inherit (ghc.meta) license platforms; + + # integer-simple builds are broken when GHC links against musl. + # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. + broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { From f8592f6ba511ecc75c8b51ea84c41d4d2f688591 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 18:15:49 +0900 Subject: [PATCH 0285/1522] release-haskell: add docs for removeMany and removePlatforms --- pkgs/top-level/release-haskell.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 233da8ee1b6..9ae66ab4414 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -81,8 +81,37 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; + # Remove multiple elements from a list at once. + # + # removeMany + # :: [a] -- list of elements to remove + # -> [a] -- list of elements from which to remove + # -> [a] + # + # > removeMany ["aarch64-linux" "x86_64-darwin"] ["aarch64-linux" "x86_64-darwin" "x86_64-linux"] + # ["x86_64-linux"] removeMany = itemsToRemove: list: lib.foldr lib.remove list itemsToRemove; + # Recursively remove platforms from the values in an attribute set. + # + # removePlatforms + # :: [String] + # -> AttrSet + # -> AttrSet + # + # > attrSet = { + # foo = ["aarch64-linux" "x86_64-darwin" "x86_64-linux"]; + # bar.baz = ["aarch64-linux" "x86_64-linux"]; + # bar.quux = ["aarch64-linux" "x86_64-darwin"]; + # } + # > removePlatforms ["aarch64-linux" "x86_64-darwin"] attrSet + # { + # foo = ["x86_64-linux"]; + # bar = { + # baz = ["x86_64-linux"]; + # quux = []; + # }; + # } removePlatforms = platformsToRemove: packageSet: lib.mapAttrsRecursive (_: val: From aca8a4e36d48d6fb2e1af8718930721002de7f27 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 19 Jul 2021 13:49:24 +0900 Subject: [PATCH 0286/1522] release-haskell: move back to using accumulateDerivations for staticHaskellPackages --- pkgs/top-level/release-haskell.nix | 39 +++++++++++------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9ae66ab4414..636f0f2b15e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -18,18 +18,22 @@ let }; inherit (releaseLib) - pkgs - packagePlatforms + lib mapTestOn - aggregate + packagePlatforms + pkgs ; - inherit (pkgs) lib; - - # helper function which traverses a (nested) set + # Helper function which traverses a (nested) set # of derivations produced by mapTestOn and flattens # it to a list of derivations suitable to be passed # to `releaseTools.aggregate` as constituents. + # Removes all non derivations from the input jobList. + # + # accumulateDerivations :: [ Either Derivation AttrSet ] -> [ Derivation ] + # + # > accumulateDerivations [ drv1 "string" { foo = drv2; bar = { baz = drv3; }; } ] + # [ drv1 drv2 drv3 ] accumulateDerivations = jobList: lib.concatMap ( attrs: @@ -383,25 +387,10 @@ let lib.maintainers.rnhmjoj ]; }; - constituents = [ - # aarch64-linux - # - # TODO: Times out on Hydra - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux - - # x86_64-darwin - # - # TODO: reenable darwin builds if static libiconv works - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-darwin - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-darwin - # jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-darwin - - # x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux + constituents = accumulateDerivations [ + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random ]; }; } From 95cd2f7a1f7cedaf4fe9b64a9fca8c10afae75b2 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 24 Jul 2021 21:12:00 +0900 Subject: [PATCH 0287/1522] release-haskell: fix comment on pkgsMusl.haskellPackages --- pkgs/top-level/release-haskell.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 636f0f2b15e..5173ec6cb36 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -258,8 +258,14 @@ let pkgsMusl.haskellPackages = removePlatforms [ - "aarch64-linux" # aarch64 does not appear to be supported - "x86_64-darwin" # musl only supports linux + # pkgsMusl is compiled natively with musl. It is not + # cross-compiled (unlike pkgsStatic). We can only + # natively bootstrap GHC with musl on x86_64-linux because + # upstream doesn't provide a musl bindist for aarch64. + "aarch64-linux" + + # musl only supports linux, not darwin. + "x86_64-darwin" ] { inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) From 47c6e2fc495db334f7b8fbffa52088da13607c8d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 14:17:49 +0200 Subject: [PATCH 0288/1522] noto-fonts-emoji: 2020-09-16-unicode13_1 -> 2.028 --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 70e43efdb72..07fba382286 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -110,7 +110,7 @@ in }; noto-fonts-emoji = let - version = "2020-09-16-unicode13_1"; + version = "2.028"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { @@ -121,7 +121,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; + sha256 = "0dy7px7wfl6bqkfzz82jm4gvbjp338ddsx0mwfl6m7z48l7ng4v6"; }; nativeBuildInputs = [ From 1381ddc58de9bbb99401df18e628883f28ffae69 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 19:43:55 +0700 Subject: [PATCH 0289/1522] remarkable-toolchain: 1.8-23.9.2019 -> 3.1.2 --- .../misc/remarkable/remarkable-toolchain/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index 643e28e82b2..e5ed098af8e 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, libarchive, python, file, which }: +{ lib, stdenv, fetchurl, libarchive, python3, file, which }: stdenv.mkDerivation rec { pname = "remarkable-toolchain"; - version = "1.8-23.9.2019"; + version = "3.1.2"; src = fetchurl { - url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; - sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${version}.sh"; + sha256 = "sha256-ocODUUx2pgmqxMk8J+D+OvqlSHBSay6YzcqnxC9n59w="; executable = true; }; nativeBuildInputs = [ libarchive - python + python3 file which ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A toolchain for cross-compiling to reMarkable tablets"; homepage = "https://remarkable.engineering/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nickhu siraben ]; platforms = [ "x86_64-linux" ]; }; From 3c5ea6d11d5cf1b18ba39fb8a6a4f72d4a71f2c5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 19:44:12 +0700 Subject: [PATCH 0290/1522] remarkable2-toolchain: 2.5.2 -> 3.1.2 --- .../remarkable2-toolchain/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix index 7b4df5df164..fe54390c785 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix @@ -1,32 +1,28 @@ -{ lib, stdenv, fetchurl, libarchive, python3, file }: +{ lib, stdenv, fetchurl, libarchive, python3, file, which }: stdenv.mkDerivation rec { pname = "remarkable2-toolchain"; - version = "2.5.2"; + version = "3.1.2"; src = fetchurl { - url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; - sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; + sha256 = "sha256-JKMDRbkvoxwHiTm/o4JdLn3Mm2Ld1LyxTnCCwvnxk4c="; + executable = true; }; nativeBuildInputs = [ libarchive python3 file + which ]; - unpackCmd = '' - mkdir src - install $curSrc src/install-toolchain.sh - ''; - + dontUnpack = true; dontBuild = true; installPhase = '' - patchShebangs install-toolchain.sh - sed -i -e '3,9d' install-toolchain.sh # breaks PATH - sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh - ./install-toolchain.sh -D -y -d $out + mkdir -p $out + ENVCLEANED=1 $src -y -d $out ''; meta = with lib; { @@ -34,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://remarkable.engineering/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.x86_64; + platforms = [ "x86_64-linux" ]; }; } From 48ef7e38ce6e6d8ceb1dd7e4ab3d0985855250a0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 14:40:35 +0200 Subject: [PATCH 0291/1522] ocamlPackages.letsencrypt: 0.2.5 -> 0.3.0 ocamlPackages.letsencrypt-dns: init at 0.3.0 ocamlPackages.letsencrypt-app: init at 0.2.5 https://github.com/mmaker/ocaml-letsencrypt/releases/tag/v0.3.0 --- .../ocaml-modules/letsencrypt/app.nix | 45 +++++++++++++++++++ .../ocaml-modules/letsencrypt/default.nix | 25 +---------- .../ocaml-modules/letsencrypt/dns.nix | 35 +++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 4 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/ocaml-modules/letsencrypt/app.nix create mode 100644 pkgs/development/ocaml-modules/letsencrypt/dns.nix diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix new file mode 100644 index 00000000000..dc9006d6d16 --- /dev/null +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, letsencrypt +, letsencrypt-dns +, cmdliner +, cohttp-lwt-unix +, logs +, fmt +, lwt +, mirage-crypto-rng +, ptime +, bos +, fpath +, randomconv +}: + +buildDunePackage { + pname = "letsencrypt-app"; + + inherit (letsencrypt) + src + version + useDune2 + minimumOCamlVersion + ; + + buildInputs = [ + letsencrypt + letsencrypt-dns + cmdliner + cohttp-lwt-unix + logs + fmt + lwt + mirage-crypto-rng + ptime + bos + fpath + randomconv + ]; + + meta = letsencrypt.meta // { + description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 0a70bf30242..623fba942f2 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -6,11 +6,6 @@ , uri , rresult , base64 -, cmdliner -, cohttp -, cohttp-lwt -, cohttp-lwt-unix -, zarith , logs , fmt , lwt @@ -20,38 +15,25 @@ , x509 , yojson , ounit -, dns -, dns-tsig , ptime -, bos -, fpath -, randomconv , domain-name }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; + sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; }; minimumOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ - cmdliner - cohttp - cohttp-lwt-unix - zarith fmt - mirage-crypto-rng ptime - bos - fpath - randomconv domain-name ]; @@ -65,11 +47,8 @@ buildDunePackage rec { asn1-combinators x509 uri - dns - dns-tsig rresult astring - cohttp-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix new file mode 100644 index 00000000000..99058f48d06 --- /dev/null +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -0,0 +1,35 @@ +{ lib +, buildDunePackage +, letsencrypt +, logs +, fmt +, lwt +, dns +, dns-tsig +, domain-name +}: + +buildDunePackage { + pname = "letsencrypt-dns"; + + inherit (letsencrypt) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + letsencrypt + dns + dns-tsig + domain-name + logs + lwt + fmt + ]; + + meta = letsencrypt.meta // { + description = "A DNS solver for the ACME implementation in OCaml"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4febee5f5a8..94f0b64d624 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -605,6 +605,10 @@ let letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; + letsencrypt-app = callPackage ../development/ocaml-modules/letsencrypt/app.nix { }; + + letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { }; + linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { From 6de88a880dbc6ba0621dc9190ca9db04dc99dc08 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 27 Mar 2021 02:33:17 +0100 Subject: [PATCH 0292/1522] attr: 2.4.48 -> 2.5.1 --- pkgs/development/libraries/attr/default.nix | 9 +- pkgs/development/libraries/attr/syscall.patch | 120 ------------------ 2 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 pkgs/development/libraries/attr/syscall.patch diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 3ff021222fa..4ad1525c2e0 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -7,22 +7,17 @@ stdenv.mkDerivation rec { pname = "attr"; - version = "2.4.48"; + version = "2.5.1"; src = fetchurl { url = "mirror://savannah/attr/${pname}-${version}.tar.gz"; - sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay"; + sha256 = "1y6sibbkrcjygv8naadnsg6xmsqwfh6cwrqk01l0v2i5kfacdqds"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ gettext ]; - patches = [ - # fix fakechroot: https://github.com/dex4er/fakechroot/issues/57 - ./syscall.patch - ]; - postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script diff --git a/pkgs/development/libraries/attr/syscall.patch b/pkgs/development/libraries/attr/syscall.patch deleted file mode 100644 index be2cfb3928b..00000000000 --- a/pkgs/development/libraries/attr/syscall.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Fri, 17 Aug 2018 14:07:31 +0200 -Subject: Switch back to syscall() - -Switch back to syscall() for the *xattr system calls. The current -mechanism of forwarding those calls to glibc breaks libraries like -libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc --fsanitize=address). - -Those libraries provide wrappers for functions defined in other shared -libraries, usually glibc, do their own processing, and forward calls to -the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name"). In -our case, dlsym returns the libattr_*xattr wrappers. However, when our -wrappers try calling glibc, they end up calling the libfakeroot / -libasan wrappers instead because those override the original symbols => -recursion. - -The libattr_*xattr wrappers will only be used when symbols are looked up -at runtime (dlopen / dlsym). Programs linking against libattr will -directly use the glibc provided symbols. Therefore, the slightly worse -performance of syscall() won't affect any of the "normal" users of -libattr. ---- - libattr/syscalls.c | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git a/libattr/syscalls.c b/libattr/syscalls.c -index 3013aa0..721ad7f 100644 ---- a/libattr/syscalls.c -+++ b/libattr/syscalls.c -@@ -22,6 +22,8 @@ - - #include "config.h" - -+#include -+#include - #include - - #ifdef HAVE_VISIBILITY_ATTRIBUTE -@@ -31,67 +33,67 @@ - int libattr_setxattr(const char *path, const char *name, - void *value, size_t size, int flags) - { -- return setxattr(path, name, value, size, flags); -+ return syscall(__NR_setxattr, path, name, value, size, flags); - } - - int libattr_lsetxattr(const char *path, const char *name, - void *value, size_t size, int flags) - { -- return lsetxattr(path, name, value, size, flags); -+ return syscall(__NR_lsetxattr, path, name, value, size, flags); - } - - int libattr_fsetxattr(int filedes, const char *name, - void *value, size_t size, int flags) - { -- return fsetxattr(filedes, name, value, size, flags); -+ return syscall(__NR_fsetxattr, filedes, name, value, size, flags); - } - - ssize_t libattr_getxattr(const char *path, const char *name, - void *value, size_t size) - { -- return getxattr(path, name, value, size); -+ return syscall(__NR_getxattr, path, name, value, size); - } - - ssize_t libattr_lgetxattr(const char *path, const char *name, - void *value, size_t size) - { -- return lgetxattr(path, name, value, size); -+ return syscall(__NR_lgetxattr, path, name, value, size); - } - - ssize_t libattr_fgetxattr(int filedes, const char *name, - void *value, size_t size) - { -- return fgetxattr(filedes, name, value, size); -+ return syscall(__NR_fgetxattr, filedes, name, value, size); - } - - ssize_t libattr_listxattr(const char *path, char *list, size_t size) - { -- return listxattr(path, list, size); -+ return syscall(__NR_listxattr, path, list, size); - } - - ssize_t libattr_llistxattr(const char *path, char *list, size_t size) - { -- return llistxattr(path, list, size); -+ return syscall(__NR_llistxattr, path, list, size); - } - - ssize_t libattr_flistxattr(int filedes, char *list, size_t size) - { -- return flistxattr(filedes, list, size); -+ return syscall(__NR_flistxattr, filedes, list, size); - } - - int libattr_removexattr(const char *path, const char *name) - { -- return removexattr(path, name); -+ return syscall(__NR_removexattr, path, name); - } - - int libattr_lremovexattr(const char *path, const char *name) - { -- return lremovexattr(path, name); -+ return syscall(__NR_lremovexattr, path, name); - } - - int libattr_fremovexattr(int filedes, const char *name) - { -- return fremovexattr(filedes, name); -+ return syscall(__NR_fremovexattr, filedes, name); - } - - #ifdef HAVE_VISIBILITY_ATTRIBUTE From a29e03164324aec5bf527a1b4272b13500973bf7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 20:08:44 +0700 Subject: [PATCH 0293/1522] s9fes: init at 20181205 --- .../interpreters/s9fes/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/interpreters/s9fes/default.nix diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix new file mode 100644 index 00000000000..7423e9f5f48 --- /dev/null +++ b/pkgs/development/interpreters/s9fes/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, ncurses, buildPackages }: + +let + isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; +in + +stdenv.mkDerivation rec { + pname = "s9fes"; + version = "20181205"; + + src = fetchurl { + url = "http://www.t3x.org/s9fes/s9fes-${version}.tgz"; + sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o="; + }; + + # Fix cross-compilation + postPatch = '' + substituteInPlace Makefile --replace 'ar q' '${stdenv.cc.targetPrefix}ar q' + substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' + ${lib.optionalString isCrossCompiling "substituteInPlace Makefile --replace ./s9 '${buildPackages.s9fes}/bin/s9'"} + ''; + + buildInputs = [ ncurses ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + enableParallelBuilding = true; + + meta = with lib; { + description = "Scheme 9 From Empty Space, an interpreter for R4RS Scheme"; + homepage = "http://www.t3x.org/s9fes/index.html"; + license = licenses.publicDomain; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..1f69d5837bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4429,6 +4429,8 @@ in rar2fs = callPackage ../tools/filesystems/rar2fs { }; + s9fes = callPackage ../development/interpreters/s9fes { }; + s-tar = callPackage ../tools/archivers/s-tar {}; sonota = callPackage ../tools/misc/sonota { }; From 34cf1e9e176b22eb76ae809bb6f4dec8f9fce4d1 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Wed, 7 Jul 2021 09:49:49 -0700 Subject: [PATCH 0294/1522] graphviz: 2.47.2 -> 2.47.3 Signed-off-by: Ana Hobden --- pkgs/tools/graphics/graphviz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 0662205d17e..5031aad7480 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ import ./base.nix rec { - rev = "a11eb938514725493324d18db1686f9a99c8569f"; # use rev as tags have disappeared before - version = "2.47.2"; - sha256 = "sha256-6JFjM/2xl7KVmGhSr6RWgO23UwLDyAif3ONsBG4t/Wc="; + rev = "887cd2207e6858ff2c0fe6e461dd309a435c8d5a"; # use rev as tags have disappeared before + version = "2.47.3"; + sha256 = "sha256-WUu3eAycG/oHTnT7HiZvf0B45I8miYolwRi9fHfA3uA="; } From 1b3ba289b2a03748d0a8b790c82b638b73a7dd01 Mon Sep 17 00:00:00 2001 From: ash lea Date: Fri, 23 Jul 2021 14:24:41 -0700 Subject: [PATCH 0295/1522] mesa: fix datadir location --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2790d88387e..a23d02c29e4 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -83,9 +83,9 @@ self = stdenv.mkDerivation { # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: substituteInPlace src/util/xmlconfig.c --replace \ - 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"' + 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' substituteInPlace src/util/meson.build --replace \ - "get_option('datadir')" "'${placeholder "out"}'" + "get_option('datadir')" "'${placeholder "out"}/share'" '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace meson.build --replace \ "find_program('nm')" \ From aa760facf3dd47b3c7419a9746bbc5799ec6747e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 11:03:00 +0200 Subject: [PATCH 0296/1522] iputils: 20210202 -> 20210722 --- pkgs/os-specific/linux/iputils/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 495860ef576..c949069885d 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 +, iproute2 , apparmorRulesFromClosure }: let - version = "20210202"; + version = "20210722"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -18,11 +19,20 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; + sha256 = "139fyifsjm0i012rhcx3ra3pxx2wxh77dfd551d8lgiv2mqd742j"; }; + postPatch = lib.optionalString (!doCheck) '' + # There isn't a Meson option for this yet: + sed -i '/##### TESTS #####/q' ping/meson.build + ''; + outputs = ["out" "apparmor"]; + # We don't have the required permissions inside the build sandbox: + # /build/source/build/ping/ping: socket: Operation not permitted + doCheck = false; + mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -37,6 +47,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; + checkInputs = [ iproute2 ]; + postInstall = '' mkdir $apparmor cat >$apparmor/bin.ping < Date: Wed, 21 Jul 2021 21:04:58 +0200 Subject: [PATCH 0297/1522] pythonPackages.pybind11: 2.6.2 -> 2.7.0 https://github.com/pybind/pybind11/releases/tag/v2.7.0 --- .../python-modules/pybind11/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 2208cca708d..3f825a06cd3 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -2,35 +2,25 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , cmake , eigen , python , catch , numpy , pytest -, scipy }: buildPythonPackage rec { pname = "pybind11"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy"; + sha256 = "sha256-iEXoNTsfsDq79bKV7A4aOCHr11rT/cqnyLghEtGsaks="; }; - patches = [ - # fix pybind11Config.cmake - (fetchpatch { - url = "https://github.com/pybind/pybind11/commit/d9c4e1047a95f023633a7260af5a633307438941.patch"; - sha256 = "0kran295kj31xfs6mfha5ip132zd0pnj2dl36qzgyc1rpnha5gz4"; - }) - ]; - nativeBuildInputs = [ cmake ]; dontUseCmakeBuildDir = true; From 04de16a04d8c7389fe63b1a2fe1bba18a115efa5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 17:44:15 +0000 Subject: [PATCH 0298/1522] freetype: 2.10.4 -> 2.11.0 --- pkgs/development/libraries/freetype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index adda15696e8..943a25dcf64 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.4"; + version = "2.11.0"; meta = with lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; + sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec="; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype From a22fd3f4bb1b0b5bc097bde48b648c0e8650921b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 09:43:41 +0000 Subject: [PATCH 0299/1522] hdf5-cpp: 1.12.0 -> 1.12.1 --- pkgs/tools/misc/hdf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 37ebbe630ca..248351272d8 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -20,11 +20,11 @@ assert !cpp || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0qazfslkqbmzg495jafpvqp0khws3jkxa0z7rph9qvhacil6544p"; + sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; }; passthru = { From 06c7c2a43128445809e58acff06192c28145e798 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Jul 2021 00:26:07 +0000 Subject: [PATCH 0300/1522] harfbuzz: 2.8.1 -> 2.8.2 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index db142286fe4..4a12c5bcc22 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -24,7 +24,7 @@ }: let - version = "2.8.1"; + version = "2.8.2"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "107l9jhvwy6pnq5032kr7r21md65qg09j7iikr4jihf9pvh7gn5w"; + sha256 = "sha256-uqcwfe5Oa3S0tyZDzqhIQfRFEv/HaiVWzVvwjqpLo5g="; }; postPatch = '' From 1ba9e45338a0a7fe1dfbc6482737cf79d708e04f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jun 2021 07:50:46 +0000 Subject: [PATCH 0301/1522] alsa-topology-conf: 1.2.5 -> 1.2.5.1 --- .../linux/alsa-project/alsa-topology-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix index 97960f833e1..e0dfc879fbc 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-topology-conf-${version}"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "sha256-i/qDBspj4dDL6AvphGYCc7kb1bfdCACmxapx3YyNd1w="; + sha256 = "sha256-98W64VRavNc4JLyX9OcsNA4Rq+oYi6DxwG9eCtd2sXk="; }; dontBuild = true; From b575c26b69bd9c09280f581d2f43a6352863508b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jun 2021 00:14:06 +0000 Subject: [PATCH 0302/1522] libGLU: 9.0.1 -> 9.0.2 --- pkgs/development/libraries/mesa-glu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 85950daea68..d2e92da0ea9 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glu"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; + sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; }; nativeBuildInputs = [ pkg-config ]; From d073245f24ae81113f2fead586812932b3520f04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 20:13:44 +0000 Subject: [PATCH 0303/1522] libgpgerror: 1.41 -> 1.42 --- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1f6fd4835af..7490995e661 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.41"; + version = "1.42"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0hi7jbcs1l9kxzhiqcs2iivsb048642mwaimgqyh1hy3bas7ic34"; + sha256 = "sha256-/AfnD2xhX4xPWQqON6m43S4soelAj45gRZxnRSuSXiM="; }; postPatch = '' From 5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76 Mon Sep 17 00:00:00 2001 From: Kid Date: Fri, 18 Jun 2021 01:29:06 +0800 Subject: [PATCH 0304/1522] file: 5.39 -> 5.40 --- pkgs/tools/misc/file/default.nix | 10 ++-------- pkgs/tools/misc/file/webassembly-format-fix.patch | 13 ------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/misc/file/webassembly-format-fix.patch diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 4a9dc7ee774..cc56205243d 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.39"; + version = "5.40"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; + sha256 = "0myxlpj9gy2diqavx33vq88kpvr1k1bpzsm0d0zmb2hl7ks22wqn"; }; - patches = [ - # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3 - # Without the RCS id change to avoid conflicts. Remove on next bump. - ./webassembly-format-fix.patch - ]; - nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/pkgs/tools/misc/file/webassembly-format-fix.patch b/pkgs/tools/misc/file/webassembly-format-fix.patch deleted file mode 100644 index 5eca833e4d7..00000000000 --- a/pkgs/tools/misc/file/webassembly-format-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/funcs.c b/src/funcs.c -index 299b8f022..ecbfa28c5 100644 ---- a/src/funcs.c -+++ b/src/funcs.c -@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) - if (*++p == '%') - continue; - // Skip uninteresting. -- while (strchr("0.'+- ", *p) != NULL) -+ while (strchr("#0.'+- ", *p) != NULL) - p++; - if (*p == '*') { - if (msg) From 18b79d29aa9941714d17af816b039f22b020e14e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 04:05:53 +0000 Subject: [PATCH 0305/1522] libndp: 1.7 -> 1.8 --- pkgs/development/libraries/libndp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 524f948703f..42f6ecc6489 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libndp-1.7"; + name = "libndp-1.8"; src = fetchurl { url = "http://libndp.org/files/${name}.tar.gz"; - sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c"; + sha256 = "sha256-iP+2buLrUn8Ub1wC9cy8OLqX0rDVfrRr+6SIghqwwCs="; }; meta = with lib; { From a19626a485025ec0335283ef2eab18194b2a2ac6 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 22 May 2021 11:42:16 +0200 Subject: [PATCH 0306/1522] xvidcore: 1.3.5 -> 1.3.7 This also switches to the new upstream URL, since the old one is deprecated and does not provide current versions. --- pkgs/development/libraries/xvidcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index dbc3d837a45..57f2403cfe3 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -3,11 +3,11 @@ with lib; stdenv.mkDerivation rec { pname = "xvidcore"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; + url = "https://downloads.xvid.com/downloads/${pname}-${version}.tar.bz2"; + sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"; }; preConfigure = '' From d952953b8548050327a540912ac33f9354c924ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:33:48 +0000 Subject: [PATCH 0307/1522] mailcap: 2.1.52 -> 2.1.53 --- pkgs/data/misc/mailcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix index 56d10e5b350..3519b01f54b 100644 --- a/pkgs/data/misc/mailcap/default.nix +++ b/pkgs/data/misc/mailcap/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.1.52"; + version = "2.1.53"; in fetchzip { name = "mailcap-${version}"; url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; - sha256 = "sha256-2GRNg3zoMPMaOk2zoAx5sVIzjbQhnYJuaO8nrzWujVc="; + sha256 = "sha256-6JPj2tZgoTEZ8hNEi9ZZhElBNm9SRTSXifMmCicwiLo="; postFetch = '' tar -xavf $downloadedFile --strip-components=1 From f541fba478b29a7b4ac1fd6f30220cc4ac9624f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 20:31:41 +0000 Subject: [PATCH 0308/1522] libcap: 2.48 -> 2.49 --- pkgs/os-specific/linux/libcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 47fa7c05e79..2f12d2fea38 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.48"; + version = "2.49"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI="; + sha256 = "sha256-6YvE2TZFCC7Hh3MLD9GnErOIgkZcUFd33hfDOIMe4YE="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] From de2e3040aa2d63484b512954f04f7e84b0de0d75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 20:09:50 +0000 Subject: [PATCH 0309/1522] libdvdread: 6.1.1 -> 6.1.2 --- pkgs/development/libraries/libdvdread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 32dfe4ee0fa..ac94dcbcb8f 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y"; + sha256 = "sha256-zBkPVTdYztdXGFnjAfgCy0gh8WTQK/rP0yDBSk4Np2M="; }; buildInputs = [libdvdcss]; From a8059e7fbf8695bd0df5fd197d15c60ebafbd43a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 17:05:54 +0000 Subject: [PATCH 0310/1522] libdvdcss: 1.4.2 -> 1.4.3 --- pkgs/development/libraries/libdvdcss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 278e3d60d90..b43c0ccdd0f 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libdvdcss"; - version = "1.4.2"; + version = "1.4.3"; buildInputs = lib.optional stdenv.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; + sha256 = "sha256-IzzJL13AHF06lvWzWCvn1c7lo1pS06CBWHRdPYYHAHk="; }; meta = with lib; { From b014e65dfca2f785d4f5d5b069989658a684513e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 13:35:01 +0000 Subject: [PATCH 0311/1522] liquibase: 4.4.1 -> 4.4.2 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 2dc5c4e77c8..9b3a92fecc4 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2Y/eRIkskuk+7GC/br178XzWTnP4iXSFfa5ybLjvqDA="; + sha256 = "sha256-qOKMyqf3KX7pWjslVgcPiGlTiwvMZLvm7DiatmSLd1U="; }; nativeBuildInputs = [ makeWrapper ]; From 3c64b6cd4695f362df22ec10cf218c9f1921419f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 06:37:49 +0000 Subject: [PATCH 0312/1522] libbytesize: 2.5 -> 2.6 --- pkgs/development/libraries/libbytesize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 7ce8d6e7f83..eda85e286b4 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.5"; + version = "2.6"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "sha256-F8Ur8gtNYp4PYfBQ9sDJGBgW7KohJYNEU9SI2SbNuvM="; + sha256 = "sha256-akZFd7rUjBQ/yj79NHWTNUro3wKu81F0Y1GX8gMdJ5Y="; }; outputs = [ "out" "dev" "devdoc" ]; From a42c0425c8e94822d59b26b03eaeb51ea32cbe74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 08:07:06 +0000 Subject: [PATCH 0313/1522] libfabric: 1.12.1 -> 1.13.0 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 9a1e44f6af9..2abe07b0964 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.12.1"; + version = "1.13.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J2PoDwjPWYpagX4M2k9E1xitBzgRUZzwX9Gf00H+Tdc="; + sha256 = "sha256-felGKpdihOi4TCp95T1ti7fErQVphP0vYGRKEwlQt4Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; From 07d64228938113a67c3536cd6ec813a0f05170be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 22:16:17 +0000 Subject: [PATCH 0314/1522] libgit2: 1.1.0 -> 1.1.1 --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index a118a611785..b02e1ecc6f7 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.1.0"; + version = "1.1.1"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "1vj7q7b8j3smiyi1acbc5x86lqk00igdm2adjnqs9n011i13rykl"; + sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; }; cmakeFlags = [ From e1c735229ef79f1356bef5313b391df0ec69eea9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 02:24:07 +0000 Subject: [PATCH 0315/1522] ajour: 1.2.0 -> 1.2.1 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 702ea28a697..1e102a950b9 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "0xmjr8brjmkk13dsn3yvcl5ss6b214hpka0idk072n46qsyhg2wh"; + sha256 = "sha256-arb6wPoDlNdBxSQ+G0KyN4Pbd0nPhb+DbvRlbPaPtPI="; }; - cargoSha256 = "06d1h2c2abg56567znxh65d4ddpi6wvxip9rbzkmdnzgy3b3y2wl"; + cargoSha256 = "sha256-1hK6C10oM5b8anX+EofekR686AZR5LcpXyhVkmHcSwA="; nativeBuildInputs = [ autoPatchelfHook From f50fa1aca14268a5ac9a0c9e5ef8d8f3febe206a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 19:59:31 +0000 Subject: [PATCH 0316/1522] libbluray: 1.2.1 -> 1.3.0 --- pkgs/development/libraries/libbluray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 3f90bb878ad..8fd680683dd 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1v1nmq631j0prih7pjl01ixhhwgrkjpxrjmmc342rsl8g4zyh8sj"; + sha256 = "sha256-4tuvmehOCpcl9Jhby4XUHlLCJhzGUdiISxt5C17wFvk="; }; patches = optional withJava ./BDJ-JARFILE-path.patch; From 5f5bb56695a8ab3b159fe54d5e284f272c60454e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:46:49 +0200 Subject: [PATCH 0317/1522] ocamlPackages.carton*: 0.4.1 -> 0.4.2 --- pkgs/development/ocaml-modules/carton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index c10537d5d50..81893ae9ac3 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -7,14 +7,14 @@ buildDunePackage rec { pname = "carton"; - version = "0.4.1"; + version = "0.4.2"; useDune2 = true; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; - sha256 = "d16aad5560d9ab1e3b4d93d2e8fdea638c216ff47338fb630a8aefd22b452665"; + sha256 = "a0a03b2f7bb7dafe070bc6a74583b6d6da714d2c636dd4d5a6443c9f299ceacc"; }; # remove changelogs for mimic and the git* packages From 54c9f714c40e63db31f90a8369ce11a2d085e079 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:48:26 +0200 Subject: [PATCH 0318/1522] ocamlPackages.decompress: 1.4.0 -> 1.4.1 https://github.com/mirage/decompress/releases/v1.4.1 --- pkgs/development/ocaml-modules/decompress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 505ffe3c425..4681e5a1879 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -4,7 +4,7 @@ }: buildDunePackage rec { - version = "1.4.0"; + version = "1.4.1"; pname = "decompress"; minimumOCamlVersion = "4.07"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "d1669e07446d73dd5e16f020d4a1682abcbb1b7a1e3bf19b805429636c26a19b"; + sha256 = "0130ea6acb61b0a25393fa23148e116d7a17c77558196f7abddaee9e05a1d7a8"; }; buildInputs = [ cmdliner ]; From 629e644af2846376f1811f0d38b793b6cb42035b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 17 Jul 2021 13:56:24 +0200 Subject: [PATCH 0319/1522] ocamlPackages.lwt: remove unnecessary dependency on OMP --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index b0f73546eed..7d6424564d2 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml -, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result +, cppo, dune-configurator, ocplib-endian, result , mmap, seq , ocaml-syntax-shims }: @@ -18,7 +18,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ] + buildInputs = [ cppo dune-configurator ] ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2e8a4fa59d1..200743944ee 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -623,9 +623,7 @@ let inherit (pkgs) file; }; - lwt = callPackage ../development/ocaml-modules/lwt { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; - }; + lwt = callPackage ../development/ocaml-modules/lwt { }; lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { }; From 451dc01e1c404175270e26d97ad0ba1b023be633 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 17 Jul 2021 21:08:22 +0200 Subject: [PATCH 0320/1522] =?UTF-8?q?ocamlPackages.graphql=5Fppx:=201.0.1?= =?UTF-8?q?=20=E2=86=92=201.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/graphql_ppx/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index f75465e99a2..aa149d60e4d 100644 --- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -1,32 +1,37 @@ -{ lib, buildDunePackage, fetchFromGitHub, alcotest, cppo -, ocaml-migrate-parsetree, ppx_tools_versioned, reason, yojson }: +{ lib, buildDunePackage, fetchFromGitHub, alcotest, reason +, ppxlib +, yojson }: buildDunePackage rec { pname = "graphql_ppx"; - version = "1.0.1"; + version = "1.2.0"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "reasonml-community"; repo = "graphql-ppx"; rev = "v${version}"; - sha256 = "0lvmv1sb0ca9mja6di1dbmsgjqgj3w9var4amv1iz9nhwjjx4cpi"; + sha256 = "1fymmvk616wv5xkwfdmqibdgfl47ry6idc5wfh20a3mz9mpaa13s"; }; - propagatedBuildInputs = - [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason yojson ]; + buildInputs = [ ppxlib ]; - checkInputs = lib.optional doCheck alcotest; + propagatedBuildInputs = [ + reason + yojson + ]; - doCheck = false; + checkInputs = [ alcotest ]; + + doCheck = true; useDune2 = true; meta = { homepage = "https://github.com/reasonml-community/graphql_ppx"; description = "GraphQL PPX rewriter for Bucklescript/ReasonML"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ]; }; } From 49853b2757740397bb3ff47b12630cda372c8664 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 14:05:29 +0200 Subject: [PATCH 0321/1522] ocamlPackages.irmin*: 2.7.1 -> 2.7.2 --- pkgs/development/ocaml-modules/irmin/ppx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 673238843ff..8d57e18dc81 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399"; + sha256 = "29c68c5001a727aaa7a6842d6204ffa3e24b3544fa4f6af2234cdbfa032f7fdf"; }; minimumOCamlVersion = "4.08"; From 8eff44934a0a370fc4ee92e852cfc01f60009c3b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 24 Jul 2021 18:00:41 +0300 Subject: [PATCH 0322/1522] =?UTF-8?q?xournalpp:=201.0.20=20=E2=86=92=201.1?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/xournalpp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 1810a6c6b8e..16544c85650 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -9,6 +9,7 @@ , glib , gsettings-desktop-schemas , gtk3 +, librsvg , libsndfile , libxml2 , libzip @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k"; + sha256 = "sha256-FIIpWgWvq1uo/lIQXpOkUTZ6YJPtOtxKF8VjXSgqrlE="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { [ glib gsettings-desktop-schemas gtk3 + librsvg libsndfile libxml2 libzip From d67b0386c3e4e56bcaa785c93f942b2a1500bee7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 24 Jul 2021 18:06:19 +0300 Subject: [PATCH 0323/1522] =?UTF-8?q?nnn:=204.1.1=20=E2=86=92=204.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d6b121081b4..159ecb9f552 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.1.1"; + version = "4.2"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "09z37lv57nbp0l1ax28558jk5jv91lb22bgaclirvdyz2qp47xhj"; + sha256 = "sha256-ICUF/LJhsbzDz9xZig1VE6TdG3u0C6Jf/61RoAjx3KI="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); From 71ec1f87a9c149e8c6eefe2add62e60cf69e5897 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Jul 2021 11:28:18 -0400 Subject: [PATCH 0324/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 96 ++++++++++++++--------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 65ec5d22090..43462797673 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "a33313899a56b936c889f9faaad798d429997042"; - sha256 = "1mqcwvmnn4lbl4901gh5rsfagcx464zdaw0rq0sn0fkyx4ydq9s0"; + rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7"; + sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1437,12 +1437,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2021-04-25"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "95847fbae47aa5d49b6470568b8151a93e15307a"; - sha256 = "06qvnbhwm2gl8921hyq75dwxxfbkwfvvsn4pci89831qn6w3pa6f"; + rev = "03029f4ec49cd0dd1d16eb9561742f5c9f794e71"; + sha256 = "14gnndh40h8qlymsb9lkycn4w7jv8f7kk0yjxi4wzjvycg7mrplx"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1522,12 +1522,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; - version = "2021-07-11"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "4c04c967691d028b4056f726735db329039cdff2"; - sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c"; + rev = "fb51d6ba6363d10d6fc9e14d0fcef09fd402e431"; + sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1546,12 +1546,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-07-03"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "1b234d8ec0ffadf7fe3f4ddba13480dd4adeb7c7"; - sha256 = "1prl720r82mp89jfciw50pd2cygp97v46w7vq30b1m4v3016lh15"; + rev = "a4d4288a11d0e50214c4f5745da5f8ce39cb2a6d"; + sha256 = "1ldv2ar8dm2arawxkzi2r7r1c6wacl9g9dkmyib038bdmr4qfn1g"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -3144,12 +3144,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0"; - sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa"; + rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1"; + sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3424,8 +3424,8 @@ final: prev: src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "4308ebe128e25704bc1b1ef20133d68d8fba2db0"; - sha256 = "07wcm7gjv48b1z33qixb52bvq7qj44dalmzjbms2wlg00zgq38kf"; + rev = "b7209e7657dcc786b844a920894a517571da1317"; + sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3456,12 +3456,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-22"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2c2aec89bb85cc38e9fd6f83a93bb748ae462a01"; - sha256 = "11qfbn54h7ckggf9va2qawpl81mbm985lr893gvimfkwl6v3zqlp"; + rev = "52286ee4d11016b3366481935c12211c44d43777"; + sha256 = "0lf0d2b2yajjv39l9zy0h5cmrnah8ig7fk3ckmlpvcfhrlqry9j8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "5a86b4f83c1f17b27a02c191dcebb0441c0531bb"; - sha256 = "1c4jcdjmafkpcq2vma39vsdm93al8yi3q8n6i4hfvmw8lvsxcfy6"; + rev = "e3e105b11a3b34e93bdcee0c895801cf3ed2a835"; + sha256 = "0pgg4xvq0dxn4rzip7nzzy1sscm8v1fixkwlpr9jdbp86s9kkq87"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3612,24 +3612,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9dc887db1c266aab2ebddf3845d22587f15e92a6"; - sha256 = "10klagr9ybk96ayhsxd1qp2mjpkrv0a70lh571ixmdf90a6zkg4y"; + rev = "b557bf8d503c966a4233a72449a80ebcaaed5415"; + sha256 = "0p6jq9a6xgbxpjcffm6bk88aicqg05cnk0an5j0cy60s7hp5vvv7"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-06-29"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "e32b33dae9d8d738f86f84699d4f978f8d9deb02"; - sha256 = "0sdx890gk79qyyjs946kq3anyq8yyxvkg9sfphiavq5xs9840ps1"; + rev = "10a57a6b6973661d7082589df3bafc949f004346"; + sha256 = "10w6wxn3gf3pn6xw9ws05pxqp4a4ssg252bq7bsq8xys9saf12gy"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3720,12 +3720,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-20"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4f72377143fc0961391fb0e42e751b9f677fca4e"; - sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m"; + rev = "00028be5527abbc829ae8263cb3319dcae08e8ec"; + sha256 = "17vxq8b70v9kq7labi3di0r6rgdhf4vz4mkiw6ji26pa60bfxy8w"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4481,8 +4481,8 @@ final: prev: src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "a0be4f89830210c5203ea2bee1373041400a59d1"; - sha256 = "1f5s9shmlpixw6lkywbnbfcqhqvaczmbhys243pn96pv4bsy09r5"; + rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0"; + sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4561,12 +4561,12 @@ final: prev: semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2021-07-13"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "39c7500032f35711aecb492affd989433b984f14"; - sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb"; + rev = "252f07fd5f0ae9eb19d02bae979fd7c9152c1ccf"; + sha256 = "0r1nrkhyhk08vfhf9hnbhjlnqy0imqhdqx31y301k2kb31hyiyq3"; }; meta.homepage = "https://github.com/numirias/semshi/"; }; @@ -5169,8 +5169,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "79644ab67731c7ba956c354bf0545282f34e10cc"; - sha256 = "0v7qpblbgs298aj0p5fs4q8b8zc36ib427aq78c0500988p6hr3d"; + rev = "c0f1999b0280bb042bba01c930dd94a4bfdee363"; + sha256 = "13igy3nph7vg1pnq7hjvql71i0031xdxgkiyd1h38chcs7whvxzf"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6822,12 +6822,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-21"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a7c54990f031ab93b556ceb25c5afb8a45c3311a"; - sha256 = "0ld8p75av2v9ki5sh7rh8cxj99k6lydhy6jp9x19fk8bzxsgff02"; + rev = "75b2a9a8daf6589f9747ff4f2d068fdea54e92ea"; + sha256 = "1c265bq5a60y7ndpvwdn54kdzb6spdfnkfdaffp47rgq0y1pfphj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7749,12 +7749,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-19"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "61802ad25f303dc37f575cbed9b902605353db49"; - sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14"; + rev = "8ae49bf65c960f6260f2d475b35b068bc6b822f2"; + sha256 = "1r0car7vbz57b5fq7kjibsdi6knw50n8az145dbfq8svkf7s1fvy"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9310,12 +9310,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-07-18"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "06f965a62c32906f220c37e7b758a275d6a992f6"; - sha256 = "0zgpp6g29n1kb0qi6n84i1d540g0xhw5bzj8kp5xsh5wlvn9h4fk"; + rev = "54eaa1b19c924551e9988063926533583e41b24c"; + sha256 = "16d38yc4v0fy7w8qdrbx134f99xny4kfgwgazqa47cgj8nrb0n4g"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; From 19458a7a0156c2cf7718aec83b5504cfb45bd556 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Jul 2021 11:28:35 -0400 Subject: [PATCH 0325/1522] vimPlugins.lualine-lsp-progress: init at 2021-07-10 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 43462797673..4a7201c2906 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2722,6 +2722,18 @@ final: prev: meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; + lualine-lsp-progress = buildVimPluginFrom2Nix { + pname = "lualine-lsp-progress"; + version = "2021-07-10"; + src = fetchFromGitHub { + owner = "arkav"; + repo = "lualine-lsp-progress"; + rev = "7c024f40a3b26c8f7925745cdd2fe7acc96939c4"; + sha256 = "0flmd69d7kjzcnzclx6k2yxjfy9nmkwxjlrgl3sszw5qpffxjlk1"; + }; + meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; + }; + lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; version = "2021-05-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d55ce357892..e134963d453 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -28,6 +28,7 @@ antoinemadec/coc-fzf antoinemadec/FixCursorHold.nvim ap/vim-css-color arcticicestudio/nord-vim +arkav/lualine-lsp-progress arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim From 6e557e45c12ffc829fda6f48af80723cb967013f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 24 Jul 2021 11:36:25 -0400 Subject: [PATCH 0326/1522] =?UTF-8?q?goverlay:=200.5.1=20=E2=86=92=200.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/goverlay/default.nix | 4 ++-- pkgs/tools/graphics/goverlay/find-xdg-data-files.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 43d711588f8..2296743694e 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -34,13 +34,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.5.1"; + version = "0.6"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - hash = "sha256-Zl1pq2MeGJsPdNlwUEpov5MHlsr9pSMkWHVprt8ImKs="; + hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 862e4c3903c..51d4dcdc54e 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index 59f6a81..a096543 100644 +index de8725f..005f171 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -4871,7 +4871,7 @@ begin +@@ -5377,7 +5377,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index 59f6a81..a096543 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -4880,7 +4880,7 @@ begin +@@ -5386,7 +5386,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index 59f6a81..a096543 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -4889,7 +4889,7 @@ begin +@@ -5395,7 +5395,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index 59f6a81..a096543 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -4898,7 +4898,7 @@ begin +@@ -5404,7 +5404,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result From 8e8f611d6f8d13a2f2187d345cecdb97bc9b7ba9 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 24 Jul 2021 16:59:36 +0200 Subject: [PATCH 0327/1522] dtc: disable checks for darwin The tests fail on darwin aarch64. https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 Reported-by: Jiuyang Liu (sequencer) --- pkgs/development/compilers/dtc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index ac1acfe4b8f..0050dd44b9a 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PYTHON=python" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; - doCheck = true; + # Checks are broken on aarch64 darwin + # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Device Tree Compiler"; From bc7bddb0dfc43b535551415a1ac038ce0da677fb Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Jul 2021 12:46:09 -0400 Subject: [PATCH 0328/1522] snixembed: init at 0.3.1 --- pkgs/applications/misc/snixembed/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/snixembed/default.nix diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/applications/misc/snixembed/default.nix new file mode 100644 index 00000000000..1a5391b132b --- /dev/null +++ b/pkgs/applications/misc/snixembed/default.nix @@ -0,0 +1,28 @@ +{ fetchFromSourcehut, gtk3, lib, libdbusmenu-gtk3, pkg-config, stdenv, vala }: + +stdenv.mkDerivation rec { + pname = "snixembed"; + version = "0.3.1"; + + src = fetchFromSourcehut { + owner = "~steef"; + repo = pname; + rev = version; + sha256 = "0yy1i4463q43aq98qk4nvvzpw4i6bid2bywwgf6iq545pr3glfj5"; + }; + + nativeBuildInputs = [ pkg-config vala ]; + + buildInputs = [ gtk3 libdbusmenu-gtk3 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"; + homepage = "https://git.sr.ht/~steef/snixembed"; + changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..db87e88860f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26974,6 +26974,8 @@ in sniproxy = callPackage ../applications/networking/sniproxy { }; + snixembed = callPackage ../applications/misc/snixembed { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sops = callPackage ../tools/security/sops { }; From 7212f6bcb4743b17a3d6a46cc5e2e17e3f54ab94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 16:50:56 +0000 Subject: [PATCH 0329/1522] dnsproxy: 0.38.3 -> 0.39.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index ffa2138ffa8..f42294974c2 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; + sha256 = "sha256-rHU07rh8wZPaaxZmXVBu4tpt02Jq7Yu//dwWeVDUpw4="; }; vendorSha256 = null; From 861f36d871ce0354b0e26ee02d2fbda54a787062 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Jul 2021 01:08:10 -0400 Subject: [PATCH 0330/1522] pythonPackages.fastparquet: 0.6.3 -> 0.7.0 --- .../python-modules/fastparquet/default.nix | 4 ++-- .../python-modules/smbprotocol/default.nix | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 155f3b6e829..756d08726c1 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; + hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index 517acd6f9cc..73a43be383b 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , cryptography , fetchFromGitHub @@ -32,6 +33,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/jborean93/smbprotocol/issues/119 + "test_copymode_local_to_local_symlink_dont_follow" + "test_copystat_local_to_local_symlink_dont_follow_fail" + + # fail in sandbox due to networking + "test_small_recv" + "test_recv_" + ]; + pythonImportsCheck = [ "smbprotocol" ]; meta = with lib; { From 0204024d1b135eee8adf80a9047a13351137b6c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 17:05:29 +0000 Subject: [PATCH 0331/1522] earthly: 0.5.18 -> 0.5.20 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index e806b502de8..924e7fc19de 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.18"; + version = "0.5.20"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w="; + sha256 = "sha256-wPtL5fH6s4qlG82udeg9Gv4iNBjDEeKNTDFHPsW4V/A="; }; - vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4="; + vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4="; buildFlagsArray = '' -ldflags= From ec03785094c8d114dac9bdfd96922d8892b4d91d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Jul 2021 17:06:00 +0000 Subject: [PATCH 0332/1522] earthly: update license to bsl11 https://earthly.dev/blog/every-open-core-company-should-be-a-source-available-company/ --- pkgs/development/tools/earthly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 924e7fc19de..ea8296b49f2 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { description = "Build automation for the container era"; homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ mdsp ]; }; } From fd828ac4f5d413c80f24e927d9608788b47b7603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Jul 2021 19:06:48 +0200 Subject: [PATCH 0333/1522] s9fes: cleanup --- pkgs/development/interpreters/s9fes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix index 7423e9f5f48..a05dde8f1f5 100644 --- a/pkgs/development/interpreters/s9fes/default.nix +++ b/pkgs/development/interpreters/s9fes/default.nix @@ -9,14 +9,15 @@ stdenv.mkDerivation rec { version = "20181205"; src = fetchurl { - url = "http://www.t3x.org/s9fes/s9fes-${version}.tgz"; + url = "https://www.t3x.org/s9fes/s9fes-${version}.tgz"; sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o="; }; # Fix cross-compilation postPatch = '' - substituteInPlace Makefile --replace 'ar q' '${stdenv.cc.targetPrefix}ar q' - substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' + substituteInPlace Makefile \ + --replace 'ar q' '${stdenv.cc.targetPrefix}ar q' \ + --replace 'strip' '${stdenv.cc.targetPrefix}strip' ${lib.optionalString isCrossCompiling "substituteInPlace Makefile --replace ./s9 '${buildPackages.s9fes}/bin/s9'"} ''; From 16af37bfca2228c988283c4103492d9617f6b281 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 24 Jul 2021 11:39:20 -0400 Subject: [PATCH 0334/1522] =?UTF-8?q?pythonPackages.debugpy:=201.3.0=20?= =?UTF-8?q?=E2=86=92=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/debugpy/default.nix | 11 ++--------- .../python-modules/debugpy/hardcode-gdb.patch | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3..c29264ff288 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , substituteAll , gdb , flask @@ -18,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; + hash = "sha256-W4hUVHY2TbFgQhM1qIbosvDPORFxsuoJC+xuCzrYIMI="; }; patches = [ @@ -49,12 +48,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Fix tests with flask>=2.0 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/0a7f2cd67dda27ea4d38389b49a4e2a1899b834e.patch"; - sha256 = "1g070fn07n7jj01jaf5s570zn70akf6klkamigs3ix11gh736rpn"; - }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 780cb1aed1c..8b87ec7bda7 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 6d031b4..ecf21f2 100644 +index 51017f2..46654ab 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ From 3786773dff5a1b2500ca5b13122a87f2097b34f3 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 24 Jul 2021 11:39:49 -0400 Subject: [PATCH 0335/1522] =?UTF-8?q?pythonPackages.debugpy:=201.4.0=20?= =?UTF-8?q?=E2=86=92=201.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index c29264ff288..8f59c5fb5a5 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-W4hUVHY2TbFgQhM1qIbosvDPORFxsuoJC+xuCzrYIMI="; + hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; }; patches = [ From 7d24d06c71d3abd72c25caaea86305aa46d44a08 Mon Sep 17 00:00:00 2001 From: Yuka Date: Sat, 24 Jul 2021 19:12:08 +0200 Subject: [PATCH 0336/1522] nixos/postgresql: use postgres 13 for 21.11 (#131018) Co-authored-by: Kim Lindberger --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 5 +++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/databases/postgresql.nix | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3695997f717..cc3b5cbd29e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -32,6 +32,11 @@ from Python 3.8. + + + PostgreSQL now defaults to major version 13. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index cc5b6bf81ee..5c27dba5fe0 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `python3` now defaults to Python 3.9, updated from Python 3.8. +- PostgreSQL now defaults to major version 13. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index effc9182472..fd4a195787f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -293,7 +293,8 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 + mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 + else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); From 5c8561f11aac6250d787b35ba71f80ac1ab80a5c Mon Sep 17 00:00:00 2001 From: Vladimir Korolev Date: Sat, 19 Jan 2019 14:38:55 +0200 Subject: [PATCH 0337/1522] openmodelica: 1.9.3 -> 1.17.0 with lots of changes Co-authored-by: Jaakko Luttinen Most of changes are: * separate packages for different openmodelica components, * qt4 -> qt5, * patches to instruct the OMEdit wrapper with stdenv executables location, * adoption of #89731 and #109595, * openblas -> blas, lapack according to #83888, * parallel building, * getting rid of spurious build phases, * correct the license, * cross-compilation, * forcing compiler to clang++ according to OM build recommendations, * drop of pangox_compat according to #75909 and #76412, * better dependencies, and more. --- .../misc/openmodelica/combined/default.nix | 30 ++++++ .../science/misc/openmodelica/default.nix | 70 +++--------- .../science/misc/openmodelica/fakegit.nix | 81 -------------- .../openmodelica/mkderivation/default.nix | 101 ++++++++++++++++++ .../openmodelica/mkderivation/src-main.nix | 7 ++ .../misc/openmodelica/omcompiler/default.nix | 63 +++++++++++ .../misc/openmodelica/omedit/default.nix | 38 +++++++ .../misc/openmodelica/omlibrary/default.nix | 37 +++++++ .../misc/openmodelica/omlibrary/fakegit.nix | 49 +++++++++ .../misc/openmodelica/omlibrary/src-libs.nix | 83 ++++++++++++++ .../openmodelica/omlibrary/update-src-libs.sh | 39 +++++++ .../openmodelica/omparser/Makefile.in.patch | 22 ++++ .../misc/openmodelica/omparser/default.nix | 28 +++++ .../misc/openmodelica/omplot/default.nix | 34 ++++++ .../misc/openmodelica/omshell/default.nix | 40 +++++++ .../misc/openmodelica/omsimulator/default.nix | 26 +++++ .../misc/openmodelica/src-libs-git.nix | 71 ------------ .../misc/openmodelica/src-libs-svn.nix | 5 - .../science/misc/openmodelica/src-main.nix | 6 -- .../misc/openmodelica/update-src-libs-git.sh | 64 ----------- .../misc/openmodelica/update-src-libs-svn.sh | 50 --------- pkgs/top-level/all-packages.nix | 4 +- 22 files changed, 615 insertions(+), 333 deletions(-) create mode 100644 pkgs/applications/science/misc/openmodelica/combined/default.nix delete mode 100644 pkgs/applications/science/misc/openmodelica/fakegit.nix create mode 100644 pkgs/applications/science/misc/openmodelica/mkderivation/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omcompiler/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omedit/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omlibrary/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix create mode 100755 pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh create mode 100644 pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch create mode 100644 pkgs/applications/science/misc/openmodelica/omparser/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omplot/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omshell/default.nix create mode 100644 pkgs/applications/science/misc/openmodelica/omsimulator/default.nix delete mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-git.nix delete mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-svn.nix delete mode 100644 pkgs/applications/science/misc/openmodelica/src-main.nix delete mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh delete mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix new file mode 100644 index 00000000000..459a325111e --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, openmodelica, symlinkJoin, gnumake, blas, lapack, makeWrapper }: +symlinkJoin { + name = "openmodelica-combined"; + paths = with openmodelica; [ + omcompiler + omsimulator + omplot + omparser + omedit + omlibrary + omshell + ]; + + buildInputs = [ gnumake makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/OMEdit \ + --prefix PATH : ${lib.makeBinPath [ gnumake stdenv.cc ]} \ + --prefix LIBRARY_PATH : "${lib.makeLibraryPath [ blas lapack ]}" \ + --set-default OPENMODELICALIBRARY "${openmodelica.omlibrary}/lib/omlibrary" + ''; + + meta = with lib; { + description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index cab0fa5ff5c..10fccfdf6da 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,53 +1,17 @@ -{lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, -hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, -lp_solve, omniorb, sqlite, libatomic_ops, pkg-config, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: - -let - - fakegit = import ./fakegit.nix { inherit lib stdenv fetchgit fetchsvn bash; }; - -in - -stdenv.mkDerivation { - name = "openmodelica"; - - src = fetchgit (import ./src-main.nix); - - buildInputs = [autoconf cmake automake libtool gfortran clang gnumake - hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which - lp_solve omniorb sqlite libatomic_ops pkg-config file gettext flex bison - doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu - git gtk2 makeWrapper]; - - hardeningDisable = [ "format" ]; - - patchPhase = '' - cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh - cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh - ''; - - configurePhase = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L${gfortran.cc.lib}/lib" - - autoconf - ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out - ''; - - postFixup = '' - for e in $(cd $out/bin && ls); do - wrapProgram $out/bin/$e \ - --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${lib.makeLibraryPath [ lapack blas ]}" - done - ''; - - meta = with lib; { - description = "An open-source Modelica-based modeling and simulation environment"; - homepage = "https://openmodelica.org"; - license = licenses.gpl3; - maintainers = with maintainers; [ smironov ]; - platforms = platforms.linux; - broken = true; - }; -} +{ lib, newScope, libsForQt5, clangStdenv }: +lib.makeScope newScope (self: + let + callPackage = self.newScope { stdenv = clangStdenv; }; + callQtPackage = self.newScope (libsForQt5 // { stdenv = clangStdenv; }); + in + { + mkOpenModelicaDerivation = callPackage ./mkderivation { }; + omcompiler = callPackage ./omcompiler { }; + omplot = callQtPackage ./omplot { }; + omsimulator = callPackage ./omsimulator { }; + omparser = callPackage ./omparser { }; + omedit = callQtPackage ./omedit { }; + omlibrary = callPackage ./omlibrary { }; + omshell = callQtPackage ./omshell { }; + combined = callPackage ./combined { }; + }) diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/pkgs/applications/science/misc/openmodelica/fakegit.nix deleted file mode 100644 index 47cca7c7491..00000000000 --- a/pkgs/applications/science/misc/openmodelica/fakegit.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchgit, fetchsvn, bash }: - -let - mkscript = path : text : '' - mkdir -pv `dirname ${path}` - cat > ${path} <<"EOF" - #!${bash}/bin/bash - ME=`basename ${path}` - ${text} - EOF - sed -i "s@%out@$out@g" ${path} - chmod +x ${path} - ''; - - hashname = r: let - rpl = lib.replaceChars [":" "/"] ["_" "_"]; - in - (rpl r.url) + "-" + (rpl r.rev); - -in - -stdenv.mkDerivation { - name = "fakegit"; - - buildCommand = '' - mkdir -pv $out/repos - ${lib.concatMapStrings - (r : '' - cp -r ${fetchgit r} $out/repos/${hashname r} - '' - ) (import ./src-libs-git.nix) - } - - ${mkscript "$out/bin/checkout-git.sh" '' - if test "$#" -ne 4; then - echo "Usage: $0 DESTINATION URL GITBRANCH HASH" - exit 1 - fi - DEST=$1 - URL=`echo $2 | tr :/ __` - GITBRANCH=$3 - REVISION=$4 - - L=`echo $REVISION | wc -c` - if expr $L '<' 10 >/dev/null; then - REVISION=refs/tags/$REVISION - fi - - REVISION=`echo $REVISION | tr :/ __` - - rm -rf $DEST - mkdir -pv $DEST - echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2 - cp -r %out/repos/$URL-$REVISION/* $DEST - chmod u+w -R $DEST - ''} - - ${lib.concatMapStrings - (r : '' - cp -r ${fetchsvn r} $out/repos/${hashname r} - '' - ) (import ./src-libs-svn.nix) - } - - ${mkscript "$out/bin/checkout-svn.sh" '' - if test "$#" -ne 3; then - echo "Usage: $0 DESTINATION URL REVISION" - exit 1 - fi - DEST=$1 - URL=`echo $2 | tr :/ __` - REVISION=`echo $4 | tr :/ __` - - rm -rf $DEST - mkdir -pv $DEST - echo "FAKE COPY %out/repos/$URL-$REVISION $DEST" - cp -r %out/repos/$URL-$REVISION/* $DEST - chmod u+w -R $DEST - ''} - ''; -} diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix new file mode 100644 index 00000000000..94029fead48 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -0,0 +1,101 @@ +# mkOpenModelicaDerivation is an mkDerivation function for packages +# from OpenModelica suite. + +{ stdenv, lib, fetchgit, autoconf, automake, libtool, cmake, autoreconfHook, symlinkJoin }: +pkg: +let + inherit (builtins) hasAttr getAttr length elemAt; + inherit (lib) attrByPath concatStringsSep; + + + # A few helpers functions: + + # getAttrDef is just a getAttr with default fallback + getAttrDef = attr: default: x: attrByPath [ attr ] default x; + + # getAttr-like helper for optional append to string: + # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world" + # "Hello" + appendByAttr "a" " " {} = "Hello" + appendByAttr = attr: sep: x: if hasAttr attr x then sep + (getAttr attr x) else ""; + + # Are there any OM dependencies at all? + ifDeps = length pkg.omdeps != 0; + + # Dependencies of current OpenModelica-target joined in one file tree. + # Return the dep itself in case it is a single one. + joinedDeps = + if length pkg.omdeps == 1 + then elemAt pkg.omdeps 0 + else + symlinkJoin { + name = pkg.pname + "-omhome"; + paths = pkg.omdeps; + }; + + # Should we run ./configure for the target pkg? + omautoconf = getAttrDef "omautoconf" false pkg; + + # Name of the make target + omtarget = getAttrDef "omtarget" pkg.pname pkg; + + # Directory of target sources + omdir = getAttrDef "omdir" pkg.pname pkg; + + # Simple to to m4 configuration scripts + postPatch = lib.optionalString ifDeps '' + sed -i ''$(find -name omhome.m4) -e 's|if test ! -z "$USINGPRESETBUILDDIR"|if test ! -z "$USINGPRESETBUILDDIR" -a -z "$OMHOME"|' + '' + + appendByAttr "postPatch" "\n" pkg; + + # Update shebangs in the scripts before running configuration. + preAutoreconf = "patchShebangs --build common" + + appendByAttr "preAutoreconf" "\n" pkg; + + # Tell OpenModelica where built dependencies are located. + configureFlags = lib.optional ifDeps "--with-openmodelicahome=${joinedDeps}" ++ + getAttrDef "configureFlags" [ ] pkg; + + # Our own configurePhase that accounts for omautoconf + configurePhase = '' + runHook preConfigure + export configureFlags="''${configureFlags} --with-ombuilddir=$PWD/build --prefix=$prefix" + ./configure --no-recursion $configureFlags + ${lib.optionalString omautoconf "(cd ${omdir}; ./configure $configureFlags)"} + runHook postConfigure + ''; + + # Targets that we want to build ourselves: + deptargets = lib.forEach pkg.omdeps (dep: dep.omtarget); + + # ... so we ask openmodelica makefile to skip those targets. + preBuild = '' + for target in ${concatStringsSep " " deptargets}; do + touch ''${target}.skip; + done + '' + + appendByAttr "preBuild" "\n" pkg; + + makeFlags = "${omtarget}" + + appendByAttr "makeFlags" " " pkg; + + installFlags = "-i " + + appendByAttr "installFlags" " " pkg; + + +in +stdenv.mkDerivation (pkg // { + inherit omtarget postPatch preAutoreconf configureFlags configurePhase preBuild makeFlags installFlags; + + src = fetchgit (import ./src-main.nix); + version = "1.17.0"; + + nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg + ++ [ autoconf automake libtool cmake autoreconfHook ]; + + buildInputs = getAttrDef "buildInputs" [ ] pkg + ++ lib.optional ifDeps joinedDeps; + + dontUseCmakeConfigure = true; + + hardeningDisable = [ "format" ]; +}) diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix new file mode 100644 index 00000000000..c31b23d2f94 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix @@ -0,0 +1,7 @@ +{ + url = "https://github.com/OpenModelica/OpenModelica/"; + rev = "08fd3f9144235f209a4ed7602bfadb32b1823628"; + sha256 = "0clgqk9ilnr43iyl5sdzwfzqpnw9amfy1npdgkpgm1wfnsvz6xrw"; + fetchSubmodules = true; +} +# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.17.0' --fetch-submodules diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix new file mode 100644 index 00000000000..b49c0f0f60c --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, gfortran +, flex +, bison +, jre8 +, blas +, lapack +, curl +, readline +, expat +, pkg-config +, buildPackages +, targetPackages +, libffi +, binutils +, mkOpenModelicaDerivation +}: +let + isCross = stdenv.buildPlatform != stdenv.hostPlatform; + nativeOMCompiler = buildPackages.openmodelica.omcompiler; +in +mkOpenModelicaDerivation ({ + pname = "omcompiler"; + omtarget = "omc"; + omdir = "OMCompiler"; + omdeps = [ ]; + omautoconf = true; + + nativeBuildInputs = [ + jre8 + gfortran + flex + bison + pkg-config + ] ++ lib.optional isCross nativeOMCompiler; + + buildInputs = [ targetPackages.stdenv.cc.cc blas lapack curl readline expat libffi binutils ]; + + postPatch = '' + sed -i -e '/^\s*AR=ar$/ s/ar/${stdenv.cc.targetPrefix}ar/ + /^\s*ar / s/ar /${stdenv.cc.targetPrefix}ar / + /^\s*ranlib/ s/ranlib /${stdenv.cc.targetPrefix}ranlib /' \ + $(find ./OMCompiler -name 'Makefile*') + ''; + + preFixup = '' + for entry in $(find $out -name libipopt.so); do + patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store $entry + patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" $entry + done + ''; + + meta = with lib; { + description = "Modelica compiler from OpenModelica suite"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} // lib.optionalAttrs isCross { + configureFlags = [ "--with-omc=${nativeOMCompiler}/bin/omc" ]; +}) diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix new file mode 100644 index 00000000000..b0cc530ba37 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omedit/default.nix @@ -0,0 +1,38 @@ +{ lib +, jre8 +, qmake +, qtbase +, qttools +, qtwebkit +, qtxmlpatterns +, binutils +, wrapQtAppsHook +, openmodelica +, mkOpenModelicaDerivation +}: +with openmodelica; +mkOpenModelicaDerivation rec { + pname = "omedit"; + omdir = "OMEdit"; + omdeps = [ omcompiler omplot omparser omsimulator ]; + omautoconf = true; + + nativeBuildInputs = [ jre8 qmake qtbase qttools wrapQtAppsHook ]; + + buildInputs = [ qtwebkit qtxmlpatterns binutils ]; + + postPatch = '' + sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|' + ''; + + dontUseQmakeConfigure = true; + QMAKESPEC = "linux-clang"; + + meta = with lib; { + description = "A Modelica connection editor for OpenModelica"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix new file mode 100644 index 00000000000..006daf18812 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchgit +, bash +, pkg-config +, jre8 +, libuuid +, openmodelica +, mkOpenModelicaDerivation +}: +let + fakegit = import ./fakegit.nix { inherit lib stdenv fetchgit bash; }; +in +mkOpenModelicaDerivation { + pname = "omlibrary"; + omdir = "libraries"; + omtarget = "omlibrary-all"; + omdeps = [ openmodelica.omcompiler ]; + + postPatch = '' + patchShebangs --build libraries + cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh + + # The EMOTH library is broken in OpenModelica 1.17.0 + # Let's remove it from targets. + sed -i -e '/^OTHER_LIBS=/ s/EMOTH //' libraries/Makefile.libs + ''; + + meta = with lib; { + description = "A collection of Modelica libraries to use with OpenModelica, +including Modelica Standard Library"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix new file mode 100644 index 00000000000..fdbc79aae59 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchgit, bash }: +let + mkscript = path: text: '' + mkdir -pv `dirname ${path}` + cat > ${path} <<"EOF" + #!${bash}/bin/bash + ME=$(basename ${path}) + ${text} + EOF + sed -i "s@%out@$out@g" ${path} + chmod +x ${path} + ''; + + hashname = r: + let + rpl = lib.replaceChars [ ":" "/" ] [ "_" "_" ]; + in + (rpl r.url) + "-" + (rpl r.rev); + +in +stdenv.mkDerivation { + name = "fakegit"; + + buildCommand = '' + mkdir -pv $out/repos + ${lib.concatMapStrings + (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") + (import ./src-libs.nix)} + + ${mkscript "$out/bin/checkout-git.sh" '' + if test "$#" -ne 4; then + echo "Usage: $0 DESTINATION URL GITBRANCH HASH" + exit 1 + fi + DEST=$1 + URL=`echo $2 | tr :/ __` + GITBRANCH=$3 + REVISION=$4 + + REVISION=`echo $REVISION | tr :/ __` + + rm -rf $DEST + mkdir -pv $DEST + echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2 + cp -r %out/repos/$URL-$REVISION/* $DEST + chmod u+w -R $DEST + ''} + ''; +} diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix new file mode 100644 index 00000000000..c91addf7804 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix @@ -0,0 +1,83 @@ +[ + { url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; } + { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "b00e01d911e2e54e148f24e36ee387a8b457d89c"; sha256 = "1sljddxkx208nill0975sz9b1xd701n97aia4wxihr140dgs4dgb"; fetchSubmodules = true; } + { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; } + { url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "c2f564ae284726a2df6252a8561856691681572b"; sha256 = "01c2i2rlry7b4a6f2skkvzphcrfg5a2waxv4i7zgx5q275fg06i1"; fetchSubmodules = true; } + { url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "1e07bb475b921a4eedc6155c5310d1f9f3ef7550"; sha256 = "1xg831vqh6zw88cxxcb3sjgz44l7ygsgxddl05fp6xvz5sjpfcna"; fetchSubmodules = true; } + { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; } + { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; } + { url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; } + # A broken one. The revision is lost. + # { url = "https://github.com/AHaumer/EMOTH.git"; rev = "fa890c8c2781f0c0b2f8efe955ed8a27875dd9ac"; sha256 = ""; fetchSubmodules = true; } + { url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; } + { url = "https://github.com/modelica/ExternalMedia.git"; rev = "159518edd538b64e28cd70983a9cc47730323cc4"; sha256 = "0qjd5fk65bln3s1jhs0cqcv54c22m6x2akbmxj09y4x0lkd1kgqn"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; } + { url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; } + { url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; } + { url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; } + { url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; } + { url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; } + { url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; } + { url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; } + { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "614a148f61c1ab5d6788d8c11197803132ec7c2f"; sha256 = "0fg0pbahybx3srv5npk8pw49k23kaw2ns6c00f15iy93mvfrmfsk"; fetchSubmodules = true; } + { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "34fe8cf3c7127ae09ca5f41e26b48fb6044e1e34"; sha256 = "0yz82k9dsp9d1jxqgxcm27fw1jz718km43qfginmgg0m9kfh2336"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; } + { url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; } + { url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; } + { url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; } + { url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; } + { url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; } + { url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; } + { url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; } + { url = "https://github.com/lochel/PNlib.git"; rev = "ab9b6b8527c0c78140365e7b105ae469d4954a64"; sha256 = "0y7bfbnvzv9bnz4v8wvmy42dji3cqpy5b2fmd2jj0rhlzs1infzh"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; } + { url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; } + { url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; } + { url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; } + { url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; } + { url = "https://github.com/modelica/PowerSystems.git"; rev = "7369976265a9d7b62097340aba5e463c62cc5061"; sha256 = "1f0h148v2g057l6ixf646d8ymsx1jzqn14xlram8h62la2k6nmvw"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; } + { url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; } + { url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "d80fc335d1fa5d1628c45c2e73204bcb8a614b21"; sha256 = "18d8cqlh0ic2yfcxzkz0ar9z19486z9x4sc7c9mpggxib28p39aa"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; } + { url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; } + { url = "https://github.com/casella/ThermoPower.git"; rev = "82d21eba0d330005899dd50a6a0ceb7d09c4caeb"; sha256 = "0n83b40hjisy7lpnbz692947d2q3hw5hk4rak7fg0w5dbm4i719p"; fetchSubmodules = true; } + { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; } + { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; } + { url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; } + { url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; } + { url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; } + { url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; } +] diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh b/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh new file mode 100755 index 00000000000..b8f2e95923b --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash + +CWD=$PWD + +chko() { + ( + T=`mktemp -d` + trap "rm -rf $T" EXIT INT PIPE + cd $T + cat >check.nix < {}; +fetchgit `cat $CWD/../mkderivation/src-main.nix` +EOF + nix-build check.nix + cat result/libraries/Makefile.libs + ) +} + +getsha256() { + URL=$(echo "$1" | sed 's/^"\(.*\)"$/\1/') + REV=$(echo "$2" | sed 's/^"\(.*\)"$/\1/') + SHA=$(nix run nixpkgs.nix-prefetch-git -c nix-prefetch-git --fetch-submodules "$URL" "$REV" 2>/dev/null | sed -n 's/.*"sha256": "\(.*\)",/\1/g p') + echo "{ url = $1; rev = $2; sha256 = \"$SHA\"; fetchSubmodules = true; }" +} + +OUT=src-libs.nix + +echo '[' > $OUT + +chko | +grep checkout-git.sh | +tr \' \" | +while read NM TGT URL BR REV ; do + echo Trying $TGT $URL $REV >&2 + getsha256 $URL $REV >> $OUT || exit 1 +done + +echo ']' >> $OUT diff --git a/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch b/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch new file mode 100644 index 00000000000..a8f04203a8c --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch @@ -0,0 +1,22 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -23,7 +23,7 @@ + omedit-testsuite: omedit-testsuite.skip + omedit-testsuite.skip: omedit.skip testsuite-depends + $(MAKE) -f $(defaultMakefileTarget) -C OMEdit/Testsuite +-omparser: omparser.skip ++omparser: build-dirs omparser.skip + omparser.skip: + test -f $@ || $(MAKE) -C OMParser OMBUILDDIR=@OMBUILDDIR@ "host_short=@host_short@" CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" + omsimulator: omsimulator.skip +@@ -134,6 +134,10 @@ + INSTALL_JAVADIR = ${DESTDIR}${datadir}/omc/java + INSTALL_LOCALEDIR = ${DESTDIR}${datadir}/locale + ++build-dirs: ++ mkdir -p "@OMBUILDDIR@"/lib/@host_short@/omc ++ mkdir -p "@OMBUILDDIR@"/include/omc ++ + install-dirs: + @test ! "${DESTDIR}/@prefix@" -ef "@OMBUILDDIR@" || (echo Error: Install and build dirs are the same && false) + if [ "@APP@" = ".app" ]; then mkdir -p ${INSTALL_APPDIR}; fi diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix new file mode 100644 index 00000000000..fcf5acd29ee --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omparser/default.nix @@ -0,0 +1,28 @@ +{ lib +, pkg-config +, jre8 +, libuuid +, openmodelica +, mkOpenModelicaDerivation +}: + +mkOpenModelicaDerivation rec { + pname = "omparser"; + omdir = "OMParser"; + omdeps = [ openmodelica.omcompiler ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ jre8 libuuid ]; + + patches = [ ./Makefile.in.patch ]; + + meta = with lib; { + description = "An antlr4-based parser of Modelica files from OpenModelica +suite"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/omplot/default.nix b/pkgs/applications/science/misc/openmodelica/omplot/default.nix new file mode 100644 index 00000000000..7edc4b6efb2 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omplot/default.nix @@ -0,0 +1,34 @@ +{ lib +, qtbase +, qttools +, qmake +, wrapQtAppsHook +, openmodelica +, mkOpenModelicaDerivation +}: + +mkOpenModelicaDerivation rec { + pname = "omplot"; + omdir = "OMPlot"; + omdeps = [ openmodelica.omcompiler ]; + omautoconf = true; + + nativeBuildInputs = [ qtbase qttools qmake wrapQtAppsHook ]; + + postPatch = '' + sed -i OMPlot/Makefile.in -e 's|bindir = @includedir@|includedir = @includedir@|' + sed -i OMPlot/OMPlot/OMPlotGUI/*.pro -e '/INCLUDEPATH +=/s|$| ../../qwt/src|' + sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|' + ''; + + dontUseQmakeConfigure = true; + QMAKESPEC = "linux-clang"; + + meta = with lib; { + description = "Plotting tool for OpenModelica-generated results files"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/omshell/default.nix b/pkgs/applications/science/misc/openmodelica/omshell/default.nix new file mode 100644 index 00000000000..2f8c5203c07 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omshell/default.nix @@ -0,0 +1,40 @@ +{ lib, qttools, qmake, qtwebkit, wrapQtAppsHook, readline, openmodelica, mkOpenModelicaDerivation }: + +mkOpenModelicaDerivation rec { + pname = "omshell"; + omdir = "OMShell"; + omdeps = [ openmodelica.omcompiler ]; + omautoconf = true; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + buildInputs = [ readline qtwebkit ]; + + postPatch = with openmodelica; '' + sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|' + sed -i OMShell/OMShell/OMShellGUI/*.pro -e ' + s|\$\$\[QT_INSTALL_BINS\]/lrelease|${lib.getDev qttools}/bin/lrelease| + /^\s*OMCLIBS =/ s|\$\$(OMBUILDDIR)|${omcompiler}| + /^\s*OMCINC =/ s|\$\$(OMBUILDDIR)|${omcompiler}| + ' + sed -i OMShell/OMShell/OMShellGUI/OMShell.config.in -e ' + s|@OMBUILDDIR@|${omcompiler}| + s|@OPENMODELICAHOME@|${omcompiler}| + ' + sed -i OMShell/mosh/src/Makefile.in -e ' + /^CFLAGS =/ s|-I../../../build|-I${omcompiler}| + /^LIBS =/ s|-L@OMBUILDDIR@|-L${omcompiler}| + ' + ''; + + dontUseQmakeConfigure = true; + QMAKESPEC = "linux-clang"; + + meta = with lib; { + description = "Interactive OpenModelica session shell"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix new file mode 100644 index 00000000000..448cdee6c26 --- /dev/null +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -0,0 +1,26 @@ +{ lib +, pkg-config +, boost +, readline +, libxml2 +, openmodelica +, mkOpenModelicaDerivation +}: + +mkOpenModelicaDerivation rec { + pname = "omsimulator"; + omdir = "OMSimulator"; + omdeps = [ openmodelica.omcompiler ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ readline libxml2 boost ]; + + meta = with lib; { + description = "The OpenModelica FMI & SSP-based co-simulation environment"; + homepage = "https://openmodelica.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix b/pkgs/applications/science/misc/openmodelica/src-libs-git.nix deleted file mode 100644 index aae5ab321fb..00000000000 --- a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix +++ /dev/null @@ -1,71 +0,0 @@ -[ -{ url = "https://github.com/modelica-3rdparty/ADGenKinetics.git"; rev = "42428db6e84bcde28543a3bba9bccee581309bb1"; sha256="14l005jwj1wz35gq8xlbzfz0bpsx99rs4q3dxkfh76yhnv1jh9h3"; } -{ url = "https://github.com/modelica-3rdparty/ADMSL.git"; rev = "ed0305603f86b46d9af03e7d37dcb8b6704915b4"; sha256="15b0nqxyh8444az56ydjn594jikdl1ina5wamabk3nzm1yx218cl"; } -{ url = "https://github.com/iea-annex60/modelica-annex60.git"; rev = "8015a01591bb24d219f57e7b69cdfcde66e39b47"; sha256="05k4pa007a6p628fq1xac0cfv8g8dnpy2bgy8h99rqpmlaa072z7"; } -{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "b5f3cb999f3cfad2bbb6fb429b496f61ecf2f628"; sha256="1l52dg888vwx4668spn59hqvfkpl9g06g8n2cdxiap7lvsyh6w9x"; } -{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256="1i9cmiy1ya04h2ld0gy0x2gvdrfksl66fmcrgdm1vpsnbb6pviv9"; } -{ url = "https://github.com/modelica-3rdparty/BondLib.git"; rev = "df7a40fe612617da22e27d39edfa4b27d65f23d0"; sha256="005djwxd568zyk3ndss9hv165dci9x0dgjmcdjhnqmsap3w83hlz"; } -{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "fed013cdeec0fb9552964376b575a8e3635539ab"; sha256="020hm2q65d5iv3h8b3lhgl6j930vi2pbh4lvxv3b3k7i9z02q43a"; } -{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "ef89361cc8673b077b9221efbf78aa63b4d7babd"; sha256="04gclknhl2f5z7w9fsbhwawisd0ibmvwpplx0siqwzvjx7nsmdg4"; } -{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "444aa231f423b8d04225bf8672e3212d089fbfe4"; sha256="0q754mlkwqj0jcqsmxksvcz4ak2i86f9s41fhffh5jvra27cvq01"; } -{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "aa2642608e587ddb6897e8c3ffabb3aa099510bd"; sha256="0y46spcb6rw0jpj4v20nlw8xlvi5kypij46f1msvwgr7dfgy4gl4"; } -{ url = "https://github.com/modelica-3rdparty/ComplexLib.git"; rev = "0b78942ee4fa95ae71347a0d552dd869fdf4c708"; sha256="18llf5ccrq3b0f4cjznfycskwf78pik8370xv45w9gb51gamszrn"; } -{ url = "https://github.com/lochel/ConPNlib.git"; rev = "bbf6e9711665d55e5a8cf2f7235fa013c2315104"; sha256="0g3ll44sn2ff14qxwdyakw9h5b8b7vzabxp8cb8km16wcdqzgcxx"; } -{ url = "https://github.com/modelica-3rdparty/DESLib.git"; rev = "7a473d8d16b118c3ea05761c6f43b17fd9838e4e"; sha256="19f2121n8rdc9svcjk8irivsd9wqcb9ai9jx72s2r85fkbvm8jc3"; } -{ url = "https://github.com/modelica-3rdparty/ExtendedPetriNets.git"; rev = "2f4eac0651c1ab0ed56b75ec61424e0ef15181d3"; sha256="0wwj756pg33qwb90ycbfkrk5xsiwsbrqvq3i16i4pisi21vl6jk9"; } -{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "396164fa708cc7c7e64da55ac0b3cba23939f790"; sha256="09052qmv91a9wawsl93b5b3q47awrxhnsbb9mrv39kpnwygfh7dq"; } -{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "1b77869b31dc3509defeccb1236db4b05d2f6f5b"; sha256="05sszn4bn8r78syydyjq8csn9xv4az56mm9lrarqykqdh78pvlqp"; } -{ url = "https://github.com/kdavies4/FCSys.git"; rev = "cb4b17f34313b9d8f2d4223d5365684b4dc1ab65"; sha256="114p7ja6b3fwlkvkkjhbx78fxc7v4af2sbs783hkdga86m1v4ib6"; } -{ url = "https://github.com/modelica-3rdparty/FastBuildings.git"; rev = "1f5cfebc2f42c13e272bff639ffa3449d5740bf7"; sha256="0sry1n2pliddz0pjv8dp899fx98f16n1arc8zvq36k5grvi52fby"; } -{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "10c226b7e5b2af901b356ac437c90d6616a6e9a4"; sha256="0a9j18qjwigq11nghl97syxa9bscs1aj6vwpkldh50csnj5h6g2s"; } -{ url = "https://github.com/modelica-3rdparty/FuzzyControl.git"; rev = "19ff67ff129a440482cc85f216f287b05ea6ec0d"; sha256="0ijcqns7pijsavijn4wlrdsz64k5ks626sly7r28wvrk9af2m2cx"; } -{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "e54fcd0e436d65c85de6c6b935983e363cdc9f6c"; sha256="05afh0379fx4mjjn7jb8j5p4am6qi62hjxvasb38b6fcp9rnysn4"; } -{ url = "https://github.com/modelica-3rdparty/IdealizedContact.git"; rev = "8ebac550d913f6d2b3af4d1aea5044e72c7eb6b0"; sha256="03gh2a7hf44clshwkiyz786w847hmyr3bicdqd9969fbirgcqn6m"; } -{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "6a2414307d5998c6d081efe803c2b575a532b3ba"; sha256="09la9h07x8bkh7zhrwykgj1467qdryjvxhvnnm8qvsim0dl9inc4"; } -{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "1e91a5dcaa662cd30c5b09a9d0267289703f933b"; sha256="12094fqmwi65h0mc65b96krbj6b8dgn6jiww3fnv6khglb21kwvd"; } -{ url = "https://github.com/modelica/Modelica.git"; rev = "refs/tags/v1.6"; sha256="106w83ylgbxf63wr7p9z5q8vqz2qcsaw0zwaad7d3saq6rdbj30c"; } -{ url = "https://github.com/modelica/Modelica.git"; rev = "d442bcd461b8db9873e33b6141bdbd37bcff9de8"; sha256="1icnd0fxix5khnsvdhy7kmzn6lnqkggbvfrbln98a2h5zqd6s32w"; } -{ url = "https://github.com/modelica/Modelica.git"; rev = "af2a3e1597d648d6826665c89cf9eaf5c2a632bc"; sha256="0ryk0iwakdazhsjqvan41w6f9bvgl329zkqchcdg6nkidiigziwh"; } -{ url = "https://github.com/modelica/Modelica.git"; rev = "48943d87db45a6c312b5a5789d384acde44a934b"; sha256="1hi2vkpmx734baa9m1lqzallcykhh3snd68r387gndiv96f6zx3n"; } -{ url = "https://github.com/modelica/Modelica.git"; rev = "164af873cc5955c50f9592a7d2f3c155f703849c"; sha256="071svqwd72sy85sngbg5r22ab693c0gw2xx29gk1sqrk2nchmvia"; } -{ url = "https://github.com/OpenModelica/modelica3d.git"; rev = "daf5669b03ad33fc6999671d1c0e7521134a282b"; sha256="1scs6v2cp2r4jz4diszwbqf9kvzf49pid50dmpsz0gfhx06j9y2v"; } -{ url = "https://github.com/modelica-deprecated/ModelicaAdditions.git"; rev = "568db43766186826b880f9d4bfafeff25cc2c4ab"; sha256="1py5i3afxdvz1dmxxwb2mqj8kyzdhg4jnnqwl8h50akizg4i49pl"; } -{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "0e670cfae4db653bd34ea777d6b56423e9be2c9f"; sha256="0lxh08w6nii4p5yk7c0xmfi5y4xkjkzz4hirr3kqdhdfybcwq824"; } -{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "ca5092c14bb7af4507a10700ee49181a3a3ee199"; sha256="12ja6dhwlbq412kxjdviypgchipxpsg8l0sf6r17g6lbsi19i2b6"; } -{ url = "https://github.com/modelica-3rdparty/ModelicaDEVS.git"; rev = "a987aa9552fbbe71b2ee2e8c28958f9d213087ae"; sha256="0qcw7vw28xadim0h8kr2km09d8vdj05ibdpzcnpny9n43pm9s5hx"; } -{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "db912ba7e1317b8f6a776ccf9a19f69c77a9c477"; sha256="052h2lr7xgfag5fks19wbldqmb985kxlc5fzysl7c9w3fnijp0ml"; } -{ url = "https://github.com/modelica/Modelica_EnergyStorages.git"; rev = "9f057365232364e31a31a8e525f96284b98c7de3"; sha256="195m5b3z8qgg9kih9zsdx1h8zgrm37q63890r59akka05a97j48h"; } -{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "18916fdc485285baab12481701b53d4eb606a3f1"; sha256="0fhvdwcgk8q3z1a98l2bxv8a6dysrs4ll6xfyzpni7yq8gp4mg4q"; } -{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "d0f5ee57bc7b639738e88026674a87343b33dbe1"; sha256="0l75v4d0fgf07ify0h3skh4y9pfw9gxh9hbj1lbsdgglmzlrcvbg"; } -{ url = "https://github.com/modelica-3rdparty/MotorcycleDynamics.git"; rev = "2be2667f9936d88ffb9b8a8246c5af9ccb0b307f"; sha256="0jazwmpqpyhhgs9qdn9drmplgp2yjs0ky7wll5x9929dkgy80m6x"; } -{ url = "https://github.com/modelica-3rdparty/NCLib.git"; rev = "ed3d72f176ac6b7031ce73be9d80101141e74a69"; sha256="1pbpv8w1lsa9vdwp7qbih8iim91ms22b01wz376b548d0x2r95la"; } -{ url = "https://github.com/modelica-3rdparty/NeuralNetwork.git"; rev = "c44e4d1fe97fd4f86dafcd05ad3713692e3f1806"; sha256="0s1v8k71zq1s9gjlvi3zr23nwfknp4x17cxm64a0y3vsi3kahj2s"; } -{ url = "https://github.com/DLR-SR/Noise.git"; rev = "9b57476845539e56769cf76ea0fe7bf3c7eb5d11"; sha256="0icrb63f6dm4gww2nyby9i7s7qxvhvialp36xzcgmi7nlq7crjr2"; } -{ url = "https://github.com/modelica-3rdparty/ObjectStab.git"; rev = "2a723e0b223af50f4ffdd62f8ac901e0f87b9323"; sha256="1b6zi27slzzfbkmbcqxygsn5i5w0zkq0hfrfb72vf7mbgz07j19j"; } -{ url = "https://github.com/cparedis/OpenHydraulics.git"; rev = "d3173d1f06f7d14c9d7c41769f143617ff03a3ad"; sha256="1hn5rcnmzcbiaqdnxfn02wddmrpj9bcdi9p680f31hbh3vb0i3r6"; } -{ url = "https://github.com/lochel/PNlib.git"; rev = "44c7d277980b7a88b449b72edec0a56416b40fa9"; sha256="026wdhbxnzarmj8gw0as70vj8f1gwc51z38hjqpswxkl0xd6mfvp"; } -{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "49d59060f6e5b4cb68560c6d7467e84ea4318056"; sha256="0klqs2axjm3s780sq4plq4wmbf9mszz2jmq9fprgxy9pw7iszbhc"; } -{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "d998a1b27355e83d2ff4849d71281a919a3234aa"; sha256="0vyq6mninn38wy2d60rk753xbkfqim2y6y31py7kq2mm170jfqf4"; } -{ url = "https://github.com/modelica/PowerSystems.git"; rev = "7b551888089277a0dd979db636d47aba0279e8f0"; sha256="0y13f1nllc7riksnly25wmmp6mc30c1b48dbq2lr1nag6yg3blwm"; } -{ url = "https://github.com/modelica/PowerSystems.git"; rev = "3abd48aa53bbcd3f3e2ddfa2371680febf8baf48"; sha256="1nr2nbpaxywk8cpwnk9rr2zr87mm2gb9b4plqipjdlrrkjlk9fka"; } -{ url = "https://github.com/modelica-3rdparty/PraxisSimulationstechnik.git"; rev = "f7db177786f84033f3a50b7474988b190a1dfb46"; sha256="08bdm7k7w35kg9gkrvcn382zkwf5h3iwkkx60d5fj64j5d5klray"; } -{ url = "https://github.com/modelica-3rdparty/QCalc.git"; rev = "af6c34dda691a9bdf7ca1de10650974b2d5cecf5"; sha256="0p0zhl27cnr492byrzib0dyn7zp5yb7wcr0spv10ngm6j90cij6y"; } -{ url = "https://github.com/modelica-3rdparty/QSSFluidFlow.git"; rev = "d84a2c107132f2cd47ea3c3751238d69e4b1f64b"; sha256="02cdvv33pi0qlmg8n401s4cxf59l9b4ff4ixf7gwn4w4n1y9bw0g"; } -{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "655ac1a22aa6deb04ea8e3869dd0aa9fb9540754"; sha256="19crf8pl9vpqq3pq1rhcbl49kkmnm4jrzpwrpqp8qc6dj8096za4"; } -{ url = "https://github.com/modelica-3rdparty/ScalableTestSuite.git"; rev = "c6319908d45ac97ffb10e96cd42654bce36ffb97"; sha256="1g79d88bfmzcqvaghyyj86ajs38v0qnmjxbj8d53yp6nmgnaasx5"; } -{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "22e1874ef9ad46156617817c67a4fb1238621bf5"; sha256="0nwb7apayk7ba9iv27yv67wi4b934dy57kkvn0acxy393jhd8jqd"; } -{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "73a3bfc6d2ddd72165bb0f3e7e9df48b643a5ed0"; sha256="0mvrkpkmr0bx2cvsb23syg7cs8k6a15vjf4n1hivdcigq4x8g2nc"; } -{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "5ef2e38b64ff481801c0db19d52f0bef21f85f77"; sha256="1llnpl2x1g28gari1rk34hdnnwf7a4fwwxlf7i18d8bl1vsrfaja"; } -{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "2bd9e367baaa8d44946897c3c3a32a4050ad2a2a"; sha256="1shm9blpn9m87ci6wwkinpmihr1fik9j0a0pj2nxy0cjrr2jzbn4"; } -{ url = "https://github.com/modelica-3rdparty/Spot.git"; rev = "2f74417f1681570900a1ed373dcbe4b42634ec7b"; sha256="0k5h2k6x98zvvsafpw7y16xs9d6lxz0csa0mlm4wwggaywadn255"; } -{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "c58a26dc3e62a50e64fd336dc4aa499b2d5ad314"; sha256="0ra3a2vgqmry92kmm060gfa41mrpkgbs4swzl78ih3icawfzjz8q"; } -{ url = "https://github.com/modelica-3rdparty/ThermoPower.git"; rev = "e012268625dd1645fe5570cf31d64129d83a8192"; sha256="1rlkli48kc9hnkplgb0bjkb6ajn7agiw4yh9l5sfvlv7k7k2gc8l"; } -{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "d4f9c3ed35f7520f82439eb6e9f4057ae0f82b73"; sha256="0hxbn26g479qkr6rrglx9ljdxnpzd5ll1sf2v08skghrdjjb8jcx"; } -{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "51e7ea2d2e121ee640e7897335c294923f8eaeb0"; sha256="0l11mzjkaxndsqrnnr0z7qvk08svv229119qkm81yb53ich9wnyw"; } -{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "ad956a35643d53e207ee126d67ea1f3f38337a39"; sha256="0g90cqwjpi06gn7vca5kqnz56im76s2hrdqjhsj2bl43rza8mhr0"; } -{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "90ff44ac791ba5ed98444c8597efbd2a2af01cad"; sha256="1icrn0y389rhxmf6i0mnsfgw9v9j5innpkz3q069rfm2ji268b12"; } -{ url = "https://github.com/xogeny/XogenyTest.git"; rev = "9b98981e8ff0f440dd319d1a806e1fd2f0ab3436"; sha256="18glaxrlxfml26w7ljlf0yj3ah1fnhpbg01py28nplsgnrfwfwqj"; } -{ url = "https://github.com/modelica-3rdparty/msgpack-modelica.git"; rev = "6ce2ca600c4902038c0f20b43ed442f1ee204310"; sha256="01x5a9y11yf62sc0j2y49yxwm24imj2lfl3z5mwvi9038gwn0lkx"; } -{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "3d2cc8272abfbc4b667d8868f851bf3e11c6f00e"; sha256="194810a4rn0flxgirrlnxsbxarnm97309dkp1w7nva9zv1q3wj7h"; } -{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "7817cd703b88fc1f433269d32c31e75eb50a21c6"; sha256="1plkxkx51f9yi99ysarmx2ymldizvyr0m66k996y5lj5h81jv8a8"; } -] diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix b/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix deleted file mode 100644 index 244da64fb4e..00000000000 --- a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix +++ /dev/null @@ -1,5 +0,0 @@ -[ -{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/InstantaneousSymmetricalComponents"; rev = "7978"; sha256="0f100c7bz4ai3ryhpkbbszw8z6mykvg40p03ic92n2qq58wjk37z"; } -{ url = "https://svn.modelica.org/projects/Modelica_EmbeddedSystems/trunk/Modelica_StateGraph2"; rev = "8121"; sha256="1cys57nc1yzkr5admc139qs5pa48rj3g69pb3j3s9xcmpd483hzp"; } -{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/Modelica_PowerFlow/trunk"; rev = "3174"; sha256="0yviw1b8psn8vfyl4q1naylak3lcqi2q1bqplqg3gg9iw4aiymxl"; } -] diff --git a/pkgs/applications/science/misc/openmodelica/src-main.nix b/pkgs/applications/science/misc/openmodelica/src-main.nix deleted file mode 100644 index 99e82259bfe..00000000000 --- a/pkgs/applications/science/misc/openmodelica/src-main.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - url = "https://openmodelica.org/git-readonly/OpenModelica.git"; - fetchSubmodules = true; - rev = "8c5d48eb31a638d5220621b20377bfe6f9e9535e"; - sha256 = "0i5cznkh4wwayjqms14f3phizqm493nrr1yjgs9747nfw7vnwsff"; -} diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh deleted file mode 100755 index 481a8979641..00000000000 --- a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -CWD=`pwd` - -chko() { ( -T=`mktemp -d` -trap "rm -rf $T" EXIT INT PIPE -cd $T -cat >check.nix < {}; -fetchgit `cat $CWD/src-main.nix` -EOF -nix-build check.nix -cat result/libraries/Makefile.libs -) } - -getsha256() { ( -T=`mktemp -d` -trap "rm -rf $T" EXIT INT PIPE -cd $T - -L=`echo $2 | wc -c` -if expr $L '<' 10 >/dev/null; then -T=`echo $2 | sed 's@"\(.*\)"@"refs/tags/\1"@'` -cat >check.nix < {}; -fetchgit { - url = $1; - rev = $T; - sha256 = "0000000000000000000000000000000000000000000000000000"; -} -EOF -SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'` -echo "{ url = $1; rev = $T; sha256=\"$SHA\"; }" -else -cat >check.nix < {}; -fetchgit { - url = $1; - rev = $2; - sha256 = "0000000000000000000000000000000000000000000000000000"; -} -EOF -SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'` -echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }" -fi - -# nix-build check.nix -) } - -OUT=src-libs-git.nix - -echo '[' > $OUT - -chko | -grep checkout-git.sh | -tr \' \" | -while read NM TGT URL BR REV ; do - echo Trying $TGT $URL $REV >&2 - getsha256 $URL $REV >> $OUT || exit 1 -done - -echo ']' >> $OUT - diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh deleted file mode 100755 index 972bc7d61f1..00000000000 --- a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -CWD=`pwd` - -chko() { ( -T=`mktemp -d` -trap "rm -rf $T" EXIT INT PIPE -cd $T -cat >check.nix < {}; -fetchgit `cat $CWD/src-main.nix` -EOF -nix-build check.nix -cat result/libraries/Makefile.libs -) } - -getsha256() { ( -T=`mktemp -d` -trap "rm -rf $T" EXIT INT PIPE -cd $T - -L=`echo $2 | wc -c` -cat >check.nix < {}; -fetchsvn { - url = $1; - rev = $2; - sha256 = "0000000000000000000000000000000000000000000000000000"; -} -EOF -SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'` -echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }" - -# nix-build check.nix -) } - -OUT=src-libs-svn.nix - -echo '[' > $OUT - -chko | -grep checkout-svn.sh | -tr \' \" | -while read NM TGT URL REV ; do - echo Trying $TGT $URL $REV >&2 - getsha256 $URL $REV >> $OUT || exit 1 -done - -echo ']' >> $OUT - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d64dcc5f176..50f5dffecaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,9 +7887,7 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); qarte = libsForQt5.callPackage ../applications/video/qarte { }; From b98b88fa49b405cfd75bfb95020867b1e0cb3958 Mon Sep 17 00:00:00 2001 From: urlordjames Date: Sat, 24 Jul 2021 11:46:31 -0400 Subject: [PATCH 0338/1522] drogon: cleanup --- pkgs/development/libraries/drogon/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 01b4bf16ff0..2b418ee4c6a 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib -# miscellaneous -, brotli, c-ares -# databases +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib +# optional but of negligible size +, openssl, brotli, c-ares +# optional databases , sqliteSupport ? true, sqlite , postgresSupport ? false, postgresql , redisSupport ? false, hiredis @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "1.7.1"; src = fetchFromGitHub { - owner = "an-tao"; + owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresSupport postgresql ++ lib.optional redisSupport hiredis - # drogon uses mariadb for mysql (see https://github.com/an-tao/drogon/wiki/ENG-02-Installation#Library-Dependencies) + # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies) ++ lib.optional mysqlSupport [ libmysqlclient mariadb ]; patches = [ @@ -48,17 +48,16 @@ stdenv.mkDerivation rec { # modifying PATH here makes drogon_ctl visible to the test installCheckPhase = '' cd .. - patchShebangs test.sh - PATH=$PATH:$out/bin ./test.sh + PATH=$PATH:$out/bin bash test.sh ''; doInstallCheck = true; meta = with lib; { - homepage = "https://github.com/an-tao/drogon"; + homepage = "https://github.com/drogonframework/drogon"; description = "C++14/17 based HTTP web application framework"; license = licenses.mit; - maintainers = [ maintainers.urlordjames ]; + maintainers = with maintainers; [ urlordjames ]; platforms = platforms.all; }; } From 3d3b37129968e8ac697e893f4627c66b15bddf78 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 19:41:28 +0200 Subject: [PATCH 0339/1522] ocamlPackages.ca-certs-nss: 3.64.0.1 -> 3.66 https://github.com/mirage/ca-certs-nss/releases/tag/v3.66 --- pkgs/development/ocaml-modules/ca-certs-nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 5e6691a9feb..31dea9201bb 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -16,13 +16,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.64.0.1"; + version = "3.66"; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz"; - sha256 = "909c64076491647471f785527bfdd9a886a34504edabf88542b43f27b86067f9"; + sha256 = "f0f8035b470f2a48360b92d0e6287f41f98e4ba71576a1cd4c9246c468932f09"; }; useDune2 = true; From dde2fa8611cb03cf311d0f1f4f527f7f0f13529d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 24 Jul 2021 21:07:40 +0300 Subject: [PATCH 0340/1522] =?UTF-8?q?josm:=2017919=20=E2=86=92=2018004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 96ea01f5374..76af55c5082 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "17919"; + version = "18004"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-Bj1s3vFSHPiZNTjp7hQhu1X2v8nlynC37Cm6sMNOi3g="; + sha256 = "sha256-Cd+/sE6A0MddHeAxy3gx7ev+9UR3ZNcR0tCTmdX2FtY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "sha256-W+s6ARA5lyRwTuRD89wm4HChb2Up5AXQwh5uk0U7pQk="; + sha256 = "sha256-QSVh8043K/f7gPEjosGo/DNj1d75LUFwf6EMeHk68fM="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-IjCFngixh2+7SifrV3Ohi1BjIOP+QSWg/QjeqbbP7aw="; + sha256 = "sha256-Ic6RtQPqpQIci1IbKgTcFmLfMdPxSVybrEAk+ttM0j8="; }; }; in From 1fa65a8865c3b6cb326d88b4d395a5fb27934ae2 Mon Sep 17 00:00:00 2001 From: hqurve Date: Fri, 23 Jul 2021 16:37:28 -0400 Subject: [PATCH 0341/1522] pdfchain: init at 0.4.4.2 --- pkgs/tools/typesetting/pdfchain/default.nix | 56 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/typesetting/pdfchain/default.nix diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/tools/typesetting/pdfchain/default.nix new file mode 100644 index 00000000000..09122d60bc0 --- /dev/null +++ b/pkgs/tools/typesetting/pdfchain/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoconf, gtkmm3, glib, pdftk, pkg-config, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pdfchain"; + version = "0.4.4.2"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-Hu4Pk9voyc75+f5OwKEOCkXKjN5nzWzv+izmyEN1Lz0="; + }; + + nativeBuildInputs = [ + pkg-config wrapGAppsHook autoconf + ]; + + buildInputs = [ + gtkmm3 pdftk glib + ]; + + patches = let + fetchDebianPatch = {name, sha256}: fetchpatch { + url = "https://salsa.debian.org/debian/pdfchain/raw/2d29107756a3194fb522bdea8e9b9e393b15a8f3/debian/patches/${name}"; + inherit name sha256; + }; + in + [ + (fetchDebianPatch { + name = "fix_crash_on_startup"; + sha256 = "sha256-1UyMHHGrmUIFhY53ILdMMsyocSIbcV6CKQ7sLVNhNQw="; + }) + (fetchDebianPatch { + name = "fix_desktop_file"; + sha256 = "sha256-L6lhUs7GqVN1XOQO6bbz6BT29n4upsJtlHCAIGzk1Bw="; + }) + (fetchDebianPatch { + name = "fix_spelling"; + sha256 = "sha256-sOUUslPfcOo2K3zuaLcux+CNdgfWM0phsfe6g4GUFes="; + }) + ]; + + postPatch = '' + substituteInPlace src/constant.h \ + --replace '"pdftk"' '"${pdftk}/bin/pdftk"' \ + --replace "/usr/share" "$out/share" + ''; + + meta = with lib; { + description = "A graphical user interface for the PDF Toolkit (PDFtk)"; + homepage = "https://pdfchain.sourceforge.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c15ef4e4414..c57095aff05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26383,6 +26383,8 @@ in inherit (gnome2) libgnomecanvas; }; + pdfchain = callPackage ../tools/typesetting/pdfchain { }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 8cd70d10fd46962336f9ac16d23da23d1295ab0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 19:00:38 +0000 Subject: [PATCH 0342/1522] gotestsum: 1.6.4 -> 1.7.0 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index e9bc48b0dcf..1e63b07d03e 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-5iSUk/J73enbc/N3bn7M4oj2A0yoF1jTWpnXD380hFI="; + sha256 = "sha256-nZaVi39dOytJTM69xpl+d9XoUt+yHdndPgY2ggfNeMQ="; }; - vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k="; + vendorSha256 = "sha256-wP5y8Ec6eSe+rdMEQQdX0fFTQ0HWuiyBRHxGlraZd+o="; doCheck = false; From 79953c4bc323ec2cf698a1c73b50dc4827d4dd14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jul 2021 21:00:45 +0200 Subject: [PATCH 0343/1522] python3Packages.channels: enable tests --- .../python-modules/channels/default.nix | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 3535f3a44d4..e50dc051361 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,23 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, - asgiref, django, daphne +{ lib +, buildPythonPackage +, fetchFromGitHub +, asgiref +, django +, daphne +, pytest-asyncio +, pytest-django +, pytestCheckHook }: + buildPythonPackage rec { pname = "channels"; version = "3.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "0xcbpfisgawqa34ccgz56wzid0ycp3c8wjcppmz8sgd2hx4skngx"; + src = fetchFromGitHub { + owner = "django"; + repo = pname; + rev = version; + sha256 = "0jdylcb77n04rqyzg9v6qfzaxp1dnvdvnxddwh3x1qazw3csi5y2"; }; - # Files are missing in the distribution - doCheck = false; + propagatedBuildInputs = [ + asgiref + django + daphne + ]; - propagatedBuildInputs = [ asgiref django daphne ]; + checkInputs = [ + pytest-asyncio + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "channels" ]; meta = with lib; { description = "Brings event-driven capabilities to Django with a channel system"; license = licenses.bsd3; homepage = "https://github.com/django/channels"; + maintainers = with maintainers; [ fab ]; }; } From a9d2bdbae3529ab5c2e8cf4aff80fb59f289b26d Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 23 Jul 2021 17:52:53 +0200 Subject: [PATCH 0344/1522] aseprite.skia: cleanup, switch to pname + version, add meta --- pkgs/applications/editors/aseprite/skia.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 141d51bed0f..2de61c7e20f 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -16,7 +16,8 @@ let }); in stdenv.mkDerivation { - name = "skia-aseprite-m71"; + pname = "skia"; + version = "aseprite-m71"; src = fetchFromGitHub { owner = "aseprite"; @@ -73,4 +74,12 @@ stdenv.mkDerivation { third_party/externals/angle2/include \ third_party/skcms/**/*.h ''; + + meta = with lib; { + description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; + homepage = "https://skia.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + }; } From 8fff6a92d739ded122e595d5a9ff9ffa827b3046 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 24 Jul 2021 19:17:18 +0000 Subject: [PATCH 0345/1522] Update pkgs/misc/vscode-extensions/default.nix --- pkgs/misc/vscode-extensions/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c8faa5cb7f7..32335990534 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,6 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal, clojure-lsp }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq +, shellcheck, moreutils, racket-minimal, clojure-lsp +}: let inherit (vscode-utils) buildVscodeMarketplaceExtension; From 4683bca7df8bfec9bf1292ada5bae062532f57c5 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 24 Jul 2021 01:45:30 +0200 Subject: [PATCH 0346/1522] pythonPackages.pylzma: init at 0.5.0 --- .../python-modules/pylzma/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pylzma/default.nix diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix new file mode 100644 index 00000000000..78bc24d35d4 --- /dev/null +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pylzma"; + version = "0.5.0"; + + # This vendors an old LZMA SDK + # After some discussion, it seemed most reasonable to keep it that way + # xz, and uefi-firmware-parser also does this + src = fetchPypi { + inherit pname version; + sha256 = "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q"; + }; + + pythonImportsCheck = [ "pylzma" ]; + + meta = with lib; { + homepage = "https://www.joachim-bauch.de/projects/pylzma/"; + description = "Platform independent python bindings for the LZMA compression library"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cab2a4f0c7..d18cdc0e967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6211,6 +6211,8 @@ in { pylxd = callPackage ../development/python-modules/pylxd { }; + pylzma = callPackage ../development/python-modules/pylzma { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; From 17e77e142252c67e776cf2869de2cbaa82e23378 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jul 2021 21:33:21 +0200 Subject: [PATCH 0347/1522] python3Packages.flower: 0.9.7 -> 1.0.0 --- pkgs/development/python-modules/flower/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 3662116bc2a..67ecdde0d5f 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -7,22 +7,22 @@ , pytz , tornado , prometheus_client +, pytestCheckHook }: buildPythonPackage rec { pname = "flower"; - version = "0.9.7"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cf27a254268bb06fd4972408d0518237fcd847f7da4b4cd8055e228150ace8f3"; + sha256 = "1gcczr04g7wx99h7pxxx1p9n50sbyi0zxrzy7f7m0sf5apxw85rf"; }; postPatch = '' # rely on using example programs (flowers/examples/tasks.py) which # are not part of the distribution rm tests/load.py - substituteInPlace requirements/default.txt --replace "prometheus_client==0.8.0" "prometheus_client>=0.8.0" ''; propagatedBuildInputs = [ @@ -33,7 +33,10 @@ buildPythonPackage rec { prometheus_client ]; - checkInputs = [ mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; pythonImportsCheck = [ "flower" ]; @@ -41,7 +44,6 @@ buildPythonPackage rec { description = "Celery Flower"; homepage = "https://github.com/mher/flower"; license = licenses.bsdOriginal; - maintainers = [ maintainers.arnoldfarkas ]; - broken = (celery.version >= "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021 + maintainers = with maintainers; [ arnoldfarkas ]; }; } From 97be046b0e014aafca7edf7e3352d7730a66f7a9 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 24 Jul 2021 02:09:38 +0200 Subject: [PATCH 0348/1522] hydrus: Add pylzma as dependency --- pkgs/applications/graphics/hydrus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 37edc37337a..ea67f8d5231 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -34,6 +34,7 @@ pythonPackages.buildPythonPackage rec { psutil pyopenssl pyyaml + pylzma requests send2trash service-identity From c8516c8ce5bf2992bb1deef514af8292d77528e7 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 24 Jul 2021 03:40:25 +0200 Subject: [PATCH 0349/1522] hydrus: correct dependencies, simply external programs --- pkgs/applications/graphics/hydrus/default.nix | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index ea67f8d5231..292c3cf2156 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub -, xz , wrapQtAppsHook , miniupnpc_2 +, ffmpeg , enableSwftools ? false , swftools -, pythonPackages +, python3Packages }: -pythonPackages.buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "hydrus"; version = "447"; format = "other"; @@ -24,31 +24,33 @@ pythonPackages.buildPythonPackage rec { wrapQtAppsHook ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 + chardet + cloudscraper html5lib lxml + lz4 + nose numpy opencv4 pillow psutil - pyopenssl - pyyaml pylzma + pyopenssl + pyside2 + pysocks + pythonPackages.mpv + pyyaml + qtpy requests send2trash service-identity + six twisted - lz4 - xz - pysocks - matplotlib - qtpy - pyside2 - mpv ]; - checkInputs = with pythonPackages; [ nose httmock ]; + checkInputs = with python3Packages; [ nose mock httmock ]; # most tests are failing, presumably because we are not using test.py checkPhase = '' @@ -78,31 +80,28 @@ pythonPackages.buildPythonPackage rec { outputs = [ "out" "doc" ]; - postPatch = '' - sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \ - -i ./hydrus/core/networking/HydrusNATPunch.py - '' + lib.optionalString enableSwftools '' - sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \ - -i ./hydrus/core/HydrusFlashHandling.py - ''; - - #doCheck = true; - installPhase = '' # Move the hydrus module and related directories - mkdir -p $out/${pythonPackages.python.sitePackages} - mv {hydrus,static} $out/${pythonPackages.python.sitePackages} + mkdir -p $out/${python3Packages.python.sitePackages} + mv {hydrus,static} $out/${python3Packages.python.sitePackages} mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin install -m0755 server.py $out/bin/hydrus-server install -m0755 client.py $out/bin/hydrus-client + '' + lib.optionalString enableSwftools '' + mkdir -p $out/${python3Packages.python.sitePackages}/bin + # swfrender seems to have to be called sfwrender_linux + # not sure if it can be loaded through PATH, but this is simpler + # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin + ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux ''; dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc_2 ]}) ''; meta = with lib; { From eb07e28d0f220021465e1a70253cc70672cca53c Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 24 Jul 2021 14:45:20 +0200 Subject: [PATCH 0350/1522] swftools: unmark as broken --- pkgs/tools/video/swftools/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 6867869a0a9..c48d684d3fc 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.koral ]; platforms = lib.platforms.unix; - broken = true; knownVulnerabilities = [ "CVE-2017-10976" "CVE-2017-11096" From 461466306ef3cef014c8ca4899879a77993b6f7d Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Thu, 22 Jul 2021 21:58:02 +0100 Subject: [PATCH 0351/1522] octaveFull: set QT_MAC_WANTS_LAYER=1 on Darwin This avoids a Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 --- pkgs/development/interpreters/octave/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 825b035d7a6..e8228d23b0c 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -187,6 +187,11 @@ let # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 + qtWrapperArgs = lib.optionals stdenv.isDarwin [ + "--set QT_MAC_WANTS_LAYER 1" + ]; + # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; From 2b8523fd7e4252455e3596b93a990a7ea6f76ef5 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Sat, 24 Jul 2021 16:22:23 +0100 Subject: [PATCH 0352/1522] portaudio: remove unsupported compiler flag Appears to no longer be supported in the latest clang. --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 840c9e773f4..4666850c584 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From 02258ab8c1ecfcaf01606e3c24b24318b43ca911 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 24 Jul 2021 20:11:39 +0000 Subject: [PATCH 0353/1522] apache-airflow: remove unused input --- pkgs/development/python-modules/apache-airflow/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index dea5776fb61..2d80b6a3984 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -3,7 +3,6 @@ , python , buildPythonPackage , fetchFromGitHub -, writeText , alembic , argcomplete , attrs From 4f62b051375b0fdaa01ba37e915cfaaa7de40d80 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 18:06:55 +0200 Subject: [PATCH 0354/1522] discourse.mkDiscoursePlugin: remove phases --- pkgs/servers/web-apps/discourse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 72ea8a943dc..74bd9a72234 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -65,7 +65,8 @@ let in stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { pluginName = if name != null then name else "${pname}-${version}"; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out From c2bb089b1808db178ed685cc37ec100da1181243 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jul 2021 22:22:11 +0200 Subject: [PATCH 0355/1522] python3Packages.influxdb-client: 1.18.0 -> 1.19.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 21e614d7d7c..5f94d61c7fd 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.18.0"; + version = "1.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0xgp1wxdfa4y316dfkpmj38chlh68mndr8kqphckpnw16qxsl3d9"; + sha256 = "0k1qcwd2qdw8mcr8ywy3wi1x9j6i57axgcps5kmkbx773s8qf155"; }; propagatedBuildInputs = [ From 621eadcaa61c9bf12b3add8ec40798ffc710ee29 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Sat, 24 Jul 2021 22:23:59 +0200 Subject: [PATCH 0356/1522] apksigner: init --- pkgs/development/tools/apksigner/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/tools/apksigner/default.nix diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix new file mode 100644 index 00000000000..7b05479ea42 --- /dev/null +++ b/pkgs/development/tools/apksigner/default.nix @@ -0,0 +1,15 @@ +{ runCommand +, makeWrapper +, jre +, build-tools +}: +let + tools = builtins.head build-tools; +in +runCommand "apksigner" { + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + makeWrapper "${jre}/bin/java" "$out/bin/apksigner" \ + --add-flags "-jar ${tools}/libexec/android-sdk/build-tools/${tools.version}/lib/apksigner.jar" +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be51f79dca..2a63a9d16c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1105,6 +1105,10 @@ in apksigcopier = callPackage ../development/tools/apksigcopier { }; + apksigner = callPackage ../development/tools/apksigner { + inherit (androidenv.androidPkgs_9_0) build-tools; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; From 9adcb3a2ab32d642355340bcf10108c8a3c69d05 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Sat, 24 Jul 2021 22:24:24 +0200 Subject: [PATCH 0357/1522] apksigcopier: use apksigner --- pkgs/development/tools/apksigcopier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/development/tools/apksigcopier/default.nix index 16cfbad52a0..cc23081473a 100644 --- a/pkgs/development/tools/apksigcopier/default.nix +++ b/pkgs/development/tools/apksigcopier/default.nix @@ -4,10 +4,9 @@ , installShellFiles , bash , pandoc +, apksigner }: -# FIXME: how to "recommend" apksigner like the Debian package? - python3.pkgs.buildPythonApplication rec { pname = "apksigcopier"; version = "1.0.1"; @@ -22,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles pandoc ]; propagatedBuildInputs = with python3.pkgs; [ click ]; checkInputs = with python3.pkgs; [ flake8 mypy pylint ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ]; postPatch = '' substituteInPlace Makefile \ From c3778dc4d8285b3f01e9efd0a2f5ead6c699a3da Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Sat, 24 Jul 2021 22:24:34 +0200 Subject: [PATCH 0358/1522] fdroidserver: use apksigner --- pkgs/development/tools/fdroidserver/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 6b3690de91b..5977d0c28d1 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,7 +1,8 @@ -{ docker -, fetchFromGitLab +{ fetchFromGitLab , python -, lib }: +, lib +, apksigner +}: python.pkgs.buildPythonApplication rec { version = "2.0.3"; @@ -47,6 +48,8 @@ python.pkgs.buildPythonApplication rec { yamllint ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ]; + # no tests doCheck = false; From 407c9d4437751a0f4c74235da4d331dac66d1ecd Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Sat, 24 Jul 2021 22:24:48 +0200 Subject: [PATCH 0359/1522] diffoscope: use top-level apksigner --- pkgs/tools/misc/diffoscope/default.nix | 11 ++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 88a9846e835..629c8accfb9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles -, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd @@ -7,13 +7,6 @@ }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -let - apksigner = runCommand "apksigner" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper "${jdk}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar ${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3/lib/apksigner.jar" - ''; -in python3Packages.buildPythonApplication rec { pname = "diffoscope"; version = "178"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a63a9d16c8..e6fd2f3e0fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4206,7 +4206,6 @@ in diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; diffoscopeMinimal = callPackage ../tools/misc/diffoscope { - inherit (androidenv.androidPkgs_9_0) build-tools; jdk = jdk8; }; From 2346ec8883c8bfca53ea7a7a1b0441a4a0562225 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 24 Jul 2021 22:20:37 +0200 Subject: [PATCH 0360/1522] fail2ban: 0.11.1 -> 0.11.2 Fixes fail2ban with python 3.9. --- pkgs/tools/security/fail2ban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 922fb412cad..30e86f66a58 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3 }: -let version = "0.11.1"; in +let version = "0.11.2"; in python3.pkgs.buildPythonApplication { pname = "fail2ban"; @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "0kqvkxpb72y3kgmxf6g36w67499c6gcd2a9yyblagwx12y05f1sh"; + sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE="; }; pythonPath = with python3.pkgs; From 1856387636e71d579dfe2a5f67c6220db4e500b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 04:03:17 +0000 Subject: [PATCH 0361/1522] hikari: 2.3.1 -> 2.3.2, cleanup --- .../window-managers/hikari/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index a9545757d79..5ee2c8c35e4 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchzip, fetchpatch, - pkg-config, bmake, - cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, - libucl, wayland, wayland-protocols, wlroots, mesa, - features ? { +{ lib, stdenv, fetchzip +, pkg-config, bmake +, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman +, libucl, wayland, wayland-protocols, wlroots, mesa +, features ? { gammacontrol = true; layershell = true; screencopy = true; @@ -10,17 +10,13 @@ } }: -let +stdenv.mkDerivation rec { pname = "hikari"; - version = "2.3.1"; -in - -stdenv.mkDerivation { - inherit pname version; + version = "2.3.2"; src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-o6YsUATcWHSuAEfU7WnwxKNxRNuBt069qCv0FKDWStg="; + sha256 = "sha256-At4b6mkArKe6knNWouLdZ9v8XhfHaUW+aB+CHyEBg8o="; }; nativeBuildInputs = [ pkg-config bmake ]; From 24509ea30344d4624427f6c1116c70a4c3ee0a90 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:06:12 +0200 Subject: [PATCH 0362/1522] riemann: remove phases --- pkgs/servers/monitoring/riemann/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 03609e4d25a..0ea67d61e06 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' substituteInPlace bin/riemann --replace '$top/lib/riemann.jar' "$out/share/java/riemann.jar" From edc01d05a925369f518b0f3cef6f3689e561011e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 24 Jul 2021 20:07:43 +0100 Subject: [PATCH 0363/1522] lrzsz: add patch for CVE-2018-10195 provide gettext because modifying source files triggers localization regeneration --- pkgs/tools/misc/lrzsz/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 55c11b00c93..09e90ca0794 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, gettext, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "lrzsz-0.12.20"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10195.patch"; + url = "https://bugzilla.redhat.com/attachment.cgi?id=79507"; + sha256 = "0jlh8w0cjaz6k56f0h3a0h4wgc51axmrdn3mdspk7apjfzqcvx3c"; + }) + ]; + + nativeBuildInputs = [ gettext ]; + hardeningDisable = [ "format" ]; configureFlags = [ "--program-transform-name=s/^l//" ]; From 5a5972100ada9af71612f9bd21167bce5d5e6991 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:08:56 +0200 Subject: [PATCH 0364/1522] prometheus-jmx-httpserver: deprecate phases --- pkgs/servers/monitoring/prometheus/jmx-httpserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 2c08374ec73..459ddf01de3 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p $out/libexec From 96ea4f525250020d623ad941c9166a77a7b6f649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 23 Jul 2021 14:26:37 +0200 Subject: [PATCH 0365/1522] pythonPackages.ignite: ignore failing tests, fix hash --- .../python-modules/ignite/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 432767b9f98..72a607505cd 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; + sha256 = "sha256-FGFpaqq7InwRqFmQTmXGpJEjRUB69ZN/l20l42L2BAA="; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; @@ -33,8 +33,13 @@ buildPythonPackage rec { # models, which doesn't work in the sandbox. # avoid tests which need special packages pytestFlagsArray = [ + "--ignore=tests/ignite/contrib/handlers/test_clearml_logger.py" + "--ignore=tests/ignite/contrib/handlers/test_lr_finder.py" "--ignore=tests/ignite/contrib/handlers/test_trains_logger.py" + "--ignore=tests/ignite/metrics/nlp/test_bleu.py" + "--ignore=tests/ignite/metrics/nlp/test_rouge.py" "--ignore=tests/ignite/metrics/test_dill.py" + "--ignore=tests/ignite/metrics/test_psnr.py" "--ignore=tests/ignite/metrics/test_ssim.py" "tests/" ]; @@ -42,16 +47,17 @@ buildPythonPackage rec { # disable tests which need specific packages disabledTests = [ "idist" - "tensorboard" "mlflow" + "tensorboard" + "test_integration" + "test_output_handler" # needs mlflow + "test_pbar" # slight output differences + "test_setup_clearml_logging" + "test_setup_neptune" + "test_setup_plx" + "test_write_results" "trains" "visdom" - "test_setup_neptune" - "test_output_handler" # needs mlflow - "test_integration" - "test_pbar" # slight output differences - "test_write_results" - "test_setup_plx" ]; meta = with lib; { From 15b29ec38ceeaae1a4e13f7a8be2c767937ba2a4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:13:58 +0200 Subject: [PATCH 0366/1522] subsonic: remove phases --- pkgs/servers/misc/subsonic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 4c5ea3fe6c6..8e04dcb1cb9 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -33,6 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ telotortium ]; platforms = platforms.unix; }; - - phases = ["unpackPhase" "installPhase"]; } From 5939a44ad0f50eea2e5211915ffed54789599465 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:17:13 +0200 Subject: [PATCH 0367/1522] jboss: remove phases --- pkgs/servers/http/jboss/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 81ec4a6c6bb..564636f6db2 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mv $PWD $out find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' From 2a2026580ffbd13eec8b16b5d30da76c6b449c81 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:23:11 +0200 Subject: [PATCH 0368/1522] mastodon-update-script: remove phases --- pkgs/servers/mastodon/update.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/servers/mastodon/update.nix index 28c0ff235e7..d7423b3e66c 100644 --- a/pkgs/servers/mastodon/update.nix +++ b/pkgs/servers/mastodon/update.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/update.sh wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} ''; - phases = [ "installPhase" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; From 0bbc4bcdba97eb25852bd168808701894129c03b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:52:56 +0200 Subject: [PATCH 0369/1522] atlassian-crowd: remove phases --- pkgs/servers/atlassian/crowd.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index f4c257314a8..74d26f65453 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; - buildPhase = '' mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml From 395890ba6a0b07f3d6eae11cb5d99cd20478316d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 24 Jul 2021 23:59:24 +0200 Subject: [PATCH 0370/1522] framac: 23.0 -> 23.1 (#131252) --- pkgs/development/tools/analysis/frama-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 9d87cb30520..a1c7265e05d 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "23.0"; + version = "23.1"; slang = "Vanadium"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0pdm3y2nfyjhpnicv1pg9j48llq86dmb591d2imnafp4xfqani0s"; + sha256 = "1rgkq9sg436smw005ag0j6y3xryhjn18a07m5wjfrfp0s1438nnj"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; From df9d5f8fe5bacaec418e2489bd34b95d14e64a6e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 00:14:56 +0200 Subject: [PATCH 0371/1522] minecraft-server: deprecate phases --- pkgs/games/minecraft-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index ee47a0ecdc2..e67506c10a8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { chmod +x $out/bin/minecraft-server ''; - phases = "installPhase"; + dontUnpack = true; passthru = { tests = { inherit (nixosTests) minecraft-server; }; From 0271807d6fb34509e78ed66a8c972dd851b996cd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 24 Jul 2021 22:21:24 +0000 Subject: [PATCH 0372/1522] btar: fix build with librsync 1.x The patch from OpenSUSE fixes the build with a more recent librsync. I haven't tested that it runs, but the patch is very simple, and if it works for OpenSUSE, it should work for us too. --- pkgs/tools/backup/btar/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index af253ccd7e6..841e9ebf6d3 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, librsync }: +{ lib, stdenv, fetchurl, fetchpatch, librsync }: stdenv.mkDerivation rec { name = "btar-1.1.1"; @@ -7,6 +7,13 @@ stdenv.mkDerivation rec { sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; + patches = [ + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/btar/btar-librsync.patch?rev=2"; + sha256 = "1awqny9489vsfffav19s73xxg26m7zrhvsgf1wxb8c2izazwr785"; + }) + ]; + buildInputs = [ librsync ]; installPhase = "make install PREFIX=$out"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be51f79dca..9e8ed45bfd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3543,9 +3543,7 @@ in bsdiff = callPackage ../tools/compression/bsdiff { }; - btar = callPackage ../tools/backup/btar { - librsync = librsync_0_9; - }; + btar = callPackage ../tools/backup/btar { }; bud = callPackage ../tools/networking/bud { }; From 7368fa12c4c6b05027b367293b92b6a8f310d08e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 24 Jul 2021 22:22:42 +0000 Subject: [PATCH 0373/1522] btar: clean up --- pkgs/tools/backup/btar/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 841e9ebf6d3..c77aa5b82b6 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, librsync }: stdenv.mkDerivation rec { - name = "btar-1.1.1"; + pname = "btar"; + version = "1.1.1"; + src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; + url = "https://vicerveza.homeunix.net/~viric/soft/btar/btar-${version}.tar.gz"; sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; @@ -16,13 +18,13 @@ stdenv.mkDerivation rec { buildInputs = [ librsync ]; - installPhase = "make install PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Tar-compatible block-based archiver"; license = lib.licenses.gpl3Plus; - homepage = "http://viric.name/cgi-bin/btar"; - platforms = with lib.platforms; all; - maintainers = with lib.maintainers; [viric]; + homepage = "https://viric.name/cgi-bin/btar"; + platforms = platforms.all; + maintainers = with maintainers; [ viric ]; }; } From 648aacb65dc8e4203a52b843652430b3d582dfdb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 24 Jul 2021 22:23:38 +0000 Subject: [PATCH 0374/1522] librsync_0_9: drop This was restored in a0dcd49bbc7 ("btar: fix build by reintroducing librsync 0.9.x for ZHF") to fix the build of a single package. We now use a patch to make it work with more recent versions of librsync, so there's no reason to keep this package around any more. --- pkgs/development/libraries/librsync/0.9.nix | 26 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/librsync/0.9.nix diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix deleted file mode 100644 index 74dca4e3085..00000000000 --- a/pkgs/development/libraries/librsync/0.9.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "librsync-0.9.7"; - - src = fetchurl { - url = "mirror://sourceforge/librsync/librsync-0.9.7.tar.gz"; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; - }; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - (lib.enableFeature stdenv.isCygwin "static") - (lib.enableFeature (!stdenv.isCygwin) "shared") - ]; - - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - homepage = "http://librsync.sourceforge.net/"; - license = lib.licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dcede94988..a148788c35b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases ({ libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24 libseat = seatd; # added 2021-06-24 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e8ed45bfd4..1b87dc31c23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17043,8 +17043,6 @@ in librsync = callPackage ../development/libraries/librsync { }; - librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { }; - librttopo = callPackage ../development/libraries/librttopo { }; libs3 = callPackage ../development/libraries/libs3 { }; From ca9212b56cd7ee70d9e9825537a481f36eb6598c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Jul 2021 23:57:59 +0200 Subject: [PATCH 0375/1522] dict-dbs: deprecate phases --- pkgs/servers/dict/dictd-db-collector.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index f635c98602d..35429ebe2c7 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -1,20 +1,20 @@ {stdenv, lib, dict}: ({dictlist, allowList ? ["127.0.0.1"], denyList ? []}: /* - dictlist is a list of form + dictlist is a list of form [ { filename = /path/to/files/basename; name = "name"; } ] - basename.dict.dz and basename.index should be + basename.dict.dz and basename.index should be dict files. Or look below for other options. allowList is a list of IP/domain *-wildcarded strings denyList is the same.. */ let - link_arguments = map + link_arguments = map (x: '' "${x.filename}" '') - dictlist; - databases = lib.concatStrings (map (x : + dictlist; + databases = lib.concatStrings (map (x : "${x.name} ${x.filename}\n") dictlist); allow = lib.concatStrings (map (x: "allow ${x}\n") allowList); deny = lib.concatStrings (map (x: "deny ${x}\n") denyList); @@ -24,18 +24,18 @@ let ${deny} } "; - installPhase = '' + installPhase = '' mkdir -p $out/share/dictd cd $out/share/dictd - echo "${databases}" >databases.names + echo "${databases}" >databases.names echo "${accessSection}" > dictd.conf - for j in ${toString link_arguments}; do + for j in ${toString link_arguments}; do name="$(egrep ' '"$j"\$ databases.names)" name=''${name% $j} if test -d "$j"; then if test -d "$j"/share/dictd ; then echo "Got store path $j" - j="$j"/share/dictd + j="$j"/share/dictd fi echo "Directory reference: $j" i=$(ls "$j""/"*.index) @@ -47,8 +47,8 @@ let locale=$(cat "$(dirname "$i")"/locale) base="$(basename "$i")" echo "Locale is $locale" - export LC_ALL=$locale - export LANG=$locale + export LC_ALL=$locale + export LANG=$locale if test -e "$i".dict.dz; then ln -s "$i".dict.dz else @@ -73,7 +73,6 @@ in stdenv.mkDerivation { name = "dictd-dbs"; - phases = ["installPhase"]; buildInputs = [dict]; inherit installPhase; From 9b6c409fb441915da659307a94655fa978ddf256 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 00:18:13 +0200 Subject: [PATCH 0376/1522] dict-dbs: fmt --- pkgs/servers/dict/dictd-db-collector.nix | 133 ++++++++++++----------- 1 file changed, 68 insertions(+), 65 deletions(-) diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index 35429ebe2c7..faf0fd24831 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -1,79 +1,82 @@ -{stdenv, lib, dict}: -({dictlist, allowList ? ["127.0.0.1"], denyList ? []}: +{ stdenv, lib, dict }: +({ dictlist, allowList ? [ "127.0.0.1" ], denyList ? [ ] }: + /* - dictlist is a list of form - [ { filename = /path/to/files/basename; - name = "name"; } ] - basename.dict.dz and basename.index should be - dict files. Or look below for other options. - allowList is a list of IP/domain *-wildcarded strings - denyList is the same.. + dictlist is a list of form + [ { filename = /path/to/files/basename; + name = "name"; } ] + basename.dict.dz and basename.index should be + dict files. Or look below for other options. + allowList is a list of IP/domain *-wildcarded strings + denyList is the same.. */ let - link_arguments = map - (x: '' "${x.filename}" '') - dictlist; - databases = lib.concatStrings (map (x : - "${x.name} ${x.filename}\n") dictlist); - allow = lib.concatStrings (map (x: "allow ${x}\n") allowList); - deny = lib.concatStrings (map (x: "deny ${x}\n") denyList); - accessSection = " - access { - ${allow} - ${deny} - } - "; - installPhase = '' - mkdir -p $out/share/dictd - cd $out/share/dictd - echo "${databases}" >databases.names - echo "${accessSection}" > dictd.conf - for j in ${toString link_arguments}; do - name="$(egrep ' '"$j"\$ databases.names)" - name=''${name% $j} - if test -d "$j"; then - if test -d "$j"/share/dictd ; then - echo "Got store path $j" - j="$j"/share/dictd - fi - echo "Directory reference: $j" - i=$(ls "$j""/"*.index) - i="''${i%.index}"; - else - i="$j"; - fi - echo "Basename is $i" - locale=$(cat "$(dirname "$i")"/locale) - base="$(basename "$i")" - echo "Locale is $locale" - export LC_ALL=$locale - export LANG=$locale - if test -e "$i".dict.dz; then - ln -s "$i".dict.dz - else - cp "$i".dict . - dictzip "$base".dict - fi - ln -s "$i".index . - dictfmt_index2word --locale $locale < "$base".index > "$base".word || true - dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true + link_arguments = map + (x: '' "${x.filename}" '') + dictlist; + databases = lib.concatStrings (map + (x: + "${x.name} ${x.filename}\n") + dictlist); + allow = lib.concatStrings (map (x: "allow ${x}\n") allowList); + deny = lib.concatStrings (map (x: "deny ${x}\n") denyList); + accessSection = " + access { + ${allow} + ${deny} + } +"; + installPhase = '' + mkdir -p $out/share/dictd + cd $out/share/dictd + echo "${databases}" >databases.names + echo "${accessSection}" > dictd.conf + for j in ${toString link_arguments}; do + name="$(egrep ' '"$j"\$ databases.names)" + name=''${name% $j} + if test -d "$j"; then + if test -d "$j"/share/dictd ; then + echo "Got store path $j" + j="$j"/share/dictd + fi + echo "Directory reference: $j" + i=$(ls "$j""/"*.index) + i="''${i%.index}"; + else + i="$j"; + fi + echo "Basename is $i" + locale=$(cat "$(dirname "$i")"/locale) + base="$(basename "$i")" + echo "Locale is $locale" + export LC_ALL=$locale + export LANG=$locale + if test -e "$i".dict.dz; then + ln -s "$i".dict.dz + else + cp "$i".dict . + dictzip "$base".dict + fi + ln -s "$i".index . + dictfmt_index2word --locale $locale < "$base".index > "$base".word || true + dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true - echo "database $name {" >> dictd.conf - echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf - echo " index $out/share/dictd/$base.index" >> dictd.conf - echo " index_word $out/share/dictd/$base.word" >> dictd.conf - echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf - echo "}" >> dictd.conf - done - ''; + echo "database $name {" >> dictd.conf + echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf + echo " index $out/share/dictd/$base.index" >> dictd.conf + echo " index_word $out/share/dictd/$base.word" >> dictd.conf + echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf + echo "}" >> dictd.conf + done + ''; in stdenv.mkDerivation { name = "dictd-dbs"; - buildInputs = [dict]; + buildInputs = [ dict ]; inherit installPhase; }) From 4183793b492eb4fe8a0562c69075529a4e3c1ad8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 00:39:40 +0200 Subject: [PATCH 0377/1522] tcl2048: deprecate phases --- pkgs/games/tcl2048/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 93286058b49..b2796225a6c 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -10,7 +10,7 @@ tcl.mkTclDerivation rec { }; buildInputs = [ tcllib ]; - phases = "installPhase fixupPhase"; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin From 5496ed328af1af672a166a8c409066f490c05117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Jul 2021 01:02:25 +0200 Subject: [PATCH 0378/1522] fail2ban: cleanup --- pkgs/tools/security/fail2ban/default.nix | 31 ++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 30e86f66a58..18128639ff4 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3 }: -let version = "0.11.2"; in -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "fail2ban"; - inherit version; + version = "0.11.2"; src = fetchFromGitHub { - owner = "fail2ban"; - repo = "fail2ban"; - rev = version; + owner = "fail2ban"; + repo = "fail2ban"; + rev = version; sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE="; }; @@ -42,18 +41,20 @@ python3.pkgs.buildPythonApplication { ${stdenv.shell} ./fail2ban-2to3 ''; - postInstall = let - sitePackages = "$out/${python3.sitePackages}"; - in '' - # see https://github.com/NixOS/nixpkgs/issues/4968 - rm -rf ${sitePackages}/etc ${sitePackages}/usr ${sitePackages}/var; - ''; + postInstall = + let + sitePackages = "$out/${python3.sitePackages}"; + in + '' + # see https://github.com/NixOS/nixpkgs/issues/4968 + rm -r ${sitePackages}/etc ${sitePackages}/usr + ''; meta = with lib; { - homepage = "https://www.fail2ban.org/"; + homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; - license = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 fpletz ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From 4a7e4dd6452146f537e008eac32ea796e41f4bd7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:27:41 +0200 Subject: [PATCH 0379/1522] scalafix: deprecate phases and use pname&version --- pkgs/development/tools/scalafix/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index c27d6e8a65f..666087e4f22 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -17,21 +17,20 @@ let }; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + pname = baseName; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - doCheck = true; - - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH scalafix.cli.Cli" ''; - checkPhase = '' + installCheckPhase = '' $out/bin/${baseName} --version | grep -q "${version}" ''; From 6098b5b2c80592bee58eb1ef1d47a7393a0c07a0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:30:48 +0200 Subject: [PATCH 0380/1522] thrust: remove phases --- pkgs/development/tools/thrust/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index cc46f3f5d34..9770a384e18 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -25,8 +25,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ thrustEnv ]; - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin mkdir -p $out/libexec/thrust From 2535b837828386b73c77704f2e80090fce409b7b Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sat, 24 Jul 2021 20:41:42 +1000 Subject: [PATCH 0381/1522] qtspim: init at 9.1.22 --- .../development/tools/misc/qtspim/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/tools/misc/qtspim/default.nix diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix new file mode 100644 index 00000000000..23d33a9f81c --- /dev/null +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: +stdenv.mkDerivation rec { + pname = "qtspim"; + version = "9.1.22"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/spimsimulator/code/"; + rev = "r739"; + sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + }; + + postPatch = '' + cd QtSpim + + # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim + sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp + sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp + sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp + sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp + + substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib + substituteInPlace menu.cpp \ + --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ + --replace /usr/lib/qtspim/help/qtspim.qhc $out/share/help/qtspim.qhc + substituteInPlace ../Setup/qtspim_debian_deployment/qtspim.desktop \ + --replace /usr/bin/qtspim qtspim \ + --replace /usr/lib/qtspim/qtspim.png qtspim + ''; + + nativeBuildInputs = [ wrapQtAppsHook qttools qmake bison flex ]; + buildInputs = [ qtbase ]; + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + + qmakeFlags = [ + "QtSpim.pro" + "-spec" + "linux-g++" + "CONFIG+=release" + ]; + + installPhase = '' + runHook preInstall + + install -D QtSpim $out/bin/qtspim + install -D ../Setup/qtspim_debian_deployment/copyright $out/share/licenses/qtspim/copyright + install -D ../Setup/qtspim_debian_deployment/qtspim.desktop $out/share/applications/qtspim.desktop + install -D ../Setup/NewIcon48x48.png $out/share/icons/hicolor/48x48/apps/qtspim.png + install -D ../Setup/NewIcon256x256.png $out/share/icons/hicolor/256x256/apps/qtspim.png + cp -r help $out/share/help + + runHook postInstall + ''; + + meta = with lib; { + description = "New user interface for spim, a MIPS simulator"; + homepage = "http://spimsimulator.sourceforge.net/"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..bbf16f1156e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8321,6 +8321,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; + quadrafuzz = callPackage ../applications/audio/quadrafuzz { }; quickfix = callPackage ../development/libraries/quickfix { }; From 1c33f2afcfd7ae9f9c503ad28ae62cd41f72ec4a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:33:28 +0200 Subject: [PATCH 0382/1522] ronn: deprecate phases --- pkgs/development/tools/ronn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 8b516627220..3569638b218 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { gemdir = ./.; }; - phases = ["installPhase"]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; From 38f2a71410a34da37ae8599e003e192cd0ff80bf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:35:41 +0200 Subject: [PATCH 0383/1522] postiats-utilities: remove phases --- pkgs/development/tools/postiats-utilities/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index 6d4db28f37e..f65d96382ac 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 python3Packages.wrapPython ]; - phases = "unpackPhase patchPhase installPhase"; - postPatch = '' for f in pats-* postiats/*.py; do sed -i "$f" -e "1 s,python3,python," From 987902c43446fbcf614193a965d81946b0861aaf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:37:42 +0200 Subject: [PATCH 0384/1522] lemon: deprecate phases --- pkgs/development/tools/parsing/lemon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 3db9e0f6d9e..9c8786950d2 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { pname = "lemon"; version = "1.69"; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' sh -xc "$CC ${srcs.lemon} -o lemon" From 04e16763517dfc72a4f71a8abdae67e986f0fe4e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:40:43 +0200 Subject: [PATCH 0385/1522] mumble_overlay: remove phases --- pkgs/applications/networking/mumble/overlay.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index bc960ac12d4..7ed9e00d3f8 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -8,8 +8,6 @@ in stdenv.mkDerivation { inherit (mumble) src; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/lib ln -s ${mumble}/lib/libmumble.so.1 $out/lib/ From 7b95bd01c1a960319349e09697db5664c514f69d Mon Sep 17 00:00:00 2001 From: cwyc <16950437+cwyc@users.noreply.github.com> Date: Fri, 23 Jul 2021 01:18:56 -0400 Subject: [PATCH 0386/1522] unison: add desktop file Added desktop file for program launchers. Also made use of lib.strings.optionalString to replace instances of `if string else ""`. --- .../networking/sync/unison/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 9ab8d441508..8a8fc073355 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch +{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems); buildInputs = [ ocaml ncurses ]; patches = [ @@ -27,9 +27,9 @@ stdenv.mkDerivation (rec { }) ]; - preBuild = (if enableX11 then '' + preBuild = (lib.strings.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml - '' else "") + '' + '') + '' echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; @@ -40,15 +40,32 @@ stdenv.mkDerivation (rec { preInstall = "mkdir -p $out/bin"; - postInstall = if enableX11 then '' + postInstall = lib.strings.optionalString enableX11 '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" done - '' else ""; + + install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg + ''; dontStrip = !ocaml.nativeCompilers; + desktopItems = lib.lists.optional enableX11 (makeDesktopItem { + name = pname; + desktopName = "Unison"; + comment = "Bidirectional file synchronizer"; + genericName = "File synchronization tool"; + exec = "unison"; + icon = "unison"; + categories = "Utility;FileTools;GTK;"; + extraDesktopEntries={ + StartupWMClass="Unison"; + StartupNotify="true"; + X-MultipleArgs="false"; + }; + }); + meta = { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; From f61fe3ec6b3741d95e968ffb2394419bd8ddc598 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 23 Jul 2021 03:29:22 +0000 Subject: [PATCH 0387/1522] python3Packages.jc: 1.14.4 -> 1.16.0 --- pkgs/development/python-modules/jc/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 10f09d912e7..b09137d361b 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -4,26 +4,31 @@ , ruamel_yaml , xmltodict , pygments -, isPy27 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jc"; - version = "1.15.4"; - disabled = isPy27; + version = "1.16.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; - repo = "jc"; + repo = pname; rev = "v${version}"; - sha256 = "1y3807i9rlif78qp1vq9n5hpzmc60i9h5ycw70gvf8mgzxxrl8jx"; + sha256 = "sha256-6kh9FzMW5davxN8jNFFUh+PGSNAW7w8aeoJP25mGY10="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jc" ]; + + # tests require timezone to set America/Los_Angeles + doCheck = false; + meta = with lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; homepage = "https://github.com/kellyjonbrazil/jc"; From 0f1204bd2be0ca1ea60b70d6d1eb7a11077f6986 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 24 Jul 2021 01:20:02 +0700 Subject: [PATCH 0388/1522] Initial implementation of s390 cross-compile --- lib/systems/doubles.nix | 5 +++-- lib/systems/examples.nix | 4 ++++ lib/systems/inspect.nix | 1 + lib/systems/parse.nix | 2 ++ lib/tests/systems.nix | 2 +- pkgs/build-support/bintools-wrapper/default.nix | 1 + 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index b8d154ad635..aa630b51ed8 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -28,7 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" - "m68k-linux" + "m68k-linux" "s390-linux" # MMIXware "mmix-mmixware" @@ -41,7 +41,7 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" "m68k-none" - "x86_64-none" + "s390-none" "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" @@ -76,6 +76,7 @@ in { vc4 = filterDoubles predicates.isVc4; or1k = filterDoubles predicates.isOr1k; m68k = filterDoubles predicates.isM68k; + s390 = filterDoubles predicates.isS390; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ce7515bc9cc..32b236d6960 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -148,6 +148,10 @@ rec { config = "m68k-unknown-linux-gnu"; }; + s390 = { + config = "s390-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a74847d4340..2fba95aa1a6 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -27,6 +27,7 @@ rec { isAlpha = { cpu = { family = "alpha"; }; }; isOr1k = { cpu = { family = "or1k"; }; }; isM68k = { cpu = { family = "m68k"; }; }; + isS390 = { cpu = { family = "s390"; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 8a8b0888149..386f252f2ba 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -105,6 +105,8 @@ rec { riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; + s390 = { bits = 32; significantByte = bigEndian; family = "s390"; }; + sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; }; sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 378dc537598..6bd43f0d0d0 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 0674c88924e..82d17369743 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -209,6 +209,7 @@ stdenv.mkDerivation { else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" else if targetPlatform.isM68k then "m68k" + else if targetPlatform.isS390 then "s390" else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" From c9ea31512ce0e2642827e41ce096f1f05f7edc62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Jul 2021 05:20:14 +0000 Subject: [PATCH 0389/1522] csfml: 2.5 -> 2.5.1 --- pkgs/development/libraries/csfml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index cfc41b9271b..3aebe23ee38 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "csfml"; - version = "2.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; rev = version; - sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm"; + sha256 = "sha256-a46V5CakKVygNfr3/nZwlsCyqNsbti4a3cr7itK5QfI="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; From e7ddc0ff6a34b22777afca389ae28af40964c662 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 04:13:00 +0000 Subject: [PATCH 0390/1522] dbmate: 1.12.0 -> 1.12.1 --- pkgs/development/tools/database/dbmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 0e4609a1fa2..5348d0be88c 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dbmate"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-Kk8CtGw1lGNky2CUjaedh0IcDooaxWkeEnaYl/5jSTc="; + sha256 = "sha256-XNxy8CnhO3rQi3VHr7nikFNXvY2eM30jR0ngNc0FV3E="; }; vendorSha256 = "sha256-Qe3fwyEf/NiGmUSha/zZHRBR1okw2vE97u7tybqiWNI="; From 1730d167ec5a997554da787e40f49d4d05ca699a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 07:47:47 +0000 Subject: [PATCH 0391/1522] libcouchbase: 3.1.3 -> 3.1.4 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 9cb83c5bf65..9e271a781e1 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "16mafxkdbns33yjyc2p3j2iajjpyq0zp66wpjir2qj1w3kgggcw8"; + sha256 = "sha256-6IBTUodKpE/RkqQb0IwSEgXfnIhfYyNNrZt5hxJ6DV8="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From 51252b83d2011ab3607b898c50ba8d74d8cfc005 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 13:59:14 +1000 Subject: [PATCH 0392/1522] xspim: init at 9.1.22 --- pkgs/development/tools/misc/xspim/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/tools/misc/xspim/default.nix diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix new file mode 100644 index 00000000000..2e6e3e3eb10 --- /dev/null +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchsvn, imake, bison, flex, xlibsWrapper, libXaw, libXpm, ... }: + +stdenv.mkDerivation rec { + pname = "xspim"; + version = "9.1.22"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/spimsimulator/code/"; + rev = "r739"; + sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + }; + + nativeBuildInputs = [ imake bison flex ]; + buildInputs = [ xlibsWrapper libXaw libXpm ]; + + preConfigure = '' + cd xspim + xmkmf + ''; + + makeFlags = [ + "BIN_DIR=${placeholder "out"}/bin" + "EXCEPTION_DIR=${placeholder "out"}/share/spim" + "MAN_DIR=${placeholder "out"}/share/man/man1" + ]; + + doCheck = true; + preCheck = '' + pushd ../spim + ''; + postCheck = '' + popd + ''; + + preInstall = '' + mkdir -p $out/share/spim + install -D ../spim/spim $out/bin/spim + install -D ../Documentation/spim.man $out/share/man/man1/spim.1 + install -D ../Documentation/xspim.man $out/share/man/man1/xspim.1 + ''; + + meta = with lib; { + description = "A MIPS32 simulator"; + homepage = "http://spimsimulator.sourceforge.net/"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..4cd06d055f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10019,6 +10019,8 @@ in xsensors = callPackage ../os-specific/linux/xsensors { }; + xspim = callPackage ../development/tools/misc/xspim { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; xwallpaper = callPackage ../tools/X11/xwallpaper { }; From 3a284fbde0a7abe4e4b05f1aad31df6a66f5e8b8 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Sun, 25 Jul 2021 11:40:23 +0700 Subject: [PATCH 0393/1522] corehunt: init at 4.2.0 --- pkgs/applications/misc/corehunt/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/misc/corehunt/default.nix diff --git a/pkgs/applications/misc/corehunt/default.nix b/pkgs/applications/misc/corehunt/default.nix new file mode 100644 index 00000000000..ad1fabb2504 --- /dev/null +++ b/pkgs/applications/misc/corehunt/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }: + +mkDerivation rec { + pname = "corehunt"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-KnIqLI8MtLirFycW2YNHAjS7EDfU3dpqb6vVq9Tl6Ow="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + ]; + + meta = with lib; { + description = "A file finder utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b2..cccd2bbfa59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3892,6 +3892,8 @@ in c14 = callPackage ../applications/networking/c14 { }; + corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; From b400b6f91d0cc62a29f79e3dd8494cf93a7412ca Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sun, 25 Jul 2021 06:53:08 +0100 Subject: [PATCH 0394/1522] iterm2: 3.3.9 -> 3.4.0 (#131314) Fixes: #131269 --- pkgs/applications/terminal-emulators/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index ff5c7f8dae4..9f157a75f93 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iterm2"; - version = "3.3.9"; + version = "3.4.0"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "06mq3gfjgy8jw2f3fzdsi3pbfkdijfzzlhlw6ixa5bfb4hbcgn5j"; + sha256 = "09nhrmi25zxw3vp0wlib9kjr3p1j6am2zpwimdzqn0c80fq1lwvi"; }; patches = [ ./disable_updates.patch ]; From a57ca29433890e526835c8d40594a96caeadeca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Jul 2021 07:49:36 +0200 Subject: [PATCH 0395/1522] python3Packages.graphviz: 0.16 -> 0.17 https://github.com/xflr6/graphviz/blob/0.17/CHANGES.txt --- .../python-modules/graphviz/default.nix | 7 +++-- .../graphviz/hardcode-graphviz-path.patch | 26 +++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 0a2413e9d76..d0483864ff8 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , substituteAll , graphviz @@ -12,14 +13,16 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.16"; + version = "0.17"; + + disabled = pythonOlder "3.6"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g"; + sha256 = "sha256-K6z2C7hQH2A9bqgRR4MRqxVAH/k2NQBEelb2/6KDUr0="; }; patches = [ diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch index fa2f634bbc2..ba25d54e370 100644 --- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch @@ -1,9 +1,9 @@ diff --git a/graphviz/backend.py b/graphviz/backend.py -index d2c4b97..f7175cd 100644 +index b66e616..3da4ef0 100644 --- a/graphviz/backend.py +++ b/graphviz/backend.py -@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None): - raise ValueError('unknown formatter: %r' % formatter) +@@ -124,7 +124,7 @@ def command(engine: str, format_: str, filepath=None, + raise ValueError(f'unknown formatter: {formatter!r}') output_format = [f for f in (format_, renderer, formatter) if f is not None] - cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] @@ -11,7 +11,7 @@ index d2c4b97..f7175cd 100644 if filepath is None: rendered = None -@@ -275,7 +275,7 @@ def unflatten(source, +@@ -297,7 +297,7 @@ def unflatten(source: str, if fanout and stagger is None: raise RequiredArgumentError('fanout given without stagger') @@ -20,8 +20,8 @@ index d2c4b97..f7175cd 100644 if stagger is not None: cmd += ['-l', str(stagger)] if fanout: -@@ -304,7 +304,7 @@ def version(): - Graphviz Release version entry format +@@ -332,7 +332,7 @@ def version() -> typing.Tuple[int, ...]: + Graphviz Release version entry format: https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20 """ - cmd = ['dot', '-V'] @@ -30,19 +30,19 @@ index d2c4b97..f7175cd 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT) diff --git a/tests/test_backend.py b/tests/test_backend.py -index d10ef1a..e4aba58 100644 +index e0a0e1c..681f178 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py -@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): +@@ -54,7 +54,7 @@ def test_run_encoding_mocked(mocker, Popen, input='sp\xe4m', encoding='utf-8'): m.decode.assert_called_once_with(encoding) --@pytest.exe +-@pytest.mark.exe +@pytest.mark.skip(reason='empty $PATH has no effect') @pytest.mark.usefixtures('empty_path') @pytest.mark.parametrize('func, args', [ (render, ['dot', 'pdf', 'nonfilepath']), -@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -148,7 +148,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' @@ -51,8 +51,8 @@ index d10ef1a..e4aba58 100644 stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=None, startupinfo=mocker.ANY) -@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 - assert e.value.stdout is mocker.sentinel.out +@@ -211,7 +211,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, Popen, quiet): # noqa: N803 + assert e.value.stdout is out e.value.stdout = mocker.sentinel.new_stdout assert e.value.stdout is mocker.sentinel.new_stdout - Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], @@ -62,7 +62,7 @@ index d10ef1a..e4aba58 100644 stderr=subprocess.PIPE, @@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 - assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out + assert pipe('dot', 'png', b'nongraph', quiet=quiet) == b'stdout' - Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], From 63fbf319d2b8cd931dd4ca4ecf1e1f811754876a Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 16:00:04 +1000 Subject: [PATCH 0396/1522] nttcp: init at 1.47 --- pkgs/tools/networking/nttcp/default.nix | 27 +++++++++++++++++++ .../networking/nttcp/format-security.patch | 12 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/networking/nttcp/default.nix create mode 100644 pkgs/tools/networking/nttcp/format-security.patch diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix new file mode 100644 index 00000000000..8979c5fd2ac --- /dev/null +++ b/pkgs/tools/networking/nttcp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl, ... }: + +stdenv.mkDerivation rec { + pname = "nttcp"; + version = "1.47"; + + src = fetchurl { + url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; + sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50"; + }; + + patches = [ + # Fix format string compiler error + ./format-security.patch + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; + + meta = with lib; { + description = "New test TCP program"; + license = licenses.unfree; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/nttcp/format-security.patch b/pkgs/tools/networking/nttcp/format-security.patch new file mode 100644 index 00000000000..f0a60457768 --- /dev/null +++ b/pkgs/tools/networking/nttcp/format-security.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c +--- nttcp-1.47/nttcp.c 2000-12-18 05:16:54.000000000 -0500 ++++ nttcp-1.47.new/nttcp.c 2012-01-30 23:44:02.260501225 -0500 +@@ -372,7 +372,7 @@ + #define Message(x) fMessage(stdout, x) + + void Exit(char *s, int ret) { +- syslog(LOG_DEBUG, s); ++ syslog(LOG_DEBUG, "%s", s); + fMessage(stderr,s); + exit(ret); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..3f4f0160a4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7519,6 +7519,8 @@ in numlockx = callPackage ../tools/X11/numlockx { }; + nttcp = callPackage ../tools/networking/nttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; From ebe051fca136c3d2621cf00715576249c5c1fe90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Jul 2021 08:14:34 +0200 Subject: [PATCH 0397/1522] python3Packages.imap-tools: 0.42.0 -> 0.44.0 https://github.com/ikvk/imap_tools/releases/tag/v0.43.0 https://github.com/ikvk/imap_tools/releases/tag/v0.44.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 5d4e41c5e5f..d1cecdda42d 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.42.0"; + version = "0.44.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-WNhhQ3iqqwyYyd+iOQVpsKAAfgJwJBaUR7rmYAEYUxw="; + sha256 = "sha256-C9396yRSowaLe3E1s+rw8bah77znjfoIhLwJpcqhN6Y="; }; checkInputs = [ From b7859406d3cf8c6c10d6f5e89ee121d1d6868492 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 06:26:13 +0000 Subject: [PATCH 0398/1522] gallery-dl: 1.18.1 -> 1.18.2 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index b617e7b2ea1..3f71bd2be22 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.18.1"; + version = "1.18.2"; src = fetchPypi { inherit pname version; - sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9"; + sha256 = "786772ce774929ef1ba64d8394dbab329a72447fd8b930968bc1fb0aacdba567"; }; propagatedBuildInputs = [ requests ]; From 003d8abd3016fd7fea2af90a0c85171a6fa21b03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 06:46:08 +0000 Subject: [PATCH 0399/1522] evans: 0.9.3 -> 0.10.0 --- pkgs/development/tools/evans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index dfc9d34b5ac..bfe58a8dd04 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q8HWDZpUWaitdZcWkvKEWWbIWCj9VmWCxxhAdcYZx8s="; + sha256 = "sha256-Ftt3lnwLk2Zx1DxDmZx2hBqXcxzqUb6I/gEdQJuFsCc="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ntRlrbsQjZmVxEg9361Q+f6Wb/R393+sbOKOEh5VKPk="; + vendorSha256 = "sha256-WclmINHcgRtbRSZGv+lOgwuImHKVC9cfK8C+f9JBcts="; meta = with lib; { description = "More expressive universal gRPC client"; From 434508d7016ead992bfe71198e7e44086451af38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 08:51:45 +0200 Subject: [PATCH 0400/1522] python3Packages.asysocks: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/asysocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 21a3ed2a8fe..16e71a62ff4 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7EzSALAJcx8BNHX44FeeiSPRcTe9UFHXQ4IoSKxMU8w="; + sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv"; }; # Upstream hasn't release the tests yet From c563421ff7ca3f937af5ff2ebfeb0ca681fd61d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 08:58:09 +0200 Subject: [PATCH 0401/1522] tfsec: 0.51.2 -> 0.51.4 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 62c05439644..176dea9a7bd 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.51.2"; + version = "0.51.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "18qblimn78w17gydy7h9sjl9ri1wkvzi5phsqz1dkk43i3ryjg3s"; + sha256 = "0l9b6hdcfcyn03y5wsfganb3h2vsnlrs9y3vahnnlx4rvv51ldwf"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From d74ac2c4eaded904255199dbccc53a3867265f6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 09:04:34 +0200 Subject: [PATCH 0402/1522] python3Packages.regenmaschine: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index e19c744ba65..0f1240549af 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.3"; + version = "3.1.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-3Q0JQQVspzuQQAn3S46uFbOYW2zQ7c1UL4zjEOnifDY="; + sha256 = "07ldbajm1y92szdc36z5cl02dpvbarsb8clq9m45849gm8g7yczd"; }; nativeBuildInputs = [ From 1566e187da34c20b945d70ea626beb2e9d6d3554 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Sun, 25 Jul 2021 10:07:04 +0300 Subject: [PATCH 0403/1522] androidStudioPackages.{canary,dev}: 2021.1.1.3 -> 2021.1.1.4 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 0ead5ff670c..12f8f2e0df1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85"; }; latestVersion = { # canary & dev - version = "2021.1.1.3"; # "Android Studio Bumblebee (2021.1.1) Canary 3" - sha256Hash = "1n8iahaqhmzvpps9vhv93n3yabb26vl78yndd6gid028r8r90y4x"; + version = "2021.1.1.4"; # "Android Studio Bumblebee (2021.1.1) Canary 4" + sha256Hash = "0s2py7xikzryqrfd9v3in9ia9qv71dd9aad1nzbda6ff61inzizb"; }; in { # Attributes are named by their corresponding release channels From 65ae9a162b1a9399c3f0e24c42184bd776f2dbd9 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Sun, 25 Jul 2021 10:07:56 +0300 Subject: [PATCH 0404/1522] androidStudioPackages.beta: 2020.3.1.20 -> 2020.3.1.21 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 12f8f2e0df1..356eb4923b7 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,8 +14,8 @@ let sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk"; }; betaVersion = { - version = "2020.3.1.20"; # "Android Studio Arctic Fox (2020.3.1) Beta 5" - sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85"; + version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" + sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev version = "2021.1.1.4"; # "Android Studio Bumblebee (2021.1.1) Canary 4" From 6d76262230cafc19f5f12406af5bd29525183d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sat, 24 Jul 2021 15:28:04 +0700 Subject: [PATCH 0405/1522] blackshades: 1.1.1 -> 1.3.1 --- pkgs/games/blackshades/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 263d92dcea6..bd29c7b616c 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,30 +1,29 @@ { lib, stdenv, fetchFromSourcehut -, SDL, SDL_image, libGLU, libGL, openal, libvorbis, freealut }: +, SDL, stb, libGLU, libGL, openal, libvorbis, freealut }: stdenv.mkDerivation rec { pname = "blackshades"; - version = "1.1.1"; + version = "1.3.1"; src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; - sha256 = "1gx43hcqahbd21ib8blhzmsrwqfzx4qy7f10ck0mh2zc4bfihz64"; + sha256 = "0yzp74ynkcp6hh5m4zmvrgx5gwm186hq7p3m7qkww54qdyijb3rv"; }; - buildInputs = [ SDL SDL_image libGLU libGL openal libvorbis freealut ]; + buildInputs = [ SDL stb libGLU libGL openal libvorbis freealut ]; - patchPhase = '' + postPatch = '' sed -i -e s,Data/,$out/share/$pname/,g \ -e s,Data:,$out/share/$pname/,g \ src/*.cpp ''; installPhase = '' - mkdir -p $out/bin $out/share/doc/$pname + mkdir -p $out/bin $out/share cp build/blackshades $out/bin cp -R Data $out/share/$pname - cp README.md $out/share/doc/$pname ''; meta = { From c2461f0d67efbd642d647e827c8f234f15386fa1 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 17:14:03 +1000 Subject: [PATCH 0406/1522] zoom-us: 5.7.26030.0627 -> 5.7.28852.0718 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 78cfa89e6d4..087754775bd 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -29,11 +29,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.7.26030.0627"; + version = "5.7.28852.0718"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1nooaafH+ajRtdrknXmFPclC4fJMpRTo+gBsaPHYfT0="; + sha256 = "NoB9qxsuGsiwsZ3Y+F3WZpszujPBX/nehtFFI+KPV5E="; }; }; From abdc77e7d5c1fe413d1bff591a97a4b276798335 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 09:15:22 +0200 Subject: [PATCH 0407/1522] python3Packages.motioneye-client: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/motioneye-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index a769128fd86..a7981feb205 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pLdAxBipmr+HUr9NSupm7h/68PK95r3zY/qZTBs1m54="; + sha256 = "0ilh9wfzggnbfz068vkz66g64ar6isl3m2vcp7jf2zbaj0bqsjax"; }; nativeBuildInputs = [ From b17d7516f2b9dcfd22b9e2064167e82d54ae15d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Jul 2021 00:04:08 +0200 Subject: [PATCH 0408/1522] apache-directory-studio: 2.0.0-M15 -> 2.0.0-M17 --- .../networking/apache-directory-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 18f9a7990c3..b37039c94d2 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -10,8 +10,8 @@ let genericName = "Apache Directory Studio"; categories = "Java;Network"; }; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; + version = "2.0.0-M17"; + versionWithDate = "2.0.0.v20210717-M17"; in stdenv.mkDerivation rec { pname = "apache-directory-studio"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz"; - sha256 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37"; + sha256 = "19zdspzv4n3mfgb1g45s3wh0vbvn6a9zjd4xi5x2afmdjkzlwxi4"; } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; From 327eaa4292ce7f0b3eedd4ce49869961b04086fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 25 Jul 2021 14:30:53 +0700 Subject: [PATCH 0409/1522] moarvm: 2021.06 -> 2021.07 --- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 60a5e071545..73dac18a597 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.06"; + version = "2021.07"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "19vjcyb9fg9msjw1ih00c2qby480gl4highw24zx7j84slhsj013"; + sha256 = "1zk3dpvgrgg4kam3hx9pq1a2l2kgw822dci8hg7x0cn1lppwwdw4"; }; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; From 100411d53fcc25e7f1ca19375f2ad77a4e06c210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 25 Jul 2021 14:35:00 +0700 Subject: [PATCH 0410/1522] nqp: 2021.06 -> 2021.07 --- pkgs/development/interpreters/rakudo/nqp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 4b456d819f6..d34f5ac71a0 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.06"; + version = "2021.07"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "1d00lajjdd2k510fb0cb6c8bpklvlnncykf6jz8j8djfp0b2i696"; + sha256 = "191y6r6qxpib52h3drc5pbjrgf65pn5ahis1dyz55dxk7ajg5anw"; }; buildInputs = [ perl ]; From 662dbb477f2a0169357c8a98d5b100230d6ff3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 25 Jul 2021 14:35:19 +0700 Subject: [PATCH 0411/1522] rakudo: 2021.06 -> 2021.07 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index fdb3a78a1b7..eabbdf0b757 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.06"; + version = "2021.07"; src = fetchurl { url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "11ixlqmvbb37abksdysg5r4lkbwzr486lkc0ssl3wca4iiy3mhgf"; + sha256 = "0lmbgw24f8277b9kj725v3grwh1524p4iy5jbqajxwxjr16zx2hp"; }; nativeBuildInputs = [ removeReferencesTo ]; From 8c72d9ad8df85b33f6a76b5826f44f6ae90f4760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 25 Jul 2021 14:41:35 +0700 Subject: [PATCH 0412/1522] zef: 0.11.5 -> 0.11.9 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 61008f242b9..350eea43160 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.5"; + version = "0.11.9"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-LLUAwqky/q9KvFltrcff5U2BSLvOk/BbDSj07QlePSg="; + sha256 = "1x1jj9k80lza1b3aidw9ybi26kjf30mvqkmnnmxf27302ipq69jy"; }; nativeBuildInputs = [ makeWrapper ]; From 76f4182a36e9bfb7497868170d57e5bbf0c43887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 25 Jul 2021 09:42:35 +0200 Subject: [PATCH 0413/1522] zstd: fixup wrong preInstall order for isDarwin This regressed in 03e499425 (PR #129873). --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 16504d50dbf..f87a144f7cc 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -73,10 +73,10 @@ stdenv.mkDerivation rec { substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd '' + lib.optionalString buildContrib '' cp contrib/pzstd/pzstd $bin/bin/pzstd + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd ''; outputs = [ "bin" "dev" ] From 51d83077ffbca115265b04853e244179713c6518 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 25 Jul 2021 08:53:56 +0100 Subject: [PATCH 0414/1522] google-chrome: avoid crash under some situations If our Chrome derivation is Vulkan enabled, the Chrome GPU process reliably crashes for me under M92 using the proprietary Nvidia drivers. This is because the PCI-based GPU detection path fails, and we attempt to use the Vulkan fallback instead, which then crashes(!!) Including libpci allows us to use Angle's src/gpu_info_util/SystemInfo_libpci.cpp path instead, which doesn't crash, unlike src/gpu_info_util/SystemInfo_vulkan.cpp. --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index ec03a77d268..61d304becfd 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -18,7 +18,7 @@ , systemd # Loaded at runtime. -, libexif +, libexif, pciutils # Additional dependencies according to other distros. ## Ubuntu @@ -62,7 +62,7 @@ let alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd - libexif + libexif pciutils liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core From baba4208a16a47f8e1d16c2afc0809c45fefdbd0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Jul 2021 09:37:59 +0200 Subject: [PATCH 0415/1522] python3Packages.astroid: 2.5.1 -> 2.5.6 --- .../python-modules/astroid/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index d6fda529d5d..efbf2f2e0f8 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,25 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , isPyPy , lazy-object-proxy , wrapt , typed-ast , pytestCheckHook +, setuptools-scm +, setuptools-scm-git-archive +, pylint }: buildPythonPackage rec { pname = "astroid"; - version = "2.5.1"; + version = "2.5.6"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "cfc35498ee64017be059ceffab0a25bedf7548ab76f2bea691c5565896e7128d"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8="; }; + SETUPTOOLS_SCM_PRETEND_VERSION=version; + + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; + # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy @@ -30,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.tests = { + inherit pylint; + }; + meta = with lib; { description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; From 8c1bc844b4c57e38345484ce9a0caf6e4afbe215 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Jul 2021 09:47:40 +0200 Subject: [PATCH 0416/1522] python3Packages.pylint: 2.7.2 -> 2.7.4 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6c2702ef3db..ef42bd43239 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.2"; + version = "2.7.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0e21d3b80b96740909d77206d741aa3ce0b06b41be375d92e1f3244a274c1f8a"; + sha256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"; }; nativeBuildInputs = [ From fef9719a58f7e52c8c3346fa5ceacff0b456d5b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Jul 2021 10:06:26 +0200 Subject: [PATCH 0417/1522] python3Packages.astroid: remove setuptools-scm-git-archive I tested with this additional dependency and accidentally commited it. --- pkgs/development/python-modules/astroid/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index efbf2f2e0f8..59bd0bc7c36 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -8,7 +8,6 @@ , typed-ast , pytestCheckHook , setuptools-scm -, setuptools-scm-git-archive , pylint }: @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - setuptools-scm-git-archive ]; # From astroid/__pkginfo__.py From 70862830f0a1415acd6c9fb7fc74ab59530f41dc Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 09:59:18 +0200 Subject: [PATCH 0418/1522] nixos/syncoid: Extract datasets rather than pools When sending or receiving datasets with the old implementation it wouldn't matter which dataset we were sending or receiving, we would always delegate permissions to the entire pool. --- nixos/modules/services/backup/syncoid.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 888ef20f642..80a704a7d26 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -5,9 +5,9 @@ with lib; let cfg = config.services.syncoid; - # Extract the pool name of a local dataset (any dataset not containing "@") - localPoolName = d: optionals (d != null) ( - let m = builtins.match "([^/@]+)[^@]*" d; in + # Extract local dasaset names (so no datasets containing "@") + localDatasetName = d: optionals (d != null) ( + let m = builtins.match "([^/@]+[^@]*)" d; in optionals (m != null) m); # Escape as required by: https://www.freedesktop.org/software/systemd/man/systemd.unit.html @@ -206,15 +206,15 @@ in { path = [ "/run/booted-system/sw/bin/" ]; serviceConfig = { ExecStartPre = - map (pool: lib.escapeShellArgs [ + map (dataset: lib.escapeShellArgs [ "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user "bookmark,hold,send,snapshot,destroy" pool + cfg.user "bookmark,hold,send,snapshot,destroy" dataset # Permissions snapshot and destroy are in case --no-sync-snap is not used - ]) (localPoolName c.source) ++ - map (pool: lib.escapeShellArgs [ + ]) (localDatasetName c.source) ++ + map (dataset: lib.escapeShellArgs [ "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user "create,mount,receive,rollback" pool - ]) (localPoolName c.target); + cfg.user "create,mount,receive,rollback" dataset + ]) (localDatasetName c.target); ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] ++ optionals c.useCommonArgs cfg.commonArgs ++ optional c.recursive "-r" From bb35e7c4044432111ab9fec5ef9c4260ae651582 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 10:00:37 +0200 Subject: [PATCH 0419/1522] nixos/sanoid: Extract datasets rather than pools When making new snapshots we only need to delegate permissions to the specific dataset rather than the entire pool. --- nixos/modules/services/backup/sanoid.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index abc4def1c61..9713581165b 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -70,8 +70,8 @@ let processChildrenOnly = process_children_only; }; - # Extract pool names from configured datasets - pools = unique (map (d: head (builtins.match "([^/]+).*" d)) (attrNames cfg.datasets)); + # Extract unique dataset names + datasets = unique (attrNames cfg.datasets); configFile = let mkValueString = v: @@ -156,18 +156,18 @@ in { systemd.services.sanoid = { description = "Sanoid snapshot service"; serviceConfig = { - ExecStartPre = map (pool: lib.escapeShellArgs [ + ExecStartPre = map (dataset: lib.escapeShellArgs [ "+/run/booted-system/sw/bin/zfs" "allow" - "sanoid" "snapshot,mount,destroy" pool - ]) pools; + "sanoid" "snapshot,mount,destroy" dataset + ]) datasets; ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/sanoid" "--cron" "--configdir" (pkgs.writeTextDir "sanoid.conf" configFile) ] ++ cfg.extraArgs); - ExecStopPost = map (pool: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "unallow" "sanoid" pool - ]) pools; + ExecStopPost = map (dataset: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "unallow" "sanoid" dataset + ]) datasets; User = "sanoid"; Group = "sanoid"; DynamicUser = true; From 463148c57a99b4cc6b46b197ff4fd6a28273e97a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 11:37:53 +0000 Subject: [PATCH 0420/1522] cimg: 2.9.7 -> 2.9.8 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index f70513e0cd0..69e16a8922a 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.7"; + version = "2.9.8"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-cR2wvGtomT1cZh8wKMCfYDNuP3d1gKhHJavVnvuQ8Mc="; + sha256 = "sha256-nEICs1oAIXu6/5O4R3mbwig1OY+HDIWWeQjrcYnCwT0="; }; installPhase = '' From b9c9d93e517c7e2457125ccac384127139426ffb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 08:31:51 +0000 Subject: [PATCH 0421/1522] _389-ds-base: 2.0.6 -> 2.0.7 --- pkgs/servers/ldap/389/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 34bb901f671..aa46426142b 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8="; + sha256 = "sha256-aM1qo+yHrCFespPWHv2f25ooqQVCIZGaZS43dY6kiC4="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; From b59fd45b12dac8b3326797b5195f20e425d7d2ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 00:06:19 +0000 Subject: [PATCH 0422/1522] clight: 4.5 -> 4.6 --- pkgs/applications/misc/clight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 10ddb290204..0bed99ab725 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-fvi0JGNNDoxE0iH//HneYwQBBP4mY75AeViLHKQUI30="; + sha256 = "sha256-5kFzVHxoiZi8tz42eUprm49JHCeuA4GPwtHvdiS2RJY="; }; # dbus-1.pc has datadir=/etc From 4c842cc4d83f80a26ab98e1a1a8ec51f6c1ac5c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 08:24:38 +0000 Subject: [PATCH 0423/1522] gnome.gdm: 40.0 -> 40.1 --- pkgs/desktops/gnome/core/gdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index f3044977349..e3c69383637 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -42,13 +42,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; + sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0="; }; mesonFlags = [ From 10012bacc60a7116cfe16a2fe4df9fe28751d870 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 22:54:05 +0000 Subject: [PATCH 0424/1522] carla: 2.3.0 -> 2.3.1 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 38514e40d00..bdafb93955c 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-724EFBpbmPMuU1m3T0XMaeohURJA5JcxHfUPYbZ/2LE="; + sha256 = "sha256-LM7wRvUg2Q3f4qBZN1MPvsLkdl1ziArCfhdalyD1G3w="; }; nativeBuildInputs = [ From 2e9d0ededcdba4e06ccc26aaf6c40a41228cde15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 18:25:54 +0000 Subject: [PATCH 0425/1522] evolution-data-server: 3.40.2 -> 3.40.3 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 8781a2aa7fd..480f95b970b 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.2"; + version = "3.40.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7IKVFjnzKlzs6AqLC5qj9mt9MY4+4sHDUjTy4r3opBg="; + sha256 = "Trs5F9a+tUrVlt5dilxG8PtXJJ7Z24HwXHqUpzDB2SE="; }; patches = [ From 9d28b44f60f254fb0c254ab9447cc6e6b71733c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 14:34:06 +0000 Subject: [PATCH 0426/1522] bzrtp: 4.5.10 -> 5.0.0 --- pkgs/development/libraries/bzrtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 5236c92527e..6ee48a0a042 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.5.10"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-8qlCTkiRKMDODKMsa52pskBJ7pjqCDYkUJDb/5gFoKg="; + sha256 = "sha256-cagRN0DQw1/efCuMWngcF04SE9bViHANaNsQNKB5txA="; }; buildInputs = [ bctoolbox sqlite ]; From 72517fee4dc42a522e3c57863e4be6c0138b82e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 10:14:38 +0000 Subject: [PATCH 0427/1522] juju: 2.9.5 -> 2.9.7 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index a91255f54e3..ced8b2fd415 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.5"; + version = "2.9.7"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-oBwusx63a8AWNHqlNtG0S/SiIRM55fbc/CGN2MFJDYA="; + sha256 = "sha256-jGrN0tsLO8gmkyZ1zNYzZd29mCQgLP7lSF0LkOygbyc="; }; - vendorSha256 = "sha256-VHUDqDsfY0c6r5sJbMX7JcXTIBXze9cd5qHqZWZAC2g="; + vendorSha256 = "sha256-0JNoOSNxJrJkph8OGzgQ7sdslnGC36e3Ap0uMpqriX0="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From e050c6890ad49c176e68db086d395b538ff8f5df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 15:22:38 +0000 Subject: [PATCH 0428/1522] hubstaff: 1.5.19-9e79d1da -> 1.6.0-02e625d8 --- pkgs/applications/misc/hubstaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 1bc22b6613d..b49993ddb9c 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.19-9e79d1da/Hubstaff-1.5.19-9e79d1da.sh"; - version = "1.5.19-9e79d1da"; - sha256 = "1l4sq8cblpl1kclkx5pgy0ldfmqa3n8bvdl5qml0n78r0lpk382j"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.0-02e625d8/Hubstaff-1.6.0-02e625d8.sh"; + version = "1.6.0-02e625d8"; + sha256 = "1rd4icgy25j9l1xs6djmpv2nc2ilvjpblddv95xvvz39z82sfr29"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From d0834047e99a8d132ee5e5a6c77a91cfa6e96f96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 13:35:31 +0000 Subject: [PATCH 0429/1522] fuzzel: 1.6.0 -> 1.6.1 --- pkgs/applications/misc/fuzzel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 1e51f69f1c1..daf5beb2fa7 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.6.0"; + version = "1.6.1"; src = fetchzip { url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; - sha256 = "sha256-iTpUWvQszDtNc1gDqkPbhvgUVNWydpivhnOCHMJVtSw="; + sha256 = "sha256-JW5sAlTprSRIdFbmSaUreGtNccERgQMGEW+WCSscYQk="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; From b08a47402dea3d8bb8b444a57aa00676d6e8eab8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 07:25:33 +0000 Subject: [PATCH 0430/1522] mackerel-agent: 0.71.2 -> 0.72.1 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 988d502e143..d8987f9e5ad 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.71.2"; + version = "0.72.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O67xzL4avCOh2x6qJCScOWR2TS1hfP5S6jHHELNbZWQ="; + sha256 = "sha256-pUbZY+TjSZNOrmRarYVUDI0HoIUMY0LacdFSdqQ/7D4="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-iFWQoAnB0R6XwjdPvOWJdNTmEZ961zE51vDrmZ7r4Jk="; + vendorSha256 = "sha256-trVfF4voye6CQ5WK78yBT86fgSUFyxaCtsZx6kXgYGE="; subPackages = [ "." ]; From e84a1189f509e7a9835a061503d2197a6778f9cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 03:11:01 +0000 Subject: [PATCH 0431/1522] doppler: 3.25.0 -> 3.26.0 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index d71350e3d74..df466b0012d 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-9knCRS5pUFSmevpQbM0DQimGpAt2Fn1XpREg0ZWRIUQ="; + sha256 = "sha256-x6LQDQ+DRfP4d87OWEppqk4FV7SHuRMog4m0DOWkvF4="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; From f1561b7f4dfa78288ef470724377f94a7e56efe3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 08:36:31 +0000 Subject: [PATCH 0432/1522] glances: 3.2.1 -> 3.2.2 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index e950fcfb1cd..1d1182ba0d5 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.1"; + version = "3.2.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0m2cxmlyay2rr9hnc08s5q9xwdqy0nhzsl10by4f9ji0kiahnpl6"; + sha256 = "13w7bxfizsfi3xyhharnindyn3dv3p9p54a4xwyhnnhczs8kqa8s"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From d3483140b2808fe68323b29f432e40fe80d54df6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 03:51:42 +0000 Subject: [PATCH 0433/1522] erlangR23: 23.3.4.4 -> 23.3.4.5 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 9e344adc15a..3d0a2b16006 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.4.4"; - sha256 = "dnoSGfBUZrgcnNQNAoqmVOxK/NQlt1DC187sxg7mPq8="; + version = "23.3.4.5"; + sha256 = "2u/w8IPKHEZ+rZ3T7Wn9+Ggxe6JY8cHz8q/N0RjbrNU="; } From f5e367d987791b5060f5cc71923901a29d56cc5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 09:02:08 +0000 Subject: [PATCH 0434/1522] gnome.gnome-sudoku: 40.1 -> 40.2 --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 3bd0ec3b3cd..1431a617949 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; + sha256 = "NhIFMePHE5WB6jgA+/48KzFpTEQBRezIl6w05WLXVKM="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; From 7b3c0545149cb5c67611945d6022b61047439d61 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 11:49:57 +0200 Subject: [PATCH 0435/1522] nixos/tests/chromium: Check the version and that it's an official build This also prints and screenshots the output of chrome://version which contains useful information. Outputs (stable, beta, ungoogled, chrome-stable, chrome-beta, chrome-dev): Chromium 92.0.4515.107 (Official Build) (64-bit) Chromium 92.0.4515.107 (Official Build) (64-bit) Chromium 91.0.4472.164 (Official Build, ungoogled-chromium) (64-bit) Google Chrome 92.0.4515.107 (Official Build) (64-bit) Google Chrome 92.0.4515.107 (Official Build) beta (64-bit) Google Chrome 93.0.4577.8 (Official Build) dev (64-bit) --- nixos/tests/chromium.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 0c85b2d2199..4d34c852389 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -243,6 +243,16 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.wait_for_text("Graphics Feature Status") + with test_new_win("version_info", "chrome://version", "About Version") as clipboard: + filters = [ + r"${chromiumPkg.version} \(Official Build", + ] + if not all( + re.search(filter, clipboard) for filter in filters + ): + assert False, "Version info not correct." + + machine.shutdown() ''; }) channelMap From 4ec2b24603e6eb4a48272678c75d2518de4e2191 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 12:12:18 +0200 Subject: [PATCH 0436/1522] nixos/tests/chromium: Drop the workaround for Chrome GPU crashes This regression was fixed by 51d83077ffb. --- nixos/tests/chromium.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 4d34c852389..ea9e19cefbc 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -80,12 +80,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec { binary = pname # Add optional CLI options: options = [] - major_version = "${versions.major (getVersion chromiumPkg.name)}" - if major_version > "91" and pname.startswith("google-chrome"): - # To avoid a GPU crash: - options += ["--use-gl=angle", "--use-angle=swiftshader"] - options.append("file://${startupHTML}") # Launch the process: + options.append("file://${startupHTML}") machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown')) if binary.startswith("google-chrome"): # Need to click away the first window: From f6c5598f54ebe442debef526b6baf9fdbeb4d1da Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 13:27:41 +0200 Subject: [PATCH 0437/1522] tdesktop: Cleanup/refactor Drop old/outdated comments and some reordering for consistency. --- .../telegram/tdesktop/default.nix | 22 +++++-------------- .../telegram/tdesktop/tg_owt.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 31aec0a4678..1eb4b222f20 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,11 +1,13 @@ { mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +, extra-cmake-modules , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc -, rnnoise, extra-cmake-modules +, rnnoise # Transitive dependencies: -, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy +, util-linuxMinimal +, pcre, libpthreadstubs, libXdmcp, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie , xdg-utils, libsysprof-capture, libpsl, brotli }: @@ -72,7 +74,7 @@ in mkDerivation rec { tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. - pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy + pcre libpthreadstubs libXdmcp libselinux libsepol epoxy at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli ]; @@ -85,20 +87,6 @@ in mkDerivation rec { "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" ]; - # Note: The following packages could be packaged system-wide, but it's - # probably best to use the bundled ones from tdesktop (Arch does this too): - # rlottie: - # - Sources (problem: there are no stable releases!): - # - desktop-app (tdesktop): https://github.com/desktop-app/rlottie - # - upstream: https://github.com/Samsung/rlottie - # libtgvoip: - # - Sources (problem: the stable releases might be too old!): - # - tdesktop: https://github.com/telegramdesktop/libtgvoip - # - upstream: https://github.com/grishka/libtgvoip - # Both of these packages are included in this PR (kotatogram-desktop): - # https://github.com/NixOS/nixpkgs/pull/75210 - # TODO: Package mapbox-variant - postFixup = '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 363650dae5a..e553c95990e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , openh264, usrsctp, libevent, libvpx +, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi }: stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5180fef9b2b..80eebdeb35f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27340,7 +27340,9 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (xorg) libpthreadstubs libXdmcp; + }; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; From 63935e7160bb6a26e0f0ca16a6b3bbbafec60315 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 12:52:35 +0200 Subject: [PATCH 0438/1522] tdesktop: remove abbradar from maintainers Their last tdesktop commit is 4c3c71fdd4b from 2018. Thank you for maintaining Telegram-Desktop in the past. --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1eb4b222f20..5f023e1cc9b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -114,6 +114,6 @@ in mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ primeos abbradar oxalica ]; + maintainers = with maintainers; [ oxalica primeos ]; }; } From 8ebf75b3c7ab95e42fa080503945dd056332c3ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Jul 2021 11:45:43 +0000 Subject: [PATCH 0439/1522] build(deps): bump cachix/cachix-action from 9 to 10 Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 9 to 10. - [Release notes](https://github.com/cachix/cachix-action/releases) - [Commits](https://github.com/cachix/cachix-action/compare/v9...v10) --- updated-dependencies: - dependency-name: cachix/cachix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 032a456569d..edd2755302a 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -22,7 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v9 + - uses: cachix/cachix-action@v10 with: # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 77655c494e0..e27a281a933 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -22,7 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v9 + - uses: cachix/cachix-action@v10 with: # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. name: nixpkgs-ci From 10594c9a96ac5e23f05040ea1e0789d631fdcd1f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 13:50:45 +0200 Subject: [PATCH 0440/1522] Revert "chromiumBeta: Temporarily build on Hydra" This reverts commit af9ea49430fe014708fa68b1ffe8513e4ecc9a00. Reason: Not required anymore. --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 705255942c4..e17f8ef7534 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -88,7 +88,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium" || channel == "beta") + hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) From 9ac31885527059cfc150343e576216e712408d1b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 13:53:59 +0200 Subject: [PATCH 0441/1522] chromium: Merge the installPhase command strings This wasn't done in 97570d30c7f to allow reusing chromiumBeta builds (without having to perform any changes) in the meantime. --- pkgs/applications/networking/browsers/chromium/browser.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e17f8ef7534..a86a82fcb5f 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -16,6 +16,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/crashpad_handler" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader @@ -62,9 +63,7 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop - '' + '' - cp -v "$buildPath/crashpad_handler" "$libExecPath/" - ''; # TODO: Merge + ''; passthru = { inherit sandboxExecutableName; }; From c7d4d354edc091bd32294ef18e1ffe1ce012ddc6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 25 Jul 2021 12:05:11 +0000 Subject: [PATCH 0442/1522] markets: init at 0.5.2 --- pkgs/applications/misc/markets/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/markets/default.nix diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix new file mode 100644 index 00000000000..bd9dd7ac950 --- /dev/null +++ b/pkgs/applications/misc/markets/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub +, desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala +, wrapGAppsHook +, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup +}: + +stdenv.mkDerivation rec { + pname = "markets"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "bitstower"; + repo = "markets"; + rev = version; + sha256 = "0nk1bs7i6b7r90g5qwd3s2m462vk3kvza0drq7rzb5sdaiz9ccnz"; + }; + + nativeBuildInputs = [ + desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala + wrapGAppsHook + ]; + buildInputs = [ + glib glib-networking gobject-introspection gtk3 json-glib libgee libhandy + libsoup + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + postInstall = '' + ln -s bitstower-markets $out/bin/markets + ''; + + meta = with lib; { + homepage = "https://github.com/bitstower/markets"; + description = "Stock, currency and cryptocurrency tracker"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80eebdeb35f..107722e6e10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25560,6 +25560,8 @@ in mark = callPackage ../tools/text/mark { }; + markets = callPackage ../applications/misc/markets { }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; From 05b7d71544e3a06b51d32e62febc2dab93b95d1b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Jul 2021 05:50:28 -0700 Subject: [PATCH 0443/1522] CODEOWNERS: remove ryantm from /nixos/doc --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 64719a7bc3a..eba0bf65133 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -46,7 +46,6 @@ /nixos/default.nix @nbp @infinisil /nixos/lib/from-env.nix @nbp @infinisil /nixos/lib/eval-config.nix @nbp @infinisil -/nixos/doc @ryantm /nixos/doc/manual/configuration/abstractions.xml @nbp /nixos/doc/manual/configuration/config-file.xml @nbp /nixos/doc/manual/configuration/config-syntax.xml @nbp From d0c2a472d826372c4cf94f491a7cadb0ac6ba3bc Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 25 Jul 2021 10:11:51 -0300 Subject: [PATCH 0444/1522] arb: 2.19.0 -> 2.20.0 --- pkgs/development/libraries/arb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 97af236af04..393639ea558 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "arb"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE="; + sha256 = "sha256-HOIbdkVV7NKowIGhDdn/S8unIRV469OnRHiuiCGaWgk="; }; buildInputs = [ mpir gmp mpfr flint ]; From 4036c82da82da2c7218e315871690fec19d467ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 05:09:47 +0000 Subject: [PATCH 0445/1522] flint: 2.7.1 -> 2.8.0 --- pkgs/development/libraries/flint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 7f814461f28..e9470986c73 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -12,11 +12,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "07j8r96kdzp19cy3a5yvpjxf90mkd6103yr2n42qmpv7mgcjyvhq"; + sha256 = "sha256-WEI1zcOdd52ZIOrvFv4ITzwm/+7qADo//2SiCg8zRJ4="; }; buildInputs = [ From b50d7d0683d61bf00a101ce7b67c7b0f065d7ff6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 25 Jul 2021 14:23:36 +0100 Subject: [PATCH 0446/1522] libgrss: add patch for CVE-2016-20011 --- pkgs/development/libraries/libgrss/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8c5ea73af0b..5e1c2b17858 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -14,6 +14,15 @@ stdenv.mkDerivation { sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; + patches = [ + (fetchpatch { + name = "CVE-2016-20011.patch"; + # https://gitlab.gnome.org/GNOME/libgrss/-/merge_requests/7, not yet merged! + url = "https://gitlab.gnome.org/GNOME/libgrss/-/commit/2c6ea642663e2a44efc8583fae7c54b7b98f72b3.patch"; + sha256 = "1ijvq2jl97vphcvrbrqxvszdmv6yyjfygdca9vyaijpafwyzzb18"; + }) + ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ glib libxml2 libsoup ]; From beb353c7765ad6ea632acccb26f0d63c8c12d06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Jul 2021 12:40:12 +0200 Subject: [PATCH 0447/1522] imagemagick6: 6.9.12-17 -> 6.9.12-19 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 4ac4af48aab..7cb4018f38f 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-17"; + version = "6.9.12-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-yZXvxl9Tbl3JRBmRcfsjbkaxywtD08SuUnJayKfwk9M="; + sha256 = "sha256-8KofT9aNd8SXL0YBQ0RUOTccVxQNacvJL1uYPZiSPkY="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 1894e8d9452640610c531a31186261b97d5d8f1c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 19 Jul 2021 12:00:00 +0000 Subject: [PATCH 0448/1522] bitwuzla: init at unstable-2021-07-01 --- .../science/logic/bitwuzla/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/science/logic/bitwuzla/default.nix diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix new file mode 100644 index 00000000000..a8820b55b74 --- /dev/null +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, fetchFromGitHub +, lib +, python3 +, cmake +, lingeling +, btor2tools +, gtest +, gmp +, cadical +, minisat +, picosat +, cryptominisat +, zlib +, pkg-config + # "*** internal error in 'lglib.c': watcher stack overflow" on aarch64-linux +, withLingeling ? !stdenv.hostPlatform.isAarch64 +}: + +stdenv.mkDerivation rec { + pname = "bitwuzla"; + version = "unstable-2021-07-01"; + + src = fetchFromGitHub { + owner = "bitwuzla"; + repo = "bitwuzla"; + rev = "58d720598e359b1fdfec4a469c76f1d1f24db51a"; + sha256 = "06ymqsdppyixb918161rmbgqvbnarj4nm4az88lkn3ri4gyimw04"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cadical + cryptominisat + picosat + minisat + btor2tools + gmp + zlib + ] ++ lib.optional withLingeling lingeling; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DPicoSAT_INCLUDE_DIR=${lib.getDev picosat}/include/picosat" + "-DBtor2Tools_INCLUDE_DIR=${lib.getDev btor2tools}/include/btor2parser" + "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ lib.optional doCheck "-DTESTING=YES"; + + checkInputs = [ python3 gtest ]; + # two tests fail on darwin and 3 on aarch64-linux + doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64); + preCheck = let + var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + export ${var}=$(readlink -f lib) + patchShebangs .. + ''; + + meta = with lib; { + description = "A SMT solver for fixed-size bit-vectors, floating-point arithmetic, arrays, and uninterpreted functions"; + homepage = "https://bitwuzla.github.io"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ symphorien ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c3366e81d3..c803a654783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30447,6 +30447,8 @@ in boolector = callPackage ../applications/science/logic/boolector {}; + bitwuzla = callPackage ../applications/science/logic/bitwuzla {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; mcy = callPackage ../applications/science/logic/mcy {}; From 8c59a77a04339beaced44b293db579c9aaa16aa0 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 25 Jul 2021 15:59:26 +0200 Subject: [PATCH 0449/1522] phpPackages.composer: 2.1.3 -> 2.1.5 https://github.com/composer/composer/releases/tag/2.1.4 https://github.com/composer/composer/releases/tag/2.1.5 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index aaa698e6d0c..15dd3f5bc59 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.3"; + version = "2.1.5"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "04ad2zsnf8qi6hzs9sak6y8xxyx8l0f7crmcimnp7nn8vsc2x9zq"; + sha256 = "1v4hjwbv1y5jvj91i2fj8bvmfsymp9ls8h231zd85svfqdy5b5dy"; }; dontUnpack = true; From 4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d Mon Sep 17 00:00:00 2001 From: sterni Date: Sun, 25 Jul 2021 15:45:06 +0200 Subject: [PATCH 0450/1522] Revert "ocamlPackages.letsencrypt: 0.2.5 -> 0.3.0" --- .../ocaml-modules/letsencrypt/app.nix | 45 ------------------- .../ocaml-modules/letsencrypt/default.nix | 25 ++++++++++- .../ocaml-modules/letsencrypt/dns.nix | 35 --------------- pkgs/top-level/ocaml-packages.nix | 4 -- 4 files changed, 23 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/letsencrypt/app.nix delete mode 100644 pkgs/development/ocaml-modules/letsencrypt/dns.nix diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix deleted file mode 100644 index dc9006d6d16..00000000000 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildDunePackage -, letsencrypt -, letsencrypt-dns -, cmdliner -, cohttp-lwt-unix -, logs -, fmt -, lwt -, mirage-crypto-rng -, ptime -, bos -, fpath -, randomconv -}: - -buildDunePackage { - pname = "letsencrypt-app"; - - inherit (letsencrypt) - src - version - useDune2 - minimumOCamlVersion - ; - - buildInputs = [ - letsencrypt - letsencrypt-dns - cmdliner - cohttp-lwt-unix - logs - fmt - lwt - mirage-crypto-rng - ptime - bos - fpath - randomconv - ]; - - meta = letsencrypt.meta // { - description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml"; - }; -} diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 623fba942f2..0a70bf30242 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -6,6 +6,11 @@ , uri , rresult , base64 +, cmdliner +, cohttp +, cohttp-lwt +, cohttp-lwt-unix +, zarith , logs , fmt , lwt @@ -15,25 +20,38 @@ , x509 , yojson , ounit +, dns +, dns-tsig , ptime +, bos +, fpath +, randomconv , domain-name }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.3.0"; + version = "0.2.5"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; + sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; }; minimumOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ + cmdliner + cohttp + cohttp-lwt-unix + zarith fmt + mirage-crypto-rng ptime + bos + fpath + randomconv domain-name ]; @@ -47,8 +65,11 @@ buildDunePackage rec { asn1-combinators x509 uri + dns + dns-tsig rresult astring + cohttp-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix deleted file mode 100644 index 99058f48d06..00000000000 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildDunePackage -, letsencrypt -, logs -, fmt -, lwt -, dns -, dns-tsig -, domain-name -}: - -buildDunePackage { - pname = "letsencrypt-dns"; - - inherit (letsencrypt) - version - src - useDune2 - minimumOCamlVersion - ; - - propagatedBuildInputs = [ - letsencrypt - dns - dns-tsig - domain-name - logs - lwt - fmt - ]; - - meta = letsencrypt.meta // { - description = "A DNS solver for the ACME implementation in OCaml"; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3e45490099c..200743944ee 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -607,10 +607,6 @@ let letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; - letsencrypt-app = callPackage ../development/ocaml-modules/letsencrypt/app.nix { }; - - letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { }; - linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { From e731250332709eed4384c1176cc176eb217fc55f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 14:26:34 +0200 Subject: [PATCH 0451/1522] ocamlPackages.tcpip: 6.1.0 -> 6.2.0 https://github.com/mirage/mirage-tcpip/releases/tag/v6.2.0 --- pkgs/development/ocaml-modules/tcpip/default.nix | 16 ++-------------- .../ocaml-modules/tcpip/makefile-no-opam.patch | 12 ------------ 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 53656f00572..635e9aea117 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -13,27 +13,15 @@ buildDunePackage rec { pname = "tcpip"; - version = "6.1.0"; + version = "6.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "7b3ed2e1ca835c1cc65ac911bcb0de12ebc2b580dd195006bdea2cb387510474"; + sha256 = "d0f6e643ce04da808d5f977c5ab2422cdb4f67e7abdc46dd6776ceada7151e1b"; }; - patches = [ - ./makefile-no-opam.patch - ]; - - # Make tests compatible with alcotest 1.4.0 - postPatch = '' - for p in common.ml test_tcp_options.ml - do - substituteInPlace test/$p --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' - done - ''; - nativeBuildInputs = [ bisect_ppx ppx_cstruct diff --git a/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch b/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch deleted file mode 100644 index 1603a1278b0..00000000000 --- a/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/freestanding/Makefile b/freestanding/Makefile -index f22d220d..3e97b4c5 100644 ---- a/freestanding/Makefile -+++ b/freestanding/Makefile -@@ -1,4 +1,6 @@ --PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig -+ifneq (, $(shell command -v opam)) -+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig -+endif - - EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) - From f027f8e38d926ffc925f4b9a7b1aa09cf2451ebc Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:16:52 +0200 Subject: [PATCH 0452/1522] ocamlPackages.x509: 0.13.0 -> 0.14.0 https://github.com/mirleft/ocaml-x509/releases/tag/v0.14.0 --- pkgs/development/ocaml-modules/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 0ce57b07168..85209098559 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "4577c2a616bda45cc777869fc44e272397d63a029135a993df8937bcfd6f6c49"; + sha256 = "9b42f34171261b2193ee662f096566c48c48e087949c186c288f90c9b3b9f498"; }; useDune2 = true; From 2f9cf506dd12c86a322ace5ae74b4eafee172cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 25 Jul 2021 19:22:26 +0100 Subject: [PATCH 0453/1522] build(deps): bump zeebe-io/backport-action (#131466) * build(deps): bump zeebe-io/backport-action Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 2b994724142df0774855690db56bc6308fb99ffa to 0.0.5. This release includes the previously tagged commit. - [Release notes](https://github.com/zeebe-io/backport-action/releases) - [Commits](https://github.com/zeebe-io/backport-action/compare/2b994724142df0774855690db56bc6308fb99ffa...e5d4d7c39c94b65670847d11d259b2f574fa3d30) --- updated-dependencies: - dependency-name: zeebe-io/backport-action dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> --- .github/workflows/backport.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bea970f02d4..0e3f315bb0d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -15,13 +15,13 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs # should be kept in sync with `version` - uses: zeebe-io/backport-action@2b994724142df0774855690db56bc6308fb99ffa + uses: zeebe-io/backport-action@v0.0.5 with: # Config README: https://github.com/zeebe-io/backport-action#backport-action github_token: ${{ secrets.GITHUB_TOKEN }} github_workspace: ${{ github.workspace }} # should be kept in sync with `uses` - version: 2b994724142df0774855690db56bc6308fb99ffa + version: v0.0.5 pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. From ae12ace63ed4fb24ee35e97f3aa0ac5a8ce41586 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 18:32:16 +0000 Subject: [PATCH 0454/1522] b3sum: 0.3.8 -> 1.0.0 --- pkgs/tools/security/b3sum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 1d9b2f66deb..9238ba06b1f 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "0.3.8"; + version = "1.0.0"; src = fetchCrate { inherit version pname; - sha256 = "1a42kwbl886yymm3v7h6y957x5f4yi9j40jy4szg9k0iy8bsdfmh"; + sha256 = "sha256-eWsvCpMG3iWB2cYIKaaP6h9QwKQQrpFNliHTqBtdzVw="; }; - cargoSha256 = "0v7ric12agicppg5ax5q0vwbslw7kmxpinafvdjj5sc2ysinw1zm"; + cargoSha256 = "sha256-YglKiEz/D5+Dz6CIzWIpoc33bhMSdGTM4MP/uJCxe7E="; meta = { description = "BLAKE3 cryptographic hash function"; From de0138305ef59ffbaef328bf0abd60bb1228f3dc Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Wed, 14 Jul 2021 22:44:23 +0300 Subject: [PATCH 0455/1522] rubik-font: init at 2.200 --- pkgs/data/fonts/rubik/default.nix | 103 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/data/fonts/rubik/default.nix diff --git a/pkgs/data/fonts/rubik/default.nix b/pkgs/data/fonts/rubik/default.nix new file mode 100644 index 00000000000..37afebb5cc0 --- /dev/null +++ b/pkgs/data/fonts/rubik/default.nix @@ -0,0 +1,103 @@ +{ stdenv, lib, fetchurl }: +let + # Latest commit touching the rubik tree + commit = "054aa9d546cd6308f8ff7139b332490e0967aebe"; +in +stdenv.mkDerivation { + pname = "rubik"; + version = "2.200"; + + srcs = [ + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Black.ttf"; + sha256 = "0h4mxqz0b5as7g964bv98aanaghp4wgs2g5wnf7apxnd2fng14dn"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BlackItalic.ttf"; + sha256 = "0x8j3fwavkf1jf7s97ncvs0jk463v1fyajcxqxvv7lpk55sjnbpy"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Bold.ttf"; + sha256 = "0prjqdbdpnhwr66gjw9mc1590gmjl7fir8wnanzch6arvngmxaj9"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BoldItalic.ttf"; + sha256 = "1zyl55fkjr61k6yfvgi0cr2iz4s0kkv3mkjpdmpla9jnk10rd8lm"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBold.ttf"; + sha256 = "0vi01lc2dadgmw5z26nkfzn7vl3lsd0flhqqfp40nn8jvpdkb2mq"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBoldItalic.ttf"; + sha256 = "0ldcszzzrc44gldflman7kcfk38x77grjb3zjvxjvgn875ggwabk"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Italic.ttf"; + sha256 = "09x7fh6ad4w6027410vhkvisgy8vqm2mzdsc19z3szlrxi0gl0rx"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Light.ttf"; + sha256 = "19a6k0pprcra6nxk3l0k6wkg9g0qn5h1v71rw2m8im64kyjx4qpf"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-LightItalic.ttf"; + sha256 = "0r9hbh9xnbp0584vjiiq72583j1ai3dw93gfy823c736y6bk0j2m"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Medium.ttf"; + sha256 = "01nky9la4qjd80dy200j8l7zl0r2h9zw90k7aghzlb5abk4i3zvf"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-MediumItalic.ttf"; + sha256 = "1i81x9h2cr65bj85z5b2mki59532nvlbh92wb84zfhfdz97s30cq"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Regular.ttf"; + sha256 = "1vk4n6yc4x1vlwfrp26jhagyl5l86jwa4lalccc320crrwqfc521"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBold.ttf"; + sha256 = "0blmy1ywsf9hr1a66cl12bjn32i072w6ncvsir0s5smm2c0gksvb"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBoldItalic.ttf"; + sha256 = "1sj22d3jrlxl6ka0naf5nby3k0i7pzadk5b8xgdhcslwijwiib3y"; + }) + ]; + + sourceRoot = "./"; + + unpackCmd = '' + ttfName=$(basename $(stripHash $curSrc)) + cp $curSrc ./$ttfName + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -a *.ttf $out/share/fonts/truetype/ + ''; + + meta = with lib; { + homepage = "https://fonts.google.com/specimen/Rubik"; + description = "Rubik Font - is a 5 weight Roman + Italic family."; + longDescription = '' + The Rubik Fonts project was initiated as part of the Chrome CubeLab + project. + + Rubik is a 5 weight Roman + Italic family. + + Rubik supports the Latin, Cyrillic and Hebrew scripts. The Latin and Cyrillic + were designed by Philipp Hubert and Sebastian Fischer at Hubert Fischer. + + The Hebrew was initially designed by Philipp and Sebastian, and then revised by + type designer and Hebrew native reader Meir Sadan to adjust proportions, + spacing and other design details. + + Cyrillic was initially designed by Philipp and Sebastian, and then revised and + expanded by Cyreal Fonts Team (Alexei Vanyashin and Nikita Kanarev). Exising + glyphs were improved, and glyph set was expanded to GF Cyrillic Plus. + ''; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9f9561022..69ed90410e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22678,6 +22678,8 @@ in recursive = callPackage ../data/fonts/recursive { }; + rubik = callPackage ../data/fonts/rubik { }; + rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; From f22bf0211bde4dd47f3a454227d44059fa6d155a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 20:48:46 +0200 Subject: [PATCH 0456/1522] wolfssl: 4.8.0 -> 4.8.1 --- .../development/libraries/wolfssl/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4c21eb27422..f4bfa96a6ff 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,8 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "wolfSSL"; @@ -11,12 +15,25 @@ stdenv.mkDerivation rec { sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h"; }; - # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed - configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; + # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed + configureFlags = [ + "--enable-all" + "--enable-base64encode" + "--enable-pkcs11" + "--enable-reproducible-build" + "--enable-tls13" + ]; - outputs = [ "out" "dev" "doc" "lib" ]; + outputs = [ + "dev" + "doc" + "lib" + "out" + ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + ]; postInstall = '' # fix recursive cycle: @@ -28,9 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; - homepage = "https://www.wolfssl.com/"; - platforms = platforms.all; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ mcmtroffaes ]; + homepage = "https://www.wolfssl.com/"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab mcmtroffaes ]; }; } From 508a22f51c406a672d421ea4a5c7dc2e4ad89b23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 20:58:09 +0200 Subject: [PATCH 0457/1522] python3Packages.pypck: 0.7.10 -> 0.7.11 --- pkgs/development/python-modules/pypck/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index b0ea3fdcb24..797657a28c5 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pytest-asyncio -, pytest-cov , pytest-timeout , pytestCheckHook , pythonOlder @@ -11,19 +10,18 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.10"; + version = "0.7.11"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "sha256-B2imewEONewj1Y+Q316reIBZB/b9WQAu67x9cLMkRTU="; + sha256 = "1jj0y487qcxrprx4x2rs6r7rqsf5m9khk0xhigbvnbyvh8rsd2jr"; }; checkInputs = [ pytest-asyncio - pytest-cov pytest-timeout pytestCheckHook ]; From 2c8947e6de5a91515d1879727328f07c26003e59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 21:29:11 +0200 Subject: [PATCH 0458/1522] python3Packages.aioambient: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/aioambient/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 83c74925b8c..8d75a1b11ee 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "1.2.4"; + version = "1.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk="; + sha256 = "1v8xr69y9cajyrdfz8wdksz1hclh5cvgxppf9lpygwfj4q70wh88"; }; nativeBuildInputs = [ @@ -46,12 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/bachya/aioambient/pull/84 - substituteInPlace pyproject.toml \ - --replace 'websockets = "^8.1"' 'websockets = ">=8.1,<10.0"' - ''; - # Ignore the examples directory as the files are prefixed with test_ disabledTestPaths = [ "examples/" ]; From 70338c53c99d06cc708f92a1050220d906ddc56a Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Sun, 25 Jul 2021 15:40:33 -0400 Subject: [PATCH 0459/1522] Added release notes and broke date apart --- .../from_md/release-notes/rl-2111.section.xml | 10 +++++++++- nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/web-apps/tt-rss.nix | 10 ++++++++-- pkgs/servers/tt-rss/default.nix | 13 ++++++++++++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a95b1dd66b9..c0e8867ca0e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -459,7 +459,7 @@ - + yggdrasil was upgraded to a new major @@ -468,6 +468,14 @@ changelog. + + + tt-rss was upgraded to the commit on + 2021-06-21, which has breaking changes, see + this + thread in the tt-rss forums for details. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index be46591dfa1..b0fbfc2bba7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -115,6 +115,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 0b23ba56cab..676683a557d 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -566,9 +566,14 @@ let "Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -" ]; - systemd.services.tt-rss = - { + systemd.services = { + phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { + restartTriggers = [ + cfg.root + ]; + }; + tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; preStart = let @@ -645,6 +650,7 @@ let wantedBy = [ "multi-user.target" ]; requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + }; }; services.mysql = mkIf mysqlLocal { diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index bd82f8d2890..39615a238e3 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,7 +2,10 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "2021-06-21"; + year = "21"; + month = "06"; + day = "21"; + version = "20${year}-${month}-${day}"; rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; src = fetchurl { @@ -11,8 +14,16 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir $out cp -ra * $out/ + + # see the code of Config::get_version(). you can check that the version in + # the footer of the preferences pages is not UNKNOWN + echo "${year}.${month}" > $out/version_static.txt + + runHook postInstall ''; meta = with lib; { From 76a1e7c5e3c6568c540969634a73b7e25cb030be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 21:49:41 +0200 Subject: [PATCH 0460/1522] cloud-init: fix build --- pkgs/tools/virtualization/cloud-init/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 1a0188127aa..439cf47e55c 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -76,6 +76,8 @@ buildPythonApplication rec { "TestConsumeUserDataHttp" # Chef Omnibus "TestInstallChefOmnibus" + # https://github.com/canonical/cloud-init/pull/893 + "TestGetPackageMirrorInfo" ]; disabledTestPaths = [ From 94ac68c879f4b172ade9cd7fabca1b9ed85bcdd1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 25 Jul 2021 22:04:24 +0200 Subject: [PATCH 0461/1522] eduke32: 20200907 -> 20210722 --- pkgs/games/eduke32/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e15cf241f75..8c7a79ff982 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20200907"; - rev = "9257"; - revExtra = "93f62bbad"; + version = "20210722"; + rev = "9484"; + revExtra = "f3fea8c15"; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; + sha256 = "0fdl2i465cl5x7129772ksx97lvim98m9009q5cfmf6scagj9pvz"; }; buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; From c7452ddec18aeaf3c9afa48c32733bbf8a50d42b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:07:45 +0200 Subject: [PATCH 0462/1522] python3Packages.pyvicare: 1.0.0 -> 1.1 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 274cb0379c2..4c06728a419 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "1.0.0"; + version = "1.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "05dlasx18fkmh4z1w8550yrb26fmsb5bc73wr9whmkasm32gpfl1"; + sha256 = "1mkbz1gl8bv4j7q82cbc9d3dzx80brzdwrcp8z3kma1b91ig99bk"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From bf5d2c431b28feb24c55cfd1e373385ff31f25d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:21:31 +0200 Subject: [PATCH 0463/1522] python3Packages.tomli: 1.0.4 -> 1.1.0 --- pkgs/development/python-modules/tomli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 4204be03b94..c658339dcd9 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tomli"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE="; + sha256 = "1cj6iil9sii1zl0l4pw7h4alcnhwdbxinpph2f0rm5rghrp6prjm"; }; nativeBuildInputs = [ flit-core ]; From 53007f4f229ceb8ba2e95c6c35e51042c91ebcff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:21:48 +0200 Subject: [PATCH 0464/1522] black: 21.6b0 -> 21.7b0 --- pkgs/development/python-modules/black/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 6f4e05767bb..2b968fb991a 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -11,7 +11,7 @@ , pathspec , parameterized , regex -, toml +, tomli , typed-ast , typing-extensions , uvloop @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.6b0"; + version = "21.7b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "016f6bhnnnbcrrh3cvmpk77ww0nykv5n1qvgf8b3044dm14264yw"; + sha256 = "06d27adq6v6p8wspi0wwqz2pnq34p5jhnqvijbin54yyj5j3qdy8"; }; nativeBuildInputs = [ setuptools-scm ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { mypy-extensions pathspec regex - toml + tomli typed-ast # required for tests and python2 extra uvloop ] ++ lib.optional (pythonOlder "3.7") dataclasses From ae13f7ccc5c5c3627d0c87964ac147b4ce5e3ee4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 22:28:15 +0200 Subject: [PATCH 0465/1522] flexget: 3.1.131 -> 3.1.133 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index b898ce33742..3d726eba980 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.131"; + version = "3.1.133"; src = python3Packages.fetchPypi { pname = "FlexGet"; inherit version; - sha256 = "sha256-wjMtCrffRhk7NL+Z0PeljuDc3WjVWSMsjWLbqo8qUjU="; + sha256 = "1mfmy2nbxx9k6hnhwxpf2062rwspigfhbvkpr161grd5amcs2cr6"; }; postPatch = '' From 6be2cb762e9a12e9e1086682cd3f86aa35858207 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 25 Jul 2021 22:40:25 +0200 Subject: [PATCH 0466/1522] warzone2100: 4.1.0 -> 4.1.1 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index feadcc7f8b2..6f31dcf9be9 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0="; + sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8="; }; buildInputs = [ From 11863820b2c4e10917e65c6c1f73cd3891ce97be Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 10 Jul 2021 14:40:33 -0600 Subject: [PATCH 0467/1522] ic-keysmith: init at 1.6.0 --- pkgs/tools/security/ic-keysmith/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/security/ic-keysmith/default.nix diff --git a/pkgs/tools/security/ic-keysmith/default.nix b/pkgs/tools/security/ic-keysmith/default.nix new file mode 100644 index 00000000000..9e480d64d18 --- /dev/null +++ b/pkgs/tools/security/ic-keysmith/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "keysmith"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "dfinity"; + repo = "keysmith"; + rev = "v${version}"; + sha256 = "1z0sxirk71yabgilq8v5lz4nd2bbm1xyrd5zppif8k9jqhr6v3v3"; + }; + + vendorSha256 = "1p0r15ihmnmrybf12cycbav80sdj2dv2kry66f4hjfjn6k8zb0dc"; + + meta = with lib; { + description = "Hierarchical Deterministic Key Derivation for the Internet Computer"; + homepage = "https://github.com/dfinity/keysmith"; + license = licenses.mit; + maintainers = with maintainers; [ imalison ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12493bfd4c2..11667ed787b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19595,6 +19595,8 @@ in hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + ic-keysmith = callPackage ../tools/security/ic-keysmith { }; + icecream = callPackage ../servers/icecream { }; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; From 85f3a06c9f132fb7344bced48c3e49e28268b19b Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 10 Jul 2021 22:22:07 -0600 Subject: [PATCH 0468/1522] quill-qr: init at 0.1.0 --- pkgs/tools/security/quill-qr/default.nix | 45 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/security/quill-qr/default.nix diff --git a/pkgs/tools/security/quill-qr/default.nix b/pkgs/tools/security/quill-qr/default.nix new file mode 100644 index 00000000000..55c2f45cc68 --- /dev/null +++ b/pkgs/tools/security/quill-qr/default.nix @@ -0,0 +1,45 @@ +{ coreutils +, fetchFromGitHub +, gzip +, jq +, lib +, makeWrapper +, qrencode +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation rec { + pname = "quill-qr"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "quill-qr"; + rev = "v${version}"; + sha256 = "1kdsq6csmxfvs2wy31bc9r92l5pkmzlzkyqrangvrf4pbk3sk0r6"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a quill-qr.sh $out/bin/quill-qr.sh + patchShebangs $out/bin + + wrapProgram $out/bin/quill-qr.sh --prefix PATH : "${lib.makeBinPath [ + qrencode + coreutils + jq + gzip + ]}" + ''; + + meta = with lib; { + description = "Print QR codes for use with https://p5deo-6aaaa-aaaab-aaaxq-cai.raw.ic0.app/"; + homepage = "https://github.com/IvanMalison/quill-qr"; + maintainers = with maintainers; [ imalison ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12493bfd4c2..57acda4e6fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26726,6 +26726,8 @@ in tag = "-daemon-qt5"; }; + quill-qr = callPackage ../tools/security/quill-qr { }; + quirc = callPackage ../tools/graphics/quirc {}; quilter = callPackage ../applications/editors/quilter { }; From 351b7d24e2974169fecf14b1cdc1dde0664819ff Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 26 Jul 2021 07:46:34 +1000 Subject: [PATCH 0469/1522] logisim: create desktop entry (#131450) --- .../science/logic/logisim/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 9b3f42dd4ba..f94f08e43ab 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem, unzip }: stdenv.mkDerivation rec { pname = "logisim"; @@ -11,17 +11,39 @@ stdenv.mkDerivation rec { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Logisim"; + exec = "logisim"; + icon = "logisim"; + comment = meta.description; + categories = "Education;"; + }) + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" + + # Create icons + unzip $src "resources/logisim/img/*" + for size in 16 20 24 48 64 128 + do + install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim.png" + done + + runHook postInstall ''; meta = with lib; { - homepage = "http://ozark.hendrix.edu/~burch/logisim"; + homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ angustrau ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; From 0834491cb742c7a8b95b90e5754b6e7d01cb55ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 00:59:36 +0200 Subject: [PATCH 0470/1522] flint: cleanup --- pkgs/development/libraries/flint/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index e9470986c73..548f561f25a 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , gmp , mpir @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { version = "2.8.0"; src = fetchurl { - url = "http://www.flintlib.org/flint-${version}.tar.gz"; + url = "https://www.flintlib.org/flint-${version}.tar.gz"; sha256 = "sha256-WEI1zcOdd52ZIOrvFv4ITzwm/+7qADo//2SiCg8zRJ4="; }; @@ -27,9 +28,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withBlas [ openblas ]; + propagatedBuildInputs = [ mpfr # flint.h includes mpfr.h ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" @@ -40,13 +43,14 @@ stdenv.mkDerivation rec { ]; doCheck = true; - meta = { + + meta = with lib; { description = "Fast Library for Number Theory"; - license = lib.licenses.gpl2Plus; - maintainers = lib.teams.sage.members; - platforms = lib.platforms.unix; - homepage = "http://www.flintlib.org/"; - downloadPage = "http://www.flintlib.org/downloads.html"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + platforms = platforms.unix; + homepage = "https://www.flintlib.org/"; + downloadPage = "https://www.flintlib.org/downloads.html"; updateWalker = true; }; } From 5b8a0fae655bff27590bacbcce261ae38754a514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 01:01:57 +0200 Subject: [PATCH 0471/1522] fldigi: format --- pkgs/applications/radio/fldigi/default.nix | 44 +++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 36f020ed272..a71e4f4bbd4 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,23 +1,49 @@ -{ lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsa-lib }: +{ lib +, stdenv +, fetchurl +, hamlib +, fltk14 +, libjpeg +, libpng +, portaudio +, libsndfile +, libsamplerate +, libpulseaudio +, libXinerama +, gettext +, pkg-config +, alsa-lib +}: stdenv.mkDerivation rec { - version = "4.1.18"; pname = "fldigi"; + version = "4.1.18"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; }; - buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkg-config alsa-lib ]; + buildInputs = [ + libXinerama + gettext + hamlib + fltk14 + libjpeg + libpng + portaudio + libsndfile + libsamplerate + libpulseaudio + pkg-config + alsa-lib + ]; - meta = { + meta = with lib; { description = "Digital modem program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ relrod ftrvxmtrx ]; - platforms = lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ relrod ftrvxmtrx ]; + platforms = platforms.linux; }; } From 8dee9de4781564940cfa8145c7a0f409041ef646 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 26 Jul 2021 00:43:43 +0100 Subject: [PATCH 0472/1522] multimon-ng: fix for darwin (#131522) Co-authored-by: Sandro --- pkgs/applications/radio/multimon-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 67d7dbea174..1bfbf00e46f 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01716cfhxfzsab9zjply9giaa4nn4b7rm3p3vizrwi7n253yiwm2"; }; - buildInputs = [ libpulseaudio libX11 ]; + buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ markuskowa ]; }; } From 17d25b4255073685a84d91eb1fddf5b547f2a9d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 00:13:41 +0000 Subject: [PATCH 0473/1522] libcouchbase: 3.1.4 -> 3.2.0 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 9e271a781e1..3078148e24f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.1.4"; + version = "3.2.0"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-6IBTUodKpE/RkqQb0IwSEgXfnIhfYyNNrZt5hxJ6DV8="; + sha256 = "sha256-8//FEWXXcp/COHj10l4jysaLobzZIl65RCYz/HgL+kc="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From 5dede290891ed8c44d68fe5a279cdc47bc976916 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 25 Jul 2021 21:42:45 +0900 Subject: [PATCH 0474/1522] wrangler: 1.16.1 -> 1.18.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index bb1f2316485..b26d5a8a9db 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.16.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chKmn38yB05NqDvtYWo4EwEIiD6kjy/1OMaMFM4qAA8="; + sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg="; }; - cargoSha256 = "sha256-pG3ZsRPa/7QRkUik6a987SlGrl3B0thnN3h62JyzdJo="; + cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI="; nativeBuildInputs = [ pkg-config ]; From e8d424833ebbd90977106ea1c4cafa30ffc2571a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 20:29:43 +0000 Subject: [PATCH 0475/1522] dua: 2.14.2 -> 2.14.3 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0c3d319f2a7..1d11f3c8deb 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.2"; + version = "2.14.3"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; + sha256 = "sha256-Tste5DdUwCu1CNRzIcBEvyckrvhEg9C8M3y89luIMbE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; + cargoSha256 = "sha256-iHRPgQtanW2LcFLPPHmr2n1NeAPi0mDmHNeIv524lrM="; doCheck = false; From e852906c87375015d8196586b4a6ba0761069284 Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Mon, 26 Jul 2021 09:38:02 +0800 Subject: [PATCH 0476/1522] flameshot: 0.10.0 -> 0.10.1 --- pkgs/tools/misc/flameshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 838572d9297..8e17111ce8e 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2"; + sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; }; nativeBuildInputs = [ cmake qttools qtsvg ]; From d78400378bb96329e0d35f530f8c741a864ffb4d Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Mon, 26 Jul 2021 08:19:29 +0530 Subject: [PATCH 0477/1522] ouch: init at 0.1.5 --- .../compression/ouch/add-Cargo.lock.patch | 434 ++++++++++++++++++ pkgs/tools/compression/ouch/default.nix | 28 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 464 insertions(+) create mode 100644 pkgs/tools/compression/ouch/add-Cargo.lock.patch create mode 100644 pkgs/tools/compression/ouch/default.nix diff --git a/pkgs/tools/compression/ouch/add-Cargo.lock.patch b/pkgs/tools/compression/ouch/add-Cargo.lock.patch new file mode 100644 index 00000000000..368ce6aab0b --- /dev/null +++ b/pkgs/tools/compression/ouch/add-Cargo.lock.patch @@ -0,0 +1,434 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..4bea8c1 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,428 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bzip2" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" ++dependencies = [ ++ "bzip2-sys", ++ "libc", ++] ++ ++[[package]] ++name = "bzip2-sys" ++version = "0.1.11+1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" ++dependencies = [ ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++ ++[[package]] ++name = "getrandom" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.98" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" ++ ++[[package]] ++name = "lzma-sys" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "ouch" ++version = "0.1.5" ++dependencies = [ ++ "bzip2", ++ "flate2", ++ "rand 0.8.4", ++ "strsim", ++ "tar", ++ "tempdir", ++ "walkdir", ++ "xz2", ++ "zip", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++dependencies = [ ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "rdrand", ++ "winapi", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++dependencies = [ ++ "rand_core 0.4.2", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++dependencies = [ ++ "rand_core 0.3.1", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++ ++[[package]] ++name = "syn" ++version = "1.0.74" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tar" ++version = "0.4.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80" ++dependencies = [ ++ "filetime", ++ "libc", ++ "xattr", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++dependencies = [ ++ "rand 0.4.6", ++ "remove_dir_all", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xattr" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "xz2" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c" ++dependencies = [ ++ "lzma-sys", ++] ++ ++[[package]] ++name = "zip" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" ++dependencies = [ ++ "byteorder", ++ "bzip2", ++ "crc32fast", ++ "flate2", ++ "thiserror", ++ "time", ++] diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix new file mode 100644 index 00000000000..c46e83ab91b --- /dev/null +++ b/pkgs/tools/compression/ouch/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "ouch"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "vrmiguel"; + repo = pname; + rev = version; + sha256 = "00ah8hgrppa61jhwb74zl5b509q0yp2pp27w9frm814iqx70qn38"; + }; + + cargoPatches = [ + # a patch file to add Cargo.lock in the source code + # https://github.com/vrmiguel/ouch/pull/46 + ./add-Cargo.lock.patch + ]; + + cargoSha256 = "181aq8r78g4bl1ndlwl54ws5ccrwph0mmk9506djxvfdy3hndxkg"; + + meta = with lib; { + description = "Taking the pain away from file (de)compression"; + homepage = "https://github.com/vrmiguel/ouch"; + license = licenses.mit; + maintainers = [ maintainers.psibi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a0ac74a862..d2862a7ddeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8276,6 +8276,8 @@ in openmpi = callPackage ../development/libraries/openmpi { }; + ouch = callPackage ../tools/compression/ouch { }; + mpi = openmpi; # this attribute should used to build MPI applications ucx = callPackage ../development/libraries/ucx {}; From 6adbeafc3b909c773a4a01cdea7438d3f4277467 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 03:31:01 +0000 Subject: [PATCH 0478/1522] corectrl: 1.1.3 -> 1.1.4 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 32ca4b0e06c..dc692b67730 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8="; + sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ="; }; nativeBuildInputs = [ From 5a7e27afe1af320b73034aab50fd1564014c6f98 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jul 2021 04:20:00 +0000 Subject: [PATCH 0479/1522] opam: 2.0.8 -> 2.1.0 https://github.com/ocaml/opam/releases/tag/2.1.0 --- .../opam-repository/download-tool.patch | 20 +++- pkgs/development/tools/ocaml/opam/default.nix | 103 ++++++++++-------- .../tools/ocaml/opam/opam-shebangs.patch | 5 +- pkgs/development/tools/ocaml/opam/opam.nix.pl | 8 +- 4 files changed, 81 insertions(+), 55 deletions(-) diff --git a/pkgs/development/ocaml-modules/opam-repository/download-tool.patch b/pkgs/development/ocaml-modules/opam-repository/download-tool.patch index 5af720adca9..9cc5f43f34f 100644 --- a/pkgs/development/ocaml-modules/opam-repository/download-tool.patch +++ b/pkgs/development/ocaml-modules/opam-repository/download-tool.patch @@ -2,16 +2,20 @@ diff --git a/src/repository/opamRepositoryConfig.ml b/src/repository/opamReposit index c2954c1d..528fc621 100644 --- a/src/repository/opamRepositoryConfig.ml +++ b/src/repository/opamRepositoryConfig.ml -@@ -27,23 +27,7 @@ type 'a options_fun = +@@ -27,31 +27,7 @@ type 'a options_fun = 'a let default = { - download_tool = lazy ( +- let os = OpamStd.Sys.os () in - try +- let curl = "curl", `Curl in - let tools = -- if OpamStd.Sys.(os () = Darwin) -- then ["wget", `Default; "curl", `Curl] -- else ["curl", `Curl; "wget", `Default] +- match os with +- | Darwin -> ["wget", `Default; curl] +- | FreeBSD -> ["fetch", `Default ; curl] +- | OpenBSD -> ["ftp", `Default; curl] +- | _ -> [curl; "wget", `Default] - in - let cmd, kind = - List.find (fun (c,_) -> OpamSystem.resolve_command c <> None) tools @@ -20,8 +24,12 @@ index c2954c1d..528fc621 100644 - with Not_found -> - OpamConsole.error_and_exit `Configuration_error - "Could not find a suitable download command. Please make sure you \ -- have either \"curl\" or \"wget\" installed, or specify a custom \ -- command through variable OPAMFETCH." +- have %s installed, or specify a custom command through variable \ +- OPAMFETCH." +- (match os with +- | FreeBSD -> "fetch" +- | OpenBSD -> "ftp" +- | _ -> "either \"curl\" or \"wget\"") - ); + download_tool = lazy ([ CIdent SUBSTITUTE_NIXOS_CURL_PATH, None ], `Curl); validation_hook = None; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index bd33d4cc1d3..eb0d284c082 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -6,62 +6,74 @@ assert lib.versionAtLeast ocaml.version "4.02.3"; let srcs = { - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; - sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; + "0install-solver" = fetchurl { + url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz"; + sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p"; }; - cppo = fetchurl { - url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz"; - sha256 = "185q0x54id7pfc6rkbjscav8sjkrg78fz65rgfw7b4bqlyb2j9z7"; + "cmdliner" = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz"; + sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; }; - cudf = fetchurl { + "cppo" = fetchurl { + url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz"; + sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; + }; + "cudf" = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; }; - dose3 = fetchurl { + "dose3" = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; - dune-local = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz"; - sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; + "dune-local" = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; - extlib = fetchurl { + "extlib" = fetchurl { url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; - mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz"; - sha256 = "0mswapf37rav8nvvbjc4c7c7wnl6qwgd3c5v0nfifmr910qygz72"; + "mccs" = fetchurl { + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz"; + sha256 = "05nnji9h8mss3hzjr5faid2v3xfr7rcv2ywmpcxxp28y6h2kv9gv"; }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; - sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; + "ocamlgraph" = fetchurl { + url = "https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz"; + sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0"; }; - opam-file-format = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.0.0.tar.gz"; - sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; + "opam-0install-cudf" = fetchurl { + url = "https://github.com/ocaml-opam/opam-0install-solver/releases/download/v0.4.2/opam-0install-cudf-v0.4.2.tbz"; + sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr"; }; - re = fetchurl { + "opam-file-format" = fetchurl { + url = "https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz"; + sha256 = "1bqyrlsvmjf4gqzmzbiyja9m1ph30ic9i18x23p5ziymyylw2sfg"; + }; + "re" = fetchurl { url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz"; sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; }; - result = fetchurl { - url = "https://github.com/janestreet/result/archive/1.4.tar.gz"; - sha256 = "1cjlncnzkwc6zr4v8dgy8nin490blbyxzwwp0qh0cla7s3q2jw0n"; + "result" = fetchurl { + url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz"; + sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; }; - seq = fetchurl { - url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; - sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; + "seq" = fetchurl { + url = "https://github.com/c-cube/seq/archive/0.2.2.tar.gz"; + sha256 = "1ck15v3pg8bacdg6d6iyp2jc3kgrzxk5jsgzx3287x2ycb897j53"; + }; + "stdlib-shims" = fetchurl { + url = "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz"; + sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.8.zip"; - sha256 = "1h55jh4nnx1fcn7v7ss3fgxrn6ixkgnq7pvg5njz8c9xq4njwbc1"; + url = "https://github.com/ocaml/opam/archive/2.1.0.zip"; + sha256 = "063df5gsvp4yrbqbnd8k7a1f04cf12prc5wh4f1200acs3jwjxwb"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.8"; + version = "2.1.0"; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -69,18 +81,21 @@ in stdenv.mkDerivation { src = srcs.opam; postUnpack = '' - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tbz - ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz - ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz - ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz - ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz - ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz - ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz - ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz - ln -sv ${srcs.result} $sourceRoot/src_ext/result.tar.gz - ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz + ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz + ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz + ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tbz + ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz + ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz + ln -sv ${srcs."extlib"} $sourceRoot/src_ext/extlib.tar.gz + ln -sv ${srcs."mccs"} $sourceRoot/src_ext/mccs.tar.gz + ln -sv ${srcs."ocamlgraph"} $sourceRoot/src_ext/ocamlgraph.tbz + ln -sv ${srcs."opam-0install-cudf"} $sourceRoot/src_ext/opam-0install-cudf.tbz + ln -sv ${srcs."opam-file-format"} $sourceRoot/src_ext/opam-file-format.tar.gz + ln -sv ${srcs."re"} $sourceRoot/src_ext/re.tbz + ln -sv ${srcs."result"} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs."seq"} $sourceRoot/src_ext/seq.tar.gz + ln -sv ${srcs."stdlib-shims"} $sourceRoot/src_ext/stdlib-shims.tbz ''; patches = [ ./opam-shebangs.patch ]; @@ -118,4 +133,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.8 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.0 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch index 13aa7a89570..72efec0a910 100644 --- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch +++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch @@ -2,7 +2,7 @@ diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml index eca13a7c..1fd66f43 100644 --- a/src/client/opamInitDefaults.ml +++ b/src/client/opamInitDefaults.ml -@@ -35,11 +35,15 @@ let eval_variables = [ +@@ -35,14 +35,18 @@ let eval_variables = [ let os_filter os = FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os) @@ -13,6 +13,9 @@ index eca13a7c..1fd66f43 100644 let macos_filter = os_filter "macos" let openbsd_filter = os_filter "openbsd" let freebsd_filter = os_filter "freebsd" + let not_open_free_bsd_filter = + FNot (FOr (openbsd_filter, freebsd_filter)) + let win32_filter = os_filter "win32" let sandbox_filter = FOr (linux_filter, macos_filter) +let nixos_filter = os_distribution_filter "nixos" diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index bfaea0c7ef3..c914bac8b5c 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -51,7 +51,7 @@ for my $src (sort keys %urls) { system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2"; die "md5 check failed for $urls{$src}\n" if $?; print <<"EOF"; - $src = fetchurl { + "$src" = fetchurl { url = "$urls{$src}"; sha256 = "$sha256"; }; @@ -68,8 +68,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - nativeBuildInputs = [ unzip ]; - buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; @@ -79,7 +79,7 @@ for my $src (sort keys %urls) { my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/ or die "could not find extension for $urls{$src}\n"; print <<"EOF"; - ln -sv \${srcs.$src} \$sourceRoot/src_ext/$src$ext + ln -sv \${srcs."$src"} \$sourceRoot/src_ext/$src$ext EOF } print <<'EOF'; From bef038a48687766a2d5163105ee46cd544162af0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jul 2021 04:20:00 +0000 Subject: [PATCH 0480/1522] dune-release: 1.4.0 -> 1.5.0 https://github.com/ocamllabs/dune-release/releases/tag/1.5.0 --- .../tools/ocaml/dune-release/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 60a9bfba58f..0eb56d3f539 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchurl, makeWrapper , curly, fmt, bos, cmdliner, re, rresult, logs -, odoc, opam-format, opam-core, opam-state, yojson +, odoc, opam-format, opam-core, opam-state, yojson, astring , opam, git, findlib, mercurial, bzip2, gnutar, coreutils , alcotest, mdx }: @@ -10,18 +10,18 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.4.0"; + version = "1.5.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1frinv1rsrm30q6jclicsswpshkdwwdgxx7sp6q9w4c2p211n1ln"; + sha256 = "1lyfaczskdbqnhmpiy6wga9437frds3m8prfk2rhwyb96h69y3pv"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core - rresult logs odoc bos yojson ]; + rresult logs odoc bos yojson astring ]; checkInputs = [ alcotest mdx ] ++ runtimeInputs; doCheck = true; @@ -44,6 +44,11 @@ in buildDunePackage rec { sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; + preCheck = '' + # it fails when it tries to reference "./make_check_deterministic.exe" + rm -fr tests/bin/check + ''; + # tool specific env vars have been deprecated, use PATH preFixup = '' wrapProgram $out/bin/dune-release \ From a051735e8d1857d4a6dc0e62c118c2ed28d66200 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 04:35:44 +0000 Subject: [PATCH 0481/1522] ccid: 1.4.34 -> 1.4.35 --- pkgs/tools/security/ccid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index e715cf50418..a7312731203 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.34"; + version = "1.4.35"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5vdkW1mpooROtLGn7/USlg1/BKRlSvAvf9L4re1dtAo="; + sha256 = "sha256-fD4qeSTt2nIhicpXyNHP+lHn+TVKI+ga7NnRro2XEMo="; }; postPatch = '' From 0b02f8162ec09935e931af67da36c525621aea35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 05:52:54 +0000 Subject: [PATCH 0482/1522] eksctl: 0.57.0 -> 0.58.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6a28e18c7d3..aeeb6b2ca42 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-5Y//OD/UsqDnM8MPVJghrc5SbVwBEG/Eu761QWy5xK8="; + sha256 = "sha256-g7Lfx8Q2yEFk6/3r8+MUl8jehbRfVGfrZb1+WgA6TYA="; }; - vendorSha256 = "sha256-CQ7A4vwUrshKRZBdIJZlCXmcxS0O0CkE1tNkZskYu1E="; + vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; doCheck = false; From b9a3c230bdf5729c95f99a5aae44bc5b71fe8dab Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:13:39 +0200 Subject: [PATCH 0483/1522] ocamlPackages.{macaddr, ipaddr*}: 5.0.1 -> 5.1.0 https://github.com/mirage/ocaml-ipaddr/releases/tag/v5.1.0 --- pkgs/development/ocaml-modules/macaddr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 5552393b408..4f6f2e4287f 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.0.1"; + version = "5.1.0"; useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; - sha256 = "0ffqkhmnj8l085xgl7jxhs3ld9zsd9iavdg06nnhr1i9g1aayk1b"; + url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; + sha256 = "7e9328222c1a5f39b0751baecd7e27a842bdb0082fd48126eacbbad8816fbf5a"; }; checkInputs = [ ppx_sexp_conv ounit ]; From aa812bf4817f579446a5cbbde6619e3435b4e905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Jul 2021 09:21:03 +0200 Subject: [PATCH 0484/1522] gpg-tui: 0.7.2 -> 0.7.3 https://github.com/orhun/gpg-tui/blob/v0.7.3/CHANGELOG.md --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 6c4f79195e1..b63b12aca08 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-2FnSCTq+Im7sbiEkbKZ9f09i/lWme/aCrcCOgcIlXp4="; + sha256 = "sha256-ti49b03Ta/MVDNIzW1WhWxJqHNVW9EALUcbElcZvurQ="; }; - cargoSha256 = "sha256-v2aZPVBT5XEaffTZHnAgRWGs6HDvL9b8ihR50I4VnJ4="; + cargoSha256 = "sha256-jF1Ozo5q5cKG9KjR1scbCCofG3FT3Fv98Cj0iOl18+c="; nativeBuildInputs = [ gpgme # for gpgme-config From 5732bf5886703742309f220cb8e838c09278736e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 26 Jul 2021 09:22:55 +0200 Subject: [PATCH 0485/1522] wine{Unstable,Staging}: 6.12 -> 6.13 --- pkgs/misc/emulators/wine/sources.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f2e61d18ee2..6accb486d57 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.12"; + version = "6.13"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv"; + sha256 = "sha256-4DohoBHUXSrp8iIED7dpC5cVY3bnQx+GHyAHPq8k8oo="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,11 +65,10 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp"; + sha256 = "sha256-3IpO+eQ/+DiQZH6en5Q/p+j441LDvjn4i9Ex7PY8KCk="; owner = "wine-staging"; repo = "wine-staging"; - # Replace back on next release: rev = "v${version}"; - rev = "v6.12.1"; + rev = "v${version}"; disabledPatchsets = [ ]; }; From e2a89729c5cec70b2aa8cfa2ac39cdf69bcf51bd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 15:10:00 +0200 Subject: [PATCH 0486/1522] ocamlPackages.mirage-crypto: 0.10.1 -> 0.10.2 https://github.com/mirage/mirage-crypto/releases/tag/v0.10.2 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 549838db396..b35d7cc910c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "028e2fc1f0a3e9b06603c6a253ecd043100099bc1c12c0567d8bc46d3781499c"; + sha256 = "96c4826fa3532c9d2ba21cd5fa25df003be3df20b2cc01068b60d59e0222d906"; }; useDune2 = true; From 8da4fa1e4b1498fd2cd0fa5f322290e6679072fc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 19 Jul 2021 09:31:51 +0200 Subject: [PATCH 0487/1522] ocamlPackages.otoml: init at 0.9.0 --- .../ocaml-modules/otoml/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/otoml/default.nix diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix new file mode 100644 index 00000000000..17e8fc855ea --- /dev/null +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildDunePackage +, menhir +, menhirLib +, uutf +}: + +buildDunePackage rec { + pname = "otoml"; + version = "0.9.0"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "dmbaturin"; + repo = pname; + rev = version; + sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; + }; + + buildInputs = [ menhir ]; + + propagatedBuildInputs = [ menhirLib uutf ]; + + meta = { + description = "A TOML parsing and manipulation library for OCaml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 200743944ee..8eb8a3944f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -964,6 +964,8 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; + otoml = callPackage ../development/ocaml-modules/otoml { }; + otr = callPackage ../development/ocaml-modules/otr { }; owee = callPackage ../development/ocaml-modules/owee { }; From 6205812d88a5332f2d7f08570e8b17bcf13f518b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 20:12:39 +0200 Subject: [PATCH 0488/1522] ocamlPackages.imagelib: 20210402 -> 20210511 --- pkgs/development/ocaml-modules/imagelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 0a846214dc0..580db48769e 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "20210402"; + version = "20210511"; pname = "imagelib"; useDune2 = true; src = fetchurl { url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; - sha256 = "b3c8ace02b10b36b6c60b3ce3ae0b9109d4a861916ec320c59cc1194f4cc86e3"; + sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480"; }; propagatedBuildInputs = [ decompress stdlib-shims ]; From a926cabc8bbf26ea3bd878b8256d1e108093ee29 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 26 Jul 2021 11:26:08 +0300 Subject: [PATCH 0489/1522] nixpkgs-review: 2.6.1 -> 2.6.2 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 35606a71347..20b1fe720d3 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-wDGmkydBLb3Wij1hjWExgHxva/03vJFqAK5zGH9yUn4="; + sha256 = "0991jz2l834pyzwcrkvjf3wlp122fkkz6avs4j5n9idv549c5xc0"; }; makeWrapperArgs = [ From 4d2f142eb9276ceac9ecd926961fd2637e2e0319 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sun, 25 Jul 2021 22:18:11 +0100 Subject: [PATCH 0490/1522] fldigi: 4.1.18 -> 4.1.19 Also fix the build of fldigi on darwin machines. --- pkgs/applications/radio/fldigi/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index a71e4f4bbd4..c27f0915a4a 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -13,17 +13,20 @@ , gettext , pkg-config , alsa-lib +, udev }: stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.18"; + version = "4.1.19"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; + sha256 = "0zvfkmvxi31ccbpxvimkcrqrkf3wzr1pgja2ny04srrakl8ff5c7"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXinerama gettext @@ -34,16 +37,13 @@ stdenv.mkDerivation rec { portaudio libsndfile libsamplerate - libpulseaudio - pkg-config - alsa-lib - ]; + ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; meta = with lib; { description = "Digital modem program"; homepage = "https://sourceforge.net/projects/fldigi/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ relrod ftrvxmtrx ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 36628e6e04e22a8b72ea5a07e4973670acabfca9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 10:47:49 +0200 Subject: [PATCH 0491/1522] pkgsMusl.haskell.compiler.*: use python38 to unbreak build seems like python39 currently fails to build with musl as libc https://github.com/NixOS/nixpkgs/issues/131557. As a workaround, we can just build the musl GHCs using python38 like we have been in the past (the python 3.8 -> 3.9 update being a more recent development). --- pkgs/top-level/haskell-packages.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 86a09b4a1fa..e6a54f0e52d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -39,6 +39,12 @@ let # Use this rather than `rec { ... }` below for sake of overlays. inherit (pkgs.haskell) compiler packages; + # temporarily use python 3.8 since 3.9 fails with musl + # https://github.com/NixOS/nixpkgs/issues/131557 + muslArgs = pkgs.lib.optionalAttrs pkgs.stdenv.buildPlatform.isMusl { + python3 = buildPackages.python38; + }; + in { lib = haskellLib; @@ -57,7 +63,7 @@ in { minimal = true; }; - ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix ({ # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then @@ -67,8 +73,8 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; - }; - ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + } // muslArgs); + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix ({ # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then @@ -78,8 +84,8 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; - }; - ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + } // muslArgs); + ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix ({ # aarch64 ghc8102Binary exceeds max output size on hydra bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8102BinaryMinimal @@ -88,14 +94,14 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; - }; - ghcHEAD = callPackage ../development/compilers/ghc/head.nix { + } // muslArgs); + ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ bootPkgs = packages.ghc901; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; - }; + } // muslArgs); # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. From ecd32b8104e6cca16fe1b2cfb89f39a8c7c01731 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 18:22:05 +0200 Subject: [PATCH 0492/1522] nixos/syncoid: Build unallow commands as a post job to drop permissions --- nixos/modules/services/backup/syncoid.nix | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 80a704a7d26..71007f6c38e 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -14,6 +14,14 @@ let escapeUnitName = name: lib.concatMapStrings (s: if lib.isList s then "-" else s) (builtins.split "[^a-zA-Z0-9_.\\-]+" name); + + # Function to build "zfs allow" and "zfs unallow" commands for the + # filesystems we've delegated permissions to. + buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [ + # Here we explicitly use the booted system to guarantee the stable API needed by ZFS + "-+/run/booted-system/sw/bin/zfs" zfsAction + cfg.user (concatStringsSep "," permissions) dataset + ]; in { # Interface @@ -206,15 +214,13 @@ in { path = [ "/run/booted-system/sw/bin/" ]; serviceConfig = { ExecStartPre = - map (dataset: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user "bookmark,hold,send,snapshot,destroy" dataset - # Permissions snapshot and destroy are in case --no-sync-snap is not used - ]) (localDatasetName c.source) ++ - map (dataset: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user "create,mount,receive,rollback" dataset - ]) (localDatasetName c.target); + # Permissions snapshot and destroy are in case --no-sync-snap is not used + (map (buildAllowCommand "allow" [ "bookmark" "hold" "send" "snapshot" "destroy" ]) (localDatasetName c.source)) ++ + (map (buildAllowCommand "allow" [ "create" "mount" "receive" "rollback" ]) (localDatasetName c.target)); + ExecStopPost = + # Permissions snapshot and destroy are in case --no-sync-snap is not used + (map (buildAllowCommand "unallow" [ "bookmark" "hold" "send" "snapshot" "destroy" ]) (localDatasetName c.source)) ++ + (map (buildAllowCommand "unallow" [ "create" "mount" "receive" "rollback" ]) (localDatasetName c.target)); ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] ++ optionals c.useCommonArgs cfg.commonArgs ++ optional c.recursive "-r" From b9f98165ab22b3981d7017ce88f268c4176f8072 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 18:27:36 +0200 Subject: [PATCH 0493/1522] nixos/sanoid: Use a function to build allow/unallow commands --- nixos/modules/services/backup/sanoid.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index 9713581165b..c7f276e3f04 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -73,6 +73,17 @@ let # Extract unique dataset names datasets = unique (attrNames cfg.datasets); + # Function to build "zfs allow" and "zfs unallow" commands for the + # filesystems we've delegated permissions to. + buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [ + # Here we explicitly use the booted system to guarantee the stable API needed by ZFS + "-+/run/booted-system/sw/bin/zfs" + zfsAction + "sanoid" + (concatStringsSep "," permissions) + dataset + ]; + configFile = let mkValueString = v: if builtins.isList v then concatStringsSep "," v @@ -156,18 +167,13 @@ in { systemd.services.sanoid = { description = "Sanoid snapshot service"; serviceConfig = { - ExecStartPre = map (dataset: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "allow" - "sanoid" "snapshot,mount,destroy" dataset - ]) datasets; + ExecStartPre = (map (buildAllowCommand "allow" [ "snapshot" "mount" "destroy" ]) datasets); + ExecStopPost = (map (buildAllowCommand "unallow" [ "snapshot" "mount" "destroy" ]) datasets); ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/sanoid" "--cron" "--configdir" (pkgs.writeTextDir "sanoid.conf" configFile) ] ++ cfg.extraArgs); - ExecStopPost = map (dataset: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "unallow" "sanoid" dataset - ]) datasets; User = "sanoid"; Group = "sanoid"; DynamicUser = true; From fa58d89b24611461304f591c64a5539bf1c13a7c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 18:31:19 +0200 Subject: [PATCH 0494/1522] nixos/syncoid: Reformat file with nixpkgs-fmt --- nixos/modules/services/backup/syncoid.nix | 393 ++++++++++++---------- 1 file changed, 206 insertions(+), 187 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 71007f6c38e..61a905a488a 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -8,206 +8,213 @@ let # Extract local dasaset names (so no datasets containing "@") localDatasetName = d: optionals (d != null) ( let m = builtins.match "([^/@]+[^@]*)" d; in - optionals (m != null) m); + optionals (m != null) m + ); # Escape as required by: https://www.freedesktop.org/software/systemd/man/systemd.unit.html escapeUnitName = name: lib.concatMapStrings (s: if lib.isList s then "-" else s) - (builtins.split "[^a-zA-Z0-9_.\\-]+" name); + (builtins.split "[^a-zA-Z0-9_.\\-]+" name); # Function to build "zfs allow" and "zfs unallow" commands for the # filesystems we've delegated permissions to. buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [ # Here we explicitly use the booted system to guarantee the stable API needed by ZFS - "-+/run/booted-system/sw/bin/zfs" zfsAction - cfg.user (concatStringsSep "," permissions) dataset + "-+/run/booted-system/sw/bin/zfs" + zfsAction + cfg.user + (concatStringsSep "," permissions) + dataset ]; -in { +in +{ - # Interface + # Interface - options.services.syncoid = { - enable = mkEnableOption "Syncoid ZFS synchronization service"; + options.services.syncoid = { + enable = mkEnableOption "Syncoid ZFS synchronization service"; - interval = mkOption { - type = types.str; - default = "hourly"; - example = "*-*-* *:15:00"; - description = '' - Run syncoid at this interval. The default is to run hourly. + interval = mkOption { + type = types.str; + default = "hourly"; + example = "*-*-* *:15:00"; + description = '' + Run syncoid at this interval. The default is to run hourly. - The format is described in - systemd.time - 7. - ''; - }; + The format is described in + systemd.time + 7. + ''; + }; - user = mkOption { - type = types.str; - default = "syncoid"; - example = "backup"; - description = '' - The user for the service. ZFS privilege delegation will be - automatically configured for any local pools used by syncoid if this - option is set to a user other than root. The user will be given the - "hold" and "send" privileges on any pool that has datasets being sent - and the "create", "mount", "receive", and "rollback" privileges on - any pool that has datasets being received. - ''; - }; + user = mkOption { + type = types.str; + default = "syncoid"; + example = "backup"; + description = '' + The user for the service. ZFS privilege delegation will be + automatically configured for any local pools used by syncoid if this + option is set to a user other than root. The user will be given the + "hold" and "send" privileges on any pool that has datasets being sent + and the "create", "mount", "receive", and "rollback" privileges on + any pool that has datasets being received. + ''; + }; - group = mkOption { - type = types.str; - default = "syncoid"; - example = "backup"; - description = "The group for the service."; - }; + group = mkOption { + type = types.str; + default = "syncoid"; + example = "backup"; + description = "The group for the service."; + }; - sshKey = mkOption { - type = types.nullOr types.path; - # Prevent key from being copied to store - apply = mapNullable toString; - default = null; - description = '' - SSH private key file to use to login to the remote system. Can be - overridden in individual commands. - ''; - }; + sshKey = mkOption { + type = types.nullOr types.path; + # Prevent key from being copied to store + apply = mapNullable toString; + default = null; + description = '' + SSH private key file to use to login to the remote system. Can be + overridden in individual commands. + ''; + }; - commonArgs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "--no-sync-snap" ]; - description = '' - Arguments to add to every syncoid command, unless disabled for that - command. See - - for available options. - ''; - }; + commonArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--no-sync-snap" ]; + description = '' + Arguments to add to every syncoid command, unless disabled for that + command. See + + for available options. + ''; + }; - service = mkOption { - type = types.attrs; - default = {}; - description = '' - Systemd configuration common to all syncoid services. - ''; - }; + service = mkOption { + type = types.attrs; + default = { }; + description = '' + Systemd configuration common to all syncoid services. + ''; + }; - commands = mkOption { - type = types.attrsOf (types.submodule ({ name, ... }: { - options = { - source = mkOption { - type = types.str; - example = "pool/dataset"; - description = '' - Source ZFS dataset. Can be either local or remote. Defaults to - the attribute name. - ''; - }; - - target = mkOption { - type = types.str; - example = "user@server:pool/dataset"; - description = '' - Target ZFS dataset. Can be either local - (pool/dataset) or remote - (user@server:pool/dataset). - ''; - }; - - recursive = mkEnableOption ''the transfer of child datasets''; - - sshKey = mkOption { - type = types.nullOr types.path; - # Prevent key from being copied to store - apply = mapNullable toString; - description = '' - SSH private key file to use to login to the remote system. - Defaults to option. - ''; - }; - - sendOptions = mkOption { - type = types.separatedString " "; - default = ""; - example = "Lc e"; - description = '' - Advanced options to pass to zfs send. Options are specified - without their leading dashes and separated by spaces. - ''; - }; - - recvOptions = mkOption { - type = types.separatedString " "; - default = ""; - example = "ux recordsize o compression=lz4"; - description = '' - Advanced options to pass to zfs recv. Options are specified - without their leading dashes and separated by spaces. - ''; - }; - - useCommonArgs = mkOption { - type = types.bool; - default = true; - description = '' - Whether to add the configured common arguments to this command. - ''; - }; - - service = mkOption { - type = types.attrs; - default = {}; - description = '' - Systemd configuration specific to this syncoid service. - ''; - }; - - extraArgs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "--sshport 2222" ]; - description = "Extra syncoid arguments for this command."; - }; + commands = mkOption { + type = types.attrsOf (types.submodule ({ name, ... }: { + options = { + source = mkOption { + type = types.str; + example = "pool/dataset"; + description = '' + Source ZFS dataset. Can be either local or remote. Defaults to + the attribute name. + ''; }; - config = { - source = mkDefault name; - sshKey = mkDefault cfg.sshKey; + + target = mkOption { + type = types.str; + example = "user@server:pool/dataset"; + description = '' + Target ZFS dataset. Can be either local + (pool/dataset) or remote + (user@server:pool/dataset). + ''; }; - })); - default = {}; - example = literalExample '' - { - "pool/test".target = "root@target:pool/test"; - } - ''; - description = "Syncoid commands to run."; + + recursive = mkEnableOption ''the transfer of child datasets''; + + sshKey = mkOption { + type = types.nullOr types.path; + # Prevent key from being copied to store + apply = mapNullable toString; + description = '' + SSH private key file to use to login to the remote system. + Defaults to option. + ''; + }; + + sendOptions = mkOption { + type = types.separatedString " "; + default = ""; + example = "Lc e"; + description = '' + Advanced options to pass to zfs send. Options are specified + without their leading dashes and separated by spaces. + ''; + }; + + recvOptions = mkOption { + type = types.separatedString " "; + default = ""; + example = "ux recordsize o compression=lz4"; + description = '' + Advanced options to pass to zfs recv. Options are specified + without their leading dashes and separated by spaces. + ''; + }; + + useCommonArgs = mkOption { + type = types.bool; + default = true; + description = '' + Whether to add the configured common arguments to this command. + ''; + }; + + service = mkOption { + type = types.attrs; + default = { }; + description = '' + Systemd configuration specific to this syncoid service. + ''; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--sshport 2222" ]; + description = "Extra syncoid arguments for this command."; + }; + }; + config = { + source = mkDefault name; + sshKey = mkDefault cfg.sshKey; + }; + })); + default = { }; + example = literalExample '' + { + "pool/test".target = "root@target:pool/test"; + } + ''; + description = "Syncoid commands to run."; + }; + }; + + # Implementation + + config = mkIf cfg.enable { + users = { + users = mkIf (cfg.user == "syncoid") { + syncoid = { + group = cfg.group; + isSystemUser = true; + # For syncoid to be able to create /var/lib/syncoid/.ssh/ + # and to use custom ssh_config or known_hosts. + home = "/var/lib/syncoid"; + createHome = false; + }; + }; + groups = mkIf (cfg.group == "syncoid") { + syncoid = { }; }; }; - # Implementation - - config = mkIf cfg.enable { - users = { - users = mkIf (cfg.user == "syncoid") { - syncoid = { - group = cfg.group; - isSystemUser = true; - # For syncoid to be able to create /var/lib/syncoid/.ssh/ - # and to use custom ssh_config or known_hosts. - home = "/var/lib/syncoid"; - createHome = false; - }; - }; - groups = mkIf (cfg.group == "syncoid") { - syncoid = {}; - }; - }; - - systemd.services = mapAttrs' (name: c: + systemd.services = mapAttrs' + (name: c: nameValuePair "syncoid-${escapeUnitName name}" (mkMerge [ - { description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}"; + { + description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}"; after = [ "zfs.target" ]; startAt = cfg.interval; # syncoid may need zpool to get feature@extensible_dataset @@ -226,11 +233,15 @@ in { ++ optional c.recursive "-r" ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] ++ c.extraArgs - ++ [ "--sendoptions" c.sendOptions - "--recvoptions" c.recvOptions - "--no-privilege-elevation" - c.source c.target - ]); + ++ [ + "--sendoptions" + c.sendOptions + "--recvoptions" + c.recvOptions + "--no-privilege-elevation" + c.source + c.target + ]); User = cfg.user; Group = cfg.group; StateDirectory = [ "syncoid" ]; @@ -246,7 +257,7 @@ in { # systemd-analyze security | grep syncoid-'*' AmbientCapabilities = ""; CapabilityBoundingSet = ""; - DeviceAllow = ["/dev/zfs"]; + DeviceAllow = [ "/dev/zfs" ]; LockPersonality = true; MemoryDenyWriteExecute = true; NoNewPrivileges = true; @@ -272,7 +283,7 @@ in { BindPaths = [ "/dev/zfs" ]; BindReadOnlyPaths = [ builtins.storeDir "/etc" "/run" "/bin/sh" ]; # Avoid useless mounting of RootDirectory= in the own RootDirectory= of ExecStart='s mount namespace. - InaccessiblePaths = ["-+/run/syncoid/${escapeUnitName name}"]; + InaccessiblePaths = [ "-+/run/syncoid/${escapeUnitName name}" ]; MountAPIVFS = true; # Create RootDirectory= in the host's mount namespace. RuntimeDirectory = [ "syncoid/${escapeUnitName name}" ]; @@ -283,8 +294,15 @@ in { # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' syncoid … # awk >perf.syscalls -F "," '$1 > 0 {sub("syscalls:sys_enter_","",$3); print $3}' perf.log # systemd-analyze syscall-filter | grep -v -e '#' | sed -e ':loop; /^[^ ]/N; s/\n //; t loop' | grep $(printf ' -e \\<%s\\>' $(cat perf.syscalls)) | cut -f 1 -d ' ' - "~@aio" "~@chown" "~@keyring" "~@memlock" "~@privileged" - "~@resources" "~@setuid" "~@sync" "~@timer" + "~@aio" + "~@chown" + "~@keyring" + "~@memlock" + "~@privileged" + "~@resources" + "~@setuid" + "~@sync" + "~@timer" ]; SystemCallArchitectures = "native"; # This is for BindPaths= and BindReadOnlyPaths= @@ -294,8 +312,9 @@ in { } cfg.service c.service - ])) cfg.commands; - }; + ])) + cfg.commands; + }; - meta.maintainers = with maintainers; [ julm lopsided98 ]; - } + meta.maintainers = with maintainers; [ julm lopsided98 ]; +} From ea9d5876a05a413c199f404696320d8c5f2cb70d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 25 Jul 2021 18:31:42 +0200 Subject: [PATCH 0495/1522] nixos/sanoid: Reformat file with nixpkgs-fmt --- nixos/modules/services/backup/sanoid.nix | 197 ++++++++++++----------- 1 file changed, 101 insertions(+), 96 deletions(-) diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index c7f276e3f04..41d0e2e1df6 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -52,7 +52,7 @@ let use_template = mkOption { description = "Names of the templates to use for this dataset."; type = types.listOf (types.enum (attrNames cfg.templates)); - default = []; + default = [ ]; }; useTemplate = use_template; @@ -84,108 +84,113 @@ let dataset ]; - configFile = let - mkValueString = v: - if builtins.isList v then concatStringsSep "," v - else generators.mkValueStringDefault {} v; + configFile = + let + mkValueString = v: + if builtins.isList v then concatStringsSep "," v + else generators.mkValueStringDefault { } v; - mkKeyValue = k: v: if v == null then "" - else if k == "processChildrenOnly" then "" - else if k == "useTemplate" then "" - else generators.mkKeyValueDefault { inherit mkValueString; } "=" k v; - in generators.toINI { inherit mkKeyValue; } cfg.settings; + mkKeyValue = k: v: + if v == null then "" + else if k == "processChildrenOnly" then "" + else if k == "useTemplate" then "" + else generators.mkKeyValueDefault { inherit mkValueString; } "=" k v; + in + generators.toINI { inherit mkKeyValue; } cfg.settings; -in { +in +{ - # Interface + # Interface - options.services.sanoid = { - enable = mkEnableOption "Sanoid ZFS snapshotting service"; + options.services.sanoid = { + enable = mkEnableOption "Sanoid ZFS snapshotting service"; - interval = mkOption { - type = types.str; - default = "hourly"; - example = "daily"; - description = '' - Run sanoid at this interval. The default is to run hourly. + interval = mkOption { + type = types.str; + default = "hourly"; + example = "daily"; + description = '' + Run sanoid at this interval. The default is to run hourly. - The format is described in - systemd.time - 7. - ''; - }; - - datasets = mkOption { - type = types.attrsOf (types.submodule ({config, options, ...}: { - freeformType = datasetSettingsType; - options = commonOptions // datasetOptions; - config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {}); - config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {}); - })); - default = {}; - description = "Datasets to snapshot."; - }; - - templates = mkOption { - type = types.attrsOf (types.submodule { - freeformType = datasetSettingsType; - options = commonOptions; - }); - default = {}; - description = "Templates for datasets."; - }; - - settings = mkOption { - type = types.attrsOf datasetSettingsType; - description = '' - Free-form settings written directly to the config file. See - - for allowed values. - ''; - }; - - extraArgs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "--verbose" "--readonly" "--debug" ]; - description = '' - Extra arguments to pass to sanoid. See - - for allowed options. - ''; - }; + The format is described in + systemd.time + 7. + ''; }; - # Implementation - - config = mkIf cfg.enable { - services.sanoid.settings = mkMerge [ - (mapAttrs' (d: v: nameValuePair ("template_" + d) v) cfg.templates) - (mapAttrs (d: v: v) cfg.datasets) - ]; - - systemd.services.sanoid = { - description = "Sanoid snapshot service"; - serviceConfig = { - ExecStartPre = (map (buildAllowCommand "allow" [ "snapshot" "mount" "destroy" ]) datasets); - ExecStopPost = (map (buildAllowCommand "unallow" [ "snapshot" "mount" "destroy" ]) datasets); - ExecStart = lib.escapeShellArgs ([ - "${pkgs.sanoid}/bin/sanoid" - "--cron" - "--configdir" (pkgs.writeTextDir "sanoid.conf" configFile) - ] ++ cfg.extraArgs); - User = "sanoid"; - Group = "sanoid"; - DynamicUser = true; - RuntimeDirectory = "sanoid"; - CacheDirectory = "sanoid"; - }; - # Prevents missing snapshots during DST changes - environment.TZ = "UTC"; - after = [ "zfs.target" ]; - startAt = cfg.interval; - }; + datasets = mkOption { + type = types.attrsOf (types.submodule ({ config, options, ... }: { + freeformType = datasetSettingsType; + options = commonOptions // datasetOptions; + config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or { }); + config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or { }); + })); + default = { }; + description = "Datasets to snapshot."; }; - meta.maintainers = with maintainers; [ lopsided98 ]; - } + templates = mkOption { + type = types.attrsOf (types.submodule { + freeformType = datasetSettingsType; + options = commonOptions; + }); + default = { }; + description = "Templates for datasets."; + }; + + settings = mkOption { + type = types.attrsOf datasetSettingsType; + description = '' + Free-form settings written directly to the config file. See + + for allowed values. + ''; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--verbose" "--readonly" "--debug" ]; + description = '' + Extra arguments to pass to sanoid. See + + for allowed options. + ''; + }; + }; + + # Implementation + + config = mkIf cfg.enable { + services.sanoid.settings = mkMerge [ + (mapAttrs' (d: v: nameValuePair ("template_" + d) v) cfg.templates) + (mapAttrs (d: v: v) cfg.datasets) + ]; + + systemd.services.sanoid = { + description = "Sanoid snapshot service"; + serviceConfig = { + ExecStartPre = (map (buildAllowCommand "allow" [ "snapshot" "mount" "destroy" ]) datasets); + ExecStopPost = (map (buildAllowCommand "unallow" [ "snapshot" "mount" "destroy" ]) datasets); + ExecStart = lib.escapeShellArgs ([ + "${pkgs.sanoid}/bin/sanoid" + "--cron" + "--configdir" + (pkgs.writeTextDir "sanoid.conf" configFile) + ] ++ cfg.extraArgs); + User = "sanoid"; + Group = "sanoid"; + DynamicUser = true; + RuntimeDirectory = "sanoid"; + CacheDirectory = "sanoid"; + }; + # Prevents missing snapshots during DST changes + environment.TZ = "UTC"; + after = [ "zfs.target" ]; + startAt = cfg.interval; + }; + }; + + meta.maintainers = with maintainers; [ lopsided98 ]; +} From a9d29a1d0ddaad92dd0db5fa913ff714f0e37ebe Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 26 Jul 2021 09:17:10 +0200 Subject: [PATCH 0496/1522] nixos/syncoid: Drop ~[at]sync from the systemcallfilter to avoid coredumps --- nixos/modules/services/backup/syncoid.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 61a905a488a..73b01d4b53f 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -301,7 +301,6 @@ in "~@privileged" "~@resources" "~@setuid" - "~@sync" "~@timer" ]; SystemCallArchitectures = "native"; From bd263441e227e9fa3022abc518504c7b6086b413 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 26 Jul 2021 09:26:02 +0200 Subject: [PATCH 0497/1522] nixos/rl-notes/21.11: Add note about remaining syncoid permissions --- .../from_md/release-notes/rl-2111.section.xml | 13 +++++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 15 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f573f731365..9dd98a5262f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -702,6 +702,19 @@ option. + + + The + services.syncoid.enable + module now properly drops ZFS permissions after usage. Before + it delegated permissions to whole pools instead of datasets + and didn’t clean up after execution. You can manually look + this up for your pools by running + zfs allow your-pool-name and use + zfs unallow syncoid your-pool-name to clean + this up. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5e379ad6fd1..12e1a938433 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -183,3 +183,5 @@ pt-services.clipcat.enable). - NSS modules which should come after `dns` should use mkAfter. - The [networking.wireless.iwd](options.html#opt-networking.wireless.iwd.enable) module has a new [networking.wireless.iwd.settings](options.html#opt-networking.wireless.iwd.settings) option. + +- The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. From 764e4acee1e0e48383f8fc2648078e5b0828766a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 26 Jul 2021 10:00:14 +0200 Subject: [PATCH 0498/1522] nixos/tests/sanoid: Improve tests by checking that no permissions are left behind --- nixos/tests/sanoid.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 7cef51e4201..3bdbe0a8d8d 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -85,10 +85,18 @@ in { "chown -R syncoid:syncoid /var/lib/syncoid/", ) + assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set before snapshotting" + assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set before snapshotting" + assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set before snapshotting" + # Take snapshot with sanoid source.succeed("touch /mnt/pool/sanoid/test.txt") source.systemctl("start --wait sanoid.service") + assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after snapshotting" + assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after snapshotting" + assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after snapshotting" + # Sync snapshots target.wait_for_open_port(22) source.succeed("touch /mnt/pool/syncoid/test.txt") @@ -96,5 +104,9 @@ in { target.succeed("cat /mnt/pool/sanoid/test.txt") source.systemctl("start --wait syncoid-pool-syncoid.service") target.succeed("cat /mnt/pool/syncoid/test.txt") + + assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after syncing snapshots" + assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after syncing snapshots" + assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after syncing snapshots" ''; }) From bf36e52f64e1fef287b51d3ff07102bb35a00b8c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 26 Jul 2021 10:06:06 +0200 Subject: [PATCH 0499/1522] sanoid: Passthru sanoid tests --- pkgs/tools/backup/sanoid/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix index 3a59dcc0640..5c61763f258 100644 --- a/pkgs/tools/backup/sanoid/default.nix +++ b/pkgs/tools/backup/sanoid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, zfs +{ lib, stdenv, fetchFromGitHub, nixosTests, makeWrapper, zfs , perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: with lib; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ]; + passthru.tests = nixosTests.sanoid; + installPhase = '' runHook preInstall From 9dfc62e2b8a67ae2d6ec0568205ca2f367342b11 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 11:18:58 +0200 Subject: [PATCH 0500/1522] haskellPackages: regenerate list of transitively broken pkgs --- .../configuration-hackage2nix/transitive-broken.yaml | 6 ++++-- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e8e415695cf..3f5ee43b8db 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1444,7 +1444,6 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options - - hasql-queue - hasql-th - hastache-aeson - haste-app @@ -2341,6 +2340,7 @@ dont-distribute-packages: - polysemy-fskvstore - polysemy-http - polysemy-keyed-state + - polysemy-kvstore - polysemy-kvstore-jsonfile - polysemy-log - polysemy-log-co @@ -2351,11 +2351,14 @@ dont-distribute-packages: - polysemy-optics - polysemy-path - polysemy-plugin + - polysemy-plugin_0_4_0_0 - polysemy-readline - polysemy-req - polysemy-resume + - polysemy-socket - polysemy-test - polysemy-time + - polysemy-uncontrolled - polysemy-video - polysemy-vinyl - polysemy-webserver @@ -2893,7 +2896,6 @@ dont-distribute-packages: - swearjure - sweet-egison - switch - - sydtest-persistent-postgresql - sylvia - sym-plot - symantic-atom diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3f1f0b010fd..c7f19ab0c74 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -122737,7 +122737,6 @@ self: { ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-simple" = callPackage @@ -126625,8 +126624,6 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -205843,6 +205840,7 @@ self: { libraryHaskellDepends = [ base containers polysemy ]; description = "KVStore effect for polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-kvstore-jsonfile" = callPackage @@ -206118,6 +206116,7 @@ self: { ]; description = "Socket effect for polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-test" = callPackage @@ -206182,6 +206181,7 @@ self: { ]; description = "Uncontrolled toy effect for polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-video" = callPackage From 1493f098f819530d60f5d226dbf6a0308098833d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 09:21:29 +0000 Subject: [PATCH 0501/1522] feh: 3.7 -> 3.7.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 139f29c3150..cd7b6e95d03 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.7"; + version = "3.7.1"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87"; + sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY="; }; outputs = [ "out" "man" "doc" ]; From babb32f49204e1bdd0135dd8d68023948716343c Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Mon, 26 Jul 2021 11:36:53 +0200 Subject: [PATCH 0502/1522] metals: 0.10.4 -> 0.10.5 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index b85ca99a9e6..859864c37c2 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.4"; + version = "0.10.5"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q"; + outputHash = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01"; }; nativeBuildInputs = [ makeWrapper ]; From 9d4867074b5d279bf0d2611f3005c50d6c7944f2 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Fri, 23 Jul 2021 16:07:19 +0100 Subject: [PATCH 0503/1522] Agda: mark packages as broken until 2.6.2 compatible release is made Co-authored-by: sternenseemann --- pkgs/development/libraries/agda/agda-categories/default.nix | 2 ++ pkgs/development/libraries/agda/agda-prelude/default.nix | 2 ++ .../libraries/agda/functional-linear-algebra/default.nix | 2 ++ pkgs/development/libraries/agda/generic/default.nix | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 3121edccfe4..11058eb0700 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -14,6 +14,8 @@ mkDerivation rec { buildInputs = [ standard-library ]; meta = with lib; { + # Remove if a version compatible with agda 2.6.2 is made + broken = true; inherit (src.meta) homepage; description = "A new Categories library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 21883acd195..c546badef2d 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -19,6 +19,8 @@ mkDerivation rec { ''; meta = with lib; { + # Remove if a version compatible with agda 2.6.2 is made + broken = true; homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; license = lib.licenses.mit; diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 1e5c0ae28d3..0253df176ed 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -18,6 +18,8 @@ mkDerivation rec { ''; meta = with lib; { + # Remove if a version compatible with agda 2.6.2 is made + broken = true; homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' Formalizing linear algebra in Agda by representing matrices as functions diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix index ab203121426..855dd0f33c5 100644 --- a/pkgs/development/libraries/agda/generic/default.nix +++ b/pkgs/development/libraries/agda/generic/default.nix @@ -21,6 +21,8 @@ mkDerivation rec { ''; meta = with lib; { + # Remove if a version compatible with agda 2.6.2 is made + broken = true; description = "A library for doing generic programming in Agda"; homepage = src.meta.homepage; From da6c45e9ccdfaf91b6401af919d40129cebaefc5 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 26 Jul 2021 11:31:01 +0200 Subject: [PATCH 0504/1522] python3Packages.sphinx-inline-tabs: init at 2021.04.11.beta9 --- .../sphinx-inline-tabs/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-inline-tabs/default.nix diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix new file mode 100644 index 00000000000..25e0aa6d6ce --- /dev/null +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-inline-tabs"; + version = "2021.04.11.beta9"; + format = "flit"; + + src = fetchFromGitHub { + owner = "pradyunsg"; + repo = "sphinx-inline-tabs"; + rev = version; + sha256 = "sha256-UYrLQAXPProjpGPQNkju6+DmzjPG+jbjdKveoeViVTY="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + # no tests, see https://github.com/pradyunsg/sphinx-inline-tabs/issues/6 + doCheck = false; + + pythonImportsCheck = [ "sphinx_inline_tabs" ]; + + meta = with lib; { + description = "Add inline tabbed content to your Sphinx documentation"; + homepage = "https://github.com/pradyunsg/sphinx-inline-tabs"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9708579cabc..44cdbd09112 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8262,6 +8262,8 @@ in { sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { }; + sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { }; From e66d3c1d562727d7d265d8629e8a042199495604 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:21:45 +0200 Subject: [PATCH 0505/1522] scalafmt: deprecate phases and use pname&version --- pkgs/development/tools/scalafmt/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 45efd813a38..0565127f8d0 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -17,21 +17,24 @@ let }; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + pname = baseName; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - doCheck = true; - - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" + + runHook postInstall ''; - checkPhase = '' + installCheckPhase = '' $out/bin/${baseName} --version | grep -q "${version}" ''; From aec81503f575b9a4e8ed3bb791af3957cc55a451 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 20:24:27 +0200 Subject: [PATCH 0506/1522] ocamlPackages.lwt-dllist: 1.0.0 -> 1.0.1 https://github.com/mirage/lwt-dllist/releases/tag/v1.0.1 --- .../ocaml-modules/lwt-dllist/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 28a6f5f43d7..b28981b1b77 100644 --- a/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -1,23 +1,22 @@ -{ lib, buildDunePackage, fetchurl, lwt }: +{ lib, buildDunePackage, fetchurl, lwt, ocaml }: buildDunePackage rec { pname = "lwt-dllist"; - version = "1.0.0"; + version = "1.0.1"; useDune2 = true; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0g111f8fq9k1hwccpkhylkp83f73mlz4xnxxr3rf9xpi2f8fh7j9"; + sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e"; }; - propagatedBuildInputs = [ + checkInputs = [ lwt ]; - - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.03"; meta = with lib; { description = "Mutable doubly-linked list with Lwt iterators"; From 7144f0c1411d8340985b992812b3d06602aa86d0 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 26 Jul 2021 18:02:02 +0800 Subject: [PATCH 0507/1522] linux_xanmod: 5.13.4 -> 5.13.5 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 758f6fd998a..701f5d3b104 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.4"; + version = "5.13.5"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU="; + sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g="; }; structuredExtraConfig = with lib.kernel; { From d44743615c7d3ef3cb9a72e6a62b6c3ec0573111 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 24 Jul 2021 20:28:04 +0200 Subject: [PATCH 0508/1522] ocamlPackages.mirage{,-runtime,-types*}: 3.10.3 -> 3.10.4 https://github.com/mirage/mirage/releases/tag/v3.10.4 --- pkgs/development/ocaml-modules/mirage/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index aaa51aa276c..4a876658d18 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.10.3"; + version = "3.10.4"; useDune2 = true; @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "7c8059ef9e330eaef1ed51c0d89afe17900310f8083a426cd8099602222c2281"; + sha256 = "c2ea22b6faf16bed783cac0e0bafd87f321756a91798f56c9a930f0edb5d9116"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; From 6d4c440f801a96a19795ee6d04189385f39fc0d3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 12:33:18 +0200 Subject: [PATCH 0509/1522] Revert "pkgsMusl.haskell.compiler.*: use python38 to unbreak build" This reverts commit 36628e6e04e22a8b72ea5a07e4973670acabfca9. As it turns out this wasn't caused by the update from python 3.8 -> 3.9, but the underlying issue affects both python version (it seems that LTO is at fault currently). Will have to be fixed elsewhere, reverting. --- pkgs/top-level/haskell-packages.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e6a54f0e52d..86a09b4a1fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -39,12 +39,6 @@ let # Use this rather than `rec { ... }` below for sake of overlays. inherit (pkgs.haskell) compiler packages; - # temporarily use python 3.8 since 3.9 fails with musl - # https://github.com/NixOS/nixpkgs/issues/131557 - muslArgs = pkgs.lib.optionalAttrs pkgs.stdenv.buildPlatform.isMusl { - python3 = buildPackages.python38; - }; - in { lib = haskellLib; @@ -63,7 +57,7 @@ in { minimal = true; }; - ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix ({ + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then @@ -73,8 +67,8 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; - } // muslArgs); - ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix ({ + }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then @@ -84,8 +78,8 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; - } // muslArgs); - ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix ({ + }; + ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { # aarch64 ghc8102Binary exceeds max output size on hydra bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8102BinaryMinimal @@ -94,14 +88,14 @@ in { inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; - } // muslArgs); - ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ + }; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc901; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; - } // muslArgs); + }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. From 672a6a6db10c0064ab3fd003af55a6b5b846dc55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Jul 2021 00:04:08 +0200 Subject: [PATCH 0510/1522] apache-directory-studio: 2.0.0-M15 -> 2.0.0-M17 (fix incorrect merge) --- .../networking/apache-directory-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 242ca8e6bfe..d9fe26fdbdc 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { pname = "apache-directory-studio"; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; + version = "2.0.0-M17"; + versionWithDate = "2.0.0.v20210717-M17"; src = if stdenv.hostPlatform.system == "x86_64-linux" then From cf9c9cae38d7a27fdc46f1decce7a1f281fdf862 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 26 Jul 2021 12:44:38 +0200 Subject: [PATCH 0511/1522] pipelight: Add patch for wine 6.13 compatibility Wine 6.13 introduces a function argument named 'new' to a header file. This confuses the C++ compiler. --- pkgs/tools/misc/pipelight/default.nix | 5 ++- .../misc/pipelight/wine-6.13-new-args.patch | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/pipelight/wine-6.13-new-args.patch diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 96027677fa8..a5a5b727a8d 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -21,7 +21,10 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; - patches = [ ./pipelight.patch ]; + patches = [ + ./pipelight.patch + ./wine-6.13-new-args.patch + ]; configurePhase = '' patchShebangs . diff --git a/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch new file mode 100644 index 00000000000..b67af621f64 --- /dev/null +++ b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch @@ -0,0 +1,42 @@ +diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c +index 80bf726..6b80f70 100644 +--- a/src/windows/pluginloader/apihook.c ++++ b/src/windows/pluginloader/apihook.c +@@ -42,7 +42,9 @@ + #include "common/common.h" + #include "pluginloader.h" + ++#define new cnew + #include // for PVOID and other types ++#undef new + #include // for memset + + void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){ +diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c +index e4e38aa..19f29d5 100644 +--- a/src/windows/pluginloader/npnfunctions.c ++++ b/src/windows/pluginloader/npnfunctions.c +@@ -41,7 +41,9 @@ + #include "common/common.h" + #include "pluginloader.h" + ++#define new cnew + #include ++#undef new + + /* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */ + NPP shockwaveInstanceBug = NULL; +diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c +index 8f1170a..99dbceb 100644 +--- a/src/windows/pluginloader/pluginloader.c ++++ b/src/windows/pluginloader/pluginloader.c +@@ -50,7 +50,9 @@ + #include "pluginloader.h" + #include "apihook.h" + ++#define new cnew + #include ++#undef new + #include // for CoInitializeEx + #include + From 87f84d7ee66c3dc6e5a930eda7556afb88c53d48 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Mon, 26 Jul 2021 10:46:40 +0000 Subject: [PATCH 0512/1522] vimPlugins.nvim-treesitter: use 0.5-compat branch for compatibility with neovim 0.5 stable --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e134963d453..2aa0becf28f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -494,7 +494,7 @@ nvim-telescope/telescope-symbols.nvim nvim-telescope/telescope-z.nvim@main nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter -nvim-treesitter/nvim-treesitter +nvim-treesitter/nvim-treesitter@0.5-compat nvim-treesitter/nvim-treesitter-refactor nvim-treesitter/nvim-treesitter-textobjects nvim-treesitter/playground From da1b8b89a8d159c98cb9851f7c9171078e8665ed Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Mon, 26 Jul 2021 10:47:00 +0000 Subject: [PATCH 0513/1522] vimPlugins.nvim-treesitter-textobjects: use 0.5-compat branch for compatibility with neovim 0.5 stable --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2aa0becf28f..ede8b8025e1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -496,7 +496,7 @@ nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter@0.5-compat nvim-treesitter/nvim-treesitter-refactor -nvim-treesitter/nvim-treesitter-textobjects +nvim-treesitter/nvim-treesitter-textobjects@0.5-compat nvim-treesitter/playground oberblastmeister/termwrapper.nvim ocaml/vim-ocaml From 41724be4e6ef85b3f5cf0d1436be13ee59becdfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jul 2021 13:14:43 +0200 Subject: [PATCH 0514/1522] prometheus-influxdb-exporter: init at 0.8.0 --- .../prometheus/influxdb-exporter.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/influxdb-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix new file mode 100644 index 00000000000..65ec5ff69b4 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "influxdb_exporter"; + version = "0.8.0"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "influxdb_exporter"; + sha256 = "sha256-aNj4ru3yDet+jdcEpckFVaymmjWmKzTMPcTxPMNFbgo="; + }; + + vendorSha256 = null; + + buildFlagsArray = let + goPackagePath = "github.com/prometheus/influxdb_exporter"; + in '' + -ldflags= + -s -w + -X github.com/prometheus/common/version.Version=${version} + -X github.com/prometheus/common/version.Revision=${rev} + -X github.com/prometheus/common/version.Branch=unknown + -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs + -X github.com/prometheus/common/version.BuildDate=unknown + ''; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; }; + + meta = with lib; { + description = "Prometheus exporter that accepts InfluxDB metrics"; + homepage = "https://github.com/prometheus/influxdb_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be85174e28..b3a38eb2470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20118,6 +20118,7 @@ in prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; + prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; From dadbcdfa3e3984c8872954bb96601a90377cbb86 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 26 Jul 2021 14:19:57 +0200 Subject: [PATCH 0515/1522] prometheus-mysqld-exporter: add version info --- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 9a856eedf68..e31800f43c0 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,6 +14,15 @@ buildGoModule rec { vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; + buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' + -ldflags= + -s -w -X ${t}.Version=${version} + -X ${t}.Revision=${rev} + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + ''; + # skips tests with external dependencies, e.g. on mysqld checkFlags = [ "-short" ]; From b0284395a60b98c9970c877b6262b5e383635ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 26 Jul 2021 12:16:56 +0200 Subject: [PATCH 0516/1522] agdaPackages.agda-categories: 0.1.6 -> 0.1.7.1 --- pkgs/development/libraries/agda/agda-categories/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 11058eb0700..267ee041bdc 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,21 +1,19 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.6"; + version = "0.1.7.1"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "1s75yqcjwj13s1m3fg29krnn05lws6143ccfdygc6c4iynvvznsh"; + sha256 = "1acb693ad2nrmnn6jxsyrlkc0di3kk2ksj2w9wnyfxrgvfsil7rn"; }; buildInputs = [ standard-library ]; meta = with lib; { - # Remove if a version compatible with agda 2.6.2 is made - broken = true; inherit (src.meta) homepage; description = "A new Categories library"; license = licenses.bsd3; From 46ea00da2328e5e4065ce0acbf0b0427b6d6838a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jul 2021 15:52:56 +0200 Subject: [PATCH 0517/1522] nixos/prometheus-influxdb-exporter: init --- .../from_md/release-notes/rl-2111.section.xml | 8 +++++ .../manual/release-notes/rl-2111.section.md | 2 ++ .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/influxdb.nix | 34 +++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 9dd98a5262f..1db624286fa 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -125,6 +125,14 @@ services.prometheus.exporters.buildkite-agent. + + + influxdb-exporter + a Prometheus exporter that exports metrics received on an + InfluxDB compatible endpoint is now available as + services.prometheus.exporters.influxdb. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 12e1a938433..a1690120b70 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -39,6 +39,8 @@ pt-services.clipcat.enable). - [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable). +- [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index d648de6a414..9182c2f2ed8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -33,6 +33,7 @@ let "domain" "dovecot" "fritzbox" + "influxdb" "json" "jitsi" "kea" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix b/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix new file mode 100644 index 00000000000..ba45173e946 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.influxdb; +in +{ + port = 9122; + extraOpts = { + sampleExpiry = mkOption { + type = types.str; + default = "5m"; + example = "10m"; + description = "How long a sample is valid for"; + }; + udpBindAddress = mkOption { + type = types.str; + default = ":9122"; + example = "192.0.2.1:9122"; + description = "Address on which to listen for udp packets"; + }; + }; + serviceOpts = { + serviceConfig = { + RuntimeDirectory = "prometheus-influxdb-exporter"; + ExecStart = '' + ${pkgs.prometheus-influxdb-exporter}/bin/influxdb_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --influxdb.sample-expiry ${cfg.sampleExpiry} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + }; +} From f77710c6baf40d85f5e839043179dd9102760b30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jul 2021 15:53:16 +0200 Subject: [PATCH 0518/1522] nixos/tests/prometheus-exporters/influxdb: init --- nixos/tests/prometheus-exporters.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index e8bc6339ecf..6153ba9e366 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -273,6 +273,26 @@ let ''; }; + influxdb = { + exporterConfig = { + enable = true; + sampleExpiry = "3s"; + }; + exporterTest = '' + wait_for_unit("prometheus-influxdb-exporter.service") + succeed( + "curl -XPOST http://localhost:9122/write --data-binary 'influxdb_exporter,distro=nixos,added_in=21.09 value=1'" + ) + succeed( + "curl -sSf http://localhost:9122/metrics | grep 'nixos'" + ) + execute("sleep 5") + fail( + "curl -sSf http://localhost:9122/metrics | grep 'nixos'" + ) + ''; + }; + jitsi = { exporterConfig = { enable = true; From 74c85b1b595e810001f5d34a75a3de7e72c5143e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 16:10:48 +0200 Subject: [PATCH 0519/1522] sof-firmware: remove not required with lib --- pkgs/os-specific/linux/firmware/sof-firmware/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 5ee39c5bf33..2409d9b1aba 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; stdenv.mkDerivation rec { pname = "sof-firmware"; version = "1.7"; From 35ce59b03b0f3a93805952968245fd122b314f16 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Sun, 25 Jul 2021 14:08:30 +0100 Subject: [PATCH 0520/1522] calibre: Pin zeroconf dependency to 0.31 This prevents https://bugs.launchpad.net/calibre/+bug/1936889 which has been patched [1] in calibre master but not yet released. [1]: https://github.com/kovidgoyal/calibre/commit/4f9e83e6426483b6cc0929c61f9207c33c573fec --- pkgs/applications/misc/calibre/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d27c9c9af65..07e0a62b901 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -94,7 +95,15 @@ mkDerivation rec { python regex sip - zeroconf + (zeroconf.overrideAttrs (oldAttrs: rec { + version = "0.31.0"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + }; + })) # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll From 2849d97ee6ed02f512f31deae27592e66f338e62 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Thu, 22 Jul 2021 17:39:51 +0200 Subject: [PATCH 0521/1522] hurl: init at 1.2.0 --- pkgs/tools/networking/hurl/default.nix | 40 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/networking/hurl/default.nix diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix new file mode 100644 index 00000000000..6ecff2e6e38 --- /dev/null +++ b/pkgs/tools/networking/hurl/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libxml2 +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "hurl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Orange-OpenSource"; + repo = pname; + rev = version; + sha256 = "0hbyqj794pvvfrg6jgz63mih73bnmnvgmwbv705c2238w7wsgk9w"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxml2 + openssl + ]; + + # Tests require network access to a test server + doCheck = false; + + cargoSha256 = "09ndgm6kmqwdz7yn2rqxk5xr1qkai87zm1k138cng4wq135c3w6g"; + + meta = with lib; { + description = "Command line tool that performs HTTP requests defined in a simple plain text format."; + homepage = "https://hurl.dev/"; + maintainers = with maintainers; [ eonpatapon ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 134d2693560..d9b846d2ead 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5863,6 +5863,8 @@ in httpx = callPackage ../tools/security/httpx { }; + hurl = callPackage ../tools/networking/hurl { }; + hub = callPackage ../applications/version-management/git-and-tools/hub { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; From 3738eb5534a679b80ea8b8b5bf53a57f18ac5743 Mon Sep 17 00:00:00 2001 From: Heph Date: Mon, 26 Jul 2021 16:58:23 +0200 Subject: [PATCH 0522/1522] telescope: 0.3.1 -> 0.4.1 --- pkgs/applications/networking/browsers/telescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index fa9b3853a9d..a6762e255f4 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz"; - sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw"; + sha256 = "086zps4nslv5isfw1b5gvms7vp3fglm7x1a6ks0h0wxarzj350bl"; }; nativeBuildInputs = [ From 19a763458d70beee0daface84c0d9e4a5378852c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 17:35:40 +0200 Subject: [PATCH 0523/1522] maintainers/haskell/package-list: minor fixes to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Manuel Bärenz --- .../scripts/haskell/upload-nixos-package-list-to-hackage.sh | 2 +- pkgs/development/haskell-modules/HACKING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index f887f0c4293..c49ea68fbfb 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -4,7 +4,7 @@ # On Hackage every package description shows a category "Distributions" which # lists a "NixOS" version. # This script uploads a csv to hackage which will update the displayed versions -# based on the current versions in nixpkgs. This happens with on simple http +# based on the current versions in nixpkgs. This happens with a simple http # request. # For authorization you just need to have any valid hackage account. This diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 98ab03a0edd..9024a90a09d 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -243,7 +243,7 @@ causes all currently open Haskell-related pull-requests to be automatically clos ## Update Hackage Version Information -After merging into master you can update what hackage displays as the current +After merging into `master` you can update what hackage displays as the current version in NixOS for every individual package. To do this you run `maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh`. See the script for how to provide credentials. Once you have configured that From f88cc5a3dc089e482590e5ff12db6bc28f8a318c Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Mon, 26 Jul 2021 11:41:38 -0400 Subject: [PATCH 0524/1522] gast: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/gast/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 6d18a7ba6d1..4b4aa8c0bd3 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -7,22 +7,13 @@ buildPythonPackage rec { pname = "gast"; - version = "0.5.0"; - - # TODO: remove this patch on the next release, this fixes a bug with parsing - # assignment expressions e.g., `x := 1`. - patches = [ - (fetchpatch { - url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch"; - sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1"; - }) - ]; + version = "0.5.1"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "gast"; rev = version; - sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw"; + sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa"; }; checkInputs = [ astunparse ]; From e1b7816a1f83360ee91b788cc5de3189bda5b624 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 25 Jul 2021 14:51:37 +0000 Subject: [PATCH 0525/1522] linux: 5.13.4 -> 5.13.5 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 82defad373b..dd97944de78 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.4"; + version = "5.13.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0v3x1q1r0r8lyjg5hsj7yayfxqcgfj01p86ya4s0i9jaclpwv4ki"; + sha256 = "0lqh7krxxnbrvr3w1kag92z9r4n9436fr6answjkjfbvw0z7q74m"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From a578a22f740e198014111587bfda2fca1b46cdeb Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 25 Jul 2021 14:52:21 +0000 Subject: [PATCH 0526/1522] linux-rt_5_10: 5.10.47-rt46 -> 5.10.52-rt47 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 62c411cd969..83b2fc05093 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.47-rt46"; # updated by ./update-rt.sh + version = "5.10.52-rt47"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; + sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q"; + sha256 = "1n71nbshma0gxyrifyymrd0wii1q0plj020amc0wdzzm27xs5k2k"; }; }; in [ rt-patch ] ++ kernelPatches; From f254b2444ac7fa5b03c56035f889356b50b4425b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 25 Jul 2021 14:52:39 +0000 Subject: [PATCH 0527/1522] linux_latest-libre: 18165 -> 18191 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 65632456963..f02c1ad1250 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18165"; - sha256 = "17birwp6byxr4yb8cbc0afssli84ds1p2sisjl4g6rx3r7yqvsxn"; + rev = "18191"; + sha256 = "0ggaccg7z540kh5if48v6sjy39xllzvznqx5srvrlycrs2r89iyr"; } , ... }: From 703882fb577fc939ace7cdc3197440f306380b9b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 17:44:39 +0200 Subject: [PATCH 0528/1522] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ pkgs/development/haskell-modules/hackage-packages.nix | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4bd34a1bccb..f79522ddb8c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1999,6 +1999,7 @@ broken-packages: - hedgehog-checkers - hedgehog-generic - hedgehog-golden + - hedgehog-optics - hedgehog-servant - hedis-config - hedis-namespace @@ -2210,6 +2211,7 @@ broken-packages: - hs2ps - hsakamai - hsaml2 + - hs-aws-lambda - hsay - hsbc - hsbencher @@ -3171,6 +3173,7 @@ broken-packages: - naqsha - narc - nationstates + - nat-optics - nats-client - nat-sized-numbers - natural @@ -3467,6 +3470,7 @@ broken-packages: - parsergen - parser-helper - parsers-megaparsec + - parser-unbiased-choice-monad-embedding - parsimony - parsley - parsley-core @@ -3733,6 +3737,7 @@ broken-packages: - process-leksah - process-listlike - processmemory + - procex - procrastinating-variable - procstat - prof2pretty diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c7f19ab0c74..f8556253d54 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -125194,6 +125194,8 @@ self: { libraryHaskellDepends = [ base hedgehog optics-core ]; description = "Hedgehog properties for optics laws"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hedgehog-quickcheck" = callPackage @@ -134918,6 +134920,8 @@ self: { testHaskellDepends = [ base time ]; description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations. Now with API Gateway support!"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hs-bibutils" = callPackage @@ -184120,6 +184124,8 @@ self: { testHaskellDepends = [ base hedgehog optics-core text ]; description = "Refinement types for natural numbers with an optics interface"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nat-sized-numbers" = callPackage @@ -197337,6 +197343,8 @@ self: { ]; description = "Parsing library with unbiased choice and support for embedding arbitrary monad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "parser241" = callPackage @@ -210779,6 +210787,8 @@ self: { testHaskellDepends = [ base ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "procrastinating-structure" = callPackage From 7620da89f6eece3c33e73009774da68603a3a303 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 18:19:53 +0200 Subject: [PATCH 0529/1522] all-cabal-hashes: 2021-07-21T05:42:12Z -> 2021-07-26T15:54:23Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 98b19c54a30..d36b8342fdd 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/51c018b566e360a908addb7fcabf98fc0fbaafbe.tar.gz", - "sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85", - "msg": "Update from Hackage at 2021-07-21T05:42:12Z" + "commit": "e40930a03e038e12969b8eac001e86d7aa7355b4", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz", + "sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc", + "msg": "Update from Hackage at 2021-07-26T15:54:23Z" } From fafe21b678c3cd2d7f2c2a917604c29775fcb3bd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 18:21:05 +0200 Subject: [PATCH 0530/1522] haskellPackages: stackage-lts 18.2 -> 18.4 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a9741a2fdc0..e4c8c8b1529 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.2 +# Stackage LTS 18.4 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -895,7 +895,7 @@ default-package-overrides: - ghc-lib-parser-ex ==8.10.0.21 - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.8 + - ghc-prof ==1.4.1.9 - ghc-source-gen ==0.4.1.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.2 @@ -963,7 +963,7 @@ default-package-overrides: - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 - H ==0.9.0.1 - - hackage-db ==2.1.1 + - hackage-db ==2.1.2 - hackage-security ==0.6.0.1 - haddock-library ==1.10.0 - hadoop-streaming ==0.2.0.3 @@ -1244,7 +1244,7 @@ default-package-overrides: - inline-c-cpp ==0.4.0.3 - inline-r ==0.10.4 - inliterate ==0.1.0 - - input-parsers ==0.2.2 + - input-parsers ==0.2.3 - insert-ordered-containers ==0.2.5 - inspection-testing ==0.4.5.0 - instance-control ==0.1.2.0 @@ -1308,7 +1308,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - - JuicyPixels-extra ==0.5.1 + - JuicyPixels-extra ==0.5.2 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 @@ -1330,7 +1330,7 @@ default-package-overrides: - kmeans ==0.1.3 - koji ==0.0.2 - koofr-client ==1.0.0.3 - - krank ==0.2.2 + - krank ==0.2.3 - kubernetes-webhook-haskell ==0.2.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 @@ -1389,7 +1389,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - - lifted-async ==0.10.2 + - lifted-async ==0.10.2.1 - lifted-base ==0.2.3.12 - lift-generics ==0.2 - lift-type ==0.1.0.1 @@ -1437,6 +1437,7 @@ default-package-overrides: - lukko ==0.1.1.3 - lz4-frame-conduit ==0.1.0.1 - lzma ==0.0.0.3 + - lzma-clib ==5.2.2 - lzma-conduit ==1.2.1 - machines ==0.7.2 - machines-binary ==7.0.0.0 @@ -1555,7 +1556,7 @@ default-package-overrides: - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - mongoDB ==2.7.1.1 - - monoid-subclasses ==1.1 + - monoid-subclasses ==1.1.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 @@ -1647,7 +1648,7 @@ default-package-overrides: - nqe ==0.6.3 - nri-env-parser ==0.1.0.7 - nri-observability ==0.1.1.1 - - nri-prelude ==0.6.0.2 + - nri-prelude ==0.6.0.3 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1867,7 +1868,7 @@ default-package-overrides: - prospect ==0.1.0.0 - proto3-wire ==1.2.2 - protobuf ==0.2.1.3 - - protobuf-simple ==0.1.1.0 + - protobuf-simple ==0.1.1.1 - protocol-buffers ==2.4.17 - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 @@ -1923,7 +1924,7 @@ default-package-overrides: - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.4.1 + - rank2classes ==1.4.2 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.15 @@ -1969,13 +1970,13 @@ default-package-overrides: - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - regex-pcre-builtin ==0.95.2.3.8.43 - - regex-posix ==0.96.0.0 + - regex-posix ==0.96.0.1 - regex-tdfa ==1.3.1.1 - regex-with-pcre ==1.1.0.0 - registry ==0.2.0.3 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.2.3 + - relational-query ==0.12.3.0 - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.0 @@ -2015,6 +2016,7 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - rpmbuild-order ==0.4.5 + - rpm-nvr ==0.1.0 - rp-tree ==0.6 - RSA ==2.4.1 - runmemo ==1.0.0.1 @@ -2039,7 +2041,7 @@ default-package-overrides: - sandwich ==0.1.0.8 - sandwich-quickcheck ==0.1.0.5 - sandwich-slack ==0.1.0.4 - - sandwich-webdriver ==0.1.0.5 + - sandwich-webdriver ==0.1.0.6 - say ==0.1.0.1 - sbp ==2.6.3 - sbv ==8.15 @@ -2122,7 +2124,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.19.5 - shake-language-c ==0.12.0 - - shake-plus ==0.3.3.1 + - shake-plus ==0.3.4.0 - shake-plus-extended ==0.4.1.0 - shakespeare ==2.0.25 - shared-memory ==0.2.0.0 @@ -2214,14 +2216,14 @@ default-package-overrides: - squeather ==0.8.0.0 - srcloc ==0.6 - stache ==2.3.0 - - stack ==2.7.1 + - stack ==2.7.3 - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 - StateVar ==1.2.1 - - static-text ==0.2.0.6 + - static-text ==0.2.0.7 - statistics ==0.15.2.0 - - status-notifier-item ==0.3.0.5 + - status-notifier-item ==0.3.1.0 - stb-image-redux ==0.2.1.3 - step-function ==0.2 - stm-chans ==3.0.0.4 @@ -2408,7 +2410,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.7 + - tidal ==1.7.8 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2519,7 +2521,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.18 + - unliftio ==0.2.19 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2625,7 +2627,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.3.3.0 + - witch ==0.3.4.0 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2686,13 +2688,13 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.20.2 + - yesod-core ==1.6.21.0 - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - - yesod-gitrev ==0.2.1 + - yesod-gitrev ==0.2.2 - yesod-markdown ==0.12.6.11 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.8 + - yesod-page-cursor ==2.0.0.9 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 From d675e19abb51d8fbf984e1c5c7f19c06a1dd6709 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 18:59:58 +0200 Subject: [PATCH 0531/1522] haskellPackages.{hackage-db,distribution-nixpkgs}: new rel. bounds * no released version of hackage2nix does support distribution-nixpkgs yet. * hackage-db 2.1.2 fixes an annoying bug introduced in 2.1.1 and also supports Cabal 3.4: https://github.com/NixOS/cabal2nix/issues/501 --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ---- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ---- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 +- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ece345208af..779897aa11f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1869,8 +1869,6 @@ EOT # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; - hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0; - # Too strict bounds on QuickCheck # https://github.com/muesli4/table-layout/issues/16 table-layout = doJailbreak super.table-layout; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 251a3d94bb2..5ef659349b3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,8 +84,4 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); - # hackage-db 2.1.1 is incompatible with Cabal < 3.4 - # See https://github.com/NixOS/cabal2nix/issues/501 - hackage-db = self.hackage-db_2_1_0; - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 42fa603d331..99b53b9f14f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -106,8 +106,4 @@ self: super: { # https://github.com/haskellari/time-compat/issues/23 time-compat = dontCheck super.time-compat; - # hackage-db 2.1.1 is incompatible with Cabal < 3.4 - # See https://github.com/NixOS/cabal2nix/issues/501 - hackage-db = super.hackage-db_2_1_0; - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 7908066ebb5..7e495474c84 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -136,7 +136,4 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; - # hackage-db 2.1.1 is incompatible with Cabal < 3.4 - # See https://github.com/NixOS/cabal2nix/issues/501 - hackage-db = super.hackage-db_2_1_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index da3c5acc483..ec372443c3e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -87,6 +87,7 @@ default-package-overrides: - diagrams-lib < 1.4.4 # streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot - streamly-bytestring == 0.1.2 + - distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -113,7 +114,6 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 package-maintainers: abbradar: From 6e72470ed25e88b15b9f9364e1ee2993ffb128fe Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 19:02:27 +0200 Subject: [PATCH 0532/1522] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1220 +++++++---------- 1 file changed, 521 insertions(+), 699 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f8556253d54..fbd79b59465 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11709,8 +11709,8 @@ self: { }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.5.1"; - sha256 = "1kgb2l6ymhjr7wq93jpdhxy3k4i7jz0rz256phz10ycdpyvdbjpq"; + version = "0.5.2"; + sha256 = "11y4735bbp99wvi4fkpvkda7cj4c6iqp437drs27flicx2ygc687"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -19211,6 +19211,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "StateVar_1_2_2" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "StateVar"; + version = "1.2.2"; + sha256 = "098q4lk60najzpbfal4bg4sh7izxm840aa5h4ycaamjn77d3jjsy"; + libraryHaskellDepends = [ base stm transformers ]; + description = "State variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "StateVar-transformer" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -20755,8 +20767,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.6.0.1"; - sha256 = "082i8jhx9s977j8dgn6v92h9nzkblcyw820jk87bg14w4lcgi91v"; + version = "0.7"; + sha256 = "0f7l91lds878s49yjq210sc49y6c6i3m3hys02902b64dqdgslpa"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21914,18 +21926,19 @@ self: { ({ mkDerivation, base, bytestring, Cabal, case-insensitive , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances - , scientific, tagged, template-haskell, time, unicode-collation - , unordered-containers + , random, scientific, tagged, template-haskell, time + , unicode-collation, unordered-containers, uuid-types }: mkDerivation { pname = "Z-Data"; - version = "1.0.0.1"; - sha256 = "1lhcmcjhr6p3ac50lpmppdvj80vx2wi8xjljd9s9mbiy5kf4pc63"; + version = "1.1.0.0"; + sha256 = "0zjgai814a4zbcyjrmfcy1kq97rds0pjsiz8lma1g8c0fhq2gy5c"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim - hashable integer-gmp primitive QuickCheck scientific tagged + hashable integer-gmp primitive QuickCheck random scientific tagged template-haskell time unicode-collation unordered-containers + uuid-types ]; testHaskellDepends = [ base containers hashable hspec HUnit integer-gmp primitive @@ -32288,8 +32301,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.9.0.0"; - sha256 = "09i5b4pdbc1x7977icq0m7amk59iy0822ki5dlhd7y74m2dmdf9z"; + version = "0.9.1.0"; + sha256 = "0k9xi2k4ifrnnh6p80pf1xhf45cbhrs1zdwy0ayp08p0ajdlh74b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49567,6 +49580,8 @@ self: { pname = "cabal2nix"; version = "2.17.0"; sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm"; + revision = "2"; + editedCabalFile = "05lb28s4l4c1s6jv1zaqpm9mwx5r4gm113akzq9xr1w5447vw2c3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50870,6 +50885,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "capability_0_5_0_0" = callPackage + ({ mkDerivation, base, constraints, containers, dlist, exceptions + , generic-lens, hspec, lens, monad-control, mtl, mutable-containers + , primitive, reflection, safe-exceptions, silently, streaming + , temporary, text, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "capability"; + version = "0.5.0.0"; + sha256 = "116phv80mqs5jd3pv0ar29xfjcg8jf2c77fp530dk0k3da8v5d38"; + libraryHaskellDepends = [ + base constraints dlist exceptions generic-lens lens monad-control + mtl mutable-containers primitive reflection safe-exceptions + streaming transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + base containers dlist hspec lens mtl silently streaming temporary + text unliftio + ]; + description = "Extensional capabilities and deriving combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "capataz" = callPackage ({ mkDerivation, async, base, bytestring, pretty-show , prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck @@ -55942,8 +55981,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.3"; - sha256 = "119hybfny3sriscgk8zjf56yfc36jxnzydkhb04wxfip9r84mn03"; + version = "0.26.4"; + sha256 = "0gvfplid34idkfg5s7dvcwg22ij3fryn82hz958z2960a4jb7ngv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -56163,8 +56202,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.2.4"; - sha256 = "0ay3rb6vfzvb43mwhjzgdf3cp7dcya0l9sl7msns0niak4xmnz1l"; + version = "0.4.3"; + sha256 = "01hs4rh89zp0y2gkfam27kdwywh5fqr10pzwf1d4c92kpnz9xd5d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -59801,8 +59840,8 @@ self: { }: mkDerivation { pname = "compdoc"; - version = "0.2.0.0"; - sha256 = "0cdgyvbx2xf7dgvg0h6k980yfh9vj7yg5vsg08i7cb8iik2w0k0m"; + version = "0.3.0.0"; + sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -59817,10 +59856,8 @@ self: { }: mkDerivation { pname = "compdoc-dhall-decoder"; - version = "0.2.0.0"; - sha256 = "0iygbgcqcs3ixdnphhrp57s1ihpwnf9q59z7r74qqj7qx1yjrxig"; - revision = "1"; - editedCabalFile = "1g15qxkxfipvf6al3k8bdcvvcl1vyhjhg3r1w2z2g91ngz0b5y18"; + version = "0.3.0.0"; + sha256 = "0qsq67zj8gr9xlgcbxgn5fi1cyv4qf7w5vzfl3v4hvil7xf3fn77"; libraryHaskellDepends = [ base compdoc composite-aeson composite-base dhall either pandoc text @@ -60168,6 +60205,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-dhall" = callPackage + ({ mkDerivation, base, composite-base, dhall, lens, text }: + mkDerivation { + pname = "composite-dhall"; + version = "0.0.1.0"; + sha256 = "1hhy3incp4j8n0c8jyk12qi9zgxmwqpvb08zhc8rql855g88rpfq"; + revision = "2"; + editedCabalFile = "16ki1iii379yn1qwxs76qfjm4wvkysdm15b60m24v1gz1vkxidhi"; + libraryHaskellDepends = [ base composite-base dhall lens text ]; + description = "Dhall instances for composite records"; + license = lib.licenses.mit; + }) {}; + "composite-ekg" = callPackage ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: @@ -63376,6 +63426,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "contravariant_1_5_4" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5.4"; + sha256 = "19bwqkxvpgdfvjamk0g8wk1q4rfvbhxain6lx78ldhjmc7m5v9ql"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, contravariant, template-haskell , template-haskell-compat-v0208 @@ -77452,6 +77514,26 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "distribution-nixpkgs_1_6_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, hspec, language-nix, lens, pretty, process, split + }: + mkDerivation { + pname = "distribution-nixpkgs"; + version = "1.6.0"; + sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq language-nix lens + pretty process split + ]; + testHaskellDepends = [ base deepseq hspec lens ]; + description = "Types and functions to manipulate the Nixpkgs distribution"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "distribution-opensuse" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class @@ -77964,18 +78046,20 @@ self: { ({ mkDerivation, base, base16-bytestring, bytestring , case-insensitive, conduit, conduit-extra, config-ini, containers , cryptonite, exceptions, extra, filepath, generic-lens, hspec - , http-client-tls, http-conduit, http-types, memory, microlens - , mime-types, mtl, resourcet, text, time, transformers, xml-conduit + , http-api-data, http-client-tls, http-conduit, http-types, memory + , microlens, mime-types, mtl, resourcet, text, time, transformers + , unliftio, xml-conduit }: mkDerivation { pname = "do-spaces"; - version = "0.1.0"; - sha256 = "1xj0n2pmmwkm4ss5gvsbvw8m545w4890a3hhk1ns1vbbm06zmvsi"; + version = "0.2"; + sha256 = "0nl3gj7jfamm4j8z16jxxl6xq3507p091zsvsa0gxmqiwkjqfc65"; libraryHaskellDepends = [ base base16-bytestring bytestring case-insensitive conduit conduit-extra config-ini containers cryptonite exceptions extra - filepath generic-lens http-client-tls http-conduit http-types - memory microlens mime-types mtl text time transformers xml-conduit + filepath generic-lens http-api-data http-client-tls http-conduit + http-types memory microlens mime-types mtl text time transformers + unliftio xml-conduit ]; testHaskellDepends = [ base bytestring case-insensitive conduit conduit-extra containers @@ -80924,8 +81008,8 @@ self: { }: mkDerivation { pname = "dynamic-pipeline"; - version = "0.3.1.2"; - sha256 = "02dnji253nvszgma7yzn7ghkz7gy4a24qa54l0pbm3mnf9xmwn31"; + version = "0.3.1.3"; + sha256 = "01f98acd9hkqi5jbgm7zb69ci6gsf8rwlwddw6g5id2kvim557n8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102011,27 +102095,6 @@ self: { }) {c = null;}; "ghc-prof" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; - version = "1.4.1.8"; - sha256 = "02k6il0a6cdr5dvf5x6gpjyn9vzn43kahqdsq5lzjvw5c6l0462p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_9" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, scientific, tasty, tasty-hunit, temporary, text, time }: @@ -102050,7 +102113,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -102324,6 +102386,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-tcplugin-api" = callPackage + ({ mkDerivation, base, ghc, transformers }: + mkDerivation { + pname = "ghc-tcplugin-api"; + version = "0.2.0.0"; + sha256 = "0x58s2ip5p59vpx1x6lwdq46vxjfx6b28yzxjpd9pb148x787yfd"; + libraryHaskellDepends = [ base ghc transformers ]; + description = "An API for type-checker plugins"; + license = lib.licenses.bsd3; + }) {}; + "ghc-tcplugins-extra_0_3_2" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -105511,15 +105584,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_0_1" = callPackage + "gitlab-haskell_0_3_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-client , http-conduit, http-types, tasty, tasty-hunit, temporary, text , time, transformers, unix, unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.0.1"; - sha256 = "103wkbfnx8n5klaacqfl4vyg6rwszac04rpg7p7hka1m7jsrikwf"; + version = "0.3.0.2"; + sha256 = "0ndwff0rk1b7vkggymb0ca0h0hg69kym7npcckv2x2pnw55lb5yz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit @@ -106410,8 +106483,8 @@ self: { }: mkDerivation { pname = "gloss-export"; - version = "0.1.0.3"; - sha256 = "1m1fxv516kfqx4y684xcd1x0vvzirgv1acawiam5nm26hqvxcf85"; + version = "0.1.0.4"; + sha256 = "1mllkmb11cqgaw183jjxmivs8h1n8vbr31bqlw94v4vjm4r4ljzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112450,8 +112523,8 @@ self: { }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.6.2"; - sha256 = "1rcw57d5f0298y40ajmb2664ryrqsmcwbr2y1pk0sl2ggwr1zzsl"; + version = "0.1.8.0"; + sha256 = "0b8b8hvsv60zvnjidqm1qchxdgqdf5gcmm5pz8fvrvcjqq27b1xa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114072,48 +114145,7 @@ self: { broken = true; }) {}; - "hackage-db_2_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, exceptions, filepath, tar, time, utf8-string - }: - mkDerivation { - pname = "hackage-db"; - version = "2.1.0"; - sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; - revision = "1"; - editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filepath tar time utf8-string - ]; - description = "Access cabal-install's Hackage database via Data.Map"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - "hackage-db" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, exceptions, filepath, tar, time, utf8-string - }: - mkDerivation { - pname = "hackage-db"; - version = "2.1.1"; - sha256 = "16y1iqb3y019hjdsq7q3zx51qy834ky3mw5vszqmzzhflqpicd31"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filepath tar time utf8-string - ]; - description = "Access cabal-install's Hackage database via Data.Map"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "hackage-db_2_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string }: @@ -114129,7 +114161,6 @@ self: { ]; description = "Access cabal-install's Hackage database via Data.Map"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -121285,19 +121316,21 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log , containers, flow, ghc-prim, hspec, interval-algebra, lens - , lens-aeson, mtl, process, QuickCheck, safe, tasty, tasty-hspec - , tasty-hunit, text, time, unordered-containers, vector, witherable + , lens-aeson, mtl, nonempty-containers, process, QuickCheck, safe + , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.12.0"; - sha256 = "0zjlzd6c5plyi803vpx0f4js9b2zys8pd6ikbdya2ifmgxfwj2zh"; + version = "0.13.1"; + sha256 = "1fhlw490bwyblsgjrzgms4lzkv0zd8bhsvl2ywlpz0flhdd999zr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cmdargs co-log containers flow ghc-prim - interval-algebra lens lens-aeson mtl process QuickCheck safe tasty - tasty-hunit text time unordered-containers vector witherable + interval-algebra lens lens-aeson mtl nonempty-containers process + QuickCheck safe semiring-simple tasty tasty-hunit text time + unordered-containers vector witherable ]; testHaskellDepends = [ aeson base bytestring containers flow hspec interval-algebra lens @@ -121521,8 +121554,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.53.6"; - sha256 = "04f9aybim3nv5xhlcawcm9jgbf4ql8v3lqgw8yvk5snrzy30yf1f"; + version = "0.53.8"; + sha256 = "1djlq58v6wm3kr8jsvr612qxaxz1k03mfxvywd6ia45f761ry1ks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121567,8 +121600,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.53.7"; - sha256 = "150nprl5i8v5api6h7svdwdskzjiy7ljrwmz3zfil1h05b2qz3l6"; + version = "0.53.8"; + sha256 = "06q9h1n9c8gz6fycc8nsjxp98c98zin1f7y7qiyy80cddhcj1jzf"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -124976,13 +125009,13 @@ self: { , case-insensitive, conduit, conduit-extra, config-ini, containers , exceptions, filepath, generic-lens, hashable, hspec , http-api-data, http-client, http-client-tls, http-conduit - , http-types, microlens, mtl, random, scientific, split, text, time - , unliftio, unordered-containers, uri-bytestring + , http-types, microlens, microlens-ghc, mtl, random, scientific + , split, text, time, unliftio, unordered-containers, uri-bytestring }: mkDerivation { pname = "heddit"; - version = "0.0.3"; - sha256 = "04kdhsxlna5l6h6wxyvxacxvmklhv19h5r802qac34gkpfvld851"; + version = "0.2"; + sha256 = "1hxshqw9s40yzpk0j4byqyvb3cqnfw2l3b2s4azbng77prvnmmd7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -124990,8 +125023,9 @@ self: { aeson aeson-casing base bytestring case-insensitive conduit conduit-extra config-ini containers exceptions filepath generic-lens hashable http-api-data http-client http-client-tls - http-conduit http-types microlens mtl random scientific split text - time unliftio unordered-containers uri-bytestring + http-conduit http-types microlens microlens-ghc mtl random + scientific split text time unliftio unordered-containers + uri-bytestring ]; testHaskellDepends = [ aeson base bytestring containers generic-lens hspec microlens @@ -135666,6 +135700,27 @@ self: { broken = true; }) {}; + "hs-term-emulator" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring + , containers, criterion, hspec, hspec-discover, lens, text, vector + }: + mkDerivation { + pname = "hs-term-emulator"; + version = "0.1.0.0"; + sha256 = "03aidqaw9pmwggd1w8ir6qhb08hlhv0q5gnl0hqa5zjj86dd0rp2"; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring containers lens text + vector + ]; + testHaskellDepends = [ + ansi-terminal attoparsec base hspec text vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Terminal Emulator written in 100% Haskell"; + license = lib.licenses.mit; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -142418,8 +142473,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "2.1.0.1"; - sha256 = "16j7kxxp60i0nbiscc1x5a14s7n8qyv8rzjm6a03pqdpbmfzrrwq"; + version = "2.1.1.0"; + sha256 = "0hlkqgbk8siycz055lqn01qgn8npgqyq59br2yvpbk4rz7jzjmfa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148238,22 +148293,6 @@ self: { }) {}; "input-parsers" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , monoid-subclasses, parsec, parsers, text, transformers - }: - mkDerivation { - pname = "input-parsers"; - version = "0.2.2"; - sha256 = "1kb70nxg8bji7bd0y0w81bqyhx62xrbv3y2vib6sp3jkz7yriarz"; - libraryHaskellDepends = [ - attoparsec base binary bytestring monoid-subclasses parsec parsers - text transformers - ]; - description = "Extension of the parsers library with more capability and efficiency"; - license = lib.licenses.bsd3; - }) {}; - - "input-parsers_0_2_3" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , monoid-subclasses, parsec, parsers, text, transformers }: @@ -148267,7 +148306,6 @@ self: { ]; description = "Extension of the parsers library with more capability and efficiency"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "inquire" = callPackage @@ -155994,6 +156032,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "keid-sound-openal" = callPackage + ({ mkDerivation, base, geomancy, keid-core, OpenAL, opusfile + , resourcet, rio, unliftio + }: + mkDerivation { + pname = "keid-sound-openal"; + version = "0.1.0.0"; + sha256 = "17ml9xh8qrvyrcsi1ai6br286bf9c6j29wbmp5sp65spp2kwlyng"; + libraryHaskellDepends = [ + base geomancy keid-core OpenAL opusfile resourcet rio unliftio + ]; + description = "OpenAL sound system for Keid engine"; + license = lib.licenses.bsd3; + }) {}; + "keid-ui-dearimgui" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash-md5 , dear-imgui, derive-storable, derive-storable-plugin, foldl @@ -157010,36 +157063,6 @@ self: { }) {}; "krank" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations, http-client, http-types, lifted-async, mtl - , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req - , safe-exceptions, text, unordered-containers - }: - mkDerivation { - pname = "krank"; - version = "0.2.2"; - sha256 = "10w6vbpcn9n07s99w02izg7nfizpbq5m5mg6zv46f1llm35jpv6w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-types - lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions - text unordered-containers - ]; - executableHaskellDepends = [ - base containers mtl optparse-applicative pcre-heavy pretty-terminal - PyF text - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec hspec-expectations - http-client http-types lifted-async mtl pcre-heavy pretty-terminal - PyF req safe-exceptions text unordered-containers - ]; - description = "Krank checks your code source comments for important markers"; - license = lib.licenses.bsd3; - }) {}; - - "krank_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-expectations, http-client, http-types, lifted-async, mtl , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF @@ -157067,7 +157090,6 @@ self: { ]; description = "Krank checks issue tracker link status in your source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "krapsh" = callPackage @@ -163420,8 +163442,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.2"; - sha256 = "0alhvrvxp4f4srllyq5br3waiba4c93cc4nxm7jd23440swr6a31"; + version = "0.10.2.1"; + sha256 = "0j4f5471qfxkxy84ri87bcvp30ikh4m30imcggwn8m5v8igp218d"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -179135,25 +179157,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "1.1"; - sha256 = "1bv0ripdw53121aj39zalczkfwrajpzzd1i99jn49sr4bfwgy3p4"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -179170,7 +179173,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -189103,33 +189105,6 @@ self: { }) {}; "nri-prelude" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base - , bytestring, containers, directory, exceptions, filepath, ghc - , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text - , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text - , time, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.6.0.2"; - sha256 = "002bq6qwaiw4v30b677hg8pv2sa9iaqdv90h02fbq4pkhqsqhpkw"; - libraryHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time vector - ]; - testHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_6_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text @@ -189154,7 +189129,6 @@ self: { ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-redis" = callPackage @@ -195832,8 +195806,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.3"; - sha256 = "1z40rjmcbs7d0f9aksgdm2w4l3jyglgm5iap4z110mfkmrvwrlfx"; + version = "0.4.4"; + sha256 = "17kwyqwywnj694b30bs3da4pns73jp7pr2jxpc7zy261gmfqvpyz"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -197522,10 +197496,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "1.3.0.0"; - sha256 = "0qx5q7a9hkj9swpwlxh24c19pf9i6yvlmp44xiwshflz4cf1n8dq"; - revision = "1"; - editedCabalFile = "03a4l7ai39kii4qdxv78wgknj3iz2n2g2055rk3mi0wsiy280jfg"; + version = "1.4.0.0"; + sha256 = "1w9pilgaajaycxr0nvjwdzk5fjf7pg4spnwh2197gbpqhbkj75q3"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -200256,8 +200228,8 @@ self: { }: mkDerivation { pname = "persistent-documentation"; - version = "0.1.0.3"; - sha256 = "03p3ppjrn9j76bwgq7n921c2h0xkzsf9ish6nx6bhxdggyq3bfwy"; + version = "0.1.0.4"; + sha256 = "0ib56hz4q83knw6lqdbfcflnpwd0x8381p67yibmnbyn9p5b6r1q"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -201577,19 +201549,19 @@ self: { "phonetic-languages-phonetics-basics" = callPackage ({ mkDerivation, base, foldable-ix, lists-flines, mmsyn2-array - , mmsyn5 + , mmsyn3, mmsyn5 }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.7.0.0"; - sha256 = "16a8b5xpdrayfh03czs0nb1xz6kn95rr4k4dim5viqjxpc9f0zbn"; + version = "0.8.1.0"; + sha256 = "1y67w8ywcmv8d86b52vhiqxsgk31pglf8hcjnmml2q5kh8cpjwmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base foldable-ix lists-flines mmsyn2-array mmsyn5 + base foldable-ix lists-flines mmsyn2-array mmsyn3 mmsyn5 ]; executableHaskellDepends = [ - base foldable-ix lists-flines mmsyn2-array mmsyn5 + base foldable-ix lists-flines mmsyn2-array mmsyn3 mmsyn5 ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; @@ -201687,8 +201659,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.5.0.0"; - sha256 = "0p7zsk9d6p4srjr0vk18r454p72v49kjpdh7hk3iwh9vh9mbjrbx"; + version = "0.5.0.1"; + sha256 = "0wrh3bmwa6l5vfjv481wvnqqd82xgm27vcbm9xg1nm7psihj6gqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201749,8 +201721,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.4.2.1"; - sha256 = "1h95v0vspx9dziqnki4553b7sblpq33l9h3a86xwim0rv7mpqsjs"; + version = "0.5.0.1"; + sha256 = "0gif3xwcbc5v4qjyhn1qwyj36jkqj7rdrq35fzxsr7xbmjcw13h2"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -201788,8 +201760,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.2.0.0"; - sha256 = "1k1id4dz0siz3qqax738k4k2dfj68slph4yy8ad6f4r9fink9jqr"; + version = "0.3.0.0"; + sha256 = "192i7dr6kpzrclvym1y1j3zgabcx3fldaan07rgxhhys3k7gbqxa"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -201905,8 +201877,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.1.0.0"; - sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf"; + version = "0.2.1.0"; + sha256 = "17gyg64hwk5cj9drpdsadyn3l94g2n6m859ghfplr665id2pgzlg"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; @@ -205582,6 +205554,19 @@ self: { broken = true; }) {}; + "polynomial-algebra" = callPackage + ({ mkDerivation, array, base, compact-word-vectors, containers }: + mkDerivation { + pname = "polynomial-algebra"; + version = "0.1"; + sha256 = "03133j7hknn0d6b6lvq0q05zy6m92lx5wh68chimgm45xh2p8y0a"; + libraryHaskellDepends = [ + array base compact-word-vectors containers + ]; + description = "Multivariate polynomial rings"; + license = lib.licenses.bsd3; + }) {}; + "polynomials-bernstein" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -205938,21 +205923,36 @@ self: { }) {}; "polysemy-methodology" = callPackage - ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin - , polysemy-zoo + ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-plugin + , polysemy-several }: mkDerivation { pname = "polysemy-methodology"; - version = "0.1.8.0"; - sha256 = "0p4h6vjrq6g6pd27mqpzp33jg84gfi3wpymjkbxfrwz7ky74jag5"; + version = "0.2.0.0"; + sha256 = "0cfd0xqcx8b5zrl5my03zx1h1mxqkdyrhn1nba453mk3lnvynwmw"; libraryHaskellDepends = [ - base co-log-polysemy polysemy polysemy-plugin polysemy-zoo + base polysemy polysemy-kvstore polysemy-plugin polysemy-several ]; description = "Domain modelling algebra for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-methodology-co-log" = callPackage + ({ mkDerivation, base, co-log-polysemy, polysemy + , polysemy-methodology, polysemy-plugin + }: + mkDerivation { + pname = "polysemy-methodology-co-log"; + version = "0.1.0.0"; + sha256 = "1pvvb83lkpxqni6055y3s0ckjg50nd1jfivq1c8701zjv31ylbpa"; + libraryHaskellDepends = [ + base co-log-polysemy polysemy polysemy-methodology polysemy-plugin + ]; + description = "Logging functions for polysemy-methodology"; + license = lib.licenses.mit; + }) {}; + "polysemy-methodology-composite" = callPackage ({ mkDerivation, base, composite-base, polysemy, polysemy-extra , polysemy-methodology, polysemy-vinyl, vinyl @@ -205999,16 +205999,12 @@ self: { }) {}; "polysemy-path" = callPackage - ({ mkDerivation, base, path, polysemy, polysemy-extra - , polysemy-plugin - }: + ({ mkDerivation, base, path, polysemy, polysemy-extra }: mkDerivation { pname = "polysemy-path"; - version = "0.2.0.0"; - sha256 = "0p5ylp8758zkhlgqrhq6v6fli03q9gmak7bzkw1czrxwdshkv0gi"; - libraryHaskellDepends = [ - base path polysemy polysemy-extra polysemy-plugin - ]; + version = "0.2.1.0"; + sha256 = "0smaai432vpqci9w7pyg443kcd1rpz7zpwww2wcxbyqszzllbhnr"; + libraryHaskellDepends = [ base path polysemy polysemy-extra ]; description = "Polysemy versions of Path functions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -206111,6 +206107,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-several" = callPackage + ({ mkDerivation, base, polysemy }: + mkDerivation { + pname = "polysemy-several"; + version = "0.1.0.0"; + sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps"; + libraryHaskellDepends = [ base polysemy ]; + description = "Run several effects at once, taken from the polysemy-zoo"; + license = lib.licenses.mit; + }) {}; + "polysemy-socket" = callPackage ({ mkDerivation, base, bytestring, polysemy, polysemy-plugin , socket @@ -206184,6 +206191,8 @@ self: { pname = "polysemy-uncontrolled"; version = "0.1.0.0"; sha256 = "137zw5366c4h7q8w7cj7h4wc4njf1n2f7kabyrl6bqav1fjb96lx"; + revision = "1"; + editedCabalFile = "1wadnvrazf6z10k5s86749zadymmw2j45amak286706qfh4zwjd1"; libraryHaskellDepends = [ base polysemy polysemy-methodology polysemy-plugin ]; @@ -206212,12 +206221,16 @@ self: { }) {}; "polysemy-vinyl" = callPackage - ({ mkDerivation, base, polysemy, polysemy-extra, vinyl }: + ({ mkDerivation, base, polysemy, polysemy-extra, polysemy-several + , vinyl + }: mkDerivation { pname = "polysemy-vinyl"; - version = "0.1.4.0"; - sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh"; - libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ]; + version = "0.1.5.0"; + sha256 = "06y91nv2fcis058gqv5hlpl5a6kmia5r9sc6npp6102lc19vkkc4"; + libraryHaskellDepends = [ + base polysemy polysemy-extra polysemy-several vinyl + ]; description = "Functions for mapping vinyl records in polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -210528,14 +210541,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_12_0" = callPackage + "process_1_6_13_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.12.0"; - sha256 = "1zw551zrnq70ip9dsc564aw1zf90l48jf59rxhjgx4d00ngs165x"; + version = "1.6.13.1"; + sha256 = "1fkaapar94w5prsvdpyybqb0j4hyjhf68czdlr5psb42i314lnj7"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -210774,17 +210787,17 @@ self: { }) {}; "procex" = callPackage - ({ mkDerivation, async, base, bytestring, containers, unix - , utf8-string + ({ mkDerivation, async, base, bytestring, containers, deepseq + , hspec, unix, utf8-string }: mkDerivation { pname = "procex"; - version = "0.1.0.0"; - sha256 = "08pd4v8jxhfy6i9vry0hlssqhlzx1wmi64kmhb0qwxagrj3r6dsx"; + version = "0.2.2"; + sha256 = "0gnrpk3n8127wc92m3qrq0hka6p56pxjrmgafxgb0w03mlvwc89q"; libraryHaskellDepends = [ - async base bytestring containers unix utf8-string + async base bytestring containers deepseq unix utf8-string ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -212209,31 +212222,6 @@ self: { }) {}; "protobuf-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, directory, filepath, hspec, mtl, parsec - , QuickCheck, quickcheck-instances, split, text - }: - mkDerivation { - pname = "protobuf-simple"; - version = "0.1.1.0"; - sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 mtl text - ]; - executableHaskellDepends = [ - base containers directory filepath mtl parsec split text - ]; - testHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 filepath - hspec parsec QuickCheck quickcheck-instances split text - ]; - description = "Simple Protocol Buffers library (proto2)"; - license = lib.licenses.mit; - }) {}; - - "protobuf-simple_0_1_1_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, directory, filepath, hspec, mtl, parsec , QuickCheck, quickcheck-instances, split, text @@ -212256,7 +212244,6 @@ self: { ]; description = "Simple Protocol Buffers library (proto2)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "protocol" = callPackage @@ -212487,8 +212474,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.2.1"; - sha256 = "15ghl4zdf4hz27kkfky4m405abmarzr8j7fqi07ax7mswwwha9f1"; + version = "0.1.2.2"; + sha256 = "1glilqib6bs1kbb0yyrzqxbsijrcrdm9q3cgmymgacc7kllc616n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217177,27 +217164,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest - , markdown-unlit, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.4.1"; - sha256 = "1cmc7xqnvjdvzgfyz7i3nmnhdm92rwfc9bqlpjcirmnkn47va4kb"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = lib.licenses.bsd3; - }) {}; - - "rank2classes_1_4_2" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest , markdown-unlit, tasty, tasty-hunit, template-haskell , transformers @@ -217216,7 +217182,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rapid" = callPackage @@ -221105,21 +221070,6 @@ self: { }) {}; "regex-posix" = callPackage - ({ mkDerivation, array, base, bytestring, containers, regex-base }: - mkDerivation { - pname = "regex-posix"; - version = "0.96.0.0"; - sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5"; - revision = "2"; - editedCabalFile = "10al5qljh6pc46581nkhrs0rjn8w05pp6jb4v55lgfr17ac0z1xx"; - libraryHaskellDepends = [ - array base bytestring containers regex-base - ]; - description = "POSIX Backend for \"Text.Regex\" (regex-base)"; - license = lib.licenses.bsd3; - }) {}; - - "regex-posix_0_96_0_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, regex-base }: mkDerivation { pname = "regex-posix"; @@ -221130,7 +221080,6 @@ self: { ]; description = "POSIX Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-posix-clib" = callPackage @@ -221882,30 +221831,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-constraint-compat, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.12.2.3"; - sha256 = "0zjqk0gkzdhg1l8rw0bz7iwvp55p585xaqp8dc3sbbr0abhmsgi5"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text - th-constraint-compat th-reify-compat time time-locale-compat - transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_3_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -221928,7 +221853,6 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -223226,13 +223150,13 @@ self: { "require" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, criterion - , directory, dlist, megaparsec, mtl, optparse-generic, relude - , tasty, tasty-hspec, text + , directory, dlist, hspec, megaparsec, mtl, optparse-generic + , relude, tasty, tasty-hspec, text }: mkDerivation { pname = "require"; - version = "0.4.10"; - sha256 = "0ha9301ncb5li3sxjlbbq5hgjijr40vl5jy33fsi0wn13zp99x94"; + version = "0.4.11"; + sha256 = "17nfpzwhwxnl6jmqnh2rf52mki3mh44y24w7masscbnadxnfp98a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223244,7 +223168,7 @@ self: { optparse-generic relude text ]; testHaskellDepends = [ - ansi-terminal base bytestring directory dlist megaparsec mtl + ansi-terminal base bytestring directory dlist hspec megaparsec mtl optparse-generic relude tasty tasty-hspec text ]; benchmarkHaskellDepends = [ @@ -228801,49 +228725,6 @@ self: { }) {}; "sandwich-webdriver" = callPackage - ({ mkDerivation, aeson, base, containers, convertible, data-default - , directory, exceptions, filepath, http-client, http-client-tls - , http-conduit, lifted-base, microlens, microlens-aeson - , monad-control, monad-logger, mtl, network, process, random, retry - , safe, safe-exceptions, sandwich, string-interpolate, temporary - , text, time, transformers, unix, unordered-containers, vector - , webdriver, X11 - }: - mkDerivation { - pname = "sandwich-webdriver"; - version = "0.1.0.5"; - sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - executableHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - testHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - description = "Sandwich integration with Selenium WebDriver"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich-webdriver_0_1_0_6" = callPackage ({ mkDerivation, aeson, base, containers, data-default, directory , exceptions, filepath, http-client, http-client-tls, http-conduit , lifted-base, microlens, microlens-aeson, monad-control @@ -228884,7 +228765,6 @@ self: { ]; description = "Sandwich integration with Selenium WebDriver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sarasvati" = callPackage @@ -235531,19 +235411,19 @@ self: { }) {}; "servant-util" = callPackage - ({ mkDerivation, aeson, autoexporter, base, containers - , data-default, fmt, hspec, hspec-discover, hspec-expectations - , http-client, http-types, insert-ordered-containers, lens - , megaparsec, mtl, pretty-terminal, QuickCheck, reflection - , regex-posix, safe-exceptions, servant, servant-client - , servant-client-core, servant-server, servant-swagger - , servant-swagger-ui, servant-swagger-ui-core, swagger2, text - , text-format, time, universum, wai, wai-extra, warp + ({ mkDerivation, aeson, base, containers, data-default, fmt, hspec + , hspec-discover, hspec-expectations, http-client, http-types + , insert-ordered-containers, lens, megaparsec, mtl, pretty-terminal + , QuickCheck, reflection, regex-posix, safe-exceptions, servant + , servant-client, servant-client-core, servant-server + , servant-swagger, servant-swagger-ui, servant-swagger-ui-core + , swagger2, text, text-format, time, universum, wai, wai-extra + , warp }: mkDerivation { pname = "servant-util"; - version = "0.1.0.1"; - sha256 = "0idb3h2482hhrj9yvphdb74wxyr2y3rzfql2q2qn2a724b1bmax4"; + version = "0.1.0.2"; + sha256 = "1l0pwwz8y4qwnpn30w3mla3j3dmbyv99kilbb8z283iwpnbgrn2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235554,7 +235434,6 @@ self: { servant-swagger-ui servant-swagger-ui-core swagger2 text text-format time universum wai ]; - libraryToolDepends = [ autoexporter ]; executableHaskellDepends = [ aeson base containers data-default fmt http-types insert-ordered-containers lens megaparsec mtl pretty-terminal @@ -235578,22 +235457,21 @@ self: { }) {}; "servant-util-beam-pg" = callPackage - ({ mkDerivation, autoexporter, base, beam-core, beam-postgres - , containers, hspec, hspec-discover, QuickCheck, servant - , servant-client, servant-client-core, servant-server, servant-util - , text, universum + ({ mkDerivation, base, beam-core, beam-postgres, containers, hspec + , hspec-discover, QuickCheck, servant, servant-client + , servant-client-core, servant-server, servant-util, text + , universum }: mkDerivation { pname = "servant-util-beam-pg"; - version = "0.1.0.1"; - sha256 = "1qhs2bvlka3qm4kv64m5p5ldcd9nfgzs0za9vqy2z9fmdhzihxz1"; + version = "0.1.0.2"; + sha256 = "048ybnlkhp7dabki4r3k6q147cdm3w3l14c57rrf1n1vf4rwkgn2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base beam-core beam-postgres containers servant servant-client servant-client-core servant-server servant-util text universum ]; - libraryToolDepends = [ autoexporter ]; executableHaskellDepends = [ base beam-core beam-postgres containers servant servant-client servant-client-core servant-server servant-util text universum @@ -237147,17 +237025,6 @@ self: { }) {}; "shake-plus" = callPackage - ({ mkDerivation, base, extra, path, rio, shake }: - mkDerivation { - pname = "shake-plus"; - version = "0.3.3.1"; - sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5"; - libraryHaskellDepends = [ base extra path rio shake ]; - description = "Re-export of Shake using well-typed paths and ReaderT"; - license = lib.licenses.mit; - }) {}; - - "shake-plus_0_3_4_0" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; @@ -237166,7 +237033,6 @@ self: { libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "shake-plus-extended" = callPackage @@ -239231,8 +239097,8 @@ self: { ({ mkDerivation, base, formatting, simple-media-timestamp }: mkDerivation { pname = "simple-media-timestamp-formatting"; - version = "0.1.0.0"; - sha256 = "05km174zc9as8aa4l18fgwnjl19068kqr1chvmnn7r3b8ms00z57"; + version = "0.1.1.0"; + sha256 = "1fkjplpkv1jxcadhc596rv7jzbgn2f1xnmwdfa68wls3hl0h7s70"; libraryHaskellDepends = [ base formatting simple-media-timestamp ]; description = "Formatting for simple-media-timestamp"; license = lib.licenses.mit; @@ -239312,8 +239178,8 @@ self: { }: mkDerivation { pname = "simple-parser"; - version = "0.8.0"; - sha256 = "0k2sj1n42kkfvr0g8sdhz5vasv0h38hgs04r8fjy5gpxmrzni472"; + version = "0.8.2"; + sha256 = "15nxh0byl0893gzsakb80asam8dr4lqxqnlj372cdjgqvrzcxrap"; libraryHaskellDepends = [ base bytestring containers errata list-t mmorph mtl nonempty-containers scientific text text-builder @@ -246591,6 +246457,40 @@ self: { license = lib.licenses.mit; }) {}; + "srt-dhall" = callPackage + ({ mkDerivation, attoparsec, base, dhall, either, formatting + , simple-media-timestamp, simple-media-timestamp-formatting, srt + , srt-attoparsec, srt-formatting, text + }: + mkDerivation { + pname = "srt-dhall"; + version = "0.1.0.0"; + sha256 = "16ygxiqb9d0js3gr4823fdkk8pzsairby6iywnvsafas1qvhm0yp"; + libraryHaskellDepends = [ + attoparsec base dhall either formatting simple-media-timestamp + simple-media-timestamp-formatting srt srt-attoparsec srt-formatting + text + ]; + description = "Dhall Encoder/Decoder for SRT"; + license = lib.licenses.mit; + }) {}; + + "srt-formatting" = callPackage + ({ mkDerivation, base, formatting, simple-media-timestamp + , simple-media-timestamp-formatting, srt + }: + mkDerivation { + pname = "srt-formatting"; + version = "0.1.0.0"; + sha256 = "0ssbxjlzqn0n3lj3f4m3881m1z0jk5qq94badddwszxs898d1zk5"; + libraryHaskellDepends = [ + base formatting simple-media-timestamp + simple-media-timestamp-formatting srt + ]; + description = "Format an SRT"; + license = lib.licenses.mit; + }) {}; + "sscan" = callPackage ({ mkDerivation, async, base, brick, directory, filepath, microlens , microlens-th, process, temporary, text, time, vty @@ -246950,100 +246850,6 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array - , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , casa-client, casa-types, colour, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify - , generic-deriving, hackage-security, hashable, hi-file-parser - , hpack, hpc, hspec, http-client, http-client-tls, http-conduit - , http-download, http-types, memory, microlens, mintty - , mono-traversable, mtl, mustache, neat-interpolation, network-uri - , open-browser, optparse-applicative, pantry, path, path-io - , persistent, persistent-sqlite, persistent-template, pretty - , primitive, process, project-template, QuickCheck, raw-strings-qq - , regex-applicative-text, retry, rio, rio-prettyprint, semigroups - , smallcheck, split, stm, streaming-commons, tar, template-haskell - , temporary, text, text-metrics, th-reify-many, time, tls - , transformers, typed-process, unicode-transforms, unix - , unix-compat, unliftio, unordered-containers, vector, yaml - , zip-archive, zlib - }: - mkDerivation { - pname = "stack"; - version = "2.7.1"; - sha256 = "09mw5jwgcmbkwsgvg1ls114hq9v2vl49pdvix8ir7vvgicvdhnv0"; - configureFlags = [ - "-fdisable-git-info" "-fhide-dependency-versions" - "-fsupported-build" - ]; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal filepath ]; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template regex-applicative-text retry rio rio-prettyprint - semigroups split stm streaming-commons tar template-haskell - temporary text text-metrics th-reify-many time tls transformers - typed-process unicode-transforms unix unix-compat unliftio - unordered-containers vector yaml zip-archive zlib - ]; - executableHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template regex-applicative-text retry rio rio-prettyprint - semigroups split stm streaming-commons tar template-haskell - temporary text text-metrics th-reify-many time tls transformers - typed-process unicode-transforms unix unix-compat unliftio - unordered-containers vector yaml zip-archive zlib - ]; - testHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc hspec http-client http-client-tls - http-conduit http-download http-types memory microlens mintty - mono-traversable mtl mustache neat-interpolation network-uri - open-browser optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template QuickCheck raw-strings-qq regex-applicative-text - retry rio rio-prettyprint semigroups smallcheck split stm - streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib - ]; - doCheck = false; - preCheck = "export HOME=$TMPDIR"; - postInstall = '' - exe=$out/bin/stack - mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack - ''; - description = "The Haskell Tool Stack"; - license = lib.licenses.bsd3; - }) {}; - - "stack_2_7_3" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal , casa-client, casa-types, colour, conduit, conduit-extra @@ -247135,7 +246941,6 @@ self: { ''; description = "The Haskell Tool Stack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "stack-all" = callPackage @@ -248441,27 +248246,6 @@ self: { }) {}; "static-text" = callPackage - ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen - , markdown-unlit, tasty, tasty-hunit, template-haskell, text - , vector - }: - mkDerivation { - pname = "static-text"; - version = "0.2.0.6"; - sha256 = "14z6ib2b1n6m460c5li58wh0p5kwmb471zwpwjn0pmgsayp8vzzi"; - libraryHaskellDepends = [ - base bytestring template-haskell text vector - ]; - testHaskellDepends = [ - base bytestring doctest doctest-driver-gen markdown-unlit tasty - tasty-hunit template-haskell - ]; - testToolDepends = [ markdown-unlit ]; - description = "Lists, Texts, ByteStrings and Vectors of statically known length"; - license = lib.licenses.bsd3; - }) {}; - - "static-text_0_2_0_7" = callPackage ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen , markdown-unlit, tasty, tasty-hunit, template-haskell, text , vector @@ -248480,7 +248264,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Lists, Texts, ByteStrings and Vectors of statically known length"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "staticanalysis" = callPackage @@ -248704,8 +248487,8 @@ self: { }: mkDerivation { pname = "status-notifier-item"; - version = "0.3.0.5"; - sha256 = "165kdg1wb0xpy4z7hlk8654ph2psdibal1p0f32zzrccbnk0w801"; + version = "0.3.1.0"; + sha256 = "1x3zqa2b9vl5mirfbh2bmyali47jpfcqsw4xxgbmsgz9jiffpda9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249642,6 +249425,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-record_0_0_6" = callPackage + ({ mkDerivation, base, QuickCheck, semigroups, transformers + , utility-ht + }: + mkDerivation { + pname = "storable-record"; + version = "0.0.6"; + sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base QuickCheck semigroups transformers utility-ht + ]; + description = "Elegant definition of Storable instances for records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "storable-static-array" = callPackage ({ mkDerivation, array, base, tagged, vector }: mkDerivation { @@ -250648,8 +250449,8 @@ self: { }: mkDerivation { pname = "streamly-archive"; - version = "0.0.2"; - sha256 = "00cd5ssa5hi4pvc5li24z68f1k50h02frn4668gcrv8lr5kh6s50"; + version = "0.1.0"; + sha256 = "0094qi2n7fg7hsdaag307gmcvgrl39m4w0lz29csrk1fq4yy578x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring streamly ]; librarySystemDepends = [ archive ]; @@ -250795,8 +250596,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.2.1"; - sha256 = "08rj29i3vb4ahgrd2zhyi2sl1lk95s7vk020xx9mwzi8sbn0ay05"; + version = "0.3.0"; + sha256 = "1da87rbmh9sgffjy5367pzy1d80f7zlxhszi9sq87jfws4i20pk7"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -250829,6 +250630,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamly-process" = callPackage + ({ mkDerivation, base, directory, exceptions, fusion-plugin, hspec + , process, QuickCheck, streamly, tasty-bench, unix + }: + mkDerivation { + pname = "streamly-process"; + version = "0.1.0"; + sha256 = "066ldbphb230cc21jvsmmqlnjli6cwqpphs7vjb88q62lbl8yf6p"; + libraryHaskellDepends = [ base exceptions process streamly unix ]; + testHaskellDepends = [ + base directory exceptions hspec process QuickCheck streamly + ]; + benchmarkHaskellDepends = [ + base directory fusion-plugin process streamly tasty-bench + ]; + description = "Use OS processes as stream transformation functions"; + license = lib.licenses.asl20; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -256099,8 +255919,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "3.2.5"; - sha256 = "1gfdlqgdqq2ivvzj7cgqahpm2bmwg90ri5ss7ah38alrp5rvda1v"; + version = "3.3.0"; + sha256 = "17ggcv1y3md11sccbb9mpss2qdanlkv7wy098qh28gra9kq4ibgm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -256190,8 +256010,8 @@ self: { pname = "tagged"; version = "0.8.6.1"; sha256 = "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m"; - revision = "1"; - editedCabalFile = "1rzqfw2pafxbnfpl1lizf9zldpxyy28g92x4jzq49miw9hr1xpsx"; + revision = "2"; + editedCabalFile = "0qi63c3z40i9qm44r571yjzcpb8d473vj2km4kq0fij0ljc7vii9"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -257271,19 +257091,20 @@ self: { }) {}; "tasty-checklist" = callPackage - ({ mkDerivation, base, exceptions, parameterized-utils, tasty - , tasty-expected-failure, tasty-hunit, text + ({ mkDerivation, base, doctest, exceptions, HUnit + , parameterized-utils, tasty, tasty-expected-failure, tasty-hunit + , text }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.1.0"; - sha256 = "0nj4xjnlrd3righ0d0yv4py7wjls51khjyacpgjs3s5knaxyippp"; + version = "1.0.2.0"; + sha256 = "0smd93c1zs44nwiz0dk87izg0c9cyvx2klzy126w0p0xcxwwbhlr"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; testHaskellDepends = [ - base parameterized-utils tasty tasty-expected-failure tasty-hunit - text + base doctest HUnit parameterized-utils tasty tasty-expected-failure + tasty-hunit text ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; @@ -263218,28 +263039,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, network, parsec - , primitive, random, text, transformers, weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.7.7"; - sha256 = "19r9h45yd2xwmah81xqmwx5bi5gi0x2hqhq2nqa47jgb0nd12a25"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - network parsec primitive random text transformers - ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - }) {}; - - "tidal_1_7_8" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, weigh @@ -263259,7 +263058,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -265266,6 +265064,23 @@ self: { broken = true; }) {}; + "token-limiter-concurrent" = callPackage + ({ mkDerivation, async, base, genvalidity, genvalidity-sydtest + , QuickCheck, sydtest, sydtest-discover + }: + mkDerivation { + pname = "token-limiter-concurrent"; + version = "0.0.0.0"; + sha256 = "1g64638v7kiblixb8xg5dvnif60mlpplp1l18pv32lr9sph7yv1c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base genvalidity genvalidity-sydtest QuickCheck sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness"; + license = lib.licenses.mit; + }) {}; + "token-search" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hashable, hspec , process, streaming-commons, text, unordered-containers @@ -266319,6 +266134,8 @@ self: { pname = "tracetree"; version = "0.1.0.2"; sha256 = "0ga78nkrfg2hlanqfd65il0yw596n7xy9jx76l7sffs438mx4wvr"; + revision = "1"; + editedCabalFile = "1k6a5n70qmch9vqyv9kyrkii4pnwjdgbiwrqwk8q3yhv9naqijkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266746,6 +266563,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "transformers-compat_0_7" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.7"; + sha256 = "13x9f3rq1ibx5lhzrsysg7m5nkqas75kv6b0zmzvspjiswfp7bd4"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + description = "A small compatibility shim for the transformers library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -268919,8 +268748,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.2.2"; - sha256 = "1sl4pld3jig1m26alhj4s96ff43v3g00wxzrng4yhb76d88z0ipw"; + version = "1.0.2.3"; + sha256 = "0chkg9xkancp6dms0ha0m86fkcmvk690q6z0rvprg37lhj42xp1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272214,8 +272043,8 @@ self: { pname = "unicode-transforms"; version = "0.3.7.1"; sha256 = "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f"; - revision = "1"; - editedCabalFile = "01kf1hanqcwc7vpkwq2rw5v2mn4nxx58l3v5hpk166jalmwqijaz"; + revision = "2"; + editedCabalFile = "0kbcn5881sxh0i8pqckjam4kwr1n7m3gl5ppcq4li32dzfiz9b57"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ghc-prim text ]; @@ -272229,6 +272058,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_8" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath + , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck + , split, tasty-bench, text, unicode-data + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.8"; + sha256 = "1j3dwz3qmak3fyb1p4qzr1rnxch2ydqfp2jizyy4rv425h0smxzl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring ghc-prim text unicode-data + ]; + testHaskellDepends = [ + base deepseq getopt-generics hspec QuickCheck split text + unicode-data + ]; + benchmarkHaskellDepends = [ + base deepseq filepath path path-io tasty-bench text + ]; + description = "Unicode normalization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-tricks" = callPackage ({ mkDerivation, base, containers, data-default, deepseq, hashable , hspec, hspec-discover, QuickCheck, text @@ -272475,8 +272330,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "union-find-array"; - version = "0.1.0.2"; - sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk"; + version = "0.1.0.3"; + sha256 = "1nfvgmgvins9gq5ba9vf9yqj9svj2c22xgvvfq03ls9wm62vj1xw"; libraryHaskellDepends = [ array base mtl ]; description = "union find data structure"; license = lib.licenses.mit; @@ -273381,31 +273236,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.18"; - sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_19" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core @@ -273428,7 +273258,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -276093,6 +275922,39 @@ self: { broken = true; }) {}; + "variable-media-field" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "variable-media-field"; + version = "0.1.0.0"; + sha256 = "13fpvd3w3c7lndkf4l4d48fcfsssxwi7ip9309gzwlrlycq57908"; + libraryHaskellDepends = [ base text ]; + description = "Simple type for representing one of several media types"; + license = lib.licenses.mit; + }) {}; + + "variable-media-field-dhall" = callPackage + ({ mkDerivation, base, dhall, variable-media-field }: + mkDerivation { + pname = "variable-media-field-dhall"; + version = "0.1.0.0"; + sha256 = "0h2gm5h86n7bm5gf9rbc0zlkkhrkyavygvrkz251r9l57qw48qax"; + libraryHaskellDepends = [ base dhall variable-media-field ]; + description = "Dhall instances for VF"; + license = lib.licenses.mit; + }) {}; + + "variable-media-field-optics" = callPackage + ({ mkDerivation, base, optics-th, variable-media-field }: + mkDerivation { + pname = "variable-media-field-optics"; + version = "0.1.0.0"; + sha256 = "1n4ccd52yy5yna28bmn4sc7cyrngyllgk976q4v7f262l49wmphj"; + libraryHaskellDepends = [ base optics-th variable-media-field ]; + description = "Optics for variable-media-field"; + license = lib.licenses.mit; + }) {}; + "variable-precision" = callPackage ({ mkDerivation, base, complex-generic, floatshow, integer-gmp , type-level-natural-number @@ -278562,8 +278424,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.0.2"; - sha256 = "19jxd73li1ybdfzznlql2im8k0qad1yas75d5cdfvjazv7x4g3n1"; + version = "0.5.1"; + sha256 = "1552vk9nzvcpkgh5b9lln9gl6rxg1jr8z7blgp3sss3pjsvi3s11"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -279367,8 +279229,8 @@ self: { }: mkDerivation { pname = "wai-make-assets"; - version = "0.2"; - sha256 = "0h6ng8g42bpb8d75wykb1q9byqh3zx745asy31yqzp49v0aip1vy"; + version = "0.3"; + sha256 = "07h56bjyap8x2aaay23k3l6n6gk1h5a3qqijd33b4pnc0nygfzci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283188,24 +283050,6 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit - , template-haskell, text, time - }: - mkDerivation { - pname = "witch"; - version = "0.3.3.0"; - sha256 = "0wckjjy7yxq899f515xhwl2izqmrr9zck0kjlgz6qfa1fsl6lbvx"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit text time - ]; - description = "Convert values from one type into another"; - license = lib.licenses.isc; - }) {}; - - "witch_0_3_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit , template-haskell, text, time }: @@ -283221,7 +283065,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "with-index" = callPackage @@ -286304,6 +286147,28 @@ self: { broken = true; }) {}; + "xml-parser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hashable + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, transformers + , unordered-containers, xml-conduit + }: + mkDerivation { + pname = "xml-parser"; + version = "0.1.0.1"; + sha256 = "079ggb9bhad9px6gqbjhbir423hds389p42jc853caz7232dc6vx"; + libraryHaskellDepends = [ + attoparsec base bytestring containers hashable text text-builder + transformers unordered-containers xml-conduit + ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck xml-conduit + ]; + description = "XML parser with informative error-reporting and simple API"; + license = lib.licenses.mit; + }) {}; + "xml-picklers" = callPackage ({ mkDerivation, base, Cabal, containers, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, text, xml-types @@ -287323,16 +287188,15 @@ self: { }) {}; "xsd" = callPackage - ({ mkDerivation, attoparsec, base, directory, doctest, filepath - , lens, QuickCheck, quickcheck-instances, text, time + ({ mkDerivation, base, lens, parsec, parsers, semigroupoids, text + , time }: mkDerivation { pname = "xsd"; - version = "0.5.0.1"; - sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0"; - libraryHaskellDepends = [ attoparsec base lens text time ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck quickcheck-instances + version = "0.6.2"; + sha256 = "0m8xb12bfcr03w5b15xx5s2wwy7kz735vwaxyk3qbny3wkq7m0fw"; + libraryHaskellDepends = [ + base lens parsec parsers semigroupoids text time ]; description = "XML Schema data structures"; license = lib.licenses.bsd3; @@ -289486,8 +289350,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.20.2"; - sha256 = "184j6nslwrfxw4zmsxlii6gs1z0h350kgmbnr5y3wwk3n4dsdzyb"; + version = "1.6.21.0"; + sha256 = "0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -289897,23 +289761,6 @@ self: { }) {}; "yesod-gitrev" = callPackage - ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core - }: - mkDerivation { - pname = "yesod-gitrev"; - version = "0.2.1"; - sha256 = "0wd6xvq9aa11n8y4hna0a5ivqfxnbg8w2bq5lramm895xs7c8d7w"; - libraryHaskellDepends = [ - aeson base githash template-haskell yesod-core - ]; - testHaskellDepends = [ base yesod-core ]; - description = "A subsite for displaying git information"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "yesod-gitrev_0_2_2" = callPackage ({ mkDerivation, aeson, base, githash, process, template-haskell , yesod-core }: @@ -290121,30 +289968,6 @@ self: { }) {}; "yesod-page-cursor" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations-lifted, http-link-header, http-types, lens - , lens-aeson, monad-logger, mtl, network-uri, persistent - , persistent-sqlite, persistent-template, scientific, text, time - , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-page-cursor"; - version = "2.0.0.8"; - sha256 = "1azd2kv5b36kryz3l587mn329a46m8mp4z8knzx5va24bmhca9jy"; - libraryHaskellDepends = [ - aeson base bytestring containers http-link-header network-uri text - unliftio yesod-core - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations-lifted - http-link-header http-types lens lens-aeson monad-logger mtl - persistent persistent-sqlite persistent-template scientific text - time unliftio unliftio-core wai-extra yesod yesod-core yesod-test - ]; - license = lib.licenses.mit; - }) {}; - - "yesod-page-cursor_2_0_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-expectations-lifted, http-link-header, http-types, lens , lens-aeson, monad-logger, mtl, network-uri, persistent @@ -290166,7 +289989,6 @@ self: { time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-paginate" = callPackage From 9f7282c9f88879b4c1c556e516ded3f5a206d988 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 26 Jul 2021 20:31:34 +0300 Subject: [PATCH 0533/1522] mc: dont add libX11.so on darwin --- pkgs/tools/misc/mc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 56844efc6ce..cddda2c6a62 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { postFixup = '' # remove unwanted build-dependency references sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc - + '' + lib.optionalString (!stdenv.isDarwin) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ From 2eb7828b36e73477aac179ca58a26c9170e86d03 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Jul 2021 19:37:41 +0200 Subject: [PATCH 0534/1522] haskellPackages.cabal2nix-unstable: 2021-07-08 -> 2021-07-21 * Regenerate hackage-packages.nix * Remove now unnecessary workaround for pam --- .../haskell-modules/cabal2nix-unstable.nix | 6 ++-- .../haskell-modules/configuration-common.nix | 7 ++-- .../haskell-modules/hackage-packages.nix | 35 ++++++++++--------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 6a769a47ef8..eabea78fd09 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-07-08"; + version = "unstable-2021-07-21"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz"; - sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk"; + url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz"; + sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 779897aa11f..9bc5a936e28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1711,14 +1711,13 @@ self: super: { excludes = ["test/buildtest"]; }); - # workaround for https://github.com/peti/distribution-nixpkgs/issues/9 - pam = super.pam.override { inherit (pkgs) pam; }; - # Too strict version bounds on base: # https://github.com/obsidiansystems/database-id/issues/1 database-id-class = doJailbreak super.database-id-class; - cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { + cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override { + distribution-nixpkgs = self.distribution-nixpkgs_1_6_0; + }) { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fbd79b59465..9c200bb8c0a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12818,7 +12818,7 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {openmpi = null;}; + }) {inherit (pkgs) openmpi;}; "LogicGrowsOnTrees-network" = callPackage ({ mkDerivation, base, cereal, cmdtheline, composition, containers @@ -41515,7 +41515,7 @@ self: { license = "unknown"; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; liblapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage ({ mkDerivation, base, bindings-DSL, libcddb }: @@ -64912,7 +64912,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {python3 = null;}; + }) {inherit (pkgs) python3;}; "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, Decimal @@ -103926,7 +103926,7 @@ self: { license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {gtk-mac-integration-gtk3 = null;}; + }) {inherit (pkgs) gtk-mac-integration-gtk3;}; "gi-gtksheet" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -112798,7 +112798,7 @@ self: { license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {gtk-mac-integration-gtk3 = null;}; + }) {inherit (pkgs) gtk-mac-integration-gtk3;}; "gtkglext" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2, gtk2hs-buildtools @@ -113588,7 +113588,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; liblapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hXmixer" = callPackage ({ mkDerivation, base, directory, gtk3, process, split, text }: @@ -119514,7 +119514,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {open-pal = null; open-rte = null; openmpi = null;}; + }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage ({ mkDerivation, aeson, base, bytestring, containers @@ -123719,7 +123719,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; liblapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hblock" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal @@ -131224,7 +131224,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {liblapack = null;}; + }) {inherit (pkgs) liblapack;}; "hmatrix-csv" = callPackage ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }: @@ -131311,7 +131311,7 @@ self: { benchmarkHaskellDepends = [ base criterion hmatrix ]; description = "Low-level machine learning auxiliary functions"; license = lib.licenses.bsd3; - }) {inherit (pkgs) blas; liblapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hmatrix-nipals" = callPackage ({ mkDerivation, base, hmatrix }: @@ -137301,7 +137301,8 @@ self: { libraryPkgconfigDepends = [ gsl ]; description = "Signal processing and EEG data analysis"; license = lib.licenses.bsd3; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; + inherit (pkgs) liblapack;}; "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir @@ -153490,7 +153491,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {python = null;}; + }) {inherit (pkgs) python;}; "json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell @@ -159883,7 +159884,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {liblapack = null;}; + }) {inherit (pkgs) liblapack;}; "lapack-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, cassava, containers @@ -195086,7 +195087,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {pam = null;}; + }) {inherit (pkgs) pam;}; "pan-os-syslog" = callPackage ({ mkDerivation, base, byteslice, bytesmith, chronos, gauge, ip @@ -214011,7 +214012,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {python = null;}; + }) {inherit (pkgs) python;}; "pyfi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 @@ -214029,7 +214030,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {python = null;}; + }) {inherit (pkgs) python;}; "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs @@ -219431,7 +219432,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {raptor2 = null; redland = null;}; + }) {raptor2 = null; inherit (pkgs) redland;}; "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath From 37810bc9a268064bb29faa5012183f729eff4834 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Mon, 26 Jul 2021 13:38:42 -0400 Subject: [PATCH 0535/1522] obs-nvfbc: init at 0.0.3 --- .../video/obs-studio/plugins/default.nix | 1 + .../video/obs-studio/plugins/obs-nvfbc.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index ef360487a6b..58151e4d03e 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -7,4 +7,5 @@ obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {}; wlrobs = callPackage ./wlrobs.nix {}; looking-glass-obs = callPackage ./looking-glass-obs.nix {}; + obs-nvfbc = callPackage ./obs-nvfbc.nix {}; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix new file mode 100644 index 00000000000..e64031ce7bb --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config +, obs-studio, libGL, libX11 +}: + +stdenv.mkDerivation rec { + pname = "obs-nvfbc"; + version = "0.0.3"; + + src = fetchFromGitLab { + owner = "fzwoch"; + repo = "obs-nvfbc"; + rev = "v${version}"; + sha256 = "0zyvks6gc6fr0a1j5b4y20rcx6ah35v6yiz05f6g3x6bhqi92l33"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ obs-studio libGL libX11 ]; + + meta = with lib; { + description = "OBS Studio source plugin for NVIDIA FBC API"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} From ee20f1abe983e6d594856c2706c265676fa627e3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 27 Jul 2021 01:08:58 +0700 Subject: [PATCH 0536/1522] cbonsai: fix cross-compilation --- pkgs/games/cbonsai/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 98b55729f0e..0425f4f56b3 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; passthru.updateScript = nix-update-script { attrPath = pname; }; From a56d117bdbff1384ca317dd0eb3d4f6ebc298cd0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 23:53:02 +0200 Subject: [PATCH 0537/1522] servers: replace name with pname&version --- pkgs/servers/adguardhome/default.nix | 2 +- pkgs/servers/apcupsd/default.nix | 4 ++-- pkgs/servers/computing/slurm-spank-x11/default.nix | 7 ++----- pkgs/servers/domoticz/default.nix | 2 +- pkgs/servers/fingerd/bsd-fingerd/default.nix | 7 ++++--- pkgs/servers/ftp/bftpd/default.nix | 7 ++----- pkgs/servers/ftp/pure-ftpd/default.nix | 5 +++-- pkgs/servers/ftp/vsftpd/default.nix | 5 +++-- pkgs/servers/gotify/ui.nix | 2 +- pkgs/servers/gpm/default.nix | 5 +++-- pkgs/servers/hashi-ui/default.nix | 2 +- pkgs/servers/hasura/cli.nix | 2 +- pkgs/servers/holochain-go/default.nix | 2 +- .../http/apache-modules/mod_fastcgi/default.nix | 14 ++++++-------- pkgs/servers/http/jboss/jdbc/mysql/default.nix | 3 ++- pkgs/servers/http/micro-httpd/default.nix | 3 ++- pkgs/servers/http/redstore/default.nix | 5 +++-- pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 3 ++- pkgs/servers/icecast/default.nix | 5 +++-- pkgs/servers/icingaweb2/theme-april/default.nix | 4 ++-- pkgs/servers/icingaweb2/theme-lsd/default.nix | 4 ++-- .../servers/icingaweb2/theme-particles/default.nix | 4 ++-- pkgs/servers/icingaweb2/theme-snow/default.nix | 4 ++-- pkgs/servers/icingaweb2/theme-spring/default.nix | 4 ++-- pkgs/servers/icingaweb2/theme-unicorn/default.nix | 4 ++-- pkgs/servers/irc/charybdis/default.nix | 5 +++-- pkgs/servers/irc/ircd-hybrid/default.nix | 5 +++-- .../monitoring/grafana-image-renderer/default.nix | 2 +- pkgs/servers/monitoring/heapster/default.nix | 3 ++- .../monitoring/prometheus/jmx-httpserver.nix | 11 ++++------- .../servers/monitoring/prometheus/tor-exporter.nix | 2 +- pkgs/servers/nas/default.nix | 4 +--- pkgs/servers/neard/default.nix | 5 +++-- pkgs/servers/news/leafnode/default.nix | 3 ++- pkgs/servers/nextcloud/news-updater.nix | 2 +- pkgs/servers/rippled/data-api.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 4 ++-- pkgs/servers/search/elasticsearch/7.x.nix | 4 ++-- pkgs/servers/shishi/default.nix | 5 +++-- pkgs/servers/silc-server/default.nix | 5 +++-- pkgs/servers/sip/sipwitch/default.nix | 5 +++-- pkgs/servers/sql/mysql/jdbc/default.nix | 5 +++-- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 3 ++- pkgs/servers/sql/virtuoso/6.x.nix | 7 ++++--- pkgs/servers/sql/virtuoso/7.x.nix | 7 ++++--- pkgs/servers/varnish/digest.nix | 2 +- pkgs/servers/varnish/dynamic.nix | 2 +- pkgs/servers/varnish/modules.nix | 2 +- pkgs/servers/web-apps/bookstack/default.nix | 4 ++-- pkgs/servers/web-apps/hedgedoc/default.nix | 2 +- pkgs/servers/web-apps/plausible/default.nix | 1 - pkgs/servers/x11/xquartz/default.nix | 3 ++- pkgs/servers/xinetd/default.nix | 5 +++-- 53 files changed, 114 insertions(+), 105 deletions(-) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index f9f164dd764..009b6466600 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "adguardhome"; + pname = "adguardhome"; version = "0.106.3"; src = fetchurl { diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index f2193d67ff5..9e5e81457e9 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -6,10 +6,10 @@ assert enableCgiScripts -> gd != null; stdenv.mkDerivation rec { pname = "apcupsd"; - name = "${pname}-3.14.14"; + version = "3.14.14"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 454cdbb57e3..8a8aa34fdb2 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitHub, slurm } : -let +stdenv.mkDerivation rec { + pname = "slurm-spank-x11"; version = "0.2.5"; -in -stdenv.mkDerivation { - name = "slurm-spank-x11-${version}"; - version = version; src = fetchFromGitHub { owner = "hautreux"; diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index a9f5245ff1f..a514cb1d86d 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -32,7 +32,7 @@ let }; in stdenv.mkDerivation rec { - name = "domoticz"; + pname = "domoticz"; inherit version; src = domoticz-src; diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index d03cd1c915a..0220a18916b 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -2,11 +2,12 @@ # !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. -stdenv.mkDerivation { - name = "bsd-fingerd-0.17"; +stdenv.mkDerivation rec { + pname = "bsd-fingerd"; + version = "0.17"; src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz"; + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index c441771157c..cd7c1a07d2d 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl }: -let +stdenv.mkDerivation rec { pname = "bftpd"; - -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "5.9"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; }; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 3ea03044062..b88d926e1db 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.49"; + pname = "pure-ftpd"; + version = "1.0.49"; src = fetchurl { - url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; + url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; }; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index a477551df30..d78c7ca18d1 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libcap, openssl, pam }: stdenv.mkDerivation rec { - name = "vsftpd-3.0.3"; + pname = "vsftpd"; + version = "3.0.3"; src = fetchurl { - url = "https://security.appspot.com/downloads/${name}.tar.gz"; + url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; }; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 2a7f1843080..36e823ac557 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -3,7 +3,7 @@ }: yarn2nix-moretea.mkYarnPackage rec { - name = "gotify-ui"; + pname = "gotify-ui"; packageJSON = ./package.json; yarnNix = ./yarndeps.nix; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index bde4150d15d..4337820683d 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gpm-1.20.7"; + pname = "gpm"; + version = "1.20.7"; src = fetchurl { - url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; + url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2"; sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; }; diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 73a96d6a3c0..d49d18c3901 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hashi-ui"; + pname = "hashi-ui"; version = "1.3.8"; src = fetchurl { diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index af2f6f2a11f..4413324e159 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -1,7 +1,7 @@ { buildGoModule, hasura-graphql-engine }: buildGoModule rec { - name = "hasura-${version}"; + pname = "hasura"; version = hasura-graphql-engine.version; src = hasura-graphql-engine.src; diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix index 0d138e1f648..f98352c5c95 100644 --- a/pkgs/servers/holochain-go/default.nix +++ b/pkgs/servers/holochain-go/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "holochain-go${version}"; + pname = "holochain-go"; version = "0.1.0-alpha"; rev = "a17510b910a7a377441c152b8dccdbae1999f63f"; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 0e5a5fed31c..eeabbc1f30d 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,17 +1,15 @@ { lib, stdenv, fetchurl, apacheHttpd }: let - version = "2.4.7.1"; - apache-24-patch = fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }; + name = "compile-against-apache24.diff"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; + }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mod_fastcgi"; - inherit version; + version = "2.4.7.1"; src = fetchurl { url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index e05bf4bfce8..8db1b7a2d04 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { - name = "jboss-mysql-jdbc"; + pname = "jboss-mysql-jdbc"; builder = ./builder.sh; inherit mysql_jdbc; + version = mysql_jdbc.version; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index 99960d6cb71..01ff91ebda6 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "micro-httpd-20140814"; + pname = "micro-httpd"; + version = "20140814"; src = fetchurl { url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index d4e92bc3f6c..30027467a2e 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -2,10 +2,11 @@ , librdf_rasqal }: stdenv.mkDerivation rec { - name = "redstore-0.5.4"; + pname = "redstore"; + version = "0.5.4"; src = fetchurl { - url = "https://www.aelius.com/njh/redstore/${name}.tar.gz"; + url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz"; sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 3796d5458b2..7585cabccd1 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { - name = "tomcat-mysql-jdbc"; + pname = "tomcat-mysql-jdbc"; builder = ./builder.sh; buildInputs = [ mysql_jdbc ]; inherit mysql_jdbc; + version = mysql_jdbc.version; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 15e5e81d058..e04716214fe 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -3,10 +3,11 @@ , libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.4.4"; + pname = "icecast"; + version = "2.4.4"; src = fetchurl { - url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; + url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz"; sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9"; }; diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix index 0a152a7e157..05f9b9c971b 100644 --- a/pkgs/servers/icingaweb2/theme-april/default.nix +++ b/pkgs/servers/icingaweb2/theme-april/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-april"; + pname = "icingaweb2-theme-april"; version = "1.0.4"; src = fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g"; }; diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix index 59b8df6b4d4..e2c60ef7986 100644 --- a/pkgs/servers/icingaweb2/theme-lsd/default.nix +++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-lsd"; + pname = "icingaweb2-theme-lsd"; version = "1.0.3"; src = fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w"; }; diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix index ddd363701a7..7e8adb72c6d 100644 --- a/pkgs/servers/icingaweb2/theme-particles/default.nix +++ b/pkgs/servers/icingaweb2/theme-particles/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-particles"; + pname = "icingaweb2-theme-particles"; version = "1.0.0"; src = fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy"; }; diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix index 5650d1ccdba..9b571b948b5 100644 --- a/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-snow"; + pname = "icingaweb2-theme-snow"; version = "1.0.0"; src = fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp"; }; diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix index dda26caf6a1..8392124eb07 100644 --- a/pkgs/servers/icingaweb2/theme-spring/default.nix +++ b/pkgs/servers/icingaweb2/theme-spring/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-spring"; + pname = "icingaweb2-theme-spring"; version = "1.0.0"; src = fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9"; }; diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix index a2bb3f9e4a2..39c4e7b9274 100644 --- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix +++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "icingaweb2-theme-unicorn"; + pname = "icingaweb2-theme-unicorn"; version = "1.0.2"; srcs = [ (fetchFromGitHub { owner = "Mikesch-mp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05"; }) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 3b2508a7760..53bfbb81cd9 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { - name = "charybdis-4.1.2"; + pname = "charybdis"; + version = "4.1.2"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; }; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index b29f75fb529..b4b567608f3 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.36"; + pname = "ircd-hybrid"; + version = "8.2.36"; src = fetchurl { - url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; + url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv"; }; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index fab8d4b0096..a87d30d7357 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -9,7 +9,7 @@ # * Update `version`+`hash` and rebuild. mkYarnPackage rec { - name = "grafana-image-renderer"; + pname = "grafana-image-renderer"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix index 2460cc633eb..d1205ae353b 100644 --- a/pkgs/servers/monitoring/heapster/default.nix +++ b/pkgs/servers/monitoring/heapster/default.nix @@ -2,7 +2,8 @@ buildGoPackage rec { rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133"; - name = "heapster-${lib.strings.substring 0 7 rev}"; + pname = "heapster"; + version = lib.strings.substring 0 7 rev; goPackagePath = "k8s.io/heapster"; subPackages = [ "./" ]; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 459ddf01de3..9a311c02f33 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -1,16 +1,13 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let +stdenv.mkDerivation rec { + pname = "jmx-prometheus-httpserver"; version = "0.15.0"; - jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; - mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; -in stdenv.mkDerivation { - inherit version jarName; - name = "jmx-prometheus-httpserver-${version}"; + jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; src = fetchurl { - url = mavenUrl; + url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz"; }; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index bc8022f9feb..663b532c8fc 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { - name = "tor-exporter-${version}"; + pname = "tor-exporter"; version = "0.4"; # Just a single .py file to use as the application's main entry point. diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 4732368ac88..c5dba62c6e7 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchurl, imake, bison, flex, gccmakedep , xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: -let +stdenv.mkDerivation rec { pname = "nas"; version = "1.9.4"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index a638c063852..e2ccaba6395 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { - name = "neard-0.16"; + pname = "neard"; + version = "0.16"; src = fetchurl { - url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz"; + url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz"; sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index eb6ce851c6e..03aea95177a 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pcre }: stdenv.mkDerivation { - name = "leafnode-2.0.0.alpha20121101a.12"; + pname = "leafnode"; + version = "2.0.0.alpha20121101a.12"; src = fetchurl { url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2"; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index 19147be3f5d..88a30e358ab 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { - name = "nextcloud-news-updater-${version}"; + pname = "nextcloud-news-updater"; version = "10.0.1"; src = fetchurl { diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 2d1db24474b..a2de1d8fad3 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -5,7 +5,7 @@ with lib; let np = nodePackages.override { generated = ./package.nix; self = np; }; in nodePackages.buildNodePackage rec { - name = "ripple-data-api-${version}"; + pname = "ripple-data-api"; version = lib.strings.substring 0 7 rev; rev = "c56b860105f36c1c44ae011189d495272648c589"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 3558fd5935e..4b92592f65d 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -13,10 +13,10 @@ with lib; stdenv.mkDerivation (rec { version = elk6Version; - name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; sha256 = if enableUnfree then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42" diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index f808b6985b4..fb15951399f 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -27,10 +27,10 @@ let in stdenv.mkDerivation (rec { version = elk7Version; - name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz"; sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 6737119d881..91f84f2f587 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -22,10 +22,11 @@ let in with lib; stdenv.mkDerivation rec { - name = "shishi-1.0.2"; + pname = "shishi"; + version = "1.0.2"; src = fetchurl { - url = "mirror://gnu/shishi/${name}.tar.gz"; + url = "mirror://gnu/shishi/shishi-${version}.tar.gz"; sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 48bc4395d07..83596cffadf 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "silc-server-1.1.18"; + pname = "silc-server"; + version = "1.1.18"; src = fetchurl { - url = "http://silcnet.org/download/server/sources/${name}.tar.bz2"; + url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2"; sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s"; }; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index f5b3288c60c..4f4f5e44ee6 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.9.15"; + pname = "sipwitch"; + version = "1.9.15"; src = fetchurl { - url = "mirror://gnu/sipwitch/${name}.tar.gz"; + url = "mirror://gnu/sipwitch/sipwitch-${version}.tar.gz"; sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 6b22185cd80..7e6422a6f53 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,11 +1,12 @@ {lib, stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.46"; + pname = "mysql-connector-java"; + version = "5.1.46"; builder = ./builder.sh; src = fetchurl { - url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; + url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip"; sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index e424120a390..a4a8e6b0fe3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation { - name = "pg_similarity-1.0"; + pname = "pg_similarity"; + version = "1.0"; src = fetchFromGitHub { owner = "eulerto"; repo = "pg_similarity"; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 4737c0a3894..c811a162412 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.6"; + pname = "virtuoso-opensource"; + version = "6.1.6"; src = fetchurl { - url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz"; sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' echo Moving documentation mkdir -pv $out/share/doc - mv -v $out/share/virtuoso/doc $out/share/doc/${name} + mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version} echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index a27cd249f1c..173124596a0 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-7.2.4.2"; + pname = "virtuoso-opensource"; + version = "7.2.4.2"; src = fetchurl { - url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz"; sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"; }; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { postInstall='' echo Moving documentation mkdir -pv $out/share/doc - mv -v $out/share/virtuoso/doc $out/share/doc/${name} + mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version} echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 55d13ffae31..4511eb3a724 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "${varnish.name}-digest-${version}"; + pname = "${varnish.name}-digest"; src = fetchFromGitHub { owner = "varnish"; diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 6ad8288871b..637380a5abd 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "${varnish.name}-dynamic-${version}"; + pname = "${varnish.name}-dynamic"; src = fetchFromGitHub { owner = "nigoroll"; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 0a8e97df61e..527dd17c03c 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.15.0"; - name = "${varnish.name}-modules-${version}"; + pname = "${varnish.name}-modules"; src = fetchFromGitHub { owner = "varnish"; diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 1c35ebeff3b..f7a02b5c13d 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -14,12 +14,12 @@ let }); in package.override rec { - name = "bookstack"; + pname = "bookstack"; version = "21.05.3"; src = fetchFromGitHub { owner = "bookstackapp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; }; diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 0e1d933ab58..40f8b1b4327 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -29,7 +29,7 @@ let in mkYarnPackage rec { - name = "hedgedoc"; + pname = "hedgedoc"; version = "1.8.2"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 2cdd33a245e..40e7d878da2 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -13,7 +13,6 @@ let pname = "plausible"; version = "1.3.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "plausible"; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 8f3bbf61baa..ad4d5603a13 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -95,7 +95,8 @@ let ]; }; in stdenv.mkDerivation { - name = "xquartz-${lib.getVersion xorg.xorgserver}"; + pname = "xquartz"; + version = lib.getVersion xorg.xorgserver; nativeBuildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 3d130c93b78..e296112045d 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,10 +1,11 @@ { fetchurl, fetchpatch, lib, stdenv, libtirpc }: stdenv.mkDerivation rec { - name = "xinetd-2.3.15"; + pname = "xinetd"; + version = "2.3.15"; src = fetchurl { - url = "http://www.xinetd.org/${name}.tar.gz"; + url = "http://www.xinetd.org/xinetd-${version}.tar.gz"; sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; From da2d48a059b3672fd5fba56f57325f75a3374761 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:20:15 +0200 Subject: [PATCH 0538/1522] facetimehd-firmware: deprecate phases --- .../os-specific/linux/firmware/facetimehd-firmware/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 88a32f174d5..1c3d8fbbaf7 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation { curlOpts = "-r ${dmgRange}"; }; - phases = [ "buildPhase" ]; + dontUnpack = true; + dontInstall = true; buildInputs = [ cpio xz ]; From c92c15beddcb25f903086859fa2494aa09e4c4a2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:26:57 +0200 Subject: [PATCH 0539/1522] nix-tour: remove phases --- pkgs/applications/misc/nix-tour/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index dda4dcb47e5..57b1b625690 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/bin mkdir -p $out/share From cd17e5e6d80ed52b4aa46201ac27f1beaccd16cf Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Mon, 26 Jul 2021 20:38:46 +0200 Subject: [PATCH 0540/1522] portfolio: 0.53.1 -> 0.54.1 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index eb2c0b0f1e7..db3c15454bb 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.53.1"; + version = "0.54.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p"; + sha256 = "16sv938sdbs01byqwngrfqmzb81zfhvk72ar53l68cg8qjvzs5ml"; }; nativeBuildInputs = [ From 29475a58af1d46e48017416aba9ffbead9bf1a91 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 26 Jul 2021 18:38:52 +0000 Subject: [PATCH 0541/1522] apk-tools: 2.12.5 -> 2.12.6 Fixes: CVE-2021-36159 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index c8b2ce00301..b39c74dd57c 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.5"; + version = "2.12.6"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "0961l2qigs3wwn8lpi5f2wnzn4y4cipcm6qcr40fqj4xyq2hz2ja"; + sha256 = "0ki306k2ilwwg8ia302i62qa00f31g9g5q56xfbanyl7b620wd1f"; }; nativeBuildInputs = [ pkg-config scdoc ] From 7abb01ac244989029a763cd268d1a6243cd556ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:51:44 +0200 Subject: [PATCH 0542/1522] lightworks: remove phases --- pkgs/applications/video/lightworks/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 352af7754c7..affc585ed35 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -38,7 +38,6 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg ]; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg-deb -x ${src} ./"; installPhase = '' From 4a046e04b6d7cd08dcddef2218507b4e7b522892 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:58:33 +0200 Subject: [PATCH 0543/1522] apktool: deprecate phases --- pkgs/development/tools/apktool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index a093dd31c10..cc991af145b 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk"; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; From c3c2ca1ba0faeb486a9a5059d95f4de72e6c39b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jul 2021 21:30:12 +0200 Subject: [PATCH 0544/1522] mysql80: 8.0.25 -> 8.0.26 --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index d5bc0171699..8e7c5a0425d 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.25"; + version = "8.0.26"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "c16aa9cf621bc028efba2bb11f3c36a323b125fa0d108ff92fab60e46309206e"; + sha256 = "sha256-293Nx3L4BscRo3MTY6UPPTWeqsnF0UgAhHKKHCzl2k0="; }; patches = [ From 33582ac414a862ab9a89dd7c7ad0d3120b5243ec Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 21 Jul 2021 08:32:00 -0700 Subject: [PATCH 0545/1522] strongswan: refactor to load from GitHub instead of archives Co-authored-by: Artturi Co-authored-by: Sandro --- pkgs/tools/networking/strongswan/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 67df00b8e69..ff69dbc7544 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch -, pkg-config, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub +, pkg-config, autoreconfHook, perl, gperf, bison, flex , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam @@ -19,14 +19,16 @@ stdenv.mkDerivation rec { pname = "strongswan"; version = "5.8.1"; # Make sure to also update when upgrading! - src = fetchurl { - url = "https://download.strongswan.org/${pname}-${version}.tar.bz2"; - sha256 = "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr"; + src = fetchFromGitHub { + owner = "strongswan"; + repo = "strongswan"; + rev = version; + sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd"; }; dontPatchELF = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] From 966700163b0aa90e6220a91379d904c327959d46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jul 2021 22:32:28 +0200 Subject: [PATCH 0546/1522] python3Packages.pyupgrade: 2.21.0 -> 2.23.0 --- .../development/python-modules/pyupgrade/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 07f21881c50..202c8254f6b 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -1,21 +1,21 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, isPy27 -, lib +, pythonOlder , pytestCheckHook , tokenize-rt }: buildPythonPackage rec { pname = "pyupgrade"; - version = "2.21.0"; - disabled = isPy27; + version = "2.23.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg="; + sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i"; }; checkInputs = [ pytestCheckHook ]; From fc74ac7b3ef3669868fc5139d69ebd928659b628 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 20:33:12 +0000 Subject: [PATCH 0547/1522] logseq: 0.2.6 -> 0.2.10 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 7367d18ddf8..559538cdccd 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.6"; + version = "0.2.10"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y="; + sha256 = "1YVOyaHDcv+GKx5nQq3cUrViKZ6CEuHQPiDvK0Jv+Qc="; name = "${pname}-${version}.AppImage"; }; From 3c47d946980b0dc86be1ec90d887f97127d77280 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jul 2021 22:44:07 +0200 Subject: [PATCH 0548/1522] python3Packages.aiowinreg: 0.0.5 -> 0.0.6 --- pkgs/development/python-modules/aiowinreg/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 17d9160ce56..3f9faad56e0 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -3,23 +3,28 @@ , fetchPypi , pythonOlder , winacl +, prompt_toolkit }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.5"; + version = "0.0.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5"; + sha256 = "0h0r9xrz1n8y75f2p21f7phqrlpsymyiipmgzr0lj591irzjmjjy"; }; - propagatedBuildInputs = [ winacl ]; + propagatedBuildInputs = [ + prompt_toolkit + winacl + ]; # Project doesn't have tests doCheck = false; + pythonImportsCheck = [ "aiowinreg" ]; meta = with lib; { From efd3e4975f19748e86f7f19ad88c255f65d0c869 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Mon, 26 Jul 2021 16:48:01 -0400 Subject: [PATCH 0549/1522] gast: remove unused fetchpatch --- pkgs/development/python-modules/gast/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 4b4aa8c0bd3..f374378d986 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , astunparse }: From 1a156d5dfe07586218a9057fd36ff115809ad4f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jul 2021 22:59:26 +0200 Subject: [PATCH 0550/1522] python3Packages.xknx: 0.18.8 -> 0.18.9 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 6dd624d597f..336d39e3c95 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.8"; + version = "0.18.9"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-Y+SHZd/E72eR7gANqHHutZt1a4G4R1oHC8uV0hpJ/J0="; + sha256 = "1dw1dqhd790wsa6v7bpcv921zf1y544ry7drwcfdcmprsm7hs42j"; }; propagatedBuildInputs = [ From b3200bc9220b12ad7a8de36b24485cdb0891dad1 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Mon, 26 Jul 2021 16:04:50 +0000 Subject: [PATCH 0551/1522] nixos/filesystems: succeed mount-pstore.service without backend --- nixos/modules/tasks/filesystems.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 49c9a37a900..93533733aa6 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -314,15 +314,15 @@ in set -eu # if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons. ${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore - # wait up to five seconds (arbitrary, happened within one in testing) for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units. - TRIES=50 + # wait up to 1.5 seconds for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units. + TRIES=15 while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do if (( $TRIES )); then sleep 0.1 TRIES=$((TRIES-1)) else echo "Persistent Storage backend was not registered in time." >&2 - exit 1 + break fi done ''; From 8b8819460cd374c18e1b834dc5eef585d300d38d Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 26 Jul 2021 23:25:55 +0200 Subject: [PATCH 0552/1522] openrct2: 0.3.4 -> 0.3.4.1 --- pkgs/games/openrct2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 9e79a9005dc..cafa51c8342 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,13 +5,13 @@ }: let - version = "0.3.4"; + version = "0.3.4.1"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4"; + sha256 = "0zjqn47pbgd2nrrbdl3lqk1mcdvwvvpjby2g0gfv6ssfw72fji7d"; }; objects-src = fetchFromGitHub { From de9913708c019a18adce74f6ecb143073fdbbec2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 26 Jul 2021 20:05:00 +0200 Subject: [PATCH 0553/1522] ecwolf: init at 1.3.3 --- pkgs/games/ecwolf/default.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/games/ecwolf/default.nix diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix new file mode 100644 index 00000000000..519398a738b --- /dev/null +++ b/pkgs/games/ecwolf/default.nix @@ -0,0 +1,52 @@ +{stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2}: + +let + desktopItem = makeDesktopItem { + name = "ecwolf"; + exec = "ecwolf"; + comment = "Enhanced Wolfenstein 3D port"; + desktopName = "Wolfenstein 3D"; + categories = "Game;"; + }; +in +stdenv.mkDerivation rec { + pname = "ecwolf"; + version = "1.3.3"; + + src = fetchurl { + url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz"; + sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 copyDesktopItems ]; + + desktopItems = [ desktopItem ]; + + # Change the location where the ecwolf executable looks for the ecwolf.pk3 + # file. + # + # By default, it expects the PK3 file to reside in the same directory as the + # executable, which is not desirable. + # We will adjust the code so that it can be retrieved from the share/ + # directory. + + preConfigure = '' + sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h + ''; + + # Install the required PK3 file in the required data directory + postInstall = '' + mkdir -p $out/share/ecwolf + cp ecwolf.pk3 $out/share/ecwolf + ''; + + meta = with lib; { + description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; + homepage = "https://maniacsvault.net/ecwolf/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sander ]; + # Darwin is untested (supported by upstream) + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8010f151bb..55b98b56700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28909,6 +28909,8 @@ in eboard = callPackage ../games/eboard { }; + ecwolf = callPackage ../games/ecwolf { }; + eduke32 = callPackage ../games/eduke32 { }; egoboo = callPackage ../games/egoboo { }; From 124dd7c2f7fc807a2fbdcf665be158b715910cfc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 23:06:43 +0000 Subject: [PATCH 0554/1522] ccextractor: 0.90 -> 0.91 --- pkgs/applications/video/ccextractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index b559a85d44c..d18ca43cbf7 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.90"; + version = "0.91"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o="; + sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs="; }; sourceRoot = "source/src"; From c42c8c4ff6519a34355188beb50b981468e836b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 23:20:07 +0000 Subject: [PATCH 0555/1522] cloud-nuke: 0.3.0 -> 0.4.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 75fb29db882..8b34f981a6e 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; + sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg="; }; - vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; + vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From a281876a05c8d8b04cc9e7e49faf367ba9605169 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 01:33:02 +0200 Subject: [PATCH 0556/1522] esphome: 1.20.0 -> 1.20.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 69a67a6e918..c82782bae90 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; + sha256 = "sha256-uCMxtMEOWrlOpc8SXDzleLY5VfyizmSh1tWgxTLUjzg="; }; patches = [ From d885373469da80d885d350806b7c4ece5138bfd5 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 27 Jul 2021 09:52:22 +1000 Subject: [PATCH 0557/1522] mosdepth: 0.3.1 -> 0.3.2 --- pkgs/applications/science/biology/mosdepth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 4815ddf2f75..715f2ea313b 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "1kcrvamrafz1m0s7mlbhaay8jyg97l1w37p6syl36r2m1plmwxjd"; + sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ="; }; nativeBuildInputs = [ nim ]; From bf22d079ed1ed13a48714d50560f9542ca22ed6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 00:22:02 +0000 Subject: [PATCH 0558/1522] deno: 1.12.1 -> 1.12.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d1a6330df7b..308cf7b8f54 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ="; + sha256 = "sha256-xIFJv/roTD7sq7vCy4JDwe8gYDMuZd34vyjS08xeijI="; }; - cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs="; + cargoSha256 = "sha256-aETAFh5yTE+ZonDC0ITdaZ2YN3/SpYROsXP47aNEICE="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From cf61acc072103d7f76cca011b465bab2bb2e847c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 00:35:56 +0000 Subject: [PATCH 0559/1522] doppler: 3.26.0 -> 3.31.0 --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index df466b0012d..fb87251d737 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.26.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-x6LQDQ+DRfP4d87OWEppqk4FV7SHuRMog4m0DOWkvF4="; + sha256 = "sha256-jmOHr32mDnjY3n9/nU/YaQ/ZuVsCKTo2likM2homToM="; }; - vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; + vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8="; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; From 6a125ca9fb6d4eb444d99a3fd15f7416b7a03893 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 27 Jul 2021 11:10:54 +1000 Subject: [PATCH 0560/1522] pythonPackages.inotify-simple: 1.2.1 -> 1.3.5 --- pkgs/development/python-modules/inotify-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 898737ca7b4..1285cd7bccb 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inotify-simple"; - version = "1.2.1"; + version = "1.3.5"; src = fetchPypi { pname = "inotify_simple"; inherit version; - sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv"; + sha256 = "0a61bh087cq5wfrvz680hg5pmykb9gmy26kwyn6ims2akkjgyh44"; }; # The package has no tests From 51666322afbbe51cafe90d560e39edfc33ab9507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 01:20:18 +0000 Subject: [PATCH 0561/1522] fido2luks: 0.2.17 -> 0.2.19 --- pkgs/tools/security/fido2luks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index b41f6bc67fc..1229620c21c 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4="; + sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM="; + cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; From 36ccff1be9d8266052aa4fae67d87d4c0363c684 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 01:56:00 +0000 Subject: [PATCH 0562/1522] frugal: 3.14.6 -> 3.14.7 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index c20993fbea9..a392bee26fd 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.6"; + version = "3.14.7"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo="; + sha256 = "sha256-mCfM2G+FhKDwPg0NqLIAe8F5MRZVJ0tcIY9FBuLpRpE="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw="; + vendorSha256 = "sha256-onbvW3vjuAL+grLfvJR14jxVpoue+YZAeFMOS8ktS1A="; meta = with lib; { description = "Thrift improved"; From 38c9692f9a476091f590cb8ca07c1af30e809293 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 02:40:46 +0000 Subject: [PATCH 0563/1522] goreleaser: 0.173.2 -> 0.174.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 5e805920b68..d2446829b28 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.173.2"; + version = "0.174.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0="; + sha256 = "sha256-oHH5/w1G0xlhmnUe6/qS0++qtBdDd6dUw6JfWYAWIh8="; }; - vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; + vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0="; buildFlagsArray = [ "-ldflags=" From 72b73d392831332b0b3eab6440ada74619c5696f Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Mon, 26 Jul 2021 21:57:29 -0500 Subject: [PATCH 0564/1522] vlc: add ncurses support This allows building the nvlc program, resolving #130119. --- pkgs/applications/video/vlc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6098aeba051..7aee50d5064 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -8,6 +8,7 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols +, ncurses , onlyLibVLC ? false , withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook , jackSupport ? false @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate - fluidsynth wayland wayland-protocols + fluidsynth wayland wayland-protocols ncurses ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) From 8c26c1caeef045cf56c5fd8467b4f2fb138e06d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 03:03:42 +0000 Subject: [PATCH 0565/1522] gramps: 5.1.3 -> 5.1.4 --- pkgs/applications/misc/gramps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 1628f0473fa..b22a09691bb 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -9,7 +9,7 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "5.1.3"; + version = "5.1.4"; pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; @@ -26,7 +26,7 @@ in buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93"; + sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; }; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; From 5323dc4cb69ff54cd198d74968bac7c8baeeb7e7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 27 Jul 2021 03:29:39 +0000 Subject: [PATCH 0566/1522] electron_13: 13.1.6 -> 13.1.7 https://github.com/electron/electron/releases/tag/v13.1.7 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 07a094dd0e8..a02ec97c70d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg"; }; - electron_13 = mkElectron "13.1.6" { - x86_64-linux = "6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101"; - x86_64-darwin = "e2bde9b3b2ee092b80d18439780c4ecb4620da1ead9fcae00cc603f3a56fda3e"; - i686-linux = "7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42"; - armv7l-linux = "8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77"; - aarch64-linux = "d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b"; - aarch64-darwin = "0fa29c1ba89ab906c5ba20216c505b6d8d3fbccdc58cd397146783bddeff1dd4"; - headers = "122ppxayj1fijzfdpnh3wqyi636dq53j8imyf46ik8fkvgmrw2mz"; + electron_13 = mkElectron "13.1.7" { + x86_64-linux = "0bb38a5e45609a8c46dd6173447a45477651f3c2ea58f724807d79c8e4a8876e"; + x86_64-darwin = "be8d05a7f853b9e7020c095c3d8075269832ccf821ca9785135884e6bc893df8"; + i686-linux = "2a1c84ca8fd2a5b10b918bda11c5e546f4b77f85484a32af24ed44d6f877587d"; + armv7l-linux = "3d4ed4cbd2ea9dd01d5ad09ed5b408762c69b5827be6fdae2e19681f2a159509"; + aarch64-linux = "68e174bee2a686926ec2da193831aefc16ff8ec43b46e423044918e6d25d5925"; + aarch64-darwin = "95489cc66c5638d95cde80189a5ae3477ce09c6cfa4c421b1e8bceea94f4dfba"; + headers = "0zsnkgixch0c6ihg4drdx9a7gsl35wwfsphgiz80mhbw84slvq0n"; }; } From 5da8361b48f4caab7995f166b7aeb3009ff33a7b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 27 Jul 2021 03:30:24 +0000 Subject: [PATCH 0567/1522] electron_12: 12.0.14 -> 12.0.15 https://github.com/electron/electron/releases/tag/v12.0.15 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a02ec97c70d..1c23ca5bf8d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33"; }; - electron_12 = mkElectron "12.0.14" { - x86_64-linux = "a75886b5aad27c64232ec0ec47d8c3c1d696ab968007cd8bfa5db87b33e8a5e7"; - x86_64-darwin = "03b30610f23be9ef835a78e9d4babc52ff32e29ff33c51218b1b8970c3bd6062"; - i686-linux = "0bb86208173da28250f261b162657c3614b859fb561df54cbd25b566d619c75c"; - armv7l-linux = "bd743c6eec434aedb80e7e5eef58dfe9f133bc48015d263dc12a119dd1276e32"; - aarch64-linux = "1f287496cc61c67db25339f8f79d09ace952edeaca47ea664766425ceaebc2a3"; - aarch64-darwin = "50171b32c927ab5b658da5b4459eca5ddb5df89cc655ae753cc6d02b4ed9b30d"; - headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg"; + electron_12 = mkElectron "12.0.15" { + x86_64-linux = "0ba1803ba64f2c155dcfc5452a4b7c034390aaea6197395b6195693b5d0bf605"; + x86_64-darwin = "7da73a8e3eb82a035f0d720709dbbb44cac0166d52ad4858fca9f3d96e6a32ed"; + i686-linux = "597f5710e6e55e4fb75c769af6e3c7db1924f6795f417e3ff6b37c4da2ae39fc"; + armv7l-linux = "01138b036812e5461a5871c2f8912baf0adf316df6597eb5c4fd3df8d41fb95e"; + aarch64-linux = "fe24cf90e3768cafa9939a0107261a97b4f132f9dec24bf0d1d15b591cdad2d6"; + aarch64-darwin = "c48323f1fd6cd4ebc67a248a83bd7c460a640bf32613d4fecf6be705f3d6803c"; + headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0"; }; electron_13 = mkElectron "13.1.7" { From e5d5dd2c9f0fbddeee21d861d879f8592c6baeeb Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 26 Jul 2021 23:53:15 +0900 Subject: [PATCH 0568/1522] vscode-extensions.magic-racket: fix homepage move meta to the end --- pkgs/misc/vscode-extensions/default.nix | 32 +++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 32335990534..3f0498168c5 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,5 +1,18 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq -, shellcheck, moreutils, racket-minimal, clojure-lsp +{ config +, lib +, buildEnv +, callPackage +, vscode-utils +, asciidoctor +, nodePackages +, jdk +, llvmPackages_8 +, nixpkgs-fmt +, jq +, shellcheck +, moreutils +, racket-minimal +, clojure-lsp }: let @@ -533,14 +546,6 @@ let }; eugleo.magic-racket = buildVscodeMarketplaceExtension { - meta = with lib; { - changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; - description = "The best coding experience for Racket in VS Code "; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; - homepage = "https://github.com/Eugleo/magic-raket"; - license = licenses.agpl3Only; - - }; mktplcRef = { name = "magic-racket"; publisher = "evzen-wybitul"; @@ -552,6 +557,13 @@ let cd "$out/$installPrefix" jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json ''; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; + description = "The best coding experience for Racket in VS Code "; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; + homepage = "https://github.com/Eugleo/magic-racket"; + license = licenses.agpl3Only; + }; }; file-icons.file-icons = buildVscodeMarketplaceExtension { From 69c886888368c123cf582e9343b241847e63be39 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 26 Jul 2021 23:54:33 +0900 Subject: [PATCH 0569/1522] vscode-extensions: use sponge instead of mktemp --- pkgs/misc/vscode-extensions/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 3f0498168c5..2941c95bb4e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -185,12 +185,10 @@ let version = "0.0.1"; sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; }; - nativeBuildInputs = [ jq ]; + nativeBuildInputs = [ jq moreutils ]; postInstall = '' cd "$out/$installPrefix" - tmp_package_json=$(mktemp) - jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json" - mv "$tmp_package_json" package.json + jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json ''; meta = with lib; { license = licenses.mit; @@ -1342,12 +1340,10 @@ let version = "0.14.4"; sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; }; - nativeBuildInputs = [ jq ]; + nativeBuildInputs = [ jq moreutils ]; postInstall = '' cd "$out/$installPrefix" - tmp_package_json=$(mktemp) - jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json" - mv "$tmp_package_json" package.json + jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json ''; meta = { license = lib.licenses.mit; From e22631727b4b1ee5426397a583be3ea107bed8d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 01:00:57 +0000 Subject: [PATCH 0570/1522] esbuild: 0.12.15 -> 0.12.16 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index d3833d3b147..2802a05f8ad 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.15"; + version = "0.12.16"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ="; + sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From dc045635426b741b7fc722f1f43623436d514f33 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Jul 2021 04:20:00 +0000 Subject: [PATCH 0571/1522] jetbrains-mono: 2.225 -> 2.241 https://github.com/JetBrains/JetBrainsMono/releases/tag/v2.241 --- pkgs/data/fonts/jetbrains-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 0ba7fd835c3..65ffe491a78 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.225"; + version = "2.241"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1k8xmjaingz50626hd73hqbp196kg3zndiy0aqb88z5cw9nd0fva"; + sha256 = "1gwhbmq8zw026i66g96i75zn2zff7cr83ns8aaslrzsrkk247lah"; postFetch = '' mkdir -p $out/share/fonts From 8ca3b6689487ae122ee6c259d4e358c63331ce46 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Jul 2021 04:20:00 +0000 Subject: [PATCH 0572/1522] ncspot: 0.7.3 -> 0.8.1 https://github.com/hrkfdn/ncspot/releases/tag/v0.8.0 https://github.com/hrkfdn/ncspot/releases/tag/v0.8.1 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 0a887ebaf3d..a2209368518 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0lfly3d8pag78pabmna4i6xjwzi65dx1mwfmsk7nx64brq3iypbq"; + sha256 = "0sgnd6n8j8lygmb9qvv6i2ir28fdsrpmzlviz7d0gbx684qj0zkc"; }; - cargoSha256 = "0a6d41ll90fza6k3lixjqzwxim98q6zbkqa3zvxvs7q5ydzg8nsp"; + cargoSha256 = "0piipqf5y5bczbwkaplv6niqh3rp2di1gn7wwpd0gaa2cw7ylbb1"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From b3cb996253de4fd49aef583d5c7133d0e94306c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 04:21:57 +0000 Subject: [PATCH 0573/1522] juju: 2.9.7 -> 2.9.9 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index ced8b2fd415..e82680e36b3 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.7"; + version = "2.9.9"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-jGrN0tsLO8gmkyZ1zNYzZd29mCQgLP7lSF0LkOygbyc="; + sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU="; }; - vendorSha256 = "sha256-0JNoOSNxJrJkph8OGzgQ7sdslnGC36e3Ap0uMpqriX0="; + vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 263166c0910483351b89bacb4e3a729edeb0f1e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 06:36:31 +0000 Subject: [PATCH 0574/1522] bdf2psf: 1.204 -> 1.205 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index d6ee1720430..72f142105b7 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.204"; + version = "1.205"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE="; + sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I="; }; nativeBuildInputs = [ dpkg ]; From c5e0a9980b4f92c2a47bf44e507bdb7450037f8c Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 23 Jul 2021 18:17:25 +0200 Subject: [PATCH 0575/1522] nitter: init at unstable-2021-07-18 --- pkgs/servers/nitter/default.nix | 131 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 133 insertions(+) create mode 100644 pkgs/servers/nitter/default.nix diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix new file mode 100644 index 00000000000..47352edf48d --- /dev/null +++ b/pkgs/servers/nitter/default.nix @@ -0,0 +1,131 @@ +{ lib +, stdenv +, fetchFromGitHub +, nim +, libsass +}: + +let + jester = fetchFromGitHub { + owner = "dom96"; + repo = "jester"; + rev = "v0.5.0"; + sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk"; + }; + karax = fetchFromGitHub { + owner = "karaxnim"; + repo = "karax"; + rev = "1.1.2"; + sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j"; + }; + sass = fetchFromGitHub { + owner = "dom96"; + repo = "sass"; + rev = "e683aa1"; + sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc"; + }; + regex = fetchFromGitHub { + owner = "nitely"; + repo = "nim-regex"; + rev = "2e32fdc"; + sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8"; + }; + unicodedb = fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodedb"; + rev = "v0.9.0"; + sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq"; + }; + unicodeplus= fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodeplus"; + rev = "v0.8.0"; + sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; + }; + segmentation = fetchFromGitHub { + owner = "nitely"; + repo = "nim-segmentation"; + rev = "v0.1.0"; + sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; + }; + nimcrypto = fetchFromGitHub { + owner = "cheatfate"; + repo = "nimcrypto"; + rev = "a5742a9a214ac33f91615f3862c7b099aec43b00"; + sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz"; + }; + markdown = fetchFromGitHub { + owner = "soasme"; + repo = "nim-markdown"; + rev = "abdbe5e"; + sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy"; + }; + packedjson = fetchFromGitHub { + owner = "Araq"; + repo = "packedjson"; + rev = "7198cc8"; + sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1"; + }; + supersnappy = fetchFromGitHub { + owner = "guzba"; + repo = "supersnappy"; + rev = "1.1.5"; + sha256 = "1y26sgnszvdf5sn7j0jx2dpd4i03mvbk9i9ni9kbyrs798bjwi6z"; + }; + redpool = fetchFromGitHub { + owner = "zedeus"; + repo = "redpool"; + rev = "57aeb25"; + sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q"; + }; + frosty = fetchFromGitHub { + owner = "disruptek"; + repo = "frosty"; + rev = "0.3.1"; + sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz"; + }; + redis = fetchFromGitHub { + owner = "zedeus"; + repo = "redis"; + rev = "94bcbf1"; + sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j"; + }; +in stdenv.mkDerivation rec { + pname = "nitter"; + version = "unstable-2021-07-18"; + + src = fetchFromGitHub { + owner = "zedeus"; + repo = "nitter"; + rev = "6c5cb01b294d4f6e3b438fc47683359eb0fe5057"; + sha256 = "1dl8ndyv8m1hnydrp5xilcpp2cfbp02d5jap3y42i4nazc9ar6p4"; + }; + + nativeBuildInputs = [ nim ]; + buildInputs = [ libsass ]; + + buildPhase = '' + runHook preBuild + export HOME=$TMPDIR + nim -d:release -p:${jester} -p:${karax} -p:${sass}/src -p:${regex}/src -p:${unicodedb}/src -p:${unicodeplus}/src -p:${segmentation}/src -p:${nimcrypto} -p:${markdown}/src -p:${packedjson} -p:${supersnappy}/src -p:${redpool}/src -p:${frosty} -p:${redis}/src c src/$pname + nim -p:${sass}/src c --hint[Processing]:off -r tools/gencss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin src/$pname + mkdir -p $out/share/nitter + cp -r public $out/share/nitter/public + runHook postInstall + ''; + + meta = with lib; { + description = "Alternative Twitter front-end"; + homepage = "https://github.com/zedeus/nitter"; + maintainers = with maintainers; [ erdnaxe ]; + license = licenses.agpl3Only; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 827a156f7f2..73f4bde028e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7363,6 +7363,8 @@ in ngrok-1 = callPackage ../tools/networking/ngrok-1 { }; + nitter = callPackage ../servers/nitter { }; + noice = callPackage ../applications/misc/noice { }; noip = callPackage ../tools/networking/noip { }; From 24bc10546ab952106e0b6103c4b5f7daec61a1a6 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 27 Jul 2021 07:52:29 +0200 Subject: [PATCH 0576/1522] libsigrokdecode: python3 -> python38 latest release is close to 2 years old, fails to run with 3.9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30aa57a1ec4..4484e207b13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13459,7 +13459,9 @@ in sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { + python3 = python38; + }; # special forks used for dsview libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; From 77f78394e5f961c648cc9295bb03287c8c65fdee Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 27 Jul 2021 07:53:03 +0200 Subject: [PATCH 0577/1522] libsigrokdecode: enable check and remove libsigrok, they don't list it as a dependency and sigrok-cli works without it it seems --- pkgs/development/tools/libsigrokdecode/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 7c8ad17c5a0..06b5f5c35bb 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, check }: stdenv.mkDerivation rec { pname = "libsigrokdecode"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib python3 libsigrok check ]; + buildInputs = [ glib python3 ]; + checkInputs = [ check ]; + doCheck = true; meta = with lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; From 571a504e01a0ca1816f1d9a6695828a2e479b59f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 07:17:10 +0000 Subject: [PATCH 0578/1522] angle-grinder: 0.16 -> 0.17.0 --- pkgs/tools/text/angle-grinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index f9f5736015b..02235b057d4 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "angle-grinder"; - version = "0.16"; + version = "0.17.0"; src = fetchFromGitHub { owner = "rcoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE="; + sha256 = "sha256-jG3jHFqFOrIT/e5oyLOEckw5C3LIs7amFAa4QDEI/EY="; }; - cargoSha256 = "sha256-LJ7zudUeso28zJqLhqWGWqf+L4o75rJjtTx9BpWKRIE="; + cargoSha256 = "sha256-Rkex+fnnacV+DCRpX3Zh9J3vGuG4QfFhFezHTs33peY="; meta = with lib; { description = "Slice and dice logs on the command line"; From e44e97f237545d76ddfaf5f12b9fd70e242739ac Mon Sep 17 00:00:00 2001 From: Emile Date: Tue, 27 Jul 2021 09:36:31 +0200 Subject: [PATCH 0579/1522] interactsh: init at 0.0.3 (#131201) Co-authored-by: Sandro --- pkgs/tools/misc/interactsh/default.nix | 39 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/misc/interactsh/default.nix diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix new file mode 100644 index 00000000000..8bc70967b16 --- /dev/null +++ b/pkgs/tools/misc/interactsh/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "interactsh"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "0a3jfdnhh5idf2j14gppjxmdhqnyymg42z7nlnbr2zaigkvgz487"; + }; + + vendorSha256 = "sha256-hLnxtARre+7HqEtU7bB9SvEieOaAoBM6VFUnKvLCD60="; + + modRoot = "."; + subPackages = [ + "cmd/interactsh-client" + "cmd/interactsh-server" + ]; + + # Test files are not part of the release tarball + doCheck = false; + + meta = with lib; { + description = "An Out of bounds interaction gathering server and client library"; + longDescription = '' + Interactsh is an Open-Source Solution for Out of band Data Extraction, + A tool designed to detect bugs that cause external interactions, + For example - Blind SQLi, Blind CMDi, SSRF, etc. + ''; + homepage = "https://github.com/projectdiscovery/interactsh"; + license = licenses.mit; + maintainers = with maintainers; [ hanemile ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4484e207b13..22403e10e2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2931,6 +2931,8 @@ in inklecate = callPackage ../development/compilers/inklecate {}; + interactsh = callPackage ../tools/misc/interactsh { }; + interlock = callPackage ../servers/interlock {}; iotools = callPackage ../tools/misc/iotools { }; From 02732ba0a48f5164d6f99835a6ef91d3598ae3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 09:46:18 +0200 Subject: [PATCH 0580/1522] xorg-rgb: format, cleanup --- pkgs/data/misc/xorg-rgb/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 056c56b4118..205fcabc713 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,20 +1,22 @@ -{lib, stdenv, fetchurl, pkg-config, xorgproto}: +{ lib, stdenv, fetchurl, pkg-config, xorgproto }: + stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; src = fetchurl { - url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; + url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; }; - nativeBuildInputs = [pkg-config]; - buildInputs = [xorgproto]; - meta = { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + + meta = with lib; { description = "X11 colorname to RGB mapping database"; - license = lib.licenses.mit; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - homepage = "http://xorg.freedesktop.org/"; + license = licenses.mit; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + homepage = "https://xorg.freedesktop.org/"; }; } From 03418a1ba661455b336b1d03c83bbb3b5b8df390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 09:42:31 +0200 Subject: [PATCH 0581/1522] postfix: format --- pkgs/servers/mail/postfix/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 2fddaae47b2..16166b73f48 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -23,9 +23,7 @@ let ++ lib.optional withLDAP "-lldap"); in stdenv.mkDerivation rec { - pname = "postfix"; - version = "3.6.1"; src = fetchurl { @@ -35,10 +33,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper m4 ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] - ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysqlclient - ++ lib.optional withSQLite sqlite - ++ lib.optional withLDAP openldap; + ++ lib.optional withPgSQL postgresql + ++ lib.optional withMySQL libmysqlclient + ++ lib.optional withSQLite sqlite + ++ lib.optional withLDAP openldap; hardeningDisable = [ "format" ]; hardeningEnable = [ "pie" ]; From e8ef8a0bc71116085c2f57990751d5953b952fa3 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Jul 2021 10:24:48 +0200 Subject: [PATCH 0582/1522] fulcio: 0.1.0 -> 0.1.1 https://github.com/sigstore/fulcio/releases/tag/v0.1.1 The binary has been renamed from `fulcio` to `fulcio-server` to match what's given in the `--help` page. --- pkgs/tools/security/fulcio/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 4539f10e50d..96ef86d18d1 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "fulcio"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; - rev = version; - sha256 = "sha256-+HWzhg+LTKpr9VJ9mzQghwOuGgp3EBb4/zltaqp0zHw="; + rev = "v${version}"; + sha256 = "sha256-MvLQMGPyJYqYUljLqsr+qJeeYnxdH9aNGkWpDRvOeh8="; }; - vendorSha256 = "sha256-1tR1vUm5eFBS93kELQoKWEyFlfMF28GBI8VEHxTyeM4="; + vendorSha256 = "sha256-pRL0et+UOi/tzuQz/Q7UmSA+pVhLJYR8lG8NAbPN9PU="; ldflags = [ "-s" "-w" ]; @@ -18,22 +18,23 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion --cmd fulcio \ - --bash <($out/bin/fulcio completion bash) \ - --fish <($out/bin/fulcio completion fish) \ - --zsh <($out/bin/fulcio completion zsh) + mv $out/bin/fulcio $out/bin/fulcio-server + installShellCompletion --cmd fulcio-server \ + --bash <($out/bin/fulcio-server completion bash) \ + --fish <($out/bin/fulcio-server completion fish) \ + --zsh <($out/bin/fulcio-server completion zsh) ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/fulcio --help + $out/bin/fulcio-server --help runHook postInstallCheck ''; meta = with lib; { homepage = "https://github.com/sigstore/fulcio"; - changelog = "https://github.com/sigstore/fulcio/releases/tag/${version}"; + changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}"; description = "A Root-CA for code signing certs - issuing certificates based on an OIDC email address"; license = licenses.asl20; maintainers = with maintainers; [ lesuisse jk ]; From b804cd913a0f2970788c7ab1b0154afd868d00ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 10:35:42 +0200 Subject: [PATCH 0583/1522] pythonPackages.inotify-simple: add pythonImportsCheck --- pkgs/development/python-modules/inotify-simple/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 1285cd7bccb..fe5f8ae9f11 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { # The package has no tests doCheck = false; + pythonImportsCheck = [ "inotify_simple" ]; + meta = with lib; { description = "A simple Python wrapper around inotify"; homepage = "https://github.com/chrisjbillington/inotify_simple"; From 7f25fd8e3146cb9e7cca4d4f3d40e62b53735390 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 21:30:12 +0200 Subject: [PATCH 0584/1522] gnucash: deprecate phases --- pkgs/applications/office/gnucash/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d2251da7007..c9390e70d25 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -11,7 +11,8 @@ let name = perl.name + "-wrapper-for-gnucash"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin for script in ${perl}/bin/*; do @@ -40,10 +41,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ]; buildInputs = [ - boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales + boost icu libxml2 libxslt gettext isocodes gtk3 glibcLocales webkitgtk dconf libofx aqbanking gwenhywfar libdbi libdbiDrivers guile perlWrapper perl From b545f2ddb4752fb0b3cfbedfbcce94a16d944a35 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 26 Jul 2021 20:22:37 +0200 Subject: [PATCH 0585/1522] openelec-dvb-firmware: remove phases --- .../linux/firmware/openelec-dvb-firmware/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index 3181072ea18..4ef9370c844 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' + runHook preInstall + DESTDIR="$out" ./install find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + + runHook postInstall ''; meta = with lib; { From a12a482755e3d333c034e9e3a37a7b7a968e033c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 10:46:59 +0200 Subject: [PATCH 0586/1522] python3Packages.prawcore: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index cb72e69af77..a115d42472a 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "prawcore"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bde42fad459c4dcfe0f22a18921ef4981ee7cd286ea1de3eb697ba91838c9123"; + sha256 = "0vgmhjddqxnz5vy70dyqvakak51fg1nk6j3xavkc83d8nzacrwfs"; }; propagatedBuildInputs = [ From b33a5188100f44ee56179d39f86798e51bc0dcca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 10:48:07 +0200 Subject: [PATCH 0587/1522] python3Packages.pyrituals: 0.0.5 -> 0.0.6 --- pkgs/development/python-modules/pyrituals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix index 6b3b9f91c1e..e7674fd3ea7 100644 --- a/pkgs/development/python-modules/pyrituals/default.nix +++ b/pkgs/development/python-modules/pyrituals/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyrituals"; - version = "0.0.5"; + version = "0.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = version; - sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg="; + sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g"; }; propagatedBuildInputs = [ aiohttp ]; From 516627915f58acc54ebf7559848faf7c7697251e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 10:51:14 +0200 Subject: [PATCH 0588/1522] wiktionary: remove builder.sh --- pkgs/servers/dict/wiktionary/builder.sh | 8 -------- pkgs/servers/dict/wiktionary/default.nix | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 pkgs/servers/dict/wiktionary/builder.sh diff --git a/pkgs/servers/dict/wiktionary/builder.sh b/pkgs/servers/dict/wiktionary/builder.sh deleted file mode 100644 index 65652ad4bdb..00000000000 --- a/pkgs/servers/dict/wiktionary/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/dictd/ -cd $out/share/dictd - -python -O "$convert" "$src" -dictzip wiktionary-en.dict -echo en_US.UTF-8 > locale diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 3a01120f3a6..05df86f3a78 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -1,23 +1,33 @@ { lib, stdenv, fetchurl, python2, dict, glibcLocales }: stdenv.mkDerivation rec { - version = "20210201"; pname = "dict-db-wiktionary"; + version = "20210201"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; }; - convert = ./wiktionary2dict.py; - buildInputs = [ python2 dict glibcLocales ]; - builder = ./builder.sh; + # script in nixpkgs does not support python2 + nativeBuildInputs = [ python2 dict glibcLocales ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share/dictd/ + cd $out/share/dictd + + ${python2.interpreter} -O ${./wiktionary2dict.py} "${src}" + dictzip wiktionary-en.dict + echo en_US.UTF-8 > locale + ''; passthru.updateScript = ./update.sh; meta = with lib; { description = "DICT version of English Wiktionary"; - homepage = "http://en.wiktionary.org/"; + homepage = "https://en.wiktionary.org/"; maintainers = with maintainers; [ qyliss ]; platforms = platforms.all; license = with licenses; [ cc-by-sa-30 fdl11Plus ]; From d40a72a89271598ab767eee1bc9a713f7db9c96f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 11:06:25 +0200 Subject: [PATCH 0589/1522] python3Packages.anyio: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/anyio/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 4c6a5e19078..ac34c336cad 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had"; + sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ="; }; preBuild = '' @@ -57,8 +57,13 @@ buildPythonPackage rec { mock ]; + disabledTests = [ + # block devices access + "test_is_block_device" + ]; + disabledTestPaths = [ - # lots of DNS lookups + # lots of DNS lookups "tests/test_sockets.py" ] ++ lib.optionals stdenv.isDarwin [ # darwin sandboxing limitations From d4a1c21fcda43d344a739df9ba5912537ef86e78 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 27 Jul 2021 11:11:40 +0200 Subject: [PATCH 0590/1522] lndmanage: 0.11.0 -> 0.12.0 --- pkgs/applications/blockchains/lndmanage.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage.nix index 56db469ff45..3c7e28d831e 100644 --- a/pkgs/applications/blockchains/lndmanage.nix +++ b/pkgs/applications/blockchains/lndmanage.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; rev = "v${version}"; - sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; + sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl"; }; propagatedBuildInputs = with python3Packages; [ From b0c4daee42008fd2ac0d08004d7802adf71cc2bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 11:12:07 +0200 Subject: [PATCH 0591/1522] python3Packages.ttp: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/ttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 6a557a1eff5..38faa10a928 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.7.1"; + version = "0.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6"; + sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk="; }; propagatedBuildInputs = [ From fc04308b0adc420fdf8ef9533770ef45edb09eee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 14:31:49 +0000 Subject: [PATCH 0592/1522] libelf: fix build on NetBSD This is a better solution than disabling native language entirely, like on Darwin. --- pkgs/development/libraries/libelf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index be328c54c08..47cd849f92c 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, autoreconfHook, gettext +, fetchurl, autoreconfHook, gettext, netbsd }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { # on Darwin, so disable NLS for now. ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; - nativeBuildInputs = [ gettext ] + nativeBuildInputs = + if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] # Need to regenerate configure script with newer version in order to pass # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` # which doesn't work with the bootstrapTools bash, so can only do this From 8ec2e85105c1ec95e9f146e12ae3ebd124db6384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 11:19:28 +0200 Subject: [PATCH 0593/1522] poetry2nix: drop anyio override The version number of the package was fixed a while ago. --- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 58a634ee86c..2a9e240e7af 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -52,12 +52,6 @@ self: super: } ); - anyio = super.anyio.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' - ''; - }); - astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; From 6f8845d30dc8a855e1061d37e0f9cac3258393ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 01:36:30 +0200 Subject: [PATCH 0594/1522] libjpeg: modernize --- pkgs/development/libraries/libjpeg/builder.sh | 25 ------------------- .../development/libraries/libjpeg/default.nix | 20 +++++++-------- 2 files changed, 10 insertions(+), 35 deletions(-) delete mode 100755 pkgs/development/libraries/libjpeg/builder.sh diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh deleted file mode 100755 index 58ca9a790ba..00000000000 --- a/pkgs/development/libraries/libjpeg/builder.sh +++ /dev/null @@ -1,25 +0,0 @@ -source $stdenv/setup - -preConfigure() { - # Workarounds for the ancient libtool shipped by libjpeg. - ln -s $libtool/bin/libtool . - cp $libtool/share/libtool/config.guess . - cp $libtool/share/libtool/config.sub . -} - -preInstall() { - mkdir $out - mkdir $out/bin - mkdir $out/lib - mkdir $out/include - mkdir $out/man - mkdir $out/man/man1 -} - -patchPhase() { - for i in $patches; do - patch < $i - done -} - -genericBuild diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 65482e8e9c6..028bf5cac33 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,23 +1,23 @@ { lib, stdenv, fetchurl, static ? false }: -with lib; - -stdenv.mkDerivation { - name = "libjpeg-9d"; +stdenv.mkDerivation rec { + pname = "libjpeg"; + version = "9d"; src = fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz"; + url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"; sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc"; }; - configureFlags = optional static "--enable-static --disable-shared"; + configureFlags = lib.optional static "--enable-static --disable-shared"; outputs = [ "bin" "dev" "out" "man" ]; - meta = { - homepage = "http://www.ijg.org/"; + meta = with lib; { + homepage = "https://www.ijg.org/"; description = "A library that implements the JPEG image file format"; - license = lib.licenses.free; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.free; + platforms = platforms.unix; }; } From cf0e7d1d47fd0bd4a96f3ccecbca572da34d7bb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 11:24:26 +0200 Subject: [PATCH 0595/1522] exploitdb: 2021-07-24 -> 2021-07-27 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ccb93c95f89..5cd7f4f63bf 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-24"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ="; + sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab"; }; installPhase = '' From b3cde793bf636b8474b46aef1b3577d6a16d9a3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Jul 2021 20:41:47 +0200 Subject: [PATCH 0596/1522] tts: 0.1.2 -> 0.1.3 --- pkgs/tools/audio/tts/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 7906c92ba88..bb5eda93a59 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,5 +1,5 @@ { lib -, python38 +, python3 , fetchFromGitHub , fetchpatch }: @@ -10,26 +10,19 @@ # $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts -# Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 -let - python3 = python38; -in python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.1.2"; - - # https://github.com/coqui-ai/TTS/issues/570 - disabled = python3.pythonAtLeast "3.9"; + version = "0.1.3"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4"; + sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq"; }; postPatch = '' From 108ad942fbd04abd08547864697825d1227a155f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jul 2021 01:41:43 +0200 Subject: [PATCH 0597/1522] mrbayes: modernize --- .../science/biology/mrbayes/builder.sh | 9 -------- .../science/biology/mrbayes/default.nix | 23 ++++++++++--------- 2 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/science/biology/mrbayes/builder.sh diff --git a/pkgs/applications/science/biology/mrbayes/builder.sh b/pkgs/applications/science/biology/mrbayes/builder.sh deleted file mode 100644 index 5b3a54946fc..00000000000 --- a/pkgs/applications/science/biology/mrbayes/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -# builder for mrbayes - note: only builds on Unix - -source $stdenv/setup - -tar xvfz $src -cd mrbayes-* -make -mkdir -p $out/bin -cp -v mb $out/bin diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 9acfea1a146..a9eb099780c 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -1,18 +1,18 @@ -{lib, stdenv, fetchurl, readline}: +{ lib, stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - # FIXME: replace Makefile so we can build MPI & MAC support + pname = "mrbayes"; + version = "3.2.7"; - name = "mrbayes-3.1.2"; - src = fetchurl { - url = "mirror://sourceforge/mrbayes/${name}.tar.gz"; - sha256 = "1x7j8ca5wjrqrxmcpvd375ydm3s2pbkzykv8xfhg1jc037g560n6"; + src = fetchFromGitHub { + owner = "NBISweden"; + repo = "MrBayes"; + rev = "v${version}"; + sha256 = "sha256-J0r4CxxQuZ3exvfCMRbLmyEd8ROaXNQG4afwiAs6H+M="; }; - builder = ./builder.sh; - buildInputs = [readline]; meta = with lib; { - description = "Bayesian Inference of Phylogeny"; + description = "Bayesian Inference of Phylogeny"; longDescription = '' Bayesian inference of phylogeny is based upon a quantity called the posterior probability distribution of trees, which is @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { MrBayes uses a simulation technique called Markov chain Monte Carlo (or MCMC) to approximate the posterior probabilities of trees. ''; - license = licenses.gpl2; - homepage = "http://mrbayes.csit.fsu.edu/"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + homepage = "https://nbisweden.github.io/MrBayes/"; platforms = platforms.linux; }; } From 02500bf5c1f4f78f7909d7ce91cd3b8901a2e823 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 27 Jul 2021 11:54:34 +0200 Subject: [PATCH 0598/1522] pythonPackages.blspy: 1.0.2 -> 1.0.5 --- pkgs/development/python-modules/blspy/default.nix | 4 ++-- .../python-modules/blspy/dont_fetch_dependencies.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index e75e474bdab..9592deccc6c 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.2"; + version = "1.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4="; + hash = "sha256-uDXzAdGzfyRbsMVllLNd3DK8F/GfovdX293z5Mel6eg="; }; patches = [ diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index f9c41d9420b..416163a744b 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -23,7 +23,7 @@ index faecc61..3272116 100644 -if (DEFINED ENV{RELIC_MAIN}) - set(RELIC_GIT_TAG "origin/main") -else () -- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +- set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1") -endif () - -message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") From fbcd933f276f890f4cecda249ada3c40170fef43 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 27 Jul 2021 12:11:47 +0200 Subject: [PATCH 0599/1522] pythonPackages.chiapos: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/chiapos/default.nix | 4 ++-- .../python-modules/chiapos/dont_fetch_dependencies.patch | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index e9f4e326654..587c2fbf3c7 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.3"; + version = "1.0.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2Ye0gaOsv/Hg1363E6+NmezsK9EcLEZVKKUHikM2hr0="; + sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w="; }; patches = [ diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index dc1cfddcc41..25102116969 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -3,7 +3,7 @@ index 9b4a2f5..86f849c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,22 +18,19 @@ include(FetchContent) - + else() FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git @@ -11,6 +11,7 @@ index 9b4a2f5..86f849c 100644 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) + endif() FetchContent_Declare( cxxopts From 81348a245d06ef036e5257ce5556b1585023219a Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 27 Jul 2021 12:12:12 +0200 Subject: [PATCH 0600/1522] chia: 1.2.2 -> 1.2.3 --- pkgs/applications/blockchains/chia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index f6ec6a0ec69..2c8e986fa86 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg="; + sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M="; }; patches = [ From b1b7d127d0d6c2d57e3e39f759356fd3d51b2262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 11:55:49 +0200 Subject: [PATCH 0601/1522] tiny8086: remove builder.sh --- .../virtualization/8086tiny/builder.sh | 30 -------- .../virtualization/8086tiny/default.nix | 43 ------------ .../virtualization/tiny8086/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 69 insertions(+), 74 deletions(-) delete mode 100644 pkgs/applications/virtualization/8086tiny/builder.sh delete mode 100644 pkgs/applications/virtualization/8086tiny/default.nix create mode 100644 pkgs/applications/virtualization/tiny8086/default.nix diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh deleted file mode 100644 index 210f11e1328..00000000000 --- a/pkgs/applications/virtualization/8086tiny/builder.sh +++ /dev/null @@ -1,30 +0,0 @@ - -source $stdenv/setup - -unpackPhase -cd $sourceRoot - -make 8086tiny - -if [ $bios ]; then - cd bios_source - nasm -f bin bios.asm -o bios - cd .. -fi - -mkdir -p $out/bin $out/share/$name $out/share/doc/$name/images - -install -m 755 8086tiny $out/bin -install -m 644 fd.img $out/share/$name/8086tiny-floppy.img -install -m 644 bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asm -install -m 644 docs/8086tiny.css $out/share/doc/$name -install -m 644 docs/doc.html $out/share/doc/$name -for i in docs/images/*.gif -do - install -m 644 $i $out/share/doc/$name/images -done -if [ $bios ]; then - install -m 644 bios_source/bios $out/share/$name/8086tiny-bios -else - install -m 644 bios $out/share/$name/8086tiny-bios -fi diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix deleted file mode 100644 index c58d488f583..00000000000 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, localBios ? true, nasm ? null -, sdlSupport ? true, SDL ? null }: - -assert sdlSupport -> (SDL != null); - -stdenv.mkDerivation rec { - - pname = "8086tiny"; - version = "1.25"; - - src = fetchFromGitHub { - owner = "adriancable"; - repo = pname; - rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a"; - sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; - }; - - buildInputs = with lib; - optionals localBios [ nasm ] - ++ optionals sdlSupport [ SDL ]; - - bios = localBios; - - builder = ./builder.sh; - - meta = with lib; { - description = "An open-source small 8086 emulator"; - longDescription = '' - 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) - Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS - Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny - emulates a "late 80's era" PC XT-type machine. - - 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the - "unobfuscated" version :) - ''; - homepage = "https://github.com/adriancable/8086tiny"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/virtualization/tiny8086/default.nix new file mode 100644 index 00000000000..60d69432cde --- /dev/null +++ b/pkgs/applications/virtualization/tiny8086/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, localBios ? true +, nasm +, sdlSupport ? true +, SDL +}: + +stdenv.mkDerivation rec { + pname = "8086tiny"; + version = "1.25"; + + src = fetchFromGitHub { + owner = "adriancable"; + repo = pname; + rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a"; + sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; + }; + + buildInputs = lib.optional localBios nasm + ++ lib.optional sdlSupport SDL; + + makeFlags = [ "8086tiny" ]; + + postBuild = lib.optionalString localBios '' + ( + cd bios_source + nasm -f bin bios.asm -o bios + ) + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + + install -m 755 8086tiny $out/bin + install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img + install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm + install -m 644 docs/8086tiny.css $out/share/doc/8086tiny + install -m 644 docs/doc.html $out/share/doc/$name + + for i in docs/images/\*.gif; do + install -m 644 $i $out/share/doc/8086tiny/images + done + + ${if localBios then + "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" + else + "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + ''; + + meta = with lib; { + description = "An open-source small 8086 emulator"; + longDescription = '' + 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) + Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS + Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny + emulates a "late 80's era" PC XT-type machine. + + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the + "unobfuscated" version :) + ''; + homepage = "https://github.com/adriancable/8086tiny"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30aa57a1ec4..1ff49cd802d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9359,7 +9359,7 @@ in tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; From 8dc0e39485a186fb2f104ab5d829a3c5b8759224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 13:21:23 +0200 Subject: [PATCH 0602/1522] nuclei: 2.4.0 -> 2.4.1 --- pkgs/tools/security/nuclei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 3f674bef7bc..3a205ebdb1e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "nuclei"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "projectdiscovery"; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; }; - vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A="; + vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s"; modRoot = "./v2"; subPackages = [ From bdf6d09cc29c762d103dd73704438772b09b58ea Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 27 Jul 2021 02:41:23 -0400 Subject: [PATCH 0603/1522] notmuch-bower: 0.12 -> 0.13 --- .../networking/mailreaders/notmuch-bower/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 2e2b7da9a4c..9db07da69f9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5"; + sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6"; }; nativeBuildInputs = [ gawk mercury pandoc ]; @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mv bower $out/bin/ mkdir -p $out/share/man/man1 mv bower.1 $out/share/man/man1/ + runHook postInstall ''; enableParallelBuilding = true; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wangp/bower"; description = "A curses terminal client for the Notmuch email system"; maintainers = with maintainers; [ erictapen ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From f4a9bc5330b9568147066e6cfa94c3ded72f4afd Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 27 Jul 2021 06:38:59 -0400 Subject: [PATCH 0604/1522] maintainers: add jgart --- maintainers/maintainer-list.nix | 6 ++++++ .../networking/mailreaders/notmuch-bower/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fd607cfdbe0..8708bf79f54 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4939,6 +4939,12 @@ fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; }]; }; + jgart = { + email = "jgart@dismail.de"; + github = "jgarte"; + githubId = 47760695; + name = "Jorge Gomez"; + }; jgeerds = { email = "jascha@geerds.org"; github = "jgeerds"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 9db07da69f9..feca7bd2018 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/wangp/bower"; description = "A curses terminal client for the Notmuch email system"; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ jgart ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; From 3656c6a538a9e9dda5c323c2211b5d338090eda0 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 14:24:12 +1000 Subject: [PATCH 0605/1522] xxgdb: init at 1.12 --- pkgs/development/tools/misc/xxgdb/default.nix | 43 ++++++++++ .../tools/misc/xxgdb/xxgdb-pty.patch | 84 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 129 insertions(+) create mode 100644 pkgs/development/tools/misc/xxgdb/default.nix create mode 100644 pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/development/tools/misc/xxgdb/default.nix new file mode 100644 index 00000000000..fc0a38ee749 --- /dev/null +++ b/pkgs/development/tools/misc/xxgdb/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, imake, xlibsWrapper, gccmakedep, libXaw }: + +stdenv.mkDerivation rec { + pname = "xxgdb"; + version = "1.12"; + + src = fetchurl { + url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${version}.orig.tar.gz"; + sha256 = "0jwazg99wk2l7r390ggw0yr8xipl07bp0qynni141xss530i6d1a"; + }; + + patches = [ + # http://zhu-qy.blogspot.com.es/2012/11/slackware-14-i-still-got-xxgdb-all-ptys.html + ./xxgdb-pty.patch + ]; + + nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ xlibsWrapper libXaw ]; + + preConfigure = '' + mkdir build + xmkmf + ''; + + makeFlags = [ + "DESTDIR=build" + ]; + + postInstall = '' + # Fix up install paths + shopt -s globstar + mv build/**/bin $out/bin + + install -D xxgdb.1 $out/share/man/man1/xxgdb.1 + ''; + + meta = with lib; { + description = "A simple but powerful graphical interface to gdb"; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch new file mode 100644 index 00000000000..735bb1b0b5f --- /dev/null +++ b/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch @@ -0,0 +1,84 @@ +--- xxgdb-1.12-org/calldbx.c 2012-10-26 17:17:49.810750909 -0700 ++++ xxgdb-1.12/calldbx.c 2012-10-26 17:53:59.209918816 -0700 +@@ -69,6 +69,12 @@ + * create_io_window(): create an io window for gdb to use + */ + ++#ifdef linux ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++#endif ++ + #include + #include + #include +@@ -126,6 +132,13 @@ + { + int master; + ++#ifdef _POSIX_SOURCE ++ if ((master = posix_openpt (O_RDWR|O_NOCTTY)) < 0) { ++ perror("posix_openpt failed:"); ++ } else { ++ return master; ++ } ++#else + #ifdef SVR4 /* (MJH) Use STREAMS */ + + if((master = open(MASTER_CLONE, O_RDWR)) < 0) +@@ -152,6 +165,7 @@ + } + #endif + #endif /* SVR4 */ ++#endif /* _POSIX_SOURCE */ + + #ifdef GDB + fprintf(stderr, "xxgdb: all ptys in use\n"); +@@ -167,7 +181,28 @@ + { + int slave; + +-#ifdef SVR4 /* (MJH) */ ++#ifdef _POSIX_SOURCE ++ char *slave_name = ptsname (master); ++ if (slave_name == NULL) { ++ perror ("Pseudo-tty slave"); ++ exit (2); ++ } // end if ++ if (grantpt (master) < 0) { ++ perror ("grantpt error"); ++ exit (3); ++ } ++ if (unlockpt (master) < 0) { ++ perror ("unlockpt error"); ++ exit (4); ++ } ++ if ((slave = open (slave_name, O_RDWR)) < 0) { ++ perror (slave_name); ++ exit (5); ++ } // end if ++ return slave; ++#else ++#ifdef SVR4 ++ /* (MJH) */ + char *slave_name = "unknown"; + extern char *ptsname(int master); + void (*handler)(); +@@ -194,6 +229,7 @@ + } + return slave; + #endif /* SVR4 */ ++#endif /* _POSIX_SOURCE */ + } + + #ifdef CREATE_IO_WINDOW +@@ -230,7 +266,7 @@ + { + /* child */ + /* printf("xterm xterm -l -e xxgdbiowin\n");*/ +- if (execlp("xterm", "xterm", "-e", "xxgdbiowin", 0)) ++ if (execlp("xterm", "xterm", "-e", "xxgdbiowin", NULL)) + { + printf("exec of 'xterm -e xxgdbiowin' fails\n"); + unlink("/tmp/iowindowtty"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..c0f726d02c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14488,6 +14488,8 @@ in xxdiff-tip = xxdiff; + xxgdb = callPackage ../development/tools/misc/xxgdb { }; + yaml2json = callPackage ../development/tools/yaml2json { }; yams = callPackage ../applications/audio/yams { }; From 319c186f9567bf77fa3c0a0fb5e1e6113c44aab7 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 25 Jul 2021 15:44:35 +1000 Subject: [PATCH 0606/1522] sockperf: init at 3.7 --- pkgs/tools/networking/sockperf/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/sockperf/default.nix diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix new file mode 100644 index 00000000000..d58bcb2f3ca --- /dev/null +++ b/pkgs/tools/networking/sockperf/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen +, enableTool ? false +, enableTest ? false }: + +stdenv.mkDerivation rec { + pname = "sockperf"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "Mellanox"; + repo = "sockperf"; + rev = version; + sha256 = "MtpV21lCEAv7ARxk0dAxoOxxlqDM+skdQnPlqOvksjw="; + }; + + nativeBuildInputs = [ autoreconfHook doxygen ]; + + configureFlags = [ "--enable-doc" ] + ++ lib.optional enableTest "--enable-test" + ++ lib.optional enableTool "--enable-tool"; + + doCheck = true; + + meta = with lib; { + description = "Network Benchmarking Utility"; + homepage = "https://github.com/Mellanox/sockperf"; + license = licenses.bsd3; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..38375e7de07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8992,6 +8992,8 @@ in socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); + sockperf = callPackage ../tools/networking/sockperf { }; + solaar = callPackage ../applications/misc/solaar {}; solanum = callPackage ../servers/irc/solanum { From 1c819c21b835db69c516faf6880ad17db9d7abec Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 27 Jul 2021 13:34:13 +0200 Subject: [PATCH 0607/1522] ocamlPackages.pecu: 0.5 -> 0.6 https://github.com/mirage/pecu/releases/tag/v0.6 --- pkgs/development/ocaml-modules/pecu/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix index 0059bbdec3c..22c1913635f 100644 --- a/pkgs/development/ocaml-modules/pecu/default.nix +++ b/pkgs/development/ocaml-modules/pecu/default.nix @@ -1,21 +1,21 @@ -{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }: +{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest, crowbar, astring }: buildDunePackage rec { pname = "pecu"; - version = "0.5"; + version = "0.6"; useDune2 = true; minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz"; - sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7"; + url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz"; + sha256 = "a9d2b7da444c83b20f879f6c3b7fc911d08ac1e6245ad7105437504f9394e5c7"; }; - # fmt availability - doCheck = lib.versionAtLeast ocaml.version "4.05"; - checkInputs = [ fmt alcotest ]; + # crowbar availability + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ fmt alcotest crowbar astring ]; meta = with lib; { description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; From 88f23a08b2a42f004869b86b8e1f68bcc48dbc16 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 26 Jul 2021 12:54:54 +1000 Subject: [PATCH 0608/1522] ddd: fix desktop icon --- pkgs/development/tools/misc/ddd/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index ca50deb504d..ecb198d7248 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -10,14 +10,22 @@ stdenv.mkDerivation rec { buildInputs = [motif ncurses libX11 libXt]; configureFlags = [ "--with-x" ]; - patches = [ ./gcc44.patch ]; + patches = [ + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504868 + ./gcc44.patch + ]; NIX_CFLAGS_COMPILE = "-fpermissive"; + postInstall = '' + install -D icons/ddd.xpm $out/share/pixmaps/ddd.xpm + ''; + meta = { homepage = "https://www.gnu.org/software/ddd"; description = "Graphical front-end for command-line debuggers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ angustrau ]; }; } From 599378f38f98799529f566562f527bc7eeaf5dbb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:06:52 +0200 Subject: [PATCH 0609/1522] parse-cli-bin: deprecate phases --- pkgs/development/tools/parse-cli-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 7cda74db5ef..33dbd0fec18 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" From 327cb2e9f05ce630d8f8c91f79094a060d27c75e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:11:02 +0200 Subject: [PATCH 0610/1522] ocamlPackages.utop: deprecate phases --- pkgs/development/tools/ocaml/utop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 361f64046ce..913871314cf 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { buildInputs = [ findlib ] ++ propagatedBuildInputs; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p "$out"/${path} From 768623e437fc37fb7f6d6b8afefea5e09c98d931 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:12:24 +0200 Subject: [PATCH 0611/1522] nwjs: remove phases --- pkgs/development/tools/node-webkit/nw12.nix | 2 -- pkgs/development/tools/nwjs/default.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f5276510e61..da85be92671 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -30,8 +30,6 @@ in stdenv.mkDerivation rec { "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/share/nwjs cp -R * $out/share/nwjs diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 7d0175ac912..2ca79410b85 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -47,8 +47,6 @@ in stdenv.mkDerivation rec { "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; }; - phases = [ "unpackPhase" "installPhase" ]; - # we have runtime deps like sqlite3 that should remain dontPatchELF = true; From 9a2ebe559767322571a19b5976de0cab95329d1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 14:15:00 +0200 Subject: [PATCH 0612/1522] python3Packages.aioesphomeapi: 5.0.1 -> 5.1.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 6d468b5f480..6ee09d5114f 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "5.0.1"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs="; + sha256 = "04r97d8bc5amvjvf2sxy2h4jf6z348q6p5z1nsxfnif80kxl0k60"; }; propagatedBuildInputs = [ From 58804e14462ba18fc9b267b26406f4bcc3c968be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 14:23:35 +0200 Subject: [PATCH 0613/1522] python3Packages.aioesphomeapi: enable tests --- .../python-modules/aioesphomeapi/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 6ee09d5114f..b9ee3af9ed8 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage -, pythonOlder -, fetchPypi +, fetchFromGitHub +, mock , protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder , zeroconf }: @@ -13,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "04r97d8bc5amvjvf2sxy2h4jf6z348q6p5z1nsxfnif80kxl0k60"; + src = fetchFromGitHub { + owner = "esphome"; + repo = pname; + rev = "v${version}"; + sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5"; }; propagatedBuildInputs = [ @@ -23,8 +28,11 @@ buildPythonPackage rec { zeroconf ]; - # no tests implemented - doCheck = false; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "aioesphomeapi" From cebfbdff37662e87ffc8a4ec225fad994e8b554f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:30:23 +0200 Subject: [PATCH 0614/1522] mrbayes: 3.2.7 -> 3.2.7a --- pkgs/applications/science/biology/mrbayes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index a9eb099780c..e4c2bbe6565 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mrbayes"; - version = "3.2.7"; + version = "3.2.7a"; src = fetchFromGitHub { owner = "NBISweden"; repo = "MrBayes"; rev = "v${version}"; - sha256 = "sha256-J0r4CxxQuZ3exvfCMRbLmyEd8ROaXNQG4afwiAs6H+M="; + sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA="; }; meta = with lib; { From 0b4b865cb66eb05d8588b3f253709ed0ecfb3801 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:33:36 +0200 Subject: [PATCH 0615/1522] watson-ruby: deprecate phases --- pkgs/development/tools/misc/watson-ruby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 23ec0643d77..4d17680471d 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { From 89fa135832a9cd96d7764a22401252be81c5fe1b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:34:42 +0200 Subject: [PATCH 0616/1522] distccMasquerade: deprecate phases --- pkgs/development/tools/misc/distcc/masq.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 2387ab1bd41..27840481a10 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' mkdir -p $out/bin From 8721cf6bca62c98e5db9fd5135135aa749cd2a81 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:35:42 +0200 Subject: [PATCH 0617/1522] chruby: remove phases --- pkgs/development/tools/misc/chruby/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index bcc0687f55b..1aef6d52075 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -19,8 +19,6 @@ in stdenv.mkDerivation rec { sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx"; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; - patches = lib.optionalString (rubies != null) [ ./env.patch ]; From f1227527ada67d3c914b5c2c14993babe21ca201 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:37:10 +0200 Subject: [PATCH 0618/1522] metals: deprecate phases --- pkgs/development/tools/metals/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index b85ca99a9e6..617f981ee2f 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - phases = [ "installPhase" ]; + dontUnpack = true; extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; From 9d191629beab5cc1043621bf41332177a3246dd8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:37:54 +0200 Subject: [PATCH 0619/1522] jsduck: deprecate phases --- pkgs/development/tools/jsduck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 15a3a683403..5c11b87f76f 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { gemset = ./gemset.nix; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ env ]; From 02b4d1c91a9507fcd42eb4433ab1d4c1e2805fa5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 14:41:39 +0200 Subject: [PATCH 0620/1522] ammonite: deprecate phases --- pkgs/development/tools/ammonite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 680217acfbb..ffd3b78cedd 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -17,7 +17,7 @@ let inherit sha256; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' install -Dm755 $src $out/bin/amm From cdb0c854a6da890a407ee61dcb2cc30552d85d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 15:21:33 +0200 Subject: [PATCH 0621/1522] rosegarden: format, cleanup --- .../applications/audio/rosegarden/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 38d8a876962..dd0112d8216 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,22 +1,40 @@ -{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook -, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsa-lib -, liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: +{ lib +, stdenv +, fetchurl +, cmake +, makedepend +, perl +, pkg-config +, qttools +, wrapQtAppsHook +, dssi +, fftwSinglePrec +, ladspaH +, ladspaPlugins +, libjack2 +, alsa-lib +, liblo +, libsamplerate +, libsndfile +, lirc +, lrdf +, qtbase +}: -stdenv.mkDerivation (rec { - version = "20.12"; +stdenv.mkDerivation rec { pname = "rosegarden"; + version = "20.12"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; }; - patchPhase = '' + postPhase = '' substituteInPlace src/CMakeLists.txt --replace svnheader svnversion ''; - nativeBuildInputs = - [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; buildInputs = [ dssi @@ -49,4 +67,4 @@ stdenv.mkDerivation (rec { license = licenses.lgpl2Plus; platforms = platforms.linux; }; -}) +} From caa1c955c94564f9bdafc23f6315f88da1e0da46 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 14 Jul 2021 19:59:37 +0200 Subject: [PATCH 0622/1522] linux_zen: 5.12.19 -> 5.13.5 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index caf65508210..3955b1851d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.12.19"; - suffix = "zen2"; + version = "5.13.5"; + suffix = "zen1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-l+KIlaXoq/Nzf7mUom9DUjaAsn7UxeKGL6MbYN7mBZk="; + sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; }; extraMeta = { From 683cfac034fc3a546b829a70bd845aec27b46564 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Jul 2021 14:13:07 +0000 Subject: [PATCH 0623/1522] evolution: 3.40.1 -> 3.40.3 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 53fe3d6f949..eff838256f5 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.1"; + version = "3.40.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g"; + sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw="; }; nativeBuildInputs = [ From d8dc6eb52e762e44bd024628a93215027e14c2c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 13:08:02 +0200 Subject: [PATCH 0624/1522] python3Packages.amcrest: 1.7.2 -> 1.8.0 --- pkgs/development/python-modules/amcrest/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 772b8fbaa04..dc132d102f2 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -4,26 +4,30 @@ , fetchFromGitHub , mock , pytestCheckHook +, pythonOlder , requests , responses , urllib3 +, typing-extensions }: buildPythonPackage rec { pname = "amcrest"; - version = "1.7.2"; + version = "1.8.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy"; + sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g"; }; propagatedBuildInputs = [ argcomplete requests urllib3 + typing-extensions ]; checkInputs = [ From 562b876e2c17dce56c599fd04f0be15d750c32f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:27:07 +0200 Subject: [PATCH 0625/1522] citrix-workspace: remove alias --- .../networking/remote/citrix-workspace/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 506f129d359..8159ae25167 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext - gnome.webkitgtk + webkitgtk gtk2 gtk2-x11 gtk3 From 332e711c66883c769012363d72b6cfe87e41088b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:27:15 +0200 Subject: [PATCH 0626/1522] eventlog: cleanup --- pkgs/development/libraries/eventlog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index ba4155db1e3..b5b4bc556f6 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { description = "Syslog event logger library"; longDescription = '' The EventLog library aims to be a replacement of the simple syslog() API @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { combination of description and tag/value pairs. ''; homepage = "https://www.balabit.com/support/community/products/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; }; } From d64d6fb45af3c49beb7950e1e9d0716203c598b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:47:00 +0200 Subject: [PATCH 0627/1522] dnsrecon: remove alias --- pkgs/tools/security/dnsrecon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 163728a37c6..6fa2041de3c 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; pythonPath = with python3.pkgs; [ - dns netaddr lxml + dnspython netaddr lxml ]; postPatch = '' From b683f580c03d522ffde1964c8e9b47dd5b25b68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:50:05 +0200 Subject: [PATCH 0628/1522] icecat-bin: remove alias --- pkgs/applications/networking/browsers/icecat-bin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix index 6f5da5b92a6..2427570a59d 100644 --- a/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , wrapGAppsHook , gnome2 +, gtk2 , nss , xdg-utils , xorg @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gnome2.GConf - gnome2.gtk + gtk2 gtk3 libX11 libXScrnSaver From 82bcc356c311e18063ec03d8ec67e8fa6ab6db0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:52:39 +0200 Subject: [PATCH 0629/1522] pcloud: remove alias --- pkgs/applications/networking/pcloud/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index e1936bf06a7..493cde9749b 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -15,13 +15,13 @@ # ^1 https://github.com/NixOS/nixpkgs/issues/69338 { - # Build dependencies - appimageTools, autoPatchelfHook, fetchzip, lib, stdenv, + # Build dependencies + appimageTools, autoPatchelfHook, fetchzip, lib, stdenv - # Runtime dependencies; - # A few additional ones (e.g. Node) are already shipped together with the - # AppImage, so we don't have to duplicate them here. - alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev + # Runtime dependencies; + # A few additional ones (e.g. Node) are already shipped together with the + # AppImage, so we don't have to duplicate them here. +, alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF From 4600fb84665e56c35863038fede78fced458a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 13:54:25 +0200 Subject: [PATCH 0630/1522] pgtop: remove alias --- pkgs/development/tools/pgtop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix index 03b3ef89265..722f701892e 100644 --- a/pkgs/development/tools/pgtop/default.nix +++ b/pkgs/development/tools/pgtop/default.nix @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; + buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' From 96f904b076b1bc1a612be250b95a63fdcabd2c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:00:18 +0200 Subject: [PATCH 0631/1522] python39Packages.python-mapnik: cleanup, remove pkgs from input, remove alias --- pkgs/development/libraries/mapnik/default.nix | 12 ++--- .../python-modules/python-mapnik/default.nix | 45 ++++++++++--------- pkgs/top-level/python-packages.nix | 13 +++++- 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 45d5e0a40eb..46f2751938e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python ]; - buildInputs = - [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff - libwebp proj python sqlite zlib + buildInputs = [ + boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff + libwebp proj python sqlite zlib - # optional inputs - postgresql - ]; + # optional inputs + postgresql + ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 228e0d74ebc..3a4e4af54de 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,26 +1,29 @@ { lib , buildPythonPackage +, fetchFromGitHub , isPyPy , python -, pkgs , pillow , pycairo +, pkg-config +, boost +, cairo +, harfbuzz +, icu +, libjpeg +, libpng +, libtiff +, libwebp +, mapnik +, proj +, zlib }: -let - boost = pkgs.boost.override { - enablePython = true; - inherit python; - }; - mapnik = pkgs.mapnik.override { - inherit python boost; - }; - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "python-mapnik"; version = "unstable-2020-02-24"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b"; @@ -29,10 +32,8 @@ in buildPythonPackage rec { disabled = isPyPy; doCheck = false; # doesn't find needed test data files - preBuild = let - pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; - in '' - export BOOST_PYTHON_LIB="boost_python${pythonVersion}" + preBuild = '' + export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}" export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" export PYCAIRO=true @@ -40,7 +41,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ mapnik # for mapnik_config - pkgs.pkgconfig + pkg-config ]; patches = [ @@ -50,7 +51,6 @@ in buildPythonPackage rec { buildInputs = [ mapnik boost - ] ++ (with pkgs; [ cairo harfbuzz icu @@ -60,15 +60,16 @@ in buildPythonPackage rec { libwebp proj zlib - ]); + ]; + propagatedBuildInputs = [ pillow pycairo ]; - pythonImportsCheck = [ "mapnik" ] ; + pythonImportsCheck = [ "mapnik" ]; meta = with lib; { description = "Python bindings for Mapnik"; + maintainers = with maintainers; [ ]; homepage = "https://mapnik.org"; - license = licenses.lgpl21; + license = licenses.lgpl21; }; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 554ede74f07..32fe5cb0729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7079,7 +7079,18 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; + python-mapnik = let + boost = pkgs.boost.override { + enablePython = true; + inherit python; + }; + in callPackage ../development/python-modules/python-mapnik { + inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib; + inherit boost; + mapnik = pkgs.mapnik.override { + inherit python boost; + }; + }; python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; From 800a59684ef99cec42060e6f770ac00fcc464543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:33:46 +0200 Subject: [PATCH 0632/1522] sqlfluff: remove alias --- pkgs/development/tools/database/sqlfluff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 6578bf8bf71..975254b83d7 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { click colorama configparser - diff_cover + diff-cover jinja2 oyaml pathspec From e10b6e7e3bcca7f3b6af707923b6c8338c7c6633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:42:31 +0200 Subject: [PATCH 0633/1522] whatsapp-for-linux: format, remove aliases --- .../whatsapp-for-linux/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 46215db3eb5..add76012ad3 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,5 +1,14 @@ -{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, - libappindicator-gtk3, gst_all_1, pcre }: +{ fetchFromGitHub +, lib +, stdenv +, gtkmm3 +, webkitgtk +, cmake +, pkg-config +, libappindicator-gtk3 +, gst_all_1 +, pcre +}: stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; @@ -18,8 +27,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.gtkmm - gnome.webkitgtk + gtkmm3 + webkitgtk libappindicator-gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good From 2008472e41c80492c82b5a71688bec602ec5bc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:22:45 +0200 Subject: [PATCH 0634/1522] python39Packages: remove two more aliases --- .../python-modules/{python-lz4 => lz4}/default.nix | 0 pkgs/top-level/python-aliases.nix | 2 ++ pkgs/top-level/python-packages.nix | 7 +------ 3 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{python-lz4 => lz4}/default.nix (100%) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix similarity index 100% rename from pkgs/development/python-modules/python-lz4/default.nix rename to pkgs/development/python-modules/lz4/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 294c90f6656..1726c3798e2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,8 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + python-lz4 = lz4; # added 2018-06-01 + python-pam = pam; # added 2020-09-07. pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32fe5cb0729..e2d85d8ca67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4260,7 +4260,7 @@ in { lyricwikia = callPackage ../development/python-modules/lyricwikia { }; - lz4 = self.python-lz4; # alias 2018-12-05 + lz4 = callPackage ../development/python-modules/lz4 { }; lzstring = callPackage ../development/python-modules/lzstring { }; @@ -5085,9 +5085,6 @@ in { palettable = callPackage ../development/python-modules/palettable { }; - # Alias. Added 2020-09-07. - pam = self.python-pam; - pamela = callPackage ../development/python-modules/pamela { }; pamqp = callPackage ../development/python-modules/pamqp { }; @@ -7069,8 +7066,6 @@ in { python-ly = callPackage ../development/python-modules/python-ly { }; - python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - python-lzf = callPackage ../development/python-modules/python-lzf { }; python-lzo = callPackage ../development/python-modules/python-lzo { From 6f99ce0c74373883010a7f851868e0c5ed7d6e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 14:52:51 +0200 Subject: [PATCH 0635/1522] cinnamon-common: remove alias --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 5fdfc0db1d6..936c4578ea3 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 pam pexpect distro ])) + (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro ])) atk cacert cinnamon-control-center From 722ac674d2439d11e8435cdee83e66c5ba3b4944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 15:15:11 +0200 Subject: [PATCH 0636/1522] python39Packages.buildbot: remove alias --- .../python-modules/buildbot/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 65919542057..8d8e5ec00dc 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, - python, twisted, jinja2, zope_interface, sqlalchemy, - sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, - txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, - isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, - parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +, python, twisted, jinja2, zope_interface, sqlalchemy +, sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq +, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial +, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins +, parameterized, git, openssh, glibcLocales, ldap3, nixosTests +}: let withPlugins = plugins: buildPythonPackage { @@ -56,7 +57,7 @@ let boto3 moto mock - python-lz4 + lz4 setuptoolsTrial isort pylint From 9de6ec98c0b8048f1265a34e0145210d325b6661 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 27 Jul 2021 08:22:34 -0700 Subject: [PATCH 0637/1522] python3Packages.joblib: fix eval --- pkgs/development/python-modules/joblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index e8d2ced7602..aad27b5ae63 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -5,7 +5,7 @@ , stdenv , numpydoc , pytestCheckHook -, python-lz4 +, lz4 , setuptools , sphinx }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ sphinx numpydoc pytestCheckHook ]; - propagatedBuildInputs = [ python-lz4 setuptools ]; + propagatedBuildInputs = [ lz4 setuptools ]; pytestFlagsArray = [ "joblib/test" ]; disabledTests = [ From fe5f3f65e23f806eb07c130b631b732fa89911d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 26 Jun 2021 01:31:10 +0200 Subject: [PATCH 0638/1522] manuals: Describe how to link NixOS tests from packages --- .../coding-conventions.chapter.md | 28 ++++++++++++++++++- ...linking-nixos-tests-to-packages.section.md | 6 ++++ nixos/doc/manual/development/nixos-tests.xml | 1 + ...inking-nixos-tests-to-packages.section.xml | 10 +++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md create mode 100644 nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index e42ba512b98..2e795015e36 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -537,7 +537,13 @@ Note that because the checksum is computed after applying these effects, using o Tests are important to ensure quality and make reviews and automatic updates easy. -Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`. +The following types of tests exists: + +* [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. For example, a NixOS module test can start a web server VM running the `nginx` module, and a client VM running `curl` or a graphical `firefox`, and test that they can talk to each other and display the correct content. +* Nix **package tests** are a lightweight alternative to NixOS module tests. They should be used to create simple integration tests for packages, but cannot test NixOS services, and some programs with graphical user interfaces may also be difficult to test with them. +* The **`checkPhase` of a package**, which should execute the unit tests that are included in the source code of a package. + +Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). ### Writing package tests {#ssec-package-tests-writing} @@ -602,3 +608,23 @@ Here are examples of package tests: - [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix) - [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix) - [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix) + +### Linking NixOS module tests to a package {#ssec-nixos-tests-linking} + +Like [package tests](#ssec-package-tests-writing) as shown above, [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests) can also be linked to a package, so that the tests can be easily run when changing the related package. + +For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`: + +```nix +{ stdenv, lib, nixosTests }: + +stdenv.mkDerivation { + ... + + passthru.tests = { + nginx = nixosTests.nginx; + }; + + ... +} +``` diff --git a/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md b/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md new file mode 100644 index 00000000000..38a64027f7c --- /dev/null +++ b/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md @@ -0,0 +1,6 @@ +# Linking NixOS tests to packages {#sec-linking-nixos-tests-to-packages} + +You can link NixOS module tests to the packages that they exercised, +so that the tests can be run automatically during code review when the package gets changed. +This is +[described in the nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking). diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 702fc03f668..67dc09fc715 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test + diff --git a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml new file mode 100644 index 00000000000..666bbec6162 --- /dev/null +++ b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml @@ -0,0 +1,10 @@ +
+ Linking NixOS tests to packages + + You can link NixOS module tests to the packages that they exercised, + so that the tests can be run automatically during code review when + the package gets changed. This is + described + in the nixpkgs manual. + +
From 6b639470214f721ea3aed1a6136b56ddbffa3df0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 10:52:36 +0200 Subject: [PATCH 0639/1522] python3Packages.pytile: 5.2.2 -> 5.2.3 --- pkgs/development/python-modules/pytile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index cf445fd9681..779703723ee 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.2.2"; + version = "5.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; + sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606"; }; nativeBuildInputs = [ From 053e4d104a665be901a67f1d0874b7e7948c81a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 17:59:41 +0200 Subject: [PATCH 0640/1522] python3Packages.async-dns: 1.1.10 -> 2.0.0 --- pkgs/development/python-modules/async-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix index 3067269aac9..375e72d24fd 100644 --- a/pkgs/development/python-modules/async-dns/default.nix +++ b/pkgs/development/python-modules/async-dns/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "async-dns"; - version = "1.1.10"; + version = "2.0.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "gera2ld"; repo = "async_dns"; rev = "v${version}"; - sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj"; + sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf"; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { checkPhase = '' export HOME=$TMPDIR # Test needs network access - rm tests/test_resolver.py + rm -r tests/resolver ${python.interpreter} -m unittest ''; From 721475c83b81ce66e50db714546c97041aca684f Mon Sep 17 00:00:00 2001 From: Ryan Orendorff <12442942+ryanorendorff@users.noreply.github.com> Date: Mon, 26 Jul 2021 19:37:01 -0600 Subject: [PATCH 0641/1522] agdaPackages.functional-linear-algebra 0.3->0.4 --- .../libraries/agda/functional-linear-algebra/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 0253df176ed..083741d58e9 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.3"; + version = "0.4"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,7 +10,7 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "032gl35x1qzaigc3hbg9dc40zr0nyjld175cb9m8b15rlz9xzjn2"; + sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0"; }; preConfigure = '' @@ -18,8 +18,6 @@ mkDerivation rec { ''; meta = with lib; { - # Remove if a version compatible with agda 2.6.2 is made - broken = true; homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' Formalizing linear algebra in Agda by representing matrices as functions From c626fec9e8db78e254bddd103fcf2b313999e72e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 18:46:57 +0200 Subject: [PATCH 0642/1522] proxify: 0.0.3 -> 0.0.4 --- pkgs/tools/networking/proxify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 6a0bfcc6ee2..47e36df3ac6 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "v${version}"; - sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn"; + sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s"; }; - vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig"; + vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx"; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; From 9867f9cef6ee2ee3705e69bb9d7be9dadd4e22a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 19:08:17 +0200 Subject: [PATCH 0643/1522] python3Packages.apispec: 4.7.0 -> 4.7.1 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 3bc1e6d4a5c..2753864fed8 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v6G+yLWyzqZyfgIMOm/hHZYwiN0u1hbhFHXOry1naTc="; + sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr"; }; propagatedBuildInputs = [ From ec518eb21b59bedf055167ba525174d82867022a Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 27 Jul 2021 19:11:46 +0200 Subject: [PATCH 0644/1522] cgit: support cross-compilation asciidoc was in the incorrect location, and CC and AR must be set explictly. --- .../git-and-tools/cgit/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index f48fe4b1ec4..a38055d9b21 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit + openssl zlib libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; @@ -48,10 +48,15 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p git tar --strip-components=1 -xf "$gitSrc" -C git - - makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/") ''; + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$out/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # Install manpage. postInstall = '' # xmllint fails: From 6b892752a0aeeb8fb89d8f86921367d0e93a53e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 19:20:56 +0200 Subject: [PATCH 0645/1522] python3Packages.emoji: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 67c9c7a1abd..97a969abf16 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v.${version}"; - sha256 = "0xksxdld20sh3c2s6pry1fm2br9xq8ypdq5pf971fpg5pk2f4iy9"; + sha256 = "0gakvh8hfmfdjyp46bl18b2zm3grm3k5shiqrpzqlipbaxb7ifrk"; }; checkInputs = [ From 4cce7f46f524efcf5459034334c34b1aa747f66a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 27 Jul 2021 10:21:17 -0700 Subject: [PATCH 0646/1522] firecracker: 0.24.4 -> 0.24.5 --- pkgs/applications/virtualization/firecracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 3d2f4606e49..78720034ea1 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.24.4"; + version = "0.24.5"; suffix = { x86_64-linux = "x86_64"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-EKndfLdkxn+S+2ElAyQ+mKEo5XN6kqZLuLCsQf+fKuk="; - aarch64-linux = "0zzr8x776aya6f6pw0dc0a6jxgbqv3f37p1vd8mmlsdv66c4kmfb"; + x86_64-linux = "sha256-drcm2kz2csuJqr8Oqs0r1BrxgPHOyuwC2S+99MhbMjA="; + aarch64-linux = "sha256-x8RoBmgY3HRUOLw8YzEwQfQuT83zGfBHHWu88b4i05o="; }; dontConfigure = true; From bd22d2425cb7f14b1f98f7432e6ad38208609adb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jul 2021 19:46:41 +0200 Subject: [PATCH 0647/1522] chromiumDev: Fix the build Our system FFmpeg version is too outdated and Snappy causes a linking failure (I didn't have time to investigate yet). Hopefully we can revert this before the stable release of M93. --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6daafc204eb..377835489a2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -75,15 +75,16 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = [ + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ "ffmpeg" + "snappy" + ] ++ [ "flac" "libjpeg" "libpng" "libwebp" "libxslt" "opus" - "snappy" "zlib" ]; From 6120ab426d8d652ff9d42caf1abc4e268af0bcb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Tue, 27 Jul 2021 17:14:53 +0300 Subject: [PATCH 0648/1522] android-tools: use system fmt --- pkgs/tools/misc/android-tools/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 1654b008aa5..b18366b057f 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , cmake, perl, go -, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 +, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7 }: stdenv.mkDerivation rec { @@ -12,8 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; }; + patches = [ + # fmt 8 breaks the build but we can use fmt 7 from Nixpkgs: + (fetchpatch { + # Vendor google's version of fmtlib + url = "https://github.com/nmeum/android-tools/commit/21061c1dfb006c22304053c1f6f9e48ae4cbe25a.patch"; + sha256 = "17mcsgfc3i8xq4hck0ppnzafh15aljxy7j2q4djcmwnvrkv9kx3s"; + revert = true; + excludes = [ "vendor/fmtlib" ]; + }) + ]; + nativeBuildInputs = [ cmake perl go ]; - buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; + buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; From 8560fdb9072b29d62b18f7a875df0d940c67e67e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 19:11:58 +0200 Subject: [PATCH 0649/1522] python3Packages.aiorpcx: 0.18.7 -> 0.22.1 --- pkgs/development/python-modules/aiorpcx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index 8e2078f5212..eae5b4a537c 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "aiorpcx"; - version = "0.18.7"; + version = "0.22.1"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7"; + sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0"; }; propagatedBuildInputs = [ attrs ]; From 93b1ba9a94d68c7960244345a395986f3fe1469b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 19:49:32 +0200 Subject: [PATCH 0650/1522] electrum: override aiorpcx --- pkgs/applications/misc/electrum/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 28c965a72b5..f722b2315c0 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -43,6 +43,20 @@ let mv ./all/electrum/tests $out ''; }; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + in python3.pkgs.buildPythonApplication { @@ -66,7 +80,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -87,7 +101,10 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor - ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle + ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py From d71d1915bf40fc6f81ed4f80618613f59b84c9a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 18:42:07 +0200 Subject: [PATCH 0651/1522] python3Packages.matrix-client: 0.3.2 -> 0.4.0 --- .../python-modules/matrix-client/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 354eace5047..6605009b8fd 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -1,25 +1,40 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook , requests -, pytest, pytest-runner, responses +, responses +, urllib3 }: buildPythonPackage rec { pname = "matrix_client"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; + sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; }; - checkInputs = [ pytest pytest-runner responses ]; + propagatedBuildInputs = [ + requests + urllib3 + ]; - propagatedBuildInputs = [ requests ]; + checkInputs = [ + pytestCheckHook + responses + ]; + + postPatch = '' + substituteInPlace setup.py --replace \ + "pytest-runner~=5.1" "" + ''; + + pythonImportsCheck = [ "matrix_client" ]; meta = with lib; { - description = "Matrix Client-Server SDK"; + description = "Python Matrix Client-Server SDK"; homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = licenses.asl20; maintainers = with maintainers; [ olejorgenb ]; From 68adc7b81c4743f3314aa720c2ac2a0e6d7e44e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jul 2021 20:20:25 +0200 Subject: [PATCH 0652/1522] chromiumDev: 93.0.4577.8 -> 93.0.4577.15 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a6df334a97d..98197e90025 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4577.8", - "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1", - "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w", + "version": "93.0.4577.15", + "sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0", + "sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig", "deps": { "gn": { "version": "2021-07-08", From 5d2d601899ea33342147ad92a411a333b1600d48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jul 2021 22:52:21 +0200 Subject: [PATCH 0653/1522] python3Packages.nexia: 0.9.10 -> 0.9.11 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index b9553765fb4..22dbea2cd51 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.10"; + version = "0.9.11"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9"; + sha256 = "0ql08nfvh6rjhjdh78gzih7az95m0fc9wxc22yqmlc9grifnp9i5"; }; propagatedBuildInputs = [ From d39767ea0f3b33f8a89f5dacd7fc80a211333b6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:35:02 +0200 Subject: [PATCH 0654/1522] blastem: stay with python2 --- pkgs/misc/emulators/blastem/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index a2dc86449d9..c96f5d9217c 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python2Packages, makeWrapper }: let vasm = @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ]; + buildInputs = [ pkg-config SDL2 glew xcftools python2Packages.python python2Packages.pillow vasm ]; preBuild = '' patchShebangs img2tiles.py ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22403e10e2e..ae759eea2bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3537,9 +3537,7 @@ in birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; - blastem = callPackage ../misc/emulators/blastem { - inherit (python27Packages) pillow; - }; + blastem = callPackage ../misc/emulators/blastem { }; blueberry = callPackage ../tools/bluetooth/blueberry { }; From 1079157175f5f64eedd640d7604e8d6227287d9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:35:15 +0200 Subject: [PATCH 0655/1522] appleseed: use python3 --- pkgs/tools/graphics/appleseed/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 1436aacad09..efa46b3b608 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, -eigen, libpng, python, libGLU, qt4, openexr, openimageio, +eigen, libpng, python3, libGLU, qt4, openexr, openimageio, opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper }: let boost_static = boost165.override { enableStatic = true; enablePython = true; + python = python3; }; in stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - boost_static guile eigen libpng python + boost_static guile eigen libpng python3 libGLU qt4 openexr openimageio opencolorio_1 xercesc osl seexpr ]; @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { # Work around a bug in the CMake build: postInstall = '' chmod a+x $out/bin/* - wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python} + wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python3} ''; } From e029eba1cac43b58202f87b0ff35a35cf9534850 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:35:38 +0200 Subject: [PATCH 0656/1522] cassandra: stay with python2 Did not test with python3. --- pkgs/servers/nosql/cassandra/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index cab21080a04..2d031ae9f5d 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python +, python2 , makeWrapper , gawk , bash @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { fi done - wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin + wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin runHook postInstall ''; From 250544f209b0d92ba01948be7ec1fa723ac3b974 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:35:47 +0200 Subject: [PATCH 0657/1522] clasp: use python3 --- pkgs/development/compilers/clasp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 3aa7063f551..0113a9aebc0 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost, libelf -, python, git, sbcl +, python3, git, sbcl , wafHook }: let @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake python git sbcl wafHook ] ++ + nativeBuildInputs = [ cmake python3 git sbcl wafHook ] ++ (with llvmPackages; [ llvm clang ]); buildInputs = with llvmPackages; From 6882ab13fcf977aafaf31d395aafd679d45d6545 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:36:13 +0200 Subject: [PATCH 0658/1522] dtc: python is only used when called from python-packages.nix --- pkgs/development/compilers/dtc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 0050dd44b9a..f145b0397f5 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, flex, bison, pkg-config, which -, pythonSupport ? false, python, swig, libyaml +, pythonSupport ? false, python ? null, swig, libyaml }: stdenv.mkDerivation rec { From 3bb6cb267e54b1468ec8ba26f1b57c76c7e06ef3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:36:27 +0200 Subject: [PATCH 0659/1522] osl: use python3 --- pkgs/development/compilers/osl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 10067644813..eeaba75c0de 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -1,6 +1,6 @@ { clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, -util-linux, python +util-linux, python3 }: let boost_static = boost165.override { enableStatic = true; }; @@ -26,7 +26,7 @@ in clangStdenv.mkDerivation rec { zlib openexr openimageio llvm partio pugixml util-linux # needed just for hexdump - python # CMake doesn't check this? + python3 # CMake doesn't check this? ]; # TODO: How important is partio? CMake doesn't seem to find it meta = with lib; { From 95cdecf2c2ddd45fac5682bb925c238c98fd5c34 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:36:36 +0200 Subject: [PATCH 0660/1522] seexpr: stay with python2 --- pkgs/development/compilers/seexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 7fc1fc7b1b6..5dfa08c4572 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, pythonPackages +bison, flex, libGLU, python2Packages }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ]; meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://www.disneyanimation.com/technology/seexpr.html"; From 8fab49cd7bbcf3b7db5aa37ca7a75d87285584b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:36:55 +0200 Subject: [PATCH 0661/1522] gdcm: python is only used when called from python-packages.nix --- pkgs/development/libraries/gdcm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 86d80a529d5..af4a5a38f7e 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -7,7 +7,7 @@ , ApplicationServices , Cocoa , enablePython ? false -, python +, python ? null , swig }: From 03e4fa0cdc8e5424b5849566e702e8f2883e8fbf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:37:32 +0200 Subject: [PATCH 0662/1522] fastnlo_toolkit: python is only used when called from python-packages.nix --- pkgs/development/libraries/physics/fastnlo_toolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index d6cbe7cc4dd..e4a731d3172 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -6,7 +6,7 @@ , gfortran , lhapdf , ncurses -, python +, python ? null , swig , yoda , zlib From f887fbcaef5903cc870fdbf887ee05aca8e2c04f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 15:37:58 +0200 Subject: [PATCH 0663/1522] boost: python is only used when called from python-packages.nix --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6158eb87511..1f9bbe5ffca 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv , fetchpatch , which , buildPackages From edd356d0a6a4a412cb49681a5b8912a7a39187ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:13:30 +0200 Subject: [PATCH 0664/1522] ja2-stracciatella: change to python3 --- pkgs/games/ja2-stracciatella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 3ad5ba20c53..ea363c96942 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, python, rustPlatform, SDL2, fltk, rapidjson, gtest, Carbon, Cocoa }: +{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, python3, rustPlatform, SDL2, fltk, rapidjson, gtest, Carbon, Cocoa }: let version = "0.17.0"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ stdenv.mkDerivation { pname = "ja2-stracciatella"; inherit src version; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; patches = [ From 9b2b860bbc56cd499cafad26aca8f5756906b084 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:13:48 +0200 Subject: [PATCH 0665/1522] gem-config: stay with python2 --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index bc70f30f959..8111f6e53cd 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl @@ -328,7 +328,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python ]; + buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; postPatch = '' From ce7b1fcc6b95bdf837a545240026886f814e946c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:14:03 +0200 Subject: [PATCH 0666/1522] hammer: clean up dependencies --- pkgs/development/tools/parsing/hammer/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 0a9dfdec016..402f83bea16 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,8 +10,10 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib python scons ]; + nativeBuildInputs = [ pkg-config scons ]; + buildInputs = [ glib ]; + + strictDeps = true; meta = with lib; { description = "A bit-oriented parser combinator library"; From cf4f947faab19de21c38cf7c367d36824aa5a283 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:14:13 +0200 Subject: [PATCH 0667/1522] coccinelle: change to python3 --- pkgs/development/tools/misc/coccinelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 8534f1e2d85..2d9aa55ed05 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }: +{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre parmap stdcompat - python ncurses pkg-config + python3 ncurses pkg-config ]; doCheck = false; From 41faf39bf59c599ba05e3484d963ce1e6ccb602c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:14:43 +0200 Subject: [PATCH 0668/1522] em-modules: stay with python2 Not tested whether it works with python3. --- pkgs/development/em-modules/generic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index a260beb5104..8bfbf6ec309 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, emscripten, python }: +{ pkgs, lib, emscripten, python2 }: { buildInputs ? [], nativeBuildInputs ? [] @@ -12,8 +12,8 @@ pkgs.stdenv.mkDerivation ( pname = "emscripten-${lib.getName args}"; version = lib.getVersion args; - buildInputs = [ emscripten python ] ++ buildInputs; - nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; + buildInputs = [ emscripten python2 ] ++ buildInputs; + nativeBuildInputs = [ emscripten python2 ] ++ nativeBuildInputs; # fake conftest results with emscripten's python magic EMCONFIGURE_JS=2; From 9070c34cd1f26a79faae3939e53cc966190d9628 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:20:02 +0200 Subject: [PATCH 0669/1522] k3d: stay with python2 not tested whether python3 works --- pkgs/applications/graphics/k3d/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 99e56738dbf..68e28c5cc88 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc -, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU, libGL, zlib, python2, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ]; buildInputs = [ - libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng + libGLU libGL zlib python2 expat libxml2 libsigcxx libuuid freetype libpng boost cairomm libjpeg libtiff ftgl glew gtkmm2 glibmm gtkglext libXmu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae759eea2bf..ac848e602d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25150,6 +25150,7 @@ in stdenv = gcc6Stdenv; boost = boost155.override { enablePython = true; + python = python2; stdenv = gcc6Stdenv; buildPackages = buildPackages // { stdenv = gcc6Stdenv; From b793742a4ee059a3dd6c799dd67fc1158f882a0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:22:36 +0200 Subject: [PATCH 0670/1522] libsigrok-0-3-0 -> libsigrok_0_3 --- 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 ac848e602d3..496746af33c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3756,7 +3756,7 @@ in convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -13454,7 +13454,7 @@ in libsigrok = callPackage ../development/tools/libsigrok { }; # old version: - libsigrok-0-3-0 = libsigrok.override { + libsigrok_0_3 = libsigrok.override { version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; }; From 9695d86309ebb0371f8d6ca1d0f41055c5fd8487 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:28:15 +0200 Subject: [PATCH 0671/1522] libsigrok: python bindings need additional work so remove python --- pkgs/development/tools/libsigrok/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 7f32b0bd716..7b9ebd57391 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm, python +, libserialport, librevisa, doxygen, glibmm , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport - librevisa doxygen glibmm python + librevisa doxygen glibmm ]; + strictDeps = true; + postInstall = '' mkdir -p "$out/share/sigrok-firmware/" tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" From f9697608d7ef3708dd740b3e313861f7764f4958 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:29:59 +0200 Subject: [PATCH 0672/1522] libsystemtap: python2 is needed --- pkgs/development/libraries/libsystemtap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index 1ce7ef58c88..17ac533732f 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchgit, gettext, python, elfutils}: +{lib, stdenv, fetchgit, gettext, python2, elfutils}: stdenv.mkDerivation { pname = "libsystemtap"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ gettext python elfutils ]; + nativeBuildInputs = [ gettext python2 elfutils ]; installPhase = '' mkdir -p $out/include From 4e8d1a8936cd6da86ae7757bdd5610f52a7e1a1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:36:51 +0200 Subject: [PATCH 0673/1522] subunit: use python3 --- pkgs/development/libraries/subunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index cb824decc6c..9cc61d20008 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, python3Packages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; + buildInputs = [ check cppunit perl python3Packages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; + propagatedBuildInputs = with python3Packages; [ testtools testscenarios ]; postFixup = "wrapPythonPrograms"; From 4735ed68add4cee2602dac5e23488d5e2504d8a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:44:29 +0200 Subject: [PATCH 0674/1522] linphone: remove unused python parameter --- .../networking/instant-messengers/linphone/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 1c2df3924ec..47ee2a68a51 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -37,7 +37,6 @@ , ortp , pango , pkg-config -, python , qtbase , qtgraphicaleffects , qtquickcontrols2 From af5e9694caa4062d71b32e29b5a9040134bb7ed7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:45:50 +0200 Subject: [PATCH 0675/1522] libtorrent-rasterbar-{1_1_x,1_2_x}: stay with python2 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496746af33c..9ea2c84b765 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17157,9 +17157,12 @@ in libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + python = python2; }; - libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; + libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { + python = python2; + }; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; From 857aba26ca2ec8eaa2729cad7e312546d64b3788 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:46:08 +0200 Subject: [PATCH 0676/1522] libtensorflow: refer to python3 --- 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 9ea2c84b765..f2b124b3398 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2001,8 +2001,8 @@ in }; libtensorflow = - if python.pkgs.tensorflow ? libtensorflow - then python.pkgs.tensorflow.libtensorflow + if python3.pkgs.tensorflow ? libtensorflow + then python3.pkgs.tensorflow.libtensorflow else libtensorflow-bin; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { From 48d060a81c025ca7d9f7ed135a66a03db8589f25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:52:47 +0200 Subject: [PATCH 0677/1522] lkl: use python3 --- pkgs/applications/virtualization/lkl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index aee2d493a70..f2481e25a8f 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive +{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive , buildPackages }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "lib" "out" ]; - nativeBuildInputs = [ bc bison flex python ]; + nativeBuildInputs = [ bc bison flex python3 ]; buildInputs = [ fuse libarchive ]; From a313d4c338db39c5c190c3250831cc45d6dcf8e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 17:00:43 +0200 Subject: [PATCH 0678/1522] lvtk: stay with python2 --- pkgs/development/libraries/audio/lvtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index cecae743da0..0ded707b3a1 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkg-config python wafHook ]; + nativeBuildInputs = [ pkg-config python2 wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; From fce33c36b10d70368d541b4f52d51c1d3034f08f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 17:17:17 +0200 Subject: [PATCH 0679/1522] lyx: use python3 --- pkgs/applications/misc/lyx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 7cab86df967..e736c235c45 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, mkDerivation, pkg-config, python, file, bc +{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -14,7 +14,7 @@ mkDerivation rec { # LaTeX is used from $PATH, as people often want to have it with extra pkgs nativeBuildInputs = [ pkg-config ]; buildInputs = [ - qtbase qtsvg python file/*for libmagic*/ bc + qtbase qtsvg python3 file/*for libmagic*/ bc hunspell makeWrapper # enchant ]; @@ -31,7 +31,7 @@ mkDerivation rec { # python is run during runtime to do various tasks qtWrapperArgs = [ - " --prefix PATH : ${python}/bin" + " --prefix PATH : ${python3}/bin" ]; meta = with lib; { From e95ca01176dadd1d5fe4b98876ba6ab43df12d8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 17:17:47 +0200 Subject: [PATCH 0680/1522] llvmPackages_rocm: use python3 --- pkgs/development/compilers/llvm/rocm/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 45c0bfda192..d6bfd07d444 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, python +, python3 , llvm , clang-tools-extra_src ? null , lld @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "clang"; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ llvm ]; From 53d4f53a145f90ed043dc6ad41d6e18425dc9d5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:24:23 +0200 Subject: [PATCH 0681/1522] mapnik: use python3 for tools but use python for the bindings. --- pkgs/development/libraries/mapnik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 45d5e0a40eb..191a741a9f1 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff -, libwebp, libxml2, proj, python, sqlite, zlib +, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff From c8dc92278892a5461b037ab595398d14e265fc1e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:33:38 +0200 Subject: [PATCH 0682/1522] matrix-appservice-discord: use python3 --- pkgs/servers/matrix-appservice-discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index 7b7a67821f9..5b0c8d10abb 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python, nodejs }: +{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python3, nodejs }: assert lib.versionAtLeast nodejs.version "12.0.0"; @@ -26,7 +26,7 @@ in mkYarnPackage rec { pkgConfig = { better-sqlite3 = { - buildInputs = [ python ]; + buildInputs = [ python3 ]; postInstall = '' # build native sqlite bindings npm run build-release --offline --nodedir="${nodeSources}" From 196d3b8291a4dc27dc2cc789c4b4942083f885b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:37:28 +0200 Subject: [PATCH 0683/1522] openjfx11: stay with python2 --- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 228dbf9b14e..1d741fd8be2 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby , openjdk11-bootstrap }: let @@ -20,7 +20,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; dontUseCmakeConfigure = true; From 8f6b07c2236eb761279bbcbc70c312adb9ae08ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:45:42 +0200 Subject: [PATCH 0684/1522] maxima: use strictDeps and python3 --- .../science/math/maxima/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 01f086c92c7..7edbeaee085 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook , rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: @@ -6,9 +6,11 @@ let name = "maxima"; version = "5.44.0"; + lisp-compiler = if ecl-fasl then ecl else sbcl; + searchPath = lib.makeBinPath - (lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); + (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ inherit version; @@ -19,11 +21,18 @@ stdenv.mkDerivation ({ sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + lisp-compiler + makeWrapper + python3 + texinfo + ]; - buildInputs = lib.filter (x: x != null) [ - sbcl ecl texinfo perl python makeWrapper - gnuplot # required in the test suite + strictDeps = true; + + checkInputs = [ + gnuplot ]; postPatch = '' From 6103f78416539ba2aee61e720ced39ba925bffca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:49:04 +0200 Subject: [PATCH 0685/1522] me_cleaner: stay with python2 --- pkgs/tools/misc/me_cleaner/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix index 308b69c9d74..f5e8f152473 100644 --- a/pkgs/tools/misc/me_cleaner/default.nix +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, python2, fetchFromGitHub }: -buildPythonPackage rec { +python2.pkgs.buildPythonPackage rec { pname = "me_cleaner"; version = "1.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b124b3398..f82daacf710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12552,7 +12552,7 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; - me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; + me_cleaner = callPackage ../tools/misc/me_cleaner { }; mesos-dns = callPackage ../servers/mesos-dns { }; From 405307cf668eb948323c1299f0433507e07f8d29 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:50:57 +0200 Subject: [PATCH 0686/1522] menumaker: stay with python2 might work with 3, not tested. --- pkgs/applications/misc/menumaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 086db35a5ad..8d018a67d37 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "menumaker"; version = "0.99.12"; From a6284f721df4c7399bb1aebb12f5f97e1d9ed017 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:54:52 +0200 Subject: [PATCH 0687/1522] mergerfs-tools: use python3 version of xattr --- pkgs/tools/filesystems/mergerfs/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index e559fd9d4cd..6e11c6513da 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, coreutils, makeWrapper -, rsync, python3, pythonPackages }: +, rsync, python3 }: stdenv.mkDerivation rec { pname = "mergerfs-tools"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = with lib; '' wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} - wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} + wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ python3.pkgs.xattr ]} ''; meta = with lib; { From 4c61dc3247800310838b47c1189388d46ee47915 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:56:09 +0200 Subject: [PATCH 0688/1522] mididings: stay with python2 --- pkgs/tools/audio/mididings/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index f220fed208f..9913ea911eb 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }: +{ lib, python2Packages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }: -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { version = "2015-11-17"; pname = "mididings"; @@ -12,8 +12,8 @@ pythonPackages.buildPythonApplication { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ]; - propagatedBuildInputs = with pythonPackages; [ decorator ] + buildInputs = [ glib alsa-lib libjack2 python2Packages.boost ]; + propagatedBuildInputs = with python2Packages; [ decorator ] # for livedings ++ [ tkinter pyliblo ] # for mididings.extra @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication { preBuild = with lib.versions; '' substituteInPlace setup.py \ - --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" + --replace boost_python "boost_python${major python2Packages.python.version}${minor python2Packages.python.version}" ''; meta = with lib; { From 32ab27637e196f9a6d1aa5d7fbdf629ba5df15ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 18:59:30 +0200 Subject: [PATCH 0689/1522] mimms: stay with python2 not tested with 3 --- pkgs/applications/audio/mimms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 9811998c368..28ec09eba9c 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, lib, pythonPackages, libmms }: +{ fetchurl, lib, python2Packages, libmms }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "mimms"; version = "3.2"; From 54fb628d7ce75e87cd6d68bab7c154771318998c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 27 Jul 2021 12:59:22 -0400 Subject: [PATCH 0690/1522] cloudflared: 2021.7.0 -> 2021.7.3 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 374062f0d80..b98f6a79822 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.7.0"; + version = "2021.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE="; + sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E="; }; vendorSha256 = null; From dc04d776a3261bf2406a762921525dfa531acd57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 19:16:20 +0200 Subject: [PATCH 0691/1522] mirtk: use python3 --- pkgs/development/libraries/science/biology/mirtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 0d23489696f..d2615b391ff 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python vtk zlib tbb ]; + buildInputs = [ boost eigen python3 vtk zlib tbb ]; meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; From afa9c4ae684a4539a677f80539c1c2640fbaa1dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 19:16:48 +0200 Subject: [PATCH 0692/1522] mlt: requires python3 --- pkgs/development/libraries/mlt/default.nix | 6 ++++-- pkgs/top-level/python-packages.nix | 2 +- pkgs/top-level/python2-packages.nix | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 8bd2bc80362..a4f0289cd58 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,7 +3,7 @@ , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 , jack2, ladspa-sdk, swig, which, ncurses -, enablePython ? false, python +, enablePython ? false, python3 }: stdenv.mkDerivation rec { @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional enablePython ncurses; nativeBuildInputs = [ pkg-config makeWrapper which ] - ++ lib.optionals enablePython [ python swig ]; + ++ lib.optionals enablePython [ python3 swig ]; + + strictDeps = true; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9708579cabc..5e3a91253e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4512,7 +4512,7 @@ in { mlxtend = callPackage ../development/python-modules/mlxtend { }; mlt = toPythonModule (pkgs.mlt.override { - inherit python; + python3 = python; enablePython = true; }); diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 48ddb18291a..5bf6803b4e7 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -281,6 +281,8 @@ with self; with super; { metaphone = callPackage ../development/python-modules/metaphone { }; + mlt = disabled super.mlt; + mock = callPackage ../development/python-modules/mock/2.nix { }; # Needed here because moinmoin is loaded as a Python library. From 9c9f7fd11c7fb1f81aead006d73c894ac7768ba2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:05:17 +0200 Subject: [PATCH 0693/1522] moosefs: use strictDeps and python3 --- pkgs/tools/filesystems/moosefs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index ee0d5eedc92..e07ca270b5c 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub -, makeWrapper -, python +, python3 , fuse , pkg-config , libpcap @@ -19,10 +18,14 @@ stdenv.mkDerivation rec { sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ + pkg-config + ]; buildInputs = - [ fuse libpcap zlib python ]; + [ fuse libpcap zlib python3 ]; + + strictDeps = true; buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; From a949d53b2b3e6017b55a5252f24c70060ea650d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:05:45 +0200 Subject: [PATCH 0694/1522] python3Packages.subunit: use postPatch --- pkgs/development/python-modules/subunit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index f4622689187..c59626fc85c 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py ''; - patchPhase = '' + postPatch = '' sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py ''; } From 63311143089410453f2ad732ce840dfb9ecbd60a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:08:46 +0200 Subject: [PATCH 0695/1522] munin: stay with python2 not tested with 3 --- pkgs/servers/monitoring/munin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index c25c23671ba..a86dd8471ce 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages -, python, ruby, jre, nettools, bc +, python2, ruby, jre, nettools, bc }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { perlPackages.ListMoreUtils perlPackages.LWP perlPackages.DBDPg - python + python2 ruby jre # tests @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { "DESTDIR=$(out)" "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" "PERL=${perlPackages.perl.outPath}/bin/perl" - "PYTHON=${python.outPath}/bin/python" + "PYTHON=${python2.outPath}/bin/python" "RUBY=${ruby.outPath}/bin/ruby" "JAVARUN=${jre.outPath}/bin/java" "PLUGINUSER=munin" From 56a031d2af74619db9c9b247319af65bc0f9b7e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:11:52 +0200 Subject: [PATCH 0696/1522] mygpoclient: use python3 version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82daacf710..8c2154bfa74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17575,7 +17575,7 @@ in mvapich = callPackage ../development/libraries/mvapich { }; - mygpoclient = pythonPackages.mygpoclient; + mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; mygui = callPackage ../development/libraries/mygui { ogre = ogre1_9; From c7d03061da47aa0c3febcd5adf8c87912190356e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:20:18 +0200 Subject: [PATCH 0697/1522] neard: stay with python2 not tested with python3. --- pkgs/servers/neard/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index a638c063852..670806db17e 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }: stdenv.mkDerivation rec { name = "neard-0.16"; @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; + nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ]; + buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]); + pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ]; + + strictDeps = true; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; From 80abab6fa835584e439e5c136ae2a15cf7c23411 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:25:52 +0200 Subject: [PATCH 0698/1522] nano-wallet: use python3 --- pkgs/applications/blockchains/nano-wallet/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 8e8d3da92be..e13a77c7d24 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL -, qtbase, python }: +, qtbase, python3 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = let options = { - PYTHON_EXECUTABLE = "${python}/bin/python"; + PYTHON_EXECUTABLE = "${python3.interpreter}"; NANO_SHARED_BOOST = "ON"; BOOST_ROOT = boost; RAIBLOCKS_GUI = "ON"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; + strictDeps = true; + buildPhase = '' runHook preBuild make nano_wallet From f16520b1d5c64acb1b899e77a1929b9c443ee607 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:27:05 +0200 Subject: [PATCH 0699/1522] opencv4: use python3 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2154bfa74..318b65ce49d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17787,6 +17787,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; + pythonPackages = python3Packages; }; opencv = opencv4; From b3b31074b2ab37f5ed4d255e2cba9625a381003d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:34:44 +0200 Subject: [PATCH 0700/1522] python interpreters: use correct python when calling pythonPackages. --- pkgs/development/interpreters/python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f1784c834c2..1b4dc22cbd6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -85,6 +85,7 @@ with pkgs; (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) { overrides = packageOverrides; + python = self; }; in rec { isPy27 = pythonVersion == "2.7"; From 238fa78d880b3d5de4865c92bd2a7167e46ebc78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 20:43:41 +0200 Subject: [PATCH 0701/1522] mininet: use python3 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318b65ce49d..9fd556e0370 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30707,7 +30707,9 @@ in scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; + mininet = callPackage ../tools/virtualization/mininet { + python = python3; + }; msieve = callPackage ../applications/science/math/msieve { }; From b8c370fedfb161e3694619625306c8a2ae34483c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 19:35:11 +0200 Subject: [PATCH 0702/1522] tools/{X11/video/virtualization}: replace name with pname&version --- pkgs/tools/X11/imwheel/default.nix | 5 +++-- pkgs/tools/X11/keynav/default.nix | 3 ++- pkgs/tools/X11/x2vnc/default.nix | 7 ++++--- pkgs/tools/X11/x2x/default.nix | 7 ++++--- pkgs/tools/X11/xbrightness/default.nix | 7 ++++--- pkgs/tools/X11/xcalib/default.nix | 5 +++-- pkgs/tools/X11/xchainkeys/default.nix | 5 +++-- pkgs/tools/X11/xdg-user-dirs/default.nix | 5 +++-- pkgs/tools/X11/xkbset/default.nix | 5 +++-- pkgs/tools/X11/xmagnify/default.nix | 7 ++++--- pkgs/tools/video/dvgrab/default.nix | 3 ++- pkgs/tools/video/mjpegtools/default.nix | 5 +++-- pkgs/tools/video/swfmill/default.nix | 5 +++-- pkgs/tools/video/vncrec/default.nix | 3 ++- pkgs/tools/virtualization/aws/default.nix | 3 ++- pkgs/tools/virtualization/ec2-api-tools/default.nix | 5 +++-- 16 files changed, 48 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index 27a545a95cd..7aa8a6cba6a 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }: stdenv.mkDerivation rec { - name = "imwheel-1.0.0pre12"; + pname = "imwheel"; + version = "1.0.0pre12"; src = fetchurl { - url = "mirror://sourceforge/imwheel/${name}.tar.gz"; + url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz"; sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3"; }; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 75b5bc2356a..077e41b10be 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -3,7 +3,8 @@ let release = "20180821"; in stdenv.mkDerivation { - name = "keynav-0.${release}.0"; + pname = "keynav"; + version = "0.${release}.0"; src = fetchFromGitHub { owner = "jordansissel"; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 10519128a9d..ed4a83fc8de 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, xorg }: -stdenv.mkDerivation { - name = "x2vnc-1.7.2"; +stdenv.mkDerivation rec { + pname = "x2vnc"; + version = "1.7.2"; src = fetchurl { - url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz"; + url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz"; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index 01169e68f6e..f473344ad38 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }: -stdenv.mkDerivation { - name = "x2x-1.27"; +stdenv.mkDerivation rec { + pname = "x2x"; + version = "1.27"; src = fetchurl { - url = "https://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz"; + url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz"; sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj"; }; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index 1bb95699f64..1445c60ccb1 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, imake, gccmakedep , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "xbrightness"; + version = "0.3-mika-akk"; - name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz"; + url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz"; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 78804d02791..09d5cde88fe 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }: stdenv.mkDerivation rec { - name = "xcalib-0.10"; + pname = "xcalib"; + version = "0.10"; src = fetchFromGitHub { owner = "OpenICC"; repo = "xcalib"; - rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d"; + rev = version; sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr"; }; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 06428393b2a..5c154f8a111 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { - name = "xchainkeys-0.11"; + pname = "xchainkeys"; + version = "0.11"; src = fetchurl { - url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz"; + url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz"; sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn"; }; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 991b9be2238..a5eb5e0ee0a 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }: stdenv.mkDerivation rec { - name = "xdg-user-dirs-0.17"; + pname = "xdg-user-dirs"; + version = "0.17"; src = fetchurl { - url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz"; + url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz"; sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix index 132b7a11122..31bcfc10d6d 100644 --- a/pkgs/tools/X11/xkbset/default.nix +++ b/pkgs/tools/X11/xkbset/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, libX11 }: stdenv.mkDerivation rec { - name = "xkbset-0.5"; + pname = "xkbset"; + version = "0.5"; src = fetchurl { - url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz"; + url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz"; sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172"; }; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index b4df0f00342..a9cb715be39 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitLab, libX11, xorgproto }: -stdenv.mkDerivation { - name = "xmagnify-0.1.0"; +stdenv.mkDerivation rec { + pname = "xmagnify"; + version = "0.1.0"; src = fetchFromGitLab { owner = "amiloradovsky"; repo = "magnify"; - rev = "0.1.0"; # 56da280173e9d0bd7b3769e07ba485cb4db35869 + rev = version; sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh"; }; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 18088eb6c30..9f4b8832f39 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -2,7 +2,8 @@ , libavc1394, pkg-config, autoreconfHook }: stdenv.mkDerivation { - name = "dvgrab-2016-05-16"; + pname = "dvgrab"; + version = "2016-05-16"; src = fetchFromGitHub { # mirror of original project with some build fixes diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 45f63dc7727..29dad791bc6 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -8,10 +8,11 @@ # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no stdenv.mkDerivation rec { - name = "mjpegtools-2.1.0"; + pname = "mjpegtools"; + version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; + url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz"; sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6"; }; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index c5e777f7531..dbad79e61ad 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "swfmill-0.3.3"; + pname = "swfmill"; + version = "0.3.3"; src = fetchurl { - url = "http://swfmill.org/releases/${name}.tar.gz"; + url = "http://swfmill.org/releases/swfmill-${version}.tar.gz"; sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r"; }; diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 5a60fc4c5d2..02608ac16b2 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation { - name = "vncrec-0.2"; # version taken from Arch AUR + pname = "vncrec"; + version = "0.2"; # version taken from Arch AUR src = fetchurl { url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz"; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index d3a5cbf10e1..d09e001ec6e 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, perl, curl }: stdenv.mkDerivation { - name = "aws-2019.06.18"; + pname = "aws"; + version = "2019.06.18"; src = fetchurl { url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws"; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 475b97abdcc..babcbcfc6c3 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ec2-api-tools-1.7.5.1"; + pname = "ec2-api-tools"; + version = "1.7.5.1"; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.zip"; + url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip"; sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; From 1965bbf76acf84e8335146b10792320b1076ee28 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 27 Jul 2021 11:44:48 -0700 Subject: [PATCH 0703/1522] python3Packages.aiowinreg: prompt_toolkit -> prompt-toolkit --- pkgs/development/python-modules/aiowinreg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 3f9faad56e0..3bfbbf7c12b 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , winacl -, prompt_toolkit +, prompt-toolkit }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - prompt_toolkit + prompt-toolkit winacl ]; From b8d14783c2302bf21e90e74f06b78f29513a5a76 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Jul 2021 22:07:19 -0400 Subject: [PATCH 0704/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4a7201c2906..fb51f4dab7d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-24"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7"; - sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5"; + rev = "393fbc24cab3fdfaffca85e286e01c84bcf748c9"; + sha256 = "08pcp6dh6kibppndf97nzj90iw1qv51s4zk3vq59z16w32zwkzda"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-07-08"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "f3ca66b6a2a42eb01ffc255ac03039177b888951"; - sha256 = "08wzq5i86wxdyhl2yrl9ggfhng92pfx5d7rhmxfcm4abnnl9sj07"; + rev = "d5bf63e50c1c7923f1de2d10d8d822f6eb8c872e"; + sha256 = "14h8kd01674i82npc2b58ivhj2d80nb1x8v0j7ag5c5n24p1nphf"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2748,12 +2748,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743"; - sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak"; + rev = "e9f4d03aaacc8af6ebd17833dfb5804a6abbd021"; + sha256 = "0k86j2rq5ykav8i6gna91v893j4panyr7l2cyp6vrrkj441bx5ww"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3432,12 +3432,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "b7209e7657dcc786b844a920894a517571da1317"; - sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr"; + rev = "f58f77dee66babac1a859c2b552797d8128e1f86"; + sha256 = "12jway928hhm8s9sbwaqzjjzdgrpvz1gr09q4q5wxicfqaln4cd1"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3828,12 +3828,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "65a059b34d5bc77db01372c589f582b17524a2f9"; - sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx"; + rev = "296fe9b8611061a1054c05922dbaa134f2b712b2"; + sha256 = "0qxdd3z4696xf3nnaxmww3gs0ijfi2bw5aq9ywnqxpb3n734iapd"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4044,12 +4044,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-22"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "fdf005f5697742da121391d31ad42a47842264f9"; - sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas"; + rev = "92dcbe5b1052c2cec1b5455a624710dd1e899777"; + sha256 = "0mh3ghbz38inwlcv4sqrpmyzwxr62j10d4873p9d5zb6j68ajxn9"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4489,12 +4489,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-23"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0"; - sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f"; + rev = "27e1555146331f42ebb07fb7ba0a196b75e03dde"; + sha256 = "13dr30nifxrkjj7rf8dyv9p942dinjcpiy24sbfwni2ibmyf2p52"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -9755,12 +9755,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-18"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "830659752b8914f6b4567a00448901246e4d1841"; - sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9"; + rev = "d1439f47a481b8665fbfa8511c6ae4e7514bdfc7"; + sha256 = "0brs97yhnfbkyyz6fzhs7s7kjwgwrw6kkinyycq51idxqdqvk4s8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 6d118402f2f0ee2353ac0b1703d40adceda8155e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Jul 2021 22:07:37 -0400 Subject: [PATCH 0705/1522] vimPlugins.goto-preview: init at 2021-06-20 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fb51f4dab7d..b2d5a726fa2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1941,6 +1941,18 @@ final: prev: meta.homepage = "https://github.com/buoto/gotests-vim/"; }; + goto-preview = buildVimPluginFrom2Nix { + pname = "goto-preview"; + version = "2021-06-20"; + src = fetchFromGitHub { + owner = "rmagatti"; + repo = "goto-preview"; + rev = "39aa1e0334b577c59c4f7177ef36624bdd83f100"; + sha256 = "0rr22r1yp7s3hqfdqf48wlv2bqw9j5izwgm3np7x1ygp85xizcbg"; + }; + meta.homepage = "https://github.com/rmagatti/goto-preview/"; + }; + goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; version = "2020-08-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e134963d453..fc699509360 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -575,6 +575,7 @@ RishabhRD/popfix rktjmp/fwatch.nvim@main rktjmp/lush.nvim@main rmagatti/auto-session@main +rmagatti/goto-preview@main rodjek/vim-puppet romainl/vim-cool romainl/vim-qf From 59297dde88aef30831b0200e181a32c7ff0f86c7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 27 Jul 2021 13:38:31 -0500 Subject: [PATCH 0706/1522] yosys: 0.9+4052 -> 0.9+4221 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a0c02e26db0..08f0ee22714 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+4052"; + version = "0.9+4221"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "687f381b6985d9dda7e11535628e2fafff267af5"; - sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf"; + rev = "9600f20be887b707f6d5d3f74dec58b336e2464e"; + sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h"; }; enableParallelBuilding = true; From 9df6e2b1cd72029d321d27bf8bf35f738910d1b3 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 27 Jul 2021 08:49:53 +0200 Subject: [PATCH 0707/1522] postfix: 3.6.1 -> 3.6.2 The source url has also been updated to the "multiple locations (Europe)" url published on the http://www.postfix.org/download.html page. --- pkgs/servers/mail/postfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 16166b73f48..fb376d52b1d 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw="; + url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; + sha256 = "sha256-UHMj0g17P3BfSc+MB9Q3xtgJC+0H4Vo8DsQF7a1Up9Q="; }; nativeBuildInputs = [ makeWrapper m4 ]; From 69a63587e04874f98e742aa2e777aad9403687d8 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 27 Jul 2021 08:54:51 +0200 Subject: [PATCH 0708/1522] postfix: add lewo as maintainer --- pkgs/servers/mail/postfix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index fb376d52b1d..6af26256772 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -101,6 +101,6 @@ in stdenv.mkDerivation rec { description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ globin dotlambda ]; + maintainers = with maintainers; [ globin dotlambda lewo ]; }; } From e97a72033852c1e5e9dbd34ebbd9fc2c5d461d13 Mon Sep 17 00:00:00 2001 From: Maximilian Huber Date: Tue, 27 Jul 2021 21:48:54 +0200 Subject: [PATCH 0709/1522] freeplane: 1.8.11 -> 1.9.5 Signed-off-by: Maximilian Huber --- pkgs/applications/misc/freeplane/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index f9c04fedfdd..37c4abb3764 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -2,13 +2,13 @@ let pname = "freeplane"; - version = "1.8.11"; + version = "1.9.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "07xjx9pf62dvy8lx6vnbwwcn1zqy89cmdmwy792k7gb12wz81nnc"; + sha256 = "qfhhmF3mePxcL4U8izkEmWaiaOLi4slsaymVnDoO3sY="; }; deps = stdenv.mkDerivation { @@ -31,7 +31,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0r7f6713m0whh5hlk1id7z9j5v9494r41sivn9fzl63q70kzz92g"; + outputHash = "xphTzaSXTGpP7vI/t4oIiv1ZpbekG2dFRzyl3ub6qnA="; }; # Point to our local deps repo From 858b0157e56426ee0d56faae393fc85b361ffd90 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Jul 2021 13:44:58 -0700 Subject: [PATCH 0710/1522] discourseAllPlugins: add discourse-calendar --- .../discourse/plugins/all-plugins.nix | 1 + .../plugins/discourse-calendar/Gemfile | 5 ++ .../plugins/discourse-calendar/Gemfile.lock | 27 +++++++ .../plugins/discourse-calendar/default.nix | 18 +++++ .../plugins/discourse-calendar/gemset.nix | 76 +++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile create mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock create mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix create mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index f64fbb137df..e762d3907f7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -3,6 +3,7 @@ let callPackage = newScope args; in { + discourse-calendar = callPackage ./discourse-calendar {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; discourse-github = callPackage ./discourse-github {}; discourse-math = callPackage ./discourse-math {}; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile new file mode 100644 index 00000000000..8c192fc0385 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem 'rrule', '0.4.2', require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock new file mode 100644 index 00000000000..b3c21c857d4 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + concurrent-ruby (1.1.9) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + minitest (5.14.4) + rrule (0.4.2) + activesupport (>= 4.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.4.2) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + rrule (= 0.4.2) + +BUNDLED WITH + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix new file mode 100644 index 00000000000..f4f179c07c0 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-calendar"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-calendar"; + rev = "567712d8c02640574fbab081eb54b2f26349c88d"; + sha256 = "sha256-r6rfbi/ScbM+SiAjeijXmr5R9wpJxzxGl52X5oV++5w="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-calendar"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Adds the ability to create a dynamic calendar in the first post of a topic"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix new file mode 100644 index 00000000000..26db0e6fd10 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -0,0 +1,76 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + type = "gem"; + }; + version = "6.1.4"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + type = "gem"; + }; + version = "1.8.10"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + type = "gem"; + }; + version = "5.14.4"; + }; + rrule = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w338b7dgvd144fl5b8xy2lfc6zgbcjac7b4z158jc8h070yzc9v"; + type = "gem"; + }; + version = "0.4.2"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + type = "gem"; + }; + version = "2.0.4"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; + }; +} From e91e8a8939ea96919dcc7235d86b2a021af476e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 27 Jul 2021 16:26:45 -0300 Subject: [PATCH 0711/1522] whitesur-gtk-theme: 2021-06-23 -> 2021-07-27 --- pkgs/data/themes/whitesur/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index e9691eaad7d..c158cc8a00c 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , glib +, gnome-shell , gnome-themes-extra , libxml2 , sassc @@ -10,17 +11,18 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-06-23"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "075fw57mv6zadq4dryn8bg2b3vq8inmisq18s758cv53pprxh9hw"; + sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; }; nativeBuildInputs = [ glib + gnome-shell libxml2 sassc util-linux @@ -35,6 +37,9 @@ stdenv.mkDerivation rec { # Do not provide `sudo`, as it is not needed in our use case of the install script substituteInPlace lib-core.sh --replace '$(which sudo)' false + + # Provides a dummy home directory + substituteInPlace lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab47db86f9..7737de885b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22939,7 +22939,9 @@ in weather-icons = callPackage ../data/fonts/weather-icons { }; - whitesur-gtk-theme = callPackage ../data/themes/whitesur { }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { + inherit (gnome) gnome-shell; + }; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; From f65e1d8793c76766c45d04a507196dbff4a4e10f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 27 Jul 2021 23:11:09 +0200 Subject: [PATCH 0712/1522] ecwolf: fix compilation on darwin --- pkgs/games/ecwolf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 519398a738b..b7bb382db83 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h + '' + # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store + + lib.optionalString (stdenv.isDarwin) '' + sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt ''; # Install the required PK3 file in the required data directory @@ -46,7 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; - # Darwin is untested (supported by upstream) platforms = platforms.all; }; } From 47abe47b55fc158cdcbe13245e6e390087b86586 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Wed, 28 Jul 2021 00:10:11 +0200 Subject: [PATCH 0713/1522] streamlink: 2.2.0 -> 2.3.0 --- pkgs/applications/video/streamlink/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index fde2833c98c..8097c5dbe92 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "streamlink"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v"; + sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g="; }; checkInputs = with python3.pkgs; [ @@ -35,9 +35,11 @@ python3.pkgs.buildPythonApplication rec { ffmpeg ]; - disabledTests = [ - "test_plugin_not_in_removed_list" - ]; + # note that upstream currently uses requests 2.25.1 in Windows builds + postPatch = '' + substituteInPlace setup.py \ + --replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0' + ''; meta = with lib; { homepage = "https://github.com/streamlink/streamlink"; From 8b8d9bb61e8ed115aefe5477562125c6f1bedb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 28 Jul 2021 01:16:03 +0300 Subject: [PATCH 0714/1522] sakura: 3.8.2 -> 3.8.3 --- pkgs/applications/terminal-emulators/sakura/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index fbebf6590d0..44c34d76f46 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk="; + sha256 = "sha256-UEDc3TjoqjLNZtWGlIZB3VTVQC+31AP0ASQH0fu+U+Q="; }; nativeBuildInputs = [ From 2d1dbaa617424f17f8daa7ec4a25ab3489afdd95 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 28 Jul 2021 00:58:59 +0200 Subject: [PATCH 0715/1522] mu: 1.4.15 -> 1.6.0 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 4553063929f..da7ef58f199 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.15"; + version = "1.6.0"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; + sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; }; postPatch = lib.optionalString (batchSize != null) '' From 9a43210e4f45cb3d230ca49a81bf1793adc78ac7 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 28 Jul 2021 04:45:34 +0530 Subject: [PATCH 0716/1522] authy: 1.8.3 -> 1.8.4 --- pkgs/applications/misc/authy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index dc8786dcce2..f242794bff7 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -11,8 +11,8 @@ in stdenv.mkDerivation rec { pname = "authy"; - version = "1.8.3"; - rev = "5"; + version = "1.8.4"; + rev = "6"; buildInputs = [ alsa-lib @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "1yfvkmy34mc1dan9am11yka88jv7a4dslsszy4kcc8vap4cjmgpn"; + sha256 = "07h4mgp229nlvw9ifiiyzph26aa61w4x4f1xya8vw580blrk1ph9"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; From a5e8f4817fa6fd3526e72120aeba22b1279d80a7 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 28 Jul 2021 05:22:12 +0530 Subject: [PATCH 0717/1522] google-cloud-sdk: 348.0.0 -> 350.0.0 --- .../admin/google-cloud-sdk/cloud_sql_proxy_path.patch | 6 +++--- pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch index aec4be2ec19..f92896e81c9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch +++ b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch @@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap index 0d88ffe..814a436 100644 --- a/lib/googlecloudsdk/api_lib/sql/instances.py +++ b/lib/googlecloudsdk/api_lib/sql/instances.py -@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone): +@@ -85,18 +85,19 @@ def GetRegionFromZone(gce_zone): def _GetCloudSqlProxyPath(): """Determines the path to the cloud_sql_proxy binary.""" sdk_bin_path = config.Paths().sdk_bin_path @@ -14,7 +14,7 @@ index 0d88ffe..814a436 100644 - 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) - return proxy_path - else: -- raise exceptions.ToolException( +- raise sql_exceptions.SqlProxyNotFound( - 'A Cloud SQL Proxy SDK root could not be found. Please check your ' - 'installation.') - return os.path.join(sdk_bin_path, 'cloud_sql_proxy') @@ -28,7 +28,7 @@ index 0d88ffe..814a436 100644 + 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) + return proxy_path + -+ raise exceptions.ToolException( ++ raise sql_exceptions.SqlProxyNotFound( + 'A Cloud SQL Proxy SDK root could not be found. Please check your ' + 'installation.') diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f461a5c30ed..924c6c745ce 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,23 +21,23 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs"; + sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr"; + sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3"; + sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "348.0.0"; + version = "350.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From a931b4c84e3e35c38b14baf7f70eabff7789b511 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 27 Jul 2021 23:55:56 +0000 Subject: [PATCH 0718/1522] nodePackages.pxder: init at 2.12.5 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 2577 +++++++++-------- 2 files changed, 1373 insertions(+), 1205 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1bf813952ea..1f2941498af 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -199,6 +199,7 @@ , "purescript-language-server" , "purescript-psa" , "purty" +, "pxder" , "pyright" , "quicktype" , "react-native-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8c972680895..45cc5cdeac6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.2" = { + "@angular-devkit/architect-0.1201.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.2"; + version = "0.1201.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.2.tgz"; - sha512 = "hR5kI03WoeEY9dkAsQNLlhL1iEFC2L77ansaKquN+HCAeOGHby4w95suSlZUAg0r6ZhPhPH0tkIRZXU9NMa09g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.3.tgz"; + sha512 = "+k8bKcc+j6ml4zxw0buwE3dO4mVtVT57Ro8fxc8GIyJMVDD9bogNB3y5ll8lJa0kP5HJ0tFCUi+hd8CISE+aSg=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -67,22 +67,13 @@ let sha512 = "zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA=="; }; }; - "@angular-devkit/core-12.1.1" = { + "@angular-devkit/core-12.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.1.1"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz"; - sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; - }; - }; - "@angular-devkit/core-12.1.2" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "12.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.2.tgz"; - sha512 = "TeaRbvsNEeAkRJcIBlT6yUNh0vaVVBGBYfXYFIMg/I04ex/HI0ApEowu78GeTzCqlE0r4t+WaGT46m7+NIljKg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.3.tgz"; + sha512 = "69bM4wYUxbHUuZvx97pxVxzNYPrUPsMuszHpYdS6/lsAgpa15EDuBoQHgob4chFiQaNoG9mzOsumlUkoI3mEbg=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -94,31 +85,22 @@ let sha512 = "iW3XuDHScr3TXuunlEjF5O01zBpwpLgfr1oEny8PvseFGDlHK4Nj8zNIoIn3Yg936aiFO4GJAC/UXsT8g5vKxQ=="; }; }; - "@angular-devkit/schematics-12.1.1" = { + "@angular-devkit/schematics-12.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.1.1"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz"; - sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.3.tgz"; + sha512 = "QTfGurkNDdEwNheoe1lILWc4YUNSbqOeXRRkwFp1+QwxwlxXoeJ1zNMAo8ytQodnBRsomw7Wu9l1xSWfOL25nA=="; }; }; - "@angular-devkit/schematics-12.1.2" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "12.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.2.tgz"; - sha512 = "/UGcAJChq+g7wf46Exr5iIyuVw3j4TxTIntTpuKg/z/xf9Y+8mzJAZgGittu/yFcHAJ9aYcOHctffrfEdV7QSA=="; - }; - }; - "@angular-devkit/schematics-cli-12.1.1" = { + "@angular-devkit/schematics-cli-12.1.3" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "12.1.1"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.1.tgz"; - sha512 = "mIwE9iD7RKnARNlm39Ao3WtXqUFkemX77AHuqWUatQ4QsaOG3fxrTH8UYPP7Oi17J4wRipIkzia1cOIStluTVA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.3.tgz"; + sha512 = "fpf1448DoF9xIBUGx/DNeaw+KmvVIGzvAUwBu5yGIEjbw93ODcKqaE8DX7FNOe9kHvTEoqYaS/aCb2tHa4KS5A=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -1570,22 +1552,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.10.5" = { + "@bugsnag/browser-7.11.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.10.5.tgz"; - sha512 = "LxzQ0g8kbVq2YAoZkLM58pzNGqKWV/JxVTBCudHQVp92Wm9Wl7aFVMNPzUWCjp9T9XrNl3h9lrs6Bb127SomyA=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.11.0.tgz"; + sha512 = "iOKXJcZzdl9XsjJnL62S+T4OQZJ21mUMCXXOiMRlLnDCrw30BwD4BoAZ5s3oQ0VE0azrv/CUsXQzU63NUcsb+Q=="; }; }; - "@bugsnag/core-7.10.0" = { + "@bugsnag/core-7.11.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.10.0.tgz"; - sha512 = "sDa2nDxwsxHQx2/2/tsBWjYqH0TewCR8N/r5at6B+irwVkI0uts7Qc2JyqDTfiEiBXKVEXFK+fHTz1x9b8tsiA=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.11.0.tgz"; + sha512 = "xCaaONqQEAewifrvHC8v+yqN+Is4WNUcmK+sdeLcSb+ghLQ52y3BQ9nEDYzQxGuJRpv1zW3edCVIB4RN5eunSQ=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1597,22 +1579,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.10.5" = { + "@bugsnag/js-7.11.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.10.5.tgz"; - sha512 = "zLlZI+KoBUFTg5gmB9swUq17wVRm1kgY+DDuPGBCv9EqBV+ofXCdfZaSFIXles4fqTH/edN6WXeVrXZ2QnQStg=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.11.0.tgz"; + sha512 = "2KQZdiBUQRayrTweMrH8LuT+YFcZSYxPVb+RaAx5J1z3vWWFar7Lw3II34zA4e+zs/7wMSTKll5p+O7Wuz60/A=="; }; }; - "@bugsnag/node-7.10.1" = { + "@bugsnag/node-7.11.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.10.1"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.10.1.tgz"; - sha512 = "kpasrz/im5ljptt2JOqrjbOu4b0i5sAZOYU4L0psWXlD31/wXytk7im11QlNALdI8gZZBxIFsVo8ks6dR6mHzg=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.11.0.tgz"; + sha512 = "hwIG7LTE2lwaIjAes1JxYbjSoih9Eu07MSf+QJoMILY6tJoHMgxJ6v0/8AfldJeEAb753qBtlQLO8Rtr2LKHBA=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1633,13 +1615,13 @@ let sha512 = "yabxBeKkCJvj3gFQmHfsS/P6JaQMBqbyEZ1G67gTCtfkbOSEGib8KWsl3ZA+u5Fs2z5q9M4emLcCBHHPrmSG3g=="; }; }; - "@chemzqm/neovim-5.2.13" = { + "@chemzqm/neovim-5.3.4" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.2.13"; + version = "5.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.13.tgz"; - sha512 = "Eo1NBUj0e2vtOdNA7fpHra6xviDtwDWbYZiPzH5BWGwPtbRa0XjNGPMggcDCCKKKFRJgp9AaAfmT0LaqIyQvyg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.4.tgz"; + sha512 = "UVH9xoNSwhzsnEhhcIc4hoDpmyUhGcqBbco5tuISdGV4gEgOKN48c7WhVMmyrsSGogohVCwPHuDugdssUx66tQ=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -1795,166 +1777,166 @@ let sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.58" = { + "@electron-forge/async-ora-6.0.0-beta.59" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.58.tgz"; - sha512 = "osJoCA+Mxda0ToHnVh0c52UiqG0vYRChFp7YZnXSOFAyv/pJhO1gaSfJeTX+2ddki0SLvWQbgiJS5ysMax6Veg=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.59.tgz"; + sha512 = "vF60XyjHCyoyXHgkDi/tZy+OB9K6oSBio2at7B4pwZLO6nqstofkeAB+Gz/XUsVj9Nim+vHKtyXPzE0BTXQkZQ=="; }; }; - "@electron-forge/core-6.0.0-beta.58" = { + "@electron-forge/core-6.0.0-beta.59" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.58.tgz"; - sha512 = "mro6o/Oa2BETPfnzlWcpLJ5W5IWVuDokE7HZPzb9c6OTlcm/BWwl8pbfSZU19Q9SLsjou9hAuMwqzFveZRqGew=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.59.tgz"; + sha512 = "DRls31VQdVqGlna9EviHGKPchTkcbYPsRjOHSTrpksyOBQGck7for/hD1sxFREQ0r1qfKMR4xtmXbpXqzD8AyQ=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.58" = { + "@electron-forge/installer-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.58.tgz"; - sha512 = "VXA9cjCy9HHWyOcPGkO1Q5ym63AAfBLj/dL0Ezpw9r0/GKbgAN0g8HWgTwvs+rqWCdOAeyhIs+sTNI0rZQjc+A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.59.tgz"; + sha512 = "rmayhhJXj5aXed8xrkqOPTGF4J1DqZdTGo05RAVKoCmXv0iGBPUp0VvkiQinOvoBopr/5XorZTzCxgqps0UC6w=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.58" = { + "@electron-forge/installer-darwin-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.58.tgz"; - sha512 = "yfx97cL7+kB77xTeniNqRT4Va++uJX6j9kZwIwgaBFvtyLHZ1DChOlOI8IR6/qctzEtrZHW41DySFKXnsWYwuw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.59.tgz"; + sha512 = "2bssItA6CWgdL0G0/opG5usUdpCurCptdrA1bC8el6hlgv/v+hhRxalkPX9A38cWTB3w8VMhesDti+PpEYnniw=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.58" = { + "@electron-forge/installer-deb-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.58.tgz"; - sha512 = "Ukw1ccUtmTOKCiorYLJCAIWGT5zxpinH1W9UpxlMP3JhrzQXApm2rF7n9TEGowkTMtPciEsNXaF/F9lzjRqIpQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.59.tgz"; + sha512 = "z2095DHbNm81gClIn+fkid/Z8FKlBnAySIodDRFKNjNDaGcWcg2Wurv3vV32Xq4kBlsHRduhxA31IqnGY1zOvA=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.58" = { + "@electron-forge/installer-dmg-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.58.tgz"; - sha512 = "zw46CQSZ2Jihx7GBUcEPHGBQJD1pIBv6oTi5HPR7IkEJ7CQ/yjESAfDuu1UfQc9mgAKI+6s+QMuFZMW+ZMqYPg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.59.tgz"; + sha512 = "QAYJ0H31hVMiTQDQ9ngBkAFBbSTb9Okj3mKNsym+Yw4RlQJQEc9XWWOmiTjPHCB1LR/NmaescT06sJ6Kh0wtQw=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.58" = { + "@electron-forge/installer-exe-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.58.tgz"; - sha512 = "Z7gl1CX8WJ/9kr5As9y0GELK8/u754j7bzSlxmaeyhaO/vSf5+M/MjkEiPUQUKVmqZ77ngdzN/T4IfDGxpk++A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.59.tgz"; + sha512 = "FJ0vu65K6wBz8gY5RJNfLanXJEGMs2w/WrawSLh5xGH5GzOkWwq3RRD5AdN1CFRrkXSCBbgkdF6x+F1kdwH7OQ=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.58" = { + "@electron-forge/installer-linux-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.58.tgz"; - sha512 = "39A2mmhsJg2MEjYS+gtF/9FUYLKEoVmD6e4S+Rn0u9Yv/WOtdqOR0KR/pLYPtsiQKsGQA5nD2V2/ZN8N/qTxZw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.59.tgz"; + sha512 = "dB1A8j6oubCnAOQQzmtFWQWTMMSijeiClaGMricNOlC0wC2U3BHiBwrU2jJqxvy4M401kfgR9UiMs6mQNSPdPg=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.58" = { + "@electron-forge/installer-rpm-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.58.tgz"; - sha512 = "RyuKOGJoJknnp1C9WPFDc06Jw9K+KBM574byYegNiJPm5eGu+ZL/4tU9hD29YAtImyoGUy8L5dquApaC4d9zKA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.59.tgz"; + sha512 = "h/S5uMl8Vvg+Euv5xIhynjB8Q6biaBauJJoPtlALxSgSNuKnWWIuc4edwqY5F0cBIw3WO4tnmA/CE6gVWgGJMg=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.58" = { + "@electron-forge/installer-zip-6.0.0-beta.59" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.58.tgz"; - sha512 = "J71WhNtHdgFDNCYB2vm3vv4Zt/rCuXFgtXxXRowb+pT39wxyL35DjXsOi/a6j5Vb2lGq0mekMuHvpcD/4MSo8w=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.59.tgz"; + sha512 = "sTYv2NR0liFUUa9snpQs+SCWPMOUddVNK/sNBNkwU1q5jrO+ZjfTF22u5C5RawIWKgTrwxc3dFUYDYXh8753og=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.58" = { + "@electron-forge/maker-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.58.tgz"; - sha512 = "Ztbv99kznlOAK/iDM03Hu/XmdTEXmfLnkcfAJ+uBlRwJmFqiAcPWNlUrPWtCu5KKxHcOiDl6mN3OC/Ae2/3fMA=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.59.tgz"; + sha512 = "S/Qdu2kwio5PdZgoDDxZPo6JSf2YwcuXi3sy9Tw2Qj58+ZT9nOHn0C+JBHI8sREv3IRK52Axu1/RYkwtX9+V8w=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.58" = { + "@electron-forge/plugin-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.58.tgz"; - sha512 = "RMRjw8iRqkPChSMKdTSWCSubvDMSdJx+9Q9eO8n3GRN0jx4ExizhSIkxWpLSuze5dPyJXm3i24YUZjKOAR21EA=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.59.tgz"; + sha512 = "S30s/hfuIjKhCI2U4DwChjTx1ulGouqyorXpkHn3hlyfIXiC35T6fJ4Baw4Ng1W4BJrnZTmkVnglEHriFyV+Lg=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.58" = { + "@electron-forge/publisher-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.58.tgz"; - sha512 = "pnAZ7VXnL0vosYn4Au347WukXVTU0XLqUSQrjC4pYCMs7YumL4n+ya+JNy51D6SkcFMmd0nCU2ohz7IHo3ttcg=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.59.tgz"; + sha512 = "W+fKf8ehtHU6GQLZnpnyy1XS+9o2dw8PJcRBU+pQNEUcbFqBxcAJhLkfh6cGE2tQQ/rN+N77RMWEnLh9GjZMCQ=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.58" = { + "@electron-forge/shared-types-6.0.0-beta.59" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.58.tgz"; - sha512 = "Kz21kMg+EnINGK3H6qW4YXjFbXYvRv24O8PBnVaQiFXYIaUOXpaXj42QeytDXR/zMSA/jy78GoGodJLKE+gbdA=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.59.tgz"; + sha512 = "3tRCgfHqn5/8LijlVZsLb2xHm9W3qgzQ+KZNWXdYhb0Wj1+h6/sXn8rlxw10Mmb2mlYJEBW/NvIhpUDHgrGPXA=="; }; }; - "@electron-forge/template-base-6.0.0-beta.58" = { + "@electron-forge/template-base-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.58.tgz"; - sha512 = "U2iT2YUY9R2wz9RNkM9dAEzv5q+b3HSDJcqPy/B7lzT3lB9kni0HZTZKihZttlQYGRO6jj+9aWnLqaE3HmtgsQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.59.tgz"; + sha512 = "PHPSHlJ72fYlk8hrEj6+6ok0Xlxz3EeFkn2DSO4ol7fjFJI7cqbaSdNuDL55CmsWsWr/3RUqk/44pn5ywmvoOg=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.58" = { + "@electron-forge/template-typescript-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.58.tgz"; - sha512 = "x3dJeB4VDg18c69GOOUSk0LFRygaN2fDYxxjTZcGMlnsUTyypXkuaVIoEnMnB01TlY+gTPrsoITeB2e7ahSyaQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.59.tgz"; + sha512 = "GD+KyNv9y1ga6RbbXwlTNVsBeg055E/92Q5+1Y/dM+f2LLx0El0whXEwBf8eJ1+AXzrBsD0JQzAFkAIFyECLkQ=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.58" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.58.tgz"; - sha512 = "PTh0TW+ohn7BT+jjdQ3ubqFU9biP2ilfA36vA1Dgnv9/N8P1IBoEtXFJ4ilsMZOAfbp344ja9vsTFG+qGTsiDw=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.59.tgz"; + sha512 = "OPYA8eVbkFZFIpXCVTmDJntPTatzgaESyF2+eKwN1f6/j00kvHCbREL9zbXbji3gryt0a59bT+GKigWXldln5g=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.58" = { + "@electron-forge/template-webpack-6.0.0-beta.59" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.58.tgz"; - sha512 = "Uf7Ck17bn3djuoSglzOioXhOBRqY72pqMSZF0K84zNGwfzsW/KSonizmOMG3yrvSDEQf48JE5Ezhssla3SSgiA=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.59.tgz"; + sha512 = "ScPVUQ//zqqnpr53/WY8pVygs6KVTpXsPlAoo0ZeYfOjuTRh2uSMPN0+2UnUUD5FGjLm3hkpIibUH4ZMtLu8aw=="; }; }; "@electron/get-1.12.4" = { @@ -2362,13 +2344,13 @@ let sha512 = "+6PB+CwwL2GNHy4GrDR6871ng7A7FRGXSHQzGqfeLq7Dr7vjO82fGuIsrIaFO1Ry1lug6c41uC5Bon/mKcs1KQ=="; }; }; - "@fluentui/react-8.22.0" = { + "@fluentui/react-8.23.8" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.22.0"; + version = "8.23.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.22.0.tgz"; - sha512 = "mn/zUd7vJNFLqpXZhc3ePNpDcNx4mhYdQ5vCC6kqcFIYjMg2ve5WqBP9tpFlbD3LEBa8NyOvIWfdG0NZdKejLg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.23.8.tgz"; + sha512 = "piomaUcVxDZvA0yueTW/BGMISYdJ9/LJ1FNMgvSnST8/LwWTCRGbswN3tg/IUVULRlENy9th9rBp1TeMZ/DigQ=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -3442,13 +3424,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.31.0" = { + "@jsii/spec-1.32.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.31.0.tgz"; - sha512 = "qpJqZ+xj4lnKfk/HJYdYURDmHzh9aBIVOTgwd314AxKmwubDAajlAup+D2F9z9kylAB7GsQiva/SXgUlFjBeQw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.32.0.tgz"; + sha512 = "XjSnqvmBXvFork9w3ehacqaa0JmUVaEYubOzR1l6z67z2FDZ9C4KP7EqMqjnv/S+j+Ou3tWQPfLICnl6aK1iGA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4171,31 +4153,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-16.1.0" = { + "@netlify/build-17.1.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "16.1.0"; + version = "17.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-16.1.0.tgz"; - sha512 = "FEPgiR2IoEC7fwCkAguMdWbiWwdAr6Zh1+mEFlgqTPAQDE6j/ji3elD8kuXwtdHHhC8U28YYOTZL6fCodlvRAw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.1.1.tgz"; + sha512 = "ulYaC/nCveDar8QGyl64wVtdjpbcUYM58/jHssVDgBiK3jQrDt6oZ5vG1sAJLDOY8ReXAtW1MqiIKLDImsk/4g=="; }; }; - "@netlify/cache-utils-1.0.7" = { + "@netlify/cache-utils-2.0.0" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.7.tgz"; - sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.0.tgz"; + sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; }; }; - "@netlify/config-13.0.0" = { + "@netlify/config-14.0.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "13.0.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; - sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-14.0.0.tgz"; + sha512 = "Ke7rEmHAy9N5qxaY9uCGrnDjCllC2lqMg1kn8p6qse0y+qkptkdlKnD0pBSDaUIsNfmyX3omvw0/d5vr0qNofA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4216,139 +4198,139 @@ let sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; }; }; - "@netlify/functions-utils-1.4.7" = { + "@netlify/functions-utils-2.0.2" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.4.7"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.7.tgz"; - sha512 = "e0y/iUsXWJq65ZUS3mn6ACJlQ6bfVSjtV6DO8Y194tevctnArtQA+F86L08zQklyhJbEV6cmyg4QbHhbLqTNOg=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-2.0.2.tgz"; + sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; }; }; - "@netlify/git-utils-1.0.11" = { + "@netlify/git-utils-2.0.0" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.11"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.11.tgz"; - sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.0.tgz"; + sha512 = "O8cGi3yRtdqJ2pDkdcoj3t6F9JSB/SokRwZiCJjp2aBQyC+Jg3RsRH7G0MbYEjrjN6JY4/p6j62NTFqsIBGh2A=="; }; }; - "@netlify/local-functions-proxy-0.1.0" = { + "@netlify/local-functions-proxy-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy"; packageName = "@netlify/local-functions-proxy"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-0.1.0.tgz"; - sha512 = "n4Y3LE3I6MrSCCLqLjY4VOVAi/uXdU35Kswd0eK0060Fla5huj+rKSnzu8GIERrvuRJMPi/AY7WFxB5mkFS8qw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.0.0.tgz"; + sha512 = "J3ZSOzcTrJVomNDP14V9Jg/xqwOK/vUfwadrBmau9zNpO/MJOb450UB5biCeJFbLVJVbkjrGbh3shUJwUZp7Fw=="; }; }; - "@netlify/local-functions-proxy-darwin-arm64-0.1.0" = { + "@netlify/local-functions-proxy-darwin-arm64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; packageName = "@netlify/local-functions-proxy-darwin-arm64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-0.1.0.tgz"; - sha512 = "QsVber2F4H2zS2Oi31y226zeLkhWQrjy+9lYV4bsU0lZB9wHqrLGQNlOabqs6MWUQmWMqcDHLv31XMFpfhndnw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.0.0.tgz"; + sha512 = "K9rS6Y/IYIl6UuOPIgXuiHFpGg3HAc+EJwW+q87LRc4NExUx4HyLAh7YeJlhFg/KJG7IaCYqAOBBaFRoUVi0/g=="; }; }; - "@netlify/local-functions-proxy-darwin-x64-0.1.0" = { + "@netlify/local-functions-proxy-darwin-x64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; packageName = "@netlify/local-functions-proxy-darwin-x64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-0.1.0.tgz"; - sha512 = "7Wb3ooicvRzHMErMWF+L+QG+rVy7iBEQ7b2GOzywL/VmeajatVk/D16v5b9adM2sX0KX1dyj3O9x2QLkDW2G7w=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.0.0.tgz"; + sha512 = "PxGE9JknIX/SvBBUW9uvpSahAKSOJ+4cEJhtV+GIzHsh/M2qMdZptfDQt+XYJVT6J+jgxJ+coJmJKmKnfwnPGg=="; }; }; - "@netlify/local-functions-proxy-freebsd-arm64-0.1.0" = { + "@netlify/local-functions-proxy-freebsd-arm64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; packageName = "@netlify/local-functions-proxy-freebsd-arm64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-0.1.0.tgz"; - sha512 = "Keno1p1rvp5fiGEDZDm0fIOZTbcE1QwyqF5hgVSpD0bxitSAFOaXZwhcyo80x8qcMlBqQp9zWEJWu4zN1UiZMA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.0.0.tgz"; + sha512 = "F4eajUy+Re4k6kUoXQhGTwISAnjI0EzNDrQb3XuzKfRt7sF4rSSmVsrNhi7UqvlIibSKa03bFqSHmcbxcj5GGQ=="; }; }; - "@netlify/local-functions-proxy-freebsd-x64-0.1.0" = { + "@netlify/local-functions-proxy-freebsd-x64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; packageName = "@netlify/local-functions-proxy-freebsd-x64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-0.1.0.tgz"; - sha512 = "kyEjE/aW/k7yD1+Oy28LLZjg6W8091HPCqUHzCk5GzT46zvR61vTPfeAEQwNaEL2uFHPJ3SauDNUZ1+U+FNlHA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.0.0.tgz"; + sha512 = "Gy9oRFKU+pP0Tk03KgZ02wtY9ROoaH8C260P/5poK3dtV5gz05qVyHTOoFaWHbljuE1OabivMSLsjK6a098IVw=="; }; }; - "@netlify/local-functions-proxy-linux-arm-0.1.0" = { + "@netlify/local-functions-proxy-linux-arm-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm"; packageName = "@netlify/local-functions-proxy-linux-arm"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-0.1.0.tgz"; - sha512 = "Un4RIA3xaiWT1njCMgYJsYc1etksFuARz8suHtcoKadsEJ1XICh6OzJoCO3AdHCN1kMQlo3cVC/sHoAB2EyEqw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.0.0.tgz"; + sha512 = "COHrxdRVwpsgzCZl8amYyFX5TFUFPyYSTctwCIoMhXgMlx8HxnQ7fCGMTWXrraat4+LxRDfVyy2jZe7vSAE3hA=="; }; }; - "@netlify/local-functions-proxy-linux-arm64-0.1.0" = { + "@netlify/local-functions-proxy-linux-arm64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; packageName = "@netlify/local-functions-proxy-linux-arm64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-0.1.0.tgz"; - sha512 = "ZDdy+5fgpHxFqpKghtJuMyyQ5tKWV+LJm6t8tKlXkAgC1n1GuqeWNP0JqHV8DSSShFHRaRNoBVpLoXJbtNIorQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.0.0.tgz"; + sha512 = "qYerhh878nqN7dCReD690/K44iCDu806A0wxtuaBLLldNy6UTWpk7LrSScIDC6BUFchN822jjYecOokkRDfyxQ=="; }; }; - "@netlify/local-functions-proxy-linux-ia32-0.1.0" = { + "@netlify/local-functions-proxy-linux-ia32-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; packageName = "@netlify/local-functions-proxy-linux-ia32"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-0.1.0.tgz"; - sha512 = "vR1qlu341JKN91t0TPsYt2xC+ug8Bjp/WCqMtARmFT9jaL8NBTm6kiUh89QcGILYCo2hMNcYb9eih8y5D4N5Iw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.0.0.tgz"; + sha512 = "zOjtT2iUoXyQsSOq3Adv7DidYNYhbLZp1Y5Kg5mK1xGwq8xcGMI5tVSCWeBsJFpt7sa2rTYJLim4Mt7OiZXDMQ=="; }; }; - "@netlify/local-functions-proxy-linux-ppc64-0.1.0" = { + "@netlify/local-functions-proxy-linux-ppc64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; packageName = "@netlify/local-functions-proxy-linux-ppc64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-0.1.0.tgz"; - sha512 = "pcAPe+PzFkNrHpICvrIHHfxk5KNIVo3GgZKoI67NXECCtVel48aXitvlcOwsodrejD8ruQkfbvossBQs9Deq8A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.0.0.tgz"; + sha512 = "mliQBNFWPW+WLnAewMXrcmAAhe/TnYsvgncc3OsVyxq+eABs1lxN/HtDBNHrynPg2Cu8DGXExU/6EhSSf58UYQ=="; }; }; - "@netlify/local-functions-proxy-linux-x64-0.1.0" = { + "@netlify/local-functions-proxy-linux-x64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-x64"; packageName = "@netlify/local-functions-proxy-linux-x64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-0.1.0.tgz"; - sha512 = "sjlMLoKNJRJnq8Esk+GkxEk9CByDNouKdeQ+doiiQhYGRjLhKXZdXbaC137z2tm/vHhI/94Lg7mhCcGygitJpA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.0.0.tgz"; + sha512 = "SAJPQsd6WAiki7kC/lgahbmhQleTNb1Hxr4kbW4QFaGP+yRzcBh9H2nT0HIsgzbtKpaKrTSwXYozyyY5rY09sg=="; }; }; - "@netlify/local-functions-proxy-openbsd-x64-0.1.0" = { + "@netlify/local-functions-proxy-openbsd-x64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; packageName = "@netlify/local-functions-proxy-openbsd-x64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-0.1.0.tgz"; - sha512 = "Dn9wQfeAU6FvurFo8eJL2scahtVigQyAi6lpV+c4YLD87WUfmiQ/mVgB7dfYB9zMiq5GO/iXbcK6wWjFyAZ6Aw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.0.0.tgz"; + sha512 = "470jepQRK7KnThc7cfPexQaR1QlPOelo178Qq/AWa9Fbolf194IyCygIP3iq4FC8wUVUY8pRuscGLfNoVVr1Mg=="; }; }; - "@netlify/local-functions-proxy-win32-ia32-0.1.0" = { + "@netlify/local-functions-proxy-win32-ia32-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; packageName = "@netlify/local-functions-proxy-win32-ia32"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-0.1.0.tgz"; - sha512 = "LRz6UZpgS0UzB5IKgOvBnVNkpBcnzRfT4YBBSBL31fucJ1J2c0zGJIUTqbFdS8eBLOS9Npq2qUT7qlnrgAWyMw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.0.0.tgz"; + sha512 = "znys5GBoUcMCg9iraFFM+YHc+jNKFCMO5kLjBaTz80MXn+43Qh7+rvmeyV2RMECTO3xI0Q7JvwIZr+6FHe/0vw=="; }; }; - "@netlify/local-functions-proxy-win32-x64-0.1.0" = { + "@netlify/local-functions-proxy-win32-x64-1.0.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-x64"; packageName = "@netlify/local-functions-proxy-win32-x64"; - version = "0.1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-0.1.0.tgz"; - sha512 = "YYzVpBPsAiup/Jg+kCAi0/EsV80BMF6JkQ3/2JjJhUqRuEG99THA+HwrFpsQOpOnr3niJBY93YrQymnJPgrk3A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.0.0.tgz"; + sha512 = "uPs7LI60p6XU11Ac7lN36P1nBTg9vUBT4wMxtztwPGmdNL9gSA4+2tRElGM6zXLdICzxdAGo4e0510S+WRN5oQ=="; }; }; "@netlify/open-api-2.5.0" = { @@ -4387,76 +4369,85 @@ let sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; - "@netlify/run-utils-1.0.7" = { + "@netlify/run-utils-2.0.0" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.7.tgz"; - sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.0.tgz"; + sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; }; }; - "@netlify/zip-it-and-ship-it-4.14.0" = { + "@netlify/zip-it-and-ship-it-4.15.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.14.0.tgz"; - sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.15.0.tgz"; + sha512 = "zEwtpomvakEogJMEnYpUxSBb+TAonxgKSo2c9B6rDd6DVUad3RtXBdnx8qizwUGRvFj7Le7QGAmnYC5yWja82A=="; }; }; - "@node-red/editor-api-2.0.1" = { + "@netlify/zip-it-and-ship-it-4.15.1" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.15.1.tgz"; + sha512 = "YgPzJEGY60zZxSSbaDe3mMO+jYB7pbsWyAVvv4tASod8Sys2x/MuOGJ64KmOTZ+bUqZYvJLOcfVL6fiFRSU9wg=="; + }; + }; + "@node-red/editor-api-2.0.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.1.tgz"; - sha512 = "0+wY8FJvS6P3hiRnz7YzjWmkannoJyBMYgnSevQ6euf8dABML5AOYThghpMNPrtl+RzRIar0oabHrTRSoEpDEg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.3.tgz"; + sha512 = "hCOfwaid2AMSTavfRKkYBUDwh9JIPTvEN4Vq+1/mtTy8+5uBAtlDBYU6HTAXMIXUS4TYPONQqQPwwYZiV8e3aQ=="; }; }; - "@node-red/editor-client-2.0.1" = { + "@node-red/editor-client-2.0.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.1.tgz"; - sha512 = "9YP0n+VFruudzZfcsTL0fofm7j/BYodKzQTqksL3ZlcZsB075O3d8zM8ZuoNlpj2CfROR/PZi7E72ucmNExzlQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.3.tgz"; + sha512 = "vKNjIOMl3HupJTlJRm2o+qiZHvszRCwuHmmD+Zq1pFntuLINSadZggmh0ThjTmnY7fIZksjqzGj2tDITNqHFKg=="; }; }; - "@node-red/nodes-2.0.1" = { + "@node-red/nodes-2.0.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.1.tgz"; - sha512 = "op1gcV99xp/xZAVg1B+VRzylNpWk/oF//I6dcRqiF8xoXjff42VfIJ8l01/JqsvuJD3p9+x9fz82QRMmASOu+w=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.3.tgz"; + sha512 = "+EnOyZtjLroJsPrYEsos8fxxVlZNl/NtNtSO2sSmt/5edIFw9bXlGFMf93r2XiztsyZq018tBGegJmRHFvKRKQ=="; }; }; - "@node-red/registry-2.0.1" = { + "@node-red/registry-2.0.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.1.tgz"; - sha512 = "B2La0qWpSEqbiiBWVmUKTqS4y/c/pZuUDPu7a5ZibGgcUEe032X05uZ68wIYMt1y2/ltnUlrPSdOjjpzpxEhEQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.3.tgz"; + sha512 = "psViMyuZQfQHktASYn/SbVNYbvT1qxmlMBxqZcNEDAqYipJg81Hd35beGt7l67D5840Xi3QSk0/l1HnsMzzeMA=="; }; }; - "@node-red/runtime-2.0.1" = { + "@node-red/runtime-2.0.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.1.tgz"; - sha512 = "3MbJk5Xum38Nt13FIvDmsuQYcdo5uxzKu2khHbXN3hG7XlECALSaKqLq19t7yg6e8q8Jqnb7j6184A1m34GVqQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.3.tgz"; + sha512 = "mlqfUuVtqvil8B1OO1kW5DJX/5tKd/RdJt+cUwH99e+eL39NkP2s+rfk3qePRBphUiMkBQKIlpK+xFzDDTGUIQ=="; }; }; - "@node-red/util-2.0.1" = { + "@node-red/util-2.0.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.1.tgz"; - sha512 = "gT+3cI134m2pD4U0/iKuOAjRqluPXKlS19eCE06ArWGLxHmqx7Gi6Cyjxu971gNcw69QEfwJzEA2xIrAKRAR+g=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.3.tgz"; + sha512 = "dMtAjtgL8W2VXEI3F1daaOArJBQaVZ+jclH6xu4JQz8ds4QoiOPQGcKlrnb7XQdf0J+4D1VxtNvm+fVcjJ+2Aw=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4756,13 +4747,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.1.0" = { + "@octokit/openapi-types-9.1.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.0.tgz"; - sha512 = "XBP03pG4XuTU+VgeJM1ozRdmZJerMG4tk6wA+raFKycC4qV9jtD2UQroAg9bAcmI3Q0zWvifeDGtPqsFjMzkLg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.1.tgz"; + sha512 = "xmyPP9tVb4T4A6Lk6SL6ScnIqAHpPV4jfMZI8VtY286212ri9J/6IFGuLsZ26daADUmriuLejake4k+azEfnaw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4792,13 +4783,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.5.0" = { + "@octokit/plugin-rest-endpoint-methods-5.5.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.0.tgz"; - sha512 = "v4dNoHF8cXNx7C67yQx7oarHs5Wg2IiafWvp/ULkNcCOuXgQdBOkJtwidpYqPiRPUw4uHDkI6Tgfje+nXB+Deg=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.1.tgz"; + sha512 = "Al57+OZmO65JpiPk4JS6u6kQ2y9qjoZtY1IWiSshc4N+F7EcrK8Rgy/cUJBB4WIcSFUQyF66EJQK1oKgXWeRNw=="; }; }; "@octokit/request-5.6.0" = { @@ -4819,22 +4810,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.7.0" = { + "@octokit/rest-18.7.1" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.7.0"; + version = "18.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.0.tgz"; - sha512 = "8K8BJFyPFRSfnwu+aSbdjU5w3EtxC33PkDlEi5tyVTYC+t4n7gaqygRg5ajJLCpb/ZzVaXXFJXC9OxQ9TvFRAw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.1.tgz"; + sha512 = "790Yv8Xpbqs3BtnMAO5hlOftVICHPdgZ/3qlTmeOoqrQGzT25BIpHkg/KKMeKG9Fg8d598PLxGhf80RswElv9g=="; }; }; - "@octokit/types-6.21.0" = { + "@octokit/types-6.21.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.21.0"; + version = "6.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.0.tgz"; - sha512 = "VPSxn9uhCoOUMpxCsOAQhf8DgIx+uzFjZRYDiZS5+TvrKaEwBrWkjr/5NmUVvPbW6xdPC2n3yL3XCnoxa4rxvg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.1.tgz"; + sha512 = "PP+m3T5EWZKawru4zi/FvX8KL2vkO5f1fLthx78/7743p7RtJUevt3z7698k+7oAYRA7YuVqfXthSEHqkDvZ8g=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5557,13 +5548,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.2" = { + "@schematics/angular-12.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.2"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.2.tgz"; - sha512 = "nnFPp9uHLinP05r9TFsWT+fwlbwbLHg3yzJr+0aIOX1OsZQFV8hblEFEqdzFQJyx1uGMp4nvBHvCUlYv9GVQLg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.3.tgz"; + sha512 = "VSXHok3Oi62FuVgHvOuz/HOgS1tGPc7iTCaW/SlrBaH+DaUffmZF1qkJnU1dzdzZfox+KckK2SjXlRJgqNZhFw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5890,13 +5881,13 @@ let sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; - "@snyk/docker-registry-v2-client-2.2.4" = { + "@snyk/docker-registry-v2-client-2.3.0" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.4.tgz"; - sha512 = "7JoxHCYAjJQBOEa11Sdb1scjtq/K4HVDlcE10pNFKbmcUn5Gcm/VDJ2RMEbG2oBdmHTTJMJ5RopIiNMSFd669w=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.3.0.tgz"; + sha512 = "VYQe/1SuIdQ8C7bA6nzfcEeafsqG1cHaZDFaIt1uYGwI1TI0OWzUIvGRkfgkMkwFBVLRqS1hFczSoxGTT7OMfA=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5971,22 +5962,13 @@ let sha512 = "aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q=="; }; }; - "@snyk/java-call-graph-builder-1.21.0" = { + "@snyk/java-call-graph-builder-1.23.1" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.21.0"; + version = "1.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.21.0.tgz"; - sha512 = "i0c4N0+pYjpXEgqAkFniM3Q9YANvy+RtbbkQMPIvdEw41+XJISfEHzZ968ZmGWcoi480cgo5t9oxZEadFuHzyg=="; - }; - }; - "@snyk/java-call-graph-builder-1.23.0" = { - name = "_at_snyk_slash_java-call-graph-builder"; - packageName = "@snyk/java-call-graph-builder"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.0.tgz"; - sha512 = "Go/UV33/R0SW10nvshrs/s8GjY2mnbJaRV4Xkj4zGrwpK80lL30th6LDpXDKEdXPZ66EbYGS1Q9gGlL7GzOdeA=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.1.tgz"; + sha512 = "mm6EI/BXFYq8boOHKs61j0R1n3JPsvwxlBsaO35cGFu9fTQaFRsBJdenKW41uJuLX+aFOC4zascbJDNfeE5THQ=="; }; }; "@snyk/mix-parser-1.3.2" = { @@ -6016,13 +5998,13 @@ let sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; }; }; - "@snyk/snyk-docker-pull-3.6.3" = { + "@snyk/snyk-docker-pull-3.7.0" = { name = "_at_snyk_slash_snyk-docker-pull"; packageName = "@snyk/snyk-docker-pull"; - version = "3.6.3"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.3.tgz"; - sha512 = "SXhIAVfBVB/WoMgh3pTJNEKehpHygzqnnqHpg3ucw2rc5z0LqSAJQyYWl3jSAUnl5LgA11UuYD8zj0dsRbed2A=="; + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.7.0.tgz"; + sha512 = "YRNysIPXmVPrP6+Gn8aG8T414r4GiSbxBP2R8CMXgBWFOdAPBoEoFjs7StjBfaVL1p0xl01AudgDnd42HDK9PA=="; }; }; "@snyk/snyk-hex-plugin-1.1.4" = { @@ -6628,13 +6610,13 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/debug-4.1.6" = { + "@types/debug-4.1.7" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz"; - sha512 = "7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; }; "@types/decompress-4.2.4" = { @@ -6727,15 +6709,6 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.49" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.49"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz"; - sha512 = "K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw=="; - }; - }; "@types/estree-0.0.50" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -7213,6 +7186,15 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; + "@types/ms-0.7.31" = { + name = "_at_types_slash_ms"; + packageName = "@types/ms"; + version = "0.7.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; + }; + }; "@types/multer-1.4.4" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; @@ -7276,13 +7258,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.5" = { + "@types/node-14.17.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.5"; + version = "14.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz"; - sha512 = "bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.6.tgz"; + sha512 = "iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ=="; }; }; "@types/node-15.12.5" = { @@ -7294,13 +7276,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.2" = { + "@types/node-15.14.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.2"; + version = "15.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz"; - sha512 = "dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz"; + sha512 = "gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg=="; }; }; "@types/node-15.6.1" = { @@ -7330,13 +7312,13 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.0" = { + "@types/node-16.4.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.0"; + version = "16.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; - sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; + sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; }; }; "@types/node-6.14.13" = { @@ -7366,13 +7348,13 @@ let sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; }; }; - "@types/node-fetch-2.5.11" = { + "@types/node-fetch-2.5.12" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.11"; + version = "2.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.11.tgz"; - sha512 = "2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; + sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; }; }; "@types/normalize-package-data-2.4.1" = { @@ -7546,13 +7528,13 @@ let sha512 = "iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ=="; }; }; - "@types/semver-7.3.7" = { + "@types/semver-7.3.8" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.7.tgz"; - sha512 = "4g1jrL98mdOIwSOUh6LTlB0Cs9I0dQPwINUhBg7C6pN4HLr8GS8xsksJxilW6S6dQHVi2K/o+lQuQcg7LroCnw=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz"; + sha512 = "D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now=="; }; }; "@types/serve-static-1.13.10" = { @@ -7852,13 +7834,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.4" = { + "@typescript-eslint/eslint-plugin-4.28.5" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; - sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz"; + sha512 = "m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7870,13 +7852,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.4" = { + "@typescript-eslint/experimental-utils-4.28.5" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; - sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz"; + sha512 = "bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7888,22 +7870,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.4" = { + "@typescript-eslint/parser-4.28.5" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; - sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz"; + sha512 = "NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw=="; }; }; - "@typescript-eslint/scope-manager-4.28.4" = { + "@typescript-eslint/scope-manager-4.28.5" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; - sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz"; + sha512 = "PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7915,13 +7897,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.4" = { + "@typescript-eslint/types-4.28.5" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; - sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz"; + sha512 = "MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7933,13 +7915,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.4" = { + "@typescript-eslint/typescript-estree-4.28.5" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; - sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz"; + sha512 = "FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7951,13 +7933,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.4" = { + "@typescript-eslint/visitor-keys-4.28.5" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.4"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; - sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz"; + sha512 = "dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8689,31 +8671,31 @@ let sha512 = "FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw=="; }; }; - "@yarnpkg/fslib-2.4.0" = { + "@yarnpkg/fslib-2.5.0" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.4.0.tgz"; - sha512 = "CwffYY9owtl3uImNOn1K4jl5iIb/L16a9UZ9Q3lkBARk6tlUsPrNFX00eoUlFcLn49TTfd3zdN6higloGCyncw=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.0.tgz"; + sha512 = "xkKmuW3HwQeWOPqOhBCbDjTGbgimP/VWN2bPpx4FnfgbVj1xjULyOtZR5h9p49jA7IIZsccG91+Ad9kLZ2A4DA=="; }; }; - "@yarnpkg/json-proxy-2.1.0" = { + "@yarnpkg/json-proxy-2.1.1" = { name = "_at_yarnpkg_slash_json-proxy"; packageName = "@yarnpkg/json-proxy"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz"; - sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; + url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.1.tgz"; + sha512 = "meUiCAgCYpXTH1qJfqfz+dX013ohW9p2dKfwIzUYAFutH+lsz1eHPBIk72cuCV84adh9gX6j66ekBKH/bIhCQw=="; }; }; - "@yarnpkg/libzip-2.2.1" = { + "@yarnpkg/libzip-2.2.2" = { name = "_at_yarnpkg_slash_libzip"; packageName = "@yarnpkg/libzip"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.1.tgz"; - sha512 = "AYDJXrkzayoDd3ZlVgFJ+LyDX+Zj/cki3vxIpcYxejtgkl3aquVWOxlC0DD9WboBWsJFIP1MjrUbchLyh++/7A=="; + url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.2.tgz"; + sha512 = "M7ziz16f+tFFnJSCreLtemaGPpjT+NC0E21JQaWXAAlRmFIXz6zl2EZ+tXLxV9yJaplpNDbTgX1j5GPiwg5H5w=="; }; }; "@yarnpkg/lockfile-1.1.0" = { @@ -8725,13 +8707,13 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.3.0" = { + "@yarnpkg/parsers-2.4.0" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.3.0.tgz"; - sha512 = "qgz0QUgOvnhtF92kaluIhIIKBUHlYlHUBQxqh5v9+sxEQvUeF6G6PKiFlzo3E6O99XwvNEGpVu1xZPoSGyGscQ=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.4.0.tgz"; + sha512 = "XWgiNGh4MkhdBTJVEbXEqzk66JKjvxTtKGeLPqo3rnJ7JiJnRaK2n9MLTKQB0uoRMWYzPlISdIlok6H9OdlOVQ=="; }; }; "@yarnpkg/pnp-2.3.2" = { @@ -9157,13 +9139,13 @@ let sha512 = "LjwZql59OKrQgppreOvRcgJDYrnj9XKVW2gb5Q1ZyGG3CH46VCiiNHJB6nYMgOntLo+DPQwQQPOSknZ1zW+wTw=="; }; }; - "addr-to-ip-port-1.5.1" = { + "addr-to-ip-port-1.5.3" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.1.tgz"; - sha512 = "bA+dyydTNuQtrEDJ0g9eR7XabNhvrM5yZY0hvTbNK3yvoeC73ZqMES6E1cEqH9WPxs4uMtMsOjfwS4FmluhsAA=="; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.3.tgz"; + sha512 = "8azR4KaQNuAFyTX2taTTBAWmE/WpX/q0K0Hz4h0P18Ero2ngYiA2x/OVRB8T2jjt9u/qSMF3CO/us7OxwSdX3Q=="; }; }; "address-1.1.2" = { @@ -10075,6 +10057,15 @@ let sha512 = "pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig=="; }; }; + "appdata-path-1.0.0" = { + name = "appdata-path"; + packageName = "appdata-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/appdata-path/-/appdata-path-1.0.0.tgz"; + sha512 = "ZbH3ezXfnT/YE3NdqduIt4lBV+H0ybvA2Qx3K76gIjQvh8gROpDFdDLpx6B1QJtW7zxisCbpTlCLhKqoR8cDBw=="; + }; + }; "append-0.1.1" = { name = "append"; packageName = "append"; @@ -11380,13 +11371,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.951.0" = { + "aws-sdk-2.954.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.951.0"; + version = "2.954.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz"; - sha512 = "YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.954.0.tgz"; + sha512 = "AbP7lUIBVHX1/dnDMgcmmkRYRU5FeBRqemtsV+BwHywEKeiDpVi024KNOIkZkd4NoYtRiLEOwTzUP9w1z/EnxQ=="; }; }; "aws-sign2-0.6.0" = { @@ -12442,13 +12433,13 @@ let sha512 = "T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w=="; }; }; - "bep53-range-1.1.0" = { + "bep53-range-1.1.1" = { name = "bep53-range"; packageName = "bep53-range"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.0.tgz"; - sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q=="; + url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.1.tgz"; + sha512 = "ct6s33iiwRCUPp9KXnJ4QMWDgHIgaw36caK/5XEQ9L8dCzSQlJt1Vk6VmHh1VD4AlGCAI4C2zmtfItifBBPrhQ=="; }; }; "bessel-1.0.2" = { @@ -12892,22 +12883,22 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-lsd-1.1.0" = { + "bittorrent-lsd-1.1.1" = { name = "bittorrent-lsd"; packageName = "bittorrent-lsd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.1.0.tgz"; - sha512 = "j9F+bDt1R//+kLfeSgkmc1A3x0u70gjb/FXaRgTtw+V3wIeYjOekiIlmsXf1SNKuxU5YHDkNL8CFNHx+MfSPSw=="; + url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.1.1.tgz"; + sha512 = "dWxU2Mr2lU6jzIKgZrTsXgeXDCIcYpR1b6f2n89fn7juwPAYbNU04OgWjcQPLiNliY0filsX5CQAWntVErpk+Q=="; }; }; - "bittorrent-peerid-1.3.3" = { + "bittorrent-peerid-1.3.4" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.3.tgz"; - sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.4.tgz"; + sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; }; }; "bittorrent-protocol-3.4.2" = { @@ -12928,13 +12919,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.17.3" = { + "bittorrent-tracker-9.17.4" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.17.3"; + version = "9.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.3.tgz"; - sha512 = "Z37yunPPT8pIEkB0Q0bDP1fMke2Rez7JSsmqwqGKoJWh4zjAtFgrEw2GHYNllRRvcy+fkfVPWt7ArvxsGoUmfA=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.4.tgz"; + sha512 = "ykhdVQHtLfn4DYSJUQD/zFAbP8YwnF6nGlj2SBnCY4xkW5bhwXPeFZUhryAtdITl0qNL/FpmFOamBZfxIwkbxg=="; }; }; "bl-1.2.3" = { @@ -14800,13 +14791,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001246" = { + "caniuse-lite-1.0.30001247" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001246"; + version = "1.0.30001247"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; - sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz"; + sha512 = "4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ=="; }; }; "canvas-2.8.0" = { @@ -16456,13 +16447,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.31.0" = { + "codemaker-1.32.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.31.0.tgz"; - sha512 = "gyWhtZ4YU5b+pIijCfOZkGrH0DCkUQXyRG3BQtDlnwFJuXyJnDoz+dpM5ErkJuDD9w6Qns4aryyG/bU78huaSg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.32.0.tgz"; + sha512 = "RYHzKPI83NJi0u7KjUVeAm4rmMwIPjLsFjcSv8sIZizNiVFwWNxON99YhtFvbg0YMbdMnjpkx0W/VADNuwETGA=="; }; }; "codepage-1.4.0" = { @@ -16969,6 +16960,15 @@ let sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; }; }; + "commander-8.1.0" = { + name = "commander"; + packageName = "commander"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz"; + sha512 = "mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -17491,13 +17491,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.99" = { + "constructs-3.3.106" = { name = "constructs"; packageName = "constructs"; - version = "3.3.99"; + version = "3.3.106"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; - sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.106.tgz"; + sha512 = "QJCbOQRS5UcCcM/e73L1bxNG7eeV70uOzwML5ffoAMhvlgsNYyeI8VleEcsbG0u1TTspMM+lIwD2NYud9NVq7A=="; }; }; "consume-http-header-1.0.0" = { @@ -17573,13 +17573,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.30.0" = { + "contentful-management-7.31.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.30.0.tgz"; - sha512 = "2aAIqLrxxCJt2bWg1LN+wxjYaevAHTsfZGkIPA5QRKK11WhpffrUMkTthbED6UWaY58BAM0TYXT3Z0s7nFu5zg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.31.0.tgz"; + sha512 = "YhPikvkO/ckRTO400I+iHYpVLuHwPyMzTQcMwBWpUluXYCF45I/RpWw7cyNQciQ19Q0NpjgEfUTQnhFhIqHtwA=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -18311,13 +18311,13 @@ let sha512 = "dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw=="; }; }; - "create-torrent-4.7.0" = { + "create-torrent-4.7.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.0.tgz"; - sha512 = "Pb3XjZNKdCs0Nk46yFKb82y+a3xRQeMvGi1AlJfIV40y/iwkgBqzS5EfqdnakEOvh2jzTOx3v8QxZpkz4hPzyw=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.1.tgz"; + sha512 = "OMT0cYHa35p55jqRPP5Cilow/iD9tk+1lRlgmGWNcAhP3e37DwgGnEPkgTU40UTSPfZpaLiWY3wGc929Q2WaRw=="; }; }; "cron-1.8.2" = { @@ -18491,6 +18491,15 @@ let sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; }; }; + "crypto-js-4.1.1" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; + }; + }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -20543,6 +20552,15 @@ let sha512 = "aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg=="; }; }; + "degenerator-3.0.1" = { + name = "degenerator"; + packageName = "degenerator"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz"; + sha512 = "LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ=="; + }; + }; "del-4.1.1" = { name = "del"; packageName = "del"; @@ -21092,13 +21110,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.7" = { + "diff2html-3.4.8" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.7"; + version = "3.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.7.tgz"; - sha512 = "QbQMz1qKFxQqqWvpDAxzD37iZb7i9ixVoBjHh7y5PLg1EagYgbrM4Fley4u5YM6i2elNrJNnKjNzyNtGBx3xjw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.8.tgz"; + sha512 = "ZkZXowZdEGu756Ka8kfmz3bEcH4j0ENC3FCDyomJ6Fz63U+tRoaoG1Qnjoej7fYMNk45AE+vsvn+woKMvm4zMg=="; }; }; "diff3-0.0.3" = { @@ -21803,13 +21821,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-5.0.0" = { + "dotnet-deps-parser-5.1.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz"; - sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.1.0.tgz"; + sha512 = "/VVFME8IwiYJMC7amuVzHf+CZHiXxYjEjgKpRvvY3lKYFirdqacLwqLlrBl1dYYcUEwmHb/90cssTKInc9pvYg=="; }; }; "downgrade-root-1.2.2" = { @@ -22181,13 +22199,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.782" = { + "electron-to-chromium-1.3.788" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.782"; + version = "1.3.788"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; - sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.788.tgz"; + sha512 = "dbMIpX4E4/Gk4gzOh1GYS7ls1vGsByWKpIqLviJi1mSmSt5BvrWLLtSqpFE5BaC7Ef4NnI0GMaiddNX2Brw6zA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25747,13 +25765,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.155.1" = { + "flow-parser-0.156.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.155.1"; + version = "0.156.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.155.1.tgz"; - sha512 = "EU55hHBilG20Qu80tMYrVjEIqB3FcXPPJwndNcf6UryvhiF74dQ2FX8zPV1LIpuvkW3P13wgZlsnG94oRihgpw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.156.0.tgz"; + sha512 = "OCE3oIixhOttaV4ahIGtxf9XfaDdxujiTnXuHu+0dvDVVDiSDJlQpgCWdDKqP0OHfFnxQKrjMamArDAXtrBtZw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26044,13 +26062,13 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.2.12" = { + "fork-ts-checker-webpack-plugin-6.2.13" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.2.12"; + version = "6.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.12.tgz"; - sha512 = "BzXGIfM47q1WFwXsNLl22dQVMFwSBgldL07lvqRJFxgrhT76QQ3nri5PX01Rxfa2RYvv/hqACULO8K5gT8fFuA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.13.tgz"; + sha512 = "+j/DfwevcZeSXn5WOv32c/shbcbhcKi88asC2A4TDPtURS3MW/qXiVucGiL1PXdt9PCGB88R3BfaSWZ1C/XGHA=="; }; }; "form-data-1.0.0-rc3" = { @@ -26188,13 +26206,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.10.5" = { + "fp-ts-2.11.0" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.10.5"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.5.tgz"; - sha512 = "X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.0.tgz"; + sha512 = "MRss/AgPUBgScVtHaaNkKa/3+SaN3QOokYr1CnOOgdfterSwuaE2x6h/ADQOTcs3mKDC17d6NzQyZOZDFijQmA=="; }; }; "fraction.js-4.1.1" = { @@ -26773,6 +26791,15 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; + "gauge-3.0.1" = { + name = "gauge"; + packageName = "gauge"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.1.tgz"; + sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; + }; + }; "gaxios-4.3.0" = { name = "gaxios"; packageName = "gaxios"; @@ -27142,13 +27169,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-release-fetch-2.0.1" = { + "gh-release-fetch-2.0.2" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.1.tgz"; - sha512 = "Ca5chpW8/yXeJPYdAxDLB8UShrWViOgnlYl4QTlQi4Y6sJnMXrXK9GMjKHyjJtNAw9IiSh0DbcTMiJZyp6vfMg=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.2.tgz"; + sha512 = "VIlw5FzT8b31rwwH3A4zg05wd9R1/7vPYY+Dow14U1mXEkGF348+x8HUk5fY9py6icVVU3z/v4L7m5BV/7xxjA=="; }; }; "git-apply-delta-0.0.7" = { @@ -27547,15 +27574,6 @@ let sha512 = "+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg=="; }; }; - "global-cache-dir-1.0.1" = { - name = "global-cache-dir"; - packageName = "global-cache-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-1.0.1.tgz"; - sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw=="; - }; - }; "global-cache-dir-2.0.0" = { name = "global-cache-dir"; packageName = "global-cache-dir"; @@ -27890,13 +27908,13 @@ let sha512 = "2a6WY+p6YMVMmwXmkRqiLreXx67xHDZhkmflcL8aDUkl1csx9ywxEI01veoDXy6T1l0JJD6zLbl5TIbWimmXrw=="; }; }; - "google-p12-pem-3.1.0" = { + "google-p12-pem-3.1.1" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.0.tgz"; - sha512 = "JUtEHXL4DY/N+xhlm7TC3qL797RPAtk0ZGXNs3/gWyiDHYoA/8Rjes0pztkda+sZv4ej1EoO2KhWgW5V9KTrSQ=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.1.tgz"; + sha512 = "e9CwdD2QYkpvJsktki3Bm8P8FSGIneF+/42a9F9QHcQvJ73C2RoYZdrwRl6BhwksWtzl65gT4OnBROhUIFw95Q=="; }; }; "goosig-0.10.0" = { @@ -29754,13 +29772,13 @@ let sha512 = "wcGvY31MpFNHIkUcXHHnvrE4IKYlpvitJw5P/1u892gMBAM46muQ+RH7UN1d+Ntnfx5apnOnVY6vcLmrWHOLwg=="; }; }; - "http2-client-1.3.3" = { + "http2-client-1.3.5" = { name = "http2-client"; packageName = "http2-client"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/http2-client/-/http2-client-1.3.3.tgz"; - sha512 = "nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA=="; + url = "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz"; + sha512 = "EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA=="; }; }; "http2-wrapper-1.0.3" = { @@ -32427,13 +32445,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; "is-stream-ended-0.1.4" = { @@ -33255,6 +33273,15 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; + "js-base64-3.6.1" = { + name = "js-base64"; + packageName = "js-base64"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.6.1.tgz"; + sha512 = "Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ=="; + }; + }; "js-beautify-1.14.0" = { name = "js-beautify"; packageName = "js-beautify"; @@ -33525,49 +33552,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.31.0" = { + "jsii-1.32.0" = { name = "jsii"; packageName = "jsii"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.31.0.tgz"; - sha512 = "q/p5a6OLO9V0pIcyzS5sygkU9lPskY57KM7KbmppLDPVi5nIqpsRyFfsbPnGWFfDBMk//nkcfj+dbKJIplVkgg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.32.0.tgz"; + sha512 = "Vw/xjiRgMdb+wbSSUaA7DTvVfSYfCR0k8Gdei43xSOOqmRfyLsmrWkN4ypnsbfaWfEYLpTj/HXGc4rJmw9Vnrw=="; }; }; - "jsii-pacmak-1.31.0" = { + "jsii-pacmak-1.32.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.31.0.tgz"; - sha512 = "fGiAoooRPMadwTWU0vfHJdcNzeYdESnkU/8LmlI4k6yF1iIlFMIbWPulBxP6fV7SqV3CZQKGpUbcPD/Uzf1glg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.32.0.tgz"; + sha512 = "zH+5ys4w9rSz7ZbfDTX0XZ8zhqpoygikuAppiWWVqjMmdk8qqZUgY9fLncZliMnI42YCXSz7q43g4tVL7dd3ng=="; }; }; - "jsii-reflect-1.31.0" = { + "jsii-reflect-1.32.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.31.0.tgz"; - sha512 = "jKc3tryVeEyEBZFv5bDB8rOaEgW+yBPh0DE4GQCKQQLdkp76Lm9ZSkrnJk5e0gEuAWsmuc1DUs35OcVNr8QRWg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.32.0.tgz"; + sha512 = "BJN8pgxSa3LlP5yPfxtaviSjsHKpG9b4xOr2kXv6w/SElIX15Q5/tKauI4/ZHTnBHGimRWh9ACNtxXAxvH0Vqg=="; }; }; - "jsii-rosetta-1.31.0" = { + "jsii-rosetta-1.32.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.31.0.tgz"; - sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.32.0.tgz"; + sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.302" = { + "jsii-srcmak-0.1.308" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.302"; + version = "0.1.308"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; - sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.308.tgz"; + sha512 = "jm/nmU3Z9730bn2NSfCu/X0pJySpVCdO7vMQGjP4ni1qcBqbQ2hp6qWThaYoB1IfS1TR9TH5RkwtxZGiTBo8PQ=="; }; }; "json-bigint-0.2.3" = { @@ -33876,13 +33903,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.272" = { + "json2jsii-0.1.278" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.272"; + version = "0.1.278"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; - sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.278.tgz"; + sha512 = "sc7Nu9qWIDbIAWVktPahGn8LLSiNNO5/FFJLDIpIhLI6FjHrsLT1wE+97WNHEzabdrpzvuGnyVO1Zu9+DEtC9A=="; }; }; "json3-3.2.6" = { @@ -34182,22 +34209,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.4.0" = { + "jszip-3.7.0" = { name = "jszip"; packageName = "jszip"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; - sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; - }; - }; - "jszip-3.6.0" = { - name = "jszip"; - packageName = "jszip"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; - sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz"; + sha512 = "Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw=="; }; }; "junk-3.1.0" = { @@ -35299,6 +35317,15 @@ let sha512 = "kUfYO29baIJzY3S4/j7qaWl0GdjxT88SEaIcUN98YGdhYh+m7Zkt1N4jGubVF05A7dzjfjgtQD/NI5APKl38RQ=="; }; }; + "limiter-1.1.5" = { + name = "limiter"; + packageName = "limiter"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"; + sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; + }; + }; "line-reader-0.4.0" = { name = "line-reader"; packageName = "line-reader"; @@ -37261,13 +37288,13 @@ let sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; - "lossless-json-1.0.4" = { + "lossless-json-1.0.5" = { name = "lossless-json"; packageName = "lossless-json"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz"; - sha512 = "zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="; + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.5.tgz"; + sha512 = "RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA=="; }; }; "lossy-store-1.2.4" = { @@ -39394,6 +39421,15 @@ let sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; }; }; + "mime-db-1.49.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.49.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -40384,15 +40420,6 @@ let sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; }; }; - "multimatch-4.0.0" = { - name = "multimatch"; - packageName = "multimatch"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; - }; - }; "multimatch-5.0.0" = { name = "multimatch"; packageName = "multimatch"; @@ -41186,13 +41213,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-7.0.1" = { + "netlify-8.0.0" = { name = "netlify"; packageName = "netlify"; - version = "7.0.1"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-7.0.1.tgz"; - sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; + url = "https://registry.npmjs.org/netlify/-/netlify-8.0.0.tgz"; + sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; "netlify-redirect-parser-8.1.0" = { @@ -42465,6 +42492,15 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; + "npmlog-5.0.0" = { + name = "npmlog"; + packageName = "npmlog"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz"; + sha512 = "ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ=="; + }; + }; "nprogress-0.2.0" = { name = "nprogress"; packageName = "nprogress"; @@ -43195,13 +43231,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.31.0" = { + "oo-ascii-tree-1.32.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.31.0.tgz"; - sha512 = "gNb2MyP1ZcF7cX0WgsAjYe4gZcx7BMLBWKE2TJZZbQ9/j4D8gbJh5Aq6RlXBgev74ODlgAVVcPr2wKU4Dufhqg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.32.0.tgz"; + sha512 = "QCYSWgdhbQwvMzw1OguyZ+K2KwZeQ1xvhFXa0/XV8XfmUXgr07MlnUoNthntfYgY6w7w+KI8WvqIxr+Q/NF5gw=="; }; }; "opal-runtime-1.0.11" = { @@ -44320,6 +44356,15 @@ let sha512 = "ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q=="; }; }; + "pac-proxy-agent-5.0.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; + sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; + }; + }; "pac-resolver-4.2.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -44329,6 +44374,15 @@ let sha512 = "rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ=="; }; }; + "pac-resolver-5.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz"; + sha512 = "H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA=="; + }; + }; "package-json-1.2.0" = { name = "package-json"; packageName = "package-json"; @@ -45787,6 +45841,15 @@ let sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; }; + "pixiv-api-client-0.25.0" = { + name = "pixiv-api-client"; + packageName = "pixiv-api-client"; + version = "0.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pixiv-api-client/-/pixiv-api-client-0.25.0.tgz"; + sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q=="; + }; + }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -45832,13 +45895,13 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; - "pkg-fetch-3.1.1" = { + "pkg-fetch-3.2.2" = { name = "pkg-fetch"; packageName = "pkg-fetch"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.1.1.tgz"; - sha512 = "3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg=="; + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.2.tgz"; + sha512 = "bLhFNT4cNnONxzbHo1H2mCCKuQkCR4dgQtv0gUZnWtp8TDP0v0UAXKHG7DXhAoTC5IYP3slLsFJtIda9ksny8g=="; }; }; "pkg-up-2.0.0" = { @@ -47192,15 +47255,6 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; - "pretty-quick-3.1.1" = { - name = "pretty-quick"; - packageName = "pretty-quick"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.1.tgz"; - sha512 = "ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ=="; - }; - }; "pretty-time-1.1.0" = { name = "pretty-time"; packageName = "pretty-time"; @@ -47804,6 +47858,15 @@ let sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA=="; }; }; + "proxy-agent-5.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz"; + sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; + }; + }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -48146,15 +48209,6 @@ let sha1 = "146b36e3e043d7a666b59a14165fdd3bef3cf44c"; }; }; - "pull-async-filter-1.0.0" = { - name = "pull-async-filter"; - packageName = "pull-async-filter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-async-filter/-/pull-async-filter-1.0.0.tgz"; - sha1 = "ebc3617d9de2463908c89fd01671c727564d6831"; - }; - }; "pull-awaitable-1.0.0" = { name = "pull-awaitable"; packageName = "pull-awaitable"; @@ -48839,13 +48893,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.157" = { + "pyright-1.1.158" = { name = "pyright"; packageName = "pyright"; - version = "1.1.157"; + version = "1.1.158"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; - sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.158.tgz"; + sha512 = "gT+uy5OYyRTbB7997hag74kUuDh7XdMFYjj6AgBQ5Zp53e7oL09RH10zNDVHvI9nzuooiWjYkIS0rhuapfDL0g=="; }; }; "q-0.9.7" = { @@ -49856,13 +49910,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-fast-2.0.2" = { + "read-package-json-fast-2.0.3" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; - sha512 = "5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; + sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; }; }; "read-package-tree-5.3.1" = { @@ -50180,13 +50234,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.20.4" = { + "recast-0.20.5" = { name = "recast"; packageName = "recast"; - version = "0.20.4"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.20.4.tgz"; - sha512 = "6qLIBGGRcwjrTZGIiBpJVC/NeuXpogXNyRQpqU1zWPUigCphvApoCs9KIwDYh1eDuJ6dAFlQoi/QUyE5KQ6RBQ=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz"; + sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ=="; }; }; "rechoir-0.6.2" = { @@ -50414,13 +50468,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.8" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.8"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz"; - sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regenerator-transform-0.14.5" = { @@ -50504,6 +50558,15 @@ let sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; + "register-protocol-win32-1.1.0" = { + name = "register-protocol-win32"; + packageName = "register-protocol-win32"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/register-protocol-win32/-/register-protocol-win32-1.1.0.tgz"; + sha1 = "ac961c69caaa2d609eec368aa0e4daf81a2dfee3"; + }; + }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -51746,13 +51809,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.3" = { + "rollup-2.54.0" = { name = "rollup"; packageName = "rollup"; - version = "2.53.3"; + version = "2.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; - sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.54.0.tgz"; + sha512 = "RHzvstAVwm9A751NxWIbGPFXs3zL4qe/eYg+N7WwGtIXVLy1cK64MiU37+hXeFm1jqipK6DGgMi6Z2hhPuCC3A=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51953,6 +52016,15 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; + "run-con-1.2.10" = { + name = "run-con"; + packageName = "run-con"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/run-con/-/run-con-1.2.10.tgz"; + sha512 = "n7PZpYmMM26ZO21dd8y3Yw1TRtGABjRtgPSgFS/nhzfvbJMXFtJhJVyEgayMiP+w/23craJjsnfDvx4W4ue/HQ=="; + }; + }; "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; @@ -52241,13 +52313,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.35.2" = { + "sass-1.36.0" = { name = "sass"; packageName = "sass"; - version = "1.35.2"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz"; - sha512 = "jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.36.0.tgz"; + sha512 = "fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg=="; }; }; "sax-0.5.8" = { @@ -53906,13 +53978,13 @@ let sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q=="; }; }; - "snyk-gradle-plugin-3.16.0" = { + "snyk-gradle-plugin-3.16.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.0.tgz"; - sha512 = "PQegG8GOweJvUDSroysO1E0RK3MxphSUvNG5siRqGHJQ8s+dw9DddYN8kMn5+pTrfzo6zddgDPJxjqsfNR+NIw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.1.tgz"; + sha512 = "ii+W544+vCsRe+I4FdmhnYwGq5ZZYacEkUswJoUYmj1sIkkN1G0iUyas/r9mX+ERjQlvzyN4diptZe9OeaTaaA=="; }; }; "snyk-module-3.1.0" = { @@ -53924,13 +53996,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.26.1" = { + "snyk-mvn-plugin-2.26.2" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.26.1"; + version = "2.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.1.tgz"; - sha512 = "DCs53aRT/uK2e1jXzeVG2d+Ll0bmY/YHL+jEYaWJko8XwGoVwqCrVOkRyzXd2KOZUk3gpD6MaxIrBWsc8RJzRA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.2.tgz"; + sha512 = "XS6I10OYMzUq60DUqf0Lf4m8uLXZTFH58O++n5W/X4MtSmYV4frrpgZOrrDfzxBM5S7SH9FlKDL3p+1m84yqzg=="; }; }; "snyk-nodejs-lockfile-parser-1.35.0" = { @@ -53951,13 +54023,13 @@ let sha512 = "NiXN+MdWaZxseXVDgCM4CZ5aBgI5LloUbwUP9c3oMZDih9Zj6Vf5edDcL8eM3BGl+a6LceJzB6w+xrIqKCXgQA=="; }; }; - "snyk-nuget-plugin-1.21.1" = { + "snyk-nuget-plugin-1.22.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.21.1"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.1.tgz"; - sha512 = "nRtedIvrow5ODqOKkQWolKrxn8ZoNL3iNJGuW0jNhwv+/9K0XE1UORM5F1ENAsd+nzCSO/kiYAXCc5CNK8HWEw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.0.tgz"; + sha512 = "R0pmcEYeoM3B6BUMUf30jPQgQo8ngHW0gAabyGMnBV3ZDvJ99TCa7McSIjI/3obdT1ERIKKF6bZxuzps4uzVOA=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -54788,6 +54860,15 @@ let sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; }; }; + "speed-limiter-1.0.2" = { + name = "speed-limiter"; + packageName = "speed-limiter"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/speed-limiter/-/speed-limiter-1.0.2.tgz"; + sha512 = "Ax+TbUOho84bWUc3AKqWtkIvAIVws7d6QI4oJkgH4yQ5Yil+lR3vjd/7qd51dHKGzS5bFxg0++QwyNRN7s6rZA=="; + }; + }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -55094,13 +55175,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.1.4" = { + "ssb-db2-2.1.5" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.4.tgz"; - sha512 = "r70wOz0taaIgpFX/I1DbzT1mucfLSHMmXfNMaenmLcrV6vDZFyFvZVyQTn26xgv7JwDkrdD9B/1Y85AH0qjYow=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.5.tgz"; + sha512 = "3Sbdf5AavoSqo7h1OQXSZ+RFIuTeu9CJpL2ojI8ySFZMZTsnPo7X7LQ1Bd4cNYTK7DBCvfjwvY01sO8VjFzlgw=="; }; }; "ssb-ebt-5.6.7" = { @@ -55175,13 +55256,13 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; - "ssb-keys-8.1.0" = { + "ssb-keys-8.2.0" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.1.0.tgz"; - sha512 = "RC2gFMptimj2QZZESOViKVhzqgXCnfW3IqUeKLQ/E8nnTdODuCVa3soLYu4KUF8nGIzFIfdKq7L2Teg32kD85w=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.2.0.tgz"; + sha512 = "U5vmEvWlMdmJQDHyiWYzXQwxlq+Th6cYvHy/cfhyoGU1vopiB5ytYm339bfhdmtjjRDSV2SPrm3vcgLrN3KH2w=="; }; }; "ssb-links-3.0.10" = { @@ -55337,15 +55418,6 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; - "ssb-sort-1.1.3" = { - name = "ssb-sort"; - packageName = "ssb-sort"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ssb-sort/-/ssb-sort-1.1.3.tgz"; - sha512 = "oPsF8lGgcHcIb4F1GddV3CbZTJZ0OzxI9fHXH0Zc7ZjqjFlYdqMDxFSuvqJnmtDydJcswyGANiziP1ghd69jOw=="; - }; - }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -55373,13 +55445,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.22" = { + "sscaff-1.2.28" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.22"; + version = "1.2.28"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; - sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.28.tgz"; + sha512 = "HSL0UNbfhrfqbz4Pnm/0SVVPXyrqnfu6d/RCfXDCdBtPPeGqhg8JMm5PiBwuFkZ217xacctVmnR5LDwE+2rOeA=="; }; }; "ssh-config-1.1.6" = { @@ -57065,13 +57137,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte2tsx-0.4.2" = { + "svelte2tsx-0.4.3" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.2.tgz"; - sha512 = "ya93OOdT/WvHVEEvQ3u+Y4lkUqq0D+mD1szbGUWcYVOdBjJyXUF5MhKS5HEJHWQw4r+XK9UlHk52BMeXR2SI8A=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.3.tgz"; + sha512 = "bbX1jrqz9Hih7GyeNrMex6HvSNguX+oorW3PPlNZk3hEgz7xXSO6f9Wuu+1dDacKt7GCEJdLjnq0wc1ZhyLqoQ=="; }; }; "sver-compat-1.5.0" = { @@ -57362,13 +57434,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.8" = { + "systeminformation-5.7.12" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.8"; + version = "5.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.8.tgz"; - sha512 = "gpFGDPtOtWDxMaQ6/7oe2XM/4ErgSvev1l3sdxChnm1AqDJKzZ3cu+VK7Dq1N02pChPiNNsIbUwe6dCLixfWRg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.12.tgz"; + sha512 = "rRMi8JafAXSrGd/aIxgmIxJyGRgRzyOZd75JilvVw13vD98aEaAJzKtezba5DYlTC/86c/XiZzd6VCed5fr/sA=="; }; }; "table-3.8.3" = { @@ -57561,13 +57633,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.13" = { + "tar-4.4.15" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "4.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz"; + sha512 = "ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA=="; }; }; "tar-4.4.6" = { @@ -57597,6 +57669,15 @@ let sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; }; }; + "tar-6.1.2" = { + name = "tar"; + packageName = "tar"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz"; + sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; + }; + }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -57876,13 +57957,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.49.3" = { + "terminal-kit-1.49.4" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.49.3"; + version = "1.49.4"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.3.tgz"; - sha512 = "7GovmExYxwGWOGfTh9LlH9uRt5braMj0bi6HmrhdhGi78Xi3S8hfJhTnio/h4iaN4pKtbAn3ugdGF2ypviZvMA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.4.tgz"; + sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag=="; }; }; "terminal-link-2.1.1" = { @@ -58893,13 +58974,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.0" = { + "torrent-discovery-9.4.2" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.0"; + version = "9.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.0.tgz"; - sha512 = "+YW9JGbO5bCuDw9YYW//p4iVLV0aP4C+AYrNQjL/+dSNPUtD1ufK1V8UZERt6rIoeNGhutkSVyeO4Fid9Tjxjg=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.2.tgz"; + sha512 = "zM7GKeWJ/jLkC8nb2DXoSD6tcImj7DywoL9ziIDp0Pjqp+zYN7b6rNgPHY+1eJZeiN4bVJZv00hD5ruly2QgwA=="; }; }; "torrent-piece-1.1.2" = { @@ -59082,13 +59163,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.6.2" = { + "tree-kit-0.7.0" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.2.tgz"; - sha512 = "95UzJA0EMbFfu5sGUUOoXixQMUGkwu82nGM4lmqLyQl+R4H3FK+lS0nT8TZJ5x7JhSHy+saVn7/AOqh6d+tmOg=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.0.tgz"; + sha512 = "MAqFo2oJJ39zmxq3xETx0nMAgZw2z6pnJPjIAehEcrDaeePDhBBTshAlyhCDtezMDTIu1Av+vGE501xN3Sh8VA=="; }; }; "treeify-1.1.0" = { @@ -59820,13 +59901,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.4.1" = { + "typegram-3.4.2" = { name = "typegram"; packageName = "typegram"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.4.1.tgz"; - sha512 = "O3HT/D46tsiIX1Y83gGF6sFoJiEITcqM5S8l8Iz9eyjDvarXFzUQ4mNoHZHoJ1JXlokB17GJk/vOT7Nx+TcpNA=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.2.tgz"; + sha512 = "Z+FaPrD+oyzvchLZHmfyz55MuPhJ51tYm6i+gbeZ0W8Yr4LLWQfI0mBlR2v08PzjHuRx26bmZBEM30jSrGbfbg=="; }; }; "typescript-2.9.2" = { @@ -59991,6 +60072,15 @@ let sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; }; + "uglify-js-3.14.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -61215,13 +61305,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.1" = { + "url-parse-1.5.3" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; - sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; + sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; }; }; "url-parse-lax-1.0.0" = { @@ -62170,13 +62260,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.3.0" = { + "verda-1.3.2" = { name = "verda"; packageName = "verda"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.3.0.tgz"; - sha512 = "EldyK2oyHMxIKj5aMC1R75aN1XH8vH96ga1PgkuXrK5ZhYndR4g8TvBTomXpIgGvwhICjq5LZITZ37Xz/YHxAg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.3.2.tgz"; + sha512 = "uheYzfPZDvcyXX5nR/eAIB2jKtvbCPhmcEpbJESU7I3QykvIvZWozdb5MEdBAx9e6LyS6TqtBp6BwGBMTO7Xow=="; }; }; "verror-1.1.0" = { @@ -62575,22 +62665,22 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-debugadapter-testsupport-1.47.0" = { + "vscode-debugadapter-testsupport-1.48.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.47.0.tgz"; - sha512 = "zhEuaMt2RCOcJoTZ5p35k2WhCzk51UN1PlrtwfWJ8fiFhjDvXIG+682Wkq1VyL12EhTf4qOLMLn0X4JlX7eJ6g=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.48.0.tgz"; + sha512 = "XSPgfFleyHEWvzL1PqleQr+/bFBcqJEKb8lp+fi4xt+JYchNi9Onom+uGpEi22R9hVLdq1J3rE67FTK1xPr1og=="; }; }; - "vscode-debugprotocol-1.47.0" = { + "vscode-debugprotocol-1.48.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.47.0.tgz"; - sha512 = "ii7oCz3Wfr/SGtFr5AYop5dJm0dUmpg0hq2lTzTBdaht8nSheYMMjPntxULBR+2TUxXLcCKFZkF2UEJQduYsIQ=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.48.0.tgz"; + sha512 = "l2jtStdGHAca+B/ZmGAeYZtx7NHT9SY9LL6g0QeImKZjQ9P7S6wB2lcBwz1LSkgFltwLw197yFULnCr36OkLKA=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -63457,22 +63547,22 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.43.0" = { + "webpack-5.46.0" = { name = "webpack"; packageName = "webpack"; - version = "5.43.0"; + version = "5.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.43.0.tgz"; - sha512 = "ex3nB9uxNI0azzb0r3xGwi+LS5Gw1RCRSKk0kg3kq9MYdIPmLS6UI3oEtG7esBaB51t9I+5H+vHmL3htaxqMSw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.46.0.tgz"; + sha512 = "qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw=="; }; }; - "webpack-5.45.1" = { + "webpack-5.47.0" = { name = "webpack"; packageName = "webpack"; - version = "5.45.1"; + version = "5.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; - sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.47.0.tgz"; + sha512 = "soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -63619,6 +63709,15 @@ let sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; + "webpack-sources-3.0.1" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.0.1.tgz"; + sha512 = "LkBxiXJ3tTuhLaS5gz6D6l77Et8mPWlghAe7bbnmi2PyN1CtkiL/YitR+I0pn9PtBC88Irqgg6F9dBJh8+sJRQ=="; + }; + }; "webpack-stream-6.1.0" = { name = "webpack-stream"; packageName = "webpack-stream"; @@ -63664,13 +63763,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.2.5" = { + "webtorrent-1.3.3" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.2.5"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.5.tgz"; - sha512 = "EvtAQ3rK4c7Kf4ZGxYOGvi8Jih8qsZka1IgNB8T5Vxw5UzSNG1nxTVNNTXL0jFhQUMsyRwIOkTgd7ZkJY6bqsw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.3.tgz"; + sha512 = "JfnAqUguJQHT+jnQPkxD2mGKN1vAbBokrhwsb63q+lBi15xDY26Dx3Uvvfqk1ugr7RpqMpsg7IxW64pTrTfRkQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -65159,13 +65258,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.23.0" = { + "xstate-4.23.1" = { name = "xstate"; packageName = "xstate"; - version = "4.23.0"; + version = "4.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.23.0.tgz"; - sha512 = "YIKb7thsDfpb6ooWJJuj+UnNZq923dG264zfpS2/vi4dkZz41ugO0ktC6QCBDeMfH8LBHhhqZ06sR4AYgWWnWg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.23.1.tgz"; + sha512 = "8ZoCe8d6wDSPfkep+GBgi+fKAdMyXcaizoNf5FKceEhlso4+9n1TeK6oviaDsXZ3Z5O8xKkJOxXPNuD4cA9LCw=="; }; }; "xstream-11.14.0" = { @@ -65591,13 +65690,13 @@ let sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; - "yarn-1.22.10" = { + "yarn-1.22.11" = { name = "yarn"; packageName = "yarn"; - version = "1.22.10"; + version = "1.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; - sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.11.tgz"; + sha512 = "AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg=="; }; }; "yarn-1.22.4" = { @@ -65831,22 +65930,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.2"; + version = "12.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.2.tgz"; - sha512 = "oBJcSqXJyPzWGYft5/nD3hJhunxTGXlI4++9ehzdF/fRipOLLMqf77vi/4rUA2DGuaPMbYJeunBnIsgXRGIHIg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.3.tgz"; + sha512 = "XIywpo+8WhwJlEMlb4CXCMdnBSEbU1L1gUzcx5p0poYkWSp1c33Ssd96Jdu3moPP/9aP/49W8fMtoPiIQo3pNQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.2" - sources."@angular-devkit/core-12.1.2" - sources."@angular-devkit/schematics-12.1.2" + sources."@angular-devkit/architect-0.1201.3" + sources."@angular-devkit/core-12.1.3" + sources."@angular-devkit/schematics-12.1.3" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.2" + sources."@schematics/angular-12.1.3" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -66031,7 +66130,7 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" (sources."request-2.88.2" // { dependencies = [ @@ -66062,7 +66161,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -66416,7 +66515,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -66603,10 +66702,10 @@ in "@hyperspace/cli" = nodeEnv.buildNodePackage { name = "_at_hyperspace_slash_cli"; packageName = "@hyperspace/cli"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-1.5.1.tgz"; - sha512 = "+VU/4tWRLf8jVMYyYo1A/rzkZHg0F3LLSvxNti0515a8VD8iyGbyd07nbh88yZC0SWpzMtUZ9ULtKXB2E53MWQ=="; + url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-2.0.0.tgz"; + sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw=="; }; dependencies = [ sources."@corestore/networker-1.1.0" @@ -66618,7 +66717,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -67108,15 +67207,15 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.0.2"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.0.2.tgz"; - sha512 = "q46mQvqhRkmnG6fXTzL9Wk7CtDxRaa2rE1IrDX3CgXaeOgjBZsA3oJKkIqelQHfKWvPGuU6yV6gDF5pOXNXixw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.1.0.tgz"; + sha512 = "n+IllUA4uqf+U+5RmV6HsD5V5+kLWKJ8G3ObSIpPK01St1376/X0Pps6AmLMyHC7vzPK5AtQTThKGIUI43PBXw=="; }; dependencies = [ - sources."@angular-devkit/core-12.1.1" - sources."@angular-devkit/schematics-12.1.1" - (sources."@angular-devkit/schematics-cli-12.1.1" // { + sources."@angular-devkit/core-12.1.3" + sources."@angular-devkit/schematics-12.1.3" + (sources."@angular-devkit/schematics-cli-12.1.3" // { dependencies = [ sources."chalk-4.1.1" sources."inquirer-8.1.1" @@ -67146,9 +67245,9 @@ in }) sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" - sources."@types/estree-0.0.49" + sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67187,7 +67286,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67214,7 +67313,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67240,7 +67339,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.2.12" // { + (sources."fork-ts-checker-webpack-plugin-6.2.13" // { dependencies = [ sources."chalk-4.1.1" sources."fs-extra-9.1.0" @@ -67278,7 +67377,7 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" (sources."jest-worker-27.0.6" // { @@ -67411,7 +67510,7 @@ in sources."util-deprecate-1.0.2" sources."watchpack-2.2.0" sources."wcwidth-1.0.1" - (sources."webpack-5.43.0" // { + (sources."webpack-5.46.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -67623,7 +67722,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67766,7 +67865,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67894,7 +67993,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -67977,7 +68076,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.155.1" + sources."flow-parser-0.156.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -68134,7 +68233,7 @@ in (sources."jscodeshift-0.11.0" // { dependencies = [ sources."ast-types-0.14.2" - sources."recast-0.20.4" + sources."recast-0.20.5" sources."source-map-0.6.1" sources."tslib-2.3.0" ]; @@ -68353,7 +68452,7 @@ in }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -68518,7 +68617,7 @@ in sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."get-stream-5.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" @@ -68904,18 +69003,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -69009,7 +69108,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69044,9 +69143,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69073,14 +69172,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.954.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69109,7 +69208,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."css-select-4.1.3" @@ -69300,7 +69399,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69843,7 +69942,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" ]; }) sources."proxy-addr-2.0.7" @@ -69958,7 +70057,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.4.1" + sources."typegram-3.4.2" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -70257,7 +70356,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.48.0" + sources."mime-db-1.49.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -70656,7 +70755,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypt-0.0.2" - sources."crypto-js-4.0.0" + sources."crypto-js-4.1.1" sources."csrf-3.1.0" (sources."csurf-1.11.0" // { dependencies = [ @@ -71023,8 +71122,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" - sources."addr-to-ip-port-1.5.1" + sources."@types/node-16.4.3" + sources."addr-to-ip-port-1.5.3" sources."airplay-js-0.2.16" sources."ajv-6.12.6" sources."ansi-regex-1.1.1" @@ -71043,7 +71142,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bep53-range-1.1.1" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -71085,7 +71184,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -71429,13 +71528,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.26"; + version = "1.0.0-beta.27"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.26.tgz"; - sha512 = "+ikLey611rDoxLBiYuFaNJZxZ1ytCppSEzW+wBIfV5mkyV8Ug5ldHuFzpeUxShZToyzqq8TwhQ5A3CGTU0tSJw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.27.tgz"; + sha512 = "1ezPt50XBr0KDh+UaJhe/aueRsOEHpNohJlCg3IIhxXWmz3jzo4PLdKrhcT6nFNYXhb6tHo1O+YPkWHhWrEb6w=="; }; dependencies = [ - sources."@jsii/spec-1.31.0" + sources."@jsii/spec-1.32.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -71448,7 +71547,7 @@ in sources."cdk8s-plus-17-1.0.0-beta.30" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.31.0" // { + (sources."codemaker-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -71457,7 +71556,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.99" + sources."constructs-3.3.106" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71506,37 +71605,37 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.31.0" // { + (sources."jsii-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.31.0" // { + (sources."jsii-pacmak-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.31.0" // { + (sources."jsii-reflect-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.31.0" // { + (sources."jsii-rosetta-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.302" // { + (sources."jsii-srcmak-0.1.308" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.272" + sources."json2jsii-0.1.278" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71552,7 +71651,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.31.0" + sources."oo-ascii-tree-1.32.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -71572,7 +71671,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.22" + sources."sscaff-1.2.28" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71628,11 +71727,11 @@ in }; dependencies = [ sources."@cdktf/hcl2json-0.4.1" - sources."@jsii/spec-1.31.0" + sources."@jsii/spec-1.32.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" - sources."@types/node-14.17.5" - sources."@types/node-fetch-2.5.11" + sources."@types/node-14.17.6" + sources."@types/node-fetch-2.5.12" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" (sources."ansi-escapes-4.3.2" // { @@ -71687,7 +71786,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.99" + sources."constructs-3.3.106" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71770,7 +71869,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.31.0" // { + (sources."jsii-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71778,10 +71877,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.31.0" // { + (sources."jsii-pacmak-1.32.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.31.0" + sources."codemaker-1.32.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -71790,7 +71889,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.31.0" // { + (sources."jsii-reflect-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71798,7 +71897,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.31.0" // { + (sources."jsii-rosetta-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71806,7 +71905,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.302" // { + (sources."jsii-srcmak-0.1.308" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71848,7 +71947,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.31.0" + sources."oo-ascii-tree-1.32.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -71889,7 +71988,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.22" + sources."sscaff-1.2.28" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -72121,10 +72220,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.20.0.tgz"; - sha512 = "iKMyYYkebv31l1LB0EbZtwQ4DeVW0dUh9nXwE0tG3LDahcUNzNi1eXGWeNVxcy+YhWmaLEkLgKTu9DE4zxpACQ=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.0.tgz"; + sha512 = "donSKELS/XuVyTpYrfuQDXej340xKZDknKyek4+4ThDYU7Xh5mVeITarDEbi882su0xQBYQsSSwy3zYDocQy7w=="; }; buildInputs = globalBuildInputs; meta = { @@ -72210,7 +72309,7 @@ in sources."inherits-2.0.4" sources."is-docker-2.2.1" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."make-dir-3.1.0" @@ -72266,10 +72365,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.1.tgz"; - sha512 = "CgBUD5qPMvbdTUKTIaeKPxmJSieVJNK3JS1PPgr4ivIXqXYZ4ECP4DM7jmnkA+BnK9Xvz1FnlebUTxTv3z/IFQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.3.tgz"; + sha512 = "JJq0jIXe4UyOI51JkyqQYPoAVXkTYWUuYBpWI/FMEDC/RVF8myL42GmqAZN3ikGhO/ErA/r4KmVhhb1UrfQqIQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72483,7 +72582,7 @@ in sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.2.13" + sources."@chemzqm/neovim-5.3.4" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -72527,7 +72626,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.14.1" - sources."fp-ts-2.10.5" + sources."fp-ts-2.11.0" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -72631,7 +72730,7 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."traverse-0.3.9" sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" @@ -72769,7 +72868,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72867,7 +72966,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73666,13 +73765,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.157"; + version = "1.1.158"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.157.tgz"; - sha512 = "GyjrMQFSqrAnBB0SlZC93JV9E8VAcsDhfCBHZ6DIRDCH9qsSI3g0Y0RGJp7v+JHDDZTrEPJiiPOu1e/6PFA90A=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.158.tgz"; + sha512 = "+aEgJAgklX3jRe+NkV4e5IgvU+6j0TtZFcjaKA50dYLiYUzjut7utjsxmBkrmacOEqRjcYlyWcHNpF20QaNZFQ=="; }; dependencies = [ - sources."pyright-1.1.157" + sources."pyright-1.1.158" ]; buildInputs = globalBuildInputs; meta = { @@ -73746,10 +73845,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.2"; + version = "0.47.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.2.tgz"; - sha512 = "DtUoWcXd++TT9PjjB5JDT3r+2c6wdZZlf2pCXeInELfwW/P4p10BKxP8EnMhkNq4jIzfP0V9QAwLMMppACFuRA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.3.tgz"; + sha512 = "S7ccnNNqL0ucbVuWlRA/41m/0dwwbD65p3/2IfQ5p2EyV74bcIVcTtU04rRfX9G2pdYOqWcCtmXT0hXfjHEZHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -73878,7 +73977,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73916,7 +74015,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74290,10 +74389,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.1.tgz"; - sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.2.tgz"; + sha512 = "bQ5bKzQ96W4ZMYZ2hkumWJsHOHtgNa/i3jS9DHqTeLLgesDg7KdHBxKDUbdVHq7BEG6TSPZF2m1BRpjxQPuS3A=="; }; dependencies = [ sources."typescript-4.3.5" @@ -74722,7 +74821,7 @@ in sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isarray-1.0.0" sources."kuler-2.0.0" sources."logform-2.2.0" @@ -75074,7 +75173,7 @@ in sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" @@ -75226,7 +75325,7 @@ in sources."read-1.0.7" sources."read-chunk-3.2.0" sources."read-package-json-2.1.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -75292,7 +75391,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -75383,7 +75482,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75754,7 +75853,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76730,10 +76829,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.11.0.tgz"; - sha512 = "4kjsgc/rV+qtH3dTqEnR/ug36yKNjyo5z674ySkD6k08DwlLs10fsP/I+d8BAsbtjpL36bqZxLa9iNgTDqioXQ=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.12.0.tgz"; + sha512 = "oXWAYO2ACrjFRYPTqUOQz3gCE7U1R5HVkuiqXXTFCcujiAprJjzvV5VAjrJolgA7guyRrXE5HliuDGoWJfWHOw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -76768,7 +76867,7 @@ in sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."merge2-1.4.1" @@ -76873,7 +76972,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.5" + sources."@types/node-14.17.6" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -76938,7 +77037,7 @@ in sources."lodash.isnil-4.0.0" sources."lodash.isundefined-3.0.1" sources."lodash.uniq-4.5.0" - sources."lossless-json-1.0.4" + sources."lossless-json-1.0.5" sources."method-missing-1.2.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" @@ -77011,30 +77110,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.58"; + version = "6.0.0-beta.59"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.58.tgz"; - sha512 = "dlGj8lrtUGOwoNaU/zEhbJMOEAqiZUcn9AJrX80saSplkkWEkOpoo4UkLJ256BLyK8nA1+k89pT/KMtFrUFcPg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.59.tgz"; + sha512 = "cFYnr5LKi+Hg+rzhL2OZq5S7vlqzNS8rlQzXiYtv4Ft6BY27CTJ8mz76nAxgjRFv0/rDUyKTY2NZUOPeztziMQ=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.58" - sources."@electron-forge/core-6.0.0-beta.58" - sources."@electron-forge/installer-base-6.0.0-beta.58" - sources."@electron-forge/installer-darwin-6.0.0-beta.58" - sources."@electron-forge/installer-deb-6.0.0-beta.58" - sources."@electron-forge/installer-dmg-6.0.0-beta.58" - sources."@electron-forge/installer-exe-6.0.0-beta.58" - sources."@electron-forge/installer-linux-6.0.0-beta.58" - sources."@electron-forge/installer-rpm-6.0.0-beta.58" - sources."@electron-forge/installer-zip-6.0.0-beta.58" - sources."@electron-forge/maker-base-6.0.0-beta.58" - sources."@electron-forge/plugin-base-6.0.0-beta.58" - sources."@electron-forge/publisher-base-6.0.0-beta.58" - sources."@electron-forge/shared-types-6.0.0-beta.58" - sources."@electron-forge/template-base-6.0.0-beta.58" - sources."@electron-forge/template-typescript-6.0.0-beta.58" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.58" - sources."@electron-forge/template-webpack-6.0.0-beta.58" + sources."@electron-forge/async-ora-6.0.0-beta.59" + sources."@electron-forge/core-6.0.0-beta.59" + sources."@electron-forge/installer-base-6.0.0-beta.59" + sources."@electron-forge/installer-darwin-6.0.0-beta.59" + sources."@electron-forge/installer-deb-6.0.0-beta.59" + sources."@electron-forge/installer-dmg-6.0.0-beta.59" + sources."@electron-forge/installer-exe-6.0.0-beta.59" + sources."@electron-forge/installer-linux-6.0.0-beta.59" + sources."@electron-forge/installer-rpm-6.0.0-beta.59" + sources."@electron-forge/installer-zip-6.0.0-beta.59" + sources."@electron-forge/maker-base-6.0.0-beta.59" + sources."@electron-forge/plugin-base-6.0.0-beta.59" + sources."@electron-forge/publisher-base-6.0.0-beta.59" + sources."@electron-forge/shared-types-6.0.0-beta.59" + sources."@electron-forge/template-base-6.0.0-beta.59" + sources."@electron-forge/template-typescript-6.0.0-beta.59" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.59" + sources."@electron-forge/template-webpack-6.0.0-beta.59" (sources."@electron/get-1.12.4" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77062,6 +77161,9 @@ in ]; }) sources."@malept/cross-spawn-promise-2.0.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -77069,7 +77171,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77109,6 +77211,7 @@ in sources."bluebird-3.7.2" sources."boolean-3.1.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -77227,11 +77330,14 @@ in sources."extract-zip-2.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" + sources."fill-range-7.0.1" (sources."find-up-5.0.0" // { dependencies = [ sources."locate-path-6.0.0" @@ -77279,6 +77385,7 @@ in sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.7" + sources."glob-parent-5.1.2" sources."global-agent-2.2.0" sources."global-modules-1.0.0" (sources."global-prefix-1.0.2" // { @@ -77316,9 +77423,12 @@ in sources."is-arrayish-0.2.1" sources."is-core-module-2.5.0" sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" sources."is-interactive-1.0.0" + sources."is-number-7.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" @@ -77376,6 +77486,8 @@ in sources."strip-bom-2.0.0" ]; }) + sources."merge2-1.4.1" + sources."micromatch-4.0.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" @@ -77410,7 +77522,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.13" + sources."tar-4.4.15" ]; }) sources."nopt-4.0.3" @@ -77468,6 +77580,7 @@ in sources."path-type-2.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picomatch-2.3.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -77493,6 +77606,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."rc-1.2.8" sources."rcedit-3.0.1" @@ -77513,9 +77627,11 @@ in sources."resolve-package-1.0.1" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."roarr-2.15.4" sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rxjs-7.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -77553,7 +77669,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -77574,6 +77690,7 @@ in }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" @@ -77707,7 +77824,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77742,7 +77859,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77779,7 +77896,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -78289,7 +78406,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.0" + sources."tar-6.1.2" ]; }) sources."cache-base-1.0.1" @@ -79301,7 +79418,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.35.2" // { + (sources."sass-1.36.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -79480,7 +79597,7 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.13" // { + (sources."tar-4.4.15" // { dependencies = [ sources."mkdirp-0.5.5" sources."yallist-3.1.1" @@ -80616,7 +80733,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80885,7 +81002,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81257,7 +81374,7 @@ in sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-string-1.0.6" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" @@ -81889,13 +82006,13 @@ in sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -81958,7 +82075,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.3" + sources."rollup-2.54.0" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82177,7 +82294,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -82296,7 +82413,7 @@ in sources."schema-utils-3.1.1" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -82637,7 +82754,7 @@ in sources."@babel/traverse-7.14.8" sources."@babel/types-7.14.8" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82664,7 +82781,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82689,7 +82806,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -83543,7 +83660,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83633,7 +83750,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.0" + sources."tar-6.1.2" ]; }) (sources."cacheable-request-6.1.0" // { @@ -83897,7 +84014,7 @@ in sources."google-auth-library-7.3.0" ]; }) - sources."google-p12-pem-3.1.0" + sources."google-p12-pem-3.1.1" sources."got-9.6.0" sources."graceful-fs-4.2.6" sources."gtoken-5.3.0" @@ -83964,7 +84081,7 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-stream-ended-0.1.4" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" @@ -84102,7 +84219,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."which-2.0.2" ]; }) @@ -84282,7 +84399,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.13" // { + (sources."tar-4.4.15" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -84530,7 +84647,7 @@ in sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -84649,7 +84766,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85300,7 +85417,7 @@ in sources."has-flag-4.0.0" sources."indent-string-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."lossless-json-1.0.4" + sources."lossless-json-1.0.5" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -85434,8 +85551,8 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.3" + sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" @@ -85501,7 +85618,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85551,7 +85668,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.30.0" + sources."contentful-management-7.31.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -85597,7 +85714,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85613,7 +85730,7 @@ in dependencies = [ sources."cross-spawn-7.0.3" sources."get-stream-6.0.1" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -85904,7 +86021,7 @@ in sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" sources."redux-4.1.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remark-mdx-2.0.0-next.9" @@ -86067,7 +86184,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.5.3" sources."xdg-basedir-4.0.0" - sources."xstate-4.23.0" + sources."xstate-4.23.1" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -86356,10 +86473,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.1.0.tgz"; - sha512 = "xf6lKP7Ptas6bIdn/KvOn7UqkPS9/BBKcGCDVrsak/e0dWYeDZIOCMNwWxLp/zEjwBMSiPZtJdOdsIdmWap3bQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.2.0.tgz"; + sha512 = "tpmDCrNmPrb1z5hauKtxXxYdHaV4+K4AjZqkzyQzDcV6tpUSBwYMGu66pFpw7g0Ux4QnE0pYSsdh3efDfYv1Pg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -86395,11 +86512,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.3.0" - ]; - }) + sources."ast-types-0.13.4" sources."atomically-1.7.0" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -86453,7 +86566,7 @@ in sources."deep-is-0.1.3" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."degenerator-2.2.0" + sources."degenerator-3.0.1" sources."depd-1.1.2" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" @@ -86509,8 +86622,13 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-7.3.3" - sources."inquirer-autocomplete-prompt-1.4.0" + sources."inquirer-8.1.2" + (sources."inquirer-autocomplete-prompt-1.4.0" // { + dependencies = [ + sources."rxjs-6.6.7" + sources."tslib-1.14.1" + ]; + }) sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" @@ -86522,7 +86640,7 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" @@ -86585,8 +86703,8 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."pac-proxy-agent-4.1.0" - sources."pac-resolver-4.2.0" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -86599,7 +86717,7 @@ in sources."pkg-up-3.1.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - (sources."proxy-agent-4.0.1" // { + (sources."proxy-agent-5.0.0" // { dependencies = [ sources."lru-cache-5.1.1" sources."yallist-3.1.1" @@ -86641,7 +86759,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + sources."rxjs-7.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -86675,7 +86793,7 @@ in sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."trim-newlines-3.0.1" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -86687,6 +86805,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" + sources."vm2-3.9.3" sources."wcwidth-1.0.1" sources."which-2.0.2" sources."widest-line-3.1.0" @@ -86814,7 +86933,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -86974,7 +87093,7 @@ in sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" - sources."http2-client-1.3.3" + sources."http2-client-1.3.5" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" @@ -87559,7 +87678,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.8" + sources."systeminformation-5.7.12" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -88455,7 +88574,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -89448,7 +89567,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.13" + sources."tar-4.4.15" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -89670,7 +89789,7 @@ in sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" - (sources."verda-1.3.0" // { + (sources."verda-1.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -89900,7 +90019,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.954.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90444,7 +90563,7 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.13" // { + (sources."tar-4.4.15" // { dependencies = [ sources."yallist-3.1.1" ]; @@ -90461,7 +90580,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.49.3" + sources."terminal-kit-1.49.4" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -90477,7 +90596,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" - sources."tree-kit-0.6.2" + sources."tree-kit-0.7.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -90503,7 +90622,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -91924,7 +92043,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92217,7 +92336,7 @@ in sources."is-number-object-1.0.5" sources."is-plain-obj-2.1.0" sources."is-regex-1.1.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-string-1.0.6" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" @@ -93068,19 +93187,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.0" + sources."@octokit/openapi-types-9.1.1" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.0" + sources."@octokit/plugin-rest-endpoint-methods-5.5.1" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.0" - sources."@octokit/types-6.21.0" + sources."@octokit/rest-18.7.1" + sources."@octokit/types-6.21.1" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -93354,7 +93473,7 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.1.3" sources."is-ssh-1.3.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-string-1.0.6" sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" @@ -93473,7 +93592,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.13" + sources."tar-4.4.15" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -93542,7 +93661,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-2.0.0" sources."read-package-json-2.1.2" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."read-package-tree-5.3.1" (sources."read-pkg-3.0.0" // { dependencies = [ @@ -93619,7 +93738,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -93642,7 +93761,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -94736,7 +94855,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94909,7 +95028,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -95033,7 +95152,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95430,7 +95549,7 @@ in sources."realpath-native-2.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" @@ -95788,16 +95907,16 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.27.1"; + version = "0.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.27.1.tgz"; - sha512 = "p1VV6aSbGrDlpUWzHizAnSNEQAweVR3qUI/AIUubxW7BGPXziSXkIED+uRtSohUlRS/jmqp3Wi4es5j6fIrdeQ=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.28.1.tgz"; + sha512 = "RBKtRRBzcuAF/H5wMSzb4zvEtbUkyYNEeaDtlQkyH9SoHWPL01emJ2Wrx6NEOa1ZDGwB+seBGvE157Qzc/t/vA=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."commander-7.1.0" + sources."commander-8.0.0" sources."concat-map-0.0.1" sources."deep-extend-0.6.0" sources."entities-2.1.0" @@ -95807,7 +95926,7 @@ in sources."ignore-5.1.8" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" + sources."ini-2.0.0" sources."js-yaml-4.1.0" sources."jsonc-parser-3.0.0" sources."linkify-it-3.0.2" @@ -95821,8 +95940,8 @@ in sources."minimist-1.2.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."rc-1.2.8" - sources."strip-json-comments-2.0.1" + sources."run-con-1.2.10" + sources."strip-json-comments-3.1.1" sources."uc.micro-1.0.6" sources."wrappy-1.0.2" ]; @@ -96281,7 +96400,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96295,7 +96414,7 @@ in sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.0.0" + sources."commander-8.1.0" sources."concat-map-0.0.1" sources."d3-5.16.0" sources."d3-array-1.2.4" @@ -96406,10 +96525,10 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.6.0.tgz"; - sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.7.0.tgz"; + sha512 = "seHSVEn7JJbOEuYD8T8UmqZcYT1iLCFp2mMA/+UyhcpRICLzClF9uQX3beAuHCZUymO3FBwdEjN4Ky5qd2kbHw=="; }; dependencies = [ sources."@fluentui/date-time-utilities-8.2.1" @@ -96418,7 +96537,7 @@ in sources."@fluentui/foundation-legacy-8.1.6" sources."@fluentui/keyboard-key-0.3.3" sources."@fluentui/merge-styles-8.1.3" - sources."@fluentui/react-8.22.0" + sources."@fluentui/react-8.23.8" sources."@fluentui/react-focus-8.1.8" sources."@fluentui/react-hooks-8.2.4" sources."@fluentui/react-window-provider-2.1.3" @@ -96429,7 +96548,6 @@ in sources."@microsoft/load-themed-styles-1.10.195" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/cors-2.8.12" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -96685,10 +96803,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.0.2.tgz"; - sha512 = "FpspiWU+UT9Sixx/wKimvnpkeW0mh6ROAKkIaPokj3xZgxeRhcna/k5X57jJghEr8X+Cgu/Vegf8zCX5ugSuTA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz"; + sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -96939,10 +97057,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.2.0"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.0.tgz"; - sha512 = "Jwy74SaN5rM4xTE2QSZijF0qN1a/ZGh1PJWUmzmVFX1RnEgA1QMZ7MVHW04UXxZ3igx+G03GGzC071+FRLKT6g=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.8.tgz"; + sha512 = "p6sCh6NCfU+eLtL6/ZIsCzhXXOyKUCQ8Xf4jy3HfjviT8QGbGey1ddP5ia1+opd+2pWV53xy09X11zAWMawPxw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -97067,21 +97185,39 @@ in sources."@babel/template-7.14.5" sources."@babel/traverse-7.14.8" sources."@babel/types-7.14.8" - sources."@bugsnag/browser-7.10.5" - sources."@bugsnag/core-7.10.0" + sources."@bugsnag/browser-7.11.0" + sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.10.5" - sources."@bugsnag/node-7.10.1" + sources."@bugsnag/js-7.11.0" + sources."@bugsnag/node-7.11.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-16.1.0" // { + (sources."@netlify/build-17.1.1" // { dependencies = [ + (sources."@netlify/zip-it-and-ship-it-4.15.1" // { + dependencies = [ + sources."execa-5.1.1" + sources."locate-path-6.0.0" + sources."p-locate-5.0.0" + sources."pkg-dir-5.0.0" + sources."semver-7.3.5" + sources."yargs-16.2.0" + ]; + }) sources."ansi-styles-4.3.0" sources."boxen-4.2.0" sources."chalk-3.0.0" - sources."execa-3.4.0" + sources."cp-file-9.1.0" + (sources."execa-3.4.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."human-signals-1.1.1" + ]; + }) + sources."get-stream-6.0.1" + sources."human-signals-2.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -97090,7 +97226,7 @@ in sources."update-notifier-4.1.3" ]; }) - (sources."@netlify/cache-utils-1.0.7" // { + (sources."@netlify/cache-utils-2.0.0" // { dependencies = [ sources."del-5.1.0" sources."locate-path-5.0.0" @@ -97098,7 +97234,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-13.0.0" // { + (sources."@netlify/config-14.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -97112,12 +97248,19 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.7.2" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.4.7" - (sources."@netlify/git-utils-1.0.11" // { + (sources."@netlify/functions-utils-2.0.2" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-4.15.1" + sources."cp-file-9.1.0" + sources."pkg-dir-5.0.0" + sources."resolve-2.0.0-next.3" + sources."yargs-16.2.0" + ]; + }) + (sources."@netlify/git-utils-2.0.0" // { dependencies = [ sources."braces-3.0.2" sources."execa-3.4.0" @@ -97127,43 +97270,39 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/local-functions-proxy-0.1.0" - sources."@netlify/local-functions-proxy-darwin-arm64-0.1.0" - sources."@netlify/local-functions-proxy-darwin-x64-0.1.0" - sources."@netlify/local-functions-proxy-freebsd-arm64-0.1.0" - sources."@netlify/local-functions-proxy-freebsd-x64-0.1.0" - sources."@netlify/local-functions-proxy-linux-arm-0.1.0" - sources."@netlify/local-functions-proxy-linux-arm64-0.1.0" - sources."@netlify/local-functions-proxy-linux-ia32-0.1.0" - sources."@netlify/local-functions-proxy-linux-ppc64-0.1.0" - sources."@netlify/local-functions-proxy-linux-x64-0.1.0" - sources."@netlify/local-functions-proxy-openbsd-x64-0.1.0" - sources."@netlify/local-functions-proxy-win32-ia32-0.1.0" - sources."@netlify/local-functions-proxy-win32-x64-0.1.0" + sources."@netlify/local-functions-proxy-1.0.0" + sources."@netlify/local-functions-proxy-darwin-arm64-1.0.0" + sources."@netlify/local-functions-proxy-darwin-x64-1.0.0" + sources."@netlify/local-functions-proxy-freebsd-arm64-1.0.0" + sources."@netlify/local-functions-proxy-freebsd-x64-1.0.0" + sources."@netlify/local-functions-proxy-linux-arm-1.0.0" + sources."@netlify/local-functions-proxy-linux-arm64-1.0.0" + sources."@netlify/local-functions-proxy-linux-ia32-1.0.0" + sources."@netlify/local-functions-proxy-linux-ppc64-1.0.0" + sources."@netlify/local-functions-proxy-linux-x64-1.0.0" + sources."@netlify/local-functions-proxy-openbsd-x64-1.0.0" + sources."@netlify/local-functions-proxy-win32-ia32-1.0.0" + sources."@netlify/local-functions-proxy-win32-x64-1.0.0" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.5" + sources."@types/node-14.17.6" + sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-2.19.3" sources."@netlify/routing-local-proxy-0.31.0" - (sources."@netlify/run-utils-1.0.7" // { + (sources."@netlify/run-utils-2.0.0" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.14.0" // { + (sources."@netlify/zip-it-and-ship-it-4.15.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -97216,10 +97355,8 @@ in }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" - sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -97280,18 +97417,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.0" + sources."@octokit/openapi-types-9.1.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.0" + sources."@octokit/plugin-rest-endpoint-methods-5.5.1" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.0" - sources."@octokit/types-6.21.0" + sources."@octokit/rest-18.7.1" + sources."@octokit/types-6.21.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97328,16 +97465,16 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.3" + sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" - sources."@types/semver-7.3.7" + sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.4" - (sources."@typescript-eslint/typescript-estree-4.28.4" // { + sources."@typescript-eslint/types-4.28.5" + (sources."@typescript-eslint/typescript-estree-4.28.5" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -97354,7 +97491,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.4" + sources."@typescript-eslint/visitor-keys-4.28.5" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -97368,7 +97505,6 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."global-cache-dir-2.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" @@ -97446,10 +97582,8 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -97487,7 +97621,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97555,7 +97689,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-6.0.0" + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -97711,11 +97845,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.10" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -97753,7 +97883,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -97923,7 +98053,7 @@ in sources."get-port-5.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.1" + sources."gh-release-fetch-2.0.2" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" sources."glob-7.1.7" @@ -97933,7 +98063,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - sources."global-cache-dir-1.0.1" + sources."global-cache-dir-2.0.0" sources."global-dirs-2.1.0" sources."globals-11.12.0" (sources."globby-10.0.2" // { @@ -98090,7 +98220,7 @@ in sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" @@ -98185,7 +98315,6 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -98300,7 +98429,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-7.0.1" // { + (sources."netlify-8.0.0" // { dependencies = [ sources."qs-6.10.1" ]; @@ -98420,8 +98549,12 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -98519,7 +98652,7 @@ in }) sources."rc-1.2.8" sources."react-is-16.13.1" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -98538,7 +98671,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpu-core-4.7.1" @@ -98571,7 +98704,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.3" + sources."rollup-2.54.0" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -98797,7 +98930,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.5" + sources."typescript-3.9.10" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -98882,7 +99015,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -98891,16 +99024,21 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" - sources."yarn-1.22.10" + sources."yargs-parser-20.2.9" + sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" sources."zip-stream-4.1.0" @@ -99028,7 +99166,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -99432,7 +99570,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" + sources."tar-4.4.15" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -99451,17 +99589,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.0.1.tgz"; - sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.3.tgz"; + sha512 = "sqhTY/p6lwO7lxjGrgbeZcml9xmpjeV1vdB/a3xXT6b5vAvq0bJgR5n+sXpZQc0JFSWGeygBXEoWvAAi39rkKQ=="; }; dependencies = [ sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" - sources."@node-red/editor-api-2.0.1" - sources."@node-red/editor-client-2.0.1" - (sources."@node-red/nodes-2.0.1" // { + sources."@node-red/editor-api-2.0.3" + sources."@node-red/editor-client-2.0.3" + (sources."@node-red/nodes-2.0.3" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.6.3" @@ -99474,15 +99612,15 @@ in }) ]; }) - sources."@node-red/registry-2.0.1" - sources."@node-red/runtime-2.0.1" - sources."@node-red/util-2.0.1" + sources."@node-red/registry-2.0.3" + sources."@node-red/runtime-2.0.3" + sources."@node-red/util-2.0.3" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99771,7 +99909,7 @@ in sources."raw-body-2.4.0" sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.0" @@ -100011,7 +100149,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -100242,7 +100380,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100442,7 +100580,7 @@ in sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-scoped-2.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-superb-4.0.0" @@ -100746,10 +100884,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.0"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.0.tgz"; - sha512 = "59Eje4RcXP9EKYPIJvBvQGTyfEvZWaKdOx5+YZ+IJ+fqYhJJH5ng78qcdD8sFPyA1g1MFBR0DYXKfncwbxXpVA=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.1.tgz"; + sha512 = "Fau808Ybtzja6SdOglKyUfEX1vC57Gq9zR20IfK2z+iwaLmYOHvHqf3zQoeXzNLDzT5bf+CnKns3EhHLFLguew=="; }; buildInputs = globalBuildInputs; meta = { @@ -101031,7 +101169,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -101067,7 +101205,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -101151,8 +101289,8 @@ in dependencies = [ sources."abbrev-1.1.1" sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" + sources."ansi-regex-3.0.0" + sources."aproba-2.0.0" sources."are-we-there-yet-1.1.5" sources."argparse-0.1.15" sources."asn1-0.2.4" @@ -101166,8 +101304,8 @@ in sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" - sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" + sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" (sources."config-chain-1.1.13" // { @@ -101203,7 +101341,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-2.7.4" + sources."gauge-3.0.1" sources."getpass-0.1.7" sources."glob-7.1.7" sources."graceful-fs-2.0.3" @@ -101214,7 +101352,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.1.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -101244,8 +101382,7 @@ in sources."semver-2.3.2" ]; }) - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" + sources."npmlog-5.0.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -101272,13 +101409,13 @@ in sources."signal-exit-3.0.3" sources."slide-1.1.6" sources."sshpk-1.16.1" - sources."string-width-1.0.2" + sources."string-width-2.1.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" (sources."tar-0.1.17" // { dependencies = [ sources."inherits-1.0.2" @@ -101608,7 +101745,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101746,7 +101883,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102155,7 +102292,7 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ @@ -102617,7 +102754,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -102729,7 +102866,7 @@ in sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; }; dependencies = [ - sources."addr-to-ip-port-1.5.1" + sources."addr-to-ip-port-1.5.3" sources."airplay-protocol-2.0.2" (sources."airplayer-2.0.0" // { dependencies = [ @@ -102745,7 +102882,7 @@ in sources."balanced-match-1.0.2" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bep53-range-1.1.1" sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -103040,14 +103177,14 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.5.1.tgz"; - sha512 = "sXl2KCt8LCUrL6ezEPD4W5D5b+I0/VVOYlfI0K3GfdVUXkNHcb0q7cogPNjAXmoSMhvb57x2nhZN1xwxgGjzuw=="; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.6.0.tgz"; + sha512 = "NGLR8G6SP7WriloFrS5JDU8Rx1Ia1OlbJOpqGeAzMKxhrajnAdPza8VeXozMUk0oBCS8hr+cuLQ7stprgzISXg=="; }; dependencies = [ sources."accepts-1.3.7" - sources."addr-to-ip-port-1.5.1" + sources."addr-to-ip-port-1.5.3" sources."after-0.8.2" sources."ajv-6.12.6" sources."archiver-3.1.1" @@ -103405,10 +103542,10 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.3.0.tgz"; - sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.1.tgz"; + sha512 = "jT/sptM1ZG++FNk+jnJYNoWLDQXYd7hqpnBhd5j18SNW1jJzNYo55RahuCiD0KN0PX9mb53GWCqKM0ia/mJytA=="; }; dependencies = [ sources."@babel/helper-validator-identifier-7.14.8" @@ -103523,7 +103660,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - sources."pkg-fetch-3.1.1" + sources."pkg-fetch-3.2.2" sources."prebuild-install-6.0.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -103788,7 +103925,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.8" + sources."systeminformation-5.7.12" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -104392,13 +104529,113 @@ in bypassCache = true; reconstructLock = true; }; + pxder = nodeEnv.buildNodePackage { + name = "pxder"; + packageName = "pxder"; + version = "2.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pxder/-/pxder-2.12.5.tgz"; + sha512 = "ttaD66WscLYQ4qIc/UbOvYvDfKYqbAzIzwFoFYyzLqQ0BhhZsVaIJhgl9oBo5NzMV4Cqu7dhxJP9noxqS9eqgw=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."agent-base-6.0.2" + sources."appdata-path-1.0.0" + sources."at-least-node-1.0.0" + sources."axios-0.21.1" + sources."blueimp-md5-2.18.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."call-bind-1.0.2" + sources."clone-response-1.0.2" + sources."colors-1.4.0" + sources."commander-5.1.0" + sources."compare-versions-3.6.0" + sources."debug-4.3.2" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."duplexer3-0.1.4" + sources."end-of-stream-1.4.4" + sources."follow-redirects-1.14.1" + sources."fs-extra-9.1.0" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."get-stream-4.1.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-symbols-1.0.2" + sources."http-cache-semantics-4.1.0" + sources."https-proxy-agent-5.0.0" + sources."ini-1.3.8" + sources."ip-1.1.5" + sources."is-docker-2.2.1" + sources."is-wsl-2.2.0" + sources."js-base64-3.6.1" + sources."json-buffer-3.0.0" + sources."jsonfile-6.1.0" + sources."keyv-3.1.0" + sources."kleur-3.0.3" + sources."latest-version-5.1.0" + sources."lodash.flatmap-4.5.0" + sources."lowercase-keys-1.0.1" + sources."mimic-response-1.0.1" + sources."minimist-1.2.5" + sources."moment-2.29.1" + sources."ms-2.1.2" + sources."normalize-url-4.5.1" + sources."object-inspect-1.11.0" + sources."once-1.4.0" + sources."open-7.4.2" + sources."p-cancelable-1.1.0" + sources."package-json-6.5.0" + sources."pixiv-api-client-0.25.0" + sources."prepend-http-2.0.0" + sources."prompts-2.4.1" + sources."pump-3.0.0" + sources."qs-6.10.1" + sources."rc-1.2.8" + sources."readline-sync-1.4.10" + sources."register-protocol-win32-1.1.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."responselike-1.0.2" + sources."semver-6.3.0" + sources."side-channel-1.0.4" + sources."sisteransi-1.0.5" + sources."smart-buffer-4.1.0" + sources."socks-2.6.1" + sources."socks-proxy-agent-5.0.1" + sources."strip-json-comments-2.0.1" + sources."to-readable-stream-1.0.0" + sources."universalify-2.0.0" + sources."url-parse-lax-3.0.0" + sources."winreg-1.2.4" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Download illusts from pixiv.net P站插画批量下载器"; + homepage = "https://github.com/Tsuk1ko/pxder#readme"; + license = "GPL-3.0-or-later"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.157"; + version = "1.1.158"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; - sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.158.tgz"; + sha512 = "gT+uy5OYyRTbB7997hag74kUuDh7XdMFYjj6AgBQ5Zp53e7oL09RH10zNDVHvI9nzuooiWjYkIS0rhuapfDL0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -104881,7 +105118,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -105069,7 +105306,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105298,7 +105535,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105696,8 +105933,12 @@ in ]; }) sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + (sources."mime-types-2.1.31" // { + dependencies = [ + sources."mime-db-1.48.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -106011,7 +106252,7 @@ in sources."readdirp-3.6.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -106356,7 +106597,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -106687,12 +106928,12 @@ in sources."@redocly/ajv-8.6.2" (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ - sources."@types/node-14.17.5" + sources."@types/node-14.17.6" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.2" + sources."@types/node-15.14.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -106806,7 +107047,7 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http2-client-1.3.3" + sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."inherits-2.0.1" @@ -106899,7 +107140,7 @@ in ]; }) sources."reftools-1.1.9" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."ripemd160-2.0.2" @@ -106932,7 +107173,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -107168,10 +107409,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.3"; + version = "2.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; - sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.54.0.tgz"; + sha512 = "RHzvstAVwm9A751NxWIbGPFXs3zL4qe/eYg+N7WwGtIXVLy1cK64MiU37+hXeFm1jqipK6DGgMi6Z2hhPuCC3A=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -107224,16 +107465,16 @@ in sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" sources."@types/node-12.12.70" - sources."@types/node-fetch-2.5.11" + sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" sources."@types/vscode-1.58.1" - sources."@typescript-eslint/eslint-plugin-4.28.4" - sources."@typescript-eslint/experimental-utils-4.28.4" - sources."@typescript-eslint/parser-4.28.4" - sources."@typescript-eslint/scope-manager-4.28.4" - sources."@typescript-eslint/types-4.28.4" - sources."@typescript-eslint/typescript-estree-4.28.4" - sources."@typescript-eslint/visitor-keys-4.28.4" + sources."@typescript-eslint/eslint-plugin-4.28.5" + sources."@typescript-eslint/experimental-utils-4.28.5" + sources."@typescript-eslint/parser-4.28.5" + sources."@typescript-eslint/scope-manager-4.28.5" + sources."@typescript-eslint/types-4.28.5" + sources."@typescript-eslint/typescript-estree-4.28.5" + sources."@typescript-eslint/visitor-keys-4.28.5" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -107497,7 +107738,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.3" + sources."rollup-2.54.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107702,10 +107943,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.35.2"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz"; - sha512 = "jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.36.0.tgz"; + sha512 = "fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -107875,10 +108116,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.52.0"; + version = "2.52.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.52.0.tgz"; - sha512 = "MoEA+YLQsfknLuc2d/uV8vTehnAsAJqOXCyQLOZn3/QQ+rdwUFzasbg0m+zZdNMespfcHDTTht+CUgS2/svUJw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.52.1.tgz"; + sha512 = "aDMJiSyCxqbJCt7011L0rMsxkd1lHSz8HotUiQWE8dFFqm3txZ1MpEy01bOLx4n35Qnyj1F8g+jmT9x+WnI2ZQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -107926,7 +108167,6 @@ in sources."argparse-1.0.10" ]; }) - sources."jwt-decode-3.1.2" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" sources."write-file-atomic-3.0.3" @@ -107945,6 +108185,7 @@ in dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" + sources."jwt-decode-2.2.0" ]; }) (sources."@serverless/platform-client-china-2.2.0" // { @@ -107957,7 +108198,6 @@ in (sources."@serverless/utils-5.6.0" // { dependencies = [ sources."get-stream-6.0.1" - sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" ]; }) @@ -107972,7 +108212,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -108033,7 +108273,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.954.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108391,14 +108631,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.6.0" // { + (sources."jszip-3.7.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) - sources."jwt-decode-2.2.0" + sources."jwt-decode-3.1.2" (sources."kafka-node-5.0.0" // { dependencies = [ sources."uuid-3.4.0" @@ -108651,7 +108891,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -109388,10 +109628,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.664.0"; + version = "1.668.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.664.0.tgz"; - sha512 = "4YPqDdPPZsn3BBN82UiN6+Jy4zdKbBvw4MKClvh2QQgUJy6R9nEm/Q8IbdsM0jOqPByDRWVMwsCPQu3ZpqG3KA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.668.0.tgz"; + sha512 = "iBcq6b2OOZAunU0qwbLhSHbfG3T1FtMTqTr0FUhOUAu9wRPAN5XbknRVeOb+ap1IbtzWeV1k6weY5Mp4liWirw=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -109413,7 +109653,7 @@ in sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.2.4" + sources."@snyk/docker-registry-v2-client-2.3.0" sources."@snyk/fast-glob-3.2.6-patch" (sources."@snyk/fix-1.650.0" // { dependencies = [ @@ -109441,7 +109681,7 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/java-call-graph-builder-1.23.0" // { + (sources."@snyk/java-call-graph-builder-1.23.1" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109458,7 +109698,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@snyk/snyk-docker-pull-3.6.3" // { + (sources."@snyk/snyk-docker-pull-3.7.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109471,7 +109711,7 @@ in }) sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" - sources."@types/debug-4.1.6" + sources."@types/debug-4.1.7" sources."@types/emscripten-1.39.5" sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.8" @@ -109483,10 +109723,11 @@ in sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" sources."@types/minimatch-3.0.5" + sources."@types/ms-0.7.31" sources."@types/node-13.13.52" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.4" - sources."@types/semver-7.3.7" + sources."@types/semver-7.3.8" sources."@types/treeify-1.0.0" sources."@types/uuid-8.3.1" (sources."@yarnpkg/core-2.4.0" // { @@ -109501,11 +109742,11 @@ in sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.4.0" - sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.2.1" + sources."@yarnpkg/fslib-2.5.0" + sources."@yarnpkg/json-proxy-2.1.1" + sources."@yarnpkg/libzip-2.2.2" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.3.0" + sources."@yarnpkg/parsers-2.4.0" sources."@yarnpkg/pnp-2.3.2" (sources."@yarnpkg/shell-2.4.1" // { dependencies = [ @@ -109627,7 +109868,7 @@ in sources."docker-modem-2.1.3" sources."dockerfile-ast-0.2.1" sources."dot-prop-5.3.0" - sources."dotnet-deps-parser-5.0.0" + sources."dotnet-deps-parser-5.1.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -109725,7 +109966,7 @@ in sources."json-buffer-3.0.1" sources."json-file-plus-3.3.1" sources."json-stringify-safe-5.0.1" - (sources."jszip-3.6.0" // { + (sources."jszip-3.7.0" // { dependencies = [ sources."pako-1.0.11" sources."readable-stream-2.3.7" @@ -109944,7 +110185,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.16.0" // { + (sources."snyk-gradle-plugin-3.16.1" // { dependencies = [ sources."chalk-3.0.0" sources."rimraf-3.0.2" @@ -109953,19 +110194,9 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.26.1" // { + (sources."snyk-mvn-plugin-2.26.2" // { dependencies = [ - (sources."@snyk/java-call-graph-builder-1.21.0" // { - dependencies = [ - sources."tmp-0.2.1" - ]; - }) - sources."rimraf-3.0.2" - (sources."tmp-0.1.0" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) @@ -109976,15 +110207,7 @@ in sources."p-map-2.1.0" ]; }) - (sources."snyk-nuget-plugin-1.21.1" // { - dependencies = [ - sources."jszip-3.4.0" - sources."pako-1.0.11" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."snyk-nuget-plugin-1.22.0" sources."snyk-paket-parser-1.6.0" (sources."snyk-php-plugin-1.9.2" // { dependencies = [ @@ -110060,12 +110283,12 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."type-fest-0.16.0" ]; }) @@ -110149,7 +110372,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -110369,7 +110592,6 @@ in sources."random-access-storage-1.3.0" ]; }) - sources."@types/minimatch-3.0.5" sources."abstract-leveldown-6.0.3" sources."aligned-block-file-1.2.2" sources."ansi-escapes-1.4.0" @@ -110380,7 +110602,6 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-differ-3.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" @@ -110464,8 +110685,6 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."commander-2.20.3" sources."compare-at-paths-1.0.0" sources."component-emitter-1.3.0" @@ -110519,7 +110738,6 @@ in sources."abstract-leveldown-6.3.0" ]; }) - sources."end-of-stream-1.4.4" sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" (sources."es-abstract-1.18.3" // { @@ -110534,16 +110752,6 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" - (sources."execa-4.1.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."onetime-5.1.2" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -110561,7 +110769,6 @@ in sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - sources."find-up-4.1.0" (sources."flumecodec-0.0.0" // { dependencies = [ sources."level-codec-6.2.0" @@ -110607,7 +110814,6 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -110618,7 +110824,6 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-flag-4.0.0" sources."has-network-0.0.1" sources."has-symbols-1.0.2" (sources."has-value-1.0.0" // { @@ -110640,10 +110845,8 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" - sources."human-signals-1.1.1" sources."idb-kv-store-4.5.0" sources."ieee754-1.2.1" - sources."ignore-5.1.8" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -110699,7 +110902,6 @@ in sources."is-primitive-2.0.0" sources."is-regex-1.1.3" sources."is-set-2.0.2" - sources."is-stream-2.0.0" sources."is-string-1.0.6" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" @@ -110748,7 +110950,6 @@ in sources."libnested-1.5.0" sources."libsodium-0.7.9" sources."libsodium-wrappers-0.7.9" - sources."locate-path-5.0.0" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" @@ -110764,9 +110965,7 @@ in sources."markdown-table-0.4.0" sources."math-random-1.0.4" sources."mdmanifest-1.0.8" - sources."merge-stream-2.0.0" sources."micromatch-2.3.11" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -110778,17 +110977,10 @@ in sources."mkdirp-classic-0.5.3" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" - sources."mri-1.1.6" sources."ms-2.1.2" sources."multiblob-1.13.7" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" - (sources."multimatch-4.0.0" // { - dependencies = [ - sources."array-union-2.1.0" - sources."arrify-2.0.1" - ]; - }) sources."multiserver-3.7.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" @@ -110820,11 +111012,6 @@ in sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" - (sources."npm-run-path-4.0.1" // { - dependencies = [ - sources."path-key-3.1.1" - ]; - }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -110867,15 +111054,11 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-defer-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."packet-stream-2.0.6" sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" @@ -110886,14 +111069,6 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.3.2" - (sources."pretty-quick-3.1.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."supports-color-7.2.0" - ]; - }) sources."private-box-0.3.1" sources."process-nextick-args-2.0.1" sources."promisify-4loc-1.0.0" @@ -110901,17 +111076,11 @@ in sources."prr-1.0.1" sources."pull-abortable-4.0.0" sources."pull-async-1.0.0" - (sources."pull-async-filter-1.0.0" // { - dependencies = [ - sources."pull-stream-2.28.4" - ]; - }) sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-cat-1.1.11" sources."pull-catch-1.0.1" sources."pull-cont-0.1.1" - sources."pull-core-1.1.0" sources."pull-cursor-3.0.0" sources."pull-defer-0.2.3" sources."pull-drain-gently-1.1.0" @@ -110963,7 +111132,6 @@ in }) sources."pull-write-1.1.4" sources."pull-write-file-0.2.4" - sources."pump-3.0.0" sources."punycode-1.4.1" sources."push-stream-10.1.2" (sources."push-stream-to-pull-stream-1.0.5" // { @@ -111100,7 +111268,6 @@ in sources."object-inspect-1.11.0" ]; }) - sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -111149,7 +111316,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.1.4" // { + (sources."ssb-db2-2.1.5" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -111163,7 +111330,7 @@ in sources."mkdirp-1.0.4" sources."push-stream-11.0.1" sources."rimraf-3.0.2" - (sources."ssb-keys-8.1.0" // { + (sources."ssb-keys-8.2.0" // { dependencies = [ sources."mkdirp-0.5.5" ]; @@ -111203,11 +111370,10 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.14.3" sources."ssb-replicate-1.3.3" - sources."ssb-sort-1.1.3" sources."ssb-unix-socket-1.0.0" (sources."ssb-validate-4.1.4" // { dependencies = [ - sources."ssb-keys-8.1.0" + sources."ssb-keys-8.2.0" ]; }) sources."ssb-ws-6.2.3" @@ -111242,7 +111408,6 @@ in sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" - sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" (sources."tape-4.13.3" // { @@ -111415,7 +111580,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.951.0" // { + (sources."aws-sdk-2.954.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112253,7 +112418,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112291,7 +112456,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112533,7 +112698,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -112576,7 +112741,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.2" + sources."svelte2tsx-0.4.3" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."typescript-4.3.5" @@ -112615,7 +112780,7 @@ in sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; }; dependencies = [ - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -113295,7 +113460,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -113455,7 +113620,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.4.1" + sources."typegram-3.4.2" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -114759,7 +114924,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -115078,7 +115243,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -115146,7 +115311,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.2.2" sources."supports-color-7.2.0" - sources."tar-4.4.13" + sources."tar-4.4.15" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" @@ -115680,7 +115845,7 @@ in sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."jsonfile-6.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -115723,10 +115888,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.10"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz"; - sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; }; buildInputs = globalBuildInputs; meta = { @@ -115772,7 +115937,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.5" + sources."@types/node-14.17.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -115825,7 +115990,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.7" + sources."diff2html-3.4.8" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -115882,7 +116047,7 @@ in sources."is-arrayish-0.3.2" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."jquery-3.6.0" @@ -116157,7 +116322,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.0" + sources."tar-6.1.2" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -116697,7 +116862,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116737,7 +116902,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116792,7 +116957,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -116891,7 +117056,6 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" - sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" @@ -116944,17 +117108,17 @@ in sources."supports-color-5.5.0" ]; }) - sources."vscode-debugadapter-testsupport-1.47.0" - sources."vscode-debugprotocol-1.47.0" + sources."vscode-debugadapter-testsupport-1.48.0" + sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.45.1" + sources."webpack-5.47.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-2.3.1" + sources."webpack-sources-3.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -117245,7 +117409,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -117304,7 +117468,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -118365,7 +118529,7 @@ in sources."punycode-2.1.1" sources."raf-3.4.1" sources."readable-stream-2.3.7" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" sources."rgbcolor-1.0.1" sources."rimraf-3.0.2" @@ -118386,7 +118550,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.0" + sources."tar-6.1.2" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -118476,7 +118640,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118736,7 +118900,7 @@ in sources."is-path-inside-3.0.3" sources."is-regex-1.1.3" sources."is-relative-0.1.3" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" @@ -118768,7 +118932,7 @@ in ]; }) sources."jsprim-1.4.1" - sources."jszip-3.6.0" + sources."jszip-3.7.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-3.1.0" @@ -118883,7 +119047,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" @@ -119029,17 +119193,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.45.1"; + version = "5.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; - sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.47.0.tgz"; + sha512 = "soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -119062,11 +119226,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001246" + sources."caniuse-lite-1.0.30001247" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.782" + sources."electron-to-chromium-1.3.788" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -119098,7 +119262,6 @@ in sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" - sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."supports-color-8.1.1" @@ -119111,7 +119274,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-2.3.1" + sources."webpack-sources-3.0.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -119153,7 +119316,7 @@ in sources."interpret-2.2.0" sources."is-core-module-2.5.0" sources."is-plain-object-2.0.4" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" @@ -119204,7 +119367,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.0" + sources."@types/node-16.4.3" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119735,7 +119898,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -119858,15 +120021,15 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.0" - sources."addr-to-ip-port-1.5.1" + sources."@types/node-16.4.3" + sources."addr-to-ip-port-1.5.3" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bencode-2.0.1" - sources."bep53-range-1.1.0" + sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.1" // { @@ -119875,20 +120038,20 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-lsd-1.1.0" // { + (sources."bittorrent-lsd-1.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.3" + sources."bittorrent-peerid-1.3.4" (sources."bittorrent-protocol-3.4.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.17.3" // { + (sources."bittorrent-tracker-9.17.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -119943,7 +120106,7 @@ in }) sources."core-util-is-1.0.2" sources."cpus-1.0.3" - sources."create-torrent-4.7.0" + sources."create-torrent-4.7.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -119962,6 +120125,7 @@ in sources."err-code-3.0.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" + sources."fast-fifo-1.0.0" sources."filestream-5.0.0" sources."freelist-1.0.3" (sources."fs-chunk-store-2.0.3" // { @@ -119997,6 +120161,7 @@ in sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" + sources."limiter-1.1.5" (sources."load-ip-set-2.2.1" // { dependencies = [ sources."decompress-response-6.0.0" @@ -120102,11 +120267,13 @@ in sources."ms-2.1.2" ]; }) + sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" + sources."streamx-2.10.3" sources."string-width-4.2.2" (sources."string2compact-1.3.0" // { dependencies = [ @@ -120121,7 +120288,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.0" // { + (sources."torrent-discovery-9.4.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -120148,7 +120315,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.2.5" // { + (sources."webtorrent-1.3.3" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -120270,10 +120437,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.10"; + version = "1.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; - sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.11.tgz"; + sha512 = "AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg=="; }; buildInputs = globalBuildInputs; meta = { @@ -120332,7 +120499,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.2" + sources."@types/node-15.14.3" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -120895,7 +121062,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."read-cmd-shim-2.0.0" - sources."read-package-json-fast-2.0.2" + sources."read-package-json-fast-2.0.3" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -120927,7 +121094,7 @@ in sources."indent-string-2.1.0" ]; }) - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" @@ -121049,7 +121216,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -121168,7 +121335,7 @@ in sources."has-flag-4.0.0" sources."inquirer-8.1.2" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" sources."ms-2.1.2" @@ -121232,8 +121399,8 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.0" - sources."@types/node-fetch-2.5.11" + sources."@types/node-16.4.3" + sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" sources."chalk-4.1.1" From 1d4ae0cfb779ae252432a55f67c97735022eaa02 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 00:31:53 +0000 Subject: [PATCH 0719/1522] libpoly: 0.1.9 -> 0.1.10 --- pkgs/applications/science/logic/poly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 75ad91bc54d..c80b9bf1f0c 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag rev = "refs/tags/v${version}"; - sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk="; + sha256 = "sha256-22Y4L5NFnCzKwZt0A/ChMuGPU4Dk1Qyke6mdvfN063w="; }; # https://github.com/SRI-CSL/libpoly/pull/52 From 47dbd87fbd1ed9751b440f90d532a200d9e2bd15 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 19 Jul 2021 20:09:45 -0700 Subject: [PATCH 0720/1522] makemkv: 1.16.3 -> 1.16.4 --- pkgs/applications/video/makemkv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9ab35b92a86..54f3d42e7a7 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -13,21 +13,21 @@ }: let - version = "1.16.3"; + version = "1.16.4"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg="; + sha256 = "18kalql846b9ggl3nsz2dpbg51byn8pj0y68fsdcgwwkgvsx7yr2"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0="; + sha256 = "0ssg3q1z80652d4gkv1z7kpsxx82xcw6kpsw266c8q4y2n8x7c76"; }; in mkDerivation { pname = "makemkv"; From e9f8d68fe763a65c3594abdecc1c868826f487ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 01:50:03 +0000 Subject: [PATCH 0721/1522] agi: 1.1.0-dev-20210521 -> 2.1.0-dev-20210726 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 57f9d7e3314..950849cafc4 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210521"; + version = "2.1.0-dev-20210726"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-otdthD5p+12JmBltFtXgVaa1fgsItluHv0S4k/GbB9Q="; + sha256 = "sha256-1joE2+lNFs0VmglqLsbyqhj16tfCZ+saQmy1XP3ATBo="; }; nativeBuildInputs = [ From 6f0fc1c9b8037add881d77846aa69362c6bbf437 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Jul 2021 02:20:54 +0000 Subject: [PATCH 0722/1522] libfprint: 1.90.7 -> 1.92.1 --- pkgs/development/libraries/libfprint/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 979ba7eea53..42e308f41a9 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -10,6 +10,8 @@ , nss , gobject-introspection , coreutils +, cairo +, libgudev , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.7"; + version = "1.92.1"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI="; + sha256 = "0dpwzmwl9jjpaz44znvy3v8s9sln0c71b756rs1knk0zx8sa1qbc"; }; nativeBuildInputs = [ @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { pixman glib nss + cairo + libgudev ]; checkInputs = [ @@ -53,6 +57,7 @@ stdenv.mkDerivation rec { "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" # Include virtual drivers for fprintd tests "-Ddrivers=all" + "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" ]; doCheck = true; @@ -61,7 +66,9 @@ stdenv.mkDerivation rec { patchShebangs \ tests/test-runner.sh \ tests/unittest_inspector.py \ - tests/virtual-image.py + tests/virtual-image.py \ + tests/umockdev-test.py \ + tests/test-generated-hwdb.sh ''; meta = with lib; { From 0a002b6b6cd5d317ae51d943602e318afb3efd57 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Jul 2021 02:38:45 +0000 Subject: [PATCH 0723/1522] fprintd: 1.90.9 -> 1.92.0 --- pkgs/tools/security/fprintd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 0ae04ddb30f..1340ec26ca2 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.90.9"; + version = "1.92.0"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; + sha256 = "0bqzxxb5iq3pdwdv1k8wsx3alirbjla6zgcki55b5p6mzrvk781x"; }; nativeBuildInputs = [ From 56665c1f9712d23dc3963fdb0dd47da223c9e2a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 02:59:25 +0000 Subject: [PATCH 0724/1522] choose: 1.3.2 -> 1.3.3 --- pkgs/tools/text/choose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index f5cded1beab..b214c65b534 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "theryangeary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QX0tAo1cGPpRhggiAPxsVhKXg6TgaVl1lcp3na7jUNw="; + sha256 = "sha256-HYwlAgFKbi6or2eblERdMMjJOJdtt2FCQECUg3MzO8E="; }; - cargoSha256 = "sha256-3pK7y/zC5iZkto5p5Xerlpu3yfN6sB2kjLF2fURlUj0="; + cargoSha256 = "sha256-55/B+LxdbekfaKKyng0lUCU3QnqL34M+QnLUxaPqkqI="; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; From 8f85e89c038d7ebcb03ba90788163eb47fd0cf4e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Jul 2021 23:30:02 +0200 Subject: [PATCH 0725/1522] tailscale: 1.10.2 -> 1.12.0 https://github.com/tailscale/tailscale/releases/tag/v1.12.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e09def926e1..094173256c0 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.10.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-bAWQTdpqDF7ERQzNY1k0NtxdA9M9bIyfHtvX0nKfIQY="; + sha256 = "sha256-PdCEmB0qchXtxIDfQVjA7f6YgHUe3ojmsMazpq4k6Bo="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "1mq5bbz9vsxhcrwxpsdnhp8q8zrnp6jpqggn9n5kqr82f3bizwxv"; + vendorSha256 = "sha256-NIf5nyUXZY5UGFcdjeeFZdGKVcD2pve+PytziCD2NFk="; doCheck = false; From 9ee8bd188933750be0584f285daf9a295d0c8930 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Tue, 27 Jul 2021 10:07:51 -0300 Subject: [PATCH 0726/1522] vscode-extensions: uniform extension namingconvention --- .../from_md/release-notes/rl-2111.section.xml | 26 +++++++++++++++++++ .../manual/release-notes/rl-2111.section.md | 5 ++++ pkgs/misc/vscode-extensions/default.nix | 8 +++--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 9dd98a5262f..570262d380a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -555,6 +555,32 @@ 6.0.0 to 9.0.0 + + + The following Visual Studio Code extensions were renamed to + keep the naming convention uniform. + + + + + bbenoist.Nix -> + bbenoist.nix + + + + + CoenraadS.bracket-pair-colorizer -> + coenraads.bracket-pair-colorizer + + + + + golang.Go -> + golang.go + + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 12e1a938433..b8936e31844 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -142,6 +142,11 @@ pt-services.clipcat.enable). - the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 +- The following Visual Studio Code extensions were renamed to keep the naming convention uniform. + - `bbenoist.Nix` -> `bbenoist.nix` + - `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer` + - `golang.Go` -> `golang.go` + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2941c95bb4e..7a825f4f683 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -207,7 +207,7 @@ let }; }; - bbenoist.Nix = buildVscodeMarketplaceExtension { + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; publisher = "bbenoist"; @@ -296,7 +296,7 @@ let }; }; - CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension { + coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; description = "A customizable extension for colorizing matching brackets"; @@ -708,7 +708,7 @@ let }; }; - golang.Go = buildVscodeMarketplaceExtension { + golang.go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; publisher = "golang"; @@ -1518,7 +1518,7 @@ let aliases = self: super: { # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; }; # TODO: add overrides overlay, so that we can have a generated.nix From 67fc7263b2de781d6c6145c7637669b00e616d58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jul 2021 04:20:00 +0000 Subject: [PATCH 0727/1522] nvchecker: 2.3 -> 2.4 --- .../python-modules/nvchecker/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index b3fd0384ef4..62942108ff4 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , pytestCheckHook , setuptools @@ -21,24 +20,16 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.3"; + version = "2.4"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx"; + sha256 = "0ys4shp7gz6aaxrbflwcz7yjbvdv2v8pgj047p4rnp8ascpxg044"; }; - patches = [ - # Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179 - (fetchpatch { - url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch"; - sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9"; - }) - ]; - nativeBuildInputs = [ installShellFiles docutils ]; propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; From 2451e7b2471ae4862f062bf212da03e027df3994 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jul 2021 04:20:00 +0000 Subject: [PATCH 0728/1522] overpass: 3.0.4 -> 3.0.5 --- pkgs/data/fonts/overpass/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 1d0cf04d756..120098fd67f 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,18 +1,20 @@ { lib, fetchzip }: let - version = "3.0.4"; + version = "3.0.5"; in fetchzip rec { name = "overpass-${version}"; - url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip"; + url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} + mkdir -p $out/share/fonts $out/share/doc + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; - sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64"; + sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; meta = with lib; { homepage = "https://overpassfont.org/"; From 314c1772c829474889c83f3411b60cc6988f0f69 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 28 Jul 2021 04:21:27 +0000 Subject: [PATCH 0729/1522] perlPackages.ack: 3.4.0 -> 3.5.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6124fc5859e..1ac5196f265 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -91,11 +91,11 @@ let ack = buildPerlPackage { pname = "ack"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.4.0.tar.gz"; - sha256 = "0l3bkac2kl1nl5pwmh5b4plyr7wdzf1h501gwkga2ag1p6wxdkvf"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.5.0.tar.gz"; + sha256 = "sha256-ZgU+iE6AM4egLd7g1oq/KhAjn6tlQ2TaszKHMJpyVSE="; }; outputs = ["out" "man"]; From 509685636d01c653889d0fe7da020ada72284173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Jul 2021 05:31:07 +0100 Subject: [PATCH 0730/1522] gpodder: fix gtk3 wrapping (#131765) --- pkgs/applications/audio/gpodder/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 681c6ffe281..cd5e476b884 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -29,8 +29,14 @@ python3Packages.buildPythonApplication rec { glibcLocales ]; + # as of 2021-07, the gobject-introspection setup hook does not + # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` + # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + buildInputs = [ python3 + gtk3 gobject-introspection gnome.adwaita-icon-theme ]; @@ -49,7 +55,6 @@ python3Packages.buildPythonApplication rec { eyeD3 podcastparser html5lib - gtk3 ]; makeFlags = [ From 87f2965a8bf4ee78fc6bc018a2f445b01547b77c Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 26 Jul 2021 10:53:29 +1000 Subject: [PATCH 0731/1522] python3Packages.luddite: init at 1.0.2 --- .../python-modules/luddite/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/luddite/default.nix diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix new file mode 100644 index 00000000000..7e8a1c5dfed --- /dev/null +++ b/pkgs/development/python-modules/luddite/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pytest-socket +, pytest-mock +}: + +buildPythonPackage rec { + pname = "luddite"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "jumptrading"; + repo = pname; + rev = "v${version}"; + sha256 = "8/7uwO5HLhyXYt+T6VUO/O7TN9+FfRlT8y0r5+CJ/l4="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=luddite --cov-report=html --cov-report=term --no-cov-on-fail" "" + ''; + + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook pytest-socket pytest-mock ]; + pythonImportsCheck = [ "luddite" ]; + + meta = with lib; { + description = "Checks for out-of-date package versions"; + homepage = "https://github.com/jumptrading/luddite"; + license = licenses.asl20; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9edbebedf..c81ca8b0a2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25518,6 +25518,8 @@ in lscolors = callPackage ../applications/misc/lscolors { }; + luddite = with python3Packages; toPythonApplication luddite; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2d85d8ca67..bda2389fe37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4248,6 +4248,8 @@ in { lsassy = callPackage ../development/python-modules/lsassy { }; + luddite = callPackage ../development/python-modules/luddite { }; + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; luftdaten = callPackage ../development/python-modules/luftdaten { }; From 0b91acaab17c1b5b91c49faaf526ea2fafa9bdf4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 27 Jul 2021 21:23:55 +0200 Subject: [PATCH 0732/1522] python3Packages.dbus-next: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/dbus-next/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index ba27b633fef..4786d8af0dd 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -2,23 +2,22 @@ , buildPythonPackage , fetchFromGitHub , python -, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout +, dbus, pytest, pytest-cov, pytest-asyncio, pytest-timeout }: buildPythonPackage rec { pname = "dbus-next"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "altdesktop"; repo = "python-dbus-next"; rev = "v${version}"; - sha256 = "0x78ghkci4las13gwbrm8fzg671lx1q2cn8h0f64ki8yag1myia1"; + sha256 = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; }; checkInputs = [ dbus - dbus-python pytest pytest-cov pytest-asyncio From 729143096b5bd0922f4608015d0e978902a94586 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 28 Jul 2021 07:17:41 +0200 Subject: [PATCH 0733/1522] usbsdmux: 0.2.0 -> 0.2.1 New upstream release: - The get command now respects the hardware signal priority. Until now this command returned the wrong value if the USB-SD-Mux was switched to off. - An error leading to creation of files in /dev/ when using the tool as root and if the device-node does not exist was fixed. This error lead to errors like OSError: [Errno 25] Inappropriate ioctl for device. Now the actual error File not found will be raised instead. --- pkgs/development/tools/misc/usbsdmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/development/tools/misc/usbsdmux/default.nix index ed7a6d8a220..07db23607ce 100644 --- a/pkgs/development/tools/misc/usbsdmux/default.nix +++ b/pkgs/development/tools/misc/usbsdmux/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "usbsdmux"; - version = "0.2.0"; + version = "0.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-ydDUSqBTY62iOtWdgrFh2qrO9LMi+OCYIw5reh6uoIA="; + sha256 = "sha256-gCxwR5jxzkH22B6nxBwAd0HpwWMIj/zp5VROJ0IWq7c="; }; # usbsdmux is not meant to be used as an importable module and has no tests From b4b29c1c7b7c03e14d1d7b54fac702bc005753e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 21:10:21 +0200 Subject: [PATCH 0734/1522] python3Packages.millheater: 0.5.0 -> 0.5.2 --- pkgs/development/python-modules/millheater/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 9a329ef2651..3c68a576723 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -1,3 +1,4 @@ + { lib , aiohttp , async-timeout @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.5.0"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-uMvCpXz+amb5mR9ebkAit21UFYpsTkjkZRXtmcvWt8k="; + sha256 = "0ndfxdg10m9mahnwbs66dnyc1lr8q7vs71y6zwxlc0h27hr3gr0d"; }; propagatedBuildInputs = [ From ea34e42b6545f2d91f55856ccb48e263612744bc Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 28 Jul 2021 12:46:44 +0700 Subject: [PATCH 0735/1522] coreshot: init at 4.2.0 --- pkgs/tools/misc/coreshot/default.nix | 32 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/coreshot/default.nix diff --git a/pkgs/tools/misc/coreshot/default.nix b/pkgs/tools/misc/coreshot/default.nix new file mode 100644 index 00000000000..bb2404b1ed5 --- /dev/null +++ b/pkgs/tools/misc/coreshot/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: + +mkDerivation rec { + pname = "coreshot"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + libcprime + ]; + + meta = with lib; { + description = "A screen capture utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab47db86f9..e49fd5dfa63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3910,6 +3910,8 @@ in coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; + coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; + c14 = callPackage ../applications/networking/c14 { }; corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; From b6d9edca7d6003789a0636a70608aa997e000a53 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 28 Jul 2021 08:46:31 +0200 Subject: [PATCH 0736/1522] tailscale: 1.12.0 -> 1.12.1 https://github.com/tailscale/tailscale/releases/tag/v1.12.1 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 094173256c0..b5e878b6966 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-PdCEmB0qchXtxIDfQVjA7f6YgHUe3ojmsMazpq4k6Bo="; + sha256 = "sha256-lGUV3GsRz09HHooaBYSvM+D53R0FPkvPyZml66hxMww="; }; nativeBuildInputs = [ makeWrapper ]; From 8c34740d33e7b7d400263bde0e0352736044f35b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 06:51:12 +0000 Subject: [PATCH 0737/1522] icingaweb2-ipl: 0.6.0 -> 0.6.1 --- pkgs/servers/icingaweb2/ipl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 35b9357009c..20b29962b7c 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "0nzvd84r9f1mypfhq4p37hsvkrbd5wzgs1m9qhj45ncvf5rq49f1"; + sha256 = "sha256-5xlvwB1o6d3mWd0TSybQW9s88q6A7KrledY1L8xaxLU="; }; installPhase = '' From 0cefe482ddbded05c7b483b5c3a005a3a48ad209 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 28 Jul 2021 16:53:48 +1000 Subject: [PATCH 0738/1522] vscode-extensions.ms-vscode-remote.remote-ssh: 0.50.0 -> 0.65.7 --- pkgs/misc/vscode-extensions/remote-ssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 29ca973a0aa..ab59527d82b 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -36,8 +36,8 @@ in mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.50.0"; - sha256 = "01pyd6759p5nkjhjy3iplrl748xblr54l1jphk2g02s1n5ds2qb9"; + version = "0.65.7"; + sha256 = "ae86c4be79fc5af747bb1f1aa5841221af80ee7476cc2f1c9ac277fa2fa1d683"; }; postPatch = '' From ff9da5fc98cbe307a95b682b6a52fd5022a1b0a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 07:08:59 +0000 Subject: [PATCH 0739/1522] iosevka-bin: 7.0.4 -> 8.0.2 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 116 +++++++++++++++++++++------ 2 files changed, 93 insertions(+), 25 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 27577047eca..96d2ee8f013 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "7.0.4"; + version = "8.0.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 1f3da2a205d..143cd225d27 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,27 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "10aa8bsykkfi3aplw4j7smj0brcbni3jxqzjbpsbv5b15wzvkm7y"; - iosevka-aile = "0pa79n41xha9rdj4vzz8cpmdhf0h4fjyphjl12i9qxh5znjr4yyz"; - iosevka-curly = "0shk75qdm5acfbxdvv985gnhaz3dys8wpshiis6y2raz8sam48qg"; - iosevka-curly-slab = "0z297s1bl2rrrmr3a4cds4cx4cw69p2y05jv999bkw9vrd6a5ij9"; - iosevka-etoile = "05h62ybd6b54b51h6m6dq3phvrw4jfcc6cyp1x44shj4az2ia17w"; - iosevka-slab = "07rp7rp3rjzzn6vnx3zbfizd924xhl702kcyq9qlif9g285l85nl"; - iosevka-ss01 = "1rvshgyhcq2cay9dssap9mhinhljn92adrbf8lbkaabf3fcyd19h"; - iosevka-ss02 = "0bscxfjhm1is7b7amr5jjj5wpxm1yps4cns47r4w26a0ad4lzf6b"; - iosevka-ss03 = "1l4mzv1w7wkjs4629hrj7svd3wwhjfvby0qsbq2fr71ngz4gdvva"; - iosevka-ss04 = "0mj5l316bji6mazgkzi5vigbfbgfnif0llmgacg0l5qayzaafqb1"; - iosevka-ss05 = "1gfc7b05fvf1m5vhlvbzxzim8qfcqf16dg8qmzdv625dk1mg2llf"; - iosevka-ss06 = "1n3mfn8h9gmf7ymc6f5ky5n70nn0nb2l8grj26hm9047cvbxcjqm"; - iosevka-ss07 = "0bffazcb6k7qd3c3fxg426mcgjzc5xncv8nsiz71frhi9crplprv"; - iosevka-ss08 = "1kv6v7n2qbgl185kfh401mjvs2iim6l3cw9zzghhfx6qv7xy0dcd"; - iosevka-ss09 = "0da9kcsxk4vllnxjlslm394lr3bhdsw4a2mi95szplipbf748jcp"; - iosevka-ss10 = "0935y7m603n3rfv38gmja7jhjmc6xrcx61psb3sznp7mlmi0dn7x"; - iosevka-ss11 = "1hh0b8qaas4bxz0sa8zi5sr4rmqrpgxfzaq53fsmxy7pzjkhjz09"; - iosevka-ss12 = "118ibl1i7981kjvf8g0rqrckh2chnxvyivk5wwmxhkw43x06ffjf"; - iosevka-ss13 = "1licqy5dy5z4s91yh086i0m362lavaqq6zr13715zaqh7ard7hva"; - iosevka-ss14 = "0y1f5hva9kpj9l3a56n6vbr8zbydd9c0knvsbpg68lcgmybfc97m"; - iosevka-ss15 = "11pm6frf74y27ym4kmh98pn2cqlab6msj0cxpah36ckpzkm5zdqq"; - iosevka-ss16 = "0z77549ydrbdhw96gc1zl3sg4s16cq7l56pwkfk9ificm1rwf1nm"; - iosevka-ss17 = "0zm34lfgrlcb97a8dx1g056qy6rr7722b1k6hm9dp676mi5va2cw"; - iosevka-ss18 = "0jmz975gny6fc7vf5cn8a4bl0y8pzdwlvfh0km9x7ijp711pw42p"; + iosevka = "1gx0hkxch4m21yqwp8sifp6hzvn579w0jf5c2vfgp771yrilhj41"; + iosevka-aile = "1x4gjwj1a6q8vpihvyy0bpqsw3s1b546b5yi7918yqlam31kbfyl"; + iosevka-curly = "11w7f2v05zgdc5ac96v3dr93a2sganw6ggpl6vdhiqiqn1asfldi"; + iosevka-curly-slab = "052cwri7fc25yn314qqnjjjw1xssjjx4nin65r11589scyxzrh97"; + iosevka-etoile = "0p677iagypvyfx8gyja4qv0b5g39i2mh27cik6cjm22ri6fq3n8y"; + iosevka-slab = "05dzpd33ivsp2fjc7zdrsgad0ym8iq2lpdj5ic5ja3lkacnm7r9j"; + iosevka-ss01 = "1ln7fz9yjwgrrw069k3v65q0jp02298a4r68f7hk2l6bgj8c6dml"; + iosevka-ss02 = "11rihmzccq0yw0r08yclspksqs0rdyrfrfkhfzv0f9fh6c5qd30q"; + iosevka-ss03 = "1zyylszp4iykj2jyx9457jsl3m7lr2irc177m1wvvv68xg1vqjrv"; + iosevka-ss04 = "14pay7d0a5yymwkdhs6vsmcvzh27nml3asdy86dlpix0byzm72qi"; + iosevka-ss05 = "00y744phcvlbwwvk4kq05m1f8l1w7b3gk400yk3y1cmx4a4168jw"; + iosevka-ss06 = "1g7pj3js22kmcnv654n6d0fdykf9jkarwbji3vzajnxqgpv03j5x"; + iosevka-ss07 = "1rv1bf9vffqc99l8dhh4v9ms6pkbxxjgzf7skq02gfr27avj1lln"; + iosevka-ss08 = "0s54csx64khdyzlb7k6m9cx9cqjj9cdymsbzhksv0fdbf3cc71ns"; + iosevka-ss09 = "0zvy010ll38dlisjggmgw8k991wwcnzzvpjyqybxpxb8hk3jfxyn"; + iosevka-ss10 = "1b5fk4hwzqg7p1b7h9vw9nc65pl0sp5h6k41jrmpdjr0nkjhm0zl"; + iosevka-ss11 = "1b9bpg43n0vh0bigaq6y510w7lpsf54v82nvdxl48vp225kibr52"; + iosevka-ss12 = "0w2ykjzjqxmp4r7yl10cpr802xpmww4nvi7nca7kj5scl30mrd4g"; + iosevka-ss13 = "1cg59jx44yyi5y6rvdvasmq0n0vqdbcli1rxhfqgwfx1rkwnxy27"; + iosevka-ss14 = "0xi6jpa8fapk72c77yljp07zdl0hdmdg9giyysllih3j2r4l1mrw"; + iosevka-ss15 = "1qv7qh4wzkq7d5rmn19hhmv447sc8hd390nrajwk2a900vfh8xlk"; + iosevka-ss16 = "1gkrhqn1k5y6q87p09nz1lcafmryl7l3s5aqx265y0dqfrni5rfg"; + iosevka-ss17 = "18plv1f9brn8kh7b3jz2imjwash72vlzbnciam41q8i4m47m7dj7"; + iosevka-ss18 = "177qy927siihpzaf4k4sfl9zbp2krbmlg56qzrcm2jbswlnmkyjx"; + sgr-iosevka = "1np4v340r33vrb92cwx68lvsk6prg2swj4a6x9iig8lbc7fjk7fy"; + sgr-iosevka-aile = "09fyslcr7vazfw7js27s0pd7immqd7ics4dihj54k12w8mjfj0fg"; + sgr-iosevka-curly = "1yva4sx4dgfh4274c5sdkllr2d973ifxpn5jkxp428xhpyx9aq5b"; + sgr-iosevka-curly-slab = "1vsngc45l30lmksvlnfr5b8xxnjsvpaqia4fzvx70napm5z6py4w"; + sgr-iosevka-etoile = "033b8w59qbjg17qlbw1lsc8shwklbcvbr0m0ldk0frd08qz2kpmk"; + sgr-iosevka-fixed = "0qyf6pmichpd4yd821k17dy0chb3rslifqm7jjhbl8kkrylf1f2c"; + sgr-iosevka-fixed-curly = "01y8zc5w7jbb7m959db63msdfhp93ckfmm4nxh8fzg6ps3zpf4dy"; + sgr-iosevka-fixed-curly-slab = "04dn2pirw771d5la702l1n8yxc46k6mlivryqlr3kd7z6c4jylca"; + sgr-iosevka-fixed-slab = "1fnzlwlp67mwrw8l4mpylpv2mfday5b9mcjjwc9diymg85gvmz38"; + sgr-iosevka-fixed-ss01 = "0259mn0p6z43ks13355czbm8pnrb7d8qwfl8kfyrnb6gaj1wa0fd"; + sgr-iosevka-fixed-ss02 = "074jdv3w6461bg3iqgwxv8wfrp0ph2sgqc51y1hg7cx26nrs727x"; + sgr-iosevka-fixed-ss03 = "0s5f2138js5w87khv1b5wzg1h96rhv77vw652m45qhqml0ivj5i6"; + sgr-iosevka-fixed-ss04 = "1mbsjgbfj8m95bb4v0dw3f30hx2kq94bz9q9xv57bs80nmyb8a9b"; + sgr-iosevka-fixed-ss05 = "1zkb9q20f9yb3qp7a092kfaag9izsqxi1nljksbg8qya4iiy22fw"; + sgr-iosevka-fixed-ss06 = "1xkd6nrh0s7dwk326bjk1wn6sa9d3d5r54q48i6giz43fg1j5six"; + sgr-iosevka-fixed-ss07 = "0vxwwy5cizq0d5dswakwbncn9jq299ppc17c7dxqjmgxwkawrd06"; + sgr-iosevka-fixed-ss08 = "08asq61zv353975h9zfv0rrn0g9x5c2l542aqhvi8kbcr702a8an"; + sgr-iosevka-fixed-ss09 = "1qldik6k3ycgq1w95z5l1iwr55jjgc94w3d10gncwl41agz8mav8"; + sgr-iosevka-fixed-ss10 = "00mylfjic10aiyfrzv0inq3i18qj97f999f86szrf8mxf9na8b73"; + sgr-iosevka-fixed-ss11 = "1ggnkqf8l8fdkyimcpjgrlc1sdkzdhd79zaygfzg4fhbfxvm7g9w"; + sgr-iosevka-fixed-ss12 = "13lgy12crxxvlj99iy3l0ag2wc20migx9l4abz04mjjh8cgvk10b"; + sgr-iosevka-fixed-ss13 = "0vk7b5xg67myrw69m5gjxchsgp4af5pwspdscklb739w66v42daq"; + sgr-iosevka-fixed-ss14 = "1dap836qgkm62p7xivdc4jmirr75m9m5w9srr1qwsc5vfly4w63j"; + sgr-iosevka-fixed-ss15 = "12alzyp3c8c9h89kqkiw7spwwahi89w9mcgrggizgjqzm5n6qvwc"; + sgr-iosevka-fixed-ss16 = "1h0wa3g6vrpi86qshx187c2a26kh7ccy89rxi2kxajqis8lc9c25"; + sgr-iosevka-fixed-ss17 = "1hlhi5fllz3sb3p25im7ymvcvhf761iafkiass2cw83l2ypbh9ph"; + sgr-iosevka-fixed-ss18 = "0cwkbj232kb0nwvy59wjinxk6ncck5yg9594p49fx6016qxsv022"; + sgr-iosevka-slab = "1imc9pamhxd5pm3xv274yv2qbnsd258rxz0skq7kc5f647bfb1dn"; + sgr-iosevka-ss01 = "0j97757fj595mlr9mgc5vkqxriskxzc1cch0sk9fb2qvr0gpyjvk"; + sgr-iosevka-ss02 = "0j1i9zakq2svfp727sxhcnqhrb0962pzdc7g0bdxgvxwdhmqzqn1"; + sgr-iosevka-ss03 = "1bz95n1xpx756sfsgyshnaqrrygvh3pmcmxjqjyc0yk5f3aawqgm"; + sgr-iosevka-ss04 = "11c4q2dsfkqbw1ppw2r2x932mhlr6bq8sc1hr6z7pvflx3kvdgdg"; + sgr-iosevka-ss05 = "1jwy3wfd4yk6q4cyrry2s3hgkg0pbnn8mmr7w5wpgph4sg2lyrs4"; + sgr-iosevka-ss06 = "0b4rilasn6zkrwf6dfxgrd957r8sjkw259acp1fnsc2wjpi27krf"; + sgr-iosevka-ss07 = "0rvprfprypd54rnjsza0z6xswx22k4mva6pq8qs8fl8kfp3b92kk"; + sgr-iosevka-ss08 = "0jfq72pi9bfmldxk8rnb3hv5kq7bps4pbs15k307avadj80dy107"; + sgr-iosevka-ss09 = "1rlckb7djrkv1bicrp8nkszvk5wkkyhm6f88br13prqhsfbkdfpi"; + sgr-iosevka-ss10 = "0v6jqs75s0xqplgxxk09ah7gpbajajwbyfcmifq2db4sv65bkalj"; + sgr-iosevka-ss11 = "1avc38qc0r7ylmvmyw9lcdimsmh3xha675qzz7gxwalp1mp6d2zp"; + sgr-iosevka-ss12 = "1y9sbvq0mdhzwkaih2gh9jg07993jzjymjgmcn52kvygyn4jc8vf"; + sgr-iosevka-ss13 = "1xsgm6301vfpvsp0z3n3wbv03557whrnkw0cb9vkb9hbww5sjcq6"; + sgr-iosevka-ss14 = "0fvj6amlgifnppfwgvl39vq76aww170wiici596zqvbddl8hhf0k"; + sgr-iosevka-ss15 = "1ihsw196wbkr6cmisf7yasd3cfipz17033crjhsmh6f5q85705l7"; + sgr-iosevka-ss16 = "1b6w69cjmaa0a29yklly9b26m5ivrn5rpygrsbzsrfadgm6h9xcb"; + sgr-iosevka-ss17 = "1zvqrpg1m5i9af80qs847lz139zj1awx6akr7m3alwpz6jm178yd"; + sgr-iosevka-ss18 = "1vw5swd09a0xplz367f26li0ksf5c54a0rf65dr62nviilvlphmx"; + sgr-iosevka-term = "0zc1n1ansv5r4ph9xshm8vaj96m718ypagg4v9in0a0mdgpdp6il"; + sgr-iosevka-term-curly = "1z487mq31afz0cpc7mfpny5x1wq8vdf2c0mmzhr46bcncinwinll"; + sgr-iosevka-term-curly-slab = "15iw3mpy75486ybws9ya4x1bn9y00v1v40clcxjcbk276bfw121p"; + sgr-iosevka-term-slab = "0y6wym3knhcvw1dlrqy9h8f68rsfpwwlb2hl9kdcfrv5zmd8mngy"; + sgr-iosevka-term-ss01 = "03q1j73jwhi54hp3dfx3yj4vabmsrgiy8g5jk6lqcmqk6d42zhgq"; + sgr-iosevka-term-ss02 = "10i1wb4if30zf61ridmqks7j2915yrs72plbv6wy7c4x1qdawhy1"; + sgr-iosevka-term-ss03 = "05ywks1ikwgwxksx0jxawp2a9gaka76gknzxxxzxxvd3x7g6qh4v"; + sgr-iosevka-term-ss04 = "15n5ky9yppcb5gz1pqm77hqihc2br0v52silg2d5yaj1fp4lzjpr"; + sgr-iosevka-term-ss05 = "05p8sc1cjj9412bnyq3xda0v8xrzgf5g6ikgkanps3glvvvlkf3m"; + sgr-iosevka-term-ss06 = "0w6zra0hpdyl0pkm9hdv4171fcgksv1s75wmwrh50dwnlv2hlns3"; + sgr-iosevka-term-ss07 = "0zg9bnrfh3kbq69v4ih8yna70hzdbkbz1x0fminp79s0j9c66fjs"; + sgr-iosevka-term-ss08 = "0sqv98xg1z5p30npg66s2z2wh139prs7960d8y06s09k0npjzlsz"; + sgr-iosevka-term-ss09 = "0cqw79mf969kwbz5gwif3qg0zxk7pdbncpvq24m6kdws7sry06p4"; + sgr-iosevka-term-ss10 = "15vaj99l2xrlcqg7712ksjcz0nwba7nlqcfc2angmw8zy163qg23"; + sgr-iosevka-term-ss11 = "0rcn1761jv9wzi1nzl7sy57msw754yxys468jkacdpskqymfrhly"; + sgr-iosevka-term-ss12 = "0l1f60gvvswnc02w8ylzsk37px0j0jv75pbc572p012x3mvkqipw"; + sgr-iosevka-term-ss13 = "0nl7qbgas1zybi7gm6jr5rgzmk2vylh3ky8ggzlkljn9zw4mm1sn"; + sgr-iosevka-term-ss14 = "0nyvayy0xj9gv21s6yjfp9xa6g4qih8lpvsrsinic4jgjhjxxn1l"; + sgr-iosevka-term-ss15 = "14p7cq5rfr8f7lzi5q7q48a5rrvrd9mghkwr09a0m9fyqav2bnwh"; + sgr-iosevka-term-ss16 = "17b88cv3ylnlybw4zlaa2y55s63p4ylrjk8y15p27knkwf0j7km3"; + sgr-iosevka-term-ss17 = "1fh3b47g6faswq4ppksa6kkq5l1wpkq8c523ffakmjgjw92za7qi"; + sgr-iosevka-term-ss18 = "161afvra35nfvk5crri1jfnwm579wbdn6r16afzq8fr5g46ddcla"; } From ebb924d4720650b1a188f65f683c7766c6a4cb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 28 Jul 2021 09:41:32 +0200 Subject: [PATCH 0740/1522] astroid: move fallback vim into top-level --- pkgs/applications/networking/mailreaders/astroid/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 4401a0a7df8..a580359a790 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -3,7 +3,7 @@ , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 # vim to be used, should support the GUI mode. -, vim ? vim_configurable.override { features = "normal"; gui = "auto"; } +, vim # additional python3 packages to be available within plugins , extraPythonPackages ? [] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d65da0978..bb940fb01b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23123,7 +23123,9 @@ in assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; - astroid = callPackage ../applications/networking/mailreaders/astroid { }; + astroid = callPackage ../applications/networking/mailreaders/astroid { + vim = vim_configurable.override { features = "normal"; gui = "auto"; }; + }; aucatctl = callPackage ../applications/audio/aucatctl { }; From 9f6f2ea74e70874c4a95e79990810bc34006515f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 15:24:16 +0200 Subject: [PATCH 0741/1522] blockchains.bitcoin-abc: cleanup, format --- pkgs/applications/blockchains/bitcoin-abc.nix | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 446aafab8ce..6f1734bbc13 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,12 +1,28 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost -, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent -, withGui, python3, jemalloc, zeromq4 }: - -with lib; +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, pkg-config +, cmake +, openssl +, db53 +, boost +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, util-linux +, protobuf +, qrencode +, libevent +, withGui +, python3 +, jemalloc +, zeromq4 +}: mkDerivation rec { - - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; version = "0.21.13"; src = fetchFromGitHub { @@ -19,11 +35,21 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 - miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ + openssl + db53 + boost + zlib + python3 + jemalloc + zeromq4 + miniupnpc + util-linux + protobuf + libevent + ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; - cmakeFlags = optionals (!withGui) [ + cmakeFlags = lib.optionals (!withGui) [ "-DBUILD_BITCOIN_QT=OFF" ]; @@ -32,9 +58,9 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Cash client)"; - longDescription= '' + longDescription = '' Bitcoin ABC is the name of open source software which enables the use of Bitcoin. It is designed to facilite a hard fork to increase Bitcoin's block size limit. "ABC" stands for "Adjustable Blocksize Cap". From abce989b6c9a5ce4fa2951e821978b84efd7d018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 15:24:40 +0200 Subject: [PATCH 0742/1522] blockchains: format, cleanup --- .../blockchains/bitcoin-classic.nix | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index f578313323c..533e3c7dca6 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,12 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent -, withGui }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, openssl +, db48 +, boost +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, util-linux +, protobuf +, qrencode +, libevent +, withGui +}: stdenv.mkDerivation rec { - - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic"; version = "1.3.8uahf"; src = fetchFromGitHub { @@ -17,22 +29,30 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ + openssl + db48 + boost + zlib + miniupnpc + util-linux + protobuf + libevent + ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + ++ lib.optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; enableParallelBuilding = true; dontWrapQtApps = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Classic client)"; - longDescription= '' + longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly From 21463560f863f078508f96c1b2035877e6f16d6d Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 28 Jul 2021 07:51:34 +0000 Subject: [PATCH 0743/1522] axoloti.libusb: cleanup, format (#131684) --- pkgs/applications/audio/axoloti/libusb1.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index b6c2a1b1ae6..820a8998f0b 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, fetchurl, pkg-config, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { - name = "libusb-1.0.19"; + pname = "libusb"; + version = "1.0.19"; src = fetchurl { - url = "mirror://sourceforge/libusb/${name}.tar.bz2"; + url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure buildInputs = [ pkg-config ]; - propagatedBuildInputs = - lib.optional stdenv.isLinux systemd ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + propagatedBuildInputs = lib.optional stdenv.isLinux systemd + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; patches = [ (fetchpatch { @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.libusb.info"; description = "User-space USB library"; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.lgpl21; }; From 8e122bcae86ad8727a7eed249d18c36edf6fd2e1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Jul 2021 09:29:41 +1000 Subject: [PATCH 0744/1522] crun: 0.20.1 -> 0.21 https://github.com/containers/crun/releases/tag/0.21 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index e172248c8dd..a0d8c16d557 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.20.1"; + version = "0.21"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-Fo8UCUwZ5RiJTXs1jWn1Mwq2qvK8p++ETxW9Tseokjw="; + sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw="; fetchSubmodules = true; }; From 6416b3a941079e069c76a96d235dedc6d5eb9385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 27 Jul 2021 18:15:41 +0200 Subject: [PATCH 0745/1522] nixos/syncthing: add declarative.extraOptions Allows setting arbitrary config options through the REST API. Also switches to the [new](https://docs.syncthing.net/rest/config.html) config endpoints. --- .../modules/services/networking/syncthing.nix | 92 +++++++++++-------- nixos/tests/syncthing-init.nix | 2 + nixos/tests/syncthing.nix | 4 +- 3 files changed, 57 insertions(+), 41 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 28348c7893a..3c58cd9ddad 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -25,41 +25,43 @@ let folder.enable ) cfg.declarative.folders); - # get the api key by parsing the config.xml - getApiKey = pkgs.writers.writeDash "getAPIKey" '' - ${pkgs.libxml2}/bin/xmllint \ - --xpath 'string(configuration/gui/apikey)'\ - ${cfg.configDir}/config.xml - ''; - updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu - # wait for syncthing port to open - until ${pkgs.curl}/bin/curl -Ss ${cfg.guiAddress} -o /dev/null; do - sleep 1 - done - API_KEY=$(${getApiKey}) - OLD_CFG=$(${pkgs.curl}/bin/curl -Ss \ - -H "X-API-Key: $API_KEY" \ - ${cfg.guiAddress}/rest/system/config) + # get the api key by parsing the config.xml + while + ! api_key=$(${pkgs.libxml2}/bin/xmllint \ + --xpath 'string(configuration/gui/apikey)' \ + ${cfg.configDir}/config.xml) + do sleep 1; done - # generate the new config by merging with the nixos config options - NEW_CFG=$(echo "$OLD_CFG" | ${pkgs.jq}/bin/jq -s '.[] as $in | $in * { - "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + $in.devices"}), - "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + $in.folders"}) - }') + curl() { + while + ${pkgs.curl}/bin/curl -Ss -H "X-API-Key: $api_key" \ + --retry 100 --retry-delay 1 --retry-connrefused "$@" + status=$? + [ "$status" -eq 52 ] # retry on empty reply from server + do sleep 1; done + return "$status" + } - # POST the new config to syncthing - echo "$NEW_CFG" | ${pkgs.curl}/bin/curl -Ss \ - -H "X-API-Key: $API_KEY" \ - ${cfg.guiAddress}/rest/system/config -d @- + # query the old config + old_cfg=$(curl ${cfg.guiAddress}/rest/config) - # restart syncthing after sending the new config - ${pkgs.curl}/bin/curl -Ss \ - -H "X-API-Key: $API_KEY" \ - -X POST \ - ${cfg.guiAddress}/rest/system/restart + # generate the new config by merging with the NixOS config options + new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { + "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + .devices"}), + "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + .folders"}) + } * ${builtins.toJSON cfg.declarative.extraOptions}') + + # send the new config + curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config + + # restart Syncthing if required + if curl ${cfg.guiAddress}/rest/config/restart-required | + ${pkgs.jq}/bin/jq -e .requiresRestart > /dev/null; then + curl -X POST ${cfg.guiAddress}/rest/system/restart + fi ''; in { ###### interface @@ -77,7 +79,7 @@ in { type = types.nullOr types.str; default = null; description = '' - Path to users cert.pem file, will be copied into the syncthing's + Path to users cert.pem file, will be copied into Syncthing's configDir ''; }; @@ -86,7 +88,7 @@ in { type = types.nullOr types.str; default = null; description = '' - Path to users key.pem file, will be copied into the syncthing's + Path to users key.pem file, will be copied into Syncthing's configDir ''; }; @@ -105,7 +107,7 @@ in { devices = mkOption { default = {}; description = '' - Peers/devices which syncthing should communicate with. + Peers/devices which Syncthing should communicate with. ''; example = { bigbox = { @@ -168,7 +170,7 @@ in { folders = mkOption { default = {}; description = '' - folders which should be shared by syncthing. + Folders which should be shared by Syncthing. ''; example = literalExample '' { @@ -227,7 +229,7 @@ in { versioning = mkOption { default = null; description = '' - How to keep changed/deleted files with syncthing. + How to keep changed/deleted files with Syncthing. There are 4 different types of versioning with different parameters. See https://docs.syncthing.net/users/versioning.html ''; @@ -335,10 +337,21 @@ in { upstream's docs. ''; }; - }; })); }; + + extraOptions = mkOption { + type = types.addCheck (pkgs.formats.json {}).type isAttrs; + default = {}; + description = '' + Extra configuration options for Syncthing. + ''; + example = { + options.localAnnounceEnabled = false; + gui.theme = "black"; + }; + }; }; guiAddress = mkOption { @@ -378,7 +391,7 @@ in { default = null; example = "socks5://address.com:1234"; description = '' - Overwrites all_proxy environment variable for the syncthing process to + Overwrites all_proxy environment variable for the Syncthing process to the given value. This is normaly used to let relay client connect through SOCKS5 proxy server. ''; @@ -412,7 +425,7 @@ in { Open the default ports in the firewall: - TCP 22000 for transfers - UDP 21027 for discovery - If multiple users are running syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled. + If multiple users are running Syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled. Alternatively, if are running only a single instance on this machine using the default ports, enable this. ''; }; @@ -431,7 +444,7 @@ in { imports = [ (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' - This option was removed because syncthing now has the inotify functionality included under the name "fswatcher". + This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher". It can be enabled on a per-folder basis through the webinterface. '') ]; @@ -516,8 +529,9 @@ in { }; }; syncthing-init = mkIf ( - cfg.declarative.devices != {} || cfg.declarative.folders != {} + cfg.declarative.devices != {} || cfg.declarative.folders != {} || cfg.declarative.extraOptions != {} ) { + description = "Syncthing configuration updater"; after = [ "syncthing.service" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 4581e3fd4fb..f359f0af1c2 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -17,6 +17,7 @@ in { path = "/tmp/test"; devices = [ "testDevice" ]; }; + extraOptions.gui.user = "guiUser"; }; }; }; @@ -27,5 +28,6 @@ in { assert "testFolder" in config assert "${testId}" in config + assert "guiUser" in config ''; }) diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix index 5536b7055cc..aff1d874413 100644 --- a/nixos/tests/syncthing.nix +++ b/nixos/tests/syncthing.nix @@ -25,7 +25,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { "xmllint --xpath 'string(configuration/gui/apikey)' %s/config.xml" % confdir ).strip() oldConf = host.succeed( - "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/config" % APIKey ) conf = json.loads(oldConf) conf["devices"].append({"deviceID": deviceID, "id": name}) @@ -39,7 +39,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ) newConf = json.dumps(conf) host.succeed( - "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s" + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/config -X PUT -d %s" % (APIKey, shlex.quote(newConf)) ) From f4ce33bf06b56bf5f7792127d1accf8823d30bd8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 27 Jul 2021 13:43:03 +0200 Subject: [PATCH 0746/1522] ocamlPackages.mirage-crypto*: 0.10.2 -> 0.10.3 https://github.com/mirage/mirage-crypto/releases/tag/v0.10.3 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index b35d7cc910c..f1ca1fef702 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "96c4826fa3532c9d2ba21cd5fa25df003be3df20b2cc01068b60d59e0222d906"; + sha256 = "a27910365d59b02c3f0e8a40d93a5b81835acf832e1ffa596ee772b41e8a900b"; }; useDune2 = true; From 02734d6d2f6194adb8174a7dd1e6055b7e683bf3 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Wed, 28 Jul 2021 14:48:45 +0700 Subject: [PATCH 0747/1522] coretoppings: init at 4.2.0 --- .../coretoppings/0001-fix-install-phase.patch | 8 +++ .../misc/coretoppings/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch create mode 100644 pkgs/applications/misc/coretoppings/default.nix diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch new file mode 100644 index 00000000000..8a8b0ae4010 --- /dev/null +++ b/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch @@ -0,0 +1,8 @@ +--- a/corepkit/CMakeLists.txt ++++ b/corepkit/Cmakelists.txt +@@ -32,4 +32,4 @@ + target_link_libraries( corepkit Qt5::Core ) + + install( TARGETS corepkit DESTINATION libexec/coreapps/ ) +-install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) ++install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/coretoppings/default.nix new file mode 100644 index 00000000000..eff253ffcc2 --- /dev/null +++ b/pkgs/applications/misc/coretoppings/default.nix @@ -0,0 +1,62 @@ +{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja +, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder +, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools +, bluez, networkmanager, connman, redshift, gawk +, polkit, libnotify, systemd, xdg-utils }: + +mkDerivation rec { + pname = "coretoppings"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + patches = [ + # Fix file cannot create directory: /var/empty/share/polkit-1/actions + ./0001-fix-install-phase.patch + ]; + + buildInputs = [ + qtbase + qtx11extras + qtconnectivity + libdbusmenu + libcprime + ffmpeg + v4l-utils + grim + wf-recorder + playerctl + xorg.xrandr + xorg.xinput + xorg.libXdamage + iio-sensor-proxy + inotify-tools + bluez + networkmanager + connman + redshift + gawk + polkit + libnotify + systemd + xdg-utils + ]; + + meta = with lib; { + description = "Additional features,plugins etc for CuboCore Application Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab47db86f9..59d3dd80de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3914,6 +3914,8 @@ in corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; + coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; From e9b01c5c8e8ca311685fe91d28c663f5c8e6c7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 28 Jul 2021 11:14:09 +0200 Subject: [PATCH 0748/1522] nixos/syncthing: move declarative options to the top level --- .../modules/services/networking/syncthing.nix | 544 +++++++++--------- nixos/tests/syncthing-init.nix | 16 +- 2 files changed, 279 insertions(+), 281 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 3c58cd9ddad..ae81b786d03 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -9,11 +9,11 @@ let devices = mapAttrsToList (name: device: { deviceID = device.id; inherit (device) name addresses introducer; - }) cfg.declarative.devices; + }) cfg.devices; folders = mapAttrsToList ( _: folder: { inherit (folder) path id label type; - devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices; + devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices; rescanIntervalS = folder.rescanInterval; fsWatcherEnabled = folder.watch; fsWatcherDelayS = folder.watchDelay; @@ -23,7 +23,7 @@ let }) (filterAttrs ( _: folder: folder.enable - ) cfg.declarative.folders); + ) cfg.folders); updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu @@ -50,9 +50,9 @@ let # generate the new config by merging with the NixOS config options new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { - "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + .devices"}), - "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + .folders"}) - } * ${builtins.toJSON cfg.declarative.extraOptions}') + "devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}), + "folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"}) + } * ${builtins.toJSON cfg.extraOptions}') # send the new config curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config @@ -74,283 +74,281 @@ in { available on http://127.0.0.1:8384/. ''; - declarative = { - cert = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Path to users cert.pem file, will be copied into Syncthing's - configDir - ''; - }; + cert = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users cert.pem file, will be copied into Syncthing's + configDir + ''; + }; - key = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Path to users key.pem file, will be copied into Syncthing's - configDir - ''; - }; + key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users key.pem file, will be copied into Syncthing's + configDir + ''; + }; - overrideDevices = mkOption { - type = types.bool; - default = true; - description = '' - Whether to delete the devices which are not configured via the - declarative.devices option. - If set to false, devices added via the webinterface will - persist but will have to be deleted manually. - ''; - }; + overrideDevices = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the devices which are not configured via the + devices option. + If set to false, devices added via the webinterface will + persist but will have to be deleted manually. + ''; + }; - devices = mkOption { - default = {}; - description = '' - Peers/devices which Syncthing should communicate with. - ''; - example = { - bigbox = { - id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; - addresses = [ "tcp://192.168.0.10:51820" ]; - }; + devices = mkOption { + default = {}; + description = '' + Peers/devices which Syncthing should communicate with. + ''; + example = { + bigbox = { + id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + addresses = [ "tcp://192.168.0.10:51820" ]; }; - type = types.attrsOf (types.submodule ({ name, ... }: { - options = { - - name = mkOption { - type = types.str; - default = name; - description = '' - Name of the device - ''; - }; - - addresses = mkOption { - type = types.listOf types.str; - default = []; - description = '' - The addresses used to connect to the device. - If this is let empty, dynamic configuration is attempted - ''; - }; - - id = mkOption { - type = types.str; - description = '' - The id of the other peer, this is mandatory. It's documented at - https://docs.syncthing.net/dev/device-ids.html - ''; - }; - - introducer = mkOption { - type = types.bool; - default = false; - description = '' - If the device should act as an introducer and be allowed - to add folders on this computer. - ''; - }; + }; + type = types.attrsOf (types.submodule ({ name, ... }: { + options = { + name = mkOption { + type = types.str; + default = name; + description = '' + Name of the device + ''; }; - })); - }; - overrideFolders = mkOption { - type = types.bool; - default = true; - description = '' - Whether to delete the folders which are not configured via the - declarative.folders option. - If set to false, folders added via the webinterface will persist - but will have to be deleted manually. - ''; - }; + addresses = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The addresses used to connect to the device. + If this is let empty, dynamic configuration is attempted + ''; + }; - folders = mkOption { - default = {}; - description = '' - Folders which should be shared by Syncthing. - ''; - example = literalExample '' - { - "/home/user/sync" = { - id = "syncme"; - devices = [ "bigbox" ]; - }; - } - ''; - type = types.attrsOf (types.submodule ({ name, ... }: { - options = { + id = mkOption { + type = types.str; + description = '' + The id of the other peer, this is mandatory. It's documented at + https://docs.syncthing.net/dev/device-ids.html + ''; + }; - enable = mkOption { - type = types.bool; - default = true; - description = '' - share this folder. - This option is useful when you want to define all folders - in one place, but not every machine should share all folders. - ''; - }; + introducer = mkOption { + type = types.bool; + default = false; + description = '' + If the device should act as an introducer and be allowed + to add folders on this computer. + ''; + }; - path = mkOption { - type = types.str; - default = name; - description = '' - The path to the folder which should be shared. - ''; - }; + }; + })); + }; - id = mkOption { - type = types.str; - default = name; - description = '' - The id of the folder. Must be the same on all devices. - ''; - }; + overrideFolders = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the folders which are not configured via the + folders option. + If set to false, folders added via the webinterface will persist + but will have to be deleted manually. + ''; + }; - label = mkOption { - type = types.str; - default = name; - description = '' - The label of the folder. - ''; - }; + folders = mkOption { + default = {}; + description = '' + Folders which should be shared by Syncthing. + ''; + example = literalExample '' + { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + } + ''; + type = types.attrsOf (types.submodule ({ name, ... }: { + options = { - devices = mkOption { - type = types.listOf types.str; - default = []; - description = '' - The devices this folder should be shared with. Must be defined - in the declarative.devices attribute. - ''; - }; + enable = mkOption { + type = types.bool; + default = true; + description = '' + share this folder. + This option is useful when you want to define all folders + in one place, but not every machine should share all folders. + ''; + }; - versioning = mkOption { - default = null; - description = '' - How to keep changed/deleted files with Syncthing. - There are 4 different types of versioning with different parameters. - See https://docs.syncthing.net/users/versioning.html - ''; - example = [ - { - versioning = { - type = "simple"; - params.keep = "10"; - }; - } - { - versioning = { - type = "trashcan"; - params.cleanoutDays = "1000"; - }; - } - { - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "31536000"; - versionsPath = "/syncthing/backup"; - }; - }; - } - { - versioning = { - type = "external"; - params.versionsPath = pkgs.writers.writeBash "backup" '' - folderpath="$1" - filepath="$2" - rm -rf "$folderpath/$filepath" - ''; - }; - } - ]; - type = with types; nullOr (submodule { - options = { - type = mkOption { - type = enum [ "external" "simple" "staggered" "trashcan" ]; - description = '' - Type of versioning. - See https://docs.syncthing.net/users/versioning.html - ''; - }; - params = mkOption { - type = attrsOf (either str path); - description = '' - Parameters for versioning. Structure depends on versioning.type. - See https://docs.syncthing.net/users/versioning.html - ''; + path = mkOption { + type = types.str; + default = name; + description = '' + The path to the folder which should be shared. + ''; + }; + + id = mkOption { + type = types.str; + default = name; + description = '' + The id of the folder. Must be the same on all devices. + ''; + }; + + label = mkOption { + type = types.str; + default = name; + description = '' + The label of the folder. + ''; + }; + + devices = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The devices this folder should be shared with. Must be defined + in the devices attribute. + ''; + }; + + versioning = mkOption { + default = null; + description = '' + How to keep changed/deleted files with Syncthing. + There are 4 different types of versioning with different parameters. + See https://docs.syncthing.net/users/versioning.html + ''; + example = [ + { + versioning = { + type = "simple"; + params.keep = "10"; + }; + } + { + versioning = { + type = "trashcan"; + params.cleanoutDays = "1000"; + }; + } + { + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "31536000"; + versionsPath = "/syncthing/backup"; }; }; - }); - }; - - rescanInterval = mkOption { - type = types.int; - default = 3600; - description = '' - How often the folders should be rescaned for changes. - ''; - }; - - type = mkOption { - type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; - default = "sendreceive"; - description = '' - Whether to send only changes from this folder, only receive them - or propagate both. - ''; - }; - - watch = mkOption { - type = types.bool; - default = true; - description = '' - Whether the folder should be watched for changes by inotify. - ''; - }; - - watchDelay = mkOption { - type = types.int; - default = 10; - description = '' - The delay after an inotify event is triggered. - ''; - }; - - ignorePerms = mkOption { - type = types.bool; - default = true; - description = '' - Whether to propagate permission changes. - ''; - }; - - ignoreDelete = mkOption { - type = types.bool; - default = false; - description = '' - Whether to delete files in destination. See - upstream's docs. - ''; - }; + } + { + versioning = { + type = "external"; + params.versionsPath = pkgs.writers.writeBash "backup" '' + folderpath="$1" + filepath="$2" + rm -rf "$folderpath/$filepath" + ''; + }; + } + ]; + type = with types; nullOr (submodule { + options = { + type = mkOption { + type = enum [ "external" "simple" "staggered" "trashcan" ]; + description = '' + Type of versioning. + See https://docs.syncthing.net/users/versioning.html + ''; + }; + params = mkOption { + type = attrsOf (either str path); + description = '' + Parameters for versioning. Structure depends on versioning.type. + See https://docs.syncthing.net/users/versioning.html + ''; + }; + }; + }); }; - })); - }; - extraOptions = mkOption { - type = types.addCheck (pkgs.formats.json {}).type isAttrs; - default = {}; - description = '' - Extra configuration options for Syncthing. - ''; - example = { - options.localAnnounceEnabled = false; - gui.theme = "black"; + rescanInterval = mkOption { + type = types.int; + default = 3600; + description = '' + How often the folders should be rescaned for changes. + ''; + }; + + type = mkOption { + type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; + default = "sendreceive"; + description = '' + Whether to send only changes from this folder, only receive them + or propagate both. + ''; + }; + + watch = mkOption { + type = types.bool; + default = true; + description = '' + Whether the folder should be watched for changes by inotify. + ''; + }; + + watchDelay = mkOption { + type = types.int; + default = 10; + description = '' + The delay after an inotify event is triggered. + ''; + }; + + ignorePerms = mkOption { + type = types.bool; + default = true; + description = '' + Whether to propagate permission changes. + ''; + }; + + ignoreDelete = mkOption { + type = types.bool; + default = false; + description = '' + Whether to delete files in destination. See + upstream's docs. + ''; + }; }; + })); + }; + + extraOptions = mkOption { + type = types.addCheck (pkgs.formats.json {}).type isAttrs; + default = {}; + description = '' + Extra configuration options for Syncthing. + ''; + example = { + options.localAnnounceEnabled = false; + gui.theme = "black"; }; }; @@ -443,11 +441,13 @@ in { }; imports = [ - (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' + (mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] '' This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher". It can be enabled on a per-folder basis through the webinterface. '') - ]; + ] ++ map (o: + mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ] + ) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"]; ###### implementation @@ -491,14 +491,14 @@ in { RestartForceExitStatus="3 4"; User = cfg.user; Group = cfg.group; - ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null) + ExecStartPre = mkIf (cfg.cert != null || cfg.key != null) "+${pkgs.writers.writeBash "syncthing-copy-keys" '' install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir} - ${optionalString (cfg.declarative.cert != null) '' - install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem + ${optionalString (cfg.cert != null) '' + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem ''} - ${optionalString (cfg.declarative.key != null) '' - install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem + ${optionalString (cfg.key != null) '' + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem ''} ''}" ; @@ -529,7 +529,7 @@ in { }; }; syncthing-init = mkIf ( - cfg.declarative.devices != {} || cfg.declarative.folders != {} || cfg.declarative.extraOptions != {} + cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {} ) { description = "Syncthing configuration updater"; after = [ "syncthing.service" ]; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index f359f0af1c2..8b60ad7faf0 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -9,16 +9,14 @@ in { machine = { services.syncthing = { enable = true; - declarative = { - devices.testDevice = { - id = testId; - }; - folders.testFolder = { - path = "/tmp/test"; - devices = [ "testDevice" ]; - }; - extraOptions.gui.user = "guiUser"; + devices.testDevice = { + id = testId; }; + folders.testFolder = { + path = "/tmp/test"; + devices = [ "testDevice" ]; + }; + extraOptions.gui.user = "guiUser"; }; }; From 1ff933002df8589b95d6cad5f232e7ff6bb5f651 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 09:43:51 +0000 Subject: [PATCH 0749/1522] ajour: 1.2.1 -> 1.2.5 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 1e102a950b9..24acbfb7341 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.2.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-arb6wPoDlNdBxSQ+G0KyN4Pbd0nPhb+DbvRlbPaPtPI="; + sha256 = "sha256-Jn+CCUUGVa6YTD3af4bkY1wlJ4gAPOzxOwgfNx6VHL0="; }; - cargoSha256 = "sha256-1hK6C10oM5b8anX+EofekR686AZR5LcpXyhVkmHcSwA="; + cargoSha256 = "sha256-7XMcZHezqk4g7FPgFCnMhbjJsJE8QkfzbtujUsV7GUw="; nativeBuildInputs = [ autoPatchelfHook From b9acd426df4b1ae98da24f1a973968f83f5dcb19 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Tue, 27 Jul 2021 16:11:32 +0100 Subject: [PATCH 0750/1522] kubernetes: add passthru tests Also defensively quote a path and reformat a comment to trigger the right review. --- nixos/modules/services/cluster/kubernetes/pki.nix | 2 +- .../networking/cluster/kubernetes/default.nix | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index d9311d3e3a0..faf951d8157 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -189,7 +189,7 @@ in # manually paste it in place. Just symlink. # otherwise, create the target file, ready for users to insert the token - mkdir -p $(dirname ${certmgrAPITokenPath}) + mkdir -p "$(dirname "${certmgrAPITokenPath}")" if [ -f "${cfsslAPITokenPath}" ]; then ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" else diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2a66b391ae8..ac1e0aa9117 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -7,6 +7,7 @@ , makeWrapper , rsync , installShellFiles +, nixosTests , components ? [ "cmd/kubelet" @@ -66,8 +67,8 @@ stdenv.mkDerivation rec { install -D build/pause/linux/pause -t $pause/bin installManPage docs/man/man1/*.[1-9] - # Unfortunately, kube-addons-main.sh only looks for the lib file in either the current working dir - # or in /opt. We have to patch this for now. + # Unfortunately, kube-addons-main.sh only looks for the lib file in either the + # current working dir or in /opt. We have to patch this for now. substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \ --subst-var out @@ -95,4 +96,11 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ johanot offline saschagrunert ]; platforms = platforms.unix; }; + + passthru.tests = with nixosTests.kubernetes; { + dns-single-node = dns.singlenode; + dns-multi-node = dns.multinode; + rbac-single-node = rbac.singlenode; + rbac-multi-node = rbac.multinode; + }; } From 082f4e01341ec3ef9aa44b136881e8bc37daa56e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 28 Jul 2021 11:35:21 +0100 Subject: [PATCH 0751/1522] rekor-cli, rekor-server: 0.2.0 -> 0.3.0 --- pkgs/tools/security/rekor/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index b9b49d4e2df..4ff36910bb1 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,29 +4,27 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "1y6qw55r30jgkcwc6434ly0v9dcfa2lc7z5djn7rjcqrjg3gn7yv"; + sha256 = "sha256-FaVZm9C1pewJCZlYgNyD/ZYr/UIRvhqVTUhFTmysxeg="; }; - vendorSha256 = "1wlh505ypwyr91wi80fpbap3far3fljwjd4mql2qcqgg0b1yay9s"; + vendorSha256 = "sha256-EBKj/+ruE88qvlbOme4GBfAqt3/1jHcqhY0IHxh6Y5U="; subPackages = [ packageToBuild ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/rekor/${packageToBuild}/app.gitVersion=v${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/${packageToBuild}/app.gitVersion=v${version}" ]; meta = with lib; { inherit description; homepage = "https://github.com/sigstore/rekor"; changelog = "https://github.com/sigstore/rekor/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ lesuisse ]; + maintainers = with maintainers; [ lesuisse jk ]; }; }; in { From 58dbc09c4103073e1f2e29b364d3c2a0a13b1585 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 21 Jul 2021 15:52:41 +0200 Subject: [PATCH 0752/1522] gnatboot: explicitly check hostPlatform and prevent building a cross compiler * gnatboot can't be used as cross compiler, so we should prevent this at eval time. * Explicitly checking hostPlatform is also a lot nicer. Keeping system since gnatboot seems to be statically linked so gnu/musl which is also tracked in config isn't important. --- pkgs/development/compilers/gnatboot/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index d97298d0238..c68c4fd4ba0 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -1,15 +1,19 @@ { lib, stdenv, fetchurl }: +if stdenv.hostPlatform != stdenv.targetPlatform +then builtins.throw "gnatboot can't cross-compile" +else + stdenv.mkDerivation { pname = "gentoo-gnatboot"; version = "4.1"; - src = if stdenv.system == "i686-linux" then + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2; sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; } - else if stdenv.system == "x86_64-linux" then + else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2; sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; From 801152e05766f61990f9a5b375fe61bbf1ed43a6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:51:39 +0200 Subject: [PATCH 0753/1522] gnat*: take bootstrap gnat compiler from buildPackages Due to overriding and use in string interpolation, our splicing magic doesn't work and we need to do this explicitly. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c81ca8b0a2e..7dc2993f453 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11212,7 +11212,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - inherit gnatboot; + inherit (buildPackages) gnatboot; }); gnat9 = wrapCC (gcc9.cc.override { @@ -11221,7 +11221,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnat10 = wrapCC (gcc10.cc.override { @@ -11230,7 +11230,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnat11 = wrapCC (gcc11.cc.override { @@ -11239,7 +11239,7 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + gnatboot = buildPackages.gnat6; }); gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); From 364713fdd33de8ea0accfbf9f9cf342abaac2b62 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 18:57:58 +0200 Subject: [PATCH 0754/1522] gnat*: bootstrap cross with native compiler of the same version https://gcc.gnu.org/install/prerequisites.html#GNAT-prerequisite --- pkgs/top-level/all-packages.nix | 37 +++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dc2993f453..c5a3949c805 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11212,7 +11212,15 @@ in langCC = false; langAda = true; profiledCompiler = false; - inherit (buildPackages) gnatboot; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well go the same + # route (especially as gnatboot can't cross-compile). + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnatboot + else buildPackages.gnat6; }); gnat9 = wrapCC (gcc9.cc.override { @@ -11221,7 +11229,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat9; }); gnat10 = wrapCC (gcc10.cc.override { @@ -11230,7 +11245,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat10; }); gnat11 = wrapCC (gcc11.cc.override { @@ -11239,7 +11261,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = buildPackages.gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat11; }); gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); From d3e05d191f9c56819b613b16c61974e5f3dc9967 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 19:02:35 +0200 Subject: [PATCH 0755/1522] gnat{6,9,10,11}: move gnatboot into nativeBuildInputs --- pkgs/development/compilers/gcc/10/default.nix | 5 +++-- pkgs/development/compilers/gcc/11/default.nix | 5 +++-- pkgs/development/compilers/gcc/6/default.nix | 5 +++-- pkgs/development/compilers/gcc/9/default.nix | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 143681c2a5b..58a4dfbe36e 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -156,7 +156,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -177,7 +179,6 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 7efc9d589f9..15d93561871 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -161,7 +161,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -182,7 +184,6 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 4567e8b43e9..df4a632db05 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -199,7 +199,9 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkg-config) - ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); + ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -222,7 +224,6 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 857263e51e0..43b2e0b5ef5 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -170,7 +170,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); + ++ (optional (perl != null) perl) + ++ (optional langAda gnatboot) + ; # For building runtime libs depsBuildTarget = @@ -191,7 +193,6 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; From 1508ea570843dd585dabbebac517256c29b6c436 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 19:06:15 +0200 Subject: [PATCH 0756/1522] gnat{6,9,10,11}: don't build libada when building a cross compiler According to https://wiki.osdev.org/GNAT_Cross-Compiler building libada is not possible when building a cross compiler. Unfortunately I haven't been able to determine if this is upstream's position as well, but sure enough disabling libada lets us build a GNAT cross compiler. --- pkgs/development/compilers/gcc/common/configure-flags.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 997771c2abf..1d75966797b 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -170,8 +170,11 @@ let "--enable-cloog-backend=isl" ] - # Ada options - ++ lib.optional langAda "--enable-libada" + # Ada options, gcc can't build the runtime library for a cross compiler + ++ lib.optional langAda + (if hostPlatform == targetPlatform + then "--enable-libada" + else "--disable-libada") # Java options ++ lib.optionals langJava [ From 9dd9a5883ae554f6030d28d1105a1c51c1644bf5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Jul 2021 11:57:47 +0900 Subject: [PATCH 0757/1522] vector: 0.15.0 -> 0.15.1 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index d9e454d4ab8..71f2ad3e955 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ZsZyV6zlMiNTVYPwqQi7F1OJ4hV33IqrrGkvUb8JaY="; + sha256 = "sha256-9Q0jRh8nlgiWslmlFAth8eff+hir5gIT8YL898FMSqk="; }; - cargoSha256 = "sha256-t6KeyBwIfCQTfaennFiFX3K+8unFOsduBP7nRbAo9wI="; + cargoSha256 = "sha256-DFFA6t+ZgpGieq5kT80PW5ZSByIp54ia2UvcBYY2+Lg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From 23ea64cd818d982df8a62544be8ede6751629ac2 Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 28 Jul 2021 11:48:18 +0200 Subject: [PATCH 0758/1522] =?UTF-8?q?coqPackages.corn:=208.12.0=20?= =?UTF-8?q?=E2=86=92=208.13.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/corn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 6910f487c64..6a3ea81ca0d 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { defaultVersion = switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } { case = (versions.range "8.7" "8.12"); out = "8.12.0"; } + { case = (versions.range "8.13" "8.13"); out = "c366d3f01ec1812b145117a4da940518b092d3a6"; } ] null; release = { "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; + "c366d3f01ec1812b145117a4da940518b092d3a6".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; }; preConfigure = "patchShebangs ./configure.sh"; From ff42213e2da40c1d93815c64ee3e3fa029275b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 28 Jul 2021 12:56:25 +0200 Subject: [PATCH 0759/1522] mozlz4a: remove alias --- pkgs/tools/compression/mozlz4a/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 0aec49827e6..44c75436908 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/mozlz4a" ''; - buildInputs = [ python3 python3.pkgs.python-lz4 ]; + buildInputs = [ python3 python3.pkgs.lz4 ]; meta = { description = "A script to handle Mozilla's mozlz4 files"; From 3dbfb638b3ecb9b39f79d379412abc16a2eba9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 28 Jul 2021 13:02:22 +0200 Subject: [PATCH 0760/1522] pythonPackages: fix alias --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1726c3798e2..637e249b13a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -61,7 +61,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 python-lz4 = lz4; # added 2018-06-01 - python-pam = pam; # added 2020-09-07. + pam = python-pam; # added 2020-09-07. pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 From 25fd71e281320e2bc6256ec9ef8f42a816b3cc00 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 28 Jul 2021 12:23:06 +0100 Subject: [PATCH 0761/1522] buf: 0.44.0 -> 0.46.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index fc87f5b781a..fb515841c7f 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "buf"; - version = "0.44.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZcZvsFw/l/7N8Yb4HG6w96ce9c4g4iiG/TcDoj8RYmA="; + sha256 = "sha256-5mjk31HuPNO/RhmMhIm3dAZAED/Kk33ObjC8KbPKRxk="; leaveDotGit = true; # Required by TestWorkspaceGit }; - vendorSha256 = "sha256-g0wrHPeHFOL6KB0SUgBy2WK54Kttiks4cuYg8jf3N9g="; + vendorSha256 = "sha256-K8UZDEhAvD292RCEDKfY9PdZGS389vLF3oukcBndUF4="; patches = [ # Skip a test that requires networking to be available to work. From 06a2b9fa9522fb9b52f5dc569a44a3c99f6a6838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jul 2021 15:31:23 +0200 Subject: [PATCH 0762/1522] pkgs/applications/blockchains: move packages into subdirs --- .../default.nix} | 0 .../fix-bitcoin-qt-build.patch | 0 .../default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../{bitcoin.nix => bitcoin/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 .../{dashpay.nix => dashpay/default.nix} | 0 .../{dcrd.nix => dcrd/default.nix} | 0 .../{dcrwallet.nix => dcrwallet/default.nix} | 0 .../{dero.nix => dero/default.nix} | 0 .../{digibyte.nix => digibyte/default.nix} | 0 .../{dogecoin.nix => dogecoin/default.nix} | 0 .../{eclair.nix => eclair/default.nix} | 0 .../{electrs.nix => electrs/default.nix} | 0 .../{elements.nix => elements/default.nix} | 0 .../default.nix} | 0 .../{litecoin.nix => litecoin/default.nix} | 0 .../blockchains/{lnd.nix => lnd/default.nix} | 0 .../{lndmanage.nix => lndmanage/default.nix} | 0 .../{masari.nix => masari/default.nix} | 0 .../{namecoin.nix => namecoin/default.nix} | 0 .../default.nix} | 0 .../{pivx.nix => pivx/default.nix} | 0 .../{quorum.nix => quorum/default.nix} | 0 .../default.nix} | 0 .../{sumokoin.nix => sumokoin/default.nix} | 0 .../{tessera.nix => tessera/default.nix} | 0 .../default.nix} | 0 .../{vertcoin.nix => vertcoin/default.nix} | 0 .../{wownero.nix => wownero/default.nix} | 0 pkgs/top-level/all-packages.nix | 130 ++++++++++++------ 34 files changed, 85 insertions(+), 45 deletions(-) rename pkgs/applications/blockchains/{bitcoin-abc.nix => bitcoin-abc/default.nix} (100%) rename pkgs/applications/blockchains/{ => bitcoin-abc}/fix-bitcoin-qt-build.patch (100%) rename pkgs/applications/blockchains/{bitcoin-classic.nix => bitcoin-classic/default.nix} (100%) rename pkgs/applications/blockchains/{bitcoin-gold.nix => bitcoin-gold/default.nix} (100%) rename pkgs/applications/blockchains/{bitcoin-knots.nix => bitcoin-knots/default.nix} (100%) rename pkgs/applications/blockchains/{bitcoin-unlimited.nix => bitcoin-unlimited/default.nix} (100%) rename pkgs/applications/blockchains/{bitcoin.nix => bitcoin/default.nix} (100%) rename pkgs/applications/blockchains/{clightning.nix => clightning/default.nix} (100%) rename pkgs/applications/blockchains/{crypto-org-wallet.nix => crypto-org-wallet/default.nix} (100%) rename pkgs/applications/blockchains/{dashpay.nix => dashpay/default.nix} (100%) rename pkgs/applications/blockchains/{dcrd.nix => dcrd/default.nix} (100%) rename pkgs/applications/blockchains/{dcrwallet.nix => dcrwallet/default.nix} (100%) rename pkgs/applications/blockchains/{dero.nix => dero/default.nix} (100%) rename pkgs/applications/blockchains/{digibyte.nix => digibyte/default.nix} (100%) rename pkgs/applications/blockchains/{dogecoin.nix => dogecoin/default.nix} (100%) rename pkgs/applications/blockchains/{eclair.nix => eclair/default.nix} (100%) rename pkgs/applications/blockchains/{electrs.nix => electrs/default.nix} (100%) rename pkgs/applications/blockchains/{elements.nix => elements/default.nix} (100%) rename pkgs/applications/blockchains/{go-ethereum.nix => go-ethereum/default.nix} (100%) rename pkgs/applications/blockchains/{litecoin.nix => litecoin/default.nix} (100%) rename pkgs/applications/blockchains/{lnd.nix => lnd/default.nix} (100%) rename pkgs/applications/blockchains/{lndmanage.nix => lndmanage/default.nix} (100%) rename pkgs/applications/blockchains/{masari.nix => masari/default.nix} (100%) rename pkgs/applications/blockchains/{namecoin.nix => namecoin/default.nix} (100%) rename pkgs/applications/blockchains/{particl/particl-core.nix => particl-core/default.nix} (100%) rename pkgs/applications/blockchains/{pivx.nix => pivx/default.nix} (100%) rename pkgs/applications/blockchains/{quorum.nix => quorum/default.nix} (100%) rename pkgs/applications/blockchains/{stellar-core.nix => stellar-core/default.nix} (100%) rename pkgs/applications/blockchains/{sumokoin.nix => sumokoin/default.nix} (100%) rename pkgs/applications/blockchains/{tessera.nix => tessera/default.nix} (100%) rename pkgs/applications/blockchains/{turbo-geth.nix => turbo-geth/default.nix} (100%) rename pkgs/applications/blockchains/{vertcoin.nix => vertcoin/default.nix} (100%) rename pkgs/applications/blockchains/{wownero.nix => wownero/default.nix} (100%) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin-abc.nix rename to pkgs/applications/blockchains/bitcoin-abc/default.nix diff --git a/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch similarity index 100% rename from pkgs/applications/blockchains/fix-bitcoin-qt-build.patch rename to pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin-classic.nix rename to pkgs/applications/blockchains/bitcoin-classic/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin-gold.nix rename to pkgs/applications/blockchains/bitcoin-gold/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin-knots.nix rename to pkgs/applications/blockchains/bitcoin-knots/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin-unlimited.nix rename to pkgs/applications/blockchains/bitcoin-unlimited/default.nix diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/bitcoin.nix rename to pkgs/applications/blockchains/bitcoin/default.nix diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning/default.nix similarity index 100% rename from pkgs/applications/blockchains/clightning.nix rename to pkgs/applications/blockchains/clightning/default.nix diff --git a/pkgs/applications/blockchains/crypto-org-wallet.nix b/pkgs/applications/blockchains/crypto-org-wallet/default.nix similarity index 100% rename from pkgs/applications/blockchains/crypto-org-wallet.nix rename to pkgs/applications/blockchains/crypto-org-wallet/default.nix diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay/default.nix similarity index 100% rename from pkgs/applications/blockchains/dashpay.nix rename to pkgs/applications/blockchains/dashpay/default.nix diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd/default.nix similarity index 100% rename from pkgs/applications/blockchains/dcrd.nix rename to pkgs/applications/blockchains/dcrd/default.nix diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet/default.nix similarity index 100% rename from pkgs/applications/blockchains/dcrwallet.nix rename to pkgs/applications/blockchains/dcrwallet/default.nix diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero/default.nix similarity index 100% rename from pkgs/applications/blockchains/dero.nix rename to pkgs/applications/blockchains/dero/default.nix diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte/default.nix similarity index 100% rename from pkgs/applications/blockchains/digibyte.nix rename to pkgs/applications/blockchains/digibyte/default.nix diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/dogecoin.nix rename to pkgs/applications/blockchains/dogecoin/default.nix diff --git a/pkgs/applications/blockchains/eclair.nix b/pkgs/applications/blockchains/eclair/default.nix similarity index 100% rename from pkgs/applications/blockchains/eclair.nix rename to pkgs/applications/blockchains/eclair/default.nix diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs/default.nix similarity index 100% rename from pkgs/applications/blockchains/electrs.nix rename to pkgs/applications/blockchains/electrs/default.nix diff --git a/pkgs/applications/blockchains/elements.nix b/pkgs/applications/blockchains/elements/default.nix similarity index 100% rename from pkgs/applications/blockchains/elements.nix rename to pkgs/applications/blockchains/elements/default.nix diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum/default.nix similarity index 100% rename from pkgs/applications/blockchains/go-ethereum.nix rename to pkgs/applications/blockchains/go-ethereum/default.nix diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/litecoin.nix rename to pkgs/applications/blockchains/litecoin/default.nix diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd/default.nix similarity index 100% rename from pkgs/applications/blockchains/lnd.nix rename to pkgs/applications/blockchains/lnd/default.nix diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage/default.nix similarity index 100% rename from pkgs/applications/blockchains/lndmanage.nix rename to pkgs/applications/blockchains/lndmanage/default.nix diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari/default.nix similarity index 100% rename from pkgs/applications/blockchains/masari.nix rename to pkgs/applications/blockchains/masari/default.nix diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/namecoin.nix rename to pkgs/applications/blockchains/namecoin/default.nix diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl-core/default.nix similarity index 100% rename from pkgs/applications/blockchains/particl/particl-core.nix rename to pkgs/applications/blockchains/particl-core/default.nix diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx/default.nix similarity index 100% rename from pkgs/applications/blockchains/pivx.nix rename to pkgs/applications/blockchains/pivx/default.nix diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum/default.nix similarity index 100% rename from pkgs/applications/blockchains/quorum.nix rename to pkgs/applications/blockchains/quorum/default.nix diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core/default.nix similarity index 100% rename from pkgs/applications/blockchains/stellar-core.nix rename to pkgs/applications/blockchains/stellar-core/default.nix diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/sumokoin.nix rename to pkgs/applications/blockchains/sumokoin/default.nix diff --git a/pkgs/applications/blockchains/tessera.nix b/pkgs/applications/blockchains/tessera/default.nix similarity index 100% rename from pkgs/applications/blockchains/tessera.nix rename to pkgs/applications/blockchains/tessera/default.nix diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth/default.nix similarity index 100% rename from pkgs/applications/blockchains/turbo-geth.nix rename to pkgs/applications/blockchains/turbo-geth/default.nix diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin/default.nix similarity index 100% rename from pkgs/applications/blockchains/vertcoin.nix rename to pkgs/applications/blockchains/vertcoin/default.nix diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero/default.nix similarity index 100% rename from pkgs/applications/blockchains/wownero.nix rename to pkgs/applications/blockchains/wownero/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c81ca8b0a2e..aef5e596924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28553,38 +28553,60 @@ in balanceofsatoshis = nodePackages.balanceofsatoshis; - bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { + miniupnpc = miniupnpc_2; + withGui = true; + }; - bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + bitcoind = callPackage ../applications/blockchains/bitcoin { + miniupnpc = miniupnpc_2; + withGui = false; + }; + + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; cgminer = callPackage ../applications/blockchains/cgminer { }; chia = callPackage ../applications/blockchains/chia { }; - clightning = callPackage ../applications/blockchains/clightning.nix { }; + clightning = callPackage ../applications/blockchains/clightning { }; - bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { + boost = boost165; + withGui = true; + }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; mkDerivation = stdenv.mkDerivation; withGui = false; }; - bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; - bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = false; }; - bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; - bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic { + boost = boost165; + withGui = true; + }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic { + boost = boost165; + withGui = false; + }; - bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; - bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold { + boost = boost165; + withGui = true; + }; + bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold { + boost = boost165; + withGui = false; + }; btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; @@ -28592,25 +28614,37 @@ in cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; - dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + dashpay = callPackage ../applications/blockchains/dashpay { }; - dcrd = callPackage ../applications/blockchains/dcrd.nix { }; - dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + dcrd = callPackage ../applications/blockchains/dcrd { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + dero = callPackage ../applications/blockchains/dero { boost = boost165; }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; - digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; }; + digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; }; - dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; - dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + dogecoin = callPackage ../applications/blockchains/dogecoin { + boost = boost165; + withGui = true; + }; + dogecoind = callPackage ../applications/blockchains/dogecoin { + boost = boost165; + withGui = false; + }; - eclair = callPackage ../applications/blockchains/eclair.nix { }; + eclair = callPackage ../applications/blockchains/eclair { }; - electrs = callPackage ../applications/blockchains/electrs.nix { }; + electrs = callPackage ../applications/blockchains/electrs { }; - elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; - elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; + elements = libsForQt5.callPackage ../applications/blockchains/elements { + miniupnpc = miniupnpc_2; + withGui = true; + }; + elementsd = callPackage ../applications/blockchains/elements { + miniupnpc = miniupnpc_2; + withGui = false; + }; ergo = callPackage ../applications/blockchains/ergo { }; @@ -28618,7 +28652,7 @@ in faraday = callPackage ../applications/blockchains/faraday { }; - go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { + go-ethereum = callPackage ../applications/blockchains/go-ethereum { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -28631,18 +28665,18 @@ in lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; livedl = callPackage ../tools/misc/livedl { }; - lnd = callPackage ../applications/blockchains/lnd.nix { }; + lnd = callPackage ../applications/blockchains/lnd { }; lndconnect = callPackage ../applications/blockchains/lndconnect { }; - lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; + lndmanage = callPackage ../applications/blockchains/lndmanage { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -28657,17 +28691,17 @@ in boost = boost17x; }; - masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + masari = callPackage ../applications/blockchains/masari { boost = boost165; }; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; - namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { + pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx { withGui = false; autoreconfHook = buildPackages.autoreconfHook269; }; @@ -28676,22 +28710,28 @@ in pycoin = with python3Packages; toPythonApplication pycoin; - stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; + stellar-core = callPackage ../applications/blockchains/stellar-core { }; - sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; }; - tessera = callPackage ../applications/blockchains/tessera.nix { }; + tessera = callPackage ../applications/blockchains/tessera { }; - turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { }; + turbo-geth = callPackage ../applications/blockchains/turbo-geth { }; - vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; - vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { + boost = boost165; + withGui = true; + }; + vertcoind = callPackage ../applications/blockchains/vertcoin { + boost = boost165; + withGui = false; + }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; + wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; - wownero = callPackage ../applications/blockchains/wownero.nix {}; + wownero = callPackage ../applications/blockchains/wownero { }; zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; @@ -28703,9 +28743,9 @@ in polkadot = callPackage ../applications/blockchains/polkadot { }; - particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; - quorum = callPackage ../applications/blockchains/quorum.nix { }; + quorum = callPackage ../applications/blockchains/quorum { }; whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; @@ -30390,7 +30430,7 @@ in cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; - crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet.nix { }; + crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; caprice32 = callPackage ../misc/emulators/caprice32 { }; @@ -32468,7 +32508,7 @@ in fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; - btcdeb = callPackage ../applications/blockchains/btcdeb {}; + btcdeb = callPackage ../applications/blockchains/btcdeb { }; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; From 646b16b095bb087f9c588ab181dd18a9653b4127 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 28 Jul 2021 12:34:05 +0100 Subject: [PATCH 0763/1522] open-policy-agent: 0.30.2 -> 0.31.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 17dc0900fdb..2d87fea8ff5 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.30.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-pyqG8k2jHUhYZ1ftfAjxpJ4H1P1uWfqSdGcyR7pw1rE="; + sha256 = "sha256-SUMTyqzeaCTj/fVdDHFZkh43t+mIFGNt6wendOt9gfw="; }; vendorSha256 = null; From d237ddbfb34bec253a1466670ba73bb15474edd3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 28 Jul 2021 12:38:31 +0100 Subject: [PATCH 0764/1522] conftest: 0.25.0 -> 0.26.0 --- pkgs/development/tools/conftest/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 833f2f84b05..473196f9a96 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-pxPqBUOsXbP9giaV5NS3a6Z6auN4vUTIrIKcNh8xURU="; + sha256 = "sha256-AIFZhe0N6FT06IrDVF2OVfSwmQVg62ZglOcnnDL9TK8="; }; - vendorSha256 = "sha256-y8DRrthaUzMKxFbdbASvqsRMT+jex7jMJA6g7YF/VxI="; + vendorSha256 = "sha256-7wj1n5ggYYrmMrDuQkbbJ2C1S1LHawkkj91owHDIwr0="; doCheck = false; @@ -36,6 +36,6 @@ buildGoModule rec { ''; inherit (src.meta) homepage; license = licenses.asl20; - maintainers = with maintainers; [ yurrriq ]; + maintainers = with maintainers; [ yurrriq jk ]; }; } From eb48ac909a5c2541ab5b4d4934cf2a04fdae163b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 20:35:51 +0200 Subject: [PATCH 0765/1522] toolsi/package-management: replace name with pname&version --- pkgs/tools/package-management/checkinstall/default.nix | 7 ++++--- .../package-management/disnix/DisnixWebService/default.nix | 7 ++++--- pkgs/tools/package-management/disnix/default.nix | 7 ++++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 7 ++++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 7 ++++--- pkgs/tools/package-management/nix-serve/default.nix | 3 ++- pkgs/tools/package-management/opkg-utils/default.nix | 3 ++- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 704c3ad6409..4987c05f876 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -2,11 +2,12 @@ assert stdenv.isLinux && stdenv ? glibc; -stdenv.mkDerivation { - name = "checkinstall-1.6.2"; +stdenv.mkDerivation rec { + pname = "checkinstall"; + version = "1.6.2"; src = fetchurl { - url = "http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz"; + url = "https://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-${version}.tar.gz"; sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw"; }; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 8a4d5d44b8d..9fd10a3aba0 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: -stdenv.mkDerivation { - name = "DisnixWebService-0.10.1"; +stdenv.mkDerivation rec { + pname = "DisnixWebService"; + version = "0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-${version}/DisnixWebService-${version}.tar.gz"; sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; }; buildInputs = [ apacheAnt jdk ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index c7b3b72e2ea..0e22a24c099 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: -stdenv.mkDerivation { - name = "disnix-0.10.1"; +stdenv.mkDerivation rec { + pname = "disnix"; + version = "0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-${version}/disnix-${version}.tar.gz"; sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; }; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index f9a8221e5f0..639d1978210 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: -stdenv.mkDerivation { - name = "disnixos-0.9.1"; +stdenv.mkDerivation rec { + pname = "disnixos"; + version = "0.9.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-${version}/disnixos-${version}.tar.gz"; sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; }; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d75683a8744..678f0a9be8b 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -38,10 +38,11 @@ assert enableNginxWebApplication -> nginx != null; assert enableS6RCService -> s6-rc != null; assert enableXinetdService -> xinetd != null; -stdenv.mkDerivation { - name = "dysnomia-0.10.1"; +stdenv.mkDerivation rec { + pname = "dysnomia"; + version = "0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-${version}/dysnomia-${version}.tar.gz"; sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; }; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index a1edfdd1367..93e240ad346 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "nix-serve-0.2-${substring 0 7 rev}"; + pname = "nix-serve"; + version = "0.2-${substring 0 7 rev}"; src = fetchFromGitHub { owner = "edolstra"; diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 2554ae47a41..922fa4c93e1 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit }: stdenv.mkDerivation { - name = "opkg-utils-20141030"; + pname = "opkg-utils"; + version = "unstable-2014-10-30"; # No releases, only a git tree src = fetchgit { From 0ed460f15cb738f9b6548c60c926447f190ea366 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 28 Jul 2021 12:34:08 +0200 Subject: [PATCH 0766/1522] terraform-providers.metal: 2.1.0 -> 3.0.0 --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 232ba03040a..7569f572b60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -634,9 +634,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v2.1.0", - "sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172", - "version": "2.1.0" + "rev": "v3.0.0", + "sha256": "08h1h0rpaxpidhslpq1i4bmc6i48rwcg7fsvwgqc202l5m7yk3wd", + "vendorSha256": null, + "version": "3.0.0" }, "metalcloud": { "owner": "terraform-providers", From 9dbf1b3e1012eb2ed13b639c190e1397cb67023e Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 28 Jul 2021 20:24:34 +0800 Subject: [PATCH 0767/1522] yaru-theme: 21.04.1 -> 21.10.1 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 40cfaee17df..05ddd5ad15d 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.04.1"; + version = "21.10.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz"; + sha256 = "sha256-VcuH/lEnSeOYGFXr3OPw9PRUwHOVx4RjUQXblv6jdD8="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From a4a19bca8ca1f9af838a1158a7d15bed6f8b29ff Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 28 Jul 2021 14:42:08 +0200 Subject: [PATCH 0768/1522] gcab: enable build on darwin --- pkgs/development/libraries/gcab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index efc533c5504..d0d314037d2 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 3ff7100f05f56685a59e30226e0d9fbb47aaf337 Mon Sep 17 00:00:00 2001 From: Yuka Date: Wed, 28 Jul 2021 14:43:08 +0200 Subject: [PATCH 0769/1522] qt5.qtwebengine: 5.15.3 -> 5.15.5 (#131123) --- pkgs/development/libraries/qt-5/5.15/default.nix | 15 +++------------ .../libraries/qt-5/modules/qtwebengine.nix | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5d8688cfdc7..639f61a82c9 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -49,21 +49,17 @@ let version = "5.212.0-alpha4"; }; - # Even if developed in the public, QtWebEngine does not have official - # releases or new tags since the Qt company made 5.15.3 proprietary. - # Apparently they care more about licensing than the security of their users. - # See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html qtwebengine = let - branchName = "5.15.3"; - rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0"; + branchName = "5.15.5"; + rev = "v${branchName}-lts"; in { version = "${branchName}-${lib.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "1vdgxfbmx4z4qrm2g61dl64gqn3fv5f83jwpp7h1gyfx5z2qvfmv"; + sha256 = "12wf30d34sgn82mbz91xybxyn3j1mhvxda452cfkxm232n1f2kjb"; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; @@ -120,11 +116,6 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ - # Fix crashes with non en_US.UTF-8 locales - (fetchpatch { - url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; - sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; - }) # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 729c5f388f9..8d1eae71276 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -166,7 +166,7 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst - xorg.libXcomposite xorg.libXdamage libdrm + xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire From 7b299ee7341b564ebae8b2ca6d7a216a52d0fd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 28 Jul 2021 02:30:34 +0300 Subject: [PATCH 0770/1522] libcprime: fix application dirs --- .../libcprime/0001-fix-application-dirs.patch | 29 +++++++++++++++++++ .../libraries/libcprime/default.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch diff --git a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch b/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch new file mode 100644 index 00000000000..b454abb188b --- /dev/null +++ b/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch @@ -0,0 +1,29 @@ +From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= +Date: Wed, 28 Jul 2021 02:26:39 +0300 +Subject: [PATCH] fix application dirs + +--- + cprime/systemxdg.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp +index f9eee66..ea0553d 100644 +--- a/cprime/systemxdg.cpp ++++ b/cprime/systemxdg.cpp +@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety + SystemXdgMime::SystemXdgMime() { + + appsDirs << QDir::home().filePath( ".local/share/applications/" ); +- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; +- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; ++ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; + }; + + DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { +-- +2.32.0 + diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix index 4db6ac1b46b..d312c832243 100644 --- a/pkgs/development/libraries/libcprime/default.nix +++ b/pkgs/development/libraries/libcprime/default.nix @@ -19,6 +19,8 @@ mkDerivation rec { sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; }; + patches = [ ./0001-fix-application-dirs.patch ]; + nativeBuildInputs = [ cmake ninja From 37e24aecea229e8befcf7fcef64055765673dbf4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 28 Jul 2021 14:45:36 +0200 Subject: [PATCH 0771/1522] msitools: disable tests on darwin --- pkgs/development/tools/misc/msitools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index ab196ebc5b3..84a9a1135b5 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -59,7 +59,8 @@ stdenv.mkDerivation rec { bzip2 ]; - doCheck = true; + # WiX tests fail on darwin + doCheck = !stdenv.isDarwin; postPatch = '' patchShebangs subprojects/bats-core/{bin,libexec} From 0cdf7b5da94f37c13c6c2366bf84c8ac779b8212 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 28 Jul 2021 14:47:40 +0200 Subject: [PATCH 0772/1522] qutebrowser: 2.3.0 -> 2.3.1 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9e8dec56179..d245e7035a4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.3.0"; + version = "2.3.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "09fz6rd0laisq7pqf9nrllcx58yb129fc05kdk45zrwwggq03b8h"; + sha256 = "05n64mw9lzzxpxr7lhakbkm9ir3x8p0rwk6vbbg01aqg5iaanyj0"; }; # Needs tox From b167e087810dce6f0298f078b0ad621e4bdaaf7f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 28 Jul 2021 15:16:30 +0200 Subject: [PATCH 0773/1522] linux: 5.13.5 -> 5.13.6 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index dd97944de78..bece15821a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.5"; + version = "5.13.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,9 +13,8 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lqh7krxxnbrvr3w1kag92z9r4n9436fr6answjkjfbvw0z7q74m"; + sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; } // (args.argsOverride or { })) - From 656524c416085135167794bf4ba395be34f05576 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 26 Jul 2021 18:51:53 +1000 Subject: [PATCH 0774/1522] python3Packages.pyfakewebcam: init at 0.1.0 --- .../python-modules/pyfakewebcam/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pyfakewebcam/default.nix diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix new file mode 100644 index 00000000000..1ef1d2df474 --- /dev/null +++ b/pkgs/development/python-modules/pyfakewebcam/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, opencv4 }: + +buildPythonPackage rec { + pname = "pyfakewebcam"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "152nglscxmv7600i1i2gahny5z0bybnqgq3npak8npb0lsnwxn1a"; + }; + + propagatedBuildInputs = [ numpy opencv4 ]; + + # No tests are available + doCheck = false; + pythonImportsCheck = [ "pyfakewebcam" ]; + + meta = with lib; { + description = "A library for writing RGB frames to a fake webcam device on Linux"; + homepage = "https://github.com/jremmons/pyfakewebcam"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec635408..81efeee19b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5977,6 +5977,8 @@ in { pyfakefs = callPackage ../development/python-modules/pyfakefs { }; + pyfakewebcam = callPackage ../development/python-modules/pyfakewebcam { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; pyfcm = callPackage ../development/python-modules/pyfcm { }; From a44657d200cb7d10c78229d0a773971aab9a9b4a Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Wed, 28 Jul 2021 15:37:39 +0200 Subject: [PATCH 0775/1522] step-ca: 0.15.15 -> 0.16.0 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index f72f3c978ff..d733d12a480 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.15.15"; + version = "0.16.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY=="; + sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk="; }; - vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs="; + vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU="; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; From 63510151a8590a55efa6ef3984b6f7f62cc6d5c9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 9 Jun 2021 20:47:00 +0700 Subject: [PATCH 0776/1522] vyper: 0.2.11 -> 0.2.15 --- pkgs/development/compilers/vyper/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 74c2503523e..6d1f7a374da 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,20 +14,21 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.11"; + version = "0.2.15"; src = fetchPypi { inherit pname version; - sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; + sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU="; }; nativeBuildInputs = [ pytest-runner ]; + # Replace the dynamic commit hash lookup with the hash from the tag postPatch = '' substituteInPlace setup.py \ --replace 'asttokens==' 'asttokens>=' \ --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \ - --replace 'commithash.decode("utf-8").strip()' "'069936fa3fee8646ff362145593128d7ef07da38'" + --replace 'commithash.decode("utf-8").strip()' "'6e7dba7a8b5f29762d3470da4f44634b819c808d'" ''; propagatedBuildInputs = [ From 5f645dd536171d09496f6c723c7b93d3618ea2b3 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Wed, 28 Jul 2021 16:39:09 +0200 Subject: [PATCH 0777/1522] step-ca: make reproducible --- pkgs/tools/security/step-ca/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index d733d12a480..127e7e9805e 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -22,6 +22,8 @@ buildGoModule rec { vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU="; + buildFlagsArray = [ "-ldflags=-buildid=" ]; + nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; buildInputs = From e170c652440db5976bf44efe723c8e9e736a90ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 19:38:37 +0200 Subject: [PATCH 0778/1522] tools/system: replace name with pname&version --- pkgs/tools/system/stress/default.nix | 5 +++-- pkgs/tools/system/ts/default.nix | 6 +++--- pkgs/tools/system/undaemonize/default.nix | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 33fbd15c5e6..10aa285085f 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "stress-1.0.4"; + pname = "stress"; + version = "1.0.4"; src = fetchurl { - url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; + url = "https://people.seas.harvard.edu/~apw/stress/stress-${version}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; }; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index b954b1adc01..df19955b607 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation rec { - - name = "ts-1.0"; + pname = "ts"; + version = "1.0"; installPhase=''make install "PREFIX=$out"''; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; + url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz"; sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; }; diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix index 45e7a8d6d62..50ae366d10b 100644 --- a/pkgs/tools/system/undaemonize/default.nix +++ b/pkgs/tools/system/undaemonize/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "undaemonize-2017-07-11"; + pname = "undaemonize"; + version = "unstable-2017-07-11"; + src = fetchFromGitHub { repo = "undaemonize"; owner = "nickstenning"; From 0ad27c8653daaf59cf0fb2e0b30561a8d86303fa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2021 17:06:03 +0200 Subject: [PATCH 0779/1522] nixos-rebuild: Set inherit_errexit Without this, failure of nixBuild() and nixFlakeBuild() was ignored (since bash doesn't inherit 'set -e' in subshells by default), so the script would proceed with a bogus ./result link, e.g. ++ readlink -f /tmp/nixos-rebuild.NfHKxx/result + pathToConfig='/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result' + '[' test = switch -o test = boot ']' + copyToTarget '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result' + '[' '' = '' ']' + '[' test = switch -o test = boot -o test = test -o test = dry-activate ']' + targetHostCmd /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test + '[' -z '' ']' + sudo -- /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test error: '/tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration' is not a recognised command Try '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix --help' for more information. + echo 'warning: error(s) occurred while switching to the new configuration' warning: error(s) occurred while switching to the new configuration --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 69e0dee1d20..6d082cb100e 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -4,6 +4,7 @@ if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi; set -e set -o pipefail +shopt -s inherit_errexit export PATH=@path@:$PATH From f2735b1d33c8e6ceb1a811e7435e7cfd6586cf73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2021 17:20:56 +0200 Subject: [PATCH 0780/1522] .github/labeler.yml: Label nixos-rebuild changes --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 5dd885552d6..ff831042461 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -70,6 +70,7 @@ "6.topic: nixos": - nixos/**/* + - pkgs/os-specific/linux/nixos-rebuild/**/* "6.topic: ocaml": - doc/languages-frameworks/ocaml.section.md From 93e0d92ccb297ce8238f15949e425501fcb54186 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 28 Jul 2021 17:24:29 +0200 Subject: [PATCH 0781/1522] cosign: 0.6.0 -> 1.0.0 https://github.com/sigstore/cosign/releases/tag/v1.0.0 --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 36781679c20..d13762080c2 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "1h0lhbcrynaiwpgpkcn10yrn90j03g00w9hr2lvsj3cwmdbz0rcz"; + sha256 = "0s9mv580habr8pprdz2n5jisxakd10vv1y79fhwfcs29njr7yi7v"; }; buildInputs = @@ -17,7 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; + vendorSha256 = "0njvgykzpiym5w5b4ddnnq597qm90hcng51lf01yf6csir7nyr12"; excludedPackages = "\\(copasetic\\)"; From 95e04538a16c3aa66f7408f7d42bd05864354c1f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 28 Jul 2021 12:25:04 -0300 Subject: [PATCH 0782/1522] mtdutils: 2.1.2 -> 2.1.3 --- pkgs/tools/filesystems/mtdutils/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index cb40e72c30b..c4bf545a7d5 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }: stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "2.1.2"; + version = "2.1.3"; - src = fetchurl { - url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-itTF80cW1AZGqihySi9WFtMlpvEZJU+RTiaXbx926dY="; + src = fetchgit { + url = "git://git.infradead.org/mtd-utils.git"; + rev = "v${version}"; + sha256 = "sha256-w20Zp1G0WbNvEJwqpLw2f8VvmW8ZBEL0GSHze8qpPWg"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for MTD filesystems"; + downloadPage = "https://git.infradead.org/mtd-utils.git"; license = licenses.gpl2Plus; homepage = "http://www.linux-mtd.infradead.org/"; maintainers = with maintainers; [ viric superherointj ]; From bf1998e82f0edf0b60134ed4642fe828c740f06a Mon Sep 17 00:00:00 2001 From: jakobrs Date: Wed, 28 Jul 2021 17:11:51 +0200 Subject: [PATCH 0783/1522] mold: 0.9.2 -> 0.9.3 --- pkgs/development/tools/mold/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index ee661e62202..8a8d2ac531d 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -3,7 +3,6 @@ , lib , autoPatchelfHook , cmake -, tbb , llvmPackages_latest , xxHash , zlib @@ -12,16 +11,16 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2LXOPirhjAifKYPgngUJwEdGrKMYsRySr5TL2x2p8J0="; + sha256 = "sha256:1z9i8nvdl9h0zydh1gd9244q96n9x1gh5y90m71bghnh7nws0zmd"; }; - buildInputs = [ tbb zlib openssl ]; + buildInputs = [ zlib openssl ]; nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; dontUseCmakeConfigure = true; From 550230b08ee2373d4165b09d9174d3da313e1b5b Mon Sep 17 00:00:00 2001 From: jakobrs Date: Wed, 28 Jul 2021 17:12:17 +0200 Subject: [PATCH 0784/1522] mold: apply patch: "Intercept all invocations of ld, ld.gold or ld.lld" --- pkgs/development/tools/mold/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 8a8d2ac531d..87cb582417a 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , lib , autoPatchelfHook , cmake @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256:1z9i8nvdl9h0zydh1gd9244q96n9x1gh5y90m71bghnh7nws0zmd"; }; + patches = [ + # Intercept all invocations of ld, ld.gold or ld.lld + (fetchpatch { + url = "https://github.com/rui314/mold/commit/d25c2553ad3cfa39d99043927db1af2c028b5acf.patch"; + sha256 = "1ic1dyvjcrj6834n6mw9id50l6nymrfn6hws6pjpy8gjk6mqfvnk"; + }) + ]; + buildInputs = [ zlib openssl ]; nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; From badbbb7e056e9252bc7ed98958a72a32957765a4 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 17 Mar 2021 21:27:15 +0000 Subject: [PATCH 0785/1522] nixos/node-red: add module Adds a basic nixos module/service for node-red based on nodePackages.node-red Co-authored-by: Aaron Andersen Co-authored-by: Sandro Co-authored by: Adrian Parvin Ouano Co-authored-by: Norbert Melzer --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/node-red.nix | 148 +++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 nixos/modules/services/web-apps/node-red.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a1907ee201..38fcacb6ec6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -907,6 +907,7 @@ ./services/web-apps/moodle.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix + ./services/web-apps/node-red.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/pgpkeyserver-lite.nix ./services/web-apps/matomo.nix diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix new file mode 100644 index 00000000000..16cfb29cf57 --- /dev/null +++ b/nixos/modules/services/web-apps/node-red.nix @@ -0,0 +1,148 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.node-red; + defaultUser = "node-red"; + finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package; + node-red_withNpmAndGcc = pkgs.runCommandNoCC "node-red" { + nativeBuildInputs = [ pkgs.makeWrapper ]; + } + '' + mkdir -p $out/bin + makeWrapper ${pkgs.nodePackages.node-red}/bin/node-red $out/bin/node-red \ + --set PATH '${lib.makeBinPath [ pkgs.nodePackages.npm pkgs.gcc ]}:$PATH' \ + ''; +in +{ + options.services.node-red = { + enable = mkEnableOption "the Node-RED service"; + + package = mkOption { + default = pkgs.nodePackages.node-red; + defaultText = "pkgs.nodePackages.node-red"; + type = types.package; + description = "Node-RED package to use."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the server. + ''; + }; + + withNpmAndGcc = mkOption { + type = types.bool; + default = false; + description = '' + Give Node-RED access to NPM and GCC at runtime, so 'Nodes' can be + downloaded and managed imperatively via the 'Palette Manager'. + ''; + }; + + configFile = mkOption { + type = types.path; + default = "${cfg.package}/lib/node_modules/node-red/settings.js"; + defaultText = "\${cfg.package}/lib/node_modules/node-red/settings.js"; + description = '' + Path to the JavaScript configuration file. + See + for a configuration example. + ''; + }; + + port = mkOption { + type = types.port; + default = 1880; + description = "Listening port."; + }; + + user = mkOption { + type = types.str; + default = defaultUser; + description = '' + User under which Node-RED runs.If left as the default value this user + will automatically be created on system activation, otherwise the + sysadmin is responsible for ensuring the user exists. + ''; + }; + + group = mkOption { + type = types.str; + default = defaultUser; + description = '' + Group under which Node-RED runs.If left as the default value this group + will automatically be created on system activation, otherwise the + sysadmin is responsible for ensuring the group exists. + ''; + }; + + userDir = mkOption { + type = types.path; + default = "/var/lib/node-red"; + description = '' + The directory to store all user data, such as flow and credential files and all library data. If left + as the default value this directory will automatically be created before the node-red service starts, + otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership + and permissions. + ''; + }; + + safe = mkOption { + type = types.bool; + default = false; + description = "Whether to launch Node-RED in --safe mode."; + }; + + define = mkOption { + type = types.attrs; + default = {}; + description = "List of settings.js overrides to pass via -D to Node-RED."; + example = literalExample '' + { + "logging.console.level" = "trace"; + } + ''; + }; + }; + + config = mkIf cfg.enable { + users.users = optionalAttrs (cfg.user == defaultUser) { + ${defaultUser} = { + isSystemUser = true; + }; + }; + + users.groups = optionalAttrs (cfg.group == defaultUser) { + ${defaultUser} = { }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + systemd.services.node-red = { + description = "Node-RED Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + environment = { + HOME = cfg.userDir; + }; + serviceConfig = mkMerge [ + { + User = cfg.user; + Group = cfg.group; + ExecStart = "${finalPackage}/bin/node-red ${pkgs.lib.optionalString cfg.safe "--safe"} --settings ${cfg.configFile} --port ${toString cfg.port} --userDir ${cfg.userDir} ${concatStringsSep " " (mapAttrsToList (name: value: "-D ${name}=${value}") cfg.define)}"; + PrivateTmp = true; + Restart = "always"; + WorkingDirectory = cfg.userDir; + } + (mkIf (cfg.userDir == "/var/lib/node-red") { StateDirectory = "node-red"; }) + ]; + }; + }; +} From b9c9d52aec8cc787629b4de6c7bb5732dca3ac0c Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 28 Jul 2021 11:42:26 +0100 Subject: [PATCH 0786/1522] nixos/node-red: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/node-red.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 nixos/tests/node-red.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 251f24a9a08..df384664f00 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -280,6 +280,7 @@ in nginx-variants = handleTest ./nginx-variants.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; + node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; diff --git a/nixos/tests/node-red.nix b/nixos/tests/node-red.nix new file mode 100644 index 00000000000..7660bc32f4c --- /dev/null +++ b/nixos/tests/node-red.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nodered"; + meta = with pkgs.lib.maintainers; { + maintainers = [ matthewcroughan ]; + }; + + nodes = { + client = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + }; + nodered = { config, pkgs, ... }: { + services.node-red = { + enable = true; + openFirewall = true; + }; + }; + }; + + testScript = '' + start_all() + nodered.wait_for_unit("node-red.service") + nodered.wait_for_open_port("1880") + + client.wait_for_unit("multi-user.target") + + with subtest("Check that the Node-RED webserver can be reached."): + assert "Node-RED" in client.succeed( + "curl -sSf http:/nodered:1880/ | grep title" + ) + ''; +}) From bbacb162cb91188d766ab6a4a46e69856b94a6fc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 19:10:39 +0200 Subject: [PATCH 0787/1522] srtrelay: init at 2021-07-28 --- pkgs/applications/video/srtrelay/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/video/srtrelay/default.nix diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/applications/video/srtrelay/default.nix new file mode 100644 index 00000000000..5fffdca9e38 --- /dev/null +++ b/pkgs/applications/video/srtrelay/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub, srt, ffmpeg }: + +buildGoModule rec { + pname = "srtrelay-unstable"; + version = "2021-07-28"; + + src = fetchFromGitHub { + owner = "voc"; + repo = "srtrelay"; + rev = "c4f02ff2e9637b01a0679b29e5a76f4521eeeef3"; + sha256 = "06zbl97bjjyv51zp27qk37ffpbh1ylm9bsr0s5qlyd73pyavcj1g"; + }; + + vendorSha256 = "1pdpb0my7gdvjjkka6jhj19b9nx575k6117hg536b106ij2n4zd2"; + + buildInputs = [ srt ]; + checkInputs = [ ffmpeg ]; + + meta = with lib; { + description = "Streaming-Relay for the SRT-protocol"; + homepage = "https://github.com/voc/srtrelay"; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22529d60400..55a56bd4970 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9048,6 +9048,8 @@ in srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; + srtrelay = callPackage ../applications/video/srtrelay { }; + sourcehut = callPackage ../applications/version-management/sourcehut { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; From 57067b71455d3299c920ab77c3d1311f67055448 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 17:11:22 +0000 Subject: [PATCH 0788/1522] gitkraken: 7.7.0 -> 7.7.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3e10add49d4..a636c2c3e59 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.7.0"; + version = "7.7.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3"; + sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c="; }; dontBuild = true; From c4ed660a9ea0cc94dffdc12f2fed400ef11b845c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 28 Jul 2021 19:30:21 +0200 Subject: [PATCH 0789/1522] yubikey-agent: 0.1.4 -> 0.1.5 https://github.com/FiloSottile/yubikey-agent/releases/tag/v0.1.5 Dependency to pinentry_mac is no more needed: https://github.com/FiloSottile/yubikey-agent/commit/c9e9f88ea9ed076fc44fc9baa00054d4592fa704 --- pkgs/tools/security/yubikey-agent/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index baccb14faf4..fa243e4b048 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "1b4522s7xkh6q74m0lprbnzg2hspg1pr9rzn94qmd06sry82d3fd"; + sha256 = "14s61jgcmpqh70jz0krrai8xg0xqhwmillxkij50vbsagpxjssk6"; }; buildInputs = @@ -27,11 +27,7 @@ buildGoModule rec { subPackages = [ "." ]; - # On macOS, there isn't a choice of pinentry program, so let's - # ensure the nixpkgs-provided one is available - postInstall = lib.optionalString stdenv.isDarwin '' - wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath}) - '' + lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" From 4ecfa58c97863796f407b823049bcf1bd1866aac Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 28 Jul 2021 19:48:19 +0200 Subject: [PATCH 0790/1522] brave: 1.26.77 -> 1.27.108 (#131566) Co-authored-by: R. RyanTM --- pkgs/applications/networking/browsers/brave/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7bbbbe082d9..c45e5298dd1 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.77"; + version = "1.27.108"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw="; + sha256 = "Lz6rNTRoxt/UQFMQ9vurFhXWUshLDfWMxFON4nXfIiY="; }; dontConfigure = true; @@ -124,9 +124,11 @@ stdenv.mkDerivation rec { ln -sf $BINARYWRAPPER $out/bin/brave + for exe in $out/opt/brave.com/brave/{brave,crashpad_handler}; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $out/opt/brave.com/brave/brave + --set-rpath "${rpath}" $exe + done # Fix paths substituteInPlace $out/share/applications/brave-browser.desktop \ From d2058529ae9a9f9751bd76c2089a2db1e7d2ae32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 17:59:26 +0000 Subject: [PATCH 0791/1522] gitlab-pages: 1.40.0 -> 1.41.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index c62ad8b75c9..68aaeb16af7 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U="; + sha256 = "sha256-f/dmQvsWHlc9thJ9Ekp14VjdjW5+IMtD0vDMlYksUx4="; }; - vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM="; + vendorSha256 = "sha256-C/1CuUbZEfawzAasTM1VsbK3vVvuRAWUR3cBm5zGzXs="; subPackages = [ "." ]; meta = with lib; { From 5721bd08d371a1a03d12417fc20def3b279bd52b Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Wed, 28 Jul 2021 10:42:00 -0700 Subject: [PATCH 0792/1522] mc: move signature breaking sed from post to pre fixup Commit cb0e81b5b6c6 reverted changes from a7f0bf791608, which are required to have mc working on aarch64-darwin, where binary signatures are enforced. --- pkgs/tools/misc/mc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index cddda2c6a62..cb577ee333d 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -57,10 +57,12 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - postFixup = '' + preFixup = '' # remove unwanted build-dependency references sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc - '' + lib.optionalString (!stdenv.isDarwin) '' + ''; + + postFixup = lib.optionalString (!stdenv.isDarwin) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ From c58a34c649e493ff47af9ecefc0522b593010919 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 28 Jul 2021 20:22:05 +0200 Subject: [PATCH 0793/1522] emacs.pkgs.elpa-packages: 2021-07-28 Update to 2021-07-28, to fix the build of wisi and ada-mode. --- .../editors/emacs/elisp-packages/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 2bbeaba2a2a..b164bc676a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.1.4"; + version = "7.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar"; - sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.5.tar"; + sha256 = "037v25mqpg1n52hz89b49vf9zw68fmc0m7l6c1f8vnbw3dibyk8d"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -4224,10 +4224,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar"; - sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k"; + url = "https://elpa.gnu.org/packages/wisi-3.1.4.tar"; + sha256 = "1j35ln5x3dgypq3hn6xcdpg6vp6yjj6avcjakc2r6wx19vxixciw"; }; packageRequires = [ emacs seq ]; meta = { From 2e7a38fdac158a4eeb376a8cec0a04855f342e38 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 20:43:05 +0200 Subject: [PATCH 0794/1522] darkice: 1.3 -> 1.4 --- pkgs/tools/audio/darkice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 1ff66e83e5a..bc3bcbe4eff 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "darkice"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz"; - sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c"; + url = "https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz"; + sha256 = "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76"; }; nativeBuildInputs = [ pkg-config ]; From 9857ee80fbeeb3af149b41d1971e0578c7227b34 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 28 Jul 2021 17:47:27 +0200 Subject: [PATCH 0795/1522] llvmPackages_git: 2021-06-19 -> 2021-07-12 --- pkgs/development/compilers/llvm/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index ef65827fbf2..8b1fca6c8b1 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -21,8 +21,8 @@ let release_version = "13.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "1605fce6c3074f8d1dff5a917a1840ffa66abd86"; # When using a Git commit - rev-version = "unstable-2021-06-19"; # When using a Git commit + rev = "98033fdc50e61273b1d5c77ba5f0f75afe3965c1"; # When using a Git commit + rev-version = "unstable-2021-07-12"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "1jf0b9vn4qv5gsvhyg6xsqdkdl4vzn7j4sfcldl8bggcgjmzp0q1"; + sha256 = "0m28wpkyymzgqflp8xwyab0vryn3jln565qk15qm839n0d0mq3hh"; }; llvm_meta = { From 29db82b37a08bfe98c4dda62fad1967e4538a6f8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 21:07:07 +0200 Subject: [PATCH 0796/1522] whois: 5.5.8 -> 5.5.10 --- pkgs/tools/networking/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 55a356e3298..0caa0af061b 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.8"; + version = "5.5.10"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-WSAqJMVeHkcqzcgwvFKKBXJiIfKXBQr2mjioG7CgkIo="; + sha256 = "179hgmh9yqk8jq26ybik4cr3lgryd5p6kdwccc3r7mfssk3yp8lz"; }; nativeBuildInputs = [ perl gettext pkg-config ]; From ca501b305c85eb2ac9fcee1a7d2e5d767bc89a66 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova Date: Wed, 28 Jul 2021 20:11:49 +0100 Subject: [PATCH 0797/1522] perlPackages.DevelNYTProf: 6.06 -> 6.10 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6124fc5859e..ac31e708186 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6231,10 +6231,10 @@ let DevelNYTProf = buildPerlPackage { pname = "Devel-NYTProf"; - version = "6.06"; + version = "6.10"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz"; - sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55"; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz"; + sha256 = "24ac4174f1f01322063fa4e119b247d371d3260ddca6e778c6c1a0e3f905f58e"; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { @@ -6242,7 +6242,7 @@ let description = "Powerful fast feature-rich Perl source code profiler"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestDifferences ]; + buildInputs = [ CaptureTiny TestDifferences ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/* From 250ccd425a4f6f8b2d4c54960d194f60b22cd090 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 21:13:02 +0200 Subject: [PATCH 0798/1522] virt-what: 1.20 -> 1.21 --- pkgs/applications/virtualization/virt-what/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index f3004267ed7..ead44c40f9c 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "1s0hg5w47gmnllbs935bx21k3zqrgvqx1wn0zzij2lfxkb9dq4zr"; + sha256 = "0yqz1l4di57d4y1z94yhdmkiykg9a8i7xwkqmd9zsk5a6i9lbjqj"; }; meta = with lib; { From ed62c1c6631814274a3dc6e13254ad23c9d03e02 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Wed, 28 Jul 2021 19:42:45 +0100 Subject: [PATCH 0799/1522] kubernetes: make corefile configurable --- .../cluster/kubernetes/addons/dns.nix | 54 ++++++++++++++----- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 24d86628b21..8f937a13231 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -60,6 +60,45 @@ in { sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw"; }; }; + + corefile = mkOption { + description = '' + Custom coredns corefile configuration. + + See: . + ''; + type = types.str; + default = '' + .:${toString ports.dns} { + errors + health :${toString ports.health} + kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa { + pods insecure + fallthrough in-addr.arpa ip6.arpa + } + prometheus :${toString ports.metrics} + forward . /etc/resolv.conf + cache 30 + loop + reload + loadbalance + }''; + defaultText = '' + .:${toString ports.dns} { + errors + health :${toString ports.health} + kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa { + pods insecure + fallthrough in-addr.arpa ip6.arpa + } + prometheus :${toString ports.metrics} + forward . /etc/resolv.conf + cache 30 + loop + reload + loadbalance + }''; + }; }; config = mkIf cfg.enable { @@ -151,20 +190,7 @@ in { namespace = "kube-system"; }; data = { - Corefile = ".:${toString ports.dns} { - errors - health :${toString ports.health} - kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa { - pods insecure - fallthrough in-addr.arpa ip6.arpa - } - prometheus :${toString ports.metrics} - forward . /etc/resolv.conf - cache 30 - loop - reload - loadbalance - }"; + Corefile = cfg.corefile; }; }; From 9f038da2bbbb0a0f693d4acbcb615ea95657daab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2021 20:16:50 +0200 Subject: [PATCH 0800/1522] geeqie: 1.5.1 -> 1.6.0 --- pkgs/applications/graphics/geeqie/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index ff1df143141..5d44c5dceea 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "http://geeqie.org/${pname}-${version}.tar.xz"; - sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28"; + url = "https://github.com/BestImageViewer/geeqie/archive/refs/tags/v1.6.tar.gz"; + sha256 = "0ky248j6n8hszkwwi949i1ypm2l5444byaspaa6564d9rpij01aj"; }; patches = [ @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkg-config autoconf automake gettext intltool - wrapGAppsHook - ]; + nativeBuildInputs = + [ pkg-config autoconf automake gettext intltool + wrapGAppsHook + ]; buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida From 4612b75f2a5b5e3d8181384f460a5128a0583597 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 21:19:41 +0200 Subject: [PATCH 0801/1522] jool: 4.0.9 -> 4.1.5 --- pkgs/os-specific/linux/jool/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index abf7b0dac45..a90482a58d3 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.0.9"; + version = "4.1.5"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "0zhdpk1sbsv1iyr9rvj94wk853684avz3zzn4cv2k4254d7n25m7"; + sha256 = "05dwz4q6v6azgpyj9dzwihnw1lalhhym116q2ya7spvgxzxi04ax"; }; } From ced23716747165e9490fb57132567ff233d5b20d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 28 Jul 2021 19:29:35 +0200 Subject: [PATCH 0802/1522] cgit: fix regression where cgi script was not installed anymore Related to https://github.com/NixOS/nixpkgs/pull/131705. --- .../version-management/git-and-tools/cgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index a38055d9b21..b8f7cee7358 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" - "CGIT_SCRIPT_PATH=$out/cgit/" + "CGIT_SCRIPT_PATH=$(out)/cgit/" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ]; From c219fdffad3fa76c43824bee34d5fb424ff95b87 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 27 Jul 2021 20:56:48 -0500 Subject: [PATCH 0803/1522] nixos/installer: force root fs type installer media can be used on top of existing host configs. In such scenarions, root fs types will already be defined. Before this change, this will inevitably lead to the following error: ```console error: The option `fileSystems./.fsType' has conflicting definition values: - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4" - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs" ``` With this patch, the installers will override those values according to their own local requirement. Use `mkOverride 60` so that conscientious overriding specially targeted at the installer, e.g. with `mkForce` is still straight forward. --- nixos/modules/installer/cd-dvd/iso-image.nix | 6 +++++- nixos/modules/installer/netboot/netboot.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index d94af0b5bf7..f0384513247 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -654,7 +654,11 @@ in ]; fileSystems."/" = - { fsType = "tmpfs"; + # This module is often over-layed onto an existing host config + # that defines `/`. We use mkOverride 60 to override standard + # values, but at the same time leave room for mkForce values + # targeted at the image build. + { fsType = mkOverride 60 "tmpfs"; options = [ "mode=0755" ]; }; diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 238ab6d0617..f7543fdf4a2 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -30,7 +30,11 @@ with lib; else [ pkgs.grub2 pkgs.syslinux ]); fileSystems."/" = - { fsType = "tmpfs"; + # This module is often over-layed onto an existing host config + # that defines `/`. We use mkOverride 60 to override standard + # values, but at the same time leave room for mkForce values + # targeted at the image build. + { fsType = mkOverride 60 "tmpfs"; options = [ "mode=0755" ]; }; From 8a91213fd64c1f8ddf88d7f656eae2b20aa08be5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 22:19:32 +0200 Subject: [PATCH 0804/1522] powertop: 2.13 -> 2.14 --- pkgs/os-specific/linux/powertop/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index bbcf6e390f0..79594a87c51 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +, pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { pname = "powertop"; - version = "2.13"; + version = "2.14"; - src = fetchurl { - url = "https://01.org/sites/default/files/downloads/${pname}-${version}.tar.gz"; - sha256 = "0y1ixw8v17fdb1ima0zshrd0rh4zxdh10r93nrrvq6d4lhn9jpx6"; + src = fetchFromGitHub { + owner = "fenrus75"; + repo = pname; + rev = "v${version}"; + sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; }; outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; patches = lib.optional stdenv.hostPlatform.isMusl ( @@ -22,6 +25,8 @@ stdenv.mkDerivation rec { } ); + NIX_LDFLAGS = [ "-lpthread" ]; + postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" From ebfa909dd1e7738ffb227cc0ce877014ed589f0c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 28 Jul 2021 22:07:32 +0200 Subject: [PATCH 0805/1522] nuspell: 4.2.0 -> 5.0.0 --- pkgs/development/libraries/nuspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index c16305018d7..b7f438e9d07 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ="; + sha256 = "039ryhwfbbrrhavzyr999kngj10nk9n81i6qigxj6igfl4fzjy87"; }; nativeBuildInputs = [ cmake pkg-config pandoc ]; From 7a699e8d5002e0d2e471bb649b5aa2daeee0ef6a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 28 Jul 2021 20:57:42 +0200 Subject: [PATCH 0806/1522] vault: 1.7.3 -> 1.8.0 --- pkgs/tools/security/vault/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 66a6d5e63e8..d502cc779c2 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,27 +1,35 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests +{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests , makeWrapper , gawk , glibc }: -buildGoPackage rec { +buildGoModule rec { pname = "vault"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-BO4xzZrX9eVETQWjBDBfP7TlD7sO+gLgbB330A11KAI="; + sha256 = "sha256-jyGymAplSe8vaSwbONtpRoAondxNBcRbFZ+YyOtr7qo="; }; - goPackagePath = "github.com/hashicorp/vault"; + vendorSha256 = "11mrdf7pwf8v7bb7wamv2yhixw4x06rd0qym942kk9bwif2balfp"; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ]; + preBuild = '' + buildFlagsArray+=( + "-tags=vault" + "-ldflags=\ + -s -w \ + -X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev} \ + -X github.com/hashicorp/vault/sdk/version.Version=${version} \ + -X github.com/hashicorp/vault/sdk/version.VersionPrerelease=") + ''; postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash From b2ae6683e31147d613ec0fcffe1d629c8b93e14a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 28 Jul 2021 22:12:14 +0200 Subject: [PATCH 0807/1522] trash-cli: 0.21.7.23 -> 0.21.7.24 --- pkgs/tools/misc/trash-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 301f6163d76..5824e9cc495 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.7.23"; + version = "0.21.7.24"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l"; + sha256 = "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5"; }; propagatedBuildInputs = [ python3Packages.psutil ]; From dc060ff8b2abef52a75fede1b9ea6d35e280931f Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 27 Jul 2021 19:38:10 -0500 Subject: [PATCH 0808/1522] nixos/testing: fix invalid node names detection the use of python further restricts possible RFC1035 host labels since dash is not allowed for use in python identifiers. The previous implementation of this check was flawed, since it did not check the `hostName` value that is actually used to construe the identifier, but the node name, which can be anything, e.g. just `machine`. The previous implementation, by further restricting RFC1035 labels, only for the sake of testing seems to be an unacceptable restriction and should be addressed separately. --- nixos/lib/testing-python.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 768f1dc2a17..c703484666d 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -130,9 +130,12 @@ rec { nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes); + # TODO: This is an implementation error and needs fixing + # the testing famework cannot legitimately restrict hostnames further + # beyond RFC1035 invalidNodeNames = lib.filter (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) - (builtins.attrNames nodes); + nodeHostNames; testScript' = # Call the test script with the computed nodes. @@ -146,7 +149,9 @@ rec { Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! All machines are referenced as python variables in the testing framework which will break the script when special characters are used. - Please stick to alphanumeric chars and underscores as separation. + + This is an IMPLEMENTATION ERROR and needs to be fixed. Meanwhile, + please stick to alphanumeric chars and underscores as separation. '' else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName { From 512ee6db3997920c51b2a15c3510683aac934b31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2021 22:45:33 +0200 Subject: [PATCH 0809/1522] nix-fallback-paths.nix: Update to 2.3.15 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index e3576074a5b..15c76287e34 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14"; - i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14"; - aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14"; - x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14"; - aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14"; + x86_64-linux = "/nix/store/jhbxh1jwjc3hjhzs9y2hifdn0rmnfwaj-nix-2.3.15"; + i686-linux = "/nix/store/9pspwnkdrgzma1l4xlv7arhwa56y16di-nix-2.3.15"; + aarch64-linux = "/nix/store/72aqi5g7f4fhgvgafbcqwcpqjgnczj48-nix-2.3.15"; + x86_64-darwin = "/nix/store/6p6qwp73dgfkqhynmxrzbx1lcfgfpqal-nix-2.3.15"; + aarch64-darwin = "/nix/store/dmq2vksdhssgfl822shd0ky3x5x0klh4-nix-2.3.15"; } From ab9d7b3385bb1795d34ce53647a41aae6690cc75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 22:54:47 +0200 Subject: [PATCH 0810/1522] python3Packages.pytenable: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index b547d030ced..d2e227c1b17 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-S39rl8bJsxYAmTcaZk9+s9G45lOvREjlGVBk1m30tJo="; + sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq"; }; propagatedBuildInputs = [ From 9f0ced4a68a23cdba01bdf9d33e54595a395ed73 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jul 2021 22:55:47 +0200 Subject: [PATCH 0811/1522] vagrant: 2.2.17 -> 2.2.18 ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.18/CHANGELOG.md#2218-july-27-2021 --- pkgs/development/tools/vagrant/default.nix | 4 ++-- pkgs/development/tools/vagrant/gemset.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 688fd6eb849..259ca5cfc94 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.17"; + version = "2.2.18"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-T48ui7jgq9ni3pC09Jd2WzkT9PBaJ+SUDfcXA5QMjM8="; + sha256 = "sha256-NQiwkGuDLXMXyNNiIHmOwnS3IefvY9DPmRxo8Z2drpA="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 332fb265f87..a4014789b06 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -64,10 +64,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl"; + sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a"; type = "gem"; }; - version = "0.84.0"; + version = "0.85.0"; }; ffi = { groups = ["default"]; @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; little-plugger = { groups = ["default"]; @@ -310,15 +310,15 @@ version = "2.3.2"; }; vagrant_cloud = { - dependencies = ["excon" "log4r"]; + dependencies = ["excon" "log4r" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rwfw014fbvaxshf8abi87srfaiirb7cr93s61qm177jm8q86h57"; + sha256 = "0np0d8rjca130si5iaxasbqmfbbx4l3kd9mxdsa3p5mqiia7za3b"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; wdm = { groups = ["default"]; From 6a91cf75237eac464c25152ff961408ef72e45b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:07:22 +0200 Subject: [PATCH 0812/1522] python3Packages.pyairvisual: 5.0.8 -> 5.0.9 --- pkgs/development/python-modules/pyairvisual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 65f70efb7c5..fadb3f58d50 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.8"; + version = "5.0.9"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QgMc0O5jk5LgKQg9ZMCZd3dNLv1typm1Rp2u8kSsqYk="; + sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf"; }; nativeBuildInputs = [ poetry-core ]; From 68c4a69a9601c91badee451a7d816b53fc689e61 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 28 Jul 2021 14:12:59 -0700 Subject: [PATCH 0813/1522] vault-bin: correct wrapping arguments --- pkgs/tools/security/vault/vault-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 68df6e557f6..c38f370b0bf 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -42,8 +42,8 @@ in stdenv.mkDerivation { echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/vault \ - --prefix PATH ${lib.makeBinPath [ gawk glibc ]} - '' + '' + --prefix PATH : ${lib.makeBinPath [ gawk glibc ]} + runHook postInstall ''; From 388cece8f056636cf4649a7b3a6dad56685ad765 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:15:03 +0200 Subject: [PATCH 0814/1522] python3Packages.pyiqvia: 1.0.0 -> 1.0.1 --- .../python-modules/pyiqvia/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 34bc7bb5eb6..5dce573eaeb 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,12 +21,16 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-6BbJgRpn2hivm4N3Zpll9NACMSNlIhxj8CF2iVduIro="; + sha256 = "18qzxxn9xw9rwv3qz8k3zxh9xxy8c7rs8xlsrdrcq9wb0dhd7p0r"; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aresponses @@ -36,7 +40,8 @@ buildPythonPackage rec { ]; # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "pyiqvia" ]; meta = with lib; { From 040129fa318af47ba035ad809a52120393147940 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Fri, 9 Jul 2021 11:58:46 +0200 Subject: [PATCH 0815/1522] nixos/mx-puppet-discord: add module --- .../from_md/release-notes/rl-2111.section.xml | 7 + .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/misc/mx-puppet-discord.nix | 120 ++++++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 nixos/modules/services/misc/mx-puppet-discord.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 5a7f52d338f..de2cd7bef6d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -133,6 +133,13 @@ services.prometheus.exporters.influxdb. + + + mx-puppet-discord, + a discord puppeting bridge for matrix. Available as + services.mx-puppet-discord. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 89a3e6398c6..1ce78a4d774 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -41,6 +41,8 @@ pt-services.clipcat.enable). - [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable). +- [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as [services.mx-puppet-discord](#opt-services.mx-puppet-discord.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4d1700ed99a..0bd789b5911 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -529,6 +529,7 @@ ./services/misc/mediatomb.nix ./services/misc/metabase.nix ./services/misc/mwlib.nix + ./services/misc/mx-puppet-discord.nix ./services/misc/n8n.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix diff --git a/nixos/modules/services/misc/mx-puppet-discord.nix b/nixos/modules/services/misc/mx-puppet-discord.nix new file mode 100644 index 00000000000..11116f7c348 --- /dev/null +++ b/nixos/modules/services/misc/mx-puppet-discord.nix @@ -0,0 +1,120 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + dataDir = "/var/lib/mx-puppet-discord"; + registrationFile = "${dataDir}/discord-registration.yaml"; + cfg = config.services.mx-puppet-discord; + settingsFormat = pkgs.formats.json {}; + settingsFile = settingsFormat.generate "mx-puppet-discord-config.json" cfg.settings; + +in { + options = { + services.mx-puppet-discord = { + enable = mkEnableOption '' + mx-puppet-discord is a discord puppeting bridge for matrix. + It handles bridging private and group DMs, as well as Guilds (servers) + ''; + + settings = mkOption rec { + apply = recursiveUpdate default; + inherit (settingsFormat) type; + default = { + bridge.port = 8434; + presence = { + enabled = true; + interval = 500; + }; + provisioning.whitelist = [ ]; + relay.whitelist = [ ]; + + # variables are preceded by a colon. + namePatterns = { + user = ":name"; + userOverride = ":displayname"; + room = ":name"; + group = ":name"; + }; + + #defaults to sqlite but can be configured to use postgresql with + #connstring + database.filename = "${dataDir}/mx-puppet-discord/database.db"; + logging = { + console = "info"; + lineDateFormat = "MMM-D HH:mm:ss.SSS"; + }; + }; + example = literalExample '' + { + bridge = { + bindAddress = "localhost"; + domain = "example.com"; + homeserverUrl = "https://example.com"; + }; + + provisioning.whitelist = [ "@admin:example.com" ]; + relay.whitelist = [ "@.*:example.com" ]; + } + ''; + description = '' + config.yaml configuration as a Nix attribute set. + Configuration options should match those described in + + sample.config.yaml. + ''; + }; + serviceDependencies = mkOption { + type = with types; listOf str; + default = optional config.services.matrix-synapse.enable "matrix-synapse.service"; + description = '' + List of Systemd services to require and wait for when starting the application service. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.mx-puppet-discord = { + description = '' + mx-puppet-discord is a discord puppeting bridge for matrix. + It handles bridging private and group DMs, as well as Guilds (servers). + ''; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ] ++ cfg.serviceDependencies; + after = [ "network-online.target" ] ++ cfg.serviceDependencies; + + preStart = '' + # generate the appservice's registration file if absent + if [ ! -f '${registrationFile}' ]; then + ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -r -c ${settingsFile} \ + -f ${registrationFile} + fi + ''; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + + ProtectSystem = "strict"; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + + DynamicUser = true; + PrivateTmp = true; + WorkingDirectory = pkgs.mx-puppet-discord; + StateDirectory = baseNameOf dataDir; + UMask = 0027; + + ExecStart = '' + ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c ${settingsFile} + ''; + }; + }; + }; + + meta.maintainers = with maintainers; [ govanify ]; +} From 08bf0bbf3341d23cf8f5d0dad16ac9bc4eed7c18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:38:15 +0200 Subject: [PATCH 0816/1522] tfsec: 0.51.4 -> 0.52.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 176dea9a7bd..570054a3686 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.51.4"; + version = "0.52.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0l9b6hdcfcyn03y5wsfganb3h2vsnlrs9y3vahnnlx4rvv51ldwf"; + sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 913fed2c45919daa659a596894982d212fe7e063 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jul 2021 23:39:27 +0200 Subject: [PATCH 0817/1522] privacyidea: 3.6.1 -> 3.6.2 ChangeLog: https://github.com/privacyidea/privacyidea/blob/2d2c928cde004b6287ad81b24ab3855912ac5552/Changelog --- pkgs/applications/misc/privacyidea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 98bb6d02ebd..217ea6f5e6c 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -26,13 +26,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg="; + sha256 = "sha256-kv6XqsbGkaGEhfNxSOjCe6JbFOJnuqwM8CR/J9lJjks="; fetchSubmodules = true; }; From 327e6a993fef4106207e982714e84fb92c495d17 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 29 Jul 2021 05:35:43 +0800 Subject: [PATCH 0818/1522] stretchly: 1.6.0 -> 1.7.0 It contains a bug fix for electron process leak on every break. https://github.com/hovancik/stretchly/issues/925 --- pkgs/applications/misc/stretchly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 52c5f542b27..9c0cc7d08e7 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "stretchly"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d"; + sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw="; }; icon = fetchurl { From ccb2e3ade14af8b51624ace879a6ce7f481c243f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 21:42:43 +0000 Subject: [PATCH 0819/1522] gnome.gnome-autoar: 0.3.2 -> 0.3.3 --- pkgs/desktops/gnome/misc/gnome-autoar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 8a74c05dfea..2afb401bef4 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.2"; + version = "0.3.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; + sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ="; }; passthru = { From 980bc2d470c1b14585bbd44beeecdf6d72d1da43 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 27 Jul 2021 20:38:16 -0700 Subject: [PATCH 0820/1522] makemkv: Install .desktop file and icons This allows makemkv to be launched from a desktop manager, with nice icons. --- pkgs/applications/video/makemkv/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 54f3d42e7a7..180d5e8e829 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -29,6 +29,7 @@ let ]; sha256 = "0ssg3q1z80652d4gkv1z7kpsxx82xcw6kpsw266c8q4y2n8x7c76"; }; + in mkDerivation { pname = "makemkv"; inherit version; @@ -51,9 +52,15 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop + install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* + install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* + install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* + install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* + install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* runHook postInstall ''; From 975a9d2e4b14574ba1ec80c46acc6b4c471f3a70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Jul 2021 23:59:02 +0200 Subject: [PATCH 0821/1522] fetchmail: 6.4.16 -> 6.4.20 Fixes: CVE-2021-36386 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index d1659822bb2..18ed79c99d6 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.16"; + version = "6.4.20"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k="; + sha256 = "0xk171sbxcwjh1ibpipryw5sv4sy7jjfvhn5n373j04g5sp428f8"; }; buildInputs = [ openssl ]; From 0951333c1a56d17ed063beccf61bb395d3527a3d Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 28 Jul 2021 22:59:02 +0000 Subject: [PATCH 0822/1522] exploitdb: 2021-07-27 -> 2021-07-28 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 5cd7f4f63bf..178d2d80a27 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-27"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab"; + sha256 = "sha256-cM7VxZRIs5QktjI1YkJGtdxkA1/CXCCuVynyTVCILsI="; }; installPhase = '' From 39f65ee33dd09350635f2495d200707dd97452b7 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Mon, 26 Jul 2021 02:05:31 +0200 Subject: [PATCH 0823/1522] nixos/mlvwm: init at 0.9.3 --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/mlvwm.nix | 41 ++++++++++++++ .../window-managers/mlvwm/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 97 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/mlvwm.nix create mode 100644 pkgs/applications/window-managers/mlvwm/default.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 53285fbce87..d71738ea633 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -26,6 +26,7 @@ in ./leftwm.nix ./lwm.nix ./metacity.nix + ./mlvwm.nix ./mwm.nix ./openbox.nix ./pekwm.nix diff --git a/nixos/modules/services/x11/window-managers/mlvwm.nix b/nixos/modules/services/x11/window-managers/mlvwm.nix new file mode 100644 index 00000000000..08dd0402029 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/mlvwm.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.windowManager.mlvwm; + +in +{ + + options.services.xserver.windowManager.mlvwm = { + enable = mkEnableOption "Macintosh-like Virtual Window Manager"; + + configFile = mkOption { + default = null; + type = with types; nullOr path; + description = '' + Path to the mlvwm configuration file. + If left at the default value, $HOME/.mlvwmrc will be used. + ''; + }; + }; + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = [{ + name = "mlvwm"; + start = '' + ${pkgs.mlvwm}/bin/mlvwm ${optionalString (cfg.configFile != null) + "-f /etc/mlvwm/mlvwmrc" + } & + waitPID=$! + ''; + }]; + + environment.etc."mlvwm/mlvwmrc" = mkIf (cfg.configFile != null) { + source = cfg.configFile; + }; + + environment.systemPackages = [ pkgs.mlvwm ]; + }; +} diff --git a/pkgs/applications/window-managers/mlvwm/default.nix b/pkgs/applications/window-managers/mlvwm/default.nix new file mode 100644 index 00000000000..14170be53ac --- /dev/null +++ b/pkgs/applications/window-managers/mlvwm/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchFromGitHub, gccmakedep, libX11, libXext, libXpm, imake, installShellFiles, ... }: + +stdenv.mkDerivation rec { + pname = "mlvwm"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "morgant"; + repo = pname; + rev = version; + sha256 = "sha256-Sps2+XyMTcNuhQTLrW/8vSZIcSzMejoi1m64SK129YI="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ gccmakedep libX11 libXext libXpm imake ]; + + buildPhase = '' + (cd man && xmkmf) + (cd sample_rc && xmkmf) + (cd mlvwm && xmkmf) + xmkmf + make + ''; + + installPhase = '' + mkdir -p $out/{bin,etc} + cp mlvwm/mlvwm $out/bin + cp sample_rc/Mlvwmrc* $out/etc + runHook postInstall + ''; + + postInstall = '' + mv man/mlvwm.man man/mlvwm.1 + installManPage man/mlvwm.1 + ''; + + meta = with lib; { + homepage = "https://github.com/morgant/mlvwm"; + description = "Macintosh-like Virtual Window Manager"; + license = licenses.mit; + longDescription = '' + MLVWM or Macintosh-Like Virtual Window Manager, + is an FVWM descendant created by Takashi Hasegawa + in 1997 while studying at Nagoya University and + was written entirely in the C programming language. + As its name implies, it attempts to emulate the + pre-Mac OS X Macintosh look and feel in its layout and window design. + ''; + platforms = platforms.linux; + maintainers = [ maintainers.j0hax ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 107722e6e10..bc64dec585b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25683,6 +25683,8 @@ in ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; + mlvwm = callPackage ../applications/window-managers/mlvwm { }; + MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { From 7bc3dafc445c303c28b364aedeca5f130cde4159 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 23:21:29 +0000 Subject: [PATCH 0824/1522] jenkins: 2.289.2 -> 2.289.3 --- .../tools/continuous-integration/jenkins/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 88156f815ab..4af5738d91b 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix -, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused +, makeWrapper, nix, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl +}: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.2"; + version = "2.289.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; + sha256 = "11wb4kqy1hja2fgnqsr6p0khdyvinclprxz9z5m58czrsllzsvcr"; }; nativeBuildInputs = [ makeWrapper ]; From b808c136bd82f4e112e6561570b02fbb7997d22e Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Thu, 29 Jul 2021 02:00:42 +0200 Subject: [PATCH 0825/1522] aviator: init at 1.8.1 Signed-off-by: Marc 'risson' Schmitt --- .../tools/misc/aviator/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/aviator/default.nix diff --git a/pkgs/development/tools/misc/aviator/default.nix b/pkgs/development/tools/misc/aviator/default.nix new file mode 100644 index 00000000000..66b2ae45035 --- /dev/null +++ b/pkgs/development/tools/misc/aviator/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aviator"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "herrjulz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ="; + }; + + deleteVendor = true; + vendorSha256 = "sha256-rYOphvI1ZE8X5UExfgxHnWBn697SDkNnmxeY7ihIZ1s="; + + meta = with lib; { + description = "Merge YAML/JSON files in a in a convenient fashion"; + homepage = "https://github.com/herrjulz/aviator"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b8dbf0af0..747f2900061 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13090,6 +13090,8 @@ in automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { }; + aviator = callPackage ../development/tools/misc/aviator { }; + awf = callPackage ../development/tools/misc/awf { }; aws-adfs = with python3Packages; toPythonApplication aws-adfs; From 5f4c97eda4d5627b4f1f1cec1479332653856fb1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 28 Jul 2021 15:14:46 -0500 Subject: [PATCH 0826/1522] trellis: 2021.01.02 -> 2021.07.06 Signed-off-by: Austin Seipp --- pkgs/development/tools/trellis/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 8f9acd6c140..4d14b6a7820 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "trellis"; - version = "2021.01.02"; + version = "2021.07.06"; # git describe --tags realVersion = with lib; with builtins; @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis"; - rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e"; - sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf"; + rev = "dff1cbcb1bd30de7e96f8a059f2e19be1bb2e44d"; + sha256 = "1gbrka9gqn124shx448aivbgywyp30zyjwfazr7v49lhrl7d46lb"; name = "trellis"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis-db"; - rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; - sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; + rev = "0ee729d20eaf9f1e0f1d657bc6452e3ffe6a0d63"; + sha256 = "0069c98bb4wilxz21snwc39yy0rm7ffma179djyz57d99p0vcfkq"; name = "trellis-database"; }) ]; From d0044b0e7d531a7a28d4552582b98e8b3953c6cb Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 28 Jul 2021 15:17:00 -0500 Subject: [PATCH 0827/1522] nextpnr: 2021.01.02 -> 2021.07.28 Signed-off-by: Austin Seipp --- pkgs/development/compilers/nextpnr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index efb29985452..c812a3bb823 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,21 +14,21 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.01.02"; + version = "2021.07.28"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "9b9628047c01a970cfe20f83f2b7129ed109440d"; - sha256 = "0pcv96d0n40h2ipywi909hpzlys5b6r4pamc320qk1xxhppmgkmm"; + rev = "39a7381928359934788aefd670c835dedbbf2cd7"; + sha256 = "1rs95vp5m3fdvhmjilj2r2g54xlabd3vy8wii1ammajqkyamy8x3"; name = "nextpnr"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr-tests"; - rev = "8f93e7e0f897b1b5da469919c9a43ba28b623b2a"; - sha256 = "0zpd0w49k9l7rs3wmi2v8z5s4l4lad5rprs5l83w13667himpzyc"; + rev = "ccc61e5ec7cc04410462ec3196ad467354787afb"; + sha256 = "09a0bhrphr3rsppryrfak4rhziyj8k3s17kgb0vgm0abjiz0jgam"; name = "nextpnr-tests"; }) ]; From 7c59c68335c2a8658518636a5caecc967324f0db Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Thu, 29 Jul 2021 02:44:08 +0200 Subject: [PATCH 0828/1522] spruce: init at 1.28.0 Signed-off-by: Marc 'risson' Schmitt --- .../development/tools/misc/spruce/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/spruce/default.nix diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix new file mode 100644 index 00000000000..ff95242681b --- /dev/null +++ b/pkgs/development/tools/misc/spruce/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "spruce"; + version = "1.28.0"; + + src = fetchFromGitHub { + owner = "geofffranks"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cNO+6rMQPO1e4Hen8vcFU1FRnnCv2+fDYtXXbuR2UCU="; + }; + + deleteVendor = true; + vendorSha256 = "sha256-5EM4Z9AN1Mjy7DayII0Iu+XrjM9lyUqrScMT/fe43dw="; + + meta = with lib; { + description = "A BOSH template merge tool"; + homepage = "https://github.com/geofffranks/spruce"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b8dbf0af0..c0a1dd4de63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14345,6 +14345,8 @@ in spooles = callPackage ../development/libraries/science/math/spooles {}; + spruce = callPackage ../development/tools/misc/spruce { }; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; From ac996ae59ab8dd09c7b4db132bd6a65024cee543 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 29 Jul 2021 02:47:02 +0200 Subject: [PATCH 0829/1522] hydrus: 447 -> 448 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 292c3cf2156..d46569028c2 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "447"; + version = "448"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "0a9nrsbw3w1229bm90xayixvkpvr6g338w64x4v75sqxvpbx84lz"; + sha256 = "sha256-h7FQRgxqXDEXDFRQEPeJUIbJYf9fs68oUQv5rCUS0zw="; }; nativeBuildInputs = [ From 7aa2bf302ae563453b010cc27ea66affb055b26e Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Wed, 28 Jul 2021 20:53:38 -0400 Subject: [PATCH 0830/1522] Added more detail to changelog, updated permissions in directory, and changed restartTriggers --- .../manual/from_md/release-notes/rl-2111.section.xml | 7 +++++-- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 10 ++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 31031a2d2e7..c78c99cb647 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -558,9 +558,12 @@ tt-rss was upgraded to the commit on - 2021-06-21, which has breaking changes, see + 2021-06-21, which has breaking changes. If you use + services.tt-rss.extraConfig you should + migrate to the putenv-style configuration. + See this - thread in the tt-rss forums for details. + Discourse post in the tt-rss forums for more details. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5a6bf727c03..eb45c9bf747 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -142,7 +142,7 @@ pt-services.clipcat.enable). - the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 -- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 676683a557d..7a6dc5f0a4e 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -568,9 +568,7 @@ let systemd.services = { phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { - restartTriggers = [ - cfg.root - ]; + restartTriggers = [ tt-rss-config tt-rss ]; }; tt-rss = { @@ -611,9 +609,9 @@ let ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chmod -R 755 "${cfg.root}" - chmod -R 777 "${cfg.root}/${lockDir}" - chmod -R 777 "${cfg.root}/${cacheDir}" - chmod -R 777 "${cfg.root}/${feedIconsDir}" + chmod -R ug+rwX "${cfg.root}/${lockDir}" + chmod -R ug+rwX "${cfg.root}/${cacheDir}" + chmod -R ug+rwX "${cfg.root}/${feedIconsDir}" '' + (optionalString (cfg.database.type == "pgsql") '' From 46f19d869e42c3671a0c0e3ef6488b5138592358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 02:30:47 +0000 Subject: [PATCH 0831/1522] brave: 1.27.108 -> 1.27.109 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index c45e5298dd1..7b85a5a5109 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.27.108"; + version = "1.27.109"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Lz6rNTRoxt/UQFMQ9vurFhXWUshLDfWMxFON4nXfIiY="; + sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU="; }; dontConfigure = true; From 8a9b68514dd944f4eb2c4ebc512660fb6a4d0799 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 02:49:25 +0000 Subject: [PATCH 0832/1522] cargo-expand: 1.0.7 -> 1.0.8 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 390850c9afa..1403f67abda 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM="; + sha256 = "sha256-UkNO2uNiyN6xB74dNMiWZUCH6qq6P6u95wTq8xRvxsQ="; }; - cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ="; + cargoSha256 = "sha256-JTjPdTG8KGYVkiCkTqRiJyTpm7OpZkbW10EKSp9lLJ4="; buildInputs = lib.optional stdenv.isDarwin libiconv; From f7eb8b8c50ef8b838816f7a81e86678865f86703 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jul 2021 04:20:00 +0000 Subject: [PATCH 0833/1522] ocamlPackages.odoc-parser: init at 0.9.0 --- .../ocaml-modules/odoc-parser/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/odoc-parser/default.nix diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix new file mode 100644 index 00000000000..a8e6bd2599c --- /dev/null +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, buildDunePackage, astring, result }: + +buildDunePackage rec { + pname = "odoc-parser"; + version = "0.9.0"; + + minimumOCamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/ocaml-doc/odoc-parser/releases/download/0.9.0/odoc-parser-0.9.0.tbz"; + sha256 = "0ydxy2sj2w9i4vvyjnxplgmp5gbkp5ilnv36pvk4vgrrmldss3fz"; + }; + + useDune2 = true; + + buildInputs = [ astring result ]; + + meta = { + description = "Parser for Ocaml documentation comments"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.marsam ]; + homepage = "https://github.com/ocaml-doc/odoc-parser"; + changelog = "https://github.com/ocaml-doc/odoc-parser/raw/${version}/CHANGES.md"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8eb8a3944f9..776f9134bca 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -934,6 +934,8 @@ let odoc = callPackage ../development/ocaml-modules/odoc { }; + odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; + omd = callPackage ../development/ocaml-modules/omd { }; opam-core = callPackage ../development/ocaml-modules/opam-core { From 707f6106fe970598ddaf54b5612e0483dd788624 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jul 2021 04:20:00 +0000 Subject: [PATCH 0834/1522] ocamlformat: 0.18.0 -> 0.19.0 https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.19.0 --- .../tools/ocaml/ocamlformat/default.nix | 6 +++++- .../tools/ocaml/ocamlformat/generic.nix | 20 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 4c8a4b9e9d0..24d94fbcf24 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -56,5 +56,9 @@ rec { version = "0.18.0"; }; - ocamlformat = ocamlformat_0_18_0; + ocamlformat_0_19_0 = mkOCamlformat { + version = "0.19.0"; + }; + + ocamlformat = ocamlformat_0_19_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 536fcd4acb1..afd7ae8807b 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -22,6 +22,7 @@ let src = "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138"; "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq"; + "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; }."${version}"; }; ocamlPackages = @@ -46,7 +47,24 @@ buildDunePackage { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.18.0" + if lib.versionAtLeast version "0.19.0" + then [ + base + cmdliner + fpath + re + stdio + uuseg + uutf + fix + menhir + menhirLib + menhirSdk + ocp-indent + dune-build-info + odoc-parser + ] + else if lib.versionAtLeast version "0.18.0" then [ base cmdliner diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b8dbf0af0..66e5491deab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11947,7 +11947,8 @@ in ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 + ocamlformat_0_19_0; orc = callPackage ../development/compilers/orc { }; From 621b13046cb1f92f1dd6fc43871dc9a34b39b116 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 03:06:42 +0000 Subject: [PATCH 0835/1522] cloudflared: 2021.7.3 -> 2021.7.4 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index b98f6a79822..9026738133b 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.7.3"; + version = "2021.7.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E="; + sha256 = "sha256-3HK7QLUhU6MUayRYec4LP2BfbwEsvtjtCf++o1cQsQw="; }; vendorSha256 = null; From 98dcfcfeb80477315f7faa995d677f919500f8b5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 15 Jul 2021 09:24:59 +0800 Subject: [PATCH 0836/1522] mkvtoolnix: 56.0.0 -> 59.0.0 Additional changes: 1. Qt is now needed for both the cli and gui variants. 2. Run the test suite 3. Drop a number of dependencies that are no longer needed 4. We have nlohmann_json and pugixml, so use those instead of the vendored versions 5. Add support for reading chapters from DVDs 6. Build with rake as recommended by upstream --- .../applications/video/mkvtoolnix/default.nix | 137 +++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 104 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 23bad049d6f..8557c47ad77 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,69 +1,138 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake -, ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib -, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 +{ lib +, stdenv +, mkDerivation +, fetchFromGitLab +, pkg-config +, autoreconfHook +, qmake +, rake +, boost +, cmark +, docbook_xsl +, expat +, file +, flac +, fmt +, gettext +, gmp +, gtest +, libdvdread +, libebml +, libiconv +, libmatroska +, libogg +, libvorbis +, libxslt +, nlohmann_json +, pugixml +, qtbase +, qtmultimedia +, xdg-utils +, zlib , withGUI ? true - , qtbase ? null - , qtmultimedia ? null - , wrapQtAppsHook ? null +, wrapQtAppsHook }: -assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null; +let + inherit (lib) enableFeature optional optionals optionalString; -with lib; + phase = name: args: + '' + runHook pre${name} -stdenv.mkDerivation rec { + rake ${args} + + runHook post${name} + ''; + +in +mkDerivation rec { pname = "mkvtoolnix"; - version = "56.0.0"; + version = "59.0.0"; src = fetchFromGitLab { - owner = "mbunkus"; - repo = "mkvtoolnix"; - rev = "release-${version}"; - sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj"; + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ="; }; nativeBuildInputs = [ - pkg-config autoconf automake gettext - drake ruby docbook_xsl libxslt - ]; + autoreconfHook + docbook_xsl + gettext + gtest + libxslt + pkg-config + rake + ] + ++ optional withGUI wrapQtAppsHook; + # 1. qtbase and qtmultimedia are needed without the GUI + # 2. we have utf8cpp in nixpkgs but it doesn't find it buildInputs = [ - expat file xdg-utils boost libebml zlib fmt - libmatroska libogg libvorbis flac cmark pcre2 - ] ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; + boost + expat + file + flac + fmt + gmp + libdvdread + libebml + libmatroska + libogg + libvorbis + nlohmann_json + pugixml + qtbase + qtmultimedia + xdg-utils + zlib + ] + ++ optional withGUI cmark + ++ optional stdenv.isDarwin libiconv; - preConfigure = "./autogen.sh; patchShebangs ."; - buildPhase = "drake -j $NIX_BUILD_CORES"; - installPhase = "drake install -j $NIX_BUILD_CORES"; + # autoupdate is not needed but it silences a ton of pointless warnings + postPatch = '' + patchShebangs . > /dev/null + autoupdate configure.ac ac/*.m4 + ''; configureFlags = [ - "--enable-magic" + "--disable-debug" + "--disable-precompiled-headers" + "--disable-profiling" + "--disable-static-qt" "--enable-optimization" "--with-boost-libdir=${boost.out}/lib" - "--disable-debug" - "--disable-profiling" - "--disable-precompiled-headers" - "--disable-static-qt" - "--with-gettext" "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" - (enableFeature withGUI "qt") + "--with-gettext" + (enableFeature withGUI "gui") ]; + buildPhase = phase "Build" ""; + + installPhase = phase "Install" "install"; + + doCheck = true; + + checkPhase = phase "Check" "tests:run_unit"; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; LDFLAGS = optional stdenv.cc.isClang "-lc++fs"; dontWrapQtApps = true; + postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui ''; meta = with lib; { description = "Cross-platform tools for Matroska"; - homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; - license = licenses.gpl2Only; + homepage = "https://mkvtoolnix.download/"; + license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel rnhmjoj ]; - platforms = platforms.linux + platforms = platforms.linux ++ optionals (!withGUI) platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66e5491deab..beab8189b44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17554,7 +17554,7 @@ in mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { + mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; }; From 91587443b60a2c6c50079afce83eeabb8d75be64 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Jul 2021 04:20:00 +0000 Subject: [PATCH 0837/1522] nodejs-12_x: 12.22.3 -> 12.22.4 https://github.com/nodejs/node/releases/tag/v12.22.4 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index cfd6c211ab5..66cf2e4904d 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.3"; - sha256 = "143ihn30jd08nk19saxn6qp3ldc9yvy8w338i4cg9256wgx120im"; + version = "12.22.4"; + sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From c7a1fddc2fe23ff2238ab5e514c1d66f757b401e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Jul 2021 04:20:00 +0000 Subject: [PATCH 0838/1522] nodejs-14_x: 14.17.3 -> 14.17.4 https://github.com/nodejs/node/releases/tag/v14.17.4 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index ad6c8aacddc..3b04f751b48 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.3"; - sha256 = "0j3zd5vavsapqs9h682mr8r5i7xp47n0w4vjvm8rw3rn3dg4p2sb"; + version = "14.17.4"; + sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From f5de4158dd462c51741ec48be2e47a3f8015930d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Jul 2021 04:20:00 +0000 Subject: [PATCH 0839/1522] nodejs-16_x: 16.5.0 -> 16.6.0 https://github.com/nodejs/node/releases/tag/v16.6.0 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 766df734a4a..c89b48ae3dd 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.5.0"; - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; + version = "16.6.0"; + sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; } From 60e09601df751cbb01e0e0db87d103608889c7b1 Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Thu, 29 Jul 2021 02:19:46 +0200 Subject: [PATCH 0840/1522] minikube: 1.21.0 -> 1.22.0 --- .../applications/networking/cluster/minikube/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index ac7a301fe06..2db814c635f 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -2,7 +2,6 @@ , stdenv , buildGoModule , fetchFromGitHub -, go-bindata , installShellFiles , pkg-config , which @@ -12,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.21.0"; + version = "1.22.0"; - vendorSha256 = "sha256-3G9QO5OMnMkMCsGIze/E9bvx6fvlXtOqiv8lGTkLN3s="; + vendorSha256 = "sha256-zAXEwGJ3dnqN/+3k189zqppdiNHPyJ+mdZvDNEWQLsA="; doCheck = false; @@ -22,10 +21,10 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-PbCwGPJZvnJCIVK7FYa1gI4aO4sIeh8iQtYOHAQBaZE="; + sha256 = "sha256-wL/HsdV6MZcsR3Y8pGZ5WYUMJ7j+VyJGpLeLIXm5MJM="; }; - nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; + nativeBuildInputs = [ installShellFiles pkg-config which ]; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; From dd98b100651cfbb8804f32d852f75ef7c97a6b74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:47:41 +0200 Subject: [PATCH 0841/1522] python3Packages.aiosmb: 0.2.49 -> 0.2.50 --- pkgs/development/python-modules/aiosmb/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 88c793f9cb5..84104f563cb 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -2,7 +2,7 @@ , asysocks , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , minikerberos , prompt_toolkit , pycryptodomex @@ -15,12 +15,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.49"; + version = "0.2.50"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-XCaAaY7a6Gdddm9B0ET+rVzFra5W0GTI/HUMuvpyhzM="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = version; + sha256 = "016pylxqmzm1hn1mvx6jhxvgckdqpf993sd1bki07pblmm4ikl6q"; }; propagatedBuildInputs = [ From 6cf7d82316e632ad4e3d7b3a075a00d9b3d79e8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 04:35:03 +0000 Subject: [PATCH 0842/1522] fend: 0.1.21 -> 0.1.22 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 4ed308643e5..e46b8fe04d4 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; + sha256 = "sha256-JuOhJGszsEBBz9G4jjV7OhCAyrSOIktYgoDpYPMk21c="; }; - cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; + cargoSha256 = "sha256-rKSbsxFt+ntE68eQK6zbIPdOL9JBOgqyqLnb8paVVo0="; doInstallCheck = true; From 9730596ace05443a9f271b8188e978c5c8ac8d68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 05:04:48 +0000 Subject: [PATCH 0843/1522] freerdp: 2.3.2 -> 2.4.0 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 942090f2bdf..0f76bced878 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w="; + sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ="; }; postPatch = '' From 6a3b465b39238f8d12cb2dedd5e418023936d5f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:03:04 +0200 Subject: [PATCH 0844/1522] python3Packages.yalexs: 1.1.12 -> 1.1.13 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 502eb5c4f68..a97ebe947af 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.12"; + version = "1.1.13"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4="; + sha256 = "0938540n60xv7kxam3azszn3nj0mnhhgh5p4hgbfxj43bkwpqz4n"; }; propagatedBuildInputs = [ From 3360feb692187ebd92f538256c832cbe9f2ac79c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 08:54:09 +0200 Subject: [PATCH 0845/1522] python3Packages.aiolip: 1.1.4 -> 1.1.6 --- pkgs/development/python-modules/aiolip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix index 1db1ae1cf03..80e110cbd8f 100644 --- a/pkgs/development/python-modules/aiolip/default.nix +++ b/pkgs/development/python-modules/aiolip/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aiolip"; - version = "1.1.4"; + version = "1.1.6"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "1f8mlvbnfcn3sigsmjdpdpgxmnbvcjhfr7lzch61i8sy25dgakji"; + sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; }; checkInputs = [ From 4b5c1a0de5558c0c6ac627249f4093a054da1513 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 06:57:39 +0000 Subject: [PATCH 0846/1522] icingaweb2: 2.9.0 -> 2.9.2 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 7923674a3b7..bde0cb01005 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1vp2gdvgvw960178yaqql6iza0rg2h8japsnass3kkrwrmb2liq5"; + sha256 = "sha256-sCglJDxEUOAcBwNowLjglMi6y92QJ4ZF+I/5HPfTE+s="; }; nativeBuildInputs = [ makeWrapper ]; From 2f3c29cc68094827c23c5601114a029de88c43c1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 9 May 2021 23:25:17 +0700 Subject: [PATCH 0847/1522] coqPackages.graph-theory: init at 0.9 --- .../coq-modules/graph-theory/default.nix | 33 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/coq-modules/graph-theory/default.nix diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix new file mode 100644 index 00000000000..5607d342a2e --- /dev/null +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -0,0 +1,33 @@ +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap +, hierarchy-builder, version ? null }: + +with lib; + +mkCoqDerivation { + pname = "graph-theory"; + + release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; + + releaseRev = v: "v${v}"; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "0.9"; } + ] null; + + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; + + meta = { + description = "Library of formalized graph theory results in Coq"; + longDescription = '' + A library of formalized graph theory results, including various + standard results from the literature (e.g., Menger’s Theorem, Hall’s + Marriage Theorem, and the excluded minor characterization of + treewidth-two graphs) as well as some more recent results arising from + the study of relation algebra within the ERC CoVeCe project (e.g., + soundness and completeness of an axiomatization of graph isomorphism). + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6fc0500ed53..35cde1b123e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -42,6 +42,7 @@ let fourcolor = callPackage ../development/coq-modules/fourcolor {}; gappalib = callPackage ../development/coq-modules/gappalib {}; goedel = callPackage ../development/coq-modules/goedel {}; + graph-theory = callPackage ../development/coq-modules/graph-theory {}; heq = callPackage ../development/coq-modules/heq {}; hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; HoTT = callPackage ../development/coq-modules/HoTT {}; From 2f6eb6594d066a2f9458660db196d633703ec2a0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 29 Jul 2021 04:20:48 -0300 Subject: [PATCH 0848/1522] marst: init at 2.7 MARST is an Algol-to-C translator. --- pkgs/development/compilers/marst/default.nix | 54 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/compilers/marst/default.nix diff --git a/pkgs/development/compilers/marst/default.nix b/pkgs/development/compilers/marst/default.nix new file mode 100644 index 00000000000..8412c149c23 --- /dev/null +++ b/pkgs/development/compilers/marst/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "marst"; + version = "2.7"; + + src = fetchurl { + url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA="; + }; + + nativeBuildInputs = [ + texinfo + ]; + + postBuild = '' + makeinfo doc/marst.texi -o doc/marst.info + ''; + + postInstall = '' + install -m644 doc/marst.info -Dt $out/share/info/ + install -m644 doc/marst.pdf -Dt $out/share/doc/${pname}/ + ''; + + meta = with lib; { + homepage = "https://www.gnu.org/software/marst/"; + description = "An Algol-60-to-C translator"; + longDescription = '' + MARST is an Algol-to-C translator. It automatically translates programs + written on the algorithmic language Algol 60 to the C programming + language. + + The MARST package includes three main components: + + - the translator, MARST, that translates Algol 60 programs to the C + programming language. + + - the library, ALGLIB, that contains precompiled standard Algol 60 + procedures and other necessary library routines. This library is to be + used at linking stage. (In the distribution the name libalgol.a is used + for this library.) + + - the converter, MACVT, that allows to convert existing Algol 60 programs + from some other representations to MARST representation. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e97207f277..2945cc384f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11842,6 +11842,8 @@ in manticore = callPackage ../development/compilers/manticore { }; + marst = callPackage ../development/compilers/marst { }; + mercury = callPackage ../development/compilers/mercury { jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; From 610c052f71dc768ebe822fbb025a8d1b94187ac5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 22:57:59 +0200 Subject: [PATCH 0849/1522] a2ps: replace name with pname&version --- pkgs/tools/text/a2ps/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 978839ab1fd..d3fe3a7e705 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }: stdenv.mkDerivation rec { - name = "a2ps-4.14"; + pname = "a2ps"; + version = "4.14"; + src = fetchurl { - url = "mirror://gnu/a2ps/${name}.tar.gz"; + url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz"; sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk"; }; From 43f86e6883c393395d28f10a2ee1ad3603443198 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Jul 2021 23:01:12 +0200 Subject: [PATCH 0850/1522] enscript: replace name with pname&version --- pkgs/tools/text/enscript/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 1918029317a..1299ef78679 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "enscript-1.6.6"; + pname = "enscript"; + version = "1.6.6"; src = fetchurl { - url = "mirror://gnu/enscript/${name}.tar.gz"; + url = "mirror://gnu/enscript/enscript-${version}.tar.gz"; sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; From e3c9ca9404dd010ed594862328d36948b16507e4 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 28 Jul 2021 07:11:45 +0200 Subject: [PATCH 0851/1522] slack: 4.17.0 -> 4.18.0 --- .../networking/instant-messengers/slack/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 24282f4be33..61a859e331e 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.17.0"; - x86_64-darwin-sha256 = "0r5cafxw73qnn14ljprn7w8bfn67zbkcniq60k9pf2zbqgb4cyj9"; + x86_64-darwin-version = "4.18.0"; + x86_64-darwin-sha256 = "1qldmh0xdbl18gvxxsi2jvcq1ziwap3naxgax4gn36x5k25ipw5k"; - x86_64-linux-version = "4.17.0"; - x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; + x86_64-linux-version = "4.18.0"; + x86_64-linux-sha256 = "1dhdmi2rvww8m6400c5dc0c6mrircvflgwcja2rr7ry0lv98n6kh"; - aarch64-darwin-version = "4.17.0"; - aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46"; + aarch64-darwin-version = "4.18.0"; + aarch64-darwin-sha256 = "0qlfxskqq5gr45p1gfc2jcbr1abhc6di653jwjgh7yibim0hpjab"; version = { x86_64-darwin = x86_64-darwin-version; From bf0a098d5b947ffa4987d2c54424b96dc426e7d1 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 29 Jul 2021 01:44:52 +0800 Subject: [PATCH 0852/1522] vlc: add srt support This enables the protocol `srt://` for vlc and downstream packages. --- pkgs/applications/video/vlc/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 7aee50d5064..46669dff530 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook, fetchpatch , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska @@ -8,7 +8,7 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols -, ncurses +, ncurses, srt , onlyLibVLC ? false , withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook , jackSupport ? false @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate - fluidsynth wayland wayland-protocols ncurses + fluidsynth wayland wayland-protocols ncurses srt ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) @@ -61,6 +61,13 @@ stdenv.mkDerivation rec { # set the path to the compiler BUILDCC = "${stdenv.cc}/bin/gcc"; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch"; + sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ="; + }) + ]; + postPatch = '' substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype @@ -80,6 +87,7 @@ stdenv.mkDerivation rec { # "--enable-foo" flags here configureFlags = [ "--with-kde-solid=$out/share/apps/solid/actions" + "--enable-srt" # Explicit enable srt to ensure the patch is applied. ] ++ optional onlyLibVLC "--disable-vlc" ++ optional skins2Support "--enable-skins2" ++ optionals chromecastSupport [ From 6a0d5d8dd22db6086472bf519e1d33cf5c959f02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Jul 2021 11:07:29 +0200 Subject: [PATCH 0853/1522] esphome: 1.20.1 -> 1.20.2 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index beaffadab97..777415de580 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210719.0"; + version = "20210728.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc="; + sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index c82782bae90..48c656acf4b 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-uCMxtMEOWrlOpc8SXDzleLY5VfyizmSh1tWgxTLUjzg="; + sha256 = "sha256-th0UJsLTJ8fAgiIv3HvNrbigFwoJO7gEXObYFV3c3WA="; }; patches = [ From 39790153557ce5ff2355110ce40f17275ce631bf Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 21 Jul 2021 10:20:58 +0200 Subject: [PATCH 0854/1522] meshcentral: init at 0.8.87 --- pkgs/tools/admin/meshcentral/default.nix | 36 + pkgs/tools/admin/meshcentral/package.json | 123 + pkgs/tools/admin/meshcentral/update.sh | 50 + pkgs/tools/admin/meshcentral/yarn.lock | 7351 +++++++++++++++++++ pkgs/tools/admin/meshcentral/yarn.nix | 8005 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 15567 insertions(+) create mode 100644 pkgs/tools/admin/meshcentral/default.nix create mode 100644 pkgs/tools/admin/meshcentral/package.json create mode 100755 pkgs/tools/admin/meshcentral/update.sh create mode 100644 pkgs/tools/admin/meshcentral/yarn.lock create mode 100644 pkgs/tools/admin/meshcentral/yarn.nix diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix new file mode 100644 index 00000000000..7d87019020e --- /dev/null +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: +yarn2nix-moretea.mkYarnPackage rec { + version = "0.8.87"; + + src = fetchzip { + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.87.tgz"; + sha256 = "1jb65pvbld83mdjdb4f4z2brqsdh3b1mvnjdhbllcsn35m705cp5"; + }; + + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + + # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. + nativeBuildInputs = [ dos2unix ]; + prePatch = '' + find . -name '*.js' -exec dos2unix {} + + ln -snf meshcentral.js bin/meshcentral + ''; + + preFixup = '' + mkdir -p $out/bin + chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js + sed -i '1i#!${nodejs}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js + ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral + ''; + + publishBinsFor = [ ]; + + meta = with lib; { + description = "Computer management web app"; + homepage = "https://meshcentral.com/info/"; + maintainers = [ maintainers.lheckemann ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json new file mode 100644 index 00000000000..dec471e7acc --- /dev/null +++ b/pkgs/tools/admin/meshcentral/package.json @@ -0,0 +1,123 @@ +{ + "name": "meshcentral", + "version": "0.8.87", + "keywords": [ + "Remote Device Management", + "Remote Device Monitoring", + "Remote Desktop", + "Remote Terminal", + "Remote File Access", + "KVM", + "2FA", + "Two-Factor Authentication", + "Intel Active Management Technology", + "Intel AMT" + ], + "homepage": "https://meshcentral.com", + "description": "Web based remote computer management server", + "author": "Ylian Saint-Hilaire ", + "main": "meshcentral.js", + "bin": { + "meshcentral": "bin/meshcentral" + }, + "license": "Apache-2.0", + "files": [ + "*.js", + "amt", + "bin", + "views", + "emails", + "agents", + "public", + "translate", + "readme.txt", + "license.txt", + "sample-config.json", + "sample-config-advanced.json" + ], + "dependencies": { + "body-parser": "^1.19.0", + "cbor": "~5.2.0", + "compression": "^1.7.4", + "cookie-session": "^2.0.0-beta.3", + "express": "^4.17.0", + "express-handlebars": "^3.1.0", + "express-ws": "^4.0.0", + "ipcheck": "^0.1.0", + "minimist": "^1.2.0", + "multiparty": "^4.2.1", + "nedb": "^1.8.0", + "node-forge": "^0.10.0", + "ws": "^5.2.3", + "xmldom": "^0.5.0", + "yauzl": "^2.10.0" + }, + "repository": { + "type": "git", + "url": "https://github.com/Ylianst/MeshCentral.git" + }, + "readme": "readme.txt", + "optionalDependencies": { + "passport": "*", + "passport-twitter": "*", + "passport-google-oauth20": "*", + "passport-github2": "*", + "passport-reddit": "*", + "passport-azure-oauth2": "*", + "jwt-simple": "*", + "passport-saml": "*", + "ws": "5.2.3", + "cbor": "5.2.0", + "nedb": "*", + "https": "*", + "yauzl": "*", + "xmldom": "*", + "ipcheck": "*", + "express": "*", + "archiver": "4.0.2", + "multiparty": "*", + "node-forge": "*", + "express-ws": "4.0.0", + "compression": "*", + "body-parser": "*", + "cookie-session": "*", + "express-handlebars": "*", + "node-windows": "*", + "loadavg-windows": "*", + "node-sspi": "*", + "ldapauth-fork": "*", + "node-rdpjs-2": "*", + "ssh2": "*", + "image-size": "*", + "acme-client": "*", + "aedes": "0.39.0", + "mysql": "*", + "@mysql/xdevapi": "*", + "mongodb": "*", + "saslprep": "*", + "mariadb": "*", + "node-vault": "*", + "semver": "*", + "https-proxy-agent": "*", + "mongojs": "*", + "nodemailer": "*", + "@sendgrid/mail": "*", + "jsdom": "*", + "esprima": "*", + "minify-js": "*", + "html-minifier": "*", + "archiver-zip-encrypted": "*", + "googleapis": "*", + "webdav": "*", + "wildleek": "2.0.0", + "yubikeyotp": "*", + "otplib": "10.2.3", + "twilio": "*", + "plivo": "*", + "web-push": "*", + "node-xcs": "*", + "modern-syslog": "*", + "syslog": "*", + "heapdump": "*" + } +} diff --git a/pkgs/tools/admin/meshcentral/update.sh b/pkgs/tools/admin/meshcentral/update.sh new file mode 100755 index 00000000000..f7f12078372 --- /dev/null +++ b/pkgs/tools/admin/meshcentral/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodejs yarn yarn2nix jq rsync common-updater-scripts moreutils + +set -exuo pipefail + +expr_dir=$(cd "$(dirname "$0")"; pwd) +tmp=$(mktemp -dt update-meshcentral.XXXXXX) + +npm show --json meshcentral > "$tmp/npm.json" +version=$(<"$tmp/npm.json" jq -r .version) +tarball=$(<"$tmp/npm.json" jq -r .dist.tarball) + +prefetch=$(nix-prefetch-url --unpack --print-path "$tarball" | tr '\n' ' ') +read -r hash storePath <<<"$prefetch" +cd "$tmp" +rsync -r --chmod=u=rwX "$storePath/" package/ +cd package + +# Very crude way of discovering optional dependencies. These are +# fetched at runtime by stock upstream, but we don't allow that kind +# of thing in nix :) +awk @?[^@]+)(@(?.+))?") | { key: .name, value: (.version // "*")}) | from_entries) as $optionalDependencies | $package | .[] | .optionalDependencies |= . + $optionalDependencies' | + sponge package.json + +# Fetch all the optional dependencies, so we have them available in +# yarn.lock/yarn.nix +yarn install --ignore-scripts + +cp package.json "$expr_dir" +cp yarn.lock "$expr_dir/yarn.lock" +yarn2nix > "$expr_dir/yarn.nix" + +cd "$expr_dir/../../../.." +update-source-version meshcentral "$version" "$hash" "$tarball" + +# Only clean up if everything worked +cd / +rm -rf "$tmp" diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock new file mode 100644 index 00000000000..6d2a752857e --- /dev/null +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -0,0 +1,7351 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== + dependencies: + "@babel/highlight" "^7.14.5" + +"@babel/generator@^7.14.8", "@babel/generator@^7.4.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" + integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== + dependencies: + "@babel/types" "^7.14.8" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== + dependencies: + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" + integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== + +"@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.4.3": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" + integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== + +"@babel/template@^7.14.5", "@babel/template@^7.4.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.4.3": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" + integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.8" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.8" + "@babel/types" "^7.14.8" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.4.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" + integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== + dependencies: + "@babel/helper-validator-identifier" "^7.14.8" + to-fast-properties "^2.0.0" + +"@mysql/xdevapi@*": + version "8.0.26" + resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.26.tgz#bdf5752553c53c32d665bfa3034f21fbfa989611" + integrity sha512-YiBW91Z4igfUil6y6+kWV2BNlD3JQvBgVjwIfpbuPdOGiPwh/eb6zc1fyFSxa5sY3PmMKc/7v4nhdauwPLyUwA== + dependencies: + google-protobuf "3.14.0" + parsimmon "1.16.0" + +"@sendgrid/client@^7.4.3": + version "7.4.3" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.4.3.tgz#bc71aae05de2cd9aa607f4eb1d886711d09f9595" + integrity sha512-tTaHx893w5iqG0sVtUnMyRchuwYF95k4UOkmov1MouMIeMUbNvbalITo7cG7YSXUTY9rT2t4eBY6HcEBCVeqfg== + dependencies: + "@sendgrid/helpers" "^7.4.3" + axios "^0.21.1" + +"@sendgrid/helpers@^7.4.3": + version "7.4.3" + resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.4.3.tgz#231a4405266cfa291054df8b668fe3a4dc9387aa" + integrity sha512-Wt+68g1sVEM5UspJh34O/cxtv6BBbtAIk7U9B3PB2ySOtPs9e6hI1QkgYVwpNmkt7k2p86muUNyma/Aig25agg== + dependencies: + deepmerge "^4.2.2" + +"@sendgrid/mail@*": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.4.5.tgz#22cef36e793134833b36aff5d3f4f53e8f81dd52" + integrity sha512-adXMvrTUOlYr7+UTigZRGSYR9vheBv1y4fF2mugn29NBdQMfcQPGLQ5vIHgSAfcboBFCagZdamZqM5FeSGU0Hw== + dependencies: + "@sendgrid/client" "^7.4.3" + "@sendgrid/helpers" "^7.4.3" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/geojson@^7946.0.7": + version "7946.0.8" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" + integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== + +"@types/ldapjs@^1.0.9": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz#34077176af2b06186bd54e4a38ceb6e852387fa4" + integrity sha512-O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ== + dependencies: + "@types/node" "*" + +"@types/node@*": + version "16.4.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.5.tgz#eac95d4e52775190c405f0b9061ddcfb0304f7fc" + integrity sha512-+0GPv/hIFNoy8r5MFf7vRpBjnqNYNrlHdetoy23E7TYc7JB2ctwyi3GMKpviozaHQ/Sy2kBNUTvG9ywN66zV1g== + +"@types/node@^14.14.14", "@types/node@^14.14.28": + version "14.17.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz#cc61c8361c89e70c468cda464d1fa3dd7e5ebd62" + integrity sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ== + +"@xmpp/base64@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.9.0.tgz#f5914c2b7228d833020af991a2a207267fc8fcf4" + integrity sha512-/Naw/zQB3YryuQvSS3T3TwBV+z29Ox7RxfAs31foRcGblxw9Vkh4arTqwYpd49BLGbUzw+PBhpCgyJ4IrHPeFA== + dependencies: + base-64 "^0.1.0" + +"@xmpp/client-core@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.9.2.tgz#0176ad686358e903afefbf92d4c0f11676a90572" + integrity sha512-mNwg3FwB2OSFxjNY445SSL9OsrKefVGtQP1o3AuL26TjioGE+C8brijBvH+g4CM84G3/FF6aDOhvetp4fJJZcQ== + dependencies: + "@xmpp/connection" "^0.9.2" + "@xmpp/jid" "^0.9.2" + "@xmpp/xml" "^0.9.2" + +"@xmpp/client@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.9.2.tgz#6a0c7e1d9a8f7ea670981bd66fba5e41067960f7" + integrity sha512-b/p+1RLiPhp3mngjkaKYyLcj0B6zwvQcV6K+JysJLz8kwevspIomlEO8dwHq3k2k3vX+Be6JPfREaTp+BjABtg== + dependencies: + "@xmpp/client-core" "^0.9.2" + "@xmpp/iq" "^0.9.2" + "@xmpp/middleware" "^0.9.2" + "@xmpp/reconnect" "^0.9.0" + "@xmpp/resolve" "^0.9.2" + "@xmpp/resource-binding" "^0.9.2" + "@xmpp/sasl" "^0.9.2" + "@xmpp/sasl-anonymous" "^0.9.0" + "@xmpp/sasl-plain" "^0.9.0" + "@xmpp/sasl-scram-sha-1" "^0.9.0" + "@xmpp/session-establishment" "^0.9.2" + "@xmpp/starttls" "^0.9.2" + "@xmpp/stream-features" "^0.9.0" + "@xmpp/tcp" "^0.9.2" + "@xmpp/tls" "^0.9.2" + "@xmpp/websocket" "^0.9.2" + +"@xmpp/connection-tcp@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/connection-tcp/-/connection-tcp-0.9.2.tgz#57f1165ef729e339237522a5206b8f9439f9edbf" + integrity sha512-qdKp9vKprcaDcs/wdGPUc4GavaRNkoIH6q3PduMpIpF2CC8faQQTGO554i0k2VITxN4AyBIBIzPL5Iht/FEUSw== + dependencies: + "@xmpp/connection" "^0.9.2" + "@xmpp/xml" "^0.9.2" + +"@xmpp/connection@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/connection/-/connection-0.9.2.tgz#bfa354d4c99e16032d50a95a5638e6f58897f31f" + integrity sha512-Jlc39RhIYLqLLInV8pmUnNClaJgjh+ZZfwGrRvYTw9v0Pic7dOeE+cyT7ONZPjmfue4Jhqo8bRbKSrF7ezQbEA== + dependencies: + "@xmpp/error" "^0.9.0" + "@xmpp/events" "^0.9.0" + "@xmpp/jid" "^0.9.2" + "@xmpp/xml" "^0.9.2" + +"@xmpp/debug@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/debug/-/debug-0.9.2.tgz#51702dfe5d14bae327c3468ea2967cf015800840" + integrity sha512-Fr0QPUZV/Kk3OnpSbIOOrSkDe0I4tVVE6670doKLdau6cRMP5Cx/bwkh565eSezcp9L0c9ws7gffqVnVDN7MkQ== + dependencies: + "@xmpp/xml" "^0.9.2" + +"@xmpp/error@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/error/-/error-0.9.0.tgz#3232fab6fdb7a25fe67d3e0e1962ae8742b2f2da" + integrity sha512-W8gqCwii+SmI8h1fx0HCFgfYMtrO0hjR2DeLHchn89F1x6o2fGisllLQ38vfCZWIqy3wXfLPuf5q6WM6nHe8gQ== + +"@xmpp/events@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/events/-/events-0.9.0.tgz#60d181390fc6b080f5487c6877c3a8fa25276d1a" + integrity sha512-ckOtr2u4NfsJxq7cl/6aZbQh3aXkrZHXOmm4Q+hdbUECZxpE1AxRu0QuxVS8yqmx+eVjGzOX98My4c0Dbe6CfQ== + dependencies: + events "^3.0.0" + +"@xmpp/id@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.9.0.tgz#baee9afad8ab7c5a3f3b000b2f98c02ddef67674" + integrity sha512-h7ycA0kDYM8fTObqtys92L3JTECnv6TUoUKP7Canq9xQP1k3K//ZMnMMFXc8NlU3Jl2U7V1Ny9zJlYM9gYv25w== + +"@xmpp/iq@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.9.2.tgz#0a16cf672eb03a7b7358d74835f00cca3aca7113" + integrity sha512-XCEuMj0JH41F7VgvKpF95lG4giXb/lyV0FbDmms3owCfWCEdaCxVJ8PzNZLq2rcUNCg/L1fvA+tUgZGqWMjnNw== + dependencies: + "@xmpp/events" "^0.9.0" + "@xmpp/id" "^0.9.0" + "@xmpp/middleware" "^0.9.2" + "@xmpp/xml" "^0.9.2" + +"@xmpp/jid@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.9.2.tgz#2b87c466834e0618e226be4119b1d54fd828c7da" + integrity sha512-mCWUhs/2C2/qB75m4x4VEEDMvs7ymcqZFjnrtgA3/i005+NLBHeZzzHiEo0n+VWVuyEE/6wrOmI/U2LkCGkEMA== + +"@xmpp/middleware@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.9.2.tgz#40b0a6b9ce5473524f46c0841eed30fcb7ca956e" + integrity sha512-ayvUm8+5gWQzq9iIh8YtzDENJAaZvIOSrmZtDfExKCewZlPSyqlMcMM96JqImyiIzXCj45q7qfaFmekZoYWt6g== + dependencies: + "@xmpp/error" "^0.9.0" + "@xmpp/jid" "^0.9.2" + "@xmpp/xml" "^0.9.2" + koa-compose "^4.1.0" + +"@xmpp/reconnect@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.9.0.tgz#50f5d8e791021f0d19b34a13cb9ea495eae8a6be" + integrity sha512-c7SicqcosnXpJ+s4jjGof94FzHEChKiInTf4Colh7WkVWwXtsGrRU1PMYIbX3P/58t5EqgZvfCYQrGjsWSB0kg== + dependencies: + "@xmpp/events" "^0.9.0" + +"@xmpp/resolve@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.9.2.tgz#530d8df631d3cb920abc5cc84b470966c71ce9a4" + integrity sha512-c0Ff0PSecGNnE2yOkDMd6IXJA9EFlKJWB2qfbfT+i24NObXjFsBeUnEdxlI0F4eFkAyxQYNvn8qPRX4bfPJlCw== + dependencies: + "@xmpp/events" "^0.9.0" + "@xmpp/xml" "^0.9.2" + node-fetch "^2.3.0" + +"@xmpp/resource-binding@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.9.2.tgz#49d440ab47e886bbbee5f27966e28a4619eb60bb" + integrity sha512-fwDY35KF6MmMSv+VJS+P5KlFd1tz5QCS/5KMo78egmlv6IiBNJILOsV36t7vnPFBj9yHNomv/lJAsNt/ApkkfQ== + dependencies: + "@xmpp/xml" "^0.9.2" + +"@xmpp/sasl-anonymous@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.9.0.tgz#dbd38751c17c41fd5aef91c1384ce3ade8099f33" + integrity sha512-F7t5LnSfmvybLBUsEOFkhvEJgY+CKdO09r5lmup5SvtYPIXMjLOb26qS+hn68woz2s1sk+tj5VUzEm/NbmfgAQ== + dependencies: + sasl-anonymous "^0.1.0" + +"@xmpp/sasl-plain@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.9.0.tgz#6b8d4a2e882685e460cdfb2181d00ac00904f606" + integrity sha512-7Jn34z88cy1khFYYFCnRQw0K10O+XxDKK13ImuOOS+tag+7ulvd2wT1cWJFcRIBsDvZJSqqROBfqXwHgd4PrYg== + dependencies: + sasl-plain "^0.1.0" + +"@xmpp/sasl-scram-sha-1@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.9.0.tgz#ee7acbba4393262db6a864630868948de031a4e4" + integrity sha512-AXV+Z5nwKKfkqg/XKsVi/fpJrJvhwUdZHxz84+cSskmfmD47cZw07eWkbFubs551qlAKeM/viSRE0WEaZqe4mA== + dependencies: + sasl-scram-sha-1 "^1.2.0" + +"@xmpp/sasl@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.9.2.tgz#69b7995520c6330f4e5a8b67127ac942c94163ee" + integrity sha512-58Fi0jkGB5o9JnRhF9SIJ3c6YdZsrxIAGMA2qksvTJfKdytx0OqmhoFU4mTxfV4fckvTOboEvYZlDSqQ26XPqQ== + dependencies: + "@xmpp/base64" "^0.9.0" + "@xmpp/error" "^0.9.0" + "@xmpp/xml" "^0.9.2" + saslmechanisms "^0.1.1" + +"@xmpp/session-establishment@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.9.2.tgz#f648879236df9c95a48bb08e4eb71b3c7be21ab9" + integrity sha512-p0WGTNxHusUOaNj72uVejAO94w8AvEwTMDfbtqHqMmotW4Lyw9xPgHgD7GFrCmU8S3OSWfyu36niXSgkrGJ2hg== + dependencies: + "@xmpp/xml" "^0.9.2" + +"@xmpp/starttls@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.9.2.tgz#656ec7c80928863a37e026fdd5b4f6966f3c15fc" + integrity sha512-/rjpHb8RAN+LXug7aiMeDc8or/kBsy1Y8Cx/jVKN3aRTR6S35J/s+o9EB8apkZAPjNVO3pqcM3rh+K2wnA+f4w== + dependencies: + "@xmpp/events" "^0.9.0" + "@xmpp/xml" "^0.9.2" + +"@xmpp/stream-features@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.9.0.tgz#5202943ccb9ad99c2750a705e40d80c24b2e5b7c" + integrity sha512-kO3sUE9+E1/0SoVe5KVbA/jrMIUp8vkk7kcEIzv3TBLQLlA0nnrbaTh3Wf1fvuOtJ8L2Tj1J06haLORY6h6rHQ== + +"@xmpp/tcp@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.9.2.tgz#d7810e68cca65078500f3d23ac4e8901474aae24" + integrity sha512-5sQPK6XDrEBxGGNTbyDlowBFIz04wSgnfmgw1jtz13v6fSK6ADypSX4sHNxBwhBa9RQ5kc/xEPWUU/p47AxCPQ== + dependencies: + "@xmpp/connection-tcp" "^0.9.2" + +"@xmpp/tls@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.9.2.tgz#bc826e36bd65dc3b2516e4a563dc53ac8307746c" + integrity sha512-Iqp8xKFwV7pLYS0Bl5GAC0UtHYhGw9TZfKb4Nc4FDewkL74WdFsIcXqZuGo0Ry4xnJ8TBSkWi2oEE1hYGUytAw== + dependencies: + "@xmpp/connection" "^0.9.2" + "@xmpp/connection-tcp" "^0.9.2" + +"@xmpp/websocket@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.9.2.tgz#f8f4aabaaa0ce429f573a7cc2c0534ea16b38dde" + integrity sha512-6Bhv16psT4qZBhmhhd8T6wwCXGBhOkXCQCH2954gHqbMTKsZL3xkL6WM9O2doiHO1ffvLERy/ofOoPSLfOLPzA== + dependencies: + "@xmpp/connection" "^0.9.2" + "@xmpp/xml" "^0.9.2" + ws "^7.0.0" + +"@xmpp/xml@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@xmpp/xml/-/xml-0.9.2.tgz#7d02ba15820b81853833a86531abe3e0d1f9abd5" + integrity sha512-xhPT3/EtTK0gsOLYyYmvoQncof1EQnE8P2eVBtUy/3Mt5FKhZI+gNsTkn+ORYjgkyHWfupIa9pN0/m7A89TCdA== + dependencies: + ltx "^2.8.1" + +abab@^2.0.3, abab@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +abstract-logging@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" + integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== + +accepts@~1.3.5, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acme-client@*: + version "4.1.3" + resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz#2a37c7c8835da259eeb0cbfd8bcb7be3b9e4725b" + integrity sha512-QL3F5us72ChCDsrSztGnTRo1HXBaOeptyUi6v2PNksZL728wZ3ZaxAST+QcfhAt2tOrr9Zl6zJorqS5vLBTtXA== + dependencies: + axios "0.21.1" + backo2 "^1.0.0" + bluebird "^3.5.0" + debug "^4.1.1" + node-forge "^0.10.0" + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + +acorn-jsx@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" + integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s= + dependencies: + acorn "^3.0.4" + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^3.0.4, acorn@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" + integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= + +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +acorn@^8.2.4: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + +aedes-packet@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz#2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1" + integrity sha1-LupG+XySWwofTQP08f5e+IexAPE= + +aedes-persistence@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-6.0.0.tgz#e9eb15288a3be1a8e9fc7f231df2237ca0978eb1" + integrity sha512-LVk80Mg6bCfQgbcyo16ipuFo5KdORVxtzFAMmaisE3Hkydwt5H9I02gmF5IPADF5zPk0RfYxumQ4IIV1+jEp7Q== + dependencies: + aedes-packet "^1.0.0" + from2 "^2.1.0" + qlobber "^3.0.2" + +aedes@0.39.0: + version "0.39.0" + resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.39.0.tgz#125e2f1e53a600f3a0bfde26431997deed27f117" + integrity sha512-AV7pN4Ogt4tNNgNNabKjsC7Cw7bMMNjQH1hua4zQV0TFf/QEBPVu1YDZMH3Lrrt2XziydQzmBrBc5aAQvAq5FQ== + dependencies: + aedes-packet "^1.0.0" + aedes-persistence "^6.0.0" + bulk-write-stream "^2.0.0" + end-of-stream "^1.4.1" + fastfall "^1.5.1" + fastparallel "^2.3.0" + fastseries "^1.7.2" + from2 "^2.3.0" + mqemitter "^3.0.0" + mqtt-packet "^6.1.2" + pump "^3.0.0" + retimer "^2.0.0" + reusify "^1.0.4" + shortid "^2.2.14" + through2 "^3.0.1" + uuid "^3.3.2" + +aes-js@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a" + integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +align-text@^0.1.1, align-text@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" + integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc= + dependencies: + kind-of "^3.0.2" + longest "^1.0.1" + repeat-string "^1.5.2" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + +ansi-escape-sequences@^2.2.1, ansi-escape-sequences@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-2.2.2.tgz#174c78d6f8b7de75f8957ae81c7f72210c701635" + integrity sha1-F0x41vi33nX4lXroHH9yIQxwFjU= + dependencies: + array-back "^1.0.2" + collect-all "~0.2.1" + +ansi-escape-sequences@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz#1c18394b6af9b76ff9a63509fa497669fd2ce53e" + integrity sha1-HBg5S2r5t2/5pjUJ+kl2af0s5T4= + dependencies: + array-back "^1.0.3" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +app-usage-stats@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/app-usage-stats/-/app-usage-stats-0.4.1.tgz#97eb9b89b5678fa2ddc9793b1298628cc218429f" + integrity sha1-l+ubibVnj6LdyXk7EphijMIYQp8= + dependencies: + array-back "^1.0.4" + core-js "^2.4.1" + feature-detect-es6 "^1.3.1" + home-path "^1.0.3" + test-value "^2.1.0" + usage-stats "^0.8.2" + +append-transform@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" + integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw== + dependencies: + default-require-extensions "^2.0.0" + +archiver-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" + integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== + dependencies: + glob "^7.1.4" + graceful-fs "^4.2.0" + lazystream "^1.0.0" + lodash.defaults "^4.2.0" + lodash.difference "^4.5.0" + lodash.flatten "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.union "^4.6.0" + normalize-path "^3.0.0" + readable-stream "^2.0.0" + +archiver-zip-encrypted@*: + version "1.0.10" + resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz#4218a602b6088480703996808484fc1fc4a60a41" + integrity sha512-Lrufx6UOithz1Z4C0PrwTsbF7qak/TDhMs3nAC/mFxV/tPKKaMhdjUgHV1UqRjcu2FaS8ghNexFVcNZ+CdFaXA== + dependencies: + aes-js "^3.1.2" + archiver "^5.3.0" + archiver-utils "^2.1.0" + buffer-crc32 "^0.2.13" + compress-commons "^4.1.1" + crc32-stream "^4.0.2" + zip-stream "^4.1.0" + +archiver@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-4.0.2.tgz#43c72865eadb4ddaaa2fb74852527b6a450d927c" + integrity sha512-B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ== + dependencies: + archiver-utils "^2.1.0" + async "^3.2.0" + buffer-crc32 "^0.2.1" + glob "^7.1.6" + readable-stream "^3.6.0" + tar-stream "^2.1.2" + zip-stream "^3.0.1" + +archiver@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" + integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== + dependencies: + archiver-utils "^2.1.0" + async "^3.2.0" + buffer-crc32 "^0.2.1" + readable-stream "^3.6.0" + readdir-glob "^1.0.0" + tar-stream "^2.2.0" + zip-stream "^4.1.0" + +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + dependencies: + arr-flatten "^1.0.1" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-back@^1.0.2, array-back@^1.0.3, array-back@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-1.0.4.tgz#644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b" + integrity sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs= + dependencies: + typical "^2.6.0" + +array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== + +array-tools@^1.0.6, array-tools@^1.1.0, array-tools@^1.1.4, array-tools@^1.8.4: + version "1.8.6" + resolved "https://registry.yarnpkg.com/array-tools/-/array-tools-1.8.6.tgz#145771f7f9c94e98cc5ea4196a99b8323aee18ae" + integrity sha1-FFdx9/nJTpjMXqQZapm4MjruGK4= + dependencies: + object-tools "^1.6.1" + typical "^2.1" + +array-tools@^2: + version "2.0.9" + resolved "https://registry.yarnpkg.com/array-tools/-/array-tools-2.0.9.tgz#5a511de7a41be0eec9ffdcd4912d0af9f0caca35" + integrity sha1-WlEd56Qb4O7J/9zUkS0K+fDKyjU= + dependencies: + ansi-escape-sequences "^2.2.2" + array-back "^1.0.2" + collect-json "^1.0.7" + filter-where "^1.0.1" + object-get "^2.0.0" + reduce-extract "^1.0.0" + reduce-flatten "^1.0.0" + reduce-unique "^1.0.0" + reduce-without "^1.0.0" + sort-array "^1.0.0" + test-value "^1.0.1" + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +arrify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" + integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== + +asap@^2.0.0, asap@~2.0.3, asap@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + +asn1.js@^5.3.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" + +asn1@^0.2.4, asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +async-each@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@0.2.10: + version "0.2.10" + resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" + integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E= + +async@^2.0.1: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + +async@^3.2.0, async@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +axios@0.21.1, axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + +babel-cli@^6.16.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" + integrity sha1-UCq1SHTX24itALiHoGODzgPQAvE= + dependencies: + babel-core "^6.26.0" + babel-polyfill "^6.26.0" + babel-register "^6.26.0" + babel-runtime "^6.26.0" + commander "^2.11.0" + convert-source-map "^1.5.0" + fs-readdir-recursive "^1.0.0" + glob "^7.1.2" + lodash "^4.17.4" + output-file-sync "^1.1.2" + path-is-absolute "^1.0.1" + slash "^1.0.0" + source-map "^0.5.6" + v8flags "^2.1.1" + optionalDependencies: + chokidar "^1.6.1" + +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-core@^6.26.0: + version "6.26.3" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" + integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== + dependencies: + babel-code-frame "^6.26.0" + babel-generator "^6.26.0" + babel-helpers "^6.24.1" + babel-messages "^6.23.0" + babel-register "^6.26.0" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + convert-source-map "^1.5.1" + debug "^2.6.9" + json5 "^0.5.1" + lodash "^4.17.4" + minimatch "^3.0.4" + path-is-absolute "^1.0.1" + private "^0.1.8" + slash "^1.0.0" + source-map "^0.5.7" + +babel-generator@^6.26.0: + version "6.26.1" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" + integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== + dependencies: + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + detect-indent "^4.0.0" + jsesc "^1.3.0" + lodash "^4.17.4" + source-map "^0.5.7" + trim-right "^1.0.1" + +babel-helper-call-delegate@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" + integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= + dependencies: + babel-helper-hoist-variables "^6.24.1" + babel-runtime "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-define-map@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" + integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-helper-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" + integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= + dependencies: + babel-helper-get-function-arity "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-get-function-arity@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" + integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-hoist-variables@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" + integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-optimise-call-expression@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" + integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-regex@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" + integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI= + dependencies: + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-helper-replace-supers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" + integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= + dependencies: + babel-helper-optimise-call-expression "^6.24.1" + babel-messages "^6.23.0" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helpers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" + integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= + dependencies: + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-check-es2015-constants@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" + integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-arrow-functions@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" + integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" + integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-block-scoping@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" + integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= + dependencies: + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-plugin-transform-es2015-classes@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" + integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= + dependencies: + babel-helper-define-map "^6.24.1" + babel-helper-function-name "^6.24.1" + babel-helper-optimise-call-expression "^6.24.1" + babel-helper-replace-supers "^6.24.1" + babel-messages "^6.23.0" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-computed-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" + integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= + dependencies: + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-destructuring@^6.22.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" + integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-duplicate-keys@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" + integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-for-of@^6.22.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" + integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" + integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-literals@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" + integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-modules-amd@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" + integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ= + dependencies: + babel-plugin-transform-es2015-modules-commonjs "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-modules-commonjs@^6.24.1: + version "6.26.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" + integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== + dependencies: + babel-plugin-transform-strict-mode "^6.24.1" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-types "^6.26.0" + +babel-plugin-transform-es2015-modules-systemjs@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" + integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM= + dependencies: + babel-helper-hoist-variables "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-modules-umd@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" + integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg= + dependencies: + babel-plugin-transform-es2015-modules-amd "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-object-super@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" + integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= + dependencies: + babel-helper-replace-supers "^6.24.1" + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-parameters@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" + integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= + dependencies: + babel-helper-call-delegate "^6.24.1" + babel-helper-get-function-arity "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-shorthand-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" + integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-spread@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" + integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-sticky-regex@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" + integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw= + dependencies: + babel-helper-regex "^6.24.1" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-template-literals@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" + integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-typeof-symbol@^6.22.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" + integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-unicode-regex@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" + integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek= + dependencies: + babel-helper-regex "^6.24.1" + babel-runtime "^6.22.0" + regexpu-core "^2.0.0" + +babel-plugin-transform-regenerator@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" + integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8= + dependencies: + regenerator-transform "^0.10.0" + +babel-plugin-transform-strict-mode@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" + integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-polyfill@^6.13.0, babel-polyfill@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" + integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= + dependencies: + babel-runtime "^6.26.0" + core-js "^2.5.0" + regenerator-runtime "^0.10.5" + +babel-preset-es2015@^6.16.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" + integrity sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk= + dependencies: + babel-plugin-check-es2015-constants "^6.22.0" + babel-plugin-transform-es2015-arrow-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoping "^6.24.1" + babel-plugin-transform-es2015-classes "^6.24.1" + babel-plugin-transform-es2015-computed-properties "^6.24.1" + babel-plugin-transform-es2015-destructuring "^6.22.0" + babel-plugin-transform-es2015-duplicate-keys "^6.24.1" + babel-plugin-transform-es2015-for-of "^6.22.0" + babel-plugin-transform-es2015-function-name "^6.24.1" + babel-plugin-transform-es2015-literals "^6.22.0" + babel-plugin-transform-es2015-modules-amd "^6.24.1" + babel-plugin-transform-es2015-modules-commonjs "^6.24.1" + babel-plugin-transform-es2015-modules-systemjs "^6.24.1" + babel-plugin-transform-es2015-modules-umd "^6.24.1" + babel-plugin-transform-es2015-object-super "^6.24.1" + babel-plugin-transform-es2015-parameters "^6.24.1" + babel-plugin-transform-es2015-shorthand-properties "^6.24.1" + babel-plugin-transform-es2015-spread "^6.22.0" + babel-plugin-transform-es2015-sticky-regex "^6.24.1" + babel-plugin-transform-es2015-template-literals "^6.22.0" + babel-plugin-transform-es2015-typeof-symbol "^6.22.0" + babel-plugin-transform-es2015-unicode-regex "^6.24.1" + babel-plugin-transform-regenerator "^6.24.1" + +babel-register@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" + integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= + dependencies: + babel-core "^6.26.0" + babel-runtime "^6.26.0" + core-js "^2.5.0" + home-or-tmp "^2.0.0" + lodash "^4.17.4" + mkdirp "^0.5.1" + source-map-support "^0.4.15" + +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.24.1, babel-template@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.24.1, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== + +backo2@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + +backoff@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f" + integrity sha1-9hbtqdPktmuMp/ynn2lXIsX44m8= + dependencies: + precond "0.2" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base-64@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" + integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= + +base-64@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz#09d0f2084e32a3fd08c2475b973788eee6ae8f4a" + integrity sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg== + +base64-js@^1.3.0, base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +base64url@3.x.x: + version "3.0.1" + resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" + integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +bcryptjs@^2.4.0: + version "2.4.3" + resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" + integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= + +bignumber.js@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" + integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== + +bignumber.js@^9.0.0, bignumber.js@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5" + integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA== + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +binary-search-tree@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.5.tgz#7dbb3b210fdca082450dad2334c304af39bdc784" + integrity sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q= + dependencies: + underscore "~1.4.4" + +binary-search@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/binary-search/-/binary-search-1.3.6.tgz#e32426016a0c5092f0f3598836a1c7da3560565c" + integrity sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA== + +bindings@^1.1.1, bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +bitwise-xor@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/bitwise-xor/-/bitwise-xor-0.0.0.tgz#040a8172b5bb8cc562b0b7119f230b2a1a780e3d" + integrity sha1-BAqBcrW7jMVisLcRnyMLKhp4Dj0= + +bl@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5" + integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + +bl@^4.0.2, bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bluebird@^3.5.0: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +bluebird@~3.4.6: + version "3.4.7" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= + +bn.js@^4.0.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +body-parser@1.19.0, body-parser@^1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +brace-expansion@^1.0.0, brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +bson@^1.1.4: + version "1.1.6" + resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a" + integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== + +bson@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.4.1.tgz#682c3cb8b90b222414ce14ef8398154ba2cc21bc" + integrity sha512-Uu4OCZa0jouQJCKOk1EmmyqtdWAP5HVLru4lQxTwzJzxT+sJ13lVpEZU/MATDxtHiekWMAL84oQY3Xn1LpJVSg== + dependencies: + buffer "^5.6.0" + +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= + +buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +build-url@^1.0.10: + version "1.3.3" + resolved "https://registry.yarnpkg.com/build-url/-/build-url-1.3.3.tgz#fad1ef30d8861931f85bc1f41fca0a537be31e5f" + integrity sha512-uSC8d+d4SlbXTu/9nBhwEKi33CE0KQgCvfy8QwyrrO5vCuXr9hN021ZBh8ip5vxPbMOrZiPwgqcupuhezxiP3g== + +bulk-write-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz#085bdc65caf19ceece4ff365fdb951ef0c6e3db8" + integrity sha512-XWOLjgHtpDasHfwM8oO4df1JoZwa7/OwTsXDzh4rUTo+9CowzeOFBZz43w+H14h1fyq+xl28tVIBrdjcjj4Gug== + dependencies: + inherits "^2.0.3" + readable-stream "^3.1.1" + +bunyan@^1.8.12: + version "1.8.15" + resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" + integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== + optionalDependencies: + dtrace-provider "~0.8" + moment "^2.19.3" + mv "~2" + safe-json-stringify "~1" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +cache-point@~0.3.3: + version "0.3.4" + resolved "https://registry.yarnpkg.com/cache-point/-/cache-point-0.3.4.tgz#152db502c6bb23b5aa3f663e230d5de8ec4e4f3f" + integrity sha1-FS21Asa7I7WqP2Y+Iw1d6OxOTz8= + dependencies: + array-back "^1.0.3" + core-js "^2.4.1" + feature-detect-es6 "^1.3.1" + fs-then-native "^1.0.2" + mkdirp "~0.5.1" + +caching-transform@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70" + integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w== + dependencies: + hasha "^3.0.0" + make-dir "^2.0.0" + package-hash "^3.0.0" + write-file-atomic "^2.4.2" + +call-bind@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +camel-case@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= + dependencies: + no-case "^2.2.0" + upper-case "^1.1.1" + +camelcase@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk= + +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +catharsis@~0.8.8: + version "0.8.11" + resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.11.tgz#d0eb3d2b82b7da7a3ce2efb1a7b00becc6643468" + integrity sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g== + dependencies: + lodash "^4.17.14" + +cbor@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c" + integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A== + dependencies: + bignumber.js "^9.0.1" + nofilter "^1.0.4" + +center-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" + integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60= + dependencies: + align-text "^0.1.3" + lazy-cache "^1.0.3" + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +charenc@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= + +chokidar@^1.6.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@^4.2.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + dependencies: + source-map "~0.6.0" + +cli-commands@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/cli-commands/-/cli-commands-0.1.0.tgz#c57cacc406bbcf9ee21646607161ed432ef5a05a" + integrity sha1-xXysxAa7z57iFkZgcWHtQy71oFo= + dependencies: + ansi-escape-sequences "^3.0.0" + command-line-args "^3.0.1" + command-line-commands "^1.0.4" + command-line-usage "^3.0.5" + +cliui@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" + integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE= + dependencies: + center-align "^0.1.1" + right-align "^0.1.1" + wordwrap "0.0.2" + +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +collect-all@^1.0.2, collect-all@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/collect-all/-/collect-all-1.0.4.tgz#50cd7119ac24b8e12a661f0f8c3aa0ea7222ddfc" + integrity sha512-RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA== + dependencies: + stream-connect "^1.0.2" + stream-via "^1.0.4" + +collect-all@~0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/collect-all/-/collect-all-0.2.1.tgz#7225fb4585c22d4ffac886f0abaf5abc563a1a6a" + integrity sha1-ciX7RYXCLU/6yIbwq69avFY6Gmo= + dependencies: + stream-connect "^1.0.1" + stream-via "~0.1.0" + typical "^2.3.0" + +collect-json@^1.0.1, collect-json@^1.0.7, collect-json@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/collect-json/-/collect-json-1.0.9.tgz#eb9906ef3160899e46e8482fac13a5e591dae9ae" + integrity sha512-5sGzu8rjhY4uzm4FJOVsNtcAhNiyEsZ70Lz3xv+7mXuLfU41QikE0es3nn2N0knqEKg+r4K7TMFHFmR8OFGpFA== + dependencies: + collect-all "^1.0.4" + stream-connect "^1.0.2" + stream-via "^1.0.4" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colors@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= + +column-layout@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/column-layout/-/column-layout-2.1.4.tgz#ed2857092ccf8338026fe538379d9672d70b3641" + integrity sha1-7ShXCSzPgzgCb+U4N52WctcLNkE= + dependencies: + ansi-escape-sequences "^2.2.2" + array-back "^1.0.3" + collect-json "^1.0.8" + command-line-args "^2.1.6" + core-js "^2.4.0" + deep-extend "~0.4.1" + feature-detect-es6 "^1.2.0" + object-tools "^2.0.6" + typical "^2.4.2" + wordwrapjs "^1.2.0" + +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +command-line-args@^2.1.4, command-line-args@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-2.1.6.tgz#f197d6eaff34c9085577484b2864375b294f5697" + integrity sha1-8ZfW6v80yQhVd0hLKGQ3WylPVpc= + dependencies: + array-back "^1.0.2" + command-line-usage "^2" + core-js "^2.0.1" + feature-detect-es6 "^1.2.0" + find-replace "^1" + typical "^2.3.0" + +command-line-args@^3.0.0, command-line-args@^3.0.1: + version "3.0.5" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-3.0.5.tgz#5bd4ad45e7983e5c1344918e40280ee2693c5ac0" + integrity sha1-W9StReeYPlwTRJGOQCgO4mk8WsA= + dependencies: + array-back "^1.0.4" + feature-detect-es6 "^1.3.1" + find-replace "^1.0.2" + typical "^2.6.0" + +command-line-commands@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-1.0.4.tgz#034f9b167b5188afbdcf6b2efbb150fc8442c32b" + integrity sha1-A0+bFntRiK+9z2su+7FQ/IRCwys= + dependencies: + array-back "^1.0.3" + feature-detect-es6 "^1.3.1" + +command-line-tool@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.1.0.tgz#91a11ba48ac63a4a687554367980f7c6423c149d" + integrity sha1-kaEbpIrGOkpodVQ2eYD3xkI8FJ0= + dependencies: + ansi-escape-sequences "^2.2.1" + array-back "^1.0.2" + +command-line-tool@~0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.5.2.tgz#f87d6977f56bbdd2d5dfcf946345dd2cd9c6a53a" + integrity sha1-+H1pd/VrvdLV38+UY0XdLNnGpTo= + dependencies: + ansi-escape-sequences "^2.2.2" + array-back "^1.0.3" + command-line-args "^3.0.0" + command-line-usage "^3.0.3" + feature-detect-es6 "^1.3.0" + typical "^2.4.2" + +command-line-usage@^2: + version "2.0.5" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-2.0.5.tgz#f80c35ca5e8624841923ea3be3b9bfbf4f7be27b" + integrity sha1-+Aw1yl6GJIQZI+o747m/v0974ns= + dependencies: + ansi-escape-sequences "^2.2.2" + array-back "^1.0.3" + column-layout "^2.1.1" + feature-detect-es6 "^1.2.0" + typical "^2.4.2" + wordwrapjs "^1.2.0" + +command-line-usage@^3.0.3, command-line-usage@^3.0.5: + version "3.0.8" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-3.0.8.tgz#b6a20978c1b383477f5c11a529428b880bfe0f4d" + integrity sha1-tqIJeMGzg0d/XBGlKUKLiAv+D00= + dependencies: + ansi-escape-sequences "^3.0.0" + array-back "^1.0.3" + feature-detect-es6 "^1.3.1" + table-layout "^0.3.0" + typical "^2.6.0" + +commander@^2.11.0, commander@^2.19.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +common-sequence@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/common-sequence/-/common-sequence-1.0.2.tgz#30e07f3f8f6f7f9b3dee854f20b2d39eee086de8" + integrity sha1-MOB/P49vf5s97oVPILLTnu4Ibeg= + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +compress-commons@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz#833944d84596e537224dd91cf92f5246823d4f1d" + integrity sha512-FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg== + dependencies: + buffer-crc32 "^0.2.13" + crc32-stream "^3.0.1" + normalize-path "^3.0.0" + readable-stream "^2.3.7" + +compress-commons@^4.1.0, compress-commons@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" + integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== + dependencies: + buffer-crc32 "^0.2.13" + crc32-stream "^4.0.2" + normalize-path "^3.0.0" + readable-stream "^3.6.0" + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + safe-buffer "5.1.2" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +config-master@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/config-master/-/config-master-2.0.4.tgz#e749505c5d3f946f2fad3c76dfe71fca689751dc" + integrity sha1-50lQXF0/lG8vrTx23+cfymiXUdw= + dependencies: + babel-polyfill "^6.13.0" + feature-detect-es6 "^1.3.1" + walk-back "^2.0.1" + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +cookie-session@^2.0.0-beta.3: + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0-rc.1.tgz#66fa03f26e5873d681d70f14bff5e48a94c53d37" + integrity sha512-zg80EsLe7S1J4y0XxV7SZ8Fbi90ZZoampuX2bfYDOvJfc//98sSlZC41YDzTTjtVbeU1VlVdBbldXOOyi5xzEw== + dependencies: + cookies "0.8.0" + debug "3.2.6" + on-headers "~1.0.2" + safe-buffer "5.2.0" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +cookies@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" + integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== + dependencies: + depd "~2.0.0" + keygrip "~1.1.0" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cp-file@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" + integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA== + dependencies: + graceful-fs "^4.1.2" + make-dir "^2.0.0" + nested-error-stacks "^2.0.0" + pify "^4.0.1" + safe-buffer "^5.0.1" + +cpu-features@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz#9f636156f1155fd04bdbaa028bb3c2fbef3cea7a" + integrity sha512-/2yieBqvMcRj8McNzkycjW2v3OIUOibBfd2dLEJ0nWts8NobAxwiyw9phVNS6oDL8x8tz9F7uNVFEVpJncQpeA== + dependencies: + nan "^2.14.1" + +crc-32@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + +crc32-stream@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85" + integrity sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w== + dependencies: + crc "^3.4.4" + readable-stream "^3.4.0" + +crc32-stream@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" + integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== + dependencies: + crc-32 "^1.2.0" + readable-stream "^3.4.0" + +crc@^3.4.4: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +create-hash@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-spawn@^4: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" + integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE= + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + +crypt@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + +dateformat@~3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" + integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== + +dayjs@^1.8.29: + version "1.10.6" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" + integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== + +ddata@~0.1.25: + version "0.1.28" + resolved "https://registry.yarnpkg.com/ddata/-/ddata-0.1.28.tgz#53138fafa3f01749ea2451d12b6b6dd9df1d5b1f" + integrity sha1-UxOPr6PwF0nqJFHRK2tt2d8dWx8= + dependencies: + array-back "^1.0.3" + core-js "^2.4.1" + handlebars "^3.0.3" + marked "~0.3.6" + object-get "^2.1.0" + reduce-flatten "^1.0.1" + string-tools "^1.0.0" + test-value "^2.0.0" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + +debug@3.2.6: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + dependencies: + ms "^2.1.1" + +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +decamelize@^1.0.0, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +deep-extend@~0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" + integrity sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + +default-require-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7" + integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc= + dependencies: + strip-bom "^3.0.0" + +defer-promise@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz#b79521c59cadadaed2d305385d30f8b05cbf9196" + integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +denque@^1.4.1, denque@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" + integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + +detect-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" + integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + dependencies: + repeating "^2.0.0" + +dir_cache@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dir_cache/-/dir_cache-1.0.3.tgz#89b8ca92efdcdf552ef2e14d24c38114f9df554b" + integrity sha1-ibjKku/c31Uu8uFNJMOBFPnfVUs= + dependencies: + async "^2.0.1" + minify-js "0.0.2" + utils-igor "^1.0.4" + +dmd@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/dmd/-/dmd-1.4.2.tgz#b1304b98a5700a6bfe5dcf91be657c981700a4bc" + integrity sha1-sTBLmKVwCmv+Xc+RvmV8mBcApLw= + dependencies: + array-back "^1.0.3" + command-line-tool "~0.5.0" + common-sequence "^1.0.2" + ddata "~0.1.25" + file-set "^1.0.0" + handlebars-array "^0.2.0" + handlebars-comparison "^2.0.0" + handlebars-json "^1.0.0" + handlebars-regexp "^1.0.0" + handlebars-string "^2.0.1" + object-tools "^2.0.6" + reduce-unique "^1.0.0" + reduce-without "^1.0.1" + stream-handlebars "~0.1.6" + string-tools "^1.0.0" + walk-back "^2.0.1" + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + +dtrace-provider@~0.8: + version "0.8.8" + resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" + integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== + dependencies: + nan "^2.14.0" + +each-series@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/each-series/-/each-series-1.0.0.tgz#f886e6c66dfdb25ef1fe73564146ee5cb478afcb" + integrity sha1-+Ibmxm39sl7x/nNWQUbuXLR4r8s= + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf" + integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ== + dependencies: + safe-buffer "^5.0.1" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es6-error@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escape-html@^1.0.3, escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +espree@~3.1.7: + version "3.1.7" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.1.7.tgz#fd5deec76a97a5120a9cd3a7cb1177a0923b11d2" + integrity sha1-/V3ux2qXpRIKnNOnyxF3oJI7EdI= + dependencies: + acorn "^3.3.0" + acorn-jsx "^3.0.0" + +esprima@*, esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +eventemitter2@~0.4.13: + version "0.4.14" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" + integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= + +events@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== + +exit@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= + dependencies: + is-posix-bracket "^0.1.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + dependencies: + fill-range "^2.1.0" + +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" + +express-handlebars@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz#c177ee9a81f6a2abada6b550b77b3e30c6bc0796" + integrity sha512-7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg== + dependencies: + glob "^7.1.3" + graceful-fs "^4.1.2" + handlebars "^4.1.2" + object.assign "^4.1.0" + promise "^8.0.2" + +express-ws@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-4.0.0.tgz#dabd8dc974516418902a41fe6e30ed949b4d36c4" + integrity sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw== + dependencies: + ws "^5.2.0" + +express@^4.17.0: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@^3.0.2, extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + dependencies: + is-extglob "^1.0.0" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-text-encoding@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53" + integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig== + +fast-xml-parser@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" + integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + +fastfall@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/fastfall/-/fastfall-1.5.1.tgz#3fee03331a49d1d39b3cdf7a5e9cd66f475e7b94" + integrity sha1-P+4DMxpJ0dObPN96XpzWb0dee5Q= + dependencies: + reusify "^1.0.0" + +fastparallel@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.0.tgz#65fbec1a5e5902494be772cf5765cbaaece08688" + integrity sha512-sacwQ7wwKlQXsa7TN24UvMBLZNLmVcPhmxccC9riFqb3N+fSczJL8eWdnZodZ/KijGVgNBBfvF/NeXER08uXnQ== + dependencies: + reusify "^1.0.4" + xtend "^4.0.2" + +fastseries@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-1.7.2.tgz#d22ce13b9433dff3388d91dbd6b8bda9b21a0f4b" + integrity sha1-0izhO5Qz3/M4jZHb1ri9qbIaD0s= + dependencies: + reusify "^1.0.0" + xtend "^4.0.0" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +feature-detect-es6@^1.2.0, feature-detect-es6@^1.3.0, feature-detect-es6@^1.3.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz#a69bb7662c65f64f89f07eac5a461b649a1e0a00" + integrity sha512-DzWPIGzTnfp3/KK1d/YPfmgLqeDju9F2DQYBL35VusgSApcA7XGqVtXfR4ETOOFEzdFJ3J7zh0Gkk011TiA4uQ== + dependencies: + array-back "^1.0.4" + +file-set@^1.0.0, file-set@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/file-set/-/file-set-1.1.2.tgz#08f700bb2c129d0e6bff90157b6556ce7c01e4f9" + integrity sha512-xDXI09w+l+mXxWDym7dQXy3PLdo7DygHlAtRnQ6XIMa0iY/qX6+1J75jjwCArCd48yCiMx2+fRn50BTFd45+jQ== + dependencies: + array-back "^1.0.3" + glob "^7.1.0" + +file-set@~0.2.1: + version "0.2.8" + resolved "https://registry.yarnpkg.com/file-set/-/file-set-0.2.8.tgz#73a6571e9cbe51ac5926c88bd567d111f836f178" + integrity sha1-c6ZXHpy+UaxZJsiL1WfREfg28Xg= + dependencies: + array-tools "^2" + glob "^4" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= + +fill-range@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" + integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^3.0.0" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +filter-where@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/filter-where/-/filter-where-1.0.1.tgz#1b042569edce36bc1c4e9f73740d2c4e2feef77d" + integrity sha1-GwQlae3ONrwcTp9zdA0sTi/u930= + dependencies: + test-value "^1.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-replace@^1, find-replace@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-1.0.3.tgz#b88e7364d2d9c959559f388c66670d6130441fa0" + integrity sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A= + dependencies: + array-back "^1.0.4" + test-value "^2.1.0" + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +findup-sync@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0" + integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^4.0.2" + resolve-dir "^1.0.1" + +findup-sync@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" + integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= + dependencies: + glob "~5.0.0" + +fined@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== + dependencies: + expand-tilde "^2.0.2" + is-plain-object "^2.0.3" + object.defaults "^1.1.0" + object.pick "^1.2.0" + parse-filepath "^1.0.1" + +flagged-respawn@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== + +follow-redirects@^1.10.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + dependencies: + for-in "^1.0.1" + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= + dependencies: + for-in "^1.0.1" + +foreground-child@^1.5.6: + version "1.5.6" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9" + integrity sha1-T9ca0t/elnibmApcCilZN8svXOk= + dependencies: + cross-spawn "^4" + signal-exit "^3.0.0" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.1.0, from2@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-readdir-recursive@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" + integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== + +fs-then-native@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/fs-then-native/-/fs-then-native-1.0.2.tgz#ac8d3807c9f1bbd1279607fb228e0ab649bb41fe" + integrity sha1-rI04B8nxu9Enlgf7Io4Ktkm7Qf4= + dependencies: + feature-detect-es6 "^1.3.1" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^1.0.0: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gaxios@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.0.tgz#ad4814d89061f85b97ef52aed888c5dbec32f774" + integrity sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg== + dependencies: + abort-controller "^3.0.0" + extend "^3.0.2" + https-proxy-agent "^5.0.0" + is-stream "^2.0.0" + node-fetch "^2.3.0" + +gcp-metadata@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.0.tgz#0423d06becdbfb9cbb8762eaacf14d5324997900" + integrity sha512-L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA== + dependencies: + gaxios "^4.0.0" + json-bigint "^1.0.0" + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getobject@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.1.tgz#17d86a05913c15d173a5bcf8662dc7c7ac5ce147" + integrity sha512-tj18lLe+917AACr6BdVoUuHnBPTVd9BEJp1vxnMZ58ztNvuxz9Ufa+wf3g37tlGITH35jggwZ2d9lcgHJJgXfQ== + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= + dependencies: + is-glob "^2.0.0" + +glob@^4: + version "4.5.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" + integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "^2.0.1" + once "^1.3.0" + +glob@^6.0.1: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@~5.0.0: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== + +google-auth-library@^7.0.2: + version "7.3.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.3.0.tgz#946a911c72425b05f02735915f03410604466657" + integrity sha512-MPeeMlnsYnoiiVFMwX3hgaS684aiXrSqKoDP+xL4Ejg4Z0qLvIeg4XsaChemyFI8ZUO7ApwDAzNtgmhWSDNh5w== + dependencies: + arrify "^2.0.0" + base64-js "^1.3.0" + ecdsa-sig-formatter "^1.0.11" + fast-text-encoding "^1.0.0" + gaxios "^4.0.0" + gcp-metadata "^4.2.0" + gtoken "^5.0.4" + jws "^4.0.0" + lru-cache "^6.0.0" + +google-p12-pem@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.1.tgz#98fb717b722d12196a3e5b550c44517562269859" + integrity sha512-e9CwdD2QYkpvJsktki3Bm8P8FSGIneF+/42a9F9QHcQvJ73C2RoYZdrwRl6BhwksWtzl65gT4OnBROhUIFw95Q== + dependencies: + node-forge "^0.10.0" + +google-protobuf@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.14.0.tgz#20373d22046e63831a5110e11a84f713cc43651e" + integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== + +googleapis-common@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.3.tgz#9580944e538029687a4e25726afea4a1a535ac6f" + integrity sha512-8khlXblLyT9UpB+NTZzrWfKQUW6U7gO6WnfJp51WrLgpzP7zkO+OshwtdArq8z2afj37jdrhbIT8eAxZLdwvwA== + dependencies: + extend "^3.0.2" + gaxios "^4.0.0" + google-auth-library "^7.0.2" + qs "^6.7.0" + url-template "^2.0.8" + uuid "^8.0.0" + +googleapis@*: + version "82.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-82.0.0.tgz#26ab303b065c37fc4c9723b703550e62057ea810" + integrity sha512-TytL2h+Cl82RP8ZZ4hgiqOz/ZKWJ5nqn2ZaQ1bNIsIp6z4xuasXyJsgPaZzHADyRx/zNQfRfJGwzRInYJy7X4A== + dependencies: + google-auth-library "^7.0.2" + googleapis-common "^5.0.2" + +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +grunt-cli@~1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff" + integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== + dependencies: + grunt-known-options "~2.0.0" + interpret "~1.1.0" + liftup "~3.0.1" + nopt "~4.0.1" + v8flags "~3.2.0" + +grunt-jsdoc-to-markdown@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/grunt-jsdoc-to-markdown/-/grunt-jsdoc-to-markdown-1.2.1.tgz#d253ac69b61c9575364a44d7db0513ab52f8dac9" + integrity sha1-0lOsabYclXU2SkTX2wUTq1L42sk= + dependencies: + jsdoc-to-markdown "^1.3.3" + +grunt-known-options@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c" + integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA== + +grunt-legacy-log-utils@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef" + integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw== + dependencies: + chalk "~4.1.0" + lodash "~4.17.19" + +grunt-legacy-log@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4" + integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA== + dependencies: + colors "~1.1.2" + grunt-legacy-log-utils "~2.1.0" + hooker "~0.2.3" + lodash "~4.17.19" + +grunt-legacy-util@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255" + integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w== + dependencies: + async "~3.2.0" + exit "~0.1.2" + getobject "~1.0.0" + hooker "~0.2.3" + lodash "~4.17.21" + underscore.string "~3.3.5" + which "~2.0.2" + +grunt@^1.0.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz#7d1e17db1f9c8108777f7273d6b9359755576f50" + integrity sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA== + dependencies: + dateformat "~3.0.3" + eventemitter2 "~0.4.13" + exit "~0.1.2" + findup-sync "~0.3.0" + glob "~7.1.6" + grunt-cli "~1.4.2" + grunt-known-options "~2.0.0" + grunt-legacy-log "~3.0.0" + grunt-legacy-util "~2.0.1" + iconv-lite "~0.4.13" + js-yaml "~3.14.0" + minimatch "~3.0.4" + mkdirp "~1.0.4" + nopt "~3.0.6" + rimraf "~3.0.2" + +gtoken@^5.0.4: + version "5.3.0" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.0.tgz#6536eb2880d9829f0b9d78f756795d4d9064b217" + integrity sha512-mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w== + dependencies: + gaxios "^4.0.0" + google-p12-pem "^3.0.3" + jws "^4.0.0" + +handlebars-array@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/handlebars-array/-/handlebars-array-0.2.1.tgz#dd58395a5261d661988e8d77520ebbfaadc6bd24" + integrity sha1-3Vg5WlJh1mGYjo13Ug67+q3GvSQ= + dependencies: + array-tools "^1.1.4" + +handlebars-comparison@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handlebars-comparison/-/handlebars-comparison-2.0.1.tgz#b17b95d2c298578e4aead38f5fac46e8f6005855" + integrity sha1-sXuV0sKYV45K6tOPX6xG6PYAWFU= + dependencies: + array-tools "^1.1.0" + +handlebars-json@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/handlebars-json/-/handlebars-json-1.0.1.tgz#2ef87bb782551cd645bb4691b824e9653ec02504" + integrity sha1-Lvh7t4JVHNZFu0aRuCTpZT7AJQQ= + +handlebars-regexp@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/handlebars-regexp/-/handlebars-regexp-1.0.1.tgz#5f47f067260e9ba8e52f1a280917f70de39f11e4" + integrity sha1-X0fwZyYOm6jlLxooCRf3DeOfEeQ= + +handlebars-string@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/handlebars-string/-/handlebars-string-2.0.2.tgz#b9f92208a979cfcf51ff4a90defa183dc62942ca" + integrity sha1-ufkiCKl5z89R/0qQ3voYPcYpQso= + dependencies: + array-tools "^1.0.6" + string-tools "^0.1.4" + +handlebars@^3.0.0, handlebars@^3.0.3: + version "3.0.8" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.8.tgz#4e6ce3650fe6c53c151d106dcff1c5a7ca79e164" + integrity sha512-frzSzoxbJZSB719r+lM3UFKrnHIY6VPY/j47+GNOHVnBHxO+r+Y/iDjozAbj1SztmmMpr2CcZY6rLeN5mqX8zA== + dependencies: + optimist "^0.6.1" + source-map "^0.1.40" + optionalDependencies: + uglify-js "^2.6" + +handlebars@^4.1.2: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.0, har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hasha@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39" + integrity sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk= + dependencies: + is-stream "^1.0.1" + +he@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +heapdump@*: + version "0.3.15" + resolved "https://registry.yarnpkg.com/heapdump/-/heapdump-0.3.15.tgz#631a8a2585588ea64778d8ec80a64c6c025f6a08" + integrity sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA== + dependencies: + nan "^2.13.2" + +home-or-tmp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" + integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.1" + +home-path@^1.0.3, home-path@^1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.7.tgz#cf77d7339ff3ddc3347a23c52612b1f5e7e56313" + integrity sha512-tM1pVa+u3ZqQwIkXcWfhUlY3HWS3TsnKsfi2OHHvnhkX52s9etyktPyy1rQotkr0euWimChDq+QkQuDe8ngUlQ== + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + +hooker@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" + integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk= + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hot-patcher@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-0.5.0.tgz#9d401424585aaf3a91646b816ceff40eb6a916b9" + integrity sha512-2Uu2W0s8+dnqXzdlg0MRsRzPoDCs1wVjOGSyMRRaMzLDX4bgHw6xDYKccsWafXPPxQpkQfEjgW6+17pwcg60bw== + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +html-minifier@*: + version "4.0.0" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56" + integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig== + dependencies: + camel-case "^3.0.0" + clean-css "^4.2.1" + commander "^2.19.0" + he "^1.2.0" + param-case "^2.1.1" + relateurl "^0.2.7" + uglify-js "^3.5.1" + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" + integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +http_ece@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.1.0.tgz#74780c6eb32d8ddfe9e36a83abcd81fe0cd4fb75" + integrity sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA== + dependencies: + urlsafe-base64 "~1.0.0" + +https-proxy-agent@*, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +https@*: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4" + integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q= + +iconv-lite@0.4.24, iconv-lite@~0.4.13: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +image-size@*: + version "1.0.0" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750" + integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw== + dependencies: + queue "6.0.2" + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +interpret@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" + integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= + +invariant@^2.2.2: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +ipcheck@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ipcheck/-/ipcheck-0.1.0.tgz#a6f942228910010f1688117b7a774b39c5222f81" + integrity sha1-pvlCIokQAQ8WiBF7endLOcUiL4E= + +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5, is-buffer@~1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-core-module@^2.2.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" + integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== + dependencies: + has "^1.0.3" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + dependencies: + is-extglob "^1.0.0" + +is-glob@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + +is-stream@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +is-windows@^1.0.1, is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +istanbul-lib-coverage@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" + integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== + +istanbul-lib-hook@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133" + integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA== + dependencies: + append-transform "^1.0.0" + +istanbul-lib-instrument@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" + integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== + dependencies: + "@babel/generator" "^7.4.0" + "@babel/parser" "^7.4.3" + "@babel/template" "^7.4.0" + "@babel/traverse" "^7.4.3" + "@babel/types" "^7.4.0" + istanbul-lib-coverage "^2.0.5" + semver "^6.0.0" + +istanbul-lib-report@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" + integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ== + dependencies: + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + supports-color "^6.1.0" + +istanbul-lib-source-maps@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" + integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + rimraf "^2.6.3" + source-map "^0.6.1" + +istanbul-reports@^2.2.4: + version "2.2.7" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931" + integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg== + dependencies: + html-escaper "^2.0.0" + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + +js-yaml@^3.13.1, js-yaml@~3.14.0: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js2xmlparser@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-1.0.0.tgz#5a170f2e8d6476ce45405e04823242513782fe30" + integrity sha1-WhcPLo1kds5FQF4EgjJCUTeC/jA= + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsdoc-75lb@^3.5.6: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jsdoc-75lb/-/jsdoc-75lb-3.6.0.tgz#a807119528b4009ccbcab49b7522f63fec6cd0bd" + integrity sha1-qAcRlSi0AJzLyrSbdSL2P+xs0L0= + dependencies: + bluebird "~3.4.6" + catharsis "~0.8.8" + escape-string-regexp "~1.0.5" + espree "~3.1.7" + js2xmlparser "~1.0.0" + klaw "~1.3.0" + marked "~0.3.6" + mkdirp "~0.5.1" + requizzle "~0.2.1" + strip-json-comments "~2.0.1" + taffydb "2.6.2" + underscore "~1.8.3" + +jsdoc-api@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/jsdoc-api/-/jsdoc-api-1.2.4.tgz#5012235927bfad1e27bc88d07b0ddddb2d3a8a59" + integrity sha1-UBIjWSe/rR4nvIjQew3d2y06ilk= + dependencies: + array-back "^1.0.3" + cache-point "~0.3.3" + collect-all "^1.0.2" + core-js "^2.4.1" + feature-detect-es6 "^1.3.1" + file-set "^1.0.1" + jsdoc-75lb "^3.5.6" + object-to-spawn-args "^1.1.0" + promise.prototype.finally "^1.0.1" + temp-path "^1.0.0" + then-fs "^2.0.0" + walk-back "^2.0.1" + +jsdoc-parse@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/jsdoc-parse/-/jsdoc-parse-1.2.7.tgz#54b7481b3cd6bcb7c173dc4fa69ee92735ea2525" + integrity sha1-VLdIGzzWvLfBc9xPpp7pJzXqJSU= + dependencies: + ansi-escape-sequences "^2.2.1" + array-tools "^2" + collect-json "^1.0.1" + command-line-args "^2.1.4" + command-line-tool "^0.1.0" + core-js "^2.0.1" + feature-detect-es6 "^1.2.0" + file-set "~0.2.1" + jsdoc-api "^1.0.0" + object-tools "^2" + stream-connect "^1.0.1" + test-value "^1.0.1" + +jsdoc-to-markdown@^1.3.3: + version "1.3.9" + resolved "https://registry.yarnpkg.com/jsdoc-to-markdown/-/jsdoc-to-markdown-1.3.9.tgz#774c0ece0ebd0bcc3261b2c9a2aa8d1399a61472" + integrity sha1-d0wOzg69C8wyYbLJoqqNE5mmFHI= + dependencies: + ansi-escape-sequences "^3.0.0" + command-line-args "^3.0.1" + command-line-usage "^3.0.5" + config-master "^2.0.4" + dmd "^1.4.1" + jsdoc-parse "^1.2.7" + jsdoc2md-stats "^1.0.3" + object-tools "^2.0.6" + stream-connect "^1.0.2" + +jsdoc2md-stats@^1.0.3: + version "1.0.6" + resolved "https://registry.yarnpkg.com/jsdoc2md-stats/-/jsdoc2md-stats-1.0.6.tgz#dc0e002aebbd0fbae5123534f92732afbc651fbf" + integrity sha1-3A4AKuu9D7rlEjU0+Scyr7xlH78= + dependencies: + app-usage-stats "^0.4.0" + feature-detect-es6 "^1.3.1" + +jsdom@*: + version "16.6.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" + integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + dependencies: + abab "^2.0.5" + acorn "^8.2.4" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.3.0" + data-urls "^2.0.0" + decimal.js "^10.2.1" + domexception "^2.0.1" + escodegen "^2.0.0" + form-data "^3.0.0" + html-encoding-sniffer "^2.0.1" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "6.0.1" + saxes "^5.0.1" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.5.0" + ws "^7.4.5" + xml-name-validator "^3.0.0" + +jsesc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-bigint@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1" + integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ== + dependencies: + bignumber.js "^9.0.0" + +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + +jsonwebtoken@^8.5.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" + integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== + dependencies: + jws "^3.2.2" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + semver "^5.6.0" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +jwa@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" + integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA== + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.11" + safe-buffer "^5.0.1" + +jwa@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc" + integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA== + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.11" + safe-buffer "^5.0.1" + +jws@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" + integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== + dependencies: + jwa "^1.4.1" + safe-buffer "^5.0.1" + +jws@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4" + integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg== + dependencies: + jwa "^2.0.0" + safe-buffer "^5.0.1" + +jwt-simple@*: + version "0.5.6" + resolved "https://registry.yarnpkg.com/jwt-simple/-/jwt-simple-0.5.6.tgz#3357adec55b26547114157be66748995b75b333a" + integrity sha512-40aUybvhH9t2h71ncA1/1SbtTNCVZHgsTsTgqPUxGWDmUDrXyDf2wMNQKEbdBjbf4AI+fQhbECNTV6lWxQKUzg== + +keygrip@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" + integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ== + dependencies: + tsscmp "1.0.6" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +klaw@~1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" + integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + optionalDependencies: + graceful-fs "^4.1.9" + +koa-compose@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" + integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw== + +layerr@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/layerr/-/layerr-0.1.2.tgz#16c8e7fb042d3595ab15492bdad088f31d7afd15" + integrity sha512-ob5kTd9H3S4GOG2nVXyQhOu9O8nBgP555XxWPkJI0tR0JeRilfyTp8WtPdIJHLXBmHMSdEq5+KMxiYABeScsIQ== + +lazy-cache@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" + integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= + +lazystream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" + integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= + dependencies: + readable-stream "^2.0.5" + +ldap-filter@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz#2b14c68a2a9d4104dbdbc910a1ca85fd189e9797" + integrity sha1-KxTGiiqdQQTb28kQocqF/Riel5c= + dependencies: + assert-plus "^1.0.0" + +ldapauth-fork@*: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz#18779a9c30371c5bbea02e3b6aaadb60819ad29c" + integrity sha512-EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg== + dependencies: + "@types/ldapjs" "^1.0.9" + bcryptjs "^2.4.0" + ldapjs "^2.2.1" + lru-cache "^6.0.0" + +ldapjs@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.0.tgz#999c85f642216709009dc8728e58ac7793888def" + integrity sha512-3Rbm3CS7vzTccpP1QnzKCEPok60L/b3BFlWU8r93P5oadCAaqCWEH9Td08crPnw4Ti20W8y0+ZKtFFNzxVu4kA== + dependencies: + abstract-logging "^2.0.0" + asn1 "^0.2.4" + assert-plus "^1.0.0" + backoff "^2.5.0" + ldap-filter "^0.3.3" + once "^1.4.0" + vasync "^2.2.0" + verror "^1.8.1" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lie@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= + dependencies: + immediate "~3.0.5" + +liftup@~3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce" + integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw== + dependencies: + extend "^3.0.2" + findup-sync "^4.0.0" + fined "^1.2.0" + flagged-respawn "^1.0.1" + is-plain-object "^2.0.4" + object.map "^1.0.1" + rechoir "^0.7.0" + resolve "^1.19.0" + +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + +loadavg-windows@*: + version "1.1.1" + resolved "https://registry.yarnpkg.com/loadavg-windows/-/loadavg-windows-1.1.1.tgz#e384aa8107b4ebf851bec267dd4a0789c4c54bc4" + integrity sha512-ncSyH121LuN6OENPSohTAS2W85J3NYVIfjsVcK4spViQbHlQUXhGKd8VYhrqWyjtwwSTw4g3rrDraNoSJWRLgw== + dependencies: + weak-daemon "1.0.3" + +localforage@^1.3.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1" + integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g== + dependencies: + lie "3.1.1" + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.difference@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= + +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.flattendeep@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + +lodash.includes@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" + integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= + +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + +lodash.isinteger@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" + integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= + +lodash.pick@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= + +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + +lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.19, lodash@~4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +longest@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= + +loose-envify@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= + +lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +ltx@^2.8.1: + version "2.10.0" + resolved "https://registry.yarnpkg.com/ltx/-/ltx-2.10.0.tgz#0b794b898e01d9dcc61b54b160e78869003bbb20" + integrity sha512-RB4zR6Mrp/0wTNS9WxMvpgfht/7u/8QAC9DpPD19opL/4OASPa28uoliFqeDkLUU8pQ4aeAfATBZmz1aSAHkMw== + dependencies: + inherits "^2.0.4" + +make-dir@^2.0.0, make-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== + dependencies: + kind-of "^6.0.2" + +map-cache@^0.2.0, map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +mariadb@*: + version "2.5.4" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz#c66daa35e2768b8c714c758453531c06ae4927f4" + integrity sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA== + dependencies: + "@types/geojson" "^7946.0.7" + "@types/node" "^14.14.28" + denque "^1.5.0" + iconv-lite "^0.6.3" + long "^4.0.0" + moment-timezone "^0.5.33" + please-upgrade-node "^3.2.0" + +marked@~0.3.6: + version "0.3.19" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" + integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== + +math-random@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +md5@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f" + integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== + dependencies: + charenc "0.0.2" + crypt "0.0.2" + is-buffer "~1.1.6" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +memory-pager@^1.0.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" + integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg== + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== + dependencies: + source-map "^0.6.1" + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^2.1.5: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.2: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== + +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== + dependencies: + mime-db "1.49.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +minify-js@*: + version "0.0.4" + resolved "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.4.tgz#e960cb61083f37af856944c512d0fca546d28dda" + integrity sha1-6WDLYQg/N6+FaUTFEtD8pUbSjdo= + dependencies: + async "^2.0.1" + dir_cache "^1.0.1" + utils-igor "^2.0.0" + +minify-js@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.2.tgz#833ba28645a1cfa942536bc6de4f0294d482f639" + integrity sha1-gzuihkWhz6lCU2vG3k8ClNSC9jk= + dependencies: + async "^2.0.1" + babel-cli "^6.16.0" + babel-preset-es2015 "^6.16.0" + dir_cache "^1.0.1" + grunt "^1.0.1" + grunt-jsdoc-to-markdown "^1.2.1" + utils-igor "^2.0.0" + +minimalistic-assert@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^2.0.1: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" + integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc= + dependencies: + brace-expansion "^1.0.0" + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp2@^1.0.3: + version "1.0.5" + resolved "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.5.tgz#68bbe61defefafce4b48948608ec0bac942512c2" + integrity sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw== + +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +modern-syslog@*: + version "1.2.0" + resolved "https://registry.yarnpkg.com/modern-syslog/-/modern-syslog-1.2.0.tgz#6e419f640efe877f73ffea1c3e987132a69cd2a2" + integrity sha512-dmFE23qpyZJf8MOdzuNKliW4j1PCqxaRtSzyNnv6QDUWjf1z8T4ZoQ7Qf0t6It2ewNv9/XJZSJoUgwpq3D0X7A== + dependencies: + nan "^2.13.2" + +moment-timezone@^0.5.33: + version "0.5.33" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" + integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== + dependencies: + moment ">= 2.9.0" + +"moment@>= 2.9.0", moment@^2.19.3: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + +mongodb-connection-string-url@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.0.1.tgz#1509b44570851f5331f9ca7052b723789d63f8dc" + integrity sha512-sXi8w9nwbMrErWbOK+8nofHz531rboasDbYAMS+sQ+W+2YnHN980RlMr+t5SDL6uKEU/kw/wG6jcjCTLiJltoA== + dependencies: + whatwg-url "^8.4.0" + +mongodb@*: + version "4.0.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.0.1.tgz#e7fa8de3448492097b3c67a0d980c4816907aa83" + integrity sha512-Ll2YCciRgbFN2jdfSqW1vhxvAcnqu+5ZlrTZNaEg+hZqKREg4xiUV56ZAtTjC02skfoTirHY5jQwtg7mBxqfug== + dependencies: + bson "^4.4.0" + denque "^1.5.0" + mongodb-connection-string-url "^1.0.1" + optionalDependencies: + saslprep "^1.0.0" + +mongodb@^3.3.2: + version "3.6.10" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.10.tgz#f10e990113c86b195c8af0599b9b3a90748b6ee4" + integrity sha512-fvIBQBF7KwCJnDZUnFFy4WqEFP8ibdXeFANnylW19+vOwdjOAvqIzPdsNCEMT6VKTHnYu4K64AWRih0mkFms6Q== + dependencies: + bl "^2.2.1" + bson "^1.1.4" + denque "^1.4.1" + optional-require "^1.0.3" + safe-buffer "^5.1.2" + optionalDependencies: + saslprep "^1.0.0" + +mongojs@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mongojs/-/mongojs-3.1.0.tgz#4242e6f5218a7301c35393b64ba9130d1d9488ef" + integrity sha512-aXJ4xfXwx9s1cqtKTZ24PypXiWhIgvgENObQzCGbV4QBxEVedy3yuErhx6znk959cF2dOzL2ClgXJvIhfgkpIQ== + dependencies: + each-series "^1.0.0" + mongodb "^3.3.2" + nyc "^14.1.1" + once "^1.4.0" + parse-mongo-url "^1.1.1" + readable-stream "^3.4.0" + thunky "^1.1.0" + to-mongodb-core "^2.0.0" + +mqemitter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-3.0.0.tgz#427733ce397be39304c2279bd84358d5525cf577" + integrity sha512-1HduoiTFngBGFEKCGvfCpGfPM/3g58xtDW9fmuHpbnRieC01uAi3yJE/F1YsUrzH8p441l10kosYzi3HhJYnrQ== + dependencies: + fastparallel "^2.3.0" + qlobber "^3.1.0" + +mqtt-packet@^6.1.2: + version "6.10.0" + resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-6.10.0.tgz#c8b507832c4152e3e511c0efa104ae4a64cd418f" + integrity sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA== + dependencies: + bl "^4.0.2" + debug "^4.1.1" + process-nextick-args "^2.0.1" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multiparty@^4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz#bee5fb5737247628d39dab4979ffd6d57bf60ef6" + integrity sha512-NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q== + dependencies: + http-errors "~1.8.0" + safe-buffer "5.2.1" + uid-safe "2.1.5" + +mustache@^2.2.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== + +mv@~2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" + integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= + dependencies: + mkdirp "~0.5.1" + ncp "~2.0.0" + rimraf "~2.4.0" + +mysql@*: + version "2.18.1" + resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717" + integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig== + dependencies: + bignumber.js "9.0.0" + readable-stream "2.3.7" + safe-buffer "5.1.2" + sqlstring "2.3.1" + +nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + +nanoid@^2.1.0: + version "2.1.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" + integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +ncp@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= + +nedb@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/nedb/-/nedb-1.8.0.tgz#0e3502cd82c004d5355a43c9e55577bd7bd91d88" + integrity sha1-DjUCzYLABNU1WkPJ5VV3vXvZHYg= + dependencies: + async "0.2.10" + binary-search-tree "0.2.5" + localforage "^1.3.0" + mkdirp "~0.5.1" + underscore "~1.4.4" + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nested-error-stacks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" + integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== + +nested-property@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/nested-property/-/nested-property-4.0.0.tgz#a67b5a31991e701e03cdbaa6453bc5b1011bb88d" + integrity sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA== + +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" + +node-addon-api@^1.7.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-fetch@^2.3.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + +node-forge@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== + +node-rdpjs-2@*: + version "0.3.5" + resolved "https://registry.yarnpkg.com/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz#6f05fa175e70095a20b59c377be34fa1fe2fa444" + integrity sha512-ABgNbpbJlX2S4SZnsyoUd1MXINLq2y2hbrOXcoxn/NMl4/7uhM/JmXKublF3AooOgRCVKlXiefUVCIMSG/mNZw== + dependencies: + bunyan "^1.8.12" + lodash.isnumber "^3.0.3" + +node-sspi@*: + version "0.2.8" + resolved "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.8.tgz#e4b4245729fa5c579ebcfa9194d491751354963f" + integrity sha512-C9OWJkOu5Syevh/QPJRQ9lyIDcpMb4XMCau2c3z9FNQfWHfJ5Q/4XKX7+ugHRiQHjqh56/NDSxzGAqBMbrQTzg== + dependencies: + bindings "^1.1.1" + node-addon-api "^1.7.1" + +node-vault@*: + version "0.9.22" + resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.9.22.tgz#052ab9b36c29d80d1ecfad61275259fe710d179e" + integrity sha512-/IR+YvINFhCzxJA5x/KHUDymJerFaeqvPUE2zwceRig8yEIA41qfVKusmO6bqRGFkr/2f6CaBVp7YfabzQyteg== + dependencies: + debug "3.1.0" + mustache "^2.2.1" + request "2.88.0" + request-promise-native "1.0.7" + tv4 "^1.2.7" + +node-windows@*: + version "0.1.14" + resolved "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.14.tgz#31bb0503da3bc637f2bfaa8b266640a2e92d891f" + integrity sha1-MbsFA9o7xjfyv6qLJmZAouktiR8= + dependencies: + optimist "~0.6.0" + xml "0.0.12" + +node-xcs@*: + version "0.1.7" + resolved "https://registry.yarnpkg.com/node-xcs/-/node-xcs-0.1.7.tgz#831d4956d6d6b958a1bc266b70760eafaa733206" + integrity sha512-YrZOhvyrk6LKYcGFq+sSNvfLalhEBmdc8E105J3hHpn+lVUD5dRJGGf0RpsismNMgp8Mv+Vvft6tofq0mj6Ofw== + dependencies: + "@xmpp/client" "^0.9.2" + "@xmpp/debug" "^0.9.2" + +nodemailer@*: + version "6.6.3" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz#31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48" + integrity sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew== + +nofilter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" + integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA== + +nopt@~3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + +nopt@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + +normalize-package-data@^2.3.2: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.0.0, normalize-path@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +nyc@^14.1.1: + version "14.1.1" + resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb" + integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw== + dependencies: + archy "^1.0.0" + caching-transform "^3.0.2" + convert-source-map "^1.6.0" + cp-file "^6.2.0" + find-cache-dir "^2.1.0" + find-up "^3.0.0" + foreground-child "^1.5.6" + glob "^7.1.3" + istanbul-lib-coverage "^2.0.5" + istanbul-lib-hook "^2.0.7" + istanbul-lib-instrument "^3.3.0" + istanbul-lib-report "^2.0.8" + istanbul-lib-source-maps "^3.0.6" + istanbul-reports "^2.2.4" + js-yaml "^3.13.1" + make-dir "^2.1.0" + merge-source-map "^1.1.0" + resolve-from "^4.0.0" + rimraf "^2.6.3" + signal-exit "^3.0.2" + spawn-wrap "^1.4.2" + test-exclude "^5.2.3" + uuid "^3.3.2" + yargs "^13.2.2" + yargs-parser "^13.0.0" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +oauth@0.9.x: + version "0.9.15" + resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" + integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-get@^2.0.0, object-get@^2.0.2, object-get@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/object-get/-/object-get-2.1.1.tgz#1dad63baf6d94df184d1c58756cc9be55b174dac" + integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg== + +object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-to-spawn-args@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz#77da8827f073d011c9e1b173f895781470246785" + integrity sha1-d9qIJ/Bz0BHJ4bFz+JV4FHAkZ4U= + +object-tools@^1.2.1, object-tools@^1.6.1: + version "1.6.7" + resolved "https://registry.yarnpkg.com/object-tools/-/object-tools-1.6.7.tgz#52d400fc875250993dbbb3ba298d7c79bb0698d0" + integrity sha1-UtQA/IdSUJk9u7O6KY18ebsGmNA= + dependencies: + array-tools "^1.8.4" + typical "^2.2" + +object-tools@^2, object-tools@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/object-tools/-/object-tools-2.0.6.tgz#f3fe1c350cda4a6f5d99d9646dc4892a02476ddd" + integrity sha1-8/4cNQzaSm9dmdlkbcSJKgJHbd0= + dependencies: + array-back "^1.0.2" + collect-json "^1.0.7" + object-get "^2.0.2" + test-value "^1.1.0" + typical "^2.4.2" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.defaults@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" + integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= + dependencies: + array-each "^1.0.1" + array-slice "^1.0.0" + for-own "^1.0.0" + isobject "^3.0.0" + +object.map@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +object.pick@^1.2.0, object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +optimist@^0.6.1, optimist@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +optional-require@^1.0.3: + version "1.1.0" + resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.0.tgz#01dfbafbbc2e8d79e33558f5af3917f22cc35c2c" + integrity sha512-5/7ee3eTFg1P+F9usTubuNCLfWRK6DjV0EFHLlbp7MmV5UlWqpWIVSnH6xo4u+fc5WHXaJuvJi6iuYnfDyj6oQ== + dependencies: + require-at "^1.0.6" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +os-homedir@^1.0.0, os-homedir@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +otplib@10.2.3: + version "10.2.3" + resolved "https://registry.yarnpkg.com/otplib/-/otplib-10.2.3.tgz#5a371da0c2b36a4a92d2bdac7bf4446dd7ccafc8" + integrity sha512-dwQTF4SkLFVZyV85JFrzCh+zSSlWHyKQtjbHrDmldxqBo6BMZ8uMfQ+kcVTf/VCkbUx1KARvn9cR/inYM2nHTw== + dependencies: + thirty-two "1.0.2" + +output-file-sync@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" + integrity sha1-0KM+7+YaIF+suQCS6CZZjVJFznY= + dependencies: + graceful-fs "^4.1.4" + mkdirp "^0.5.1" + object-assign "^4.1.0" + +p-limit@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz#50183f2d36c9e3e528ea0a8605dff57ce976f88e" + integrity sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA== + dependencies: + graceful-fs "^4.1.15" + hasha "^3.0.0" + lodash.flattendeep "^4.4.0" + release-zalgo "^1.0.0" + +param-case@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= + dependencies: + no-case "^2.2.0" + +parse-filepath@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" + integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= + dependencies: + is-absolute "^1.0.0" + map-cache "^0.2.0" + path-root "^0.1.1" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-mongo-url@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz#66238df5f8e7c0c8ca4cd970d4ab6a1373eb75b5" + integrity sha1-ZiON9fjnwMjKTNlw1KtqE3PrdbU= + +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +parsimmon@1.16.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.16.0.tgz#2834e3db645b6a855ab2ea14fbaad10d82867e0f" + integrity sha512-tekGDz2Lny27SQ/5DzJdIK0lqsWwZ667SCLFIDCxaZM7VNgQjyKLbaL7FYPKpbjdxNAXFV/mSxkq5D2fnkW4pA== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +passport-azure-oauth2@*: + version "0.1.0" + resolved "https://registry.yarnpkg.com/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz#b391ebdf3aabb9529aa2b6c461d5a1677dd4c362" + integrity sha1-s5Hr3zqruVKaorbEYdWhZ33Uw2I= + dependencies: + passport-oauth "^1.0.0" + +passport-github2@*: + version "0.1.12" + resolved "https://registry.yarnpkg.com/passport-github2/-/passport-github2-0.1.12.tgz#a72ebff4fa52a35bc2c71122dcf470d1116f772c" + integrity sha512-3nPUCc7ttF/3HSP/k9sAXjz3SkGv5Nki84I05kSQPo01Jqq1NzJACgMblCK0fGcv9pKCG/KXU3AJRDGLqHLoIw== + dependencies: + passport-oauth2 "1.x.x" + +passport-google-oauth20@*: + version "2.0.0" + resolved "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz#0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef" + integrity sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ== + dependencies: + passport-oauth2 "1.x.x" + +passport-oauth1@1.x.x: + version "1.2.0" + resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz#5229d431781bf5b265bec86ce9a9cce58a756cf9" + integrity sha512-Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg== + dependencies: + oauth "0.9.x" + passport-strategy "1.x.x" + utils-merge "1.x.x" + +passport-oauth2@1.x.x: + version "1.6.0" + resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz#5f599735e0ea40ea3027643785f81a3a9b4feb50" + integrity sha512-emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw== + dependencies: + base64url "3.x.x" + oauth "0.9.x" + passport-strategy "1.x.x" + uid2 "0.0.x" + utils-merge "1.x.x" + +passport-oauth@1.x, passport-oauth@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/passport-oauth/-/passport-oauth-1.0.0.tgz#90aff63387540f02089af28cdad39ea7f80d77df" + integrity sha1-kK/2M4dUDwIImvKM2tOep/gNd98= + dependencies: + passport-oauth1 "1.x.x" + passport-oauth2 "1.x.x" + +passport-reddit@*: + version "0.2.4" + resolved "https://registry.yarnpkg.com/passport-reddit/-/passport-reddit-0.2.4.tgz#4e5805d919a8f28f80c238f7da2d92a38067acc5" + integrity sha1-TlgF2Rmo8o+Awjj32i2So4BnrMU= + dependencies: + passport-oauth "1.x" + pkginfo "0.3.x" + +passport-saml@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.0.tgz#32f79316c617d223ad03f71f23d2ee3813e34516" + integrity sha512-mLIg3QbVwCOgjDKqWCbAz7Oo/IAwUp5ftloEkecbD/oVYMgVZFDjTFuIA5KJ4LQ8tRVf1o2aTaMlzl6JmYfHiA== + dependencies: + debug "^4.3.1" + passport-strategy "^1.0.0" + xml-crypto "^2.1.2" + xml-encryption "^1.2.4" + xml2js "^0.4.23" + xmlbuilder "^15.1.1" + xmldom "^0.6.0" + +passport-strategy@1.x.x, passport-strategy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" + integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ= + +passport-twitter@*: + version "1.0.4" + resolved "https://registry.yarnpkg.com/passport-twitter/-/passport-twitter-1.0.4.tgz#01a799e1f760bf2de49f2ba5fba32282f18932d7" + integrity sha1-AaeZ4fdgvy3knyul+6MigvGJMtc= + dependencies: + passport-oauth1 "1.x.x" + xtraverse "0.1.x" + +passport@*: + version "0.4.1" + resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" + integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== + dependencies: + passport-strategy "1.x.x" + pause "0.0.1" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-posix@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f" + integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8= + +path-root-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= + +path-root@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= + dependencies: + path-root-regex "^0.1.0" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + +pause@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d" + integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10= + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkginfo@0.3.x: + version "0.3.1" + resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21" + integrity sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE= + +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + +plivo@*: + version "4.20.1" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.20.1.tgz#032366930f930debab6497b2def2ab07e46361dc" + integrity sha512-0f3l/FBc00hz/BXF9Pyl1HgqWWI2XW9CLGlQN284YQqlt54T0vI5AaPd3GRlDxb6tI95u9UATTwbOgNKe5WJVQ== + dependencies: + "@types/node" "^14.14.14" + axios "^0.21.1" + base-64 "^0.1.0" + build-url "^1.0.10" + form-data "^4.0.0" + https-proxy-agent "^5.0.0" + jsonwebtoken "^8.5.1" + lodash "^4.17.4" + querystring "^0.2.0" + uri-parser "^1.0.0" + utf8 "^2.1.2" + xml2js "^0.4.19" + xmlbuilder "^9.0.1" + +pop-iterate@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3" + integrity sha1-zqz9q0q/NT16DyqqLB/Hs/lBO6M= + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +precond@0.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" + integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + +private@^0.1.6, private@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== + +process-nextick-args@^2.0.1, process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +promise.prototype.finally@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-1.0.1.tgz#91182f91c92486995740fa05e0da942ac986befa" + integrity sha1-kRgvkckkhplXQPoF4NqUKsmGvvo= + +"promise@>=3.2 <8": + version "7.3.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== + dependencies: + asap "~2.0.3" + +promise@^8.0.2: + version "8.1.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" + integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== + dependencies: + asap "~2.0.6" + +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +psl@^1.1.24, psl@^1.1.28, psl@^1.1.33: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +q@2.0.x: + version "2.0.3" + resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134" + integrity sha1-dbjbAlWhpa+C9Yw/Oqoe/sfQ0TQ= + dependencies: + asap "^2.0.0" + pop-iterate "^1.0.1" + weak-map "^1.0.5" + +qlobber@^3.0.2, qlobber@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" + integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@^6.7.0, qs@^6.9.4: + version "6.10.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" + integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== + dependencies: + side-channel "^1.0.4" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +querystring@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" + integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +queue@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" + integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== + dependencies: + inherits "~2.0.3" + +random-bytes@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" + integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= + +randomatic@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" + integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== + dependencies: + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" + +randombytes@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read-pkg-up@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" + integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== + dependencies: + find-up "^3.0.0" + read-pkg "^3.0.0" + +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + +"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.7: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readdir-glob@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" + integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== + dependencies: + minimatch "^3.0.4" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + +reduce-extract@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/reduce-extract/-/reduce-extract-1.0.0.tgz#67f2385beda65061b5f5f4312662e8b080ca1525" + integrity sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU= + dependencies: + test-value "^1.0.1" + +reduce-flatten@^1.0.0, reduce-flatten@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-1.0.1.tgz#258c78efd153ddf93cb561237f61184f3696e327" + integrity sha1-JYx479FT3fk8tWEjf2EYTzaW4yc= + +reduce-unique@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/reduce-unique/-/reduce-unique-1.0.0.tgz#7e586bcf87a4e32b6d7abd8277fad6cdec9f4803" + integrity sha1-flhrz4ek4ytter2Cd/rWzeyfSAM= + +reduce-without@^1.0.0, reduce-without@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/reduce-without/-/reduce-without-1.0.1.tgz#68ad0ead11855c9a37d4e8256c15bbf87972fc8c" + integrity sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw= + dependencies: + test-value "^2.0.0" + +regenerate@^1.2.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.10.5: + version "0.10.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +regenerator-transform@^0.10.0: + version "0.10.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" + integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== + dependencies: + babel-runtime "^6.18.0" + babel-types "^6.19.0" + private "^0.1.6" + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== + dependencies: + is-equal-shallow "^0.1.3" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpu-core@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" + integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA= + dependencies: + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + +regjsgen@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= + +regjsparser@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= + dependencies: + jsesc "~0.5.0" + +relateurl@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + +release-zalgo@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730" + integrity sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA= + dependencies: + es6-error "^4.0.1" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + +req-then@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.5.1.tgz#31c6e0b56f4ddd2acd6de0ba1bcea77b6079dfdf" + integrity sha1-McbgtW9N3SrNbeC6G86ne2B5398= + dependencies: + array-back "^1.0.3" + defer-promise "^1.0.0" + feature-detect-es6 "^1.3.1" + lodash.pick "^4.4.0" + typical "^2.6.0" + +request-promise-core@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" + integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag== + dependencies: + lodash "^4.17.11" + +request-promise-native@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59" + integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w== + dependencies: + request-promise-core "1.1.2" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + +request@*: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +request@2.88.0: + version "2.88.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.0" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.4.3" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-at@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a" + integrity sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +requizzle@~0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.3.tgz#4675c90aacafb2c036bd39ba2daa4a1cb777fded" + integrity sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ== + dependencies: + lodash "^4.17.14" + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retimer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca" + integrity sha512-KLXY85WkEq2V2bKex/LOO1ViXVn2KGYe4PYysAdYdjmraYIUsVkXu8O4am+8+5UbaaGl1qho4aqAAPHNQ4GSbg== + +reusify@^1.0.0, reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8= + dependencies: + align-text "^0.1.1" + +rimraf@^2.6.2, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@~2.4.0: + version "2.4.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" + integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= + dependencies: + glob "^6.0.1" + +rimraf@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +rootpath@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz#5b379a87dca906e9b91d690a599439bef267ea6b" + integrity sha1-Wzeah9ypBum5HWkKWZQ5vvJn6ms= + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-json-stringify@~1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" + integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sasl-anonymous@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz#f544c7e824df2a40d9ad4733829572cc8d9ed5a5" + integrity sha1-9UTH6CTfKkDZrUczgpVyzI2e1aU= + +sasl-plain@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/sasl-plain/-/sasl-plain-0.1.0.tgz#cf145e7c02222b64d60c0806d9cd2ae5380426cc" + integrity sha1-zxRefAIiK2TWDAgG2c0q5TgEJsw= + +sasl-scram-sha-1@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz#d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b" + integrity sha1-2I1R/qoP8yDY6x1vx1ZXZT+dzUs= + dependencies: + bitwise-xor "0.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.3" + randombytes "^2.0.1" + +saslmechanisms@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/saslmechanisms/-/saslmechanisms-0.1.1.tgz#478be1429500fcfaa780be88b3343ced7d2a9182" + integrity sha1-R4vhQpUA/PqngL6IszQ87X0qkYI= + +saslprep@*, saslprep@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226" + integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag== + dependencies: + sparse-bitfield "^3.0.3" + +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +saxes@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + +scmp@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" + integrity sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver@*: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +"semver@2 || 3 || 4 || 5", semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shortid@^2.2.14: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +sort-array@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-array/-/sort-array-1.1.2.tgz#b88986053c0170a7f9de63f18a49ec79c24c3e64" + integrity sha1-uImGBTwBcKf53mPxiknsecJMPmQ= + dependencies: + array-back "^1.0.4" + object-get "^2.1.0" + typical "^2.6.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.4.15: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== + dependencies: + source-map "^0.5.6" + +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + +source-map@^0.1.40: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y= + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +sparse-bitfield@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" + integrity sha1-/0rm5oZWBWuks+eSqzM004JzyhE= + dependencies: + memory-pager "^1.0.2" + +spawn-wrap@^1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz#81b7670e170cca247d80bf5faf0cfb713bdcf848" + integrity sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw== + dependencies: + foreground-child "^1.5.6" + mkdirp "^0.5.0" + os-homedir "^1.0.1" + rimraf "^2.6.2" + signal-exit "^3.0.2" + which "^1.3.0" + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.9" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@^1.0.3: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sqlstring@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" + integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= + +ssh2@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz#43dd24930e15e317687f519d6b40270d9cd00d00" + integrity sha512-CidQLG2ZacoT0Z7O6dOyisj4JdrOrLVJ4KbHjVNz9yI1vO08FAYQPcnkXY9BP8zeYo+J/nBgY6Gg4R7w4WFWtg== + dependencies: + asn1 "^0.2.4" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: + cpu-features "0.0.2" + nan "^2.14.2" + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stealthy-require@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + +stream-connect@^1.0.1, stream-connect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/stream-connect/-/stream-connect-1.0.2.tgz#18bc81f2edb35b8b5d9a8009200a985314428a97" + integrity sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc= + dependencies: + array-back "^1.0.2" + +stream-handlebars@~0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/stream-handlebars/-/stream-handlebars-0.1.6.tgz#7305b5064203da171608c478acf642a149892a2f" + integrity sha1-cwW1BkID2hcWCMR4rPZCoUmJKi8= + dependencies: + handlebars "^3.0.0" + object-tools "^1.2.1" + +stream-via@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-1.0.4.tgz#8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c" + integrity sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ== + +stream-via@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-0.1.1.tgz#0cee5df9c959fb1d3f4eda4819f289d5f9205afc" + integrity sha1-DO5d+clZ+x0/TtpIGfKJ1fkgWvw= + +string-tools@^0.1.4: + version "0.1.8" + resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-0.1.8.tgz#70884e86a26ee5103a078bef67033d558d36e337" + integrity sha1-cIhOhqJu5RA6B4vvZwM9VY024zc= + +string-tools@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-1.0.0.tgz#c69a9d5788858997da66f1d923ba7113ea466b5a" + integrity sha1-xpqdV4iFiZfaZvHZI7pxE+pGa1o= + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +syslog@*: + version "0.1.1" + resolved "https://registry.yarnpkg.com/syslog/-/syslog-0.1.1.tgz#675d8210898e785fd14c831de2d9a6aec0a35cbd" + integrity sha1-Z12CEImOeF/RTIMd4tmmrsCjXL0= + +table-layout@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-0.3.0.tgz#6ee20dc483db371b3e5c87f704ed2f7c799d2c9a" + integrity sha1-buINxIPbNxs+XIf3BO0vfHmdLJo= + dependencies: + array-back "^1.0.3" + core-js "^2.4.1" + deep-extend "~0.4.1" + feature-detect-es6 "^1.3.1" + typical "^2.6.0" + wordwrapjs "^2.0.0-0" + +taffydb@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" + integrity sha1-fLy2S1oUG2ou/CxdLGe04VCyomg= + +tar-stream@^2.1.2, tar-stream@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +temp-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/temp-path/-/temp-path-1.0.0.tgz#24b1543973ab442896d9ad367dd9cbdbfafe918b" + integrity sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs= + +test-exclude@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" + integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g== + dependencies: + glob "^7.1.3" + minimatch "^3.0.4" + read-pkg-up "^4.0.0" + require-main-filename "^2.0.0" + +test-value@^1.0.1, test-value@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/test-value/-/test-value-1.1.0.tgz#a09136f72ec043d27c893707c2b159bfad7de93f" + integrity sha1-oJE29y7AQ9J8iTcHwrFZv6196T8= + dependencies: + array-back "^1.0.2" + typical "^2.4.2" + +test-value@^2.0.0, test-value@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/test-value/-/test-value-2.1.0.tgz#11da6ff670f3471a73b625ca4f3fdcf7bb748291" + integrity sha1-Edpv9nDzRxpztiXKTz/c97t0gpE= + dependencies: + array-back "^1.0.3" + typical "^2.6.0" + +then-fs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" + integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= + dependencies: + promise ">=3.2 <8" + +thirty-two@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a" + integrity sha1-TKL//AKlEpDSdEueP1V2k8prYno= + +through2@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" + integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== + dependencies: + inherits "^2.0.4" + readable-stream "2 || 3" + +thunky@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-mongodb-core@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz#3596ec7613ac9ad3b98a89dcb9aefba569cd27eb" + integrity sha1-NZbsdhOsmtO5ioncua77pWnNJ+s= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +tough-cookie@^2.3.3, tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.1.2" + +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== + dependencies: + punycode "^2.1.1" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= + +tsscmp@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" + integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA== + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tv4@^1.2.7: + version "1.3.0" + resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963" + integrity sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM= + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +twilio@*: + version "3.66.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.66.0.tgz#8df54865b16b3b0578826cf4f342542daa1227c4" + integrity sha512-2jek7akXcRMusoR20EWA1+e5TQp9Ahosvo81wTUoeS7H24A1xbVQJV4LfSWQN4DLUY1oZ4d6tH2oCe/+ELcpNA== + dependencies: + axios "^0.21.1" + dayjs "^1.8.29" + https-proxy-agent "^5.0.0" + jsonwebtoken "^8.5.1" + lodash "^4.17.21" + q "2.0.x" + qs "^6.9.4" + rootpath "^0.1.2" + scmp "^2.1.0" + url-parse "^1.5.0" + xmlbuilder "^13.0.2" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typical@^2.1, typical@^2.2, typical@^2.3.0, typical@^2.4.2, typical@^2.5.0, typical@^2.6.0, typical@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" + integrity sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0= + +uglify-js@^2.6: + version "2.8.29" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0= + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-js@^3.1.4, uglify-js@^3.5.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06" + integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g== + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc= + +uid-safe@2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" + integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== + dependencies: + random-bytes "~1.0.0" + +uid2@0.0.x: + version "0.0.3" + resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" + integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= + +unc-path-regex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + +underscore.string@~3.3.5: + version "3.3.5" + resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023" + integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg== + dependencies: + sprintf-js "^1.0.3" + util-deprecate "^1.0.2" + +underscore@~1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604" + integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ= + +underscore@~1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +universalify@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +upper-case@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +uri-parser@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz#3307ebb50f279c11198ad09214bdaf24e29735b2" + integrity sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g== + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + +url-parse@^1.5.0, url-parse@^1.5.1: + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +url-template@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" + integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + +urlsafe-base64@^1.0.0, urlsafe-base64@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz#23f89069a6c62f46cf3a1d3b00169cefb90be0c6" + integrity sha1-I/iQaabGL0bPOh07ABac77kL4MY= + +usage-stats@^0.8.2: + version "0.8.6" + resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.8.6.tgz#ec92559f648845c2021cbf5b4adea17af7513830" + integrity sha512-QS1r7a1h5g1jo6KulvVGV+eQM+Jfj87AjJBfr1iaIJYz+N7+Qh7ezaVFCulwBGd8T1EidRiSYphG17gra2y0kg== + dependencies: + array-back "^1.0.4" + cli-commands "0.1.0" + core-js "^2.4.1" + feature-detect-es6 "^1.3.1" + home-path "^1.0.5" + mkdirp2 "^1.0.3" + req-then "0.5.1" + typical "^2.6.1" + uuid "^3.0.1" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +user-home@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" + integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA= + +utf8@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" + integrity sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY= + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-igor@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utils-igor/-/utils-igor-1.0.4.tgz#59197669fd1e51a05ddbd3febb4789498cc42f03" + integrity sha1-WRl2af0eUaBd29P+u0eJSYzELwM= + +utils-igor@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/utils-igor/-/utils-igor-2.0.5.tgz#51fae3fd0a754be33f7f4a05a6a4905f229e3d80" + integrity sha1-Ufrj/Qp1S+M/f0oFpqSQXyKePYA= + dependencies: + minify-js "0.0.2" + +utils-merge@1.0.1, utils-merge@1.x.x: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.0.1, uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +uuid@^8.0.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8flags@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" + integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ= + dependencies: + user-home "^1.1.1" + +v8flags@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +vasync@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/vasync/-/vasync-2.2.0.tgz#cfde751860a15822db3b132bc59b116a4adaf01b" + integrity sha1-z951GGChWCLbOxMrxZsRakra8Bs= + dependencies: + verror "1.10.0" + +verror@1.10.0, verror@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walk-back@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/walk-back/-/walk-back-2.0.1.tgz#554e2a9d874fac47a8cb006bf44c2f0c4998a0a4" + integrity sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ= + +weak-daemon@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/weak-daemon/-/weak-daemon-1.0.3.tgz#d922b7c0dfb8f6bf027c463ea875584d2b085f19" + integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ== + +weak-map@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb" + integrity sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes= + +web-push@*: + version "3.4.5" + resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.4.5.tgz#f94074ff150538872c7183e4d8881c8305920cf1" + integrity sha512-2njbTqZ6Q7ZqqK14YpK1GGmaZs3NmuGYF5b7abCXulUIWFSlSYcZ3NBJQRFcMiQDceD7vQknb8FUuvI1F7Qe/g== + dependencies: + asn1.js "^5.3.0" + http_ece "1.1.0" + https-proxy-agent "^5.0.0" + jws "^4.0.0" + minimist "^1.2.5" + urlsafe-base64 "^1.0.0" + +webdav@*: + version "4.6.0" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.6.0.tgz#b12d3631562ed4a7d665dd1757349682dfc8f441" + integrity sha512-amL/NeZ73xe8cNC+uqAF3mOC/j5dNoNWlZswYCd7DKxhnZM7dViAVSv6gdCYeGAETjPEZVubcKDDRwGKz9ShQQ== + dependencies: + axios "^0.21.1" + base-64 "^1.0.0" + fast-xml-parser "^3.19.0" + he "^1.2.0" + hot-patcher "^0.5.0" + layerr "^0.1.2" + md5 "^2.3.0" + minimatch "^3.0.4" + nested-property "^4.0.0" + path-posix "^1.0.0" + url-join "^4.0.1" + url-parse "^1.5.1" + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== + dependencies: + lodash "^4.7.0" + tr46 "^2.1.0" + webidl-conversions "^6.1.0" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@^1.2.14, which@^1.2.9, which@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@~2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wildleek@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildleek/-/wildleek-2.0.0.tgz#85eb93c9c1822da963bc3c3c8d09ae9d12b48a47" + integrity sha512-wtHhfuGeWH9diQsQoprX5tr2+y5lyqyzMpiTFu4gJVQIK+L4jE8Phmr50sFmk7ewhZzbbQj2pCwbUcceq+IEIg== + dependencies: + binary-search "1.3.6" + +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0= + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8= + +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + +wordwrapjs@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-1.2.1.tgz#754a5ea0664cfbff50540dc32d67bda3289fc34b" + integrity sha1-dUpeoGZM+/9QVA3DLWe9oyifw0s= + dependencies: + array-back "^1.0.3" + typical "^2.5.0" + +wordwrapjs@^2.0.0-0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-2.0.0.tgz#ab55f695e6118da93858fdd70c053d1c5e01ac20" + integrity sha1-q1X2leYRjak4WP3XDAU9HF4BrCA= + dependencies: + array-back "^1.0.3" + feature-detect-es6 "^1.3.1" + reduce-flatten "^1.0.1" + typical "^2.6.0" + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^2.4.2: + version "2.4.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" + integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +ws@5.2.3, ws@^5.2.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" + integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== + dependencies: + async-limiter "~1.0.0" + +ws@^7.0.0, ws@^7.4.5: + version "7.5.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" + integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== + +xml-crypto@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz#501506d42e466f6cd908c5a03182217231b4e4b8" + integrity sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ== + dependencies: + xmldom "^0.6.0" + xpath "0.0.32" + +xml-encryption@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz#767d13f9ff2f979ff5657b93bd72aa729d34b66c" + integrity sha512-+4aSBIv/lwmv5PntfYsZyelOnCcyDmCt/MNxXUukRGlcWW8DObJ26obbVX3iXYRdqkLqbv3AKk8ntNCGKIq/UQ== + dependencies: + escape-html "^1.0.3" + node-forge "^0.10.0" + xmldom "~0.6.0" + xpath "0.0.32" + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xml2js@^0.4.19, xml2js@^0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xml@0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz#f08b347109912be00285785f46f15ad8e50a5f67" + integrity sha1-8Is0cQmRK+AChXhfRvFa2OUKX2c= + +xmlbuilder@^13.0.2: + version "13.0.2" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" + integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ== + +xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlbuilder@^9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +xmldom@0.1.x: + version "0.1.31" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" + integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== + +xmldom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== + +xmldom@^0.6.0, xmldom@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" + integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== + +xpath@0.0.32: + version "0.0.32" + resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" + integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw== + +xtend@^4.0.0, xtend@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +xtraverse@0.1.x: + version "0.1.0" + resolved "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz#b741bad018ef78d8a9d2e83ade007b3f7959c732" + integrity sha1-t0G60BjveNip0ug63gB7P3lZxzI= + dependencies: + xmldom "0.1.x" + +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^13.0.0, yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs@^13.2.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" + +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E= + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yubikeyotp@*: + version "0.2.0" + resolved "https://registry.yarnpkg.com/yubikeyotp/-/yubikeyotp-0.2.0.tgz#8bdc51122cd00ed8c919b9c9caeba851b272aa7d" + integrity sha1-i9xREizQDtjJGbnJyuuoUbJyqn0= + dependencies: + request "*" + +zip-stream@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz#cb8db9d324a76c09f9b76b31a12a48638b0b9708" + integrity sha512-r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ== + dependencies: + archiver-utils "^2.1.0" + compress-commons "^3.0.0" + readable-stream "^3.6.0" + +zip-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" + integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== + dependencies: + archiver-utils "^2.1.0" + compress-commons "^4.1.0" + readable-stream "^3.6.0" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix new file mode 100644 index 00000000000..94ef1c72188 --- /dev/null +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -0,0 +1,8005 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + }; + } + { + name = "_babel_generator___generator_7.14.8.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; + sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_babel_parser___parser_7.14.8.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; + sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; + }; + } + { + name = "_babel_template___template_7.14.5.tgz"; + path = fetchurl { + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + }; + } + { + name = "_babel_traverse___traverse_7.14.8.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; + sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; + }; + } + { + name = "_babel_types___types_7.14.8.tgz"; + path = fetchurl { + name = "_babel_types___types_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; + sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; + }; + } + { + name = "_mysql_xdevapi___xdevapi_8.0.26.tgz"; + path = fetchurl { + name = "_mysql_xdevapi___xdevapi_8.0.26.tgz"; + url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.26.tgz"; + sha1 = "bdf5752553c53c32d665bfa3034f21fbfa989611"; + }; + } + { + name = "_sendgrid_client___client_7.4.3.tgz"; + path = fetchurl { + name = "_sendgrid_client___client_7.4.3.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.4.3.tgz"; + sha1 = "bc71aae05de2cd9aa607f4eb1d886711d09f9595"; + }; + } + { + name = "_sendgrid_helpers___helpers_7.4.3.tgz"; + path = fetchurl { + name = "_sendgrid_helpers___helpers_7.4.3.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.4.3.tgz"; + sha1 = "231a4405266cfa291054df8b668fe3a4dc9387aa"; + }; + } + { + name = "_sendgrid_mail___mail_7.4.5.tgz"; + path = fetchurl { + name = "_sendgrid_mail___mail_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.4.5.tgz"; + sha1 = "22cef36e793134833b36aff5d3f4f53e8f81dd52"; + }; + } + { + name = "_tootallnate_once___once_1.1.2.tgz"; + path = fetchurl { + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; + }; + } + { + name = "_types_geojson___geojson_7946.0.8.tgz"; + path = fetchurl { + name = "_types_geojson___geojson_7946.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz"; + sha1 = "30744afdb385e2945e22f3b033f897f76b1f12ca"; + }; + } + { + name = "_types_ldapjs___ldapjs_1.0.11.tgz"; + path = fetchurl { + name = "_types_ldapjs___ldapjs_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz"; + sha1 = "34077176af2b06186bd54e4a38ceb6e852387fa4"; + }; + } + { + name = "_types_node___node_16.4.5.tgz"; + path = fetchurl { + name = "_types_node___node_16.4.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.5.tgz"; + sha1 = "eac95d4e52775190c405f0b9061ddcfb0304f7fc"; + }; + } + { + name = "_types_node___node_14.17.6.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.6.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz"; + sha1 = "cc61c8361c89e70c468cda464d1fa3dd7e5ebd62"; + }; + } + { + name = "_xmpp_base64___base64_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_base64___base64_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.9.0.tgz"; + sha1 = "f5914c2b7228d833020af991a2a207267fc8fcf4"; + }; + } + { + name = "_xmpp_client_core___client_core_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_client_core___client_core_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.9.2.tgz"; + sha1 = "0176ad686358e903afefbf92d4c0f11676a90572"; + }; + } + { + name = "_xmpp_client___client_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_client___client_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/client/-/client-0.9.2.tgz"; + sha1 = "6a0c7e1d9a8f7ea670981bd66fba5e41067960f7"; + }; + } + { + name = "_xmpp_connection_tcp___connection_tcp_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_connection_tcp___connection_tcp_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/connection-tcp/-/connection-tcp-0.9.2.tgz"; + sha1 = "57f1165ef729e339237522a5206b8f9439f9edbf"; + }; + } + { + name = "_xmpp_connection___connection_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_connection___connection_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/connection/-/connection-0.9.2.tgz"; + sha1 = "bfa354d4c99e16032d50a95a5638e6f58897f31f"; + }; + } + { + name = "_xmpp_debug___debug_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_debug___debug_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/debug/-/debug-0.9.2.tgz"; + sha1 = "51702dfe5d14bae327c3468ea2967cf015800840"; + }; + } + { + name = "_xmpp_error___error_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_error___error_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/error/-/error-0.9.0.tgz"; + sha1 = "3232fab6fdb7a25fe67d3e0e1962ae8742b2f2da"; + }; + } + { + name = "_xmpp_events___events_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_events___events_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/events/-/events-0.9.0.tgz"; + sha1 = "60d181390fc6b080f5487c6877c3a8fa25276d1a"; + }; + } + { + name = "_xmpp_id___id_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_id___id_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/id/-/id-0.9.0.tgz"; + sha1 = "baee9afad8ab7c5a3f3b000b2f98c02ddef67674"; + }; + } + { + name = "_xmpp_iq___iq_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_iq___iq_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.9.2.tgz"; + sha1 = "0a16cf672eb03a7b7358d74835f00cca3aca7113"; + }; + } + { + name = "_xmpp_jid___jid_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_jid___jid_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.9.2.tgz"; + sha1 = "2b87c466834e0618e226be4119b1d54fd828c7da"; + }; + } + { + name = "_xmpp_middleware___middleware_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_middleware___middleware_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.9.2.tgz"; + sha1 = "40b0a6b9ce5473524f46c0841eed30fcb7ca956e"; + }; + } + { + name = "_xmpp_reconnect___reconnect_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_reconnect___reconnect_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.9.0.tgz"; + sha1 = "50f5d8e791021f0d19b34a13cb9ea495eae8a6be"; + }; + } + { + name = "_xmpp_resolve___resolve_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_resolve___resolve_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.9.2.tgz"; + sha1 = "530d8df631d3cb920abc5cc84b470966c71ce9a4"; + }; + } + { + name = "_xmpp_resource_binding___resource_binding_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_resource_binding___resource_binding_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.9.2.tgz"; + sha1 = "49d440ab47e886bbbee5f27966e28a4619eb60bb"; + }; + } + { + name = "_xmpp_sasl_anonymous___sasl_anonymous_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_sasl_anonymous___sasl_anonymous_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.9.0.tgz"; + sha1 = "dbd38751c17c41fd5aef91c1384ce3ade8099f33"; + }; + } + { + name = "_xmpp_sasl_plain___sasl_plain_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_sasl_plain___sasl_plain_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.9.0.tgz"; + sha1 = "6b8d4a2e882685e460cdfb2181d00ac00904f606"; + }; + } + { + name = "_xmpp_sasl_scram_sha_1___sasl_scram_sha_1_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_sasl_scram_sha_1___sasl_scram_sha_1_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.9.0.tgz"; + sha1 = "ee7acbba4393262db6a864630868948de031a4e4"; + }; + } + { + name = "_xmpp_sasl___sasl_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_sasl___sasl_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.9.2.tgz"; + sha1 = "69b7995520c6330f4e5a8b67127ac942c94163ee"; + }; + } + { + name = "_xmpp_session_establishment___session_establishment_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_session_establishment___session_establishment_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.9.2.tgz"; + sha1 = "f648879236df9c95a48bb08e4eb71b3c7be21ab9"; + }; + } + { + name = "_xmpp_starttls___starttls_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_starttls___starttls_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.9.2.tgz"; + sha1 = "656ec7c80928863a37e026fdd5b4f6966f3c15fc"; + }; + } + { + name = "_xmpp_stream_features___stream_features_0.9.0.tgz"; + path = fetchurl { + name = "_xmpp_stream_features___stream_features_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.9.0.tgz"; + sha1 = "5202943ccb9ad99c2750a705e40d80c24b2e5b7c"; + }; + } + { + name = "_xmpp_tcp___tcp_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_tcp___tcp_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.9.2.tgz"; + sha1 = "d7810e68cca65078500f3d23ac4e8901474aae24"; + }; + } + { + name = "_xmpp_tls___tls_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_tls___tls_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.9.2.tgz"; + sha1 = "bc826e36bd65dc3b2516e4a563dc53ac8307746c"; + }; + } + { + name = "_xmpp_websocket___websocket_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_websocket___websocket_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.9.2.tgz"; + sha1 = "f8f4aabaaa0ce429f573a7cc2c0534ea16b38dde"; + }; + } + { + name = "_xmpp_xml___xml_0.9.2.tgz"; + path = fetchurl { + name = "_xmpp_xml___xml_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/@xmpp/xml/-/xml-0.9.2.tgz"; + sha1 = "7d02ba15820b81853833a86531abe3e0d1f9abd5"; + }; + } + { + name = "abab___abab_2.0.5.tgz"; + path = fetchurl { + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "abort_controller___abort_controller_3.0.0.tgz"; + path = fetchurl { + name = "abort_controller___abort_controller_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz"; + sha1 = "eaf54d53b62bae4138e809ca225c8439a6efb392"; + }; + } + { + name = "abstract_logging___abstract_logging_2.0.1.tgz"; + path = fetchurl { + name = "abstract_logging___abstract_logging_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz"; + sha1 = "6b0c371df212db7129b57d2e7fcf282b8bf1c839"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acme_client___acme_client_4.1.3.tgz"; + path = fetchurl { + name = "acme_client___acme_client_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz"; + sha1 = "2a37c7c8835da259eeb0cbfd8bcb7be3b9e4725b"; + }; + } + { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } + { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } + { + name = "acorn___acorn_3.3.0.tgz"; + path = fetchurl { + name = "acorn___acorn_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + }; + } + { + name = "aedes_packet___aedes_packet_1.0.0.tgz"; + path = fetchurl { + name = "aedes_packet___aedes_packet_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz"; + sha1 = "2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1"; + }; + } + { + name = "aedes_persistence___aedes_persistence_6.0.0.tgz"; + path = fetchurl { + name = "aedes_persistence___aedes_persistence_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-6.0.0.tgz"; + sha1 = "e9eb15288a3be1a8e9fc7f231df2237ca0978eb1"; + }; + } + { + name = "aedes___aedes_0.39.0.tgz"; + path = fetchurl { + name = "aedes___aedes_0.39.0.tgz"; + url = "https://registry.yarnpkg.com/aedes/-/aedes-0.39.0.tgz"; + sha1 = "125e2f1e53a600f3a0bfde26431997deed27f117"; + }; + } + { + name = "aes_js___aes_js_3.1.2.tgz"; + path = fetchurl { + name = "aes_js___aes_js_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz"; + sha1 = "db9aabde85d5caabbfc0d4f2a4446960f627146a"; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "align_text___align_text_0.1.4.tgz"; + path = fetchurl { + name = "align_text___align_text_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + } + { + name = "amdefine___amdefine_1.0.1.tgz"; + path = fetchurl { + name = "amdefine___amdefine_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + } + { + name = "ansi_escape_sequences___ansi_escape_sequences_2.2.2.tgz"; + path = fetchurl { + name = "ansi_escape_sequences___ansi_escape_sequences_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-2.2.2.tgz"; + sha1 = "174c78d6f8b7de75f8957ae81c7f72210c701635"; + }; + } + { + name = "ansi_escape_sequences___ansi_escape_sequences_3.0.0.tgz"; + path = fetchurl { + name = "ansi_escape_sequences___ansi_escape_sequences_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz"; + sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_1.3.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; + }; + } + { + name = "app_usage_stats___app_usage_stats_0.4.1.tgz"; + path = fetchurl { + name = "app_usage_stats___app_usage_stats_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/app-usage-stats/-/app-usage-stats-0.4.1.tgz"; + sha1 = "97eb9b89b5678fa2ddc9793b1298628cc218429f"; + }; + } + { + name = "append_transform___append_transform_1.0.0.tgz"; + path = fetchurl { + name = "append_transform___append_transform_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz"; + sha1 = "046a52ae582a228bd72f58acfbe2967c678759ab"; + }; + } + { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + path = fetchurl { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; + }; + } + { + name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz"; + path = fetchurl { + name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz"; + sha1 = "4218a602b6088480703996808484fc1fc4a60a41"; + }; + } + { + name = "archiver___archiver_4.0.2.tgz"; + path = fetchurl { + name = "archiver___archiver_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-4.0.2.tgz"; + sha1 = "43c72865eadb4ddaaa2fb74852527b6a450d927c"; + }; + } + { + name = "archiver___archiver_5.3.0.tgz"; + path = fetchurl { + name = "archiver___archiver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz"; + sha1 = "dd3e097624481741df626267564f7dd8640a45ba"; + }; + } + { + name = "archy___archy_1.0.0.tgz"; + path = fetchurl { + name = "archy___archy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_2.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_back___array_back_1.0.4.tgz"; + path = fetchurl { + name = "array_back___array_back_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/array-back/-/array-back-1.0.4.tgz"; + sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b"; + }; + } + { + name = "array_each___array_each_1.0.1.tgz"; + path = fetchurl { + name = "array_each___array_each_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_slice___array_slice_1.1.0.tgz"; + path = fetchurl { + name = "array_slice___array_slice_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz"; + sha1 = "e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"; + }; + } + { + name = "array_tools___array_tools_1.8.6.tgz"; + path = fetchurl { + name = "array_tools___array_tools_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/array-tools/-/array-tools-1.8.6.tgz"; + sha1 = "145771f7f9c94e98cc5ea4196a99b8323aee18ae"; + }; + } + { + name = "array_tools___array_tools_2.0.9.tgz"; + path = fetchurl { + name = "array_tools___array_tools_2.0.9.tgz"; + url = "https://registry.yarnpkg.com/array-tools/-/array-tools-2.0.9.tgz"; + sha1 = "5a511de7a41be0eec9ffdcd4912d0af9f0caca35"; + }; + } + { + name = "array_unique___array_unique_0.2.1.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "arrify___arrify_2.0.1.tgz"; + path = fetchurl { + name = "arrify___arrify_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz"; + sha1 = "c9655e9331e0abcd588d2a7cad7e9956f66701fa"; + }; + } + { + name = "asap___asap_2.0.6.tgz"; + path = fetchurl { + name = "asap___asap_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + } + { + name = "asn1.js___asn1.js_5.4.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "async___async_0.2.10.tgz"; + path = fetchurl { + name = "async___async_0.2.10.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + name = "async___async_3.2.0.tgz"; + path = fetchurl { + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.11.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; + }; + } + { + name = "axios___axios_0.21.1.tgz"; + path = fetchurl { + name = "axios___axios_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; + sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; + }; + } + { + name = "babel_cli___babel_cli_6.26.0.tgz"; + path = fetchurl { + name = "babel_cli___babel_cli_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz"; + sha1 = "502ab54874d7db88ad00b887a06383ce03d002f1"; + }; + } + { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + path = fetchurl { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + } + { + name = "babel_core___babel_core_6.26.3.tgz"; + path = fetchurl { + name = "babel_core___babel_core_6.26.3.tgz"; + url = "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz"; + sha1 = "b2e2f09e342d0f0c88e2f02e067794125e75c207"; + }; + } + { + name = "babel_generator___babel_generator_6.26.1.tgz"; + path = fetchurl { + name = "babel_generator___babel_generator_6.26.1.tgz"; + url = "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz"; + sha1 = "1844408d3b8f0d35a404ea7ac180f087a601bd90"; + }; + } + { + name = "babel_helper_call_delegate___babel_helper_call_delegate_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_call_delegate___babel_helper_call_delegate_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz"; + sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d"; + }; + } + { + name = "babel_helper_define_map___babel_helper_define_map_6.26.0.tgz"; + path = fetchurl { + name = "babel_helper_define_map___babel_helper_define_map_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz"; + sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f"; + }; + } + { + name = "babel_helper_function_name___babel_helper_function_name_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_function_name___babel_helper_function_name_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz"; + sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9"; + }; + } + { + name = "babel_helper_get_function_arity___babel_helper_get_function_arity_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_get_function_arity___babel_helper_get_function_arity_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz"; + sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d"; + }; + } + { + name = "babel_helper_hoist_variables___babel_helper_hoist_variables_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_hoist_variables___babel_helper_hoist_variables_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz"; + sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76"; + }; + } + { + name = "babel_helper_optimise_call_expression___babel_helper_optimise_call_expression_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_optimise_call_expression___babel_helper_optimise_call_expression_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz"; + sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257"; + }; + } + { + name = "babel_helper_regex___babel_helper_regex_6.26.0.tgz"; + path = fetchurl { + name = "babel_helper_regex___babel_helper_regex_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz"; + sha1 = "325c59f902f82f24b74faceed0363954f6495e72"; + }; + } + { + name = "babel_helper_replace_supers___babel_helper_replace_supers_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_replace_supers___babel_helper_replace_supers_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz"; + sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"; + }; + } + { + name = "babel_helpers___babel_helpers_6.24.1.tgz"; + path = fetchurl { + name = "babel_helpers___babel_helpers_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + } + { + name = "babel_messages___babel_messages_6.23.0.tgz"; + path = fetchurl { + name = "babel_messages___babel_messages_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + } + { + name = "babel_plugin_check_es2015_constants___babel_plugin_check_es2015_constants_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_check_es2015_constants___babel_plugin_check_es2015_constants_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz"; + sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a"; + }; + } + { + name = "babel_plugin_transform_es2015_arrow_functions___babel_plugin_transform_es2015_arrow_functions_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_arrow_functions___babel_plugin_transform_es2015_arrow_functions_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz"; + sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221"; + }; + } + { + name = "babel_plugin_transform_es2015_block_scoped_functions___babel_plugin_transform_es2015_block_scoped_functions_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_block_scoped_functions___babel_plugin_transform_es2015_block_scoped_functions_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz"; + sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141"; + }; + } + { + name = "babel_plugin_transform_es2015_block_scoping___babel_plugin_transform_es2015_block_scoping_6.26.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_block_scoping___babel_plugin_transform_es2015_block_scoping_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz"; + sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f"; + }; + } + { + name = "babel_plugin_transform_es2015_classes___babel_plugin_transform_es2015_classes_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_classes___babel_plugin_transform_es2015_classes_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz"; + sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"; + }; + } + { + name = "babel_plugin_transform_es2015_computed_properties___babel_plugin_transform_es2015_computed_properties_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_computed_properties___babel_plugin_transform_es2015_computed_properties_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz"; + sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3"; + }; + } + { + name = "babel_plugin_transform_es2015_destructuring___babel_plugin_transform_es2015_destructuring_6.23.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_destructuring___babel_plugin_transform_es2015_destructuring_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; + }; + } + { + name = "babel_plugin_transform_es2015_duplicate_keys___babel_plugin_transform_es2015_duplicate_keys_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_duplicate_keys___babel_plugin_transform_es2015_duplicate_keys_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz"; + sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e"; + }; + } + { + name = "babel_plugin_transform_es2015_for_of___babel_plugin_transform_es2015_for_of_6.23.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_for_of___babel_plugin_transform_es2015_for_of_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz"; + sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691"; + }; + } + { + name = "babel_plugin_transform_es2015_function_name___babel_plugin_transform_es2015_function_name_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_function_name___babel_plugin_transform_es2015_function_name_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz"; + sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"; + }; + } + { + name = "babel_plugin_transform_es2015_literals___babel_plugin_transform_es2015_literals_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_literals___babel_plugin_transform_es2015_literals_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz"; + sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e"; + }; + } + { + name = "babel_plugin_transform_es2015_modules_amd___babel_plugin_transform_es2015_modules_amd_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_modules_amd___babel_plugin_transform_es2015_modules_amd_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz"; + sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154"; + }; + } + { + name = "babel_plugin_transform_es2015_modules_commonjs___babel_plugin_transform_es2015_modules_commonjs_6.26.2.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_modules_commonjs___babel_plugin_transform_es2015_modules_commonjs_6.26.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz"; + sha1 = "58a793863a9e7ca870bdc5a881117ffac27db6f3"; + }; + } + { + name = "babel_plugin_transform_es2015_modules_systemjs___babel_plugin_transform_es2015_modules_systemjs_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_modules_systemjs___babel_plugin_transform_es2015_modules_systemjs_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz"; + sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23"; + }; + } + { + name = "babel_plugin_transform_es2015_modules_umd___babel_plugin_transform_es2015_modules_umd_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_modules_umd___babel_plugin_transform_es2015_modules_umd_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz"; + sha1 = "ac997e6285cd18ed6176adb607d602344ad38468"; + }; + } + { + name = "babel_plugin_transform_es2015_object_super___babel_plugin_transform_es2015_object_super_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_object_super___babel_plugin_transform_es2015_object_super_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz"; + sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d"; + }; + } + { + name = "babel_plugin_transform_es2015_parameters___babel_plugin_transform_es2015_parameters_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_parameters___babel_plugin_transform_es2015_parameters_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz"; + sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b"; + }; + } + { + name = "babel_plugin_transform_es2015_shorthand_properties___babel_plugin_transform_es2015_shorthand_properties_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_shorthand_properties___babel_plugin_transform_es2015_shorthand_properties_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz"; + sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0"; + }; + } + { + name = "babel_plugin_transform_es2015_spread___babel_plugin_transform_es2015_spread_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_spread___babel_plugin_transform_es2015_spread_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz"; + sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"; + }; + } + { + name = "babel_plugin_transform_es2015_sticky_regex___babel_plugin_transform_es2015_sticky_regex_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_sticky_regex___babel_plugin_transform_es2015_sticky_regex_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz"; + sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"; + }; + } + { + name = "babel_plugin_transform_es2015_template_literals___babel_plugin_transform_es2015_template_literals_6.22.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_template_literals___babel_plugin_transform_es2015_template_literals_6.22.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz"; + sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"; + }; + } + { + name = "babel_plugin_transform_es2015_typeof_symbol___babel_plugin_transform_es2015_typeof_symbol_6.23.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_typeof_symbol___babel_plugin_transform_es2015_typeof_symbol_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz"; + sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372"; + }; + } + { + name = "babel_plugin_transform_es2015_unicode_regex___babel_plugin_transform_es2015_unicode_regex_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_es2015_unicode_regex___babel_plugin_transform_es2015_unicode_regex_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz"; + sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9"; + }; + } + { + name = "babel_plugin_transform_regenerator___babel_plugin_transform_regenerator_6.26.0.tgz"; + path = fetchurl { + name = "babel_plugin_transform_regenerator___babel_plugin_transform_regenerator_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz"; + sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"; + }; + } + { + name = "babel_plugin_transform_strict_mode___babel_plugin_transform_strict_mode_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_strict_mode___babel_plugin_transform_strict_mode_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz"; + sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758"; + }; + } + { + name = "babel_polyfill___babel_polyfill_6.26.0.tgz"; + path = fetchurl { + name = "babel_polyfill___babel_polyfill_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; + sha1 = "379937abc67d7895970adc621f284cd966cf2153"; + }; + } + { + name = "babel_preset_es2015___babel_preset_es2015_6.24.1.tgz"; + path = fetchurl { + name = "babel_preset_es2015___babel_preset_es2015_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz"; + sha1 = "d44050d6bc2c9feea702aaf38d727a0210538939"; + }; + } + { + name = "babel_register___babel_register_6.26.0.tgz"; + path = fetchurl { + name = "babel_register___babel_register_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "babel_template___babel_template_6.26.0.tgz"; + path = fetchurl { + name = "babel_template___babel_template_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + } + { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + path = fetchurl { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + } + { + name = "babel_types___babel_types_6.26.0.tgz"; + path = fetchurl { + name = "babel_types___babel_types_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + } + { + name = "babylon___babylon_6.18.0.tgz"; + path = fetchurl { + name = "babylon___babylon_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz"; + sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"; + }; + } + { + name = "backo2___backo2_1.0.2.tgz"; + path = fetchurl { + name = "backo2___backo2_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + }; + } + { + name = "backoff___backoff_2.5.0.tgz"; + path = fetchurl { + name = "backoff___backoff_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz"; + sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base_64___base_64_0.1.0.tgz"; + path = fetchurl { + name = "base_64___base_64_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz"; + sha1 = "780a99c84e7d600260361511c4877613bf24f6bb"; + }; + } + { + name = "base_64___base_64_1.0.0.tgz"; + path = fetchurl { + name = "base_64___base_64_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz"; + sha1 = "09d0f2084e32a3fd08c2475b973788eee6ae8f4a"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "base64url___base64url_3.0.1.tgz"; + path = fetchurl { + name = "base64url___base64url_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz"; + sha1 = "6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "bcryptjs___bcryptjs_2.4.3.tgz"; + path = fetchurl { + name = "bcryptjs___bcryptjs_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; + }; + } + { + name = "bignumber.js___bignumber.js_9.0.0.tgz"; + path = fetchurl { + name = "bignumber.js___bignumber.js_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz"; + sha1 = "805880f84a329b5eac6e7cb6f8274b6d82bdf075"; + }; + } + { + name = "bignumber.js___bignumber.js_9.0.1.tgz"; + path = fetchurl { + name = "bignumber.js___bignumber.js_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz"; + sha1 = "8d7ba124c882bfd8e43260c67475518d0689e4e5"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary_search_tree___binary_search_tree_0.2.5.tgz"; + path = fetchurl { + name = "binary_search_tree___binary_search_tree_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.5.tgz"; + sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; + }; + } + { + name = "binary_search___binary_search_1.3.6.tgz"; + path = fetchurl { + name = "binary_search___binary_search_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/binary-search/-/binary-search-1.3.6.tgz"; + sha1 = "e32426016a0c5092f0f3598836a1c7da3560565c"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bitwise_xor___bitwise_xor_0.0.0.tgz"; + path = fetchurl { + name = "bitwise_xor___bitwise_xor_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/bitwise-xor/-/bitwise-xor-0.0.0.tgz"; + sha1 = "040a8172b5bb8cc562b0b7119f230b2a1a780e3d"; + }; + } + { + name = "bl___bl_2.2.1.tgz"; + path = fetchurl { + name = "bl___bl_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz"; + sha1 = "8c11a7b730655c5d56898cdc871224f40fd901d5"; + }; + } + { + name = "bl___bl_4.1.0.tgz"; + path = fetchurl { + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "bluebird___bluebird_3.4.7.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.4.7.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; + }; + } + { + name = "bn.js___bn.js_4.12.0.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_1.8.5.tgz"; + path = fetchurl { + name = "braces___braces_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + }; + } + { + name = "bson___bson_1.1.6.tgz"; + path = fetchurl { + name = "bson___bson_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz"; + sha1 = "fb819be9a60cd677e0853aee4ca712a785d6618a"; + }; + } + { + name = "bson___bson_4.4.1.tgz"; + path = fetchurl { + name = "bson___bson_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.4.1.tgz"; + sha1 = "682c3cb8b90b222414ce14ef8398154ba2cc21bc"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; + path = fetchurl { + name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "build_url___build_url_1.3.3.tgz"; + path = fetchurl { + name = "build_url___build_url_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/build-url/-/build-url-1.3.3.tgz"; + sha1 = "fad1ef30d8861931f85bc1f41fca0a537be31e5f"; + }; + } + { + name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; + path = fetchurl { + name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz"; + sha1 = "085bdc65caf19ceece4ff365fdb951ef0c6e3db8"; + }; + } + { + name = "bunyan___bunyan_1.8.15.tgz"; + path = fetchurl { + name = "bunyan___bunyan_1.8.15.tgz"; + url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz"; + sha1 = "8ce34ca908a17d0776576ca1b2f6cbd916e93b46"; + }; + } + { + name = "bytes___bytes_3.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "cache_point___cache_point_0.3.4.tgz"; + path = fetchurl { + name = "cache_point___cache_point_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/cache-point/-/cache-point-0.3.4.tgz"; + sha1 = "152db502c6bb23b5aa3f663e230d5de8ec4e4f3f"; + }; + } + { + name = "caching_transform___caching_transform_3.0.2.tgz"; + path = fetchurl { + name = "caching_transform___caching_transform_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz"; + sha1 = "601d46b91eca87687a281e71cef99791b0efca70"; + }; + } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + }; + } + { + name = "camel_case___camel_case_3.0.0.tgz"; + path = fetchurl { + name = "camel_case___camel_case_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + } + { + name = "camelcase___camelcase_1.2.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "catharsis___catharsis_0.8.11.tgz"; + path = fetchurl { + name = "catharsis___catharsis_0.8.11.tgz"; + url = "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.11.tgz"; + sha1 = "d0eb3d2b82b7da7a3ce2efb1a7b00becc6643468"; + }; + } + { + name = "cbor___cbor_5.2.0.tgz"; + path = fetchurl { + name = "cbor___cbor_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz"; + sha1 = "4cca67783ccd6de7b50ab4ed62636712f287a67c"; + }; + } + { + name = "center_align___center_align_0.1.3.tgz"; + path = fetchurl { + name = "center_align___center_align_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + }; + } + { + name = "charenc___charenc_0.0.2.tgz"; + path = fetchurl { + name = "charenc___charenc_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + } + { + name = "chokidar___chokidar_1.7.0.tgz"; + path = fetchurl { + name = "chokidar___chokidar_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "clean_css___clean_css_4.2.3.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + }; + } + { + name = "cli_commands___cli_commands_0.1.0.tgz"; + path = fetchurl { + name = "cli_commands___cli_commands_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-commands/-/cli-commands-0.1.0.tgz"; + sha1 = "c57cacc406bbcf9ee21646607161ed432ef5a05a"; + }; + } + { + name = "cliui___cliui_2.1.0.tgz"; + path = fetchurl { + name = "cliui___cliui_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "collect_all___collect_all_1.0.4.tgz"; + path = fetchurl { + name = "collect_all___collect_all_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/collect-all/-/collect-all-1.0.4.tgz"; + sha1 = "50cd7119ac24b8e12a661f0f8c3aa0ea7222ddfc"; + }; + } + { + name = "collect_all___collect_all_0.2.1.tgz"; + path = fetchurl { + name = "collect_all___collect_all_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/collect-all/-/collect-all-0.2.1.tgz"; + sha1 = "7225fb4585c22d4ffac886f0abaf5abc563a1a6a"; + }; + } + { + name = "collect_json___collect_json_1.0.9.tgz"; + path = fetchurl { + name = "collect_json___collect_json_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/collect-json/-/collect-json-1.0.9.tgz"; + sha1 = "eb9906ef3160899e46e8482fac13a5e591dae9ae"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colors___colors_1.1.2.tgz"; + path = fetchurl { + name = "colors___colors_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + } + { + name = "column_layout___column_layout_2.1.4.tgz"; + path = fetchurl { + name = "column_layout___column_layout_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/column-layout/-/column-layout-2.1.4.tgz"; + sha1 = "ed2857092ccf8338026fe538379d9672d70b3641"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "command_line_args___command_line_args_2.1.6.tgz"; + path = fetchurl { + name = "command_line_args___command_line_args_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/command-line-args/-/command-line-args-2.1.6.tgz"; + sha1 = "f197d6eaff34c9085577484b2864375b294f5697"; + }; + } + { + name = "command_line_args___command_line_args_3.0.5.tgz"; + path = fetchurl { + name = "command_line_args___command_line_args_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/command-line-args/-/command-line-args-3.0.5.tgz"; + sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0"; + }; + } + { + name = "command_line_commands___command_line_commands_1.0.4.tgz"; + path = fetchurl { + name = "command_line_commands___command_line_commands_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-1.0.4.tgz"; + sha1 = "034f9b167b5188afbdcf6b2efbb150fc8442c32b"; + }; + } + { + name = "command_line_tool___command_line_tool_0.1.0.tgz"; + path = fetchurl { + name = "command_line_tool___command_line_tool_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.1.0.tgz"; + sha1 = "91a11ba48ac63a4a687554367980f7c6423c149d"; + }; + } + { + name = "command_line_tool___command_line_tool_0.5.2.tgz"; + path = fetchurl { + name = "command_line_tool___command_line_tool_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.5.2.tgz"; + sha1 = "f87d6977f56bbdd2d5dfcf946345dd2cd9c6a53a"; + }; + } + { + name = "command_line_usage___command_line_usage_2.0.5.tgz"; + path = fetchurl { + name = "command_line_usage___command_line_usage_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-2.0.5.tgz"; + sha1 = "f80c35ca5e8624841923ea3be3b9bfbf4f7be27b"; + }; + } + { + name = "command_line_usage___command_line_usage_3.0.8.tgz"; + path = fetchurl { + name = "command_line_usage___command_line_usage_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-3.0.8.tgz"; + sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "common_sequence___common_sequence_1.0.2.tgz"; + path = fetchurl { + name = "common_sequence___common_sequence_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/common-sequence/-/common-sequence-1.0.2.tgz"; + sha1 = "30e07f3f8f6f7f9b3dee854f20b2d39eee086de8"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "compress_commons___compress_commons_3.0.0.tgz"; + path = fetchurl { + name = "compress_commons___compress_commons_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz"; + sha1 = "833944d84596e537224dd91cf92f5246823d4f1d"; + }; + } + { + name = "compress_commons___compress_commons_4.1.1.tgz"; + path = fetchurl { + name = "compress_commons___compress_commons_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; + sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; + }; + } + { + name = "compressible___compressible_2.0.18.tgz"; + path = fetchurl { + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; + }; + } + { + name = "compression___compression_1.7.4.tgz"; + path = fetchurl { + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "config_master___config_master_2.0.4.tgz"; + path = fetchurl { + name = "config_master___config_master_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/config-master/-/config-master-2.0.4.tgz"; + sha1 = "e749505c5d3f946f2fad3c76dfe71fca689751dc"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; + }; + } + { + name = "cookie_session___cookie_session_2.0.0_rc.1.tgz"; + path = fetchurl { + name = "cookie_session___cookie_session_2.0.0_rc.1.tgz"; + url = "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0-rc.1.tgz"; + sha1 = "66fa03f26e5873d681d70f14bff5e48a94c53d37"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "cookies___cookies_0.8.0.tgz"; + path = fetchurl { + name = "cookies___cookies_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz"; + sha1 = "1293ce4b391740a8406e3c9870e828c4b54f3f90"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js___core_js_2.6.12.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cp_file___cp_file_6.2.0.tgz"; + path = fetchurl { + name = "cp_file___cp_file_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz"; + sha1 = "40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"; + }; + } + { + name = "cpu_features___cpu_features_0.0.2.tgz"; + path = fetchurl { + name = "cpu_features___cpu_features_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz"; + sha1 = "9f636156f1155fd04bdbaa028bb3c2fbef3cea7a"; + }; + } + { + name = "crc_32___crc_32_1.2.0.tgz"; + path = fetchurl { + name = "crc_32___crc_32_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; + sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; + }; + } + { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + path = fetchurl { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz"; + sha1 = "cae6eeed003b0e44d739d279de5ae63b171b4e85"; + }; + } + { + name = "crc32_stream___crc32_stream_4.0.2.tgz"; + path = fetchurl { + name = "crc32_stream___crc32_stream_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha1 = "c922ad22b38395abe9d3870f02fa8134ed709007"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + }; + } + { + name = "cross_spawn___cross_spawn_4.0.2.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + } + { + name = "crypt___crypt_0.0.2.tgz"; + path = fetchurl { + name = "crypt___crypt_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + } + { + name = "cssom___cssom_0.4.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + }; + } + { + name = "cssom___cssom_0.3.8.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssstyle___cssstyle_2.3.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } + { + name = "dateformat___dateformat_3.0.3.tgz"; + path = fetchurl { + name = "dateformat___dateformat_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz"; + sha1 = "a6e37499a4d9a9cf85ef5872044d62901c9889ae"; + }; + } + { + name = "dayjs___dayjs_1.10.6.tgz"; + path = fetchurl { + name = "dayjs___dayjs_1.10.6.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz"; + sha1 = "288b2aa82f2d8418a6c9d4df5898c0737ad02a63"; + }; + } + { + name = "ddata___ddata_0.1.28.tgz"; + path = fetchurl { + name = "ddata___ddata_0.1.28.tgz"; + url = "https://registry.yarnpkg.com/ddata/-/ddata-0.1.28.tgz"; + sha1 = "53138fafa3f01749ea2451d12b6b6dd9df1d5b1f"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decimal.js___decimal.js_10.3.1.tgz"; + path = fetchurl { + name = "decimal.js___decimal.js_10.3.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; + sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_extend___deep_extend_0.4.2.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } + { + name = "default_require_extensions___default_require_extensions_2.0.0.tgz"; + path = fetchurl { + name = "default_require_extensions___default_require_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz"; + sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"; + }; + } + { + name = "defer_promise___defer_promise_1.0.2.tgz"; + path = fetchurl { + name = "defer_promise___defer_promise_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz"; + sha1 = "b79521c59cadadaed2d305385d30f8b05cbf9196"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "denque___denque_1.5.0.tgz"; + path = fetchurl { + name = "denque___denque_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; + sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "detect_indent___detect_indent_4.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + } + { + name = "dir_cache___dir_cache_1.0.3.tgz"; + path = fetchurl { + name = "dir_cache___dir_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/dir_cache/-/dir_cache-1.0.3.tgz"; + sha1 = "89b8ca92efdcdf552ef2e14d24c38114f9df554b"; + }; + } + { + name = "dmd___dmd_1.4.2.tgz"; + path = fetchurl { + name = "dmd___dmd_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/dmd/-/dmd-1.4.2.tgz"; + sha1 = "b1304b98a5700a6bfe5dcf91be657c981700a4bc"; + }; + } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } + { + name = "dtrace_provider___dtrace_provider_0.8.8.tgz"; + path = fetchurl { + name = "dtrace_provider___dtrace_provider_0.8.8.tgz"; + url = "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz"; + sha1 = "2996d5490c37e1347be263b423ed7b297fb0d97e"; + }; + } + { + name = "each_series___each_series_1.0.0.tgz"; + path = fetchurl { + name = "each_series___each_series_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/each-series/-/each-series-1.0.0.tgz"; + sha1 = "f886e6c66dfdb25ef1fe73564146ee5cb478afcb"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; + path = fetchurl { + name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha1 = "ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es6_error___es6_error_4.1.1.tgz"; + path = fetchurl { + name = "es6_error___es6_error_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; + sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escodegen___escodegen_2.0.0.tgz"; + path = fetchurl { + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + }; + } + { + name = "espree___espree_3.1.7.tgz"; + path = fetchurl { + name = "espree___espree_3.1.7.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-3.1.7.tgz"; + sha1 = "fd5deec76a97a5120a9cd3a7cb1177a0923b11d2"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "event_target_shim___event_target_shim_5.0.1.tgz"; + path = fetchurl { + name = "event_target_shim___event_target_shim_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha1 = "5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"; + }; + } + { + name = "eventemitter2___eventemitter2_0.4.14.tgz"; + path = fetchurl { + name = "eventemitter2___eventemitter2_0.4.14.tgz"; + url = "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz"; + sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; + }; + } + { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + path = fetchurl { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + }; + } + { + name = "exit___exit_0.1.2.tgz"; + path = fetchurl { + name = "exit___exit_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + } + { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_range___expand_range_1.8.2.tgz"; + path = fetchurl { + name = "expand_range___expand_range_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + } + { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "express_handlebars___express_handlebars_3.1.0.tgz"; + path = fetchurl { + name = "express_handlebars___express_handlebars_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz"; + sha1 = "c177ee9a81f6a2abada6b550b77b3e30c6bc0796"; + }; + } + { + name = "express_ws___express_ws_4.0.0.tgz"; + path = fetchurl { + name = "express_ws___express_ws_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/express-ws/-/express-ws-4.0.0.tgz"; + sha1 = "dabd8dc974516418902a41fe6e30ed949b4d36c4"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_0.3.2.tgz"; + path = fetchurl { + name = "extglob___extglob_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fast_text_encoding___fast_text_encoding_1.0.3.tgz"; + path = fetchurl { + name = "fast_text_encoding___fast_text_encoding_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"; + sha1 = "ec02ac8e01ab8a319af182dae2681213cfe9ce53"; + }; + } + { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; + sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + }; + } + { + name = "fastfall___fastfall_1.5.1.tgz"; + path = fetchurl { + name = "fastfall___fastfall_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/fastfall/-/fastfall-1.5.1.tgz"; + sha1 = "3fee03331a49d1d39b3cdf7a5e9cd66f475e7b94"; + }; + } + { + name = "fastparallel___fastparallel_2.4.0.tgz"; + path = fetchurl { + name = "fastparallel___fastparallel_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.0.tgz"; + sha1 = "65fbec1a5e5902494be772cf5765cbaaece08688"; + }; + } + { + name = "fastseries___fastseries_1.7.2.tgz"; + path = fetchurl { + name = "fastseries___fastseries_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/fastseries/-/fastseries-1.7.2.tgz"; + sha1 = "d22ce13b9433dff3388d91dbd6b8bda9b21a0f4b"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "feature_detect_es6___feature_detect_es6_1.5.0.tgz"; + path = fetchurl { + name = "feature_detect_es6___feature_detect_es6_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz"; + sha1 = "a69bb7662c65f64f89f07eac5a461b649a1e0a00"; + }; + } + { + name = "file_set___file_set_1.1.2.tgz"; + path = fetchurl { + name = "file_set___file_set_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/file-set/-/file-set-1.1.2.tgz"; + sha1 = "08f700bb2c129d0e6bff90157b6556ce7c01e4f9"; + }; + } + { + name = "file_set___file_set_0.2.8.tgz"; + path = fetchurl { + name = "file_set___file_set_0.2.8.tgz"; + url = "https://registry.yarnpkg.com/file-set/-/file-set-0.2.8.tgz"; + sha1 = "73a6571e9cbe51ac5926c88bd567d111f836f178"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filename_regex___filename_regex_2.0.1.tgz"; + path = fetchurl { + name = "filename_regex___filename_regex_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + } + { + name = "fill_range___fill_range_2.2.4.tgz"; + path = fetchurl { + name = "fill_range___fill_range_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; + sha1 = "eb1e773abb056dcd8df2bfdf6af59b8b3a936565"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "filter_where___filter_where_1.0.1.tgz"; + path = fetchurl { + name = "filter_where___filter_where_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/filter-where/-/filter-where-1.0.1.tgz"; + sha1 = "1b042569edce36bc1c4e9f73740d2c4e2feef77d"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + }; + } + { + name = "find_replace___find_replace_1.0.3.tgz"; + path = fetchurl { + name = "find_replace___find_replace_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/find-replace/-/find-replace-1.0.3.tgz"; + sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "findup_sync___findup_sync_4.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz"; + sha1 = "956c9cdde804052b881b428512905c4a5f2cdef0"; + }; + } + { + name = "findup_sync___findup_sync_0.3.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz"; + sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; + }; + } + { + name = "fined___fined_1.2.0.tgz"; + path = fetchurl { + name = "fined___fined_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz"; + sha1 = "d00beccf1aa2b475d16d423b0238b713a2c4a37b"; + }; + } + { + name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; + path = fetchurl { + name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz"; + sha1 = "e7de6f1279ddd9ca9aac8a5971d618606b3aab41"; + }; + } + { + name = "follow_redirects___follow_redirects_1.14.1.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz"; + sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "for_own___for_own_0.1.5.tgz"; + path = fetchurl { + name = "for_own___for_own_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + } + { + name = "for_own___for_own_1.0.0.tgz"; + path = fetchurl { + name = "for_own___for_own_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + } + { + name = "foreground_child___foreground_child_1.5.6.tgz"; + path = fetchurl { + name = "foreground_child___foreground_child_1.5.6.tgz"; + url = "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz"; + sha1 = "4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_3.0.1.tgz"; + path = fetchurl { + name = "form_data___form_data_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; + sha1 = "ebd53791b78356a99af9a300d4282c4d5eb9755f"; + }; + } + { + name = "form_data___form_data_4.0.0.tgz"; + path = fetchurl { + name = "form_data___form_data_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; + sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.2.0.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; + path = fetchurl { + name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; + sha1 = "e32fc030a2ccee44a6b5371308da54be0b397d27"; + }; + } + { + name = "fs_then_native___fs_then_native_1.0.2.tgz"; + path = fetchurl { + name = "fs_then_native___fs_then_native_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/fs-then-native/-/fs-then-native-1.0.2.tgz"; + sha1 = "ac8d3807c9f1bbd1279607fb228e0ab649bb41fe"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "gaxios___gaxios_4.3.0.tgz"; + path = fetchurl { + name = "gaxios___gaxios_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.0.tgz"; + sha1 = "ad4814d89061f85b97ef52aed888c5dbec32f774"; + }; + } + { + name = "gcp_metadata___gcp_metadata_4.3.0.tgz"; + path = fetchurl { + name = "gcp_metadata___gcp_metadata_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.0.tgz"; + sha1 = "0423d06becdbfb9cbb8762eaacf14d5324997900"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getobject___getobject_1.0.1.tgz"; + path = fetchurl { + name = "getobject___getobject_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/getobject/-/getobject-1.0.1.tgz"; + sha1 = "17d86a05913c15d173a5bcf8662dc7c7ac5ce147"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_base___glob_base_0.3.0.tgz"; + path = fetchurl { + name = "glob_base___glob_base_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + } + { + name = "glob_parent___glob_parent_2.0.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + } + { + name = "glob___glob_4.5.3.tgz"; + path = fetchurl { + name = "glob___glob_4.5.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }; + } + { + name = "glob___glob_6.0.4.tgz"; + path = fetchurl { + name = "glob___glob_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "glob___glob_5.0.15.tgz"; + path = fetchurl { + name = "glob___glob_5.0.15.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_9.18.0.tgz"; + path = fetchurl { + name = "globals___globals_9.18.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + } + { + name = "google_auth_library___google_auth_library_7.3.0.tgz"; + path = fetchurl { + name = "google_auth_library___google_auth_library_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.3.0.tgz"; + sha1 = "946a911c72425b05f02735915f03410604466657"; + }; + } + { + name = "google_p12_pem___google_p12_pem_3.1.1.tgz"; + path = fetchurl { + name = "google_p12_pem___google_p12_pem_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.1.tgz"; + sha1 = "98fb717b722d12196a3e5b550c44517562269859"; + }; + } + { + name = "google_protobuf___google_protobuf_3.14.0.tgz"; + path = fetchurl { + name = "google_protobuf___google_protobuf_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.14.0.tgz"; + sha1 = "20373d22046e63831a5110e11a84f713cc43651e"; + }; + } + { + name = "googleapis_common___googleapis_common_5.0.3.tgz"; + path = fetchurl { + name = "googleapis_common___googleapis_common_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.3.tgz"; + sha1 = "9580944e538029687a4e25726afea4a1a535ac6f"; + }; + } + { + name = "googleapis___googleapis_82.0.0.tgz"; + path = fetchurl { + name = "googleapis___googleapis_82.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-82.0.0.tgz"; + sha1 = "26ab303b065c37fc4c9723b703550e62057ea810"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + }; + } + { + name = "grunt_cli___grunt_cli_1.4.3.tgz"; + path = fetchurl { + name = "grunt_cli___grunt_cli_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz"; + sha1 = "22c9f1a3d2780bf9b0d206e832e40f8f499175ff"; + }; + } + { + name = "grunt_jsdoc_to_markdown___grunt_jsdoc_to_markdown_1.2.1.tgz"; + path = fetchurl { + name = "grunt_jsdoc_to_markdown___grunt_jsdoc_to_markdown_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/grunt-jsdoc-to-markdown/-/grunt-jsdoc-to-markdown-1.2.1.tgz"; + sha1 = "d253ac69b61c9575364a44d7db0513ab52f8dac9"; + }; + } + { + name = "grunt_known_options___grunt_known_options_2.0.0.tgz"; + path = fetchurl { + name = "grunt_known_options___grunt_known_options_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz"; + sha1 = "cac641e897f9a0a680b8c9839803d35f3325103c"; + }; + } + { + name = "grunt_legacy_log_utils___grunt_legacy_log_utils_2.1.0.tgz"; + path = fetchurl { + name = "grunt_legacy_log_utils___grunt_legacy_log_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz"; + sha1 = "49a8c7dc74051476dcc116c32faf9db8646856ef"; + }; + } + { + name = "grunt_legacy_log___grunt_legacy_log_3.0.0.tgz"; + path = fetchurl { + name = "grunt_legacy_log___grunt_legacy_log_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz"; + sha1 = "1c6eaf92371ea415af31ea84ce50d434ef6d39c4"; + }; + } + { + name = "grunt_legacy_util___grunt_legacy_util_2.0.1.tgz"; + path = fetchurl { + name = "grunt_legacy_util___grunt_legacy_util_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz"; + sha1 = "0f929d13a2faf9988c9917c82bff609e2d9ba255"; + }; + } + { + name = "grunt___grunt_1.4.1.tgz"; + path = fetchurl { + name = "grunt___grunt_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz"; + sha1 = "7d1e17db1f9c8108777f7273d6b9359755576f50"; + }; + } + { + name = "gtoken___gtoken_5.3.0.tgz"; + path = fetchurl { + name = "gtoken___gtoken_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.0.tgz"; + sha1 = "6536eb2880d9829f0b9d78f756795d4d9064b217"; + }; + } + { + name = "handlebars_array___handlebars_array_0.2.1.tgz"; + path = fetchurl { + name = "handlebars_array___handlebars_array_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/handlebars-array/-/handlebars-array-0.2.1.tgz"; + sha1 = "dd58395a5261d661988e8d77520ebbfaadc6bd24"; + }; + } + { + name = "handlebars_comparison___handlebars_comparison_2.0.1.tgz"; + path = fetchurl { + name = "handlebars_comparison___handlebars_comparison_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handlebars-comparison/-/handlebars-comparison-2.0.1.tgz"; + sha1 = "b17b95d2c298578e4aead38f5fac46e8f6005855"; + }; + } + { + name = "handlebars_json___handlebars_json_1.0.1.tgz"; + path = fetchurl { + name = "handlebars_json___handlebars_json_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/handlebars-json/-/handlebars-json-1.0.1.tgz"; + sha1 = "2ef87bb782551cd645bb4691b824e9653ec02504"; + }; + } + { + name = "handlebars_regexp___handlebars_regexp_1.0.1.tgz"; + path = fetchurl { + name = "handlebars_regexp___handlebars_regexp_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/handlebars-regexp/-/handlebars-regexp-1.0.1.tgz"; + sha1 = "5f47f067260e9ba8e52f1a280917f70de39f11e4"; + }; + } + { + name = "handlebars_string___handlebars_string_2.0.2.tgz"; + path = fetchurl { + name = "handlebars_string___handlebars_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/handlebars-string/-/handlebars-string-2.0.2.tgz"; + sha1 = "b9f92208a979cfcf51ff4a90defa183dc62942ca"; + }; + } + { + name = "handlebars___handlebars_3.0.8.tgz"; + path = fetchurl { + name = "handlebars___handlebars_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.8.tgz"; + sha1 = "4e6ce3650fe6c53c151d106dcff1c5a7ca79e164"; + }; + } + { + name = "handlebars___handlebars_4.7.7.tgz"; + path = fetchurl { + name = "handlebars___handlebars_4.7.7.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz"; + sha1 = "9ce33416aad02dbd6c8fafa8240d5d98004945a1"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hash_base___hash_base_3.1.0.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; + }; + } + { + name = "hasha___hasha_3.0.0.tgz"; + path = fetchurl { + name = "hasha___hasha_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz"; + sha1 = "52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "heapdump___heapdump_0.3.15.tgz"; + path = fetchurl { + name = "heapdump___heapdump_0.3.15.tgz"; + url = "https://registry.yarnpkg.com/heapdump/-/heapdump-0.3.15.tgz"; + sha1 = "631a8a2585588ea64778d8ec80a64c6c025f6a08"; + }; + } + { + name = "home_or_tmp___home_or_tmp_2.0.0.tgz"; + path = fetchurl { + name = "home_or_tmp___home_or_tmp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + } + { + name = "home_path___home_path_1.0.7.tgz"; + path = fetchurl { + name = "home_path___home_path_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/home-path/-/home-path-1.0.7.tgz"; + sha1 = "cf77d7339ff3ddc3347a23c52612b1f5e7e56313"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + }; + } + { + name = "hooker___hooker_0.2.3.tgz"; + path = fetchurl { + name = "hooker___hooker_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz"; + sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; + }; + } + { + name = "hot_patcher___hot_patcher_0.5.0.tgz"; + path = fetchurl { + name = "hot_patcher___hot_patcher_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-0.5.0.tgz"; + sha1 = "9d401424585aaf3a91646b816ceff40eb6a916b9"; + }; + } + { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.tgz"; + path = fetchurl { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "html_minifier___html_minifier_4.0.0.tgz"; + path = fetchurl { + name = "html_minifier___html_minifier_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz"; + sha1 = "cca9aad8bce1175e02e17a8c33e46d8988889f56"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_errors___http_errors_1.8.0.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz"; + sha1 = "75d1bbe497e1044f51e4ee9e704a62f28d336507"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "http_ece___http_ece_1.1.0.tgz"; + path = fetchurl { + name = "http_ece___http_ece_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/http_ece/-/http_ece-1.1.0.tgz"; + sha1 = "74780c6eb32d8ddfe9e36a83abcd81fe0cd4fb75"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + }; + } + { + name = "https___https_1.0.0.tgz"; + path = fetchurl { + name = "https___https_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz"; + sha1 = "3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "image_size___image_size_1.0.0.tgz"; + path = fetchurl { + name = "image_size___image_size_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz"; + sha1 = "58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"; + }; + } + { + name = "immediate___immediate_3.0.6.tgz"; + path = fetchurl { + name = "immediate___immediate_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "interpret___interpret_1.1.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "ipcheck___ipcheck_0.1.0.tgz"; + path = fetchurl { + name = "ipcheck___ipcheck_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/ipcheck/-/ipcheck-0.1.0.tgz"; + sha1 = "a6f942228910010f1688117b7a774b39c5222f81"; + }; + } + { + name = "is_absolute___is_absolute_1.0.0.tgz"; + path = fetchurl { + name = "is_absolute___is_absolute_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; + sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_core_module___is_core_module_2.5.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz"; + sha1 = "f754843617c70bfd29b7bd87327400cda5c18491"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + path = fetchurl { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + } + { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + path = fetchurl { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_1.0.0.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_finite___is_finite_1.1.0.tgz"; + path = fetchurl { + name = "is_finite___is_finite_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz"; + sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_glob___is_glob_2.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_number___is_number_2.1.0.tgz"; + path = fetchurl { + name = "is_number___is_number_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_4.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; + sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + path = fetchurl { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + } + { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + path = fetchurl { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; + }; + } + { + name = "is_primitive___is_primitive_2.0.0.tgz"; + path = fetchurl { + name = "is_primitive___is_primitive_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + } + { + name = "is_relative___is_relative_1.0.0.tgz"; + path = fetchurl { + name = "is_relative___is_relative_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; + sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.1.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + path = fetchurl { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; + sha1 = "675f0ab69503fad4b1d849f736baaca803344f49"; + }; + } + { + name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz"; + path = fetchurl { + name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz"; + sha1 = "c95695f383d4f8f60df1f04252a9550e15b5b133"; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; + sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; + sha1 = "5a8113cd746d43c4889eba36ab10e7d50c9b4f33"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; + sha1 = "284997c48211752ec486253da97e3879defba8c8"; + }; + } + { + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_tokens___js_tokens_3.0.2.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "js2xmlparser___js2xmlparser_1.0.0.tgz"; + path = fetchurl { + name = "js2xmlparser___js2xmlparser_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; + sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsdoc_75lb___jsdoc_75lb_3.6.0.tgz"; + path = fetchurl { + name = "jsdoc_75lb___jsdoc_75lb_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-75lb/-/jsdoc-75lb-3.6.0.tgz"; + sha1 = "a807119528b4009ccbcab49b7522f63fec6cd0bd"; + }; + } + { + name = "jsdoc_api___jsdoc_api_1.2.4.tgz"; + path = fetchurl { + name = "jsdoc_api___jsdoc_api_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-api/-/jsdoc-api-1.2.4.tgz"; + sha1 = "5012235927bfad1e27bc88d07b0ddddb2d3a8a59"; + }; + } + { + name = "jsdoc_parse___jsdoc_parse_1.2.7.tgz"; + path = fetchurl { + name = "jsdoc_parse___jsdoc_parse_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-parse/-/jsdoc-parse-1.2.7.tgz"; + sha1 = "54b7481b3cd6bcb7c173dc4fa69ee92735ea2525"; + }; + } + { + name = "jsdoc_to_markdown___jsdoc_to_markdown_1.3.9.tgz"; + path = fetchurl { + name = "jsdoc_to_markdown___jsdoc_to_markdown_1.3.9.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-to-markdown/-/jsdoc-to-markdown-1.3.9.tgz"; + sha1 = "774c0ece0ebd0bcc3261b2c9a2aa8d1399a61472"; + }; + } + { + name = "jsdoc2md_stats___jsdoc2md_stats_1.0.6.tgz"; + path = fetchurl { + name = "jsdoc2md_stats___jsdoc2md_stats_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/jsdoc2md-stats/-/jsdoc2md-stats-1.0.6.tgz"; + sha1 = "dc0e002aebbd0fbae5123534f92732afbc651fbf"; + }; + } + { + name = "jsdom___jsdom_16.6.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_16.6.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz"; + sha1 = "f79b3786682065492a3da6a60a4695da983805ac"; + }; + } + { + name = "jsesc___jsesc_1.3.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_bigint___json_bigint_1.0.0.tgz"; + path = fetchurl { + name = "json_bigint___json_bigint_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz"; + sha1 = "ae547823ac0cad8398667f8cd9ef4730f5b01ff1"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_0.5.1.tgz"; + path = fetchurl { + name = "json5___json5_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + } + { + name = "jsonwebtoken___jsonwebtoken_8.5.1.tgz"; + path = fetchurl { + name = "jsonwebtoken___jsonwebtoken_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; + sha1 = "00e71e0b8df54c2121a1f26137df2280673bcc0d"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "jwa___jwa_1.4.1.tgz"; + path = fetchurl { + name = "jwa___jwa_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz"; + sha1 = "743c32985cb9e98655530d53641b66c8645b039a"; + }; + } + { + name = "jwa___jwa_2.0.0.tgz"; + path = fetchurl { + name = "jwa___jwa_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz"; + sha1 = "a7e9c3f29dae94027ebcaf49975c9345593410fc"; + }; + } + { + name = "jws___jws_3.2.2.tgz"; + path = fetchurl { + name = "jws___jws_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz"; + sha1 = "001099f3639468c9414000e99995fa52fb478304"; + }; + } + { + name = "jws___jws_4.0.0.tgz"; + path = fetchurl { + name = "jws___jws_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz"; + sha1 = "2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"; + }; + } + { + name = "jwt_simple___jwt_simple_0.5.6.tgz"; + path = fetchurl { + name = "jwt_simple___jwt_simple_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/jwt-simple/-/jwt-simple-0.5.6.tgz"; + sha1 = "3357adec55b26547114157be66748995b75b333a"; + }; + } + { + name = "keygrip___keygrip_1.1.0.tgz"; + path = fetchurl { + name = "keygrip___keygrip_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz"; + sha1 = "871b1681d5e159c62a445b0c74b615e0917e7226"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "klaw___klaw_1.3.1.tgz"; + path = fetchurl { + name = "klaw___klaw_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + } + { + name = "koa_compose___koa_compose_4.1.0.tgz"; + path = fetchurl { + name = "koa_compose___koa_compose_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz"; + sha1 = "507306b9371901db41121c812e923d0d67d3e877"; + }; + } + { + name = "layerr___layerr_0.1.2.tgz"; + path = fetchurl { + name = "layerr___layerr_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/layerr/-/layerr-0.1.2.tgz"; + sha1 = "16c8e7fb042d3595ab15492bdad088f31d7afd15"; + }; + } + { + name = "lazy_cache___lazy_cache_1.0.4.tgz"; + path = fetchurl { + name = "lazy_cache___lazy_cache_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + } + { + name = "lazystream___lazystream_1.0.0.tgz"; + path = fetchurl { + name = "lazystream___lazystream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + } + { + name = "ldap_filter___ldap_filter_0.3.3.tgz"; + path = fetchurl { + name = "ldap_filter___ldap_filter_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz"; + sha1 = "2b14c68a2a9d4104dbdbc910a1ca85fd189e9797"; + }; + } + { + name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz"; + path = fetchurl { + name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz"; + sha1 = "18779a9c30371c5bbea02e3b6aaadb60819ad29c"; + }; + } + { + name = "ldapjs___ldapjs_2.3.0.tgz"; + path = fetchurl { + name = "ldapjs___ldapjs_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.0.tgz"; + sha1 = "999c85f642216709009dc8728e58ac7793888def"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lie___lie_3.1.1.tgz"; + path = fetchurl { + name = "lie___lie_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + } + { + name = "liftup___liftup_3.0.1.tgz"; + path = fetchurl { + name = "liftup___liftup_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz"; + sha1 = "1cb81aff0f368464ed3a5f1a7286372d6b1a60ce"; + }; + } + { + name = "load_json_file___load_json_file_4.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + } + { + name = "loadavg_windows___loadavg_windows_1.1.1.tgz"; + path = fetchurl { + name = "loadavg_windows___loadavg_windows_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/loadavg-windows/-/loadavg-windows-1.1.1.tgz"; + sha1 = "e384aa8107b4ebf851bec267dd4a0789c4c54bc4"; + }; + } + { + name = "localforage___localforage_1.9.0.tgz"; + path = fetchurl { + name = "localforage___localforage_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz"; + sha1 = "f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + } + { + name = "lodash.includes___lodash.includes_4.3.0.tgz"; + path = fetchurl { + name = "lodash.includes___lodash.includes_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; + }; + } + { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + path = fetchurl { + name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + } + { + name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; + path = fetchurl { + name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + }; + } + { + name = "lodash.isnumber___lodash.isnumber_3.0.3.tgz"; + path = fetchurl { + name = "lodash.isnumber___lodash.isnumber_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc"; + }; + } + { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + path = fetchurl { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + } + { + name = "lodash.once___lodash.once_4.1.1.tgz"; + path = fetchurl { + name = "lodash.once___lodash.once_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + }; + } + { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + path = fetchurl { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + } + { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "long___long_4.0.0.tgz"; + path = fetchurl { + name = "long___long_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; + sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; + }; + } + { + name = "longest___longest_1.0.1.tgz"; + path = fetchurl { + name = "longest___longest_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lower_case___lower_case_1.1.4.tgz"; + path = fetchurl { + name = "lower_case___lower_case_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "ltx___ltx_2.10.0.tgz"; + path = fetchurl { + name = "ltx___ltx_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/ltx/-/ltx-2.10.0.tgz"; + sha1 = "0b794b898e01d9dcc61b54b160e78869003bbb20"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_iterator___make_iterator_1.0.1.tgz"; + path = fetchurl { + name = "make_iterator___make_iterator_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz"; + sha1 = "29b33f312aa8f547c4a5e490f56afcec99133ad6"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "mariadb___mariadb_2.5.4.tgz"; + path = fetchurl { + name = "mariadb___mariadb_2.5.4.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz"; + sha1 = "c66daa35e2768b8c714c758453531c06ae4927f4"; + }; + } + { + name = "marked___marked_0.3.19.tgz"; + path = fetchurl { + name = "marked___marked_0.3.19.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz"; + sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; + }; + } + { + name = "math_random___math_random_1.0.4.tgz"; + path = fetchurl { + name = "math_random___math_random_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; + sha1 = "5dd6943c938548267016d4e34f057583080c514c"; + }; + } + { + name = "md5.js___md5.js_1.3.5.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; + sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; + }; + } + { + name = "md5___md5_2.3.0.tgz"; + path = fetchurl { + name = "md5___md5_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; + sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "memory_pager___memory_pager_1.5.0.tgz"; + path = fetchurl { + name = "memory_pager___memory_pager_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz"; + sha1 = "d8751655d22d384682741c972f2c3d6dfa3e66b5"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_source_map___merge_source_map_1.1.0.tgz"; + path = fetchurl { + name = "merge_source_map___merge_source_map_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha1 = "2fdde7e6020939f70906a68f2d7ae685e4c8c646"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_2.3.11.tgz"; + path = fetchurl { + name = "micromatch___micromatch_2.3.11.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { + name = "mime_db___mime_db_1.49.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; + }; + } + { + name = "mime_types___mime_types_2.1.32.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "minify_js___minify_js_0.0.4.tgz"; + path = fetchurl { + name = "minify_js___minify_js_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.4.tgz"; + sha1 = "e960cb61083f37af856944c512d0fca546d28dda"; + }; + } + { + name = "minify_js___minify_js_0.0.2.tgz"; + path = fetchurl { + name = "minify_js___minify_js_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.2.tgz"; + sha1 = "833ba28645a1cfa942536bc6de4f0294d482f639"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimatch___minimatch_2.0.10.tgz"; + path = fetchurl { + name = "minimatch___minimatch_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minimist___minimist_0.0.10.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp2___mkdirp2_1.0.5.tgz"; + path = fetchurl { + name = "mkdirp2___mkdirp2_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.5.tgz"; + sha1 = "68bbe61defefafce4b48948608ec0bac942512c2"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "modern_syslog___modern_syslog_1.2.0.tgz"; + path = fetchurl { + name = "modern_syslog___modern_syslog_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/modern-syslog/-/modern-syslog-1.2.0.tgz"; + sha1 = "6e419f640efe877f73ffea1c3e987132a69cd2a2"; + }; + } + { + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + path = fetchurl { + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha1 = "b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"; + }; + } + { + name = "moment___moment_2.29.1.tgz"; + path = fetchurl { + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; + }; + } + { + name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz"; + path = fetchurl { + name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.0.1.tgz"; + sha1 = "1509b44570851f5331f9ca7052b723789d63f8dc"; + }; + } + { + name = "mongodb___mongodb_4.0.1.tgz"; + path = fetchurl { + name = "mongodb___mongodb_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.0.1.tgz"; + sha1 = "e7fa8de3448492097b3c67a0d980c4816907aa83"; + }; + } + { + name = "mongodb___mongodb_3.6.10.tgz"; + path = fetchurl { + name = "mongodb___mongodb_3.6.10.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.10.tgz"; + sha1 = "f10e990113c86b195c8af0599b9b3a90748b6ee4"; + }; + } + { + name = "mongojs___mongojs_3.1.0.tgz"; + path = fetchurl { + name = "mongojs___mongojs_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mongojs/-/mongojs-3.1.0.tgz"; + sha1 = "4242e6f5218a7301c35393b64ba9130d1d9488ef"; + }; + } + { + name = "mqemitter___mqemitter_3.0.0.tgz"; + path = fetchurl { + name = "mqemitter___mqemitter_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mqemitter/-/mqemitter-3.0.0.tgz"; + sha1 = "427733ce397be39304c2279bd84358d5525cf577"; + }; + } + { + name = "mqtt_packet___mqtt_packet_6.10.0.tgz"; + path = fetchurl { + name = "mqtt_packet___mqtt_packet_6.10.0.tgz"; + url = "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; + sha1 = "c8b507832c4152e3e511c0efa104ae4a64cd418f"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "multiparty___multiparty_4.2.2.tgz"; + path = fetchurl { + name = "multiparty___multiparty_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz"; + sha1 = "bee5fb5737247628d39dab4979ffd6d57bf60ef6"; + }; + } + { + name = "mustache___mustache_2.3.2.tgz"; + path = fetchurl { + name = "mustache___mustache_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; + sha1 = "a6d4d9c3f91d13359ab889a812954f9230a3d0c5"; + }; + } + { + name = "mv___mv_2.1.1.tgz"; + path = fetchurl { + name = "mv___mv_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + } + { + name = "mysql___mysql_2.18.1.tgz"; + path = fetchurl { + name = "mysql___mysql_2.18.1.tgz"; + url = "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz"; + sha1 = "2254143855c5a8c73825e4522baf2ea021766717"; + }; + } + { + name = "nan___nan_2.14.2.tgz"; + path = fetchurl { + name = "nan___nan_2.14.2.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; + sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + }; + } + { + name = "nanoid___nanoid_2.1.11.tgz"; + path = fetchurl { + name = "nanoid___nanoid_2.1.11.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz"; + sha1 = "ec24b8a758d591561531b4176a01e3ab4f0f0280"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "ncp___ncp_2.0.0.tgz"; + path = fetchurl { + name = "ncp___ncp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + } + { + name = "nedb___nedb_1.8.0.tgz"; + path = fetchurl { + name = "nedb___nedb_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/nedb/-/nedb-1.8.0.tgz"; + sha1 = "0e3502cd82c004d5355a43c9e55577bd7bd91d88"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "nested_error_stacks___nested_error_stacks_2.1.0.tgz"; + path = fetchurl { + name = "nested_error_stacks___nested_error_stacks_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz"; + sha1 = "0fbdcf3e13fe4994781280524f8b96b0cdff9c61"; + }; + } + { + name = "nested_property___nested_property_4.0.0.tgz"; + path = fetchurl { + name = "nested_property___nested_property_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/nested-property/-/nested-property-4.0.0.tgz"; + sha1 = "a67b5a31991e701e03cdbaa6453bc5b1011bb88d"; + }; + } + { + name = "no_case___no_case_2.3.2.tgz"; + path = fetchurl { + name = "no_case___no_case_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; + sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + }; + } + { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; + sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + }; + } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { + name = "node_forge___node_forge_0.10.0.tgz"; + path = fetchurl { + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; + }; + } + { + name = "node_rdpjs_2___node_rdpjs_2_0.3.5.tgz"; + path = fetchurl { + name = "node_rdpjs_2___node_rdpjs_2_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz"; + sha1 = "6f05fa175e70095a20b59c377be34fa1fe2fa444"; + }; + } + { + name = "node_sspi___node_sspi_0.2.8.tgz"; + path = fetchurl { + name = "node_sspi___node_sspi_0.2.8.tgz"; + url = "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.8.tgz"; + sha1 = "e4b4245729fa5c579ebcfa9194d491751354963f"; + }; + } + { + name = "node_vault___node_vault_0.9.22.tgz"; + path = fetchurl { + name = "node_vault___node_vault_0.9.22.tgz"; + url = "https://registry.yarnpkg.com/node-vault/-/node-vault-0.9.22.tgz"; + sha1 = "052ab9b36c29d80d1ecfad61275259fe710d179e"; + }; + } + { + name = "node_windows___node_windows_0.1.14.tgz"; + path = fetchurl { + name = "node_windows___node_windows_0.1.14.tgz"; + url = "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.14.tgz"; + sha1 = "31bb0503da3bc637f2bfaa8b266640a2e92d891f"; + }; + } + { + name = "node_xcs___node_xcs_0.1.7.tgz"; + path = fetchurl { + name = "node_xcs___node_xcs_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/node-xcs/-/node-xcs-0.1.7.tgz"; + sha1 = "831d4956d6d6b958a1bc266b70760eafaa733206"; + }; + } + { + name = "nodemailer___nodemailer_6.6.3.tgz"; + path = fetchurl { + name = "nodemailer___nodemailer_6.6.3.tgz"; + url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz"; + sha1 = "31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48"; + }; + } + { + name = "nofilter___nofilter_1.0.4.tgz"; + path = fetchurl { + name = "nofilter___nofilter_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz"; + sha1 = "78d6f4b6a613e7ced8b015cec534625f7667006e"; + }; + } + { + name = "nopt___nopt_3.0.6.tgz"; + path = fetchurl { + name = "nopt___nopt_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + } + { + name = "nopt___nopt_4.0.3.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "nwsapi___nwsapi_2.2.0.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + }; + } + { + name = "nyc___nyc_14.1.1.tgz"; + path = fetchurl { + name = "nyc___nyc_14.1.1.tgz"; + url = "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz"; + sha1 = "151d64a6a9f9f5908a1b73233931e4a0a3075eeb"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "oauth___oauth_0.9.15.tgz"; + path = fetchurl { + name = "oauth___oauth_0.9.15.tgz"; + url = "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_get___object_get_2.1.1.tgz"; + path = fetchurl { + name = "object_get___object_get_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-get/-/object-get-2.1.1.tgz"; + sha1 = "1dad63baf6d94df184d1c58756cc9be55b174dac"; + }; + } + { + name = "object_inspect___object_inspect_1.11.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; + sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_to_spawn_args___object_to_spawn_args_1.1.1.tgz"; + path = fetchurl { + name = "object_to_spawn_args___object_to_spawn_args_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz"; + sha1 = "77da8827f073d011c9e1b173f895781470246785"; + }; + } + { + name = "object_tools___object_tools_1.6.7.tgz"; + path = fetchurl { + name = "object_tools___object_tools_1.6.7.tgz"; + url = "https://registry.yarnpkg.com/object-tools/-/object-tools-1.6.7.tgz"; + sha1 = "52d400fc875250993dbbb3ba298d7c79bb0698d0"; + }; + } + { + name = "object_tools___object_tools_2.0.6.tgz"; + path = fetchurl { + name = "object_tools___object_tools_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/object-tools/-/object-tools-2.0.6.tgz"; + sha1 = "f3fe1c350cda4a6f5d99d9646dc4892a02476ddd"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + }; + } + { + name = "object.defaults___object.defaults_1.1.0.tgz"; + path = fetchurl { + name = "object.defaults___object.defaults_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + } + { + name = "object.map___object.map_1.0.1.tgz"; + path = fetchurl { + name = "object.map___object.map_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + } + { + name = "object.omit___object.omit_2.0.1.tgz"; + path = fetchurl { + name = "object.omit___object.omit_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "optimist___optimist_0.6.1.tgz"; + path = fetchurl { + name = "optimist___optimist_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + } + { + name = "optional_require___optional_require_1.1.0.tgz"; + path = fetchurl { + name = "optional_require___optional_require_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.0.tgz"; + sha1 = "01dfbafbbc2e8d79e33558f5af3917f22cc35c2c"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "otplib___otplib_10.2.3.tgz"; + path = fetchurl { + name = "otplib___otplib_10.2.3.tgz"; + url = "https://registry.yarnpkg.com/otplib/-/otplib-10.2.3.tgz"; + sha1 = "5a371da0c2b36a4a92d2bdac7bf4446dd7ccafc8"; + }; + } + { + name = "output_file_sync___output_file_sync_1.1.2.tgz"; + path = fetchurl { + name = "output_file_sync___output_file_sync_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz"; + sha1 = "d0a33eefe61a205facb90092e826598d5245ce76"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_hash___package_hash_3.0.0.tgz"; + path = fetchurl { + name = "package_hash___package_hash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz"; + sha1 = "50183f2d36c9e3e528ea0a8605dff57ce976f88e"; + }; + } + { + name = "param_case___param_case_2.1.1.tgz"; + path = fetchurl { + name = "param_case___param_case_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + } + { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + path = fetchurl { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + } + { + name = "parse_glob___parse_glob_3.0.4.tgz"; + path = fetchurl { + name = "parse_glob___parse_glob_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_mongo_url___parse_mongo_url_1.1.1.tgz"; + path = fetchurl { + name = "parse_mongo_url___parse_mongo_url_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz"; + sha1 = "66238df5f8e7c0c8ca4cd970d4ab6a1373eb75b5"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "parse5___parse5_6.0.1.tgz"; + path = fetchurl { + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "parsimmon___parsimmon_1.16.0.tgz"; + path = fetchurl { + name = "parsimmon___parsimmon_1.16.0.tgz"; + url = "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.16.0.tgz"; + sha1 = "2834e3db645b6a855ab2ea14fbaad10d82867e0f"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "passport_azure_oauth2___passport_azure_oauth2_0.1.0.tgz"; + path = fetchurl { + name = "passport_azure_oauth2___passport_azure_oauth2_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz"; + sha1 = "b391ebdf3aabb9529aa2b6c461d5a1677dd4c362"; + }; + } + { + name = "passport_github2___passport_github2_0.1.12.tgz"; + path = fetchurl { + name = "passport_github2___passport_github2_0.1.12.tgz"; + url = "https://registry.yarnpkg.com/passport-github2/-/passport-github2-0.1.12.tgz"; + sha1 = "a72ebff4fa52a35bc2c71122dcf470d1116f772c"; + }; + } + { + name = "passport_google_oauth20___passport_google_oauth20_2.0.0.tgz"; + path = fetchurl { + name = "passport_google_oauth20___passport_google_oauth20_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz"; + sha1 = "0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef"; + }; + } + { + name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; + path = fetchurl { + name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz"; + sha1 = "5229d431781bf5b265bec86ce9a9cce58a756cf9"; + }; + } + { + name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; + path = fetchurl { + name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; + sha1 = "5f599735e0ea40ea3027643785f81a3a9b4feb50"; + }; + } + { + name = "passport_oauth___passport_oauth_1.0.0.tgz"; + path = fetchurl { + name = "passport_oauth___passport_oauth_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth/-/passport-oauth-1.0.0.tgz"; + sha1 = "90aff63387540f02089af28cdad39ea7f80d77df"; + }; + } + { + name = "passport_reddit___passport_reddit_0.2.4.tgz"; + path = fetchurl { + name = "passport_reddit___passport_reddit_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/passport-reddit/-/passport-reddit-0.2.4.tgz"; + sha1 = "4e5805d919a8f28f80c238f7da2d92a38067acc5"; + }; + } + { + name = "passport_saml___passport_saml_3.1.0.tgz"; + path = fetchurl { + name = "passport_saml___passport_saml_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.0.tgz"; + sha1 = "32f79316c617d223ad03f71f23d2ee3813e34516"; + }; + } + { + name = "passport_strategy___passport_strategy_1.0.0.tgz"; + path = fetchurl { + name = "passport_strategy___passport_strategy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + } + { + name = "passport_twitter___passport_twitter_1.0.4.tgz"; + path = fetchurl { + name = "passport_twitter___passport_twitter_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/passport-twitter/-/passport-twitter-1.0.4.tgz"; + sha1 = "01a799e1f760bf2de49f2ba5fba32282f18932d7"; + }; + } + { + name = "passport___passport_0.4.1.tgz"; + path = fetchurl { + name = "passport___passport_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz"; + sha1 = "941446a21cb92fc688d97a0861c38ce9f738f270"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_posix___path_posix_1.0.0.tgz"; + path = fetchurl { + name = "path_posix___path_posix_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz"; + sha1 = "06b26113f56beab042545a23bfa88003ccac260f"; + }; + } + { + name = "path_root_regex___path_root_regex_0.1.2.tgz"; + path = fetchurl { + name = "path_root_regex___path_root_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + } + { + name = "path_root___path_root_0.1.1.tgz"; + path = fetchurl { + name = "path_root___path_root_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_3.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + }; + } + { + name = "pause___pause_0.0.1.tgz"; + path = fetchurl { + name = "pause___pause_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pkginfo___pkginfo_0.3.1.tgz"; + path = fetchurl { + name = "pkginfo___pkginfo_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + } + { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + path = fetchurl { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + }; + } + { + name = "plivo___plivo_4.20.1.tgz"; + path = fetchurl { + name = "plivo___plivo_4.20.1.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.20.1.tgz"; + sha1 = "032366930f930debab6497b2def2ab07e46361dc"; + }; + } + { + name = "pop_iterate___pop_iterate_1.0.1.tgz"; + path = fetchurl { + name = "pop_iterate___pop_iterate_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "precond___precond_0.2.3.tgz"; + path = fetchurl { + name = "precond___precond_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz"; + sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "preserve___preserve_0.2.0.tgz"; + path = fetchurl { + name = "preserve___preserve_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + } + { + name = "printj___printj_1.1.2.tgz"; + path = fetchurl { + name = "printj___printj_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; + sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; + }; + } + { + name = "private___private_0.1.8.tgz"; + path = fetchurl { + name = "private___private_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; + sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "promise.prototype.finally___promise.prototype.finally_1.0.1.tgz"; + path = fetchurl { + name = "promise.prototype.finally___promise.prototype.finally_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-1.0.1.tgz"; + sha1 = "91182f91c92486995740fa05e0da942ac986befa"; + }; + } + { + name = "promise___promise_7.3.1.tgz"; + path = fetchurl { + name = "promise___promise_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz"; + sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf"; + }; + } + { + name = "promise___promise_8.1.0.tgz"; + path = fetchurl { + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "q___q_2.0.3.tgz"; + path = fetchurl { + name = "q___q_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + }; + } + { + name = "qlobber___qlobber_3.1.0.tgz"; + path = fetchurl { + name = "qlobber___qlobber_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz"; + sha1 = "b8c8e067496de17bdbf3cd843cf53ece09c8d211"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.10.1.tgz"; + path = fetchurl { + name = "qs___qs_6.10.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz"; + sha1 = "4931482fa8d647a5aab799c5271d2133b981fb6a"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "querystring___querystring_0.2.1.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz"; + sha1 = "40d77615bb09d16902a85c3e38aa8b5ed761c2dd"; + }; + } + { + name = "querystringify___querystringify_2.2.0.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; + }; + } + { + name = "queue___queue_6.0.2.tgz"; + path = fetchurl { + name = "queue___queue_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz"; + sha1 = "b91525283e2315c7553d2efa18d83e76432fed65"; + }; + } + { + name = "random_bytes___random_bytes_1.0.0.tgz"; + path = fetchurl { + name = "random_bytes___random_bytes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + } + { + name = "randomatic___randomatic_3.1.1.tgz"; + path = fetchurl { + name = "randomatic___randomatic_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; + sha1 = "b776efc59375984e36c537b2f51a1f0aff0da1ed"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; + }; + } + { + name = "read_pkg___read_pkg_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + path = fetchurl { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; + sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "rechoir___rechoir_0.7.1.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha1 = "9478a96a1ca135b5e88fc027f03ee92d6c645686"; + }; + } + { + name = "reduce_extract___reduce_extract_1.0.0.tgz"; + path = fetchurl { + name = "reduce_extract___reduce_extract_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/reduce-extract/-/reduce-extract-1.0.0.tgz"; + sha1 = "67f2385beda65061b5f5f4312662e8b080ca1525"; + }; + } + { + name = "reduce_flatten___reduce_flatten_1.0.1.tgz"; + path = fetchurl { + name = "reduce_flatten___reduce_flatten_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-1.0.1.tgz"; + sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; + }; + } + { + name = "reduce_unique___reduce_unique_1.0.0.tgz"; + path = fetchurl { + name = "reduce_unique___reduce_unique_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/reduce-unique/-/reduce-unique-1.0.0.tgz"; + sha1 = "7e586bcf87a4e32b6d7abd8277fad6cdec9f4803"; + }; + } + { + name = "reduce_without___reduce_without_1.0.1.tgz"; + path = fetchurl { + name = "reduce_without___reduce_without_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/reduce-without/-/reduce-without-1.0.1.tgz"; + sha1 = "68ad0ead11855c9a37d4e8256c15bbf87972fc8c"; + }; + } + { + name = "regenerate___regenerate_1.4.2.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.10.1.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.10.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz"; + sha1 = "1e4996837231da8b7f3cf4114d71b5691a0680dd"; + }; + } + { + name = "regex_cache___regex_cache_0.4.4.tgz"; + path = fetchurl { + name = "regex_cache___regex_cache_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; + sha1 = "75bdc58a2a1496cec48a12835bc54c8d562336dd"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexpu_core___regexpu_core_2.0.0.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz"; + sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240"; + }; + } + { + name = "regjsgen___regjsgen_0.2.0.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz"; + sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7"; + }; + } + { + name = "regjsparser___regjsparser_0.1.5.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz"; + sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; + }; + } + { + name = "relateurl___relateurl_0.2.7.tgz"; + path = fetchurl { + name = "relateurl___relateurl_0.2.7.tgz"; + url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + } + { + name = "release_zalgo___release_zalgo_1.0.0.tgz"; + path = fetchurl { + name = "release_zalgo___release_zalgo_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz"; + sha1 = "09700b7e5074329739330e535c5a90fb67851730"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.4.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "repeating___repeating_2.0.1.tgz"; + path = fetchurl { + name = "repeating___repeating_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + } + { + name = "req_then___req_then_0.5.1.tgz"; + path = fetchurl { + name = "req_then___req_then_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/req-then/-/req-then-0.5.1.tgz"; + sha1 = "31c6e0b56f4ddd2acd6de0ba1bcea77b6079dfdf"; + }; + } + { + name = "request_promise_core___request_promise_core_1.1.2.tgz"; + path = fetchurl { + name = "request_promise_core___request_promise_core_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha1 = "339f6aababcafdb31c799ff158700336301d3346"; + }; + } + { + name = "request_promise_native___request_promise_native_1.0.7.tgz"; + path = fetchurl { + name = "request_promise_native___request_promise_native_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "request___request_2.88.0.tgz"; + path = fetchurl { + name = "request___request_2.88.0.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; + sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + }; + } + { + name = "require_at___require_at_1.0.6.tgz"; + path = fetchurl { + name = "require_at___require_at_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz"; + sha1 = "9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "requizzle___requizzle_0.2.3.tgz"; + path = fetchurl { + name = "requizzle___requizzle_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.3.tgz"; + sha1 = "4675c90aacafb2c036bd39ba2daa4a1cb777fded"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "retimer___retimer_2.0.0.tgz"; + path = fetchurl { + name = "retimer___retimer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz"; + sha1 = "e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca"; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + name = "right_align___right_align_0.1.3.tgz"; + path = fetchurl { + name = "right_align___right_align_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_2.4.5.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + }; + } + { + name = "rootpath___rootpath_0.1.2.tgz"; + path = fetchurl { + name = "rootpath___rootpath_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz"; + sha1 = "5b379a87dca906e9b91d690a599439bef267ea6b"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; + path = fetchurl { + name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz"; + sha1 = "356e44bc98f1f93ce45df14bcd7c01cda86e0afd"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sasl_anonymous___sasl_anonymous_0.1.0.tgz"; + path = fetchurl { + name = "sasl_anonymous___sasl_anonymous_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz"; + sha1 = "f544c7e824df2a40d9ad4733829572cc8d9ed5a5"; + }; + } + { + name = "sasl_plain___sasl_plain_0.1.0.tgz"; + path = fetchurl { + name = "sasl_plain___sasl_plain_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/sasl-plain/-/sasl-plain-0.1.0.tgz"; + sha1 = "cf145e7c02222b64d60c0806d9cd2ae5380426cc"; + }; + } + { + name = "sasl_scram_sha_1___sasl_scram_sha_1_1.2.1.tgz"; + path = fetchurl { + name = "sasl_scram_sha_1___sasl_scram_sha_1_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz"; + sha1 = "d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b"; + }; + } + { + name = "saslmechanisms___saslmechanisms_0.1.1.tgz"; + path = fetchurl { + name = "saslmechanisms___saslmechanisms_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/saslmechanisms/-/saslmechanisms-0.1.1.tgz"; + sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; + }; + } + { + name = "saslprep___saslprep_1.0.3.tgz"; + path = fetchurl { + name = "saslprep___saslprep_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz"; + sha1 = "4c02f946b56cf54297e347ba1093e7acac4cf226"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } + { + name = "scmp___scmp_2.1.0.tgz"; + path = fetchurl { + name = "scmp___scmp_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz"; + sha1 = "37b8e197c425bdeb570ab91cc356b311a11f9c9a"; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "setprototypeof___setprototypeof_1.2.0.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha1 = "66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + }; + } + { + name = "shortid___shortid_2.2.16.tgz"; + path = fetchurl { + name = "shortid___shortid_2.2.16.tgz"; + url = "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz"; + sha1 = "b742b8f0cb96406fd391c76bfc18a67a57fe5608"; + }; + } + { + name = "side_channel___side_channel_1.0.4.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "sort_array___sort_array_1.1.2.tgz"; + path = fetchurl { + name = "sort_array___sort_array_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-array/-/sort-array-1.1.2.tgz"; + sha1 = "b88986053c0170a7f9de63f18a49ec79c24c3e64"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.4.18.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.4.18.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz"; + sha1 = "0286a6de8be42641338594e97ccea75f0a2c585f"; + }; + } + { + name = "source_map_url___source_map_url_0.4.1.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; + }; + } + { + name = "source_map___source_map_0.1.43.tgz"; + path = fetchurl { + name = "source_map___source_map_0.1.43.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "sparse_bitfield___sparse_bitfield_3.0.3.tgz"; + path = fetchurl { + name = "sparse_bitfield___sparse_bitfield_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + }; + } + { + name = "spawn_wrap___spawn_wrap_1.4.3.tgz"; + path = fetchurl { + name = "spawn_wrap___spawn_wrap_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz"; + sha1 = "81b7670e170cca247d80bf5faf0cfb713bdcf848"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sqlstring___sqlstring_2.3.1.tgz"; + path = fetchurl { + name = "sqlstring___sqlstring_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz"; + sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; + }; + } + { + name = "ssh2___ssh2_1.1.0.tgz"; + path = fetchurl { + name = "ssh2___ssh2_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz"; + sha1 = "43dd24930e15e317687f519d6b40270d9cd00d00"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + path = fetchurl { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + } + { + name = "stream_connect___stream_connect_1.0.2.tgz"; + path = fetchurl { + name = "stream_connect___stream_connect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-connect/-/stream-connect-1.0.2.tgz"; + sha1 = "18bc81f2edb35b8b5d9a8009200a985314428a97"; + }; + } + { + name = "stream_handlebars___stream_handlebars_0.1.6.tgz"; + path = fetchurl { + name = "stream_handlebars___stream_handlebars_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/stream-handlebars/-/stream-handlebars-0.1.6.tgz"; + sha1 = "7305b5064203da171608c478acf642a149892a2f"; + }; + } + { + name = "stream_via___stream_via_1.0.4.tgz"; + path = fetchurl { + name = "stream_via___stream_via_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/stream-via/-/stream-via-1.0.4.tgz"; + sha1 = "8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c"; + }; + } + { + name = "stream_via___stream_via_0.1.1.tgz"; + path = fetchurl { + name = "stream_via___stream_via_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-via/-/stream-via-0.1.1.tgz"; + sha1 = "0cee5df9c959fb1d3f4eda4819f289d5f9205afc"; + }; + } + { + name = "string_tools___string_tools_0.1.8.tgz"; + path = fetchurl { + name = "string_tools___string_tools_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/string-tools/-/string-tools-0.1.8.tgz"; + sha1 = "70884e86a26ee5103a078bef67033d558d36e337"; + }; + } + { + name = "string_tools___string_tools_1.0.0.tgz"; + path = fetchurl { + name = "string_tools___string_tools_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/string-tools/-/string-tools-1.0.0.tgz"; + sha1 = "c69a9d5788858997da66f1d923ba7113ea466b5a"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + path = fetchurl { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + }; + } + { + name = "syslog___syslog_0.1.1.tgz"; + path = fetchurl { + name = "syslog___syslog_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/syslog/-/syslog-0.1.1.tgz"; + sha1 = "675d8210898e785fd14c831de2d9a6aec0a35cbd"; + }; + } + { + name = "table_layout___table_layout_0.3.0.tgz"; + path = fetchurl { + name = "table_layout___table_layout_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/table-layout/-/table-layout-0.3.0.tgz"; + sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a"; + }; + } + { + name = "taffydb___taffydb_2.6.2.tgz"; + path = fetchurl { + name = "taffydb___taffydb_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz"; + sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + }; + } + { + name = "tar_stream___tar_stream_2.2.0.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + }; + } + { + name = "temp_path___temp_path_1.0.0.tgz"; + path = fetchurl { + name = "temp_path___temp_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/temp-path/-/temp-path-1.0.0.tgz"; + sha1 = "24b1543973ab442896d9ad367dd9cbdbfafe918b"; + }; + } + { + name = "test_exclude___test_exclude_5.2.3.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz"; + sha1 = "c3d3e1e311eb7ee405e092dac10aefd09091eac0"; + }; + } + { + name = "test_value___test_value_1.1.0.tgz"; + path = fetchurl { + name = "test_value___test_value_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/test-value/-/test-value-1.1.0.tgz"; + sha1 = "a09136f72ec043d27c893707c2b159bfad7de93f"; + }; + } + { + name = "test_value___test_value_2.1.0.tgz"; + path = fetchurl { + name = "test_value___test_value_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/test-value/-/test-value-2.1.0.tgz"; + sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291"; + }; + } + { + name = "then_fs___then_fs_2.0.0.tgz"; + path = fetchurl { + name = "then_fs___then_fs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz"; + sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; + }; + } + { + name = "thirty_two___thirty_two_1.0.2.tgz"; + path = fetchurl { + name = "thirty_two___thirty_two_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz"; + sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; + }; + } + { + name = "through2___through2_3.0.2.tgz"; + path = fetchurl { + name = "through2___through2_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz"; + sha1 = "99f88931cfc761ec7678b41d5d7336b5b6a07bf4"; + }; + } + { + name = "thunky___thunky_1.1.0.tgz"; + path = fetchurl { + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; + }; + } + { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_mongodb_core___to_mongodb_core_2.0.0.tgz"; + path = fetchurl { + name = "to_mongodb_core___to_mongodb_core_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz"; + sha1 = "3596ec7613ac9ad3b98a89dcb9aefba569cd27eb"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; + }; + } + { + name = "tough_cookie___tough_cookie_2.4.3.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + }; + } + { + name = "tr46___tr46_2.1.0.tgz"; + path = fetchurl { + name = "tr46___tr46_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; + sha1 = "fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"; + }; + } + { + name = "trim_right___trim_right_1.0.1.tgz"; + path = fetchurl { + name = "trim_right___trim_right_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + } + { + name = "tsscmp___tsscmp_1.0.6.tgz"; + path = fetchurl { + name = "tsscmp___tsscmp_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz"; + sha1 = "85b99583ac3589ec4bfef825b5000aa911d605eb"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tv4___tv4_1.3.0.tgz"; + path = fetchurl { + name = "tv4___tv4_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz"; + sha1 = "d020c846fadd50c855abb25ebaecc68fc10f7963"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "twilio___twilio_3.66.0.tgz"; + path = fetchurl { + name = "twilio___twilio_3.66.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.0.tgz"; + sha1 = "8df54865b16b3b0578826cf4f342542daa1227c4"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typical___typical_2.6.1.tgz"; + path = fetchurl { + name = "typical___typical_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz"; + sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; + }; + } + { + name = "uglify_js___uglify_js_2.8.29.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_2.8.29.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + } + { + name = "uglify_js___uglify_js_3.14.1.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz"; + sha1 = "e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06"; + }; + } + { + name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; + path = fetchurl { + name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + } + { + name = "uid_safe___uid_safe_2.1.5.tgz"; + path = fetchurl { + name = "uid_safe___uid_safe_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz"; + sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"; + }; + } + { + name = "uid2___uid2_0.0.3.tgz"; + path = fetchurl { + name = "uid2___uid2_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }; + } + { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + path = fetchurl { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + } + { + name = "underscore.string___underscore.string_3.3.5.tgz"; + path = fetchurl { + name = "underscore.string___underscore.string_3.3.5.tgz"; + url = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz"; + sha1 = "fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"; + }; + } + { + name = "underscore___underscore_1.4.4.tgz"; + path = fetchurl { + name = "underscore___underscore_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + } + { + name = "underscore___underscore_1.8.3.tgz"; + path = fetchurl { + name = "underscore___underscore_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "upper_case___upper_case_1.1.3.tgz"; + path = fetchurl { + name = "upper_case___upper_case_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "uri_parser___uri_parser_1.0.1.tgz"; + path = fetchurl { + name = "uri_parser___uri_parser_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz"; + sha1 = "3307ebb50f279c11198ad09214bdaf24e29735b2"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "url_join___url_join_4.0.1.tgz"; + path = fetchurl { + name = "url_join___url_join_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz"; + sha1 = "b642e21a2646808ffa178c4c5fda39844e12cde7"; + }; + } + { + name = "url_parse___url_parse_1.5.3.tgz"; + path = fetchurl { + name = "url_parse___url_parse_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz"; + sha1 = "71c1303d38fb6639ade183c2992c8cc0686df862"; + }; + } + { + name = "url_template___url_template_2.0.8.tgz"; + path = fetchurl { + name = "url_template___url_template_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + } + { + name = "urlsafe_base64___urlsafe_base64_1.0.0.tgz"; + path = fetchurl { + name = "urlsafe_base64___urlsafe_base64_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz"; + sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; + }; + } + { + name = "usage_stats___usage_stats_0.8.6.tgz"; + path = fetchurl { + name = "usage_stats___usage_stats_0.8.6.tgz"; + url = "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.8.6.tgz"; + sha1 = "ec92559f648845c2021cbf5b4adea17af7513830"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "user_home___user_home_1.1.1.tgz"; + path = fetchurl { + name = "user_home___user_home_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + } + { + name = "utf8___utf8_2.1.2.tgz"; + path = fetchurl { + name = "utf8___utf8_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz"; + sha1 = "1fa0d9270e9be850d9b05027f63519bf46457d96"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "utils_igor___utils_igor_1.0.4.tgz"; + path = fetchurl { + name = "utils_igor___utils_igor_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utils-igor/-/utils-igor-1.0.4.tgz"; + sha1 = "59197669fd1e51a05ddbd3febb4789498cc42f03"; + }; + } + { + name = "utils_igor___utils_igor_2.0.5.tgz"; + path = fetchurl { + name = "utils_igor___utils_igor_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/utils-igor/-/utils-igor-2.0.5.tgz"; + sha1 = "51fae3fd0a754be33f7f4a05a6a4905f229e3d80"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; + }; + } + { + name = "v8flags___v8flags_2.1.1.tgz"; + path = fetchurl { + name = "v8flags___v8flags_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz"; + sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; + }; + } + { + name = "v8flags___v8flags_3.2.0.tgz"; + path = fetchurl { + name = "v8flags___v8flags_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz"; + sha1 = "b243e3b4dfd731fa774e7492128109a0fe66d656"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "vasync___vasync_2.2.0.tgz"; + path = fetchurl { + name = "vasync___vasync_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/vasync/-/vasync-2.2.0.tgz"; + sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + }; + } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } + { + name = "walk_back___walk_back_2.0.1.tgz"; + path = fetchurl { + name = "walk_back___walk_back_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/walk-back/-/walk-back-2.0.1.tgz"; + sha1 = "554e2a9d874fac47a8cb006bf44c2f0c4998a0a4"; + }; + } + { + name = "weak_daemon___weak_daemon_1.0.3.tgz"; + path = fetchurl { + name = "weak_daemon___weak_daemon_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/weak-daemon/-/weak-daemon-1.0.3.tgz"; + sha1 = "d922b7c0dfb8f6bf027c463ea875584d2b085f19"; + }; + } + { + name = "weak_map___weak_map_1.0.5.tgz"; + path = fetchurl { + name = "weak_map___weak_map_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + }; + } + { + name = "web_push___web_push_3.4.5.tgz"; + path = fetchurl { + name = "web_push___web_push_3.4.5.tgz"; + url = "https://registry.yarnpkg.com/web-push/-/web-push-3.4.5.tgz"; + sha1 = "f94074ff150538872c7183e4d8881c8305920cf1"; + }; + } + { + name = "webdav___webdav_4.6.0.tgz"; + path = fetchurl { + name = "webdav___webdav_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/webdav/-/webdav-4.6.0.tgz"; + sha1 = "b12d3631562ed4a7d665dd1757349682dfc8f441"; + }; + } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + }; + } + { + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wildleek___wildleek_2.0.0.tgz"; + path = fetchurl { + name = "wildleek___wildleek_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildleek/-/wildleek-2.0.0.tgz"; + sha1 = "85eb93c9c1822da963bc3c3c8d09ae9d12b48a47"; + }; + } + { + name = "window_size___window_size_0.1.0.tgz"; + path = fetchurl { + name = "window_size___window_size_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wordwrap___wordwrap_0.0.2.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + } + { + name = "wordwrap___wordwrap_1.0.0.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + } + { + name = "wordwrap___wordwrap_0.0.3.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + } + { + name = "wordwrapjs___wordwrapjs_1.2.1.tgz"; + path = fetchurl { + name = "wordwrapjs___wordwrapjs_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-1.2.1.tgz"; + sha1 = "754a5ea0664cfbff50540dc32d67bda3289fc34b"; + }; + } + { + name = "wordwrapjs___wordwrapjs_2.0.0.tgz"; + path = fetchurl { + name = "wordwrapjs___wordwrapjs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-2.0.0.tgz"; + sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha1 = "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"; + }; + } + { + name = "ws___ws_5.2.3.tgz"; + path = fetchurl { + name = "ws___ws_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz"; + sha1 = "05541053414921bc29c63bee14b8b0dd50b07b3d"; + }; + } + { + name = "ws___ws_7.5.3.tgz"; + path = fetchurl { + name = "ws___ws_7.5.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz"; + sha1 = "160835b63c7d97bfab418fc1b8a9fced2ac01a74"; + }; + } + { + name = "xml_crypto___xml_crypto_2.1.2.tgz"; + path = fetchurl { + name = "xml_crypto___xml_crypto_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz"; + sha1 = "501506d42e466f6cd908c5a03182217231b4e4b8"; + }; + } + { + name = "xml_encryption___xml_encryption_1.2.4.tgz"; + path = fetchurl { + name = "xml_encryption___xml_encryption_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz"; + sha1 = "767d13f9ff2f979ff5657b93bd72aa729d34b66c"; + }; + } + { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + }; + } + { + name = "xml2js___xml2js_0.4.23.tgz"; + path = fetchurl { + name = "xml2js___xml2js_0.4.23.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz"; + sha1 = "a0c69516752421eb2ac758ee4d4ccf58843eac66"; + }; + } + { + name = "xml___xml_0.0.12.tgz"; + path = fetchurl { + name = "xml___xml_0.0.12.tgz"; + url = "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz"; + sha1 = "f08b347109912be00285785f46f15ad8e50a5f67"; + }; + } + { + name = "xmlbuilder___xmlbuilder_13.0.2.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_13.0.2.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz"; + sha1 = "02ae33614b6a047d1c32b5389c1fdacb2bce47a7"; + }; + } + { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + }; + } + { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } + { + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3"; + }; + } + { + name = "xmlchars___xmlchars_2.2.0.tgz"; + path = fetchurl { + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + }; + } + { + name = "xmldom___xmldom_0.1.31.tgz"; + path = fetchurl { + name = "xmldom___xmldom_0.1.31.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz"; + sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"; + }; + } + { + name = "xmldom___xmldom_0.5.0.tgz"; + path = fetchurl { + name = "xmldom___xmldom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; + sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; + }; + } + { + name = "xmldom___xmldom_0.6.0.tgz"; + path = fetchurl { + name = "xmldom___xmldom_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; + sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; + }; + } + { + name = "xpath___xpath_0.0.32.tgz"; + path = fetchurl { + name = "xpath___xpath_0.0.32.tgz"; + url = "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz"; + sha1 = "1b73d3351af736e17ec078d6da4b8175405c48af"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "xtraverse___xtraverse_0.1.0.tgz"; + path = fetchurl { + name = "xtraverse___xtraverse_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz"; + sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732"; + }; + } + { + name = "y18n___y18n_4.0.3.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yargs___yargs_3.10.0.tgz"; + path = fetchurl { + name = "yargs___yargs_3.10.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + { + name = "yubikeyotp___yubikeyotp_0.2.0.tgz"; + path = fetchurl { + name = "yubikeyotp___yubikeyotp_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/yubikeyotp/-/yubikeyotp-0.2.0.tgz"; + sha1 = "8bdc51122cd00ed8c919b9c9caeba851b272aa7d"; + }; + } + { + name = "zip_stream___zip_stream_3.0.1.tgz"; + path = fetchurl { + name = "zip_stream___zip_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz"; + sha1 = "cb8db9d324a76c09f9b76b31a12a48638b0b9708"; + }; + } + { + name = "zip_stream___zip_stream_4.1.0.tgz"; + path = fetchurl { + name = "zip_stream___zip_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz"; + sha1 = "51dd326571544e36aa3f756430b313576dc8fc79"; + }; + } + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e05755cea5..c4c07451b38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25656,6 +25656,8 @@ in merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + meshcentral = callPackage ../tools/admin/meshcentral { }; + meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { }; From ce6a51bd14f3585b5ad63b672019bc8d6cf47ae9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jul 2021 10:58:33 +0200 Subject: [PATCH 0855/1522] signal-desktop: 5.10.0 -> 5.11.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a46649acb18..dbd2c7b3ec7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.10.0"; # Please backport all updates to the stable channel. + version = "5.11.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3"; + sha256 = "17r7apmsz5bvcfnf81m6jjsj17a4h7bhgy1vllwyyvaa585nspmp"; }; nativeBuildInputs = [ From a175be0e7e06c2404d25777e9e8c8fa6ebee376d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 21 Jul 2021 18:03:57 +0200 Subject: [PATCH 0856/1522] nixos/meshcentral: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/admin/meshcentral.nix | 53 ++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/modules/services/admin/meshcentral.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4d1700ed99a..899b05cf190 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -236,6 +236,7 @@ ./security/doas.nix ./security/systemd-confinement.nix ./security/tpm2.nix + ./services/admin/meshcentral.nix ./services/admin/oxidized.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix diff --git a/nixos/modules/services/admin/meshcentral.nix b/nixos/modules/services/admin/meshcentral.nix new file mode 100644 index 00000000000..ae7b6edda7d --- /dev/null +++ b/nixos/modules/services/admin/meshcentral.nix @@ -0,0 +1,53 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.meshcentral; + configFormat = pkgs.formats.json {}; + configFile = configFormat.generate "meshcentral-config.json" cfg.settings; +in with lib; { + options.services.meshcentral = with types; { + enable = mkEnableOption "MeshCentral computer management server"; + package = mkOption { + description = "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality."; + type = types.package; + default = pkgs.meshcentral; + defaultText = "pkgs.meshcentral"; + }; + settings = mkOption { + description = '' + Settings for MeshCentral. Refer to upstream documentation for details: + + + JSON Schema definition + simple sample configuration + complex sample configuration + Old homepage) with documentation link + + ''; + type = types.submodule { + freeformType = configFormat.type; + }; + example = { + settings = { + WANonly = true; + Cert = "meshcentral.example.com"; + TlsOffload = "10.0.0.2,fd42::2"; + Port = 4430; + }; + domains."".certUrl = "https://meshcentral.example.com/"; + }; + }; + }; + config = mkIf cfg.enable { + services.meshcentral.settings.settings.autoBackup.backupPath = lib.mkDefault "/var/lib/meshcentral/backups"; + systemd.services.meshcentral = { + wantedBy = ["multi-user.target"]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/meshcentral --datapath /var/lib/meshcentral --configfile ${configFile}"; + DynamicUser = true; + StateDirectory = "meshcentral"; + CacheDirectory = "meshcentral"; + }; + }; + }; + meta.maintainers = [ maintainers.lheckemann ]; +} From a476da069049bbdd1630ba1bc66e0ba0512cff15 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 29 Jul 2021 11:36:17 +0200 Subject: [PATCH 0857/1522] release notes: add meshcentral --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 11 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 9dd98a5262f..446f2486df4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -125,6 +125,15 @@ services.prometheus.exporters.buildkite-agent. + + + MeshCentral, + a remote administration service (TeamViewer but + self-hosted and with more features) is now available + with a package and a module: + services.meshcentral.enable + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 12e1a938433..3486142385a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -39,6 +39,8 @@ pt-services.clipcat.enable). - [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable). +- [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable) + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 From 124bbac82780569c391964601fc3ce4060e71be3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 29 Jul 2021 11:50:27 +0200 Subject: [PATCH 0858/1522] squashfsTools: make Darwin patch apply again I pretty much manually applied all the changes in the patch to the new codebase and then generated a new diff because the pull request mentioned at the top of the patch was not accepted and will probably never be updated again. --- pkgs/tools/filesystems/squashfs/darwin.patch | 56 ++++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch index eb2dc24ec1a..5f2e0b07299 100644 --- a/pkgs/tools/filesystems/squashfs/darwin.patch +++ b/pkgs/tools/filesystems/squashfs/darwin.patch @@ -8,9 +8,9 @@ diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c index 4b06ccb..3cad2ab 100644 --- a/squashfs-tools/action.c +++ b/squashfs-tools/action.c -@@ -38,6 +38,10 @@ - #include +@@ -39,6 +39,10 @@ #include + #include +#ifndef FNM_EXTMATCH /* glibc extension */ + #define FNM_EXTMATCH 0 @@ -19,7 +19,7 @@ index 4b06ccb..3cad2ab 100644 #include "squashfs_fs.h" #include "mksquashfs.h" #include "action.h" -@@ -2284,9 +2288,12 @@ static char *get_start(char *s, int n) +@@ -2414,9 +2418,12 @@ static char *get_start(char *s, int n) static int subpathname_fn(struct atom *atom, struct action_data *action_data) { @@ -27,7 +27,7 @@ index 4b06ccb..3cad2ab 100644 + char *path = strdup(action_data->subpath); + int is_match = fnmatch(atom->argv[0], get_start(path, count_components(atom->argv[0])), - FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == 0; + FNM_PATHNAME|FNM_EXTMATCH) == 0; + free(path); + return is_match; } @@ -116,8 +116,8 @@ index a45b77f..3607448 100644 +#endif #ifndef linux - #define __BYTE_ORDER BYTE_ORDER -@@ -4348,6 +4356,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, + #include +@@ -5022,6 +5030,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); @@ -125,7 +125,7 @@ index a45b77f..3607448 100644 if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) BAD_ERROR("Failed to set signal mask in intialise_threads\n"); -@@ -5195,6 +5204,35 @@ int get_physical_memory() +@@ -5760,6 +5769,35 @@ static int get_physical_memory() long long page_size = sysconf(_SC_PAGESIZE); int phys_mem; @@ -161,7 +161,7 @@ index a45b77f..3607448 100644 if(num_pages == -1 || page_size == -1) { struct sysinfo sys; int res = sysinfo(&sys); -@@ -5207,6 +5245,7 @@ int get_physical_memory() +@@ -5772,6 +5810,7 @@ static int get_physical_memory() } phys_mem = num_pages * page_size >> 20; @@ -173,9 +173,9 @@ diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c index 4debedf..3257c30 100644 --- a/squashfs-tools/read_xattrs.c +++ b/squashfs-tools/read_xattrs.c -@@ -39,13 +39,13 @@ - #include - #endif +@@ -31,13 +31,13 @@ + #include + #include +#include + @@ -206,7 +206,7 @@ index 727f1d5..c1a6183 100644 #include #include #include -@@ -1080,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i) +@@ -1175,7 +1179,7 @@ int create_inode(char *pathname, struct inode *i) break; case SQUASHFS_SYMLINK_TYPE: case SQUASHFS_LSYMLINK_TYPE: { @@ -215,7 +215,7 @@ index 727f1d5..c1a6183 100644 { i->time, 0 }, { i->time, 0 } }; -@@ -1099,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i) +@@ -1194,8 +1198,7 @@ int create_inode(char *pathname, struct inode *i) goto failed; } @@ -223,16 +223,16 @@ index 727f1d5..c1a6183 100644 - AT_SYMLINK_NOFOLLOW); + res = lutimes(pathname, times); if(res == -1) { - EXIT_UNSQUASH_STRICT("create_inode: failed to set time on " - "%s, because %s\n", pathname, -@@ -2235,6 +2238,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size) - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) - EXIT_UNSQUASH("Failed to set signal mask in initialise_threads" - "\n"); + EXIT_UNSQUASH_STRICT("create_inode: failed to" + " set time on %s, because %s\n", +@@ -2683,6 +2686,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) + EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n"); + diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h index 934618b..0e680ab 100644 --- a/squashfs-tools/unsquashfs.h @@ -245,14 +245,14 @@ index 934618b..0e680ab 100644 + #define FNM_EXTMATCH 0 +#endif + - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER - #define __BIG_ENDIAN BIG_ENDIAN + #include "endian_compat.h" + #include "squashfs_fs.h" + #include "unsquashfs_error.h" diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c index c8e2b9b..7d4f7af 100644 --- a/squashfs-tools/unsquashfs_info.c +++ b/squashfs-tools/unsquashfs_info.c -@@ -97,31 +97,22 @@ void dump_state() +@@ -96,31 +96,22 @@ void dump_state() void *info_thrd(void *arg) { sigset_t sigmask; @@ -289,7 +289,7 @@ index c8e2b9b..7d4f7af 100644 "because %s\n", strerror(errno)); } } -@@ -133,8 +124,12 @@ void *info_thrd(void *arg) +@@ -132,8 +123,12 @@ void *info_thrd(void *arg) /* set one second interval period, if ^\ received within then, dump queue and cache status */ waiting = 1; From 869f270723e2c3bd4fe304e11f99f0256b4effd0 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 29 Jul 2021 11:44:59 +0200 Subject: [PATCH 0859/1522] fuse-overlayfs: 1.6.0 -> 1.7.0 Signed-off-by: Sascha Grunert --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index a3cb67c1bd3..56c96ff6f16 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YNR9Cj2StbmA2MjoQEWgJCMoHXQ1wIYikXGUEkmJEIg="; + sha256 = "sha256-eJTyiepQpCptZUnlmWTYejCyzf3QHCzqrn67UjW9mU4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From f7fb107bf22555b2963cf3fcf8c8a40e6611228a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Jul 2021 12:47:26 +0200 Subject: [PATCH 0860/1522] prometheus-postgres-exporter: 0.9.0 -> 0.10.0 ChangeLog: https://github.com/prometheus-community/postgres_exporter/releases/tag/v0.10.0 --- pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 9b3cda6e7ae..4db534add8c 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "wrouesnel"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-Kv+sjqhlmH36L4YvDuGYODR/eTHA2TKQ6IUCXAiItyo="; + sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw="; }; - vendorSha256 = "sha256-yMcoUl9NsiiZQyEHlLu79DzIyl6BbhLZ/xNFavaGrEs="; + vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY="; doCheck = true; From 77429716f281e22f3d3b155a403dd8804314c133 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 29 Jul 2021 14:07:43 +0200 Subject: [PATCH 0861/1522] ipfs-cluster: 0.13.1 -> 0.14.0 (#131942) --- .../applications/networking/ipfs-cluster/default.nix | 12 ++++-------- pkgs/applications/networking/ipfs-cluster/test.patch | 12 ------------ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/networking/ipfs-cluster/test.patch diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 67d45c44868..9a63f90b393 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,19 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.13.1"; + version = "0.14.0"; - vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh"; - - patches = [ - ./test.patch - ]; + vendorSha256 = "sha256-I8UJxqzbcOE6pHsKkktrEXVHurxwe0D20GZZmASdWH4="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8"; + sha256 = "sha256-lB0sYsbZfUJgQVNEFLoXNFszWYxlXNEQbRQWA7fRT2A="; }; meta = with lib; { @@ -22,6 +18,6 @@ buildGoModule rec { homepage = "https://cluster.ipfs.io/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ jglukasik ]; + maintainers = with maintainers; [ Luflosi jglukasik ]; }; } diff --git a/pkgs/applications/networking/ipfs-cluster/test.patch b/pkgs/applications/networking/ipfs-cluster/test.patch deleted file mode 100644 index 65f10fec8ef..00000000000 --- a/pkgs/applications/networking/ipfs-cluster/test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/peer_manager_test.go b/peer_manager_test.go -index 521e754..cf0d777 100644 ---- a/peer_manager_test.go -+++ b/peer_manager_test.go -@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr { - } - - func TestClustersPeerAdd(t *testing.T) { -+ t.Skip("test is disabld by nixos") - ctx := context.Background() - clusters, mocks, boot := peerManagerClusters(t) - defer shutdownClusters(t, clusters, mocks) From 476329cf00ca757a60b29d2b43e6e47d17922327 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 29 Jul 2021 13:58:55 +0200 Subject: [PATCH 0862/1522] python3Packages.sphinxext-opengraph: init at 0.4.2 --- .../sphinxext-opengraph/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxext-opengraph/default.nix diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix new file mode 100644 index 00000000000..08a87a2f7c0 --- /dev/null +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxext-opengraph"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "wpilibsuite"; + repo = "sphinxext-opengraph"; + rev = "v${version}"; + sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "sphinxext.opengraph" ]; + + meta = with lib; { + description = "Sphinx extension to generate unique OpenGraph metadata"; + homepage = "https://github.com/wpilibsuite/sphinxext-opengraph"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 067eaf16749..cdc7a91e8e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8286,6 +8286,8 @@ in { sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { }; + spidev = callPackage ../development/python-modules/spidev { }; splinter = callPackage ../development/python-modules/splinter { }; From 36ca09dbe9a52084acb5d743a39d18e261d355c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:11:51 +0200 Subject: [PATCH 0863/1522] nttcp: cleanup --- pkgs/tools/networking/nttcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix index 8979c5fd2ac..c5a4c4c1cd1 100644 --- a/pkgs/tools/networking/nttcp/default.nix +++ b/pkgs/tools/networking/nttcp/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nttcp"; version = "1.47"; src = fetchurl { - url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; + url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50"; }; From 44fbafbd7e9bc2d5043b687e86e50eb0dcc5037c Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Thu, 29 Jul 2021 17:42:16 +0530 Subject: [PATCH 0864/1522] maintainers: add nukaduka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8708bf79f54..e45ccd95212 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7832,6 +7832,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + nukaduka = { + email = "ksgokte@gmail.com"; + github = "NukaDuka"; + githubId = 22592293; + name = "Kartik Gokte"; + }; nullx76 = { email = "nix@xirion.net"; github = "NULLx76"; From 38357d7306de6e8178d374a161d1865d4fde6496 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 29 Jul 2021 14:12:54 +0200 Subject: [PATCH 0865/1522] perlPackages.LinkEmbedder: 1.18 -> 1.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff35e523146..92cd7818efc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11410,10 +11410,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.18"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz"; - sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.20.tar.gz"; + sha256 = "19fwr3y8dd1bya2z86x3904s4dxfx15h7b777529j8n74m78ppmi"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; From 0876c079f7ec1d2b8aaf86ea8c97198241a1aac0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 14:13:51 +0200 Subject: [PATCH 0866/1522] dune-release: remove now unnecessary test fixes We've upstreamed those git fixes. --- pkgs/development/tools/ocaml/dune-release/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 0eb56d3f539..e3c8728cbfd 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -32,14 +32,6 @@ in buildDunePackage rec { # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - # fix problems with git invocations in tests - for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do - # set bogus user info in git so git commit doesn't fail - sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f" - # surpress hint to set default branch name - substituteInPlace "$f" --replace "git init" "git init -b main" - done - # ignore weird yes error message sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; From 6f460f1127f73be60c159aa38534609e512dd74e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 14:14:15 +0200 Subject: [PATCH 0867/1522] dune-release: apply yes broken pipe fix in additional places Seems the use of yes increased and we need to fix it in additional places. Alternatively we could ofcourse find out why SIGHUP is trapped somewhere?! --- pkgs/development/tools/ocaml/dune-release/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index e3c8728cbfd..4e0f8d80f78 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -33,7 +33,10 @@ in buildDunePackage rec { sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml # ignore weird yes error message - sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t + sed -i 's/yes |/yes 2>\/dev\/null |/' \ + tests/bin/no_doc/run.t \ + tests/bin/draft/run.t \ + tests/bin/url-file/run.t ''; preCheck = '' From 9f4fe8201b986b0d64c81ed9aa3cacbd0b8d252e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:14:35 +0200 Subject: [PATCH 0868/1522] unison: format, cleanup --- .../networking/sync/unison/default.nix | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 8a8fc073355..b106deb074e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,12 +1,22 @@ -{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem -, enableX11 ? true}: - -let inherit (ocamlPackages) ocaml lablgtk; in - -stdenv.mkDerivation (rec { +{ lib +, stdenv +, fetchFromGitHub +, ocamlPackages +, fontschumachermisc +, xset +, makeWrapper +, ncurses +, gnugrep +, fetchpatch +, copyDesktopItems +, makeDesktopItem +, enableX11 ? true +}: +stdenv.mkDerivation rec { pname = "unison"; version = "2.51.3"; + src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; @@ -14,8 +24,9 @@ stdenv.mkDerivation (rec { sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; - nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems); - buildInputs = [ ocaml ncurses ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional enableX11 copyDesktopItems; + buildInputs = [ ocamlPackages.ocaml ncurses ]; patches = [ # Patch to fix build with ocaml 4.12. Remove in 2.51.4 @@ -27,20 +38,22 @@ stdenv.mkDerivation (rec { }) ]; - preBuild = (lib.strings.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml - '') + '' - echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile + preBuild = lib.optionalString enableX11 '' + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + '' + '' + echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" "UISTYLE=${if enableX11 then "gtk2" else "text"}" - ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; + ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; - preInstall = "mkdir -p $out/bin"; + preInstall = '' + mkdir -p $out/bin + ''; - postInstall = lib.strings.optionalString enableX11 '' + postInstall = lib.optionalString enableX11 '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" @@ -49,9 +62,9 @@ stdenv.mkDerivation (rec { install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; - dontStrip = !ocaml.nativeCompilers; + dontStrip = !ocamlPackages.ocaml.nativeCompilers; - desktopItems = lib.lists.optional enableX11 (makeDesktopItem { + desktopItems = lib.optional enableX11 (makeDesktopItem { name = pname; desktopName = "Unison"; comment = "Bidirectional file synchronizer"; @@ -59,19 +72,18 @@ stdenv.mkDerivation (rec { exec = "unison"; icon = "unison"; categories = "Utility;FileTools;GTK;"; - extraDesktopEntries={ - StartupWMClass="Unison"; - StartupNotify="true"; - X-MultipleArgs="false"; + extraDesktopEntries = { + StartupWMClass = "Unison"; + StartupNotify = "true"; + X-MultipleArgs = "false"; }; }); - meta = { + meta = with lib; { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; - -}) +} From 14af34c2f416d2900e96aff2985b70a8dd8212e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:15:12 +0200 Subject: [PATCH 0869/1522] treewide: remove lib.{lists,string}.optional* --- .../libraries/khronos-ocl-icd-loader/default.nix | 2 +- .../libraries/libayatana-appindicator/default.nix | 8 ++++---- .../libraries/libayatana-indicator/default.nix | 4 ++-- pkgs/development/python-modules/bootstrapped-pip/2.nix | 2 +- .../python-modules/bootstrapped-pip/default.nix | 2 +- pkgs/development/python-modules/setuptools/44.0.nix | 2 +- pkgs/development/python-modules/setuptools/default.nix | 2 +- pkgs/tools/backup/tsm-client/default.nix | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index f4688f34982..b0f1f0eae25 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; - patches = lib.lists.optional withTracing ./tracing.patch; + patches = lib.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 53b0dca0912..df1c6683fbc 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ]; buildInputs = - lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 - ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3; + lib.optional (gtkVersion == "2") libayatana-indicator-gtk2 + ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3; propagatedBuildInputs = - lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] - ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; + lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] + ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index c3c271c1719..f4871538eff 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ayatana-ido ] - ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ] - ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ]; + ++ lib.optionals (gtkVersion == "2") [ gtk2 ] + ++ lib.optionals (gtkVersion == "3") [ gtk3 ]; configureFlags = [ "--with-gtk=${gtkVersion}" ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix index 2d06b44b507..f89d39ae2b7 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/2.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/2.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 '' + '' # Give folders a known name diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 81aca3f3c57..84016043929 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 '' + '' # Give folders a known name diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index 7c7d6b01e40..40265dc639b 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -61,7 +61,7 @@ in buildPythonPackage rec { (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) ]; - preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2c8f5d898dc..62e7fb686c4 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -62,7 +62,7 @@ in buildPythonPackage rec { (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) ]; - preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index c432d47becd..e298751faca 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -152,7 +152,7 @@ buildEnv { ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys - ${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"} + ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"} for bin in $out/bin/* do target=$(readlink "$bin") From e1e51730dd3b3599233c9a5816b4d57e748d736d Mon Sep 17 00:00:00 2001 From: Nathan Ruiz Date: Thu, 29 Jul 2021 11:13:44 +0000 Subject: [PATCH 0870/1522] pythonPackages.environmental-override: init at 0.1.2 --- maintainers/maintainer-list.nix | 6 +++++ .../environmental-override/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/environmental-override/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8708bf79f54..4c2469d7211 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7477,6 +7477,12 @@ email = "natedevv@gmail.com"; name = "Nathan Moore"; }; + nathanruiz = { + email = "nathanruiz@protonmail.com"; + github = "nathanruiz"; + githubId = 18604892; + name = "Nathan Ruiz"; + }; nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; diff --git a/pkgs/development/python-modules/environmental-override/default.nix b/pkgs/development/python-modules/environmental-override/default.nix new file mode 100644 index 00000000000..23540115313 --- /dev/null +++ b/pkgs/development/python-modules/environmental-override/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "environmental-override"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vhd37i6f8xh6kd61yxc2ynzgcln7v2p7fyzjmhbkdnws6gwfs6s"; + }; + + # No tests have been written for this library. + doCheck = false; + + pythonImportsCheck = [ "environmental_override" ]; + + meta = { + description = "Easily configure apps using simple environmental overrides"; + homepage = "https://github.com/coddingtonbear/environmental-override"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nathanruiz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 067eaf16749..db8de608819 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2326,6 +2326,8 @@ in { env-canada = callPackage ../development/python-modules/env-canada { }; + environmental-override = callPackage ../development/python-modules/environmental-override {}; + envisage = callPackage ../development/python-modules/envisage { }; envs = callPackage ../development/python-modules/envs { }; From a2758d5a99c3ed85763481476bac4f39e5c68ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 14:19:26 +0200 Subject: [PATCH 0871/1522] influxdb-exporter: format, cleanup --- .../prometheus/influxdb-exporter.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 65ec5ff69b4..35c67af92b1 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -14,17 +14,15 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = let - goPackagePath = "github.com/prometheus/influxdb_exporter"; - in '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=unknown - -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs - -X github.com/prometheus/common/version.BuildDate=unknown - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; }; @@ -33,6 +31,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/influxdb_exporter"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; - platforms = platforms.unix; }; } From a4e46b26e9204455802abee20ce0f3d56c1c9d69 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 22 Jul 2021 21:39:32 +0200 Subject: [PATCH 0872/1522] =?UTF-8?q?scheherazade-new:=203.100=20=E2=86=92?= =?UTF-8?q?=203.200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/scheherazade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 848daa899ed..3448226c58d 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchzip, version ? "3.100" }: +{ lib, fetchzip, version ? "3.200" }: let new = lib.versionAtLeast version "3.000"; sha256 = { "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7"; + "3.200" = "0qvmpsn6ja3g2hlvq0vb9pjsyk6ibna7s3w3n6q7lnhk0rhjg8bv"; }."${version}"; in fetchzip rec { From 72934892883ee5a37643f8ea02838fdd61fe4153 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 29 Jul 2021 14:55:57 +0200 Subject: [PATCH 0873/1522] nixos/systemd: provision a systemd-coredump user systemd-coredump tries to drop privileges to a systemd-coredump user if present (and falls back to the root user if it's not available). Create that user, and recycle uid 151 for it. We don't really care about the gid. Fixes https://github.com/NixOS/nixpkgs/issues/120803. --- nixos/modules/misc/ids.nix | 1 + nixos/modules/system/boot/systemd.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 858c7ee53db..a7a31ba8576 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -187,6 +187,7 @@ in #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; + systemd-coredump = 151; systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 58064e5de86..b8dab27a393 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1053,6 +1053,7 @@ in services.dbus.enable = true; + users.users.systemd-coredump.uid = config.ids.uids.systemd-coredump; users.users.systemd-network.uid = config.ids.uids.systemd-network; users.groups.systemd-network.gid = config.ids.gids.systemd-network; users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; From f6b3d12b4a5f9d43666e682c07495c9cdd169ede Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 14:49:49 +0200 Subject: [PATCH 0874/1522] haskellPackages.streamly-*: unbreak where possible Most of the failures where caused by being ahead of the stackage streamly. Old failures for streamly-fsnotify don't happen anymore. --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 8 +++- .../haskell-modules/hackage-packages.nix | 44 ++++++++++++++++++- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f79522ddb8c..f258e093c79 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4531,7 +4531,6 @@ broken-packages: - streaming-utils - streaming-with - streamly-examples - - streamly-fsnotify - stream-monad - streamproc - StrictBench diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ec372443c3e..8bd6c316f28 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -85,8 +85,12 @@ default-package-overrides: - dual-tree < 0.2.3.0 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 - # streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot - - streamly-bytestring == 0.1.2 + # streamly-* packages which are not in stackage and to be constrained + # as long as we have streamly < 0.8.0 + - streamly-archive < 0.1.0 + - streamly-bytestring < 0.1.3 + - streamly-lmdb < 0.3.0 + - streamly-process - distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released extra-packages: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9c200bb8c0a..9995fcb0f4c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -250444,6 +250444,27 @@ self: { }) {}; "streamly-archive" = callPackage + ({ mkDerivation, archive, base, bytestring, cryptonite, directory + , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit + , tasty-quickcheck, temporary, zlib + }: + mkDerivation { + pname = "streamly-archive"; + version = "0.0.2"; + sha256 = "00cd5ssa5hi4pvc5li24z68f1k50h02frn4668gcrv8lr5kh6s50"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring streamly ]; + librarySystemDepends = [ archive ]; + testHaskellDepends = [ + base bytestring cryptonite directory filepath QuickCheck streamly + tar tasty tasty-hunit tasty-quickcheck temporary zlib + ]; + testSystemDepends = [ archive ]; + description = "Stream data from archives using the streamly library"; + license = lib.licenses.bsd3; + }) {archive = null;}; + + "streamly-archive_0_1_0" = callPackage ({ mkDerivation, archive, base, bytestring, cryptonite, directory , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit , tasty-quickcheck, temporary, zlib @@ -250462,6 +250483,7 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {archive = null;}; "streamly-binary" = callPackage @@ -250587,11 +250609,28 @@ self: { ]; description = "Folder watching as a Streamly stream"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streamly-lmdb" = callPackage + ({ mkDerivation, async, base, bytestring, directory, lmdb + , QuickCheck, streamly, tasty, tasty-quickcheck, temporary + }: + mkDerivation { + pname = "streamly-lmdb"; + version = "0.2.1"; + sha256 = "08rj29i3vb4ahgrd2zhyi2sl1lk95s7vk020xx9mwzi8sbn0ay05"; + libraryHaskellDepends = [ async base bytestring streamly ]; + librarySystemDepends = [ lmdb ]; + testHaskellDepends = [ + async base bytestring directory QuickCheck streamly tasty + tasty-quickcheck temporary + ]; + testSystemDepends = [ lmdb ]; + description = "Stream data to or from LMDB databases using the streamly library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) lmdb;}; + + "streamly-lmdb_0_3_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, lmdb , QuickCheck, streamly, tasty, tasty-quickcheck, temporary }: @@ -250608,6 +250647,7 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) lmdb;}; "streamly-posix" = callPackage From aaae1445d1078b4e4a1aabf30b4d3a546be2a4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jul 2021 15:09:02 +0200 Subject: [PATCH 0875/1522] prometheus.node-exporter: cleanup --- .../monitoring/prometheus/node-exporter.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index f97485f9478..7f0e5c78eba 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -19,17 +19,15 @@ buildGoModule rec { excludedPackages = [ "docs/node-mixin" ]; - buildFlagsArray = let - goPackagePath = "github.com/prometheus/node_exporter"; - in '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=unknown - -X github.com/prometheus/common/version.BuildUser=nix@nixpkgs - -X github.com/prometheus/common/version.BuildDate=unknown - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; @@ -38,6 +36,5 @@ buildGoModule rec { homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin Frostman ]; - platforms = platforms.unix; }; } From f114215b14aec65a43fb5f4c268d4f3c7730fb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 29 Jul 2021 15:20:30 +0200 Subject: [PATCH 0876/1522] nixos/syncthing: clean up option descriptions --- .../modules/services/networking/syncthing.nix | 213 ++++++++++-------- 1 file changed, 114 insertions(+), 99 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index ae81b786d03..63b249df735 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.syncthing; defaultUser = "syncthing"; + defaultGroup = defaultUser; devices = mapAttrsToList (name: device: { deviceID = device.id; @@ -68,18 +69,15 @@ in { options = { services.syncthing = { - enable = mkEnableOption '' - Syncthing - the self-hosted open-source alternative - to Dropbox and Bittorrent Sync. Initial interface will be - available on http://127.0.0.1:8384/. - ''; + enable = mkEnableOption + "Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync"; cert = mkOption { type = types.nullOr types.str; default = null; description = '' - Path to users cert.pem file, will be copied into Syncthing's - configDir + Path to the cert.pem file, which will be copied into Syncthing's + configDir. ''; }; @@ -87,8 +85,8 @@ in { type = types.nullOr types.str; default = null; description = '' - Path to users key.pem file, will be copied into Syncthing's - configDir + Path to the key.pem file, which will be copied into Syncthing's + configDir. ''; }; @@ -97,9 +95,9 @@ in { default = true; description = '' Whether to delete the devices which are not configured via the - devices option. - If set to false, devices added via the webinterface will - persist but will have to be deleted manually. + devices option. + If set to false, devices added via the web + interface will persist and will have to be deleted manually. ''; }; @@ -107,6 +105,10 @@ in { default = {}; description = '' Peers/devices which Syncthing should communicate with. + + Note that you can still add devices manually, but those changes + will be reverted on restart if overrideDevices + is enabled. ''; example = { bigbox = { @@ -121,7 +123,7 @@ in { type = types.str; default = name; description = '' - Name of the device + The name of the device. ''; }; @@ -130,15 +132,14 @@ in { default = []; description = '' The addresses used to connect to the device. - If this is let empty, dynamic configuration is attempted + If this is left empty, dynamic configuration is attempted. ''; }; id = mkOption { type = types.str; description = '' - The id of the other peer, this is mandatory. It's documented at - https://docs.syncthing.net/dev/device-ids.html + The device ID. See . ''; }; @@ -146,8 +147,9 @@ in { type = types.bool; default = false; description = '' - If the device should act as an introducer and be allowed + Whether the device should act as an introducer and be allowed to add folders on this computer. + See . ''; }; @@ -160,9 +162,9 @@ in { default = true; description = '' Whether to delete the folders which are not configured via the - folders option. - If set to false, folders added via the webinterface will persist - but will have to be deleted manually. + folders option. + If set to false, folders added via the web + interface will persist and will have to be deleted manually. ''; }; @@ -170,6 +172,10 @@ in { default = {}; description = '' Folders which should be shared by Syncthing. + + Note that you can still add devices manually, but those changes + will be reverted on restart if overrideDevices + is enabled. ''; example = literalExample '' { @@ -186,7 +192,7 @@ in { type = types.bool; default = true; description = '' - share this folder. + Whether to share this folder. This option is useful when you want to define all folders in one place, but not every machine should share all folders. ''; @@ -204,7 +210,7 @@ in { type = types.str; default = name; description = '' - The id of the folder. Must be the same on all devices. + The ID of the folder. Must be the same on all devices. ''; }; @@ -220,8 +226,8 @@ in { type = types.listOf types.str; default = []; description = '' - The devices this folder should be shared with. Must be defined - in the devices attribute. + The devices this folder should be shared with. Each device must + be defined in the devices option. ''; }; @@ -230,56 +236,59 @@ in { description = '' How to keep changed/deleted files with Syncthing. There are 4 different types of versioning with different parameters. - See https://docs.syncthing.net/users/versioning.html + See . ''; - example = [ - { - versioning = { - type = "simple"; - params.keep = "10"; - }; - } - { - versioning = { - type = "trashcan"; - params.cleanoutDays = "1000"; - }; - } - { - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "31536000"; - versionsPath = "/syncthing/backup"; + example = literalExample '' + [ + { + versioning = { + type = "simple"; + params.keep = "10"; }; - }; - } - { - versioning = { - type = "external"; - params.versionsPath = pkgs.writers.writeBash "backup" '' - folderpath="$1" - filepath="$2" - rm -rf "$folderpath/$filepath" - ''; - }; - } - ]; + } + { + versioning = { + type = "trashcan"; + params.cleanoutDays = "1000"; + }; + } + { + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "31536000"; + versionsPath = "/syncthing/backup"; + }; + }; + } + { + versioning = { + type = "external"; + params.versionsPath = pkgs.writers.writeBash "backup" ''' + folderpath="$1" + filepath="$2" + rm -rf "$folderpath/$filepath" + '''; + }; + } + ] + ''; type = with types; nullOr (submodule { options = { type = mkOption { type = enum [ "external" "simple" "staggered" "trashcan" ]; description = '' - Type of versioning. - See https://docs.syncthing.net/users/versioning.html + The type of versioning. + See . ''; }; params = mkOption { type = attrsOf (either str path); description = '' - Parameters for versioning. Structure depends on versioning.type. - See https://docs.syncthing.net/users/versioning.html + The parameters for versioning. Structure depends on + versioning.type. + See . ''; }; }; @@ -290,7 +299,7 @@ in { type = types.int; default = 3600; description = '' - How often the folders should be rescaned for changes. + How often the folder should be rescanned for changes. ''; }; @@ -298,8 +307,8 @@ in { type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; default = "sendreceive"; description = '' - Whether to send only changes from this folder, only receive them - or propagate both. + Whether to only send changes for this folder, only receive them + or both. ''; }; @@ -323,7 +332,7 @@ in { type = types.bool; default = true; description = '' - Whether to propagate permission changes. + Whether to ignore permission changes. ''; }; @@ -331,9 +340,8 @@ in { type = types.bool; default = false; description = '' - Whether to delete files in destination. See - upstream's docs. + Whether to skip deleting files that are deleted by peers. + See . ''; }; }; @@ -345,6 +353,7 @@ in { default = {}; description = '' Extra configuration options for Syncthing. + See . ''; example = { options.localAnnounceEnabled = false; @@ -356,31 +365,35 @@ in { type = types.str; default = "127.0.0.1:8384"; description = '' - Address to serve the GUI. + The address to serve the web interface at. ''; }; systemService = mkOption { type = types.bool; default = true; - description = "Auto launch Syncthing as a system service."; + description = '' + Whether to auto-launch Syncthing as a system service. + ''; }; user = mkOption { type = types.str; default = defaultUser; + example = "yourUser"; description = '' - Syncthing will be run under this user (user will be created if it doesn't exist. - This can be your user name). + The user to run Syncthing as. + By default, a user named ${defaultUser} will be created. ''; }; group = mkOption { type = types.str; - default = defaultUser; + default = defaultGroup; + example = "yourGroup"; description = '' - Syncthing will be run under this group (group will not be created if it doesn't exist. - This can be your user name). + The group to run Syncthing under. + By default, a group named ${defaultGroup} will be created. ''; }; @@ -389,52 +402,54 @@ in { default = null; example = "socks5://address.com:1234"; description = '' - Overwrites all_proxy environment variable for the Syncthing process to - the given value. This is normaly used to let relay client connect - through SOCKS5 proxy server. + Overwrites the all_proxy environment variable for the Syncthing process to + the given value. This is normally used to let Syncthing connect + through a SOCKS5 proxy server. + See . ''; }; dataDir = mkOption { type = types.path; default = "/var/lib/syncthing"; + example = "/home/yourUser"; description = '' - Path where synced directories will exist. + The path where synchronised directories will exist. ''; }; - configDir = mkOption { + configDir = let + cond = versionAtLeast config.system.stateVersion "19.03"; + in mkOption { type = types.path; description = '' - Path where the settings and keys will exist. + The path where the settings and keys will exist. ''; - default = - let - nixos = config.system.stateVersion; - cond = versionAtLeast nixos "19.03"; - in cfg.dataDir + (optionalString cond "/.config/syncthing"); + default = cfg.dataDir + (optionalString cond "/.config/syncthing"); + defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}"; }; openDefaultPorts = mkOption { type = types.bool; default = false; - example = literalExample "true"; + example = true; description = '' - Open the default ports in the firewall: - - TCP 22000 for transfers - - UDP 21027 for discovery - If multiple users are running Syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled. - Alternatively, if are running only a single instance on this machine using the default ports, enable this. + Whether to open the default ports in the firewall: TCP 22000 for transfers + and UDP 21027 for discovery. + + If multiple users are running Syncthing on this machine, you will need + to manually open a set of ports for each instance and leave this disabled. + Alternatively, if you are running only a single instance on this machine + using the default ports, enable this. ''; }; package = mkOption { type = types.package; default = pkgs.syncthing; - defaultText = "pkgs.syncthing"; - example = literalExample "pkgs.syncthing"; + defaultText = literalExample "pkgs.syncthing"; description = '' - Syncthing package to use. + The Syncthing package to use. ''; }; }; @@ -443,7 +458,7 @@ in { imports = [ (mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] '' This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher". - It can be enabled on a per-folder basis through the webinterface. + It can be enabled on a per-folder basis through the web interface. '') ] ++ map (o: mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ] @@ -470,8 +485,8 @@ in { }; }; - users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) { - ${defaultUser}.gid = + users.groups = mkIf (cfg.systemService && cfg.group == defaultGroup) { + ${defaultGroup}.gid = config.ids.gids.syncthing; }; From 5a69fb930d7621376a17fb144ba57da99e2814a9 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 29 Jul 2021 15:22:51 +0200 Subject: [PATCH 0877/1522] gitlab: 14.1.0 -> 14.1.1 https://about.gitlab.com/releases/2021/07/28/gitlab-14-1-1-released/ --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c46aaffbbd2..ec91ef3ccc6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.1.0", - "repo_hash": "1a61jc8rsbdbyh891nwygl7qlsj0lm8v59s66hn22csg0dvn6qk6", + "version": "14.1.1", + "repo_hash": "1cygdllhqxah7d8lmx4hcx880wijwfvbbs6dfkdzcn0cd3czpcv8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.1.0-ee", + "rev": "v14.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.1.0", + "GITALY_SERVER_VERSION": "14.1.1", "GITLAB_PAGES_VERSION": "1.41.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.1.0" + "GITLAB_WORKHORSE_VERSION": "14.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index bdc5eb92249..87f200a20fc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "14.1.0"; + version = "14.1.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-k9Vz/b5ZKz93/7nzEA5mnQI8U++CB3E9b8gJBefl2b0="; + sha256 = "sha256-UCWN9TXbfysNLMOU8bDcjrwYtz7+kTCDQmRAl84ysWU="; }; vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 39bb89722e5..beee2c2c894 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.1.0"; + version = "14.1.1"; src = fetchFromGitLab { owner = data.owner; From a67b27e31a0a4f1f8473238fe52c9c74c0af4635 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 29 Jul 2021 13:30:00 +0000 Subject: [PATCH 0878/1522] nixpkgs-review: add me as maintainer, small nit change (#131950) --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 20b1fe720d3..9b4b37a232c 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ]) + "--prefix" "PATH" ":" "${lib.makeBinPath [ nixUnstable git ]}" ]; doCheck = false; @@ -26,6 +26,6 @@ python3.pkgs.buildPythonApplication rec { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 SuperSandro2000 ]; }; } From 2044dcf1bb36206027624f7531cfe45545e4f36c Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 20 Jul 2021 10:08:01 -0600 Subject: [PATCH 0879/1522] matrix-synapse: 1.38.1 -> 1.39.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b2e61d50656..982ced37df4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.38.1"; + version = "1.39.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s="; + sha256 = "sha256-dErfNHDUo0yGLbrRQdwbNkMVfnMfbrO3f7bsRwgRQMM="; }; patches = [ From 519eb5a7431836dfaf2d03c83f1595b368c55e2c Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 29 Jul 2021 07:26:13 -0600 Subject: [PATCH 0880/1522] maintainers: add sumnerevans to the matrix team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a39567f572c..ff7d9eb3fb4 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -162,6 +162,7 @@ with lib.maintainers; { ralith mjlbach dandellion + sumnerevans ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; }; From f2821e16ace335fc99172540968e438360d26bc8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 29 Jul 2021 15:48:22 +0200 Subject: [PATCH 0881/1522] python3Packages.trezor: 0.12.2 -> 0.12.3 --- pkgs/development/python-modules/trezor/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 546989ef349..3015e8d7ebb 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -24,20 +24,15 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.12.2"; + version = "0.12.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv"; + sha256 = "02c39c333435b8f6dc62cc79bb5bf35fc7f0eb144a1a748be3b7c065ee3e85ae"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'click>=7,<8' 'click>=7,<9' - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = [ From 064432684d9878ef29fec2ad298a3d7a2d3c9bf3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Jul 2021 05:02:20 +0200 Subject: [PATCH 0882/1522] flow: remove spurious dependency on ppx_tools_versioned --- pkgs/development/tools/analysis/flow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index abd6a1b691e..af45487a86a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { From 4d4aa14a3e72c6a15895bc03f274be7f240d044a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Jul 2021 05:10:22 +0200 Subject: [PATCH 0883/1522] flow: build with OCaml 4.10 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3c489b7c3f..1107717fef8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13645,7 +13645,7 @@ in ffuf = callPackage ../tools/security/ffuf { }; flow = callPackage ../development/tools/analysis/flow { - ocamlPackages = ocaml-ng.ocamlPackages_4_09; + ocamlPackages = ocaml-ng.ocamlPackages_4_10; inherit (darwin.apple_sdk.frameworks) CoreServices; }; From fea6b0e497fbda44ad1afd66286dde8e2151f0d7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 29 Jul 2021 11:18:18 -0300 Subject: [PATCH 0884/1522] clojure: 1.10.3.855 -> 1.10.3.933 --- 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 9ae94f0a248..77ec74e8c3f 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.855"; + version = "1.10.3.933"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-y2PuOBRq5kZlTpPV8NwkWhspQKlNxwjl+k/Drwixk4Q="; + sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA="; }; nativeBuildInputs = [ From 88742cf661425d27b449f0ade290dde8f0247124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 29 Jul 2021 16:39:35 +0200 Subject: [PATCH 0885/1522] knot-resolver: 5.3.2 -> 5.4.0 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.4.0 It's a prerequisite to updating knot-dns to >= 3.1.0. --- pkgs/servers/dns/knot-resolver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index b0f9dfd6c91..60fed65e6d7 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436"; + sha256 = "534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e"; }; outputs = [ "out" "dev" ]; @@ -43,7 +43,7 @@ unwrapped = stdenv.mkDerivation rec { # some tests have issues with network sandboxing, apparently + optionalString doInstallCheck '' echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua - sed '/^[[:blank:]]*test_dstaddr,$/d' -i \ + sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \ tests/config/doh2.test.lua modules/http/http_doh.test.lua ''; From 8694e478d259daf7673af8f40f0efb06874628bb Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 17:18:10 +0200 Subject: [PATCH 0886/1522] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../transitive-broken.yaml | 3 +++ .../haskell-modules/hackage-packages.nix | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f258e093c79..a6329c8f9e3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1219,6 +1219,7 @@ broken-packages: - EnumMap - enummapmap - enum-utf8 + - env-extra - env-parser - envstatus - epanet-haskell @@ -1607,6 +1608,7 @@ broken-packages: - ghc-syb-utils - ghc-tags - ghc-tags-core + - ghc-tcplugin-api - ghc-time-alloc-prof - ghc-usage - gh-labeler @@ -2307,6 +2309,7 @@ broken-packages: - hs-tags - hstats - hstatsd + - hs-term-emulator - hstest - hstidy - hs-twitter @@ -4531,6 +4534,7 @@ broken-packages: - streaming-utils - streaming-with - streamly-examples + - streamly-process - stream-monad - streamproc - StrictBench @@ -4651,6 +4655,7 @@ broken-packages: - tapioca - TaskMonad - tasty-auto + - tasty-checklist - tasty-fail-fast - tasty-grading-system - tasty-hedgehog-coverage diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3f5ee43b8db..dbc93b59045 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1837,6 +1837,7 @@ dont-distribute-packages: - keid-geometry - keid-render-basic - keid-resource-gltf + - keid-sound-openal - keid-ui-dearimgui - kevin - keysafe @@ -2346,6 +2347,7 @@ dont-distribute-packages: - polysemy-log-co - polysemy-log-di - polysemy-methodology + - polysemy-methodology-co-log - polysemy-methodology-composite - polysemy-mocks - polysemy-optics @@ -2355,6 +2357,7 @@ dont-distribute-packages: - polysemy-readline - polysemy-req - polysemy-resume + - polysemy-several - polysemy-socket - polysemy-test - polysemy-time diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9995fcb0f4c..3ebdfe48fdd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -84654,6 +84654,8 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "env-locale" = callPackage @@ -102395,6 +102397,8 @@ self: { libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-tcplugins-extra_0_3_2" = callPackage @@ -135719,6 +135723,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Terminal Emulator written in 100% Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hs-twitter" = callPackage @@ -156046,6 +156052,7 @@ self: { ]; description = "OpenAL sound system for Keid engine"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "keid-ui-dearimgui" = callPackage @@ -205952,6 +205959,7 @@ self: { ]; description = "Logging functions for polysemy-methodology"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-methodology-composite" = callPackage @@ -206117,6 +206125,7 @@ self: { libraryHaskellDepends = [ base polysemy ]; description = "Run several effects at once, taken from the polysemy-zoo"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-socket" = callPackage @@ -250688,6 +250697,8 @@ self: { ]; description = "Use OS processes as stream transformation functions"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streamproc" = callPackage @@ -257149,6 +257160,8 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tasty-dejafu" = callPackage From d2e468a571a9abf275a07d530dbd2949d1a6d077 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 29 Jul 2021 16:12:23 +0200 Subject: [PATCH 0887/1522] nixos/version: make versions in /etc/os-release less verbose Fixes #127654; also see details in there. --- nixos/modules/misc/version.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index a6fffb76f6e..8f246a9278b 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -103,9 +103,10 @@ in '' NAME=NixOS ID=nixos - VERSION="${cfg.version} (${cfg.codeName})" + VERSION="${cfg.release} (${cfg.codeName})" VERSION_CODENAME=${toLower cfg.codeName} - VERSION_ID="${cfg.version}" + VERSION_ID="${cfg.release}" + BUILD_ID="${cfg.version}" PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})" LOGO="nix-snowflake" HOME_URL="https://nixos.org/" From 1a03ae0afad1b3b998674a85d137fc0ba07442d9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 29 Jul 2021 08:58:03 -0700 Subject: [PATCH 0888/1522] roon-bridge: 1.8-795 -> 1.8-814 --- pkgs/servers/roon-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 5b469c1cc9d..4f188b7f5cf 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "1.8-795"; + version = "1.8-814"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210610172810/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; - sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w="; + url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; + sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; }; buildInputs = [ From 8d77396653b72a6dc9a65b0524c297fbdcc6b2a4 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 29 Jul 2021 08:58:12 -0700 Subject: [PATCH 0889/1522] roon-server: 1.8-795 -> 1.8-814 --- pkgs/servers/roon-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 91371a08557..61af3f2425e 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-806"; + version = "1.8-814"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210707070319/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-TRgsHR71wNz2MoH+RZrIaWEzQSAbo+q8ICKfmmCFy5Y="; + url = "https://web.archive.org/web/20210729154130/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-GbWcgNq+dmzoHNFZyB/QFCvJ7Hh48v8IuGS4WMNlKgI="; }; buildInputs = [ From d542ab83c6cb04b8c4aaf0ac27035c67c5c68fed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 16:17:29 +0000 Subject: [PATCH 0890/1522] diff-so-fancy: 1.4.2 -> 1.4.3 --- .../git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 95060714c24..0d346e3598d 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; + sha256 = "sha256-/xdBvq2u1s5/yzjwr3MLxpaD1CNktcPijXJTKW3Bc4c="; }; nativeBuildInputs = [ From 3936313b1f13c198ee1ae56009db55fd6a87ab02 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Sun, 4 Jul 2021 15:02:13 +0200 Subject: [PATCH 0891/1522] nixos/firewall: document log location Motivated by not finding the firewall log messages for an annoyingly long time. --- nixos/modules/services/networking/firewall.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index cdc3a172ea7..f982621e232 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -339,6 +339,8 @@ in description = '' Whether to log rejected or dropped incoming connections. + Note: The logs are found in the kernel logs, i.e. dmesg + or journalctl -k. ''; }; @@ -350,6 +352,8 @@ in Whether to log all rejected or dropped incoming packets. This tends to give a lot of log messages, so it's mostly useful for debugging. + Note: The logs are found in the kernel logs, i.e. dmesg + or journalctl -k. ''; }; From f6eb8281ad7426120bd7112708015777ecd912d9 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 29 Jul 2021 18:41:40 +0200 Subject: [PATCH 0892/1522] nomad_1_0: 1.0.8 -> 1.0.9 --- pkgs/applications/networking/cluster/nomad/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index ac6938e4ddc..4966c42b9a4 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.8"; - sha256 = "1kjwa9lnxh5zfzijqgkp94wslkzn6kspwi42kf46vrn0qkiz39f2"; + version = "1.0.9"; + sha256 = "0ml6l5xq1310ib5zqfdwlxmsmhpc5ybd05z7pc6zgxbma1brxdv4"; } From 946ad968ffcb623d6473228c4390bf4262024e91 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 28 Jul 2021 21:29:23 +0200 Subject: [PATCH 0893/1522] rott: init at 1.1.2 --- pkgs/games/rott/default.nix | 54 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/games/rott/default.nix diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix new file mode 100644 index 00000000000..cac357faf2e --- /dev/null +++ b/pkgs/games/rott/default.nix @@ -0,0 +1,54 @@ +{stdenv, lib, fetchurl, SDL, SDL_mixer, makeDesktopItem, copyDesktopItems, runtimeShell, buildShareware ? false}: + +stdenv.mkDerivation rec { + pname = "rott"; + version = "1.1.2"; + + src = fetchurl { + url = "https://icculus.org/rott/releases/${pname}-${version}.tar.gz"; + sha256 = "1zr7v5dv2iqx40gzxbg8mhac7fxz3kqf28y6ysxv1xhjqgl1c98h"; + }; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ SDL SDL_mixer ]; + + preBuild = '' + cd rott + make clean + make SHAREWARE=${if buildShareware then "1" else "0"} + ''; + + # Include a wrapper script to allow the game to be launched from a user's PATH and load the game data from the user's home directory. + + installPhase = '' + mkdir -p $out/bin + cp rott $out/bin + + cat > $out/bin/launch-rott < Date: Thu, 29 Jul 2021 21:01:18 +0200 Subject: [PATCH 0894/1522] ipget: 0.6.0 -> 0.7.0 https://github.com/ipfs/ipget/releases/tag/v0.7.0 --- pkgs/applications/networking/ipget/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 8817d90dd6e..19cc4445b32 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,21 @@ buildGoModule rec { pname = "ipget"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b"; + sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk="; }; - vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv"; + vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg="; + + postPatch = '' + # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies + rm -r sharness/dependencies/ + ''; doCheck = false; From 09bbf2d3ec81a12767f3146c868f7735b12f8ea7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jul 2021 21:15:47 +0200 Subject: [PATCH 0895/1522] isync: 1.4.2 -> 1.4.3 --- pkgs/tools/networking/isync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 666e19ca81a..a6181e6f2de 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; + sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; }; nativeBuildInputs = [ pkg-config perl ]; From 7ac716fa2bfadcd56598918b618afc656ecc6645 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 21:28:12 +0200 Subject: [PATCH 0896/1522] python3Packages.brotlicffi: init at 1.0.9.2 --- .../python-modules/brotlicffi/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/brotlicffi/default.nix diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix new file mode 100644 index 00000000000..06cb2bf7580 --- /dev/null +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, cffi +, brotli +}: + +buildPythonPackage rec { + pname = "brotlicffi"; + version = "1.0.9.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-hyper"; + repo = pname; + rev = "v${version}"; + sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + }; + + buildInputs = [ + brotli + ]; + + propagatedBuildInputs = [ + cffi + ]; + + preBuild = '' + export USE_SHARED_BROTLI=1 + ''; + + # Test data is not available, only when using libbortli git checkout + doCheck = false; + + pythonImportsCheck = [ "brotlicffi" ]; + + meta = with lib; { + description = "Python CFFI bindings to the Brotli library"; + homepage = "https://github.com/python-hyper/brotlicffi"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec635408..e37f4b0b6ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1212,6 +1212,10 @@ in { brotli = callPackage ../development/python-modules/brotli { }; + brotlicffi = callPackage ../development/python-modules/brotlicffi { + inherit (pkgs) brotli; + }; + brotlipy = callPackage ../development/python-modules/brotlipy { }; brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { }; From 51b1d4b421740ceddf556b9e425b955d1ca3c53a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 29 Jul 2021 21:30:34 +0200 Subject: [PATCH 0897/1522] arrow-cpp: 4.0.1 -> 5.0.0 --- pkgs/development/libraries/arrow-cpp/default.nix | 16 ++++++++-------- .../python-modules/pyarrow/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a13ebf28193..bea56617468 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -9,25 +9,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; - sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; + rev = "6d98243093c0b36442da94de7010f3eacc2a9909"; + hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; - sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0"; + hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; + hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { # ./cpp/thirdparty/versions.txt url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; }; ARROW_MIMALLOC_URL = fetchurl { @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; - sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; + "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; + hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; }; patches = [ diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 989433b499d..e9510d9552c 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -41,9 +41,9 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # Deselect the parquet dataset write test because it erroneously fails to find the + # Deselect a parquet dataset test because it erroneously fails to find the # pyarrow._dataset module. - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem" + "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" ]; dontUseSetuptoolsCheck = true; From 2001b86adcfee4a2f2a9413a7444dcca2d65167b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 22:04:37 +0200 Subject: [PATCH 0898/1522] python3Packages.dotmap: 1.3.23 -> 1.3.24 --- pkgs/development/python-modules/dotmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index cb5f032a6f2..e9bb585544e 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dotmap"; - version = "1.3.23"; + version = "1.3.24"; src = fetchPypi { inherit pname version; - sha256 = "0hy88kzzb7zhxfr7iyvl6rhmvz02538pbna7zypaard4a88bbbka"; + sha256 = "1mvkhkrhzzzng17j2yvwp4x1hj8wls3qw5lngqs777a2qc1mhg0r"; }; checkInputs = [ From 2be2b75dec148156f8f4da0fba53ffe7a1f10ec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 22:24:30 +0200 Subject: [PATCH 0899/1522] nuclei: 2.4.1 -> 2.4.2 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 3a205ebdb1e..24ab55900f9 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; + sha256 = "0qgpkxb3wm5lwg8kvhfnirw60l81nrs0qv4z07740amnqzd6by4b"; }; - vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s"; + vendorSha256 = "1ddr986rqmd57m8k4x78c4xkbja580ix6xdj5rbysfkr6g073qmq"; modRoot = "./v2"; subPackages = [ From 4301e4eaa869c00fc00ec9a39c3c94788f141178 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 29 Jul 2021 10:37:41 -0400 Subject: [PATCH 0900/1522] taplo-cli: init at 0.4.0 --- pkgs/development/tools/taplo-cli/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/taplo-cli/default.nix diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo-cli/default.nix new file mode 100644 index 00000000000..3145131005d --- /dev/null +++ b/pkgs/development/tools/taplo-cli/default.nix @@ -0,0 +1,25 @@ +{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "taplo-cli"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "0hh9l83z7qymakyf7ka756gwxpzirgdhf6kpzh89bcmpdfz70005"; + }; + + cargoSha256 = "0bkpcnbrrfv07czs1gy8r9q1cp6fdfz2vmlfk9lsg3iapvyi5s1c"; + + nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + + buildInputs = lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "A TOML toolkit written in Rust"; + homepage = "https://taplo.tamasfe.dev"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b8dbf0af0..5de318c8873 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14396,6 +14396,10 @@ in stdenv = gccStdenv; }; + taplo-cli = callPackage ../development/tools/taplo-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; From 4fcccf07623df2482cc3dc3e62bc496953db2b40 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 29 Jul 2021 10:37:54 -0400 Subject: [PATCH 0901/1522] taplo-lsp: init at 0.2.4 --- pkgs/development/tools/taplo-lsp/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/taplo-lsp/default.nix diff --git a/pkgs/development/tools/taplo-lsp/default.nix b/pkgs/development/tools/taplo-lsp/default.nix new file mode 100644 index 00000000000..9db148a9ad2 --- /dev/null +++ b/pkgs/development/tools/taplo-lsp/default.nix @@ -0,0 +1,28 @@ +{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "taplo-lsp"; + version = "0.2.4"; + + src = fetchCrate { + inherit pname version; + sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy"; + }; + + cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc"; + + # excludes test_tcp since it fails + cargoTestFlags = [ "test_stdio" ]; + + nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + + buildInputs = lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "A TOML toolkit written in Rust"; + homepage = "https://taplo.tamasfe.dev"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de318c8873..9e4b5f24eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14400,6 +14400,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + taplo-lsp = callPackage ../development/tools/taplo-lsp { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; From 7f8de3536ab224357110274441c209f8291a6cbd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Jul 2021 23:09:58 +0200 Subject: [PATCH 0902/1522] chromiumDev: 93.0.4577.15 -> 93.0.4577.18 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 98197e90025..91b5a328371 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4577.15", - "sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0", - "sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig", + "version": "93.0.4577.18", + "sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x", + "sha256bin64": "14cw0k4gsilybg7gbbbmck62i0prq5rm6hwqalmmmiqcldrw05mq", "deps": { "gn": { "version": "2021-07-08", From 1642ca5a777aff0da46156d8ce5557419322248d Mon Sep 17 00:00:00 2001 From: Harrison Houghton <28076058+hrhino@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:53:32 -0400 Subject: [PATCH 0903/1522] libsigrok: fix c++ bindings (#131998) Doxygen and Python are needed as nativeBuildInputs (according to configure). Add a tiny installCheck for this. --- pkgs/development/tools/libsigrok/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 7b9ebd57391..52272e61956 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm +, libserialport, librevisa, doxygen, glibmm, python3 , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libzip glib libusb1 libftdi1 check libserialport - librevisa doxygen glibmm - ]; + nativeBuildInputs = [ doxygen pkg-config python3 ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ]; strictDeps = true; @@ -29,11 +27,18 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; + doInstallCheck = true; + installCheckPhase = '' + # assert that c++ bindings are included + [[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \ + || { echo 'C++ bindings were not generated; check configure output'; false; } + ''; + meta = with lib; { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } From 594a143e0e5dafbce1a2f400e233388d4461b7ae Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 28 Jul 2021 02:28:25 +0200 Subject: [PATCH 0904/1522] lua: normalize package name --- maintainers/scripts/update-luarocks-packages | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index da4d224bd33..c7180083da2 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -89,6 +89,10 @@ function convert_pkg() { echo "Skipping comment ${*}" >&2 return fi + + # Normalize package name + nix_pkg_name_normalized=$(sed 's/\./-/' <(echo "$nix_pkg_name")) + if [ -z "$lua_pkg_name" ]; then echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2 lua_pkg_name="$nix_pkg_name" @@ -111,7 +115,7 @@ function convert_pkg() { luarocks_args+=("$pkg_version") fi echo "Running 'luarocks ${luarocks_args[*]}'" >&2 - if drv="$nix_pkg_name = $(luarocks "${luarocks_args[@]}")"; then + if drv="$nix_pkg_name_normalized = $(luarocks "${luarocks_args[@]}")"; then echo "$drv" else echo "Failed to convert $nix_pkg_name" >&2 From 9a70fbc593389b35d5e83fe489d857cf3756632a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 28 Jul 2021 02:54:42 +0200 Subject: [PATCH 0905/1522] luarocks-nix: nix_v3.5.0 -> nix_v3.5.0-1 that changes some rules as how to normalize nix names --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 30e02a3623f..6e55292722f 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -5,7 +5,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "v3.5.0_nix"; - sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; + rev = "nix_v3.5.0-1"; + sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ="; }; }) From a2a2bb32fb3cb254a10b88570366e221cb49fe37 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 30 Jul 2021 00:05:53 +0200 Subject: [PATCH 0906/1522] lua51Packages.plenary-nvim: init there is no version yet --- maintainers/scripts/luarocks-packages.csv | 3 +- .../lua-modules/generated-packages.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a387430245a..b092a58b2d1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -78,10 +78,11 @@ mpack,,,,, moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, +plenary.nvim,,,,lua5_1, rapidjson,,,,, readline,,,,, say,,,,, -std__debug,std._debug,,,, +std-_debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp vstruct,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 07a91f96ff3..5cd7a7c8fe7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1479,6 +1479,36 @@ penlight = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +plenary-nvim = buildLuarocksPackage { + pname = "plenary.nvim"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = "mirror://luarocks/plenary.nvim-scm-1.rockspec"; + sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/nvim-lua/plenary.nvim", + "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974", + "date": "2021-07-12T11:07:18-04:00", + "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim", + "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luassert ]; + + meta = with lib; { + homepage = "http://github.com/nvim-lua/plenary.nvim"; + description = "lua functions you don't want to write "; + license.fullName = "MIT/X11"; + }; +}; rapidjson = buildLuarocksPackage { pname = "rapidjson"; version = "0.6.1-1"; From 7b83ef98fd0e8b4634ac2e1093a1d53dbc0d2127 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 29 Jul 2021 19:33:10 -0300 Subject: [PATCH 0907/1522] org-packages 2021-07-29 --- .../editors/emacs/elisp-packages/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 4dbf968ee26..6bfe29fc2e7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210719"; + version = "20210726"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210719.tar"; - sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6"; + url = "https://orgmode.org/elpa/org-20210726.tar"; + sha256 = "0bz5dwnknxb5mwb3rk6ckwq8a5imd2cjsx40ql9p9vc0c8rirqd4"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210719"; + version = "20210726"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar"; - sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210726.tar"; + sha256 = "0fxjmb1773skyq76qmgx1jqfcglxrxxxqysqiirm48cc6yf13kp7"; }; packageRequires = []; meta = { From 3bf28a824a5c7ca832fc1eed1ce74f4f8fd07aa2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 29 Jul 2021 19:42:26 -0300 Subject: [PATCH 0908/1522] melpa-packages 2021-07-29 --- .../elisp-packages/recipes-archive-melpa.json | 1539 +++++++++-------- 1 file changed, 807 insertions(+), 732 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index e0cb7878bc8..3d5880c039e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1600,8 +1600,8 @@ "repo": "chumpage/ack-menu", "unstable": { "version": [ - 20130107, - 640 + 20150504, + 2022 ], "deps": [ "mag-menu" @@ -1951,8 +1951,8 @@ "annotation", "eri" ], - "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", - "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" + "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", + "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" }, "stable": { "version": [ @@ -2182,16 +2182,16 @@ "fetcher": "github", "repo": "alan-platform/AlanForEmacs", "unstable": { - "version": [ - 20210721, - 1343 + "version": [ + 20210728, + 1427 ], "deps": [ "flycheck", "s" ], - "commit": "c1c4205d2cdf8bf69b22e62548568ed4a8529807", - "sha256": "023lzr112gjscmyqgfz5ib3a80s3bis72acsaxnk4jw32knjy4yl" + "commit": "6e2005441af34fe54872c00ed793f6084f25c3f8", + "sha256": "0fqbjklfglgiy838j37p0v0rcvzj48vps8zsn0bmnabnd5vsrc3b" }, "stable": { "version": [ @@ -2333,8 +2333,8 @@ "deps": [ "flycheck" ], - "commit": "f3688475bba4c451fdfe52ad95fb25c7050ec9f9", - "sha256": "02h6xhnnbx27gq3xm2f2j3py5h94kcg8m8399j7dhski60ncn4b4" + "commit": "8089607dc118827e832d4bd524b3c0f0f56e8cdd", + "sha256": "1im0k28skb9skxxfkh279j91xjfc4c7qnmwc8l6sgazhglj5rqs6" }, "stable": { "version": [ @@ -2441,11 +2441,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210703, - 2203 + 20210728, + 2330 ], - "commit": "9d97c074b08000eacefc03ebc5dadbdc33888cc2", - "sha256": "06ya21isl47cfs4fsl8k3qzh7d27gss0snxv7mmv8a0c7rgjyx7j" + "commit": "e01eeb40858f971e45c014726a14c75556d8cc8f", + "sha256": "0psyfmajz2rsi5asv07514zd7vlwzk42hff4dcbmycyf7s998ifn" }, "stable": { "version": [ @@ -2513,14 +2513,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20210721, - 651 + 20210727, + 808 ], "deps": [ "all-the-icons" ], - "commit": "a3cc2d96f619a2a6cf1cb6ad881ab6e509ac8fc3", - "sha256": "09l0y99lqi3p7h0ll3hm13zi6kp2pbya8rdpvqrx7jpkg3w5slfk" + "commit": "c1c0606a793b71c8c1efc3c55dfcc22182214f24", + "sha256": "0p0icyj9084q7gm3bjknxgxd6g36sgy3b1kpxlm3fmh93j0v6l32" }, "stable": { "version": [ @@ -2575,15 +2575,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210721, - 653 + 20210727, + 757 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "b20df3e2c901a107441b6246b9d03fa3dc57f47f", - "sha256": "1hqf3jqpq0viygxnbkq7rsabpyygz2kr6nl6jrarm8wdczs55rpr" + "commit": "2a4baba0343d1e4dcabc29e5ccca596fd032ac90", + "sha256": "1fy86vkn5j0v9brkfzfjrwr1zrp792i7pxywlrflahcbxd8v68pp" }, "stable": { "version": [ @@ -3217,8 +3217,8 @@ 20200914, 644 ], - "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", - "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" + "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", + "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" }, "stable": { "version": [ @@ -4102,7 +4102,7 @@ "unstable": { "version": [ 20210501, - 1536 + 1527 ], "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" @@ -4604,14 +4604,14 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20210615, - 1457 + 20210728, + 2054 ], "deps": [ "packed" ], - "commit": "0f3afc6b057f9c9a3b60966f36e34cb46008cf61", - "sha256": "0grb9y7v7ibbcjv1yhssnavz43cij16ys5c68my8mv12wg5ld86z" + "commit": "504863340fa82cf8aca785ad1f2a541be598c3d6", + "sha256": "0d1z6k4gcx9yxvvsi9m3pz0nfbql1f2vs29ccjcdycaxlq04k7ls" }, "stable": { "version": [ @@ -5532,8 +5532,8 @@ "avy", "embark" ], - "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", - "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" + "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", + "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" }, "stable": { "version": [ @@ -7038,14 +7038,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210714, - 1030 + 20210727, + 1208 ], "deps": [ "bibtex-completion" ], - "commit": "6b9a075aebd85fee8a071ffbbada1158ecd470d4", - "sha256": "0ihpm7pnlx5acj7jmrqr9di92908mz7z3k1kg62k8vxj2q43a00c" + "commit": "a2569ef74b40ed6b6459ed1b1b19e12282b426d0", + "sha256": "02yvr60ri07igfq8c0v2a0hybqzkvnacqp34jv1y4dhd5igbhfdc" }, "stable": { "version": [ @@ -7067,8 +7067,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210718, - 1044 + 20210725, + 1459 ], "deps": [ "biblio", @@ -7078,8 +7078,8 @@ "parsebib", "s" ], - "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", - "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" + "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", + "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" }, "stable": { "version": [ @@ -8927,14 +8927,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20210709, - 415 + 20210726, + 125 ], "deps": [ "map" ], - "commit": "a67a026db0937b26c0b7a2fcf81bf44498ad2dd1", - "sha256": "0xck02i9l0yw7yzy6sgzg17k2hyqaj9lvafp7r229xzw8rdzl8cr" + "commit": "59fa9e92abdf1e730f8f3908d5a42852c10c5e2b", + "sha256": "1jbfsr28fhf945lhhbds89a9g5c8rbpmykwg8z5adp8ncfj6pw99" }, "stable": { "version": [ @@ -9616,8 +9616,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20210311, - 830 + 20210728, + 802 ], "deps": [ "anaconda-mode", @@ -9626,8 +9626,8 @@ "ivy", "tree-mode" ], - "commit": "3e5c510c51dd8b3491a32a1d67ad6268033348ee", - "sha256": "1jj8bj9a05dq0igxd2ddf0p9gc9sbffcn0wy3b26qlcspcvbpm1h" + "commit": "7a40f9ddb16a6ce9345e0bd632109b7e2048baa1", + "sha256": "18as7vq8cmhxkxgh0p8qlifyvza66n6xf9a2fi07wc4acp2gpn55" }, "stable": { "version": [ @@ -9760,8 +9760,8 @@ 20210707, 2310 ], - "commit": "583f07515b3be254ec150ce1dadabb48fdfa5bd3", - "sha256": "1nccl2v2fvpmsmvga1ghb9kb72v90bgdqhxb153086qx69s7vlcn" + "commit": "c4c70235ebbfc1733789f07f084c2d071679feee", + "sha256": "063gfjlay5fdgd19q363np9p5s24hxrwvxbxahkjjfn40mnb6nqi" }, "stable": { "version": [ @@ -10449,8 +10449,8 @@ 20171115, 2108 ], - "commit": "94d292543d4869c3c5b48bb4dd1e5d901ce6227e", - "sha256": "12pxnwgfr0ypf80hpgrqyb789wj41gv8cbzsr1jks7pinvpda65f" + "commit": "d33da533194106a0a30dc4a22f11acbd2846cfba", + "sha256": "0q89wmfa4pi2a3vs9qcy27dharxlqpxm9b4lpxbjzii9f08fad0x" }, "stable": { "version": [ @@ -11240,8 +11240,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210706, - 1151 + 20210729, + 521 ], "deps": [ "clojure-mode", @@ -11252,8 +11252,8 @@ "sesman", "spinner" ], - "commit": "fe8cf244fd3426261f9f630c981a6296afd433a4", - "sha256": "02xj7g6jnwd9vjr8jipqvwy89zadkzsak08pq8418hz2af26bvaf" + "commit": "52ad2bc4ebadf6692d9c2d5cfcae467e149beea6", + "sha256": "15vr53diq6q8sj9cnb3w8smxx6jlxp0ps4vjqk24yv1lgycfq0ng" }, "stable": { "version": [ @@ -11522,8 +11522,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210719, - 918 + 20210727, + 1320 ], "deps": [ "dash", @@ -11533,8 +11533,8 @@ "s", "string-inflection" ], - "commit": "b46d3c3c6e5a00237f62084c64a25c4b4efabe1b", - "sha256": "0gyyxaiky82km9c897vvslnin7yll3yzjfz0fd5zg7lz4kmjilqk" + "commit": "ad453630ced1fd1aa1f760b96da1cd702c77aaa9", + "sha256": "1v7k1psvj1n90y5nb8cflapfzn5hf75hxsfdmy4ppliw97b5bq9d" }, "stable": { "version": [ @@ -11600,11 +11600,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210722, - 1158 + 20210728, + 125 ], - "commit": "45e7f801744f471b43fdd96cfe734a4a3796bab6", - "sha256": "1sdj2nvgnbvsz2cvgzpr0axzm4gcb0sna0ps37mbxb0y356xyzfv" + "commit": "5c5958e467e4da7a8578039643d5036b3395e3d6", + "sha256": "1fal5cbj1wbji4ail1b8k9bc3c8mps7m68j7lk2086x67l1il9di" }, "stable": { "version": [ @@ -12225,8 +12225,8 @@ 20210706, 1318 ], - "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1", - "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak" + "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", + "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" }, "stable": { "version": [ @@ -12252,8 +12252,8 @@ "deps": [ "clojure-mode" ], - "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1", - "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak" + "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", + "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" }, "stable": { "version": [ @@ -12555,17 +12555,17 @@ 20210104, 1831 ], - "commit": "f7a3031b7defbc805a39a8b23dbefe10764d956b", - "sha256": "13036j6019viskahslw3vq28h5kn1xr6ap61l2hvgzpimriam012" + "commit": "9251205512c49bbdda5d82f48126dc5b8e79d70f", + "sha256": "0jkkb213w1zngask7n542rj8idjxvzbxy51pgydhas57m6xng4af" }, "stable": { "version": [ 3, 21, - 0 + 1 ], - "commit": "ff7a2e37bfff23ce1751a93b3eba179fbf32a9b6", - "sha256": "061cjj5mni91p6b0mpp6a2zrkrmw1hc3l4cci6lcqbx733y192fq" + "commit": "f7cf69e34a1607e8ea2b6d10fef6a6058377c24e", + "sha256": "18gwkb8p9086qg4acfbs74891nzh5wqs3id6iv5zqwc76kvcb4y7" } }, { @@ -13807,14 +13807,14 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20210629, - 1038 + 20210723, + 1322 ], "deps": [ "company" ], - "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174", - "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x" + "commit": "ff813c58e930d01fb55ee2f57fe810896a12c51b", + "sha256": "0v5a7aaqj1p2c6ci34v31r4jb1wd29rff7n779n3klaqjbkg3b6h" }, "stable": { "version": [ @@ -13967,6 +13967,40 @@ "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" } }, + { + "ename": "company-emojify", + "commit": "a83aa15fa8c6fa2e8fd22c8368be18714d97861f", + "sha256": "07rnpz30k38cmh20r1gf6zimch4y8kxyhrl5bk03x887hwkrwc4y", + "fetcher": "github", + "repo": "jcs-elpa/company-emojify", + "unstable": { + "version": [ + 20210718, + 424 + ], + "deps": [ + "company", + "emojify", + "ht" + ], + "commit": "cebfff07a21f885f87a692ec4d5e7f84468c6565", + "sha256": "1ishjn1biv9irm3ih96b0larsz6jq81lxd7jjkh4nqjs1207gcij" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "company", + "emojify", + "ht" + ], + "commit": "015dc2cee7c9713794efd44d398a12eb62a94185", + "sha256": "0w1pvknlnbz9q9v9krq4cvfjmk1mzhcvyh61qqn5m9srgc3hdkg3" + } + }, { "ename": "company-erlang", "commit": "ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219", @@ -14766,8 +14800,8 @@ "company", "prescient" ], - "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", - "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" + "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", + "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" }, "stable": { "version": [ @@ -15720,11 +15754,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210722, - 1644 + 20210729, + 844 ], - "commit": "d42ccdca5bbc4c437819cf4d29c7b8728ed090bc", - "sha256": "134flhq2rx2qjhfc5fspsijpdiv7a3z5mk0j1pwipfwfkid27nqk" + "commit": "ebed71d554a5eda6914de6519cd30b867e9dbc28", + "sha256": "1bk9h3yh4r7l0jsmas83sa0hvzsbj8zvracf081jdhi7vl27p9zq" }, "stable": { "version": [ @@ -15839,15 +15873,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210701, - 422 + 20210725, + 2113 ], "deps": [ "consult", "notmuch" ], - "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", - "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" + "commit": "62462df58ecd888ae8a3a8421078227acdfd36d1", + "sha256": "0z4ayx6xh9x9rqj1shm4kw4q1xw99xncisd0c4m9g5qbn4mq6yas" }, "stable": { "version": [ @@ -16219,8 +16253,8 @@ "ivy", "swiper" ], - "commit": "56139df678d9886d0612c0a192cce2cf6f156628", - "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" + "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", + "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" }, "stable": { "version": [ @@ -16414,26 +16448,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210608, - 206 + 20210725, + 821 ], "deps": [ "counsel" ], - "commit": "2c1f2161d36f70e0034e29abecfcb8878b30b6ac", - "sha256": "1hcsz773i67i82crzczm4csjkl9qj430m73lpvqkh7if543bs030" + "commit": "84fff26b0f207131c2e6669bd7f510eac43973aa", + "sha256": "07445bbr68q1pnwpj5bwqmml9ky1gq67g24zswv8fylnzjkhy9wc" }, "stable": { "version": [ 1, 9, - 16 + 17 ], "deps": [ "counsel" ], - "commit": "894cd7e25a2f96e29b70897ab799e7dd9e4f85fd", - "sha256": "01si554r0s6m7ypx1m2n0z6j6q6yihifz76dha6q6v56ixdlv626" + "commit": "84fff26b0f207131c2e6669bd7f510eac43973aa", + "sha256": "07445bbr68q1pnwpj5bwqmml9ky1gq67g24zswv8fylnzjkhy9wc" } }, { @@ -17389,25 +17423,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210624, - 1320 + 20210727, + 1254 ], - "deps": [ - "tree-sitter", - "tree-sitter-indent", - "tree-sitter-langs" - ], - "commit": "093f0f21a9d04d79a380de145cbc42693ef8c76f", - "sha256": "1150s8zz9z6pmr9m8jny7g8qrhxdnpbk4nzrlyddhaf9hkw9nfi9" + "commit": "27cd2e8da1f374fd9db121826bf78484b0e4079e", + "sha256": "1qrcxyn9n2xn4k2is8q8brvicncc9x78gq3sl8xw00smww3i3rdj" }, "stable": { "version": [ 0, - 11, + 12, 0 ], - "commit": "84664285a6d215998da763dc5d286d4f941df81e", - "sha256": "0aq6ln92jr3hcrd1592n4s5cb079fly7qaj2hm510p9zckyfx230" + "commit": "69fe52b5908e1b29b2765d7e01cd6a8f0fc16332", + "sha256": "1x40xm9d5sbxbnyxl12ppkzlgxzyn0bjg2vmc139jpkazmmw7r7k" } }, { @@ -17643,11 +17672,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210418, - 2044 + 20210724, + 126 ], - "commit": "dbe83710d06bc39315f1455f6f21479f3747c0aa", - "sha256": "0nl7mh1i9pw039gd0ma6xrv499aw2vs3a1fm1bxz71hh13jmbd4c" + "commit": "b78e129a8a4fabfebba8cdd5ef51278d0d57e0f4", + "sha256": "0j3rsax644x8753hginn0cd8sm86wf521p1rjqspdhgpi4dv0cdq" }, "stable": { "version": [ @@ -17894,6 +17923,21 @@ "sha256": "1idh5by5fzndaywf86lckz7mxr5kxggbzlgpjjvmahlnma110a1j" } }, + { + "ename": "cursor-flash", + "commit": "6a269e5187fd244f67adb83b940eedcbd643a0c2", + "sha256": "0y7ngpxwid83rgw1fbmrp7xifkkvf04a9s6wdfd2l8jdyh0jvn65", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-cursor-flash", + "unstable": { + "version": [ + 20210722, + 445 + ], + "commit": "6bb54a1e2e1bf9df80926718b1b8b9ee49080484", + "sha256": "1zav30zkf7ir5zwy9625wldg4kaf8bk3mn1py5sidihpn299319b" + } + }, { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", @@ -18075,8 +18119,8 @@ 20190111, 2150 ], - "commit": "e46e9dd7c37d8d7ad432a94fff5daafa7fa444e3", - "sha256": "0lbla1pbqk2gaprkwdyxg5x381nmxx1jcc9snls6crlsf8bbhrm4" + "commit": "0574dbceef7b8ee16a9cc94091c3629dfa23133d", + "sha256": "1gnwy0pdxwwwicp46w9g9mcsnz070wb7hjvrj33nilsv796m3kss" }, "stable": { "version": [ @@ -18173,11 +18217,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20200421, - 912 + 20210728, + 1514 ], - "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569", - "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd" + "commit": "cbab674d995022c1c223bfccf13d8009c7c4e2ba", + "sha256": "0h08k9g746j1kg4138am3v7lv9w6fg7yrz2hzm7x737qmg852chn" }, "stable": { "version": [ @@ -19075,8 +19119,8 @@ 20201011, 1543 ], - "commit": "4fd5547a54ee931f4a16adde1d3b52bf01ce045a", - "sha256": "07yar2b0h8d16j3q55cw2mdk88akvsab6z7bpkzavyqalgvd061b" + "commit": "6f09126b2e97b2e195145204caba11d0d4f871df", + "sha256": "0qrjy3zs2xjf54b7kcwxbds99il76zxlx219c5d1siq6bkv0z0k4" }, "stable": { "version": [ @@ -19889,8 +19933,8 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210615, - 1539 + 20210716, + 241 ], "deps": [ "cl-lib" @@ -20287,14 +20331,14 @@ "repo": "tilmanrassy/emacs-dir-treeview", "unstable": { "version": [ - 20201003, - 2206 + 20210625, + 2358 ], "deps": [ "treeview" ], - "commit": "53dc9dae71d1be3a7a925332a53e72d2bd05366b", - "sha256": "0hgcargxbl58f4im57c1zqwnfxl52lfv78s8l69njjggvdki0hz1" + "commit": "c48b0e12eb02ae046cf6dc97fe006db31ded3f2b", + "sha256": "07hhy41h1qx38rrf6f9b2r13chs3v4mzyplhpx1r6wjrj0nmh2pv" } }, { @@ -21020,15 +21064,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210529, - 600 + 20210724, + 1015 ], "deps": [ "ess", "ess-view-data" ], - "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c", - "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h" + "commit": "92dc267bcaac1b6258ad595488bf10b88882b5ae", + "sha256": "00zzcrhjkc3f0wfda3a843wk0ajkhyi8qi4jy0lax4myc0i8mpsk" }, "stable": { "version": [ @@ -22014,14 +22058,14 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20210526, - 748 + 20210729, + 508 ], "deps": [ "cl-lib" ], - "commit": "aaee11cedf7b4c31700f24a1fd88dcef9c2a7c3d", - "sha256": "120sxrifn82hhrqhqdy0dhnni353vwzkkd5x7inqg1wpzsxjwhzl" + "commit": "7bfbb55417e7d2aac53adf92cb0e3fd329c495c1", + "sha256": "078hqc8rqw27v5li8dgmh9sspfrypha6h7hx4iagjwndb2llg2ix" }, "stable": { "version": [ @@ -22306,14 +22350,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210714, - 1511 + 20210728, + 2333 ], "deps": [ "cl-lib" ], - "commit": "b7995ac041f8dadb021cd2445e85d29c9bf718ae", - "sha256": "09hhplhb0832ja9nnsq3d4p6g0fdw2sp9kl2y4n2kk6zq909ar54" + "commit": "9e2680b9188ebd58c490598684bb7545ba01950d", + "sha256": "1yricwp9xndkqask5gg4frg5axmjn2g65z8bbazg9gixvsj4gbbq" }, "stable": { "version": [ @@ -22510,8 +22554,8 @@ "deps": [ "debian-el" ], - "commit": "0f2a8257788a2f99e87326e52402f69e3f534903", - "sha256": "1hkabhnbiwygcx3blv3hc819m3bckkcngsf280pfg2y1xmd9n7b2" + "commit": "458f5230d02b15c94e94eca1af4eabaec30f45db", + "sha256": "0cdsi18vn3la9yaq4nbpvvhrblr36x0lc54wp7gv75rlg23fbl5a" }, "stable": { "version": [ @@ -22970,8 +23014,8 @@ 20210715, 548 ], - "commit": "07dd21abc029f50c6a3a96f2867d31102366faba", - "sha256": "0pvbvzdljxq7mjfsx4fcm3782wdawx2mgzi4hy7kvw7z80n9zm7k" + "commit": "d1e683b1489ff830d61566876a94b1da35bc2aaa", + "sha256": "0yi88xd0h3mbggjhay66pz7j55hjvqln7cs0av2na9d5mf70asrb" }, "stable": { "version": [ @@ -23543,15 +23587,15 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20210303, - 2352 + 20210726, + 2034 ], "deps": [ "popup", "request" ], - "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40", - "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf" + "commit": "279d242d66dd48f7a59405167dff332a569f4c1d", + "sha256": "0cvzq29299lsh6rq4sxmz2fdsnapbv4iqrx2bnsvld9dpm01m6j6" }, "stable": { "version": [ @@ -24730,8 +24774,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210522, - 1036 + 20210723, + 1958 ], "deps": [ "anaphora", @@ -24742,8 +24786,8 @@ "websocket", "with-editor" ], - "commit": "09af85821e4fce64675d5287fe9f3a6847d1c5d2", - "sha256": "12b8idh2mpd37nrc8ricr4s4hz4wgnp7cy1298qcpxl00xx99dqw" + "commit": "983ee612f81c1f976bc1ebce2bfe574a825ba9ed", + "sha256": "1hfsbw5fgxbxma7smzmdc7qa4f9affrgs19xxk3dk0p659789lip" }, "stable": { "version": [ @@ -24767,24 +24811,6 @@ "sha256": "0jnqi8pq83s8q0dy2y1518yz8lsc0graqrqf8frss21fcj7ny22g" } }, - { - "ename": "ein-mumamo", - "commit": "bd8fcf7f6332f94dc37697f9412c8043da8d4f76", - "sha256": "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w", - "fetcher": "github", - "repo": "millejoh/ein-mumamo", - "unstable": { - "version": [ - 20150302, - 28 - ], - "deps": [ - "ein" - ], - "commit": "028fefec499598add1a87b92ed991891f38f0c7b", - "sha256": "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570" - } - }, { "ename": "eink-theme", "commit": "a1349c3f93ab60983f77c28f97048fa258b612a6", @@ -25619,14 +25645,14 @@ "repo": "Manoj321/elfeed-dashboard", "unstable": { "version": [ - 20201218, - 347 + 20210727, + 603 ], "deps": [ "elfeed" ], - "commit": "9e8e212da9ea471bdc58bc0a1f5932833029bb38", - "sha256": "182kr8nqrnf1lpiqbl04qm6871yvk0z53dxxdjc2y9xnh6dvx460" + "commit": "b143f8453aed2053e8fc6f05cef6233797408546", + "sha256": "1yvr3fg5dx0z6h7jbv3fvn5ccw5grpcaj2ynp7zri5y388g160ql" } }, { @@ -26294,11 +26320,21 @@ "repo": "jcaw/elnode", "unstable": { "version": [ - 20190608, - 1623 + 20190702, + 1509 ], - "commit": "305c532b6e59f58c4afcfb76466dbfbdc4e58b9c", - "sha256": "1214216wrdhfw3lbf59vnddk28hi4g3s1ksdi5walksihd3gh7my" + "deps": [ + "creole", + "dash", + "db", + "fakir", + "kv", + "noflet", + "s", + "web" + ], + "commit": "29ef0f51a65a24fca7fdcdb4140d2e4556e4bb29", + "sha256": "1bks7aakhvdab56gbsa44ca9kbilajisdd9bns485d9wr62d2lgj" } }, { @@ -26456,20 +26492,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20210720, - 1520 + 20210729, + 1123 ], - "commit": "3cddc8bdcb0a05ecd308c310bcd020f7288af4de", - "sha256": "12xcra3a5bsihcfqs014bcayw0wmv5f22gdk6dipfx1pjygz1x1k" + "commit": "2cdf02e99dbd2d7f765c08ad2f8477b4ea07d5f7", + "sha256": "19gsy0q8qddsm7mcf8ijkw2f92cqg7q32x7yhqblmmwbqa7zcsjf" }, "stable": { "version": [ - 2, - 10, - 2 + 3, + 1, + 0 ], - "commit": "1edbaec565d413a9c7d4c55e9356c38b2037e0f5", - "sha256": "0xqiisirpvw4ka9417pq4r73x937wl3qbf8cpn2i03akm8d58smd" + "commit": "8c20802c5f2262440dadbdca60b7901d09ca022f", + "sha256": "0a6qfm7x4nbfanjv33h1zgcwnywd77qbc4adya5kx8lndcn0669l" } }, { @@ -27129,11 +27165,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210723, - 47 + 20210729, + 1843 ], - "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", - "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" + "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", + "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" }, "stable": { "version": [ @@ -27152,15 +27188,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210717, - 1845 + 20210729, + 1543 ], "deps": [ "consult", "embark" ], - "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", - "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" + "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", + "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" }, "stable": { "version": [ @@ -27327,16 +27363,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210619, - 1246 + 20210726, + 1926 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6e0aaaf4c5598826b24c3079b80bf8af000a77c6", - "sha256": "016y0w1gy8z1gdri54njas20l3kw99jg5bjyrmcbmgzjmb1jq0y8" + "commit": "a0e26c1a143778f7378ec8a053725726e1e6aeef", + "sha256": "0j1jjwavdl3q33rn6zx9z3ka87d9fihd9s5bhrgw3x4fvgv8gikg" }, "stable": { "version": [ @@ -27769,8 +27805,8 @@ "repo": "rejeep/enclose.el", "unstable": { "version": [ - 20120618, - 2019 + 20121008, + 1614 ], "commit": "2747653e84af39017f503064bc66ed1812a77259", "sha256": "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim" @@ -27910,7 +27946,7 @@ "unstable": { "version": [ 20130407, - 1236 + 1348 ], "commit": "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80", "sha256": "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd" @@ -28714,8 +28750,8 @@ 20200914, 644 ], - "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", - "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" + "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", + "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" }, "stable": { "version": [ @@ -28738,8 +28774,8 @@ 20210315, 1640 ], - "commit": "4adbbaa681d902cc342f20c4e153d0cb6d866238", - "sha256": "01nq7qdmdpasvay3jg9kmg8wamvf37pwqcc37sfc85h81qf2rvc4" + "commit": "4a12f98146fb5f0484ae04b6bf1e469c3d882e12", + "sha256": "09rpzlvygp83drcwgbq75bxgi7m8xrap51mrgqc4rfgcmmmc3zk3" }, "stable": { "version": [ @@ -28959,8 +28995,8 @@ "repo": "dakrone/es-mode", "unstable": { "version": [ - 20201112, - 2317 + 20201125, + 2059 ], "deps": [ "cl-lib", @@ -30195,15 +30231,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210721, - 658 + 20210726, + 2220 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f", - "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r" + "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", + "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" }, "stable": { "version": [ @@ -30963,26 +30999,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210609, - 1311 + 20210727, + 1106 ], "deps": [ "evil" ], - "commit": "d7ad7f712b98aa64b7cc4fb16354b32666739c77", - "sha256": "1x7wpq0lgkp016yik6sc7b2abhixgcwk0mxx29dyycsjjkdlhp3a" + "commit": "80dc731ab736545541546ca64187e850bf0e39c8", + "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk" }, "stable": { "version": [ 2, 3, - 12 + 13 ], "deps": [ "evil" ], - "commit": "9cd0ddaacb3476221d37344715c759ed3cb538d7", - "sha256": "0l4ash907d91vccqdxjz1v5spd8f4va0vrdri6h9y1qc67mjlsph" + "commit": "80dc731ab736545541546ca64187e850bf0e39c8", + "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk" } }, { @@ -31723,8 +31759,8 @@ "deps": [ "evil" ], - "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f", - "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r" + "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", + "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" }, "stable": { "version": [ @@ -31747,15 +31783,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20210510, - 1809 + 20210728, + 2155 ], "deps": [ "auctex", "evil" ], - "commit": "87445d4d2339436179e792609bfbff0eaf056a9c", - "sha256": "014bwsnry6v07n9cv194gsiwny0jp6rxs5gl4dhqfwq9hbj74p84" + "commit": "9b3a560cc43cca73d2947747892f7d4f92c2c573", + "sha256": "0hain42prqaa08fc116a0qy12j8pbj4a8i589s6h87h4hhy8dj8d" }, "stable": { "version": [ @@ -32791,15 +32827,15 @@ "repo": "Wilfred/ez-query-replace.el", "unstable": { "version": [ - 20210525, - 2222 + 20210724, + 2247 ], "deps": [ "dash", "s" ], - "commit": "3202cf4644ed3b6549284c3816b90bb230970a5b", - "sha256": "1xsvwf7g7c3v4p59svmahhn9pkr6zgp6vyr6dyvfy24mgaqw4jzv" + "commit": "2b68472f4007a73908c3b242e83ac5a7587967ff", + "sha256": "0zdgdqd9zi9fz6rn2z24jmpr83rzwbgxq0q38ynmskkd7n42a8ds" }, "stable": { "version": [ @@ -32946,14 +32982,11 @@ "url": "https://git.sr.ht/~pkal/face-shift", "unstable": { "version": [ - 20210707, - 1127 + 20210725, + 2146 ], - "deps": [ - "cl-lib" - ], - "commit": "0170ab2993211eb0f514f7d1ce14e8194a11f6b2", - "sha256": "0zj9h3nmswpc7q02a76rrzw3ypjwn1lwq5mkm6s28q0xrdpmrgq3" + "commit": "14dce79fc42116c49eb4c8a4ab7ca3c4bd7cbf6f", + "sha256": "0k10dskv9fzs1y05h7mq0z798kpwgkwwhh9dd9d7hdk70vkvlg66" }, "stable": { "version": [ @@ -33105,8 +33138,8 @@ "deps": [ "popup" ], - "commit": "1096582f68cda91fe9d9336756b7c044ab0d6096", - "sha256": "0qp1nqcni5a3m9iaqar07sii6mpcnnqxmaf5n2fpz1iaz6bwsxva" + "commit": "eff6cba7b09611ce9ade56972f0ceccf227cf174", + "sha256": "0nzg2l9wxyqkhr4wj0mmcc4ydm1lx1smdcnsf1hs2yqh7bdgi02k" } }, { @@ -33371,11 +33404,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20210605, - 1057 + 20210723, + 549 ], - "commit": "c223aee30af7dc7f52fb20045226ed9f49f4ec49", - "sha256": "14dzn3ggq8vb6qb5babngrpgsb29k6y8ficgzwwd9wfd5npynrpa" + "commit": "458464771bb220b6eb87ccfd4c985c436e57dc7e", + "sha256": "0253r4fbi9b8vk5akp1wz0krvik500jhy1hclwp1p0bwrq2irlml" }, "stable": { "version": [ @@ -33493,11 +33526,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210720, - 1516 + 20210724, + 2039 ], - "commit": "12bdd8ee09ce2ba7c232df96fb199461d25a89c5", - "sha256": "13fyadml9wa30f4brdwfnby067q6bp2dl1y6x7hz0pzzlbk4sbs5" + "commit": "128702146298dad3f4d5409992e985fe670581d1", + "sha256": "12mvxziyrzgbmcg9kcqbscjld42ybl7km027m0kaln39awc0nb03" }, "stable": { "version": [ @@ -33834,11 +33867,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210720, - 244 + 20210729, + 5 ], - "commit": "cde02e549512742366a91ffb70c86c354117cfde", - "sha256": "1xkpyn5lh6nhsmnq50174lnir9c9xhwb9ihvj0lw721s57xq3aa0" + "commit": "136018df39520433840d67acbbf92908ab115532", + "sha256": "0rgvk4r1iy4kncmxvgzlgb39dsjvvmihnqwrjgkmzdqfx9891m02" }, "stable": { "version": [ @@ -38551,11 +38584,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210723, - 505 + 20210724, + 1042 ], - "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", - "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" + "commit": "00357953a736e21d0a1c8d76f5605820990544fe", + "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj" }, "stable": { "version": [ @@ -38582,8 +38615,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", - "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" + "commit": "00357953a736e21d0a1c8d76f5605820990544fe", + "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj" }, "stable": { "version": [ @@ -38614,8 +38647,8 @@ "flyspell-correct", "helm" ], - "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", - "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" + "commit": "00357953a736e21d0a1c8d76f5605820990544fe", + "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj" }, "stable": { "version": [ @@ -38646,8 +38679,8 @@ "flyspell-correct", "ivy" ], - "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", - "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" + "commit": "00357953a736e21d0a1c8d76f5605820990544fe", + "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj" }, "stable": { "version": [ @@ -38678,8 +38711,8 @@ "flyspell-correct", "popup" ], - "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", - "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" + "commit": "00357953a736e21d0a1c8d76f5605820990544fe", + "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj" }, "stable": { "version": [ @@ -39151,8 +39184,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210716, - 1447 + 20210727, + 1934 ], "deps": [ "closql", @@ -39165,8 +39198,8 @@ "transient", "yaml" ], - "commit": "49da45ac4515d7442ebd606f4ad4922a3e1439ff", - "sha256": "1vqhxckmkfbkvpnsigdb1625b5n0fpry2hxkympqnxspcccnijks" + "commit": "34cbaa7b6a77ba2e4c6750f4f922d3e887c08c67", + "sha256": "1bpkzzkm3r0ylfk319k0dr03ikllhps65yir5i7ybwafddj8albp" }, "stable": { "version": [ @@ -39526,11 +39559,11 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20200103, - 1238 + 20210728, + 1258 ], - "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf", - "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6" + "commit": "63d42d913468cd0d75dcccb99e5517057fa34e25", + "sha256": "0ar5dxyxz7nwmh1b1rdiiy76fm43q0pxcpj5959pc7gqxbf5c1rh" }, "stable": { "version": [ @@ -39652,11 +39685,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20210201, - 731 + 20210727, + 1535 ], - "commit": "d5dc811fc892d78e042394bb4a1342dea2480b5c", - "sha256": "0n1w3rycc5cpqvhw6d1dzkwjdy1xx7bps7d994l4hcpdfx5c25lx" + "commit": "151d264a0d0593b413b5a984b391023e905a190b", + "sha256": "04cv6p9df7h6w9h2ina3y3mmkp0y1rs6d9wmzari0cbm7q50hz4l" }, "stable": { "version": [ @@ -39989,8 +40022,8 @@ "deps": [ "cl-lib" ], - "commit": "d9b6d549251d4a1a7cec2e83b11bda2ef7ff4ed2", - "sha256": "0246kl945g5v539h1hvwg06jsmj10a4q8rld3g6jix2iy1jmnfw7" + "commit": "7b451bb813d242dbc0cd6c29d071e0b320f2200e", + "sha256": "0wvbjc40f3bph7vhkixnrqa7k18f5jl81zdvdrr3fplkqnm3vxwj" }, "stable": { "version": [ @@ -40728,8 +40761,8 @@ "repo": "emacs-geiser/gauche", "unstable": { "version": [ - 20200801, - 2337 + 20200802, + 1300 ], "deps": [ "geiser" @@ -41316,15 +41349,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210619, - 1405 + 20210727, + 1414 ], "deps": [ "let-alist", "treepy" ], - "commit": "865424d4faf66048bfb3752856ac0cf68e1c6efe", - "sha256": "0kqjxwkm3n6r9zg6pi015g9ix4pyz7b2rngcmmrindcjb5h292a4" + "commit": "00a77b79c28e22db1b151c3f7857073ccbeff726", + "sha256": "0qrp2n53fhvwr5ndnmfzh841g88hzmcgz3i54hbcqq1gj6vwqd7f" }, "stable": { "version": [ @@ -41690,8 +41723,8 @@ "transient", "with-editor" ], - "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", - "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" + "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", + "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" }, "stable": { "version": [ @@ -42343,11 +42376,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210402, - 1246 + 20210718, + 824 ], - "commit": "633b7371a6a00660422e195795c4b79f16bf29ae", - "sha256": "1wqnar0y6migb5n4hkz98r5bpxxx9m4qn15wg9cz213jpnykfkyy" + "commit": "98d759473ddfdddba0d82ff710aafc9ee6f0490b", + "sha256": "084scd1prj0i1ljz6l298a4yknqkj4rjl9yjvqmd605ac8ji3xh1" }, "stable": { "version": [ @@ -44593,8 +44626,8 @@ "magit-popup", "s" ], - "commit": "7822b34eb5d359ddae2f93d356c78c5ea05784d5", - "sha256": "0qkznd0a6cc32mwnmsa28lr8zji2nsi87kzcn467hq542zr61nz6" + "commit": "19e1a8188e003bae250ff6c40f61a31b638ce35d", + "sha256": "0iajd0qdcgh4vvl3f81z4r1pki9wkzy3hrywp1mmm5zhfncvhfis" }, "stable": { "version": [ @@ -46645,16 +46678,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210714, - 1600 + 20210729, + 1510 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c", - "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37" + "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", + "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" }, "stable": { "version": [ @@ -46939,16 +46972,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20201214, - 2111 + 20210725, + 1510 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", - "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" + "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", + "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" }, "stable": { "version": [ @@ -47559,8 +47592,8 @@ "deps": [ "async" ], - "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c", - "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37" + "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", + "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" }, "stable": { "version": [ @@ -48406,26 +48439,26 @@ "repo": "masutaka/emacs-helm-ghq", "unstable": { "version": [ - 20190526, - 1409 + 20210724, + 744 ], "deps": [ "helm" ], - "commit": "d0d6aa0f407388e7012f0443df8ae657ece01779", - "sha256": "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082" + "commit": "7b47ac91e42762f2ecbbceeaadc05b86c9fe5f14", + "sha256": "0a4piipqnsj0rnwmqz3vj674ljmy1bl33qr9hv959pw5b3jzqfh0" }, "stable": { "version": [ 1, 8, - 0 + 1 ], "deps": [ "helm" ], - "commit": "d0d6aa0f407388e7012f0443df8ae657ece01779", - "sha256": "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082" + "commit": "7b47ac91e42762f2ecbbceeaadc05b86c9fe5f14", + "sha256": "0a4piipqnsj0rnwmqz3vj674ljmy1bl33qr9hv959pw5b3jzqfh0" } }, { @@ -48734,26 +48767,26 @@ "repo": "masutaka/emacs-helm-hatena-bookmark", "unstable": { "version": [ - 20190609, - 1455 + 20210724, + 732 ], "deps": [ "helm" ], - "commit": "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e", - "sha256": "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1" + "commit": "a6a2b37370ac84ca2cae5ef65b2b144a010b1584", + "sha256": "0zwngldnh6ys9m7v0fc4nwk1bcrwqvip08114vn4dcv8kl3lnxvv" }, "stable": { "version": [ 2, 4, - 3 + 4 ], "deps": [ "helm" ], - "commit": "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e", - "sha256": "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1" + "commit": "a6a2b37370ac84ca2cae5ef65b2b144a010b1584", + "sha256": "0zwngldnh6ys9m7v0fc4nwk1bcrwqvip08114vn4dcv8kl3lnxvv" } }, { @@ -49145,8 +49178,8 @@ "repo": "julienXX/helm-lobste.rs", "unstable": { "version": [ - 20150211, - 2214 + 20150213, + 1546 ], "deps": [ "cl-lib", @@ -49164,14 +49197,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20210324, - 1515 + 20210729, + 911 ], "deps": [ "helm" ], - "commit": "48696448e52d266f5b2cb5ee1390071dab4d16e8", - "sha256": "1nhza9af2xfwq1idk4g69kr4wyyf9samk3vi40jvkfnwap4w3ip4" + "commit": "d861fb407d72470db41ac458447b92c6d9b00206", + "sha256": "13hxglh5w70w5y7x4r7rqpa7npj4lfrajjjic8vizn71752cndkg" }, "stable": { "version": [ @@ -54285,15 +54318,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20210614, - 1212 + 20210728, + 846 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "f52ad0b4770403561b40f1d0499ecaca70da886c", - "sha256": "1ai5ha67650ryj7mdxx6b86hlm2v13h7kipisgvxj5dss3j9j7lv" + "commit": "be578820a7e14cb4264a63eac272800a3540a7f3", + "sha256": "174xlr36n8iv8gmapmfy55jgppmbck0m51yhni35674f50q8200y" }, "stable": { "version": [ @@ -55152,26 +55185,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210322, - 1421 + 20210723, + 718 ], "deps": [ "clojure-mode" ], - "commit": "a2cebf5362fe583538dda8dcf6348a8d73b462a2", - "sha256": "0sfn6x08i7sd2k6z4swpd8hxaab3ly0gfyapcaq768chi0grr0gw" + "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8", + "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ "clojure-mode" ], - "commit": "2c8e46b584be71fe1a585c9072da86382710dc59", - "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b" + "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8", + "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy" } }, { @@ -55911,8 +55944,8 @@ "repo": "dcjohnson/inverse-acme-theme", "unstable": { "version": [ - 20170615, - 1337 + 20210204, + 1640 ], "deps": [ "autothemer", @@ -56432,11 +56465,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210602, - 1349 + 20210727, + 1907 ], - "commit": "56139df678d9886d0612c0a192cce2cf6f156628", - "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" + "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", + "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" }, "stable": { "version": [ @@ -56463,8 +56496,8 @@ "avy", "ivy" ], - "commit": "56139df678d9886d0612c0a192cce2cf6f156628", - "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" + "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", + "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" }, "stable": { "version": [ @@ -56496,8 +56529,8 @@ "cl-lib", "swiper" ], - "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", - "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" + "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", + "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" }, "stable": { "version": [ @@ -56831,8 +56864,8 @@ "hydra", "ivy" ], - "commit": "56139df678d9886d0612c0a192cce2cf6f156628", - "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" + "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", + "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" }, "stable": { "version": [ @@ -57039,8 +57072,8 @@ "ivy", "prescient" ], - "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", - "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" + "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", + "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" }, "stable": { "version": [ @@ -58915,14 +58948,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20210627, - 1451 + 20210726, + 1251 ], "deps": [ "dash" ], - "commit": "404ebe3ca964fde99b7a6d89d2840ce53376d80a", - "sha256": "1ddkljjmvbm35gdw6wnys2na19826wxxgydlikn52nvchvr5z5z9" + "commit": "63c0f44fe7b5a333173235db7102ef8c2ae0b006", + "sha256": "1l7v5ibbl52ylbnz92ipw10ds8ahj3s2q4yxansnj8xy19kpjchz" }, "stable": { "version": [ @@ -59071,8 +59104,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210722, - 426 + 20210728, + 523 ], "deps": [ "dash", @@ -59081,8 +59114,8 @@ "spinner", "vterm" ], - "commit": "e4035da5322b9528b9751a0305a0feaa28e181fb", - "sha256": "1rpcsw7ddg7cs5mha7sn4j719rkvk04vwsri1y6d1c80y2fdlr10" + "commit": "7652679de3118c10659fdc492d67ec097e9ef46e", + "sha256": "1n41bvrrnqgj3qijdn4s7zac4xrfvyh759q99agycbsm1xdpkrvj" }, "stable": { "version": [ @@ -59645,28 +59678,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210605, - 1117 + 20210727, + 1225 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7eb08e47bc5f227c72c318ff327c689ab54a7620", - "sha256": "181vnz6ancqhb13w9890pbplnw6lzbzcx3xkg4li9fk10lab72zk" + "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60", + "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g" }, "stable": { "version": [ 1, 6, - 4 + 5 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "c50bc11fdd42dc98ff806d1fc7cd94619c0ab7bb", - "sha256": "08ypmv43vjk1l409n894jxplnja6nicn2k3qwhwaf9qxhz0yxpjr" + "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60", + "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g" } }, { @@ -59771,11 +59804,11 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20210628, - 729 + 20210110, + 630 ], - "commit": "fd7d380b762c888f25435d0c241012cdabf6e288", - "sha256": "1623hqlyk7qlvb5kigkyiji98a2vp39y0v6smag2mnqa3r89jq7l" + "commit": "515343a7667b2bf4253309449f65a6eb94933df7", + "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" }, "stable": { "version": [ @@ -60454,8 +60487,8 @@ 20210318, 2106 ], - "commit": "143ba31a0a5c23d8c1a8d6fb1972d94cc1d7f31c", - "sha256": "1daisqp687p0bpjk8mj7c3sxq9clwi25byzbk7yx8l15rcr1bhr5" + "commit": "a55ad400a52e038f110df10d8f3c1e822b90f76c", + "sha256": "06kwhj190k7g5hqy9ibgphf1xrhkhzp36d0d3kqbqkdfc4jx7xaj" }, "stable": { "version": [ @@ -60475,15 +60508,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210723, - 443 + 20210724, + 1237 ], "deps": [ "elquery", "request" ], - "commit": "c0c597d1e1653112f3e10c67dcc22d85beb2aed8", - "sha256": "1k056qzw3a4i4icyrl1a0dv971jnl5d096hawj5qhgwslplrhdpj" + "commit": "71e770ce1e9994cf3e035cbcc7a2f26b1922323c", + "sha256": "0m6insjzl4hc00ank3i5f7y3mq734cbz085yfkm79vziy5j1i2bc" }, "stable": { "version": [ @@ -61007,8 +61040,8 @@ "auctex", "yasnippet" ], - "commit": "9d6f4448347fcf48d0fed51eba16423c9254c212", - "sha256": "0kfivjdjhlrbrn1z6i51y36s6f4qj386iy1jpcbvv33xa0lh5ksi" + "commit": "d6cd35d57ed9cd1728913ee75e42f575f090c3b9", + "sha256": "0i571idikvgryyar4sskl9k31jrn88cax7gm18mm6yfjq33ivk18" }, "stable": { "version": [ @@ -61109,8 +61142,8 @@ "highlight", "math-symbol-lists" ], - "commit": "138e6794122f8601e58731a365930bd7cf5791ea", - "sha256": "0zj3i612h0sih7lyy4zvzldcrgqmsqcvr4y42zv75r81s0l6gddz" + "commit": "4cf69db45aeeb01feb6b38c88b6aa2d01ae4da13", + "sha256": "1ihs24dqnbzj37y9zrwdwzwnr1xrxcs4qxm0z3d1bjalffai2x13" } }, { @@ -61983,8 +62016,8 @@ "repo": "phillord/lentic", "unstable": { "version": [ - 20190102, - 2124 + 20210727, + 1247 ], "deps": [ "dash", @@ -61992,8 +62025,8 @@ "m-buffer", "s" ], - "commit": "e6d013bf570bb235817f6c8f0abdd31d3b456d53", - "sha256": "0ksmb5mvcpa699bw62fkhrx1i8adgrzsbc2fivfsimq54y25rdd7" + "commit": "36861bdf9c1d88492648da553f66529e3a879880", + "sha256": "0cj19czxmrxw1id1ym1ai3k7sv9shl3lz4fqj8qyg73j4kj1gbn0" }, "stable": { "version": [ @@ -62167,15 +62200,30 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20210318, - 1315 + 20210729, + 1808 + ], + "commit": "25c8d839cf78332c15b5762024ccb5f7c90b7a11", + "sha256": "14x4a6dw9ywzl16f4blg7bmb0rvvik5jjldilshjdxf4zpvy80fd" + } + }, + { + "ename": "lf", + "commit": "8073246c85cf632c01c14c48c453e1fd80d49569", + "sha256": "1rs5lik11xqpm624p6l02vdmf0zsmlz422s0d1wlz3f5hnchv7p2", + "fetcher": "github", + "repo": "alhassy/lf", + "unstable": { + "version": [ + 20210729, + 229 ], "deps": [ "dash", - "visual-fill-column" + "s" ], - "commit": "4ded6be2ce3e8dadc5635a534827181a8c8ab602", - "sha256": "116qjizqa83zy6xas5cah58sf22ha05pps2004wfgng487ln9n59" + "commit": "54994d4db09d879c247db9aecdc0b6f27dcb7e6a", + "sha256": "0slv6ix6z0pnwr4rphpyy0fk0ff0bx0h6vqb8qjf85gnwz8l6dwr" } }, { @@ -62270,8 +62318,8 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20200915, - 542 + 20210526, + 623 ], "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" @@ -62437,8 +62485,8 @@ 20210303, 1751 ], - "commit": "3603e4473ce9f81c5d73ba623c1938e152d03723", - "sha256": "1s1wsz8w7i1p509dqvv0ykljlqlr56203k4lrc542vjdnj4ih4z4" + "commit": "ec85691c073f0c3cb5a96d3716c70a93ff207faf", + "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" }, "stable": { "version": [ @@ -62447,7 +62495,7 @@ 0 ], "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f", - "sha256": "02n5yc0nqckfpfxkw8gxigg59769alxvk043c2d9bxgm79zxvhhy" + "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" } }, { @@ -62598,14 +62646,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20150922, - 451 + 20210727, + 1302 ], "deps": [ "avy" ], - "commit": "9fbf196d155016d9b8471a99318ed67a086cf257", - "sha256": "0v2g9gzf2v88ag59q1pf5vhd4qjnz3g4i6gzl27k6fi7pvlxdn39" + "commit": "d3c5bacc9c697c4cf8b14616c4199210f9267068", + "sha256": "1d25lf556c9idr0slzakcks93rcw032bp1hbbcqffrljqzapxz4x" } }, { @@ -63226,8 +63274,8 @@ 20210701, 1955 ], - "commit": "db1f98cc470972f92d72f40b78db4baff5768edd", - "sha256": "1wgqcb4m5nzkbxkvdx801h9d1wqswlqmqbar4282wabgnw78zwwy" + "commit": "23e674f8572f3189fbe3917af6f22e6ec8708818", + "sha256": "1j25p0hmdfyfhlfrdn02q2ng6sgnaqvcjz1ll7rl0liq5acjvd2w" }, "stable": { "version": [ @@ -63367,11 +63415,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20201214, - 1852 + 20210724, + 1250 ], - "commit": "e6dae7465423a5304d0e38e92625383d07fe6f52", - "sha256": "1axxfh96pl2s0c301ak1gjh10k744wafnza3qx4sqaxcka5f6hc9" + "commit": "b4f56e17933d1d4098eeb04ef665a3f18479def9", + "sha256": "0fcz8hz26pwpwbl5dq4w3z6vmnjjjzwckv19zhwxj7bgv9dnm6wa" } }, { @@ -63833,14 +63881,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210710, - 228 + 20210729, + 144 ], "deps": [ "map" ], - "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311", - "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n" + "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", + "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" } }, { @@ -63858,8 +63906,8 @@ "dash", "loopy" ], - "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311", - "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n" + "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", + "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" } }, { @@ -63926,8 +63974,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210715, - 1659 + 20210728, + 201 ], "deps": [ "dap-mode", @@ -63938,8 +63986,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea", - "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n" + "commit": "1237f6762a6c8c8f0618c850a3c9be13655118a3", + "sha256": "0bw940zv6alh4gsryyll4k607c5lpl8fzr8v6qd2v91kydsks848" }, "stable": { "version": [ @@ -64127,8 +64175,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210710, - 1757 + 20210728, + 1739 ], "deps": [ "dap-mode", @@ -64140,8 +64188,8 @@ "request", "treemacs" ], - "commit": "b66a075bcb1edf57b09a0e1c73c3a399596d4760", - "sha256": "1s47y8hd9mnvz858h3sbdbdgrv3d1kdxag8flm44jla4yhgish7g" + "commit": "7ba9c459a484a9ef8d6a59e509c03d761fccde45", + "sha256": "1pi17qxqpaig8x2hpcdhwnvn3a8smgkkspc2a2gb9xwq9bcjglp5" }, "stable": { "version": [ @@ -64357,8 +64405,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210721, - 511 + 20210729, + 732 ], "deps": [ "dash", @@ -64368,8 +64416,8 @@ "markdown-mode", "spinner" ], - "commit": "ac3b7e6efd1f8d4bb92aa4d89fc361fce3208c46", - "sha256": "1gx5y9j259q4iqnp7b58958wnpw8l3fdcs88zx38252givf814nx" + "commit": "f996db04e1159299c4fce2cbf3dc0cfa0e3966c4", + "sha256": "1w903yw2w4gwcz8ma1rpr2il8w76yh6gnifp3p2885r305xhsf5a" }, "stable": { "version": [ @@ -65157,11 +65205,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20200304, - 1323 + 20210728, + 1354 ], - "commit": "e54f934952cde3f96d6a131968295d993b3cf624", - "sha256": "1yivbgbcy5qvs55dn5lx08mbkmsd4mriymas9jgh7rn6hl14x8hj" + "commit": "d221002128b7954fb5705c37b974223514a9c4f0", + "sha256": "0h04i2xif8iqlrp85kp3p34snzhfcgqcf65asd1qblh0qlhp37gn" }, "stable": { "version": [ @@ -65181,8 +65229,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210721, - 1556 + 20210728, + 2026 ], "deps": [ "dash", @@ -65191,8 +65239,8 @@ "transient", "with-editor" ], - "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", - "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" + "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", + "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" }, "stable": { "version": [ @@ -65538,8 +65586,8 @@ "libgit", "magit" ], - "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", - "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" + "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", + "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" }, "stable": { "version": [ @@ -65706,8 +65754,8 @@ "deps": [ "dash" ], - "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", - "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" + "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", + "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" }, "stable": { "version": [ @@ -66501,11 +66549,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210721, - 2100 + 20210729, + 1226 ], - "commit": "a3a8edbf25db4b1e167f1fdff6f60a065d0bf9cb", - "sha256": "0a4ra9fwyj5av4cjyj1y1y1z1kr6dnq39hhf51c072zqw3k3jar9" + "commit": "a36af71f8ac530fbb24700494f5b2a75f2cc0111", + "sha256": "18xxglr557svzmh2j2n6lybxd9rkwmafxfw6zxd6qxn2b11ps0fh" }, "stable": { "version": [ @@ -66621,11 +66669,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210722, - 839 + 20210728, + 756 ], - "commit": "f3c4fd9230252503e3a9f2de6f5d469c4ac270ae", - "sha256": "08snhqw9kyg8vdaz7ibga0pf2j5cg1akjiphs88dgvxkph8m65nr" + "commit": "8158bc8239c531756fbf6602f4b4dea8d52eb4cc", + "sha256": "1g58va0a4m8q82nr16l693wngbbdj3xw07a937a2x21y1pzrgiih" }, "stable": { "version": [ @@ -66964,15 +67012,15 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20210219, - 1431 + 20210729, + 1842 ], "deps": [ "dash", "s" ], - "commit": "08aa7c47ffc85c9cba1c9812e1c14250cc4192e4", - "sha256": "1z371v68aw92iaj5mbsk47mfr44scgkwazbf9i6gzygq84fdm6dh" + "commit": "b6f54d7a53d2ed5c71fc9ab6d65da63103c799bc", + "sha256": "0hzchn5m5r0iv0im43paxbpd00fyv4m1rv53asp1fg2h27zg7xfz" } }, { @@ -67565,18 +67613,19 @@ 20210720, 950 ], - "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", - "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" }, "stable": { "version": [ 4, - 2, + 3, + 1, -4, 412 ], - "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", - "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" } }, { @@ -67594,13 +67643,14 @@ "auto-complete", "merlin" ], - "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", - "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" }, "stable": { "version": [ 4, - 2, + 3, + 1, -4, 412 ], @@ -67608,8 +67658,8 @@ "auto-complete", "merlin" ], - "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", - "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" } }, { @@ -67627,13 +67677,14 @@ "company", "merlin" ], - "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", - "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" }, "stable": { "version": [ 4, - 2, + 3, + 1, -4, 412 ], @@ -67641,8 +67692,8 @@ "company", "merlin" ], - "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", - "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" } }, { @@ -67689,13 +67740,14 @@ "iedit", "merlin" ], - "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", - "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" }, "stable": { "version": [ 4, - 2, + 3, + 1, -4, 412 ], @@ -67703,8 +67755,8 @@ "iedit", "merlin" ], - "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", - "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" + "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", + "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" } }, { @@ -68262,14 +68314,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20210312, - 452 + 20210725, + 900 ], "deps": [ "dash" ], - "commit": "3e67b8e59d46659df4b37dedf75485a366c93600", - "sha256": "1iqdbm90qj90a522qmssbqn5im0kxdw1kxq7z821ss3fag960xw8" + "commit": "fb2fc8661b4a32a40b3f5777ae1d69654c263ff0", + "sha256": "1bv06p6m5xygqcpwxngds2hral58h23jvp3di5dq3ac2hkf2m92l" }, "stable": { "version": [ @@ -69056,20 +69108,20 @@ "repo": "SidharthArya/modular-config.el", "unstable": { "version": [ - 20210629, - 2319 + 20210726, + 1614 ], - "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", - "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" + "commit": "2bd77193fa3a7ec0541db284b4034821a8f59fea", + "sha256": "1bbycd4cr280vl643kvnzyml44mg63yh4i28bbszmj2yrkxy0frj" }, "stable": { "version": [ 0, 0, - 3 + 5 ], - "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", - "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" + "commit": "3c78fde6b7c53857c712408691427536d3c891bc", + "sha256": "057lhrlnyhl0hdp419lvl0fqpkkp3msmzn7gynvqmjig756dra7p" } }, { @@ -69080,11 +69132,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210722, - 1916 + 20210729, + 950 ], - "commit": "fd61a0c67ceafa3aeb0aeebddb93955148376b7e", - "sha256": "0l9gfq4qapa5snskb747jydprb0xvn80rjc83da1vwh4j8s3gavz" + "commit": "7447abafd82a1a7f9696ed5c193ae683609b5b82", + "sha256": "14wwfvc0gn3ciigslvbl8didxiif84ragwzwaya4wcchwjg5vzsj" }, "stable": { "version": [ @@ -69427,11 +69479,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20210615, - 1511 + 20210729, + 1215 ], - "commit": "9d8b2f758098d19781c7c5cdaeda5785e41be039", - "sha256": "1z9pspjrpclxznc9d16lix1zc0yx520jx1nqjbxj3kcwfxzkbbl4" + "commit": "9b679400ca885b8ff51bcfd75b87f79d66c0ee26", + "sha256": "14x3hd0z0nh0dyfi434vqywi7aawfxhlqj6sp7m17np56zq32yhi" }, "stable": { "version": [ @@ -69786,8 +69838,8 @@ 20210306, 1053 ], - "commit": "d08f2a8d96af3ff80aac0e5641d9d20281084038", - "sha256": "1dbpy2bw131g5d166dmw5m4zq7y6h3krm7k1lv33cnbss10kj2fl" + "commit": "87f9ce226a32225cd3dfedde47a21fa16541ae88", + "sha256": "07364nxahcwn77l1xxr5gl9hqf0jc4q6gkzg0gs3wlwbbm9qdaic" }, "stable": { "version": [ @@ -69913,8 +69965,8 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20201026, - 1123 + 20210107, + 1303 ], "deps": [ "libmpdel", @@ -70338,16 +70390,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20210709, - 150 + 20210729, + 1158 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "9fbe402dc5931ba9cafec581ac3e6d86e9a9f2da", - "sha256": "0a73izknp2nkzklkhf9wyxy38fnw4f1jyimdcnh14m1v5bcw2wal" + "commit": "f3f454c7f92e8a9eecb5501af9ca81a547fd1841", + "sha256": "137r0kbd386954ydiwz6g9ff3j5289nqfzkvhp13rjjkrs668332" }, "stable": { "version": [ @@ -70513,8 +70565,8 @@ "repo": "sagarjha/multi-run", "unstable": { "version": [ - 20190507, - 2349 + 20210108, + 336 ], "deps": [ "window-layout" @@ -70564,15 +70616,15 @@ "repo": "suonlight/multi-vterm", "unstable": { "version": [ - 20201203, - 1500 + 20210727, + 1050 ], "deps": [ "project", "vterm" ], - "commit": "934397efd2e78a6b83d2b06ef4e4c281c0ae3c65", - "sha256": "0cz3zs9xd2zbyb9g9r4r893kl9nqk8i9l0zy66s500iy5522vcnh" + "commit": "a3df7218c1ecadef779e2c47815201052283f9ea", + "sha256": "0z6321994c4c8f5iya240pzvhirci9idlc110wjjwsm4pzdrrppj" } }, { @@ -72109,8 +72161,8 @@ 20181024, 1439 ], - "commit": "c8f8f2a9e3016ab7a9ecb2e8b084cf441f3ae88e", - "sha256": "1nj7w0dgvhmqy5hkdn0idf468x7s2h2y5372j13w3x1fkdcnyln8" + "commit": "d52a43d105040b92442e7c6657b50a2188b80ebd", + "sha256": "1pikcr0m533l03ffkwv9ak5w1zqcln3ar28km2052330mq93gpj4" }, "stable": { "version": [ @@ -72411,16 +72463,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210716, - 1030 + 20210729, + 953 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "50a6a7a58bc0316a9acc2b972380692f7438d9ed", - "sha256": "0q86wzl4va5xjj7czh6ldypwgb09gv8gp7kqi449bhx984a1yq7n" + "commit": "3a2fc7da6c6cfaba15fabcf1f3c9cf57b016c362", + "sha256": "1z91i6kl0bpsk87rl0ysfm8wifb3a196r82bxb6wlk6lkxlqr8jq" } }, { @@ -72702,8 +72754,8 @@ "repo": "esessoms/nofrils-theme", "unstable": { "version": [ - 20180227, - 2153 + 20180620, + 1248 ], "commit": "98ad7bfaff1d85b33dc162645670285b067c6f92", "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs" @@ -72809,11 +72861,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210719, - 1132 + 20210725, + 1815 ], - "commit": "bed62eb8bee4aeca1fabfa5e302b515849f50b31", - "sha256": "00mixvwwhrmmr7wcscyzdhwhbnfiha0b0lcx1f3zk5xyshll2y9n" + "commit": "b649b0c871e7fbfcd15a24d51b071bad2680e5d2", + "sha256": "1jvibldc37whindnq64ghnj6iha1k3nvvj8bkv9s2fm90g7y4zy1" }, "stable": { "version": [ @@ -72993,8 +73045,8 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200812, - 1850 + 20210601, + 1122 ], "deps": [ "jest", @@ -74629,8 +74681,8 @@ 20210617, 1726 ], - "commit": "121f3913f5dad7468b33d4a5ca19e7a687d2ecfc", - "sha256": "104jaqllwzcikk17iajgnjnnqchgivj210mhrx07qrk5vy5qwv5d" + "commit": "269984a50006efe282c693a6315962c92749296a", + "sha256": "19w93zpffybb4zb0h12rvyfh0857f1vf3hyr1r7rmgwyslfgp6gh" }, "stable": { "version": [ @@ -75189,8 +75241,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20201220, - 906 + 20210725, + 1955 ], "deps": [ "auto-complete", @@ -75202,8 +75254,8 @@ "popup", "s" ], - "commit": "5fad6835bee15792774183164dd423ba18cf1e01", - "sha256": "1ww202j6bh8ycw2wfngy9rw1hv5qrjg66bgp2yj28j12ag1qxn2r" + "commit": "e276ff140666057c6d6848f9cfc84a82e3a7650c", + "sha256": "0aicn5s368s6ks4dq5b8xga0ifijd4lkqawzs0a4y58z8s922h69" }, "stable": { "version": [ @@ -77016,16 +77068,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210719, - 2242 + 20210727, + 519 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "2ea00944a7426012cda95cede99e49470f1383aa", - "sha256": "179h5j0k79hbbxz2n3x6hm1v2ws9qii6n8zx4800avbq1fgsh792" + "commit": "c8b05805f897b5325e12d94e4f10a287219db44d", + "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4" }, "stable": { "version": [ @@ -77169,14 +77221,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210704, - 2214 + 20210724, + 1406 ], "deps": [ "all-the-icons" ], - "commit": "40d40c1e6187ec9c13292beb3f7f319f189264d8", - "sha256": "0253i9hvq9yki97jmdrvbv82xbgdrq76l73frq6xbbzzhw6615m6" + "commit": "e34c314b84a0c2aef50772baa7c849f54323f598", + "sha256": "0bq1fl8qn3sf9wmqjj27ii42b95g501c16dbwziapvm3jhw3cz6h" } }, { @@ -77423,14 +77475,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210716, - 2237 + 20210728, + 2037 ], "deps": [ "htmlize" ], - "commit": "7cedeeece58879e05d3a3bab8af1385006f234df", - "sha256": "0gw34smbw9v0f3xwjci7zsj8hbnqd54yzbph6az65r5634nqhiv2" + "commit": "bb51a47513d1c4232aca8ca2c705ec57bd174b4b", + "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp" } }, { @@ -78251,8 +78303,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210510, - 1614 + 20210726, + 1533 ], "deps": [ "bibtex-completion", @@ -78267,8 +78319,8 @@ "pdf-tools", "s" ], - "commit": "8aa2bb45268f660956151547533689d4ec30378d", - "sha256": "0ihjjmysldxx8n3q7mi06p5ydxknxy347c9lf3gnlgzcc776a49v" + "commit": "839ca73f3ae451efbf82859dcd17b63375cb8d76", + "sha256": "0zhzxmwlgwa0c27rfqpbpz7k477mm5ahhxyvmkvk6nafv5gdryc6" }, "stable": { "version": [ @@ -78394,8 +78446,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210721, - 1746 + 20210729, + 1527 ], "deps": [ "dash", @@ -78405,8 +78457,8 @@ "magit-section", "org" ], - "commit": "9c10a3c04c06d1658a63d44927e385e2d97854d6", - "sha256": "0kd7wkd6k37ahsgmcjcs0msp02x6vfkq8gdih210yp2w6vz10hhy" + "commit": "127d6efa485c2d7846e1ec88954f4bf93623281f", + "sha256": "1663brqgysfkn5ja26jm6f4rf8zjdvrbbfkwi0xcfkac2sg2f4bq" }, "stable": { "version": [ @@ -78434,16 +78486,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210720, - 1306 + 20210729, + 1238 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "13de4262d87debdbc43f8e2bd72b991b7284e705", - "sha256": "0iizd5vzxxl7fsm7k4y7dwisipsqwc3xqn33nk8r4c182mga3d9c" + "commit": "919ec8d837a7a3bd25232bdba17a0208efaefb2a", + "sha256": "0ir7516ngagf8mvy3qdir50bfigrqd2pl45c4g2y5cih5lvmfsn6" }, "stable": { "version": [ @@ -78468,8 +78520,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210521, - 1055 + 20210723, + 1424 ], "deps": [ "dash", @@ -78479,8 +78531,8 @@ "s", "simple-httpd" ], - "commit": "a0f82bf41e318d4ef606a26f54054262ed6c3441", - "sha256": "06j8wabbxay9h8ca4pbv5xgjygfzbb3kbk4icni3lrfj6izsp3i4" + "commit": "35cd20280428470d37c1bff18d26cd49436ec3a2", + "sha256": "0xf229xkvzwaxwg2aqxgxpsi89aw3dp76ixhpkwyx6l52798nznf" }, "stable": { "version": [ @@ -78879,8 +78931,8 @@ "s", "ts" ], - "commit": "f5e80e4d0da6b2eeda9ba21e021838fa6a495376", - "sha256": "18q1af3hjjbsny9lxqjsq68qjzzpdjqgx7npg7pl7k3hzdjaj42f" + "commit": "a5557ea4f51571ee9def3cd9a1ab1c38f1a27af7", + "sha256": "1xbdkscg32pqpwzs50igdwkyi2k2mgi01wkqm7rc6bhrpgsk9gkw" }, "stable": { "version": [ @@ -78936,8 +78988,8 @@ "repo": "arbox/org-sync", "unstable": { "version": [ - 20181203, - 2242 + 20181204, + 23 ], "deps": [ "cl-lib", @@ -79041,15 +79093,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210527, - 1130 + 20210729, + 929 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "20193bf9b07efba03fdd5ffb2852cd43fcd88051", - "sha256": "0diccvg4gx9djayihd1hp39q5n2s8cahck93s5r58vk0d4jlcyyk" + "commit": "69e7dcb50278ff0d7b220cda9562d4fe7e4db0ec", + "sha256": "0wyqjzb2ph7092ghrnq0gxaf4r57mvcm0007kqpzqvknc3byd38d" } }, { @@ -80960,14 +81012,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20210518, - 108 + 20210727, + 117 ], "deps": [ "org" ], - "commit": "290b5d6b659addf99cb96a316fb24caa90ad0e77", - "sha256": "04isqw4wfn5hq772sf0szq2rc3b8finhgjc5cna2sw7bhfgycywb" + "commit": "8345ceb90ff1314d598c6b67ba6ee7616e2b0bc4", + "sha256": "09x5dr4kc9pxz8iw1ibl262164akr1m5gms5cws2q3zy04qjqfzl" }, "stable": { "version": [ @@ -81760,14 +81812,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210707, - 1424 + 20210724, + 1143 ], "deps": [ "cl-lib" ], - "commit": "eea82edcbcc95e9cd35e33243d77adeb88ec7edc", - "sha256": "018pihaz1msmizhfjqwsp4d1aa9idiri4nrf6ifkpp6v6j8k7mva" + "commit": "01246e739da2eded6e007631861cada633302faa", + "sha256": "03w5yaivh2zc8c42zrfqmrlcc8lkmg3jjxa7sf223bwq1v9xypdj" }, "stable": { "version": [ @@ -81864,11 +81916,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20210608, - 1406 + 20210724, + 1700 ], - "commit": "1e30d097de8939c4aa380915d3ba3060a87ce3c6", - "sha256": "0wmf3pfjvxrv86mpvbkn5n4drc20yc12fwm4k6a613br0bs75gan" + "commit": "895ab23f970f954349ccb6c89d397ad7d86087f8", + "sha256": "0maa3w06wx54f482z2k6d0vq8mr01j75nnbb7d0mjw15d6qi7pbk" } }, { @@ -82692,15 +82744,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20200419, - 1124 + 20210729, + 1657 ], "deps": [ "a", "parseclj" ], - "commit": "90cfe3df51b96f85e346f336c0a0ee6bf7fee508", - "sha256": "0fhmxj8qjhpqzmj07phf1njkjryc6d2qqqcl4f515b6hly1l41kz" + "commit": "7b9ca20b398ca0ca0e3005e84c16f23aab49b667", + "sha256": "0knv5m6w7v9zi94b6qi861r271l49pxzmwzp4nm595c33lxagqj2" }, "stable": { "version": [ @@ -83188,11 +83240,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210722, - 329 + 20210729, + 331 ], - "commit": "36139ba64f43a3d3f4090ef0118bcebfef7e20c9", - "sha256": "1isab23shk1gfk54z4ppbnnkrm527rzb9cvbqqa47s8gv9k7zbnm" + "commit": "7d444d5793c779a863d5834572c1dae4d87a250b", + "sha256": "0mvpbv0y25qvk42yrhkawbimff92mbd8kgpcb8rb3lvdjv4mh0n0" } }, { @@ -84197,14 +84249,14 @@ "repo": "OVYA/php-cs-fixer", "unstable": { "version": [ - 20201126, - 1538 + 20210729, + 1022 ], "deps": [ "cl-lib" ], - "commit": "c5b5d8a4986b31bade5e2a57131469bf90630db8", - "sha256": "0v6nhyrkcb4nw1b0d30wlns0f82h5a8i7wf5jsb0wjlbqgxabx4b" + "commit": "cc9a3624dcdc72d748d91e3d7cdb8544a1d85a51", + "sha256": "1iiazmyzr6gxwsdpx687j0zp3s1zs0rk4kgv4hicl9mjda2f7dmz" }, "stable": { "version": [ @@ -84265,20 +84317,20 @@ "repo": "vpxyz/php-quickhelp", "unstable": { "version": [ - 20210721, - 1945 + 20210725, + 1413 ], - "commit": "f22e6d31aad504094b441e2f635869fc97939ddf", - "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84" + "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", + "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" }, "stable": { "version": [ 0, 5, - 3 + 4 ], - "commit": "f22e6d31aad504094b441e2f635869fc97939ddf", - "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84" + "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", + "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" } }, { @@ -86784,11 +86836,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210723, - 143 + 20210724, + 1756 ], - "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", - "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" + "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", + "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" }, "stable": { "version": [ @@ -86853,14 +86905,14 @@ "unstable": { "version": [ 20210606, - 1150 + 1152 ], "deps": [ "iter2", "nvm" ], - "commit": "85c9349de2730b71c5796e342d67efee34faa9ed", - "sha256": "06gcqnd6wwcxqij4gx06y16kcqsh5znhs7hi5kwhzrbvqvqvrki8" + "commit": "e38d21a885e234af9ea6b03f499c487175570571", + "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8" }, "stable": { "version": [ @@ -87952,8 +88004,8 @@ 20200619, 1742 ], - "commit": "d662ec9c2e4f8ca21cb500b25cfe7430511014b2", - "sha256": "1n8ls2pm36imqg98yz20q9nyyxf4z0250mp4aigjcv3c66j8fp2a" + "commit": "53365065d9b8549a5c7b7ef1e7e0fd22926dbd07", + "sha256": "07r0mvflnhhnqc5igmv6r894nrv70a4j6sf9fzz23ka945ss5dgq" }, "stable": { "version": [ @@ -88806,16 +88858,16 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210721, - 1917 + 20210724, + 2207 ], "deps": [ "ivy", "nav-flash", "uci-mode" ], - "commit": "30cce9c134f685d7f2db81aa879e683864a23b66", - "sha256": "0q4q5wziwy2nhv0yyx7k5jx6bccx9lxr4f97njb06j2nvz2x7k1v" + "commit": "7298c3cd798853309bece115848e9d0400a7a627", + "sha256": "049aw0cs8kh4p2113v7f2cxcv9277zby02hxalg86bx0rdy8yaz5" }, "stable": { "version": [ @@ -89010,17 +89062,17 @@ 20210411, 1931 ], - "commit": "a054796d7008f4531b482490f917bdef1454b8fd", - "sha256": "07zs0dzh500xs26ybyfz2z4wigc74l6wq3z1225gnblphhzl4jv9" + "commit": "ca3bc53fd8d628473fba25c7736d0abfac8e4a4a", + "sha256": "0yhkj2468si884x748v0a3jhzyg890fvxv02y5g5v8alpj19j1jj" }, "stable": { "version": [ 2, 9, - 5 + 6 ], - "commit": "ec8219e48f031f93377cc7d862a6f3bf80d76dbf", - "sha256": "1fixqimr8mq0mg5qs8wj4hbrzlw9925x72311is4s5r8phyjaabb" + "commit": "444f654e23de0772036c0e29c8e5745e48a8970c", + "sha256": "15yw69v1cj6zkndk60c2g0dgl0khh8bfm1lrwhjffpdjfc7nkc9a" } }, { @@ -89912,15 +89964,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210720, - 2002 + 20210727, + 1545 ], "deps": [ "faceup", "pos-tip" ], - "commit": "76ca5838cbc266c306aa54964410730f6fd93d88", - "sha256": "1q4cgsi659bk4p1avl6bpzfhlf314432mqjhj3hlyxhf4d3nza8m" + "commit": "ef9a3fed943495ec2b0c8258f8e00307d6434b17", + "sha256": "0rkhkhpjpnp4h3c60ms9637737sfz6nfjlvlgvw0wfa51bvmzimd" } }, { @@ -90869,7 +90921,7 @@ "unstable": { "version": [ 20210513, - 1453 + 2237 ], "deps": [ "load-relative", @@ -92514,8 +92566,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210628, - 1648 + 20210723, + 1236 ], "deps": [ "cl-lib", @@ -92523,8 +92575,8 @@ "popup", "posframe" ], - "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9", - "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237" + "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc", + "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr" }, "stable": { "version": [ @@ -92999,14 +93051,14 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200310, - 1909 + 20210721, + 2314 ], "deps": [ "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -93861,8 +93913,8 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20201011, - 905 + 20201015, + 836 ], "commit": "5daade4836da5b1b2ab26d84128d6c38328a5d52", "sha256": "0fkq8knq023zm538ls4zxghlkn9zf4rfccpmmgfcpad6bdm00cpc" @@ -94024,8 +94076,8 @@ 20200830, 301 ], - "commit": "cff035686cc9505d114115646e4d98edac307512", - "sha256": "0w5bzlsbs5zdk3h8ij019yj7861ggg0a4wcqwq7dm7rwf1bshsl2" + "commit": "bb54b9743aca98017746959e2cf0d9c9e0844110", + "sha256": "0yj3ivxbzgv2x96jsagnvn059hh7r65qpmz7gv76l8b6qnfr1i80" } }, { @@ -94524,8 +94576,8 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210524, - 354 + 20210530, + 624 ], "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" @@ -94866,15 +94918,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210425, - 1720 + 20210724, + 1756 ], "deps": [ "prescient", "selectrum" ], - "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", - "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" + "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", + "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" }, "stable": { "version": [ @@ -95885,11 +95937,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210721, - 148 + 20210725, + 2353 ], - "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d", - "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx" + "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", + "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" } }, { @@ -96536,14 +96588,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210206, - 2015 + 20210729, + 611 ], "deps": [ "cl-lib" ], - "commit": "7b17fcc467e485dce5550be901d26223b8ad3f23", - "sha256": "1ksckai0hr2345vpjsahv0kzk8h52vrg2wki290v5aj64iy2nw76" + "commit": "9601e6b15f36d2e3a721043820a650413cbee42b", + "sha256": "1mclkg8frsljzcklfbbbnr72i9i990ag41n2iivbf1p27xbcp5cc" } }, { @@ -97202,11 +97254,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210721, - 1756 + 20210729, + 1613 ], - "commit": "e8f57c09cb4cc857887310e61eed7325500e9998", - "sha256": "1ipbi9h1p943mxzyc81wyrpyah41dhg33kmb3y9cy6avr2pkm1ry" + "commit": "540a8c5b9a04af0a6907e07cb070f1fed8a76f48", + "sha256": "13m15gcsqmagxmjvn28kd5rhh0ly7d4p4malhg5m7cbbms4svv68" }, "stable": { "version": [ @@ -98436,14 +98488,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210112, - 1050 + 20210724, + 703 ], "deps": [ "dash" ], - "commit": "8271679a627148c96ad894f960cec9b1abfb1e6c", - "sha256": "1xrya65z54si9cf64whllq7vhw5dnafal9q2m4jf62jvxmbjdfsi" + "commit": "e281635dbaecb1715805a604f3404e7143a19356", + "sha256": "0a1sv5x49adj5s26khandc86y844vqk7241jc5qsli2dvdbxsqdg" }, "stable": { "version": [ @@ -99839,11 +99891,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210721, - 125 + 20210727, + 1800 ], - "commit": "de1fdca07229e5d43c18cb3dc300397849eeab78", - "sha256": "0vdlcy211zx3fr8vcl6hm8xj8v3wkjj4y7pjcni9g87iijzf6gx2" + "commit": "70935753de73724f338700725462dec2cfda90f7", + "sha256": "1z1cvkbxpw28pgi6fzmkk1w6ha339pw09qy1hzppis8haijj0zxs" }, "stable": { "version": [ @@ -99956,11 +100008,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210714, + 20210724, 951 ], - "commit": "1c8f8779f20479e55f9d3d1151f1f68c1dff56f2", - "sha256": "0vcs6bz3qzw06c7bs253m9q2l43k8nppzdv7hqbybcdh4fakp8xw" + "commit": "2642659aa4cb882d95d84f780e8f8bf5e3a9114b", + "sha256": "1fivfpadw14cw9f78jpjhn7zl1b9sh3jhh7g8lh7f62kjv2p0a9m" } }, { @@ -100432,20 +100484,20 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20210712, - 755 + 20210729, + 658 ], - "commit": "bf60b0c943cc0934aa188ada7c1c16053517df07", - "sha256": "077qxldhya397ka96786w0876bwa77x0il3zwixa9pcbqmqsg8qd" + "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a", + "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd" }, "stable": { "version": [ 1, 0, - 13 + 14 ], - "commit": "96a9baf4936df43b9f46804629384b79238691c3", - "sha256": "1v8h05m7iwxqp7lypdngib2620z0x23zc715vxqpqys79djwh9yh" + "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a", + "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd" } }, { @@ -101380,8 +101432,8 @@ "deps": [ "ivy" ], - "commit": "56139df678d9886d0612c0a192cce2cf6f156628", - "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" + "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", + "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" }, "stable": { "version": [ @@ -101591,14 +101643,14 @@ "url": "https://tildegit.org/contrapunctus/sxiv", "unstable": { "version": [ - 20210713, - 1845 + 20210514, + 918 ], "deps": [ "dash" ], - "commit": "14057b156dd57610edf101403e653be874a342bb", - "sha256": "14wh7fw45w5cfdqibrcfzahsf4cwbi97xp16jd773ynkcf049cjs" + "commit": "028409c3a9ff7ba33a1cc2158abfc1793ed50717", + "sha256": "0zscfz1f6sgf4b9arfj9bmyvxqlpphm7q36k73zn5hn28kzd9di4" }, "stable": { "version": [ @@ -101711,8 +101763,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210720, - 1708 + 20210727, + 1646 ], "deps": [ "evil", @@ -101724,8 +101776,8 @@ "seq", "undo-tree" ], - "commit": "acd0874024018a3352761ffef3ca88916370b195", - "sha256": "17fi4jzsfp2k1fp772b75ihjsg602qyc1vzc0k6vv0p05kiv8s2x" + "commit": "e775e97d5bca462571078f727796727088833949", + "sha256": "0gmwkn5az4xrz9d85xd16bg1h8p5mph344800pqcpapqs389cpba" }, "stable": { "version": [ @@ -101958,15 +102010,15 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210722, - 1112 + 20210727, + 1827 ], "deps": [ "hide-lines", "ov" ], - "commit": "e18d74d8a12b943a3a64eb8c693981e55aea8e9a", - "sha256": "0snf3pjnhff0r7v4iwqqq3568h0a4ff7b2s3axssxk4rfg8bm3ks" + "commit": "299042e1ce65bea0728bc56b0540a7ab8ab02010", + "sha256": "1y2p74am7v0n9bdzsix0fi6fzhi3pafxr8c2n36cm9hf5xdmb4q1" }, "stable": { "version": [ @@ -102372,11 +102424,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20210417, - 626 + 20210726, + 1827 ], - "commit": "d5ccf6f53d65e80083acdfb0bced6bcd678c6ea9", - "sha256": "1wgk0xngamwgh242wfmxizi5r1ji5dxmr8s542g3p7rgfv5w0qs8" + "commit": "f35b97823f27e8d0f378bbd18b79a61f9e34cc55", + "sha256": "097zvklc90dy90p62fbk5khnysijzmb6knvzyi8m6wba2g32v4mh" }, "stable": { "version": [ @@ -102587,15 +102639,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210711, - 1323 + 20210728, + 1000 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "377531fc19063b490b842e779df9b07195e8c496", - "sha256": "0gmjfw6kz5cflvj3zmyhw9qad850ckvq14k5vys62603yvm53qgw" + "commit": "e3ae2dfe048f25f3929b414279f6ceffbed748cf", + "sha256": "1lawl9gn59qkn7bfp6phzsiaw1nkmz3g38skbzrn86nsk9dczkzl" }, "stable": { "version": [ @@ -102642,16 +102694,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20210322, - 2248 + 20210724, + 1411 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "aebac4658e553902369a3bf465bacc1f07a01106", - "sha256": "1kbxhrlg3pddg10zb9h3ky72f6l67nb5cziv17i3d0shx2z0sw17" + "commit": "ff5fcb2181cf1d52bfc5fb8d76ac37f9cad22ce2", + "sha256": "15l5w4avs3y6mj22k6c1vfvk7az69wiws0yym4vyqmfpdpsmwab2" }, "stable": { "version": [ @@ -103535,14 +103587,14 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20210714, - 1807 + 20210727, + 249 ], "deps": [ "cl-lib" ], - "commit": "bb711c4bb992d7a129dd434a41a356cdaf8c387d", - "sha256": "09i7w2s594ksyi7a9bwpcycn4j7is19jh9kznrk39ar2kc3m118h" + "commit": "32ca76dfa8100a2069ca735e28e19ae87c74f956", + "sha256": "184n2r33d99wmzrnscpl0rqqivmvm17k60gfbrw5yjppq5fl55m3" }, "stable": { "version": [ @@ -103678,8 +103730,8 @@ 20200212, 1903 ], - "commit": "1486e47402a5fa7df9791bd01c7e703671de9de6", - "sha256": "098hf7w27223v0h7090w4s2gcw5ylnj6fdfw3c1ifhblglyrbq1n" + "commit": "00e9095d6b2eeba01ba1b76b4816891d21ccf7e4", + "sha256": "0k9d7zb6l8v7pihgk5spy73jkdab9c7cwc4zwhbd9v65rd6756zj" }, "stable": { "version": [ @@ -104630,10 +104682,10 @@ }, { "ename": "tracking", - "commit": "a2b295656d53fddc76cacc86b239e5648e49e3a4", - "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z", + "commit": "f0f88655608fec94c0a218e261cef10436aa8265", + "sha256": "1708zilyjwx0x27v2izd6yiqs2lfaxw620ikqiyx2fjfvxrf6794", "fetcher": "github", - "repo": "jorgenschaefer/circe", + "repo": "emacs-circe/circe", "unstable": { "version": [ 20210713, @@ -104743,11 +104795,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210721, - 2104 + 20210723, + 1601 ], - "commit": "769219b5f5757f1373a28e993f36b6a41c778651", - "sha256": "1s108ps8l563ywn4k5z64y67fgi3j0c7ln2zz9qi9xfih0lnz81b" + "commit": "efdf91980a6f8bcb151debb877302ead8751ab65", + "sha256": "17gyd76ih8b9f8jw0c47x337lfdynz98xq1kykxs8riwrih1dhip" }, "stable": { "version": [ @@ -105051,14 +105103,14 @@ "repo": "ubolonton/tree-sitter-langs", "unstable": { "version": [ - 20210314, - 1704 + 20210724, + 1056 ], "deps": [ "tree-sitter" ], - "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861", - "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a" + "commit": "a516144aa9b109582e89702e5d76217e8fae907b", + "sha256": "1p2izm6n3r31jjxq8sazkqxnlhvg3kalf10323q246pdq6frk0qz" }, "stable": { "version": [ @@ -105117,8 +105169,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210713, - 2032 + 20210726, + 1955 ], "deps": [ "ace-window", @@ -105130,8 +105182,8 @@ "pfuture", "s" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105167,8 +105219,8 @@ "all-the-icons", "treemacs" ], - "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0", - "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" } }, { @@ -105186,8 +105238,8 @@ "evil", "treemacs" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105216,8 +105268,8 @@ "deps": [ "treemacs" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105248,8 +105300,8 @@ "pfuture", "treemacs" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105281,8 +105333,8 @@ "persp-mode", "treemacs" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105314,8 +105366,8 @@ "perspective", "treemacs" ], - "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0", - "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" } }, { @@ -105333,8 +105385,8 @@ "projectile", "treemacs" ], - "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", - "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" + "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", + "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" }, "stable": { "version": [ @@ -105381,11 +105433,11 @@ "repo": "tilmanrassy/emacs-treeview", "unstable": { "version": [ - 20200921, - 6 + 20210723, + 2256 ], - "commit": "e6012303670d112596e00eb3cb505eb0e0d61d84", - "sha256": "0drjzjwrk7fkcc6q8qbvzf60dgcbnysm482cdvzikc0phzgjpl9n" + "commit": "09c8c1d045c7c8eace61b10b6df9d2f9079de78e", + "sha256": "008m6ckrcc0ddnrc5p9b5agbvsma31bq0094yygv5dwg49lh7ly4" } }, { @@ -107976,8 +108028,8 @@ "repo": "koral/veri-kompass", "unstable": { "version": [ - 20181103, - 1246 + 20200213, + 934 ], "deps": [ "cl-lib", @@ -108563,6 +108615,29 @@ "sha256": "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm" } }, + { + "ename": "vline", + "commit": "515c6cd2efaa2c330122aabd7b23f29d5e4ec27d", + "sha256": "12kwxblqd8zdqhlcacvpd6z732l3ig92vklzbsv90n31k27yzzyn", + "fetcher": "github", + "repo": "emacsorphanage/vline", + "unstable": { + "version": [ + 20120108, + 1245 + ], + "commit": "8cc7947387f8da2888da25538668afa33a1d8662", + "sha256": "0iqnin1z8fxhh59199zakfd6jw7nj7425y642vrxxn043a3s08vw" + }, + "stable": { + "version": [ + 1, + 11 + ], + "commit": "bc29e08c8e04845fb0e09155fe8f5212862f0a92", + "sha256": "1gcskm7p6f3b29ax41hafxjla38qw8cyvazmnn9xmx3pw0hf0jx0" + } + }, { "ename": "vmd-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -108990,11 +109065,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210615, - 103 + 20210728, + 2251 ], - "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d", - "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx" + "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", + "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" } }, { @@ -109998,11 +110073,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210712, - 1852 + 20210728, + 150 ], - "commit": "55fcce0c6143044535bc6825a68f42ca83f58f00", - "sha256": "0bap1k6rzaqvqp7njzikw8clhky1fj78mdcx4zah1y57vhszavcw" + "commit": "cc84b2d0da629ecb62a92e3fd23cbee4ea20ce56", + "sha256": "0h4f1pdkvp92mqp6vy8vk1xbyjfhgccm4fw00kim08mzf0z8zjyy" }, "stable": { "version": [ @@ -110709,8 +110784,8 @@ 20210405, 1410 ], - "commit": "c67784cc0c44dc7c590f1f1f5a979a36b1e8c11d", - "sha256": "0pisq1b2yjfplv64xn33lw38ymmpr8wah84pfnwvzqnlfsn5s1hs" + "commit": "a144cfd1604c308f65f990a1e994ab0d5d7fe244", + "sha256": "0q5ivjaxsw9ci40ap7qavziqjfbarlk7fwqivmndcgwnh0is3ddx" } }, { @@ -111560,11 +111635,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20170821, - 1053 + 20210724, + 159 ], - "commit": "e3ef069ea9fea3a092689d45c94c6211b51d0ea4", - "sha256": "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0" + "commit": "4f9041e7231108bc86ce722c623884146973343b", + "sha256": "1my96vqbwnnqfmh3r93ch6yqka6kqfq3qis9s3dqrmb91zvcjdl0" } }, { @@ -113815,8 +113890,8 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20210129, - 413 + 20210222, + 347 ], "deps": [ "deferred", From 7558fccda464bb9a21050fa6cc7fbe05d8951ebd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 29 Jul 2021 19:20:01 -0300 Subject: [PATCH 0909/1522] elpa-packages 2021-07-29 --- .../emacs/elisp-packages/elpa-generated.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index b164bc676a0..424ef611069 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -3392,6 +3392,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; + sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From c98b490e65d8050d859a41e4f08ef2c57fb0dac8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 29 Jul 2021 19:23:54 -0300 Subject: [PATCH 0910/1522] fixup shell-command-plus duplicated insertion --- .../emacs/elisp-packages/elpa-generated.nix | 45 +++++++------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 424ef611069..13269640355 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -3362,6 +3362,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; + sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shelisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shelisp"; @@ -3377,36 +3392,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; - sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; - sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From 06a13f7353e1181aab65e640ffa971410a6a902a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 22:45:05 +0000 Subject: [PATCH 0911/1522] ipset: 7.11 -> 7.14 --- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 213ae45f48f..dd9fadfd02f 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.11"; + version = "7.14"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30="; + sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; }; nativeBuildInputs = [ pkg-config ]; From 87f0713511da47f05362916dc8a380de02665e82 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Fri, 30 Jul 2021 01:52:32 +0200 Subject: [PATCH 0912/1522] openafs: 1.8.7 -> 1.8.8 Signed-off-by: Marc 'risson' Schmitt --- pkgs/servers/openafs/1.8/module.nix | 43 ----------------------------- pkgs/servers/openafs/1.8/srcs.nix | 6 ++-- 2 files changed, 3 insertions(+), 46 deletions(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 2e33e61c0e5..a2613844d4c 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -18,49 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; - patches = [ - # LINUX 5.8: Replace kernel_setsockopt with new funcs - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch"; - sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab"; - }) - # LINUX 5.8: do not set name field in backing_dev_info - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch"; - sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x"; - }) - # LINUX 5.8: use lru_cache_add - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch"; - sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1"; - }) - # LINUX 5.9: Remove HAVE_UNLOCKED_IOCTL/COMPAT_IOCTL - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch"; - sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl"; - }) - # Linux: Refactor test for 32bit compat - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/4ad1057ab8fd206c9fa8d5e3bdde4f1a8417afdb.patch"; - sha256 = "0v2537wkav78yi8lv6fkd1n6rf2g17igf44rpa3kd0kkidxv5lqr"; - }) - # Linux 5.11: Test 32bit compat with in_compat_syscall - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/ee53dd3bc087a05e22fc4111297a51ddb30013f0.patch"; - sha256 = "0dfab3zk0dmf6iksna5n09lf5dn4f8w43q4irl2yf5dgqm35shkr"; - }) - # Linux: Create wrapper for setattr_prepare - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/5a5d358b02b88d6d2c7a27a75149e35b1de7db38.patch"; - sha256 = "07gywsg41cz5h6iafr4pb0gb9jnsb58xkwn479lw46b3y5jgz7ki"; - }) - # Linux 5.12: Add user_namespace param to inode ops - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/c747b15dd2877e6d17e3e6b940ae78c1e1ccd3ea.patch"; - sha256 = "0bbqmx4nkmfkapk25zrv9ivhhs91rn9dizb1lkfs7a6937q1kaqh"; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index f1fd7ff4c0f..f35903e5091 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0ygsrf65w9sqji2x3jbx3h31vk6513s6nalzxi7p2ryf3xb3lm2k"; + sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "0zri99pxmp4klh8ki5ycnjpf1h21lynn4049s6ywmap1vkpq84yn"; + sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U="; })]; } From c914d8bf3e8f331e4a5b45223f1585cfd88e768c Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Fri, 30 Jul 2021 06:20:55 +0530 Subject: [PATCH 0913/1522] xplr: 0.14.4 -> 0.14.5 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 3ee90dce51c..b84da33df40 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.4"; + version = "0.14.5"; src = fetchCrate { inherit pname version; - sha256 = "1jfclwpip4xvwkvz5g0fb3v04pdnk3ddvkdll0yr7wm0g6p44xfd"; + sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "06iwx3s7h6l9kvd17hx0ihy6zrz4jbfjmdlkyij2fs0fhvas110x"; + cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 7a979a3325733db07f4d91d9dd77b2035d06bfb0 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Fri, 9 Jul 2021 23:08:12 -0400 Subject: [PATCH 0914/1522] difftastic: init at 0.6 --- pkgs/tools/text/difftastic/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/text/difftastic/default.nix diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix new file mode 100644 index 00000000000..3a32f855c0c --- /dev/null +++ b/pkgs/tools/text/difftastic/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "difftastic"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "wilfred"; + repo = pname; + rev = version; + sha256 = "WFvxdRCbTBW1RGn2SvAo2iXn82OO/Z06cZQkIu4eiew="; + }; + + cargoSha256 = "2hRUfIxNVs4uSrEESas3wvvVsZHVocP8aiO7K0NZ+mY="; + + meta = with lib; { + description = "A syntax-aware diff"; + homepage = "https://github.com/Wilfred/difftastic"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6b95e8f4a..ec9d9bedd22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4165,6 +4165,8 @@ in diffstat = callPackage ../tools/text/diffstat { }; + difftastic = callPackage ../tools/text/difftastic { }; + diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { From af3b508ffc243c1d3175e6b5d25b391c6de6f8ba Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 30 Jul 2021 01:11:06 +0000 Subject: [PATCH 0915/1522] exploitdb: 2021-07-28 -> 2021-07-29 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 178d2d80a27..8fdf5ec0d78 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-28"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-cM7VxZRIs5QktjI1YkJGtdxkA1/CXCCuVynyTVCILsI="; + sha256 = "sha256-/ZNQcfDHFFiI3BFyUTcwDUnhbCdxA4GrS8EIjgYgKw8="; }; installPhase = '' From d902365913fd65abc2d5d5298c2b9b0beda2f2ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Jul 2021 03:13:50 +0200 Subject: [PATCH 0916/1522] nixos/bird: fix bird/bird6 description --- nixos/modules/services/networking/bird.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 1923afdf83f..c14adbda3c5 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -10,8 +10,8 @@ let birdBin = if variant == "bird6" then "bird6" else "bird"; birdc = if variant == "bird6" then "birdc6" else "birdc"; descr = - { bird = "1.9.x with IPv4 suport"; - bird6 = "1.9.x with IPv6 suport"; + { bird = "1.6.x with IPv4 support"; + bird6 = "1.6.x with IPv6 support"; bird2 = "2.x"; }.${variant}; in { From 3d43cf8f210632818963160d2df01fc64c76769a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Jul 2021 23:22:50 +0200 Subject: [PATCH 0917/1522] nixos/kea: fix config reload Because the config file gets symlinked to /etc/kea to make reloads work we need to add restart triggers for the actual symlink targets. --- nixos/modules/services/networking/kea.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 72773b83a49..b11402204ae 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -238,6 +238,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + ctrlAgentConfig + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; KillMode = "process"; @@ -269,6 +273,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcp4Config + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp4 -c /etc/kea/dhcp4-server.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; # Kea does not request capabilities by itself @@ -307,6 +315,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcp6Config + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp6 -c /etc/kea/dhcp6-server.conf ${lib.escapeShellArgs cfg.dhcp6.extraArgs}"; # Kea does not request capabilities by itself @@ -343,6 +355,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcpDdnsConfig + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp-ddns -c /etc/kea/dhcp-ddns.conf ${lib.escapeShellArgs cfg.dhcp-ddns.extraArgs}"; AmbientCapabilites = [ From 53e85e512bb026c6f5211e16a72b2ab11b848688 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 30 Jul 2021 04:19:49 +0300 Subject: [PATCH 0918/1522] xonsh: add PYTHONPATH --- pkgs/shells/xonsh/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 41f2c8b4f0a..28f87685166 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -29,6 +29,19 @@ python3Packages.buildPythonApplication rec { find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \; find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . + + substituteInPlace scripts/xon.sh \ + --replace 'python' "${python3Packages.python}/bin/python" + + ''; + + makeWrapperArgs = [ + "--prefix PYTHONPATH : ${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages" + ]; + + postInstall = '' + wrapProgram $out/bin/xon.sh \ + $makeWrapperArgs ''; disabledTests = [ From 1060845f565425109efa12629c367e76595375bd Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Thu, 29 Jul 2021 22:16:40 -0400 Subject: [PATCH 0919/1522] mkcl: fix A recent glibc update removed the deprecated/non-standard const char *const sys_siglist[]; array which contained textual descriptions of the various signal codes. The attached patch is merged to master but has not yet been released. --- pkgs/development/compilers/mkcl/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 3656f1e0dd8..181c75c81b0 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }: with lib; stdenv.mkDerivation rec { pname = "mkcl"; @@ -11,6 +11,15 @@ with lib; stdenv.mkDerivation rec { sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26"; }; + patches = [ + # "Array sys_siglist[] never was part of the public interface. Replace it with calls to psiginfo()." + (fetchpatch { + name = "sys_siglist.patch"; + url = "https://github.com/jcbeaudoin/MKCL/commit/0777dd08254c88676f4f101117b10786b22111d6.patch"; + sha256 = "1dnr1jzha77nrxs22mclrcqyqvxxn6q1sfn35qjs77fi3jcinjsc"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ gmp ]; From d2285de1ba3fb2a547b46b4be84d368e092c9d38 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 30 Jul 2021 05:17:08 +0300 Subject: [PATCH 0920/1522] pcl: 1.11.1 -> 1.12.0 --- pkgs/development/libraries/pcl/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 2b2763b5a05..d940d051815 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , cmake , qhull @@ -18,28 +17,20 @@ , Cocoa , AGL , OpenGL +, withCuda ? false, cudatoolkit }: stdenv.mkDerivation rec { pname = "pcl"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = "${pname}-${version}"; - sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; + sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc"; }; - patches = [ - # Support newer QHull versions (2020.2) - # Backport of https://github.com/PointCloudLibrary/pcl/pull/4540 - (fetchpatch { - url = "https://raw.githubusercontent.com/conda-forge/pcl-feedstock/0b1eff402994a3fb891b44659c261e7e85c8d915/recipe/4540.patch"; - sha256 = "0hhvw6ajigzrarn95aicni73zd3sdgnb8rc3wgjrrg19xs84z138"; - }) - ]; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ qhull @@ -53,11 +44,12 @@ stdenv.mkDerivation rec { qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] + ++ lib.optionals withCuda [ cudatoolkit ]; cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ]; + ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; From 2f216e02f453cf64cb3b06c1e564ea53bdc01fa0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 04:02:17 +0000 Subject: [PATCH 0921/1522] libhdhomerun: 20210224 -> 20210624 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index f8db7075ca7..187382e1f3e 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210224"; + version = "20210624"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256:1y1kwv34qg8nayfkbrxkw8163l46krsfqx8yvkcsc97ilsd3i5mr"; + sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; }; patchPhase = lib.optionalString stdenv.isDarwin '' From 9ce1327fdaea6e0d5bbc256cd897620baca7f138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Thu, 29 Jul 2021 22:52:59 +0700 Subject: [PATCH 0922/1522] python3Packages.palace: init at 0.2.5 --- .../python-modules/palace/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/palace/default.nix diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix new file mode 100644 index 00000000000..60d73bca09f --- /dev/null +++ b/pkgs/development/python-modules/palace/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromSourcehut, pythonOlder +, cmake, cython, alure2, typing-extensions +}: + +buildPythonPackage rec { + pname = "palace"; + version = "0.2.5"; + disabled = pythonOlder "3.6"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "1z0m35y4v1bg6vz680pwdicm9ssryl0q6dm9hfpb8hnifmridpcj"; + }; + + # Nix uses Release CMake configuration instead of what is assumed by palace. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE + ''; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ cython ]; + propagatedBuildInputs = [ alure2 ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + doCheck = false; # FIXME: tests need an audio device + pythonImportsCheck = [ "palace" ]; + + meta = with lib; { + description = "Pythonic Audio Library and Codecs Environment"; + homepage = "https://mcsinyx.gitlab.io/palace"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9708579cabc..1674c487ce1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5083,6 +5083,8 @@ in { paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + palace = callPackage ../development/python-modules/palace { }; + palettable = callPackage ../development/python-modules/palettable { }; # Alias. Added 2020-09-07. From a83ee450bbffa61cfe027c4f10e9d4f81a7041e5 Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 30 Jul 2021 07:21:36 +0300 Subject: [PATCH 0923/1522] pythonPackages.pytube: 10.9.0 -> 10.9.3 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 62824354c67..93ff3936083 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.9.0"; + version = "10.9.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-9kKazy0Fg3YcNIkzgVFQ46Ipn3Dngfnh5DjwRP/fZGg="; + sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo="; }; checkInputs = [ From 00da1ca5a5ab3f4f8c88c9b99312cc77a9bca991 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 30 Jul 2021 08:07:00 +0300 Subject: [PATCH 0924/1522] =?UTF-8?q?transifex-client:=200.13.9=20?= =?UTF-8?q?=E2=86=92=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/text/transifex-client/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 93c2e645309..f1b2928c794 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,23 +1,23 @@ { lib, buildPythonApplication, fetchPypi -, python-slugify, requests, urllib3, six, setuptools }: +, python-slugify, requests, urllib3, six, setuptools, GitPython }: buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.9"; + version = "0.14.3"; propagatedBuildInputs = [ - urllib3 requests python-slugify six setuptools + urllib3 requests python-slugify six setuptools GitPython ]; src = fetchPypi { inherit pname version; - sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f"; + sha256 = "sha256-sKol67lRaYPFa7Bg9KNa1rDrNoT9DtUd48NY8jqK1iw="; }; + # https://github.com/transifex/transifex-client/issues/323 prePatch = '' - substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \ - --replace "six==1.11.0" "six>=1.11.0" \ - --replace "python-slugify<2.0.0" "python-slugify>2.0.0" + substituteInPlace requirements.txt \ + --replace "python-slugify<5.0.0" "python-slugify" ''; # Requires external resources @@ -25,8 +25,8 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://www.transifex.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; description = "Transifex translation service client"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; }; } From 75a0d735246a8996e921f79ba05f744b76ac445f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 05:11:28 +0000 Subject: [PATCH 0925/1522] agi: 2.1.0-dev-20210726 -> 2.1.0-dev-20210729 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 950849cafc4..17a79cda81e 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.1.0-dev-20210726"; + version = "2.1.0-dev-20210729"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-1joE2+lNFs0VmglqLsbyqhj16tfCZ+saQmy1XP3ATBo="; + sha256 = "sha256-CrGZf+EiJfgPYOdz7NYSc6B/hpVpgNMCdRl1jd/nJ2o="; }; nativeBuildInputs = [ From 0b0ebd4c3326b84dbe47730d0bafb5b826cf5a7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:23:43 +0000 Subject: [PATCH 0926/1522] cargo-msrv: 0.7.0 -> 0.8.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 216e8362215..6cc10418fc0 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34="; + sha256 = "sha256-TqrbkTij+XCousADorrzsVVNVYOUEyl5+nhMn4IgaIY="; }; - cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4="; + cargoSha256 = "sha256-cA4a7lqzOXkNZ7ehM/gCqtTyAaY2TH+23bITHBId8wQ="; passthru = { updateScript = nix-update-script { From fc37170d7b3640088878a2215075596ccdcd3af1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:29:16 +0000 Subject: [PATCH 0927/1522] ceph-csi: 3.3.1 -> 3.4.0 --- pkgs/tools/filesystems/ceph-csi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index 7f468c80964..2eaa59b27e5 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.3.1"; + version = "3.4.0"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "16nh4bh8a9s2zbxnnhq1ldww4dzp2fmf5idgq99vkyw2kfp017lf"; + sha256 = "sha256-5+eK+iN6ecWtcmNPjiThCj1rwFaHX3rVCW9lmUCWhU0="; }; preConfigure = '' From 1a980484d6d3c1e738417d38e80bc5809de56b55 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:14:53 -0400 Subject: [PATCH 0928/1522] multimc: change license to asl20 --- pkgs/games/multimc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index aa32efaa940..7ccafd2b860 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -43,7 +43,7 @@ in mkDerivation rec { Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; platforms = platforms.linux; - license = licenses.lgpl21Plus; + license = licenses.asl20; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } From e8d67ac8fc5294a32fd257c757548d9cb0f81190 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:18:05 -0400 Subject: [PATCH 0929/1522] multimc: don't re-distribute package Fixes NixOS#131983 --- pkgs/games/multimc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7ccafd2b860..8e72b958856 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -44,6 +44,9 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.asl20; + # upstream don't want us to re-distribute this application: + # https://github.com/NixOS/nixpkgs/issues/131983 + hydraPlatforms = []; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } From 2833fb0ec751bcc187728aebcfa16e31302236cf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 30 Jul 2021 03:20:36 -0300 Subject: [PATCH 0930/1522] algol68g: init at 2.8.4 --- .../algol68g/0001-plotutils-png-support.diff | 27 +++++++++ .../compilers/algol68g/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff create mode 100644 pkgs/development/compilers/algol68g/default.nix diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff new file mode 100644 index 00000000000..beb3cb1c8bb --- /dev/null +++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff @@ -0,0 +1,27 @@ +diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotutils.c +--- algol68g-2.8.4-old/source/plotutils.c 2016-10-11 18:14:48.000000000 -0300 ++++ algol68g-2.8.4-new/source/plotutils.c 2021-07-30 02:42:29.762627511 -0300 +@@ -1026,10 +1026,10 @@ + X_COORD (&DEVICE (f)) = 0; + Y_COORD (&DEVICE (f)) = 0; + return (PLOTTER (&DEVICE (f))); +- } else if (!strcmp (device_type, "gif")) { +-/*------------------------------------+ +-| Supported plotter type - pseudo GIF | +-+------------------------------------*/ ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "gif")) { ++/*-------------------------------------------+ ++| Supported plotter type - pseudo GIF or PNG | +++-------------------------------------------*/ + char *z = DEREF (char, &A68_PAGE_SIZE (&DEVICE (f))), size[BUFFER_SIZE]; + /* Establish page size */ + if (!scan_int (&z, &(WINDOW_X_SIZE (&DEVICE (f))))) { +@@ -1067,7 +1067,7 @@ + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black"); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no"); +- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); ++ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); + if (PLOTTER (&DEVICE (f)) == NULL) { + diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN); + exit_genie (p, A68_RUNTIME_ERROR); diff --git a/pkgs/development/compilers/algol68g/default.nix b/pkgs/development/compilers/algol68g/default.nix new file mode 100644 index 00000000000..88210ca5b72 --- /dev/null +++ b/pkgs/development/compilers/algol68g/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchurl +, gsl +, plotutils +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "algol68g"; + version = "2.8.4"; + + src = fetchurl { + url = "https://jmvdveer.home.xs4all.nl/${pname}-${version}.tar.gz"; + hash = "sha256-WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA="; + }; + + patches = [ + # add PNG support + ./0001-plotutils-png-support.diff + ]; + + buildInputs = [ + gsl + plotutils + postgresql + ]; + + postInstall = let + pdfdoc = fetchurl { + url = "https://jmvdveer.home.xs4all.nl/learning-algol-68-genie.pdf"; + hash = "sha256-QCwn1e/lVfTYTeolCFErvfMhvwCgsBnASqq2K+NYmlU="; + }; + in + '' + install -m644 ${pdfdoc} $out/share/doc/${pname}/learning-algol-68-genie.pdf + ''; + + meta = with lib; { + homepage = "https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html"; + description = "Algol 68 Genie compiler-interpreter"; + longDescription = '' + Algol 68 Genie (a68g) is a recent checkout hybrid compiler-interpreter, + written from scratch by Marcel van der Veer. It ranks among the most + complete Algol 68 implementations. It implements for example arbitrary + precision arithmetic, complex numbers, parallel processing, partial + parametrisation and formatted transput, as well as support for curses, + regular expressions and sounds. It can be linked to GNU plotutils, the GNU + scientific library and PostgreSQL. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1107717fef8..212e5083160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10672,6 +10672,8 @@ in aldor = callPackage ../development/compilers/aldor { }; + algol68g = callPackage ../development/compilers/algol68g { }; + aliceml = callPackage ../development/compilers/aliceml { }; armips = callPackage ../development/compilers/armips { }; From d7ab681b7aa525b4c3081473ab68dd13ae85c7b2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Jul 2021 09:17:18 +0200 Subject: [PATCH 0931/1522] chromiumBeta: 92.0.4515.107 -> 93.0.4577.18 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 91b5a328371..f7be43f9bd5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,15 +18,15 @@ } }, "beta": { - "version": "92.0.4515.107", - "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", - "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd", + "version": "93.0.4577.18", + "sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x", + "sha256bin64": "1s5qj0pd79qbchq3awhxc86l9vmi6304z7sd9ls9f8q138789cha", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" } } }, From 4e992dcdfc0cb123d52a3a274f84c7163df0de59 Mon Sep 17 00:00:00 2001 From: Elias N Vasylenko Date: Wed, 28 Jul 2021 11:28:08 +0100 Subject: [PATCH 0932/1522] win-spice: 0.11 -> 0.21 This includes updates for three components; usbdk, qxlwddm, and vdagent. The result is updated support from Windows 8.1 to Windows 10. --- .../driver/win-spice/default.nix | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 67ba9b74fbb..2c2cd90f1c2 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -1,51 +1,56 @@ { lib, stdenv, fetchurl, p7zip, win-virtio }: let + version_usbdk = "1.0.22"; src_usbdk_x86 = fetchurl { - url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x86.msi"; - sha256 = "17hv8034wk1xqnanm5jxs4741nl7asps1fdz6lhnrpp6gvj6yg9y"; + url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x86.msi"; + sha256 = "1vr8kv37wz6p3xhawyhwxv0g7y89igkvx30zwmyvlgnkv3h5i317"; }; - src_usbdk_amd64 = fetchurl { - url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x64.msi"; - sha256 = "0alcqsivp33pm8sy0lmkvq7m5yh6mmcmxdl39zjxjra67kw8r2sd"; + url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x64.msi"; + sha256 = "19b64jv6pfimd54y0pphbs1xh25z41bbblz64ih6ag71w6azdxli"; }; + version_qxlwddm = "0.21"; src_qxlwddm = fetchurl { - url = "https://people.redhat.com/~vrozenfe/qxlwddm/qxlwddm-0.11.zip"; - sha256 = "082zdpbh9i3bq2ds8g33rcbcw390jsm7cqf46rrlx02x8r03dm98"; + url = "https://www.spice-space.org/download/windows/qxl-wddm-dod/qxl-wddm-dod-${version_qxlwddm}/spice-qxl-wddm-dod-${version_qxlwddm}.zip"; + sha256 = "0yjq54gxw3lcfghsfs4fzwipa9sgx5b1sn3fss6r5dm7pdvjp20q"; }; + version_vdagent = "0.10.0"; src_vdagent_x86 = fetchurl { - url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x86.zip"; - sha256 = "0d928g49rf4dl79jmvnqh6g864hp1flw1f0384sfp82himm3bxjs"; + url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x86.zip"; + sha256 = "142c0lqsqry9dclji2225ppclkn13gbjl1j0pzx8fp6hgy4i02c1"; }; - src_vdagent_amd64 = fetchurl { - url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x64.zip"; - sha256 = "0djmvm66jcmcyhhbjppccbai45nqpva7vyvry6w8nyc0fwi1vm9l"; + url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x64.zip"; + sha256 = "1x2wcvld531kv17a4ks7sh67nhzxzv7nkhpx391n5vj6d12i8g3i"; }; in stdenv.mkDerivation { # use version number of qxlwddm as qxlwddm is the most important component - name = "win-spice-0.11"; - version = "0.11"; + pname = "win-spice"; + version = version_qxlwddm; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' + runHook preBuild + mkdir -p usbdk/x86 usbdk/amd64 (cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86}) (cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64}) mkdir -p vdagent/x86 vdagent/amd64 - (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86) - (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64) + (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent-win-${version_vdagent}-x86/* .; rm -r vdagent-win-${version_vdagent}-x86) + (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent-win-${version_vdagent}-x64/* .; rm -r vdagent-win-${version_vdagent}-x64) mkdir -p qxlwddm - (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64) - ''; + (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; cd w10) + + runHook postBuild + ''; installPhase = let @@ -57,8 +62,11 @@ stdenv.mkDerivation { # That way it would never matter whether vioserial is installed from win-virtio or win-spice. copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n"; copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch); - in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); + in '' + runHook preInstall + ${(copy "amd64" "w10") + (copy "x86" "w10")} + runHook postInstall + ''; meta = with lib; { description = "Windows SPICE Drivers"; From a68cec5ef28efe2ae7aec658b3fd37675d672ffb Mon Sep 17 00:00:00 2001 From: Elias N Vasylenko Date: Wed, 28 Jul 2021 11:34:19 +0100 Subject: [PATCH 0933/1522] win-virtio: 0.1.141-1 -> 0.1.196-1 this results in Windows version support bumped from 8.1 to 10 --- .../virtualization/driver/win-virtio/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 1f9e21845ce..7de6498ab5b 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,18 +1,20 @@ { lib, stdenv, fetchurl, p7zip }: stdenv.mkDerivation rec { pname = "win-virtio"; - version = "0.1.141-1"; + version = "0.1.196-1"; phases = [ "buildPhase" "installPhase" ]; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - sha256 = "0mn5gcgb9dk59nrw9scdza628yiji4vdkxmixikn9v02kgwnkja3"; + sha256 = "1zj53xybygps66m3v5kzi61vqy987zp6bfgk0qin9pja68qq75vx"; }; buildPhase = '' + runHook preBuild ${p7zip}/bin/7z x $src - ''; + runHook postBuild + ''; installPhase = let @@ -24,12 +26,16 @@ stdenv.mkDerivation rec { {input="viostor"; output="viostor";} {input="viorng"; output="viorng";} ]; - in - lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); + in '' + runHook preInstall + ${lib.concatStringsSep "\n" ((map (copy "amd64" "w10") virtio) ++ (map (copy "x86" "w10") virtio))} + runHook postInstall + ''; meta = with lib; { description = "Windows VirtIO Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; + license = [ licenses.bsd3 ]; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; From 31a0f36b06c82023b31770dec295957686e0788e Mon Sep 17 00:00:00 2001 From: Vanilla Date: Fri, 30 Jul 2021 15:44:00 +0800 Subject: [PATCH 0934/1522] flat-remix-gnome: 20210715 -> 20210716 --- pkgs/data/themes/flat-remix-gnome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index f9eed54534c..28bfb12f4c5 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -6,20 +6,20 @@ stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20210715"; + version = "20210716"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA="; + hash = "sha256-UAWi4MyqtuSzp5TEkVLYJF7+2tzH/aT60ObNOimCJ4o="; }; nativeBuildInputs = [ glib ]; makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20210623/Makefile#L50 + # https://github.com/daniruiz/flat-remix-gnome/blob/20210716/Makefile#L53 mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource ''; From 6eade3f79291ad582a055f92fc1748dc56be86d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 07:45:20 +0000 Subject: [PATCH 0935/1522] droidcam: 1.7.3 -> 1.8.0 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 38d3d6304c6..4284d6dbf9f 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU="; + sha256 = "sha256-A8FHTAeDFaSDp5Bnfv5NmCC7xIFAw3IcHSD4hZp4vwU="; }; nativeBuildInputs = [ From 6660b6b8cc1a8393073b2a3f43eac77e5495e687 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 08:13:17 +0000 Subject: [PATCH 0936/1522] esphome: 1.20.2 -> 1.20.3 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 48c656acf4b..e38f0d48b9b 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-th0UJsLTJ8fAgiIv3HvNrbigFwoJO7gEXObYFV3c3WA="; + sha256 = "1sx2ky7860d8rjfxpbwb176n33icz6q82w4wgd5qr3ldrfjn58vn"; }; patches = [ From 89b511fcdfb8ee144dbd608b5db56097808dc245 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 24 Jul 2021 14:05:25 -0600 Subject: [PATCH 0937/1522] nodePackages.musescore-downloader: init --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 4835 ++++++++++------- 2 files changed, 3022 insertions(+), 1814 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1f2941498af..0737706d404 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -165,6 +165,7 @@ , "mirakurun" , "mocha" , "multi-file-swagger" +, "musescore-downloader" , "neovim" , "netlify-cli" , "nijs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 45cc5cdeac6..d73a86e060f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.3" = { + "@angular-devkit/architect-0.1201.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.3"; + version = "0.1201.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.3.tgz"; - sha512 = "+k8bKcc+j6ml4zxw0buwE3dO4mVtVT57Ro8fxc8GIyJMVDD9bogNB3y5ll8lJa0kP5HJ0tFCUi+hd8CISE+aSg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.4.tgz"; + sha512 = "hGO5NrZxV8Z7sILwokt7H+1sMf+5tJS9PJszvYlIBSzG0LBkOwwLQDb4MD42ATXFru57SXNqMZDVKoi1kTgxAw=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,6 +76,15 @@ let sha512 = "69bM4wYUxbHUuZvx97pxVxzNYPrUPsMuszHpYdS6/lsAgpa15EDuBoQHgob4chFiQaNoG9mzOsumlUkoI3mEbg=="; }; }; + "@angular-devkit/core-12.1.4" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.4.tgz"; + sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; + }; + }; "@angular-devkit/schematics-12.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -94,6 +103,15 @@ let sha512 = "QTfGurkNDdEwNheoe1lILWc4YUNSbqOeXRRkwFp1+QwxwlxXoeJ1zNMAo8ytQodnBRsomw7Wu9l1xSWfOL25nA=="; }; }; + "@angular-devkit/schematics-12.1.4" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz"; + sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; + }; + }; "@angular-devkit/schematics-cli-12.1.3" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -220,6 +238,15 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; + "@apollo/client-3.4.1" = { + name = "_at_apollo_slash_client"; + packageName = "@apollo/client"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.1.tgz"; + sha512 = "CT7ZBSHQD4UG1PDvMS9qOz5ACRIR0b4mBkqjCXEVjteOxA4wpFqUX3dg2bNl+Ok3LwPxFT4b3FwC3+LVcWFa6w=="; + }; + }; "@apollo/protobufjs-1.2.2" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; @@ -247,6 +274,15 @@ let sha512 = "tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw=="; }; }; + "@apollographql/graphql-playground-html-1.6.29" = { + name = "_at_apollographql_slash_graphql-playground-html"; + packageName = "@apollographql/graphql-playground-html"; + version = "1.6.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz"; + sha512 = "xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA=="; + }; + }; "@apollographql/graphql-upload-8-fork-8.1.3" = { name = "_at_apollographql_slash_graphql-upload-8-fork"; packageName = "@apollographql/graphql-upload-8-fork"; @@ -652,15 +688,6 @@ let sha512 = "RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q=="; }; }; - "@babel/plugin-proposal-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; - sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; - }; - }; "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; @@ -1372,15 +1399,6 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.12.17" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.17.tgz"; - sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; - }; - }; "@babel/preset-env-7.14.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; @@ -1435,15 +1453,6 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.17" = { - name = "_at_babel_slash_preset-typescript"; - packageName = "@babel/preset-typescript"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.17.tgz"; - sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; - }; - }; "@babel/preset-typescript-7.14.5" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; @@ -1606,13 +1615,22 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.4.1" = { + "@cdktf/hcl2cdk-0.5.0" = { + name = "_at_cdktf_slash_hcl2cdk"; + packageName = "@cdktf/hcl2cdk"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.5.0.tgz"; + sha512 = "E9/uA3JxXPPVKkiTX6DhUZHkAH5ZFWrNewhJB/woOejTkn7P4saOGxXYgrxiu6MCz2lgN8iE4YNGSTKPcxq8sA=="; + }; + }; + "@cdktf/hcl2json-0.5.0" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.1.tgz"; - sha512 = "yabxBeKkCJvj3gFQmHfsS/P6JaQMBqbyEZ1G67gTCtfkbOSEGib8KWsl3ZA+u5Fs2z5q9M4emLcCBHHPrmSG3g=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.5.0.tgz"; + sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; }; }; "@chemzqm/neovim-5.3.4" = { @@ -2056,22 +2074,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.5" = { + "@expo/config-5.0.6" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.5.tgz"; - sha512 = "r3/Y6mFhOmGqEfhhkUncP6/Qg8Aexg1G66TzDzd97iNezCY2LP9c2hwyN7SwhBv5l1YBNc2zeT556xXe0v4Qgw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.6.tgz"; + sha512 = "KnSEmlRYT4AsxOGa2OPEefeCEJSo4oMZI/2q3/vriiSYlI2J12/YZz2QaZtGUfKD6jm+5hCerYRQcAMhzj5/BA=="; }; }; - "@expo/config-plugins-3.0.5" = { + "@expo/config-plugins-3.0.6" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.5.tgz"; - sha512 = "hHKr6i201QG16ms93XiXwcI1IhDYhITCRt7hWNO1UPxt2Cm7yDOG2YoGkauP0V/nAN3TEocDYbCrltGFBdoCTg=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.6.tgz"; + sha512 = "hJfxEWfsWuqt4WG3X2F74+tL1JrXZomRBgShKLTMw1vvLe4md70rjTLbmaHkcGb+TfY3RtFZSK8p9oqFXCi8KA=="; }; }; "@expo/config-types-42.0.0" = { @@ -2083,22 +2101,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.80" = { + "@expo/dev-server-0.1.81" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.80"; + version = "0.1.81"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.80.tgz"; - sha512 = "+5HaLrd0QM8/CpqDhK9qDghZl1DkdqGz0QnSkPZDexnfZjTrEjPX8aXd0H5mv67W9ev1eUtoiABY6iU0wZ7czg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.81.tgz"; + sha512 = "N/NeD/40aUCVM1m8BFlkQggLiy1HeL0SHx/6SXzyXZNCqcA2TdsZ3RGcvLG2RZlPBknSSixufaABQF482yL3fQ=="; }; }; - "@expo/dev-tools-0.13.110" = { + "@expo/dev-tools-0.13.112" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.110"; + version = "0.13.112"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.110.tgz"; - sha512 = "heG6yXLwN87o0jMn90xstsl5GULNABtDx03/jPS6sy3Yqgf6SiqZpwXCWp+kZgSi+fWFE6TRAsk91eWhLRHjug=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.112.tgz"; + sha512 = "lUjC0Q6HeNGuwLkV3fIeexhx7ccx1+OCd7W6m2g+eGF0hMPKHPfrUED4Q1Sin/Y9d7yZxQqwzCIOMfxzaZ2GxA=="; }; }; "@expo/devcert-1.0.0" = { @@ -2110,49 +2128,49 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.15" = { + "@expo/image-utils-0.3.16" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.15"; + version = "0.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.15.tgz"; - sha512 = "uLJMNZ6ux5nBpLxxP1tUtFjpPG6stv0IGEBug6nVZfwQgR/BAsEao+RqZFqrcKhiXw2rIwhKhkspfWU5G6e1dw=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.16.tgz"; + sha512 = "ZggQK5w7awqYdA/TE0DT02nYxWirQm2r7NNy043zVtzBCtjhLpFpluk1v9W0pH4+nT1ChGk1c67j0mYRKcBkjg=="; }; }; - "@expo/json-file-8.2.31" = { + "@expo/json-file-8.2.32" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.31"; + version = "8.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.31.tgz"; - sha512 = "GvbL1tQnM3kGOM9hG+lwGbPJ/1tX+Sb8ZkqRrJlRpWGRa4DwnpLvIZHlWMb1ug/ye1QC7+RK/KwRZ7xcAXergA=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.32.tgz"; + sha512 = "VnpoEnjMptBQr/zgkfGHd7L8iJBme9g2AVpUIecI+aoW6qmeIRbBViPmyNABgH4UUQn3ObQCxe+q1dAdJo8KGg=="; }; }; - "@expo/metro-config-0.1.80" = { + "@expo/metro-config-0.1.81" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.80"; + version = "0.1.81"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.80.tgz"; - sha512 = "A2jFV4XWNaT/LR7oKkLMFbCNTpI7JWCbns1mmhjA3zKf8k03Kj2mLEoJMI17JtLtz0WuH9hvqr5OuaK7jlmegQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.81.tgz"; + sha512 = "Ta95ohtPChXnuZsCEqMMl4yWqt5hThEY1VULLMe19kT4dPa/rEQ72rtRzpDFH7adNQBRrahTz7kx9rWj6YO+MA=="; }; }; - "@expo/osascript-2.0.29" = { + "@expo/osascript-2.0.30" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.29"; + version = "2.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.29.tgz"; - sha512 = "R0DtZY0NOGCwd+JHS/OO6I/Jkg7acpHAqFFDuwCPfEPgL9HJPr1fKc1rTuMYE7+der5/Pe1EXlo1/c3GFYlHxw=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.30.tgz"; + sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g=="; }; }; - "@expo/package-manager-0.0.44" = { + "@expo/package-manager-0.0.45" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.44"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.44.tgz"; - sha512 = "Yw8gHc1+kt64VXcUtrZ3w6ljy7Xxb5P0YY5acZiAaW6cdeOYtkeCtYcKrCAWlQaGdg8mYOWtfPEF1Ydy8IOjpg=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.45.tgz"; + sha512 = "UxQxRVBKkHCd4c5otoigRFQ7tkP/EyP58ZVQ0QN5SpsUULmyKmpPFzvELoOuPsYCgSioyvmwpYe2bMEt07oJJA=="; }; }; "@expo/plist-0.0.13" = { @@ -2164,13 +2182,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.5" = { + "@expo/prebuild-config-2.0.6" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.5.tgz"; - sha512 = "TTqKtfnavnlNSMKsdAVfR8bNOYQrR2WM6QpyOISgT9Cuu11ykxMbrmFEGazvIIGmYJhh6f9+CVwoqoZbf9hH7Q=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.6.tgz"; + sha512 = "eJHkTFmLwD0llfZMo1eGQNhd50cSmqWrPLcOoY7w1nSwfwYKa6/H18XwQ3ZbTsLf44Ai/Uj8JeI3HClEFYMsxw=="; }; }; "@expo/results-1.0.0" = { @@ -2182,13 +2200,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.30" = { + "@expo/schemer-1.3.31" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.30"; + version = "1.3.31"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.30.tgz"; - sha512 = "RYg6eiz2i3ETGlydUejszHoKkj9OaCedp3eVVr3065DY2MYTPoPwyfapU8CBljIJBeKpW9tc/Yvr9ZJbXibkVg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.31.tgz"; + sha512 = "gW4r6FIHjlD1sJfAO7JZtrHiIYEf6s5mbEsgU1lxi8bs3vV2feVqb05U8oTCuf0imawNf5aHhvgTL8CUVLA5tA=="; }; }; "@expo/sdk-runtime-versions-1.0.0" = { @@ -2200,15 +2218,6 @@ let sha512 = "Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="; }; }; - "@expo/simple-spinner-1.0.2" = { - name = "_at_expo_slash_simple-spinner"; - packageName = "@expo/simple-spinner"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/simple-spinner/-/simple-spinner-1.0.2.tgz"; - sha1 = "b31447de60e5102837a4edf702839fcc8f7f31f3"; - }; - }; "@expo/spawn-async-1.5.0" = { name = "_at_expo_slash_spawn-async"; packageName = "@expo/spawn-async"; @@ -2218,13 +2227,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.13.1" = { + "@expo/webpack-config-0.13.3" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.1.tgz"; - sha512 = "OaTtB5nQp4Vqxx+ORDIn7ROL4yEqQBFYPp3TnPVKi9AxOOxqjatxvcIUreDJlb2r9G+Eeub9dW0DSF6ETtBnGg=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.3.tgz"; + sha512 = "ja4oGqIpS5K9dqPysAudQYp8Nd/sm0ojXRCIequO4fcePM8JNLQ4D8vbM2ahl6osODAJqpOumH2UlB1pTnSZrA=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2290,22 +2299,22 @@ let sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; }; }; - "@fluentui/font-icons-mdl2-8.1.6" = { + "@fluentui/font-icons-mdl2-8.1.7" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.6"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.6.tgz"; - sha512 = "tNAaX72NQYbvR9zeiOiVQBQhYtVgPUgh68LKTGywuYGc2WffBu20Xk9wII8iLGmAijLI1QClaCQxaRAL0IkfBA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.7.tgz"; + sha512 = "piTdL/rKTx3cNBaMBc+u7YtluLfKYt9NY7Z341h3gZyYfgzeO8djU4RD7KpSozocPPGjooMjCjfPWDVh3DZqkw=="; }; }; - "@fluentui/foundation-legacy-8.1.6" = { + "@fluentui/foundation-legacy-8.1.7" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.6"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.6.tgz"; - sha512 = "TJzUFcpfcJefXNmTOAJBKgIlQXDPw/dIcpO9l2nBfORvy4RnrJK4QjpdJPp5XOhDPtDVjlKPB1WvavoRkPRrbg=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.7.tgz"; + sha512 = "hzzgbtMFp0gPi5qG9+Wa2ImYrfEuld3880g3xsxfrjRgVQ5zcRIkNFNc5//YfiLRqi0y9wNUuDrEI08ZMvxSBA=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2362,13 +2371,13 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.8" = { + "@fluentui/react-focus-8.1.9" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.8"; + version = "8.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.8.tgz"; - sha512 = "EUI1TZwM7T2keNEjqIAkeV9ALMlLjz7abqHk0AypKJG3v4YPQHycal37KAHQb+gdVJX2hjVQLxynI1yrquKFUw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.9.tgz"; + sha512 = "vYnenLKUj2Uxj5sjuv6AJJ1kYCqq/stM4ZMCQmJWq2qiMm2TpqW3vMpRspuxwD9BqOVbIFNoj9pEWpxAaTCEqw=="; }; }; "@fluentui/react-hooks-8.2.4" = { @@ -2407,13 +2416,13 @@ let sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; }; }; - "@fluentui/style-utilities-8.2.0" = { + "@fluentui/style-utilities-8.2.1" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.0.tgz"; - sha512 = "gdAgBnevDOHbgqAKCaQG4CXN6dONMg8BRSZNqha0I9WdgLJy7F7t4xVo8elPjlDUP72ciYT8J9Z/YNljZzbE0w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.1.tgz"; + sha512 = "+ZSl7Hz/C9DX1dYTZBnmP/57fHPK2qrLr0oTLJTq4uLjmG5Hxyo6gZ9/YCrEnW0h1d3tZlNa4LH5X8rux+D8kg=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2425,13 +2434,13 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.1.4" = { + "@fluentui/theme-2.2.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.4.tgz"; - sha512 = "Y4FWgnYldvAFOo24tfsREMb8/3Tn5uDoYgGO7AAdrksP7VAaavaEVQCOgvHWy3l89Bsxf00/fE+QJ/AHv5Z4CA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.0.tgz"; + sha512 = "LKM2ML05WU22It39iw523wGrpLG5qcvmQkSV7HV5NERSeZkI79TYntmXecaKaKWZjdUFTsZDijuhCOkWypNG5Q=="; }; }; "@fluentui/utilities-8.2.1" = { @@ -2560,13 +2569,31 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.14" = { + "@graphql-tools/load-6.2.8" = { + name = "_at_graphql-tools_slash_load"; + packageName = "@graphql-tools/load"; + version = "6.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.8.tgz"; + sha512 = "JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA=="; + }; + }; + "@graphql-tools/merge-6.2.16" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.14"; + version = "6.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.14.tgz"; - sha512 = "RWT4Td0ROJai2eR66NHejgf8UwnXJqZxXgDWDI+7hua5vNA2OW8Mf9K1Wav1ZkjWnuRp4ztNtkZGie5ISw55ow=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.16.tgz"; + sha512 = "KjZ1pppzKcr2Uspgb53p8uw5yhWVuGIL+sEroar7vLsClSsuiGib8OKVICAGWjC9wrCxGaL9SjJGavfXpJMQIg=="; + }; + }; + "@graphql-tools/mock-8.1.6" = { + name = "_at_graphql-tools_slash_mock"; + packageName = "@graphql-tools/mock"; + version = "8.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.6.tgz"; + sha512 = "ciEFfzAz+Ny/wMq+VRlBAzCVtLcIJiRYbnO7nWE+qFtiUUjmAh9Ahz6UVB1+5Fy6uqaGU6zCMgoDNVFQFtzhJg=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2578,6 +2605,15 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; + "@graphql-tools/schema-8.0.1" = { + name = "_at_graphql-tools_slash_schema"; + packageName = "@graphql-tools/schema"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.1.tgz"; + sha512 = "QG2HGLJjmsNc1wcj+rwZTEArgfMp7rsrb8iVq4P8ce1mDYAt6kRV6bLyPVb9q/j8Ik2zBc/B/Y1jPsnAVUHwdA=="; + }; + }; "@graphql-tools/url-loader-6.10.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; @@ -2605,6 +2641,15 @@ let sha512 = "d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w=="; }; }; + "@graphql-tools/utils-8.0.1" = { + name = "_at_graphql-tools_slash_utils"; + packageName = "@graphql-tools/utils"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.1.tgz"; + sha512 = "gjQk6sht4b0/hcG+QEVxfMyO8bn5tuU1nIOVhQ4whgFaUmrnb3hx2mwzz1EJzfIOAuHKE8tY0lu6jt3bGTD4yg=="; + }; + }; "@graphql-tools/wrap-7.0.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; @@ -2614,6 +2659,15 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; + "@graphql-typed-document-node/core-3.1.0" = { + name = "_at_graphql-typed-document-node_slash_core"; + packageName = "@graphql-typed-document-node/core"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz"; + sha512 = "wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg=="; + }; + }; "@grpc/grpc-js-1.3.2" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -3064,285 +3118,6 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@jimp/bmp-0.12.1" = { - name = "_at_jimp_slash_bmp"; - packageName = "@jimp/bmp"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.12.1.tgz"; - sha512 = "t16IamuBMv4GiGa1VAMzsgrVKVANxXG81wXECzbikOUkUv7pKJ2vHZDgkLBEsZQ9sAvFCneM1+yoSRpuENrfVQ=="; - }; - }; - "@jimp/core-0.12.1" = { - name = "_at_jimp_slash_core"; - packageName = "@jimp/core"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/core/-/core-0.12.1.tgz"; - sha512 = "mWfjExYEjHxBal+1gPesGChOQBSpxO7WUQkrO9KM7orboitOdQ15G5UA75ce7XVZ+5t+FQPOLmVkVZzzTQSEJA=="; - }; - }; - "@jimp/custom-0.12.1" = { - name = "_at_jimp_slash_custom"; - packageName = "@jimp/custom"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.12.1.tgz"; - sha512 = "bVClp8FEJ/11GFTKeRTrfH7NgUWvVO5/tQzO/68aOwMIhbz9BOYQGh533K9+mSy29VjZJo8jxZ0C9ZwYHuFwfA=="; - }; - }; - "@jimp/gif-0.12.1" = { - name = "_at_jimp_slash_gif"; - packageName = "@jimp/gif"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.12.1.tgz"; - sha512 = "cGn/AcvMGUGcqR6ByClGSnrja4AYmTwsGVXTQ1+EmfAdTiy6ztGgZCTDpZ/tq4SpdHXwm9wDHez7damKhTrH0g=="; - }; - }; - "@jimp/jpeg-0.12.1" = { - name = "_at_jimp_slash_jpeg"; - packageName = "@jimp/jpeg"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.12.1.tgz"; - sha512 = "UoCUHbKLj2CDCETd7LrJnmK/ExDsSfJXmc1pKkfgomvepjXogdl2KTHf141wL6D+9CfSD2VBWQLC5TvjMvcr9A=="; - }; - }; - "@jimp/plugin-blit-0.12.1" = { - name = "_at_jimp_slash_plugin-blit"; - packageName = "@jimp/plugin-blit"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.12.1.tgz"; - sha512 = "VRBB6bx6EpQuaH0WX8ytlGNqUQcmuxXBbzL3e+cD0W6MluYibzQy089okvXcyUS72Q+qpSMmUDCVr3pDqLAsSA=="; - }; - }; - "@jimp/plugin-blur-0.12.1" = { - name = "_at_jimp_slash_plugin-blur"; - packageName = "@jimp/plugin-blur"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.12.1.tgz"; - sha512 = "rTFY0yrwVJFNgNsAlYGn2GYCRLVEcPQ6cqAuhNylXuR/7oH3Acul+ZWafeKtvN8D8uMlth/6VP74gruXvwffZw=="; - }; - }; - "@jimp/plugin-circle-0.12.1" = { - name = "_at_jimp_slash_plugin-circle"; - packageName = "@jimp/plugin-circle"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.12.1.tgz"; - sha512 = "+/OiBDjby7RBbQoDX8ZsqJRr1PaGPdTaaKUVGAsrE7KCNO9ODYNFAizB9lpidXkGgJ4Wx5R4mJy21i22oY/a4Q=="; - }; - }; - "@jimp/plugin-color-0.12.1" = { - name = "_at_jimp_slash_plugin-color"; - packageName = "@jimp/plugin-color"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.12.1.tgz"; - sha512 = "xlnK/msWN4uZ+Bu7+UrCs9oMzTSA9QE0jWFnF3h0aBsD8t1LGxozkckHe8nHtC/y/sxIa8BGKSfkiaW+r6FbnA=="; - }; - }; - "@jimp/plugin-contain-0.12.1" = { - name = "_at_jimp_slash_plugin-contain"; - packageName = "@jimp/plugin-contain"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.12.1.tgz"; - sha512 = "WZ/D6G0jhnBh2bkBh610PEh/caGhAUIAxYLsQsfSSlOxPsDhbj3S6hMbFKRgnDvf0hsd5zTIA0j1B0UG4kh18A=="; - }; - }; - "@jimp/plugin-cover-0.12.1" = { - name = "_at_jimp_slash_plugin-cover"; - packageName = "@jimp/plugin-cover"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.12.1.tgz"; - sha512 = "ddWwTQO40GcabJ2UwUYCeuNxnjV4rBTiLprnjGMqAJCzdz3q3Sp20FkRf+H+E22k2v2LHss8dIOFOF4i6ycr9Q=="; - }; - }; - "@jimp/plugin-crop-0.12.1" = { - name = "_at_jimp_slash_plugin-crop"; - packageName = "@jimp/plugin-crop"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.12.1.tgz"; - sha512 = "CKjVkrNO8FDZKYVpMireQW4SgKBSOdF+Ip/1sWssHHe77+jGEKqOjhYju+VhT3dZJ3+75rJNI9II7Kethp+rTw=="; - }; - }; - "@jimp/plugin-displace-0.12.1" = { - name = "_at_jimp_slash_plugin-displace"; - packageName = "@jimp/plugin-displace"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.12.1.tgz"; - sha512 = "MQAw2iuf1/bVJ6P95WWTLA+WBjvIZ7TeGBerkvBaTK8oWdj+NSLNRIYOIoyPbZ7DTL8f1SN4Vd6KD6BZaoWrwg=="; - }; - }; - "@jimp/plugin-dither-0.12.1" = { - name = "_at_jimp_slash_plugin-dither"; - packageName = "@jimp/plugin-dither"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.12.1.tgz"; - sha512 = "mCrBHdx2ViTLJDLcrobqGLlGhZF/Mq41bURWlElQ2ArvrQ3/xR52We9DNDfC08oQ2JVb6q3v1GnCCdn0KNojGQ=="; - }; - }; - "@jimp/plugin-fisheye-0.12.1" = { - name = "_at_jimp_slash_plugin-fisheye"; - packageName = "@jimp/plugin-fisheye"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.12.1.tgz"; - sha512 = "CHvYSXtHNplzkkYzB44tENPDmvfUHiYCnAETTY+Hx58kZ0w8ERZ+OiLhUmiBcvH/QHm/US1iiNjgGUAfeQX6dg=="; - }; - }; - "@jimp/plugin-flip-0.12.1" = { - name = "_at_jimp_slash_plugin-flip"; - packageName = "@jimp/plugin-flip"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.12.1.tgz"; - sha512 = "xi+Yayrnln8A/C9E3yQBExjxwBSeCkt/ZQg1CxLgszVyX/3Zo8+nkV8MJYpkTpj8LCZGTOKlsE05mxu/a3lbJQ=="; - }; - }; - "@jimp/plugin-gaussian-0.12.1" = { - name = "_at_jimp_slash_plugin-gaussian"; - packageName = "@jimp/plugin-gaussian"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.12.1.tgz"; - sha512 = "7O6eKlhL37hsLfV6WAX1Cvce7vOqSwL1oWbBveC1agutDlrtvcTh1s2mQ4Pde654hCJu55mq1Ur10+ote5j3qw=="; - }; - }; - "@jimp/plugin-invert-0.12.1" = { - name = "_at_jimp_slash_plugin-invert"; - packageName = "@jimp/plugin-invert"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.12.1.tgz"; - sha512 = "JTAs7A1Erbxwl+7ph7tgcb2PZ4WzB+3nb2WbfiWU8iCrKj17mMDSc5soaCCycn8wfwqvgB1vhRfGpseOLWxsuQ=="; - }; - }; - "@jimp/plugin-mask-0.12.1" = { - name = "_at_jimp_slash_plugin-mask"; - packageName = "@jimp/plugin-mask"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.12.1.tgz"; - sha512 = "bnDdY0RO/x5Mhqoy+056SN1wEj++sD4muAKqLD2CIT8Zq5M/0TA4hkdf/+lwFy3H2C0YTK39PSE9xyb4jPX3kA=="; - }; - }; - "@jimp/plugin-normalize-0.12.1" = { - name = "_at_jimp_slash_plugin-normalize"; - packageName = "@jimp/plugin-normalize"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.12.1.tgz"; - sha512 = "4kSaI4JLM/PNjHwbnAHgyh51V5IlPfPxYvsZyZ1US32pebWtocxSMaSuOaJUg7OGSkwSDBv81UR2h5D+Dz1b5A=="; - }; - }; - "@jimp/plugin-print-0.12.1" = { - name = "_at_jimp_slash_plugin-print"; - packageName = "@jimp/plugin-print"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.12.1.tgz"; - sha512 = "T0lNS3qU9SwCHOEz7AGrdp50+gqiWGZibOL3350/X/dqoFs1EvGDjKVeWncsGCyLlpfd7M/AibHZgu8Fx2bWng=="; - }; - }; - "@jimp/plugin-resize-0.12.1" = { - name = "_at_jimp_slash_plugin-resize"; - packageName = "@jimp/plugin-resize"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.12.1.tgz"; - sha512 = "sbNn4tdBGcgGlPt9XFxCuDl4ZOoxa8/Re8nAikyxYhRss2Dqz91ARbBQxOf1vlUGeicQMsjEuWbPQAogTSJRug=="; - }; - }; - "@jimp/plugin-rotate-0.12.1" = { - name = "_at_jimp_slash_plugin-rotate"; - packageName = "@jimp/plugin-rotate"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.12.1.tgz"; - sha512 = "RYkLzwG2ervG6hHy8iepbIVeWdT1kz4Qz044eloqo6c66MK0KAqp228YI8+CAKm0joQnVDC/A0FgRIj/K8uyAw=="; - }; - }; - "@jimp/plugin-scale-0.12.1" = { - name = "_at_jimp_slash_plugin-scale"; - packageName = "@jimp/plugin-scale"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.12.1.tgz"; - sha512 = "zjNVI1fUj+ywfG78T1ZU33g9a5sk4rhEQkkhtny8koAscnVsDN2YaZEKoFli54kqaWh5kSS5DDL7a/9pEfXnFQ=="; - }; - }; - "@jimp/plugin-shadow-0.12.1" = { - name = "_at_jimp_slash_plugin-shadow"; - packageName = "@jimp/plugin-shadow"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.12.1.tgz"; - sha512 = "Z82IwvunXWQ2jXegd3W3TYUXpfJcEvNbHodr7Z+oVnwhM1OoQ5QC6RSRQwsj2qXIhbGffQjH8eguHgEgAV+u5w=="; - }; - }; - "@jimp/plugin-threshold-0.12.1" = { - name = "_at_jimp_slash_plugin-threshold"; - packageName = "@jimp/plugin-threshold"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.12.1.tgz"; - sha512 = "PFezt5fSk0q+xKvdpuv0eLggy2I7EgYotrK8TRZOT0jimuYFXPF0Z514c6szumoW5kEsRz04L1HkPT1FqI97Yg=="; - }; - }; - "@jimp/plugins-0.12.1" = { - name = "_at_jimp_slash_plugins"; - packageName = "@jimp/plugins"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.12.1.tgz"; - sha512 = "7+Yp29T6BbYo+Oqnc+m7A5AH+O+Oy5xnxvxlfmsp48+SuwEZ4akJp13Gu2PSmRlylENzR7MlWOxzhas5ERNlIg=="; - }; - }; - "@jimp/png-0.12.1" = { - name = "_at_jimp_slash_png"; - packageName = "@jimp/png"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/png/-/png-0.12.1.tgz"; - sha512 = "tOUSJMJzcMAN82F9/Q20IToquIVWzvOe/7NIpVQJn6m+Lq6TtVmd7d8gdcna9AEFm2FIza5lhq2Kta6Xj0KXhQ=="; - }; - }; - "@jimp/tiff-0.12.1" = { - name = "_at_jimp_slash_tiff"; - packageName = "@jimp/tiff"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.12.1.tgz"; - sha512 = "bzWDgv3202TKhaBGzV9OFF0PVQWEb4194h9kv5js348SSnbCusz/tzTE1EwKrnbDZThZPgTB1ryKs7D+Q9Mhmg=="; - }; - }; - "@jimp/types-0.12.1" = { - name = "_at_jimp_slash_types"; - packageName = "@jimp/types"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/types/-/types-0.12.1.tgz"; - sha512 = "hg5OKXpWWeKGuDrfibrjWWhr7hqb7f552wqnPWSLQpVrdWgjH+hpOv6cOzdo9bsU78qGTelZJPxr0ERRoc+MhQ=="; - }; - }; - "@jimp/utils-0.12.1" = { - name = "_at_jimp_slash_utils"; - packageName = "@jimp/utils"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.12.1.tgz"; - sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; - }; - }; "@joplin/fork-htmlparser2-4.1.28" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -3991,6 +3766,24 @@ let sha512 = "XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg=="; }; }; + "@librescore/fonts-0.4.1" = { + name = "_at_librescore_slash_fonts"; + packageName = "@librescore/fonts"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@librescore/fonts/-/fonts-0.4.1.tgz"; + sha512 = "S4Ico0Tmkk5YXPL58mw71LMYtls8WfNRF0KM1l8ZO+tx2iN0jXv2YF2iqKBVgU26L2/ihWIjIc+uHl7Ve9K38w=="; + }; + }; + "@librescore/sf3-0.3.0" = { + name = "_at_librescore_slash_sf3"; + packageName = "@librescore/sf3"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@librescore/sf3/-/sf3-0.3.0.tgz"; + sha512 = "fkAZCkkpB90Nepvfd2NqwAF6wa3O+/ofhBDeQd7+79JwEtBqhCVGfa/xVb2j1mUscxmTIqwo1WIJtKM7YgGYsw=="; + }; + }; "@malept/cross-spawn-promise-1.1.1" = { name = "_at_malept_slash_cross-spawn-promise"; packageName = "@malept/cross-spawn-promise"; @@ -4072,13 +3865,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.195" = { + "@microsoft/load-themed-styles-1.10.196" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.195"; + version = "1.10.196"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.195.tgz"; - sha512 = "KDCKYsdIo3/ivmu4kzn/LmdttAOwz/bU2C1KywyKy8jHuTj/gU9LBD2htDNGbHQgKObOuqGTpUNNVpVe92Gghw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.196.tgz"; + sha512 = "eImlYYB/ZJH8Y3t2d/JbjxwSwWVeiQ7x+Xl5mTlTAlByzAiEs7tB3LUOEEz0XrlasvYV9ynq2i8b1+Gi/+KlMQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4153,13 +3946,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.1.1" = { + "@netlify/build-17.3.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.1.1"; + version = "17.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.1.1.tgz"; - sha512 = "ulYaC/nCveDar8QGyl64wVtdjpbcUYM58/jHssVDgBiK3jQrDt6oZ5vG1sAJLDOY8ReXAtW1MqiIKLDImsk/4g=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.3.1.tgz"; + sha512 = "xHxhdefsugGOzeoj4vLabZ29mDN6MRTT+Q3IR/iQKbDk5vlMr3pcT8EhowLBLhSoC1NnfskRbaFBtftxn5VWPw=="; }; }; "@netlify/cache-utils-2.0.0" = { @@ -4171,13 +3964,13 @@ let sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; }; }; - "@netlify/config-14.0.0" = { + "@netlify/config-14.1.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "14.0.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-14.0.0.tgz"; - sha512 = "Ke7rEmHAy9N5qxaY9uCGrnDjCllC2lqMg1kn8p6qse0y+qkptkdlKnD0pBSDaUIsNfmyX3omvw0/d5vr0qNofA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-14.1.0.tgz"; + sha512 = "XgBIaKA+itg5uOAYOTt3uZmfyIFtC4t0vKPgf/CoEzWQ323g83fpwxbdqtGkqhw0bYgt0iWPKsoibnLdyoG1vQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4216,121 +4009,121 @@ let sha512 = "O8cGi3yRtdqJ2pDkdcoj3t6F9JSB/SokRwZiCJjp2aBQyC+Jg3RsRH7G0MbYEjrjN6JY4/p6j62NTFqsIBGh2A=="; }; }; - "@netlify/local-functions-proxy-1.0.0" = { + "@netlify/local-functions-proxy-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy"; packageName = "@netlify/local-functions-proxy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.0.0.tgz"; - sha512 = "J3ZSOzcTrJVomNDP14V9Jg/xqwOK/vUfwadrBmau9zNpO/MJOb450UB5biCeJFbLVJVbkjrGbh3shUJwUZp7Fw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.0.tgz"; + sha512 = "HoxJuJpBqmzflIcdFsnUSuf/KwYsgzrsF/jh+bXPO+aOB9pzZEH0P/e/qCAr2JbJVzOyxo/36Ti3sXbahSDAYQ=="; }; }; - "@netlify/local-functions-proxy-darwin-arm64-1.0.0" = { + "@netlify/local-functions-proxy-darwin-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; packageName = "@netlify/local-functions-proxy-darwin-arm64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.0.0.tgz"; - sha512 = "K9rS6Y/IYIl6UuOPIgXuiHFpGg3HAc+EJwW+q87LRc4NExUx4HyLAh7YeJlhFg/KJG7IaCYqAOBBaFRoUVi0/g=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.0.tgz"; + sha512 = "EOSEA/mt6IyXqou//vOo17vnQwwBKPu8wO+bZZQNb+NNgyjzYl/8wpZE0CvoYHPsEU2h0hk1xeqwaYBMihunKg=="; }; }; - "@netlify/local-functions-proxy-darwin-x64-1.0.0" = { + "@netlify/local-functions-proxy-darwin-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; packageName = "@netlify/local-functions-proxy-darwin-x64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.0.0.tgz"; - sha512 = "PxGE9JknIX/SvBBUW9uvpSahAKSOJ+4cEJhtV+GIzHsh/M2qMdZptfDQt+XYJVT6J+jgxJ+coJmJKmKnfwnPGg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.0.tgz"; + sha512 = "P+khKO6YwjeEv+zppE7asbInliopo1mJSkQeGT27ebs4UVkZPpYefhtLs8Gs5dau7zFfPBF8PFgE1kCEMKw4+g=="; }; }; - "@netlify/local-functions-proxy-freebsd-arm64-1.0.0" = { + "@netlify/local-functions-proxy-freebsd-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; packageName = "@netlify/local-functions-proxy-freebsd-arm64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.0.0.tgz"; - sha512 = "F4eajUy+Re4k6kUoXQhGTwISAnjI0EzNDrQb3XuzKfRt7sF4rSSmVsrNhi7UqvlIibSKa03bFqSHmcbxcj5GGQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.0.tgz"; + sha512 = "bqjyD4o7KVWrUPO/cr4HfUfUFUfTJFmjw0KFDFet//itJMSg+RocQGmjkJ8YTqWQZxwDJF7Dp44n/WGhpnWUUg=="; }; }; - "@netlify/local-functions-proxy-freebsd-x64-1.0.0" = { + "@netlify/local-functions-proxy-freebsd-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; packageName = "@netlify/local-functions-proxy-freebsd-x64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.0.0.tgz"; - sha512 = "Gy9oRFKU+pP0Tk03KgZ02wtY9ROoaH8C260P/5poK3dtV5gz05qVyHTOoFaWHbljuE1OabivMSLsjK6a098IVw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.0.tgz"; + sha512 = "R8a0sW5bcTbX7eKiVzFw1+2F0tO8Sw/+fQL9f9Z+2F4pT5+SKml8CLvfRU5xYl1KcxdHGq5ETcSwu/wyqfMTpA=="; }; }; - "@netlify/local-functions-proxy-linux-arm-1.0.0" = { + "@netlify/local-functions-proxy-linux-arm-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm"; packageName = "@netlify/local-functions-proxy-linux-arm"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.0.0.tgz"; - sha512 = "COHrxdRVwpsgzCZl8amYyFX5TFUFPyYSTctwCIoMhXgMlx8HxnQ7fCGMTWXrraat4+LxRDfVyy2jZe7vSAE3hA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.0.tgz"; + sha512 = "iGricZd2RqBiF/LjD0EPnH0qSKjfn6RDEIp90I0BKQ2XRkQu7dPFr7m3QhOuoPIHxGERNNGK2FL4OGZ9jXEXtw=="; }; }; - "@netlify/local-functions-proxy-linux-arm64-1.0.0" = { + "@netlify/local-functions-proxy-linux-arm64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; packageName = "@netlify/local-functions-proxy-linux-arm64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.0.0.tgz"; - sha512 = "qYerhh878nqN7dCReD690/K44iCDu806A0wxtuaBLLldNy6UTWpk7LrSScIDC6BUFchN822jjYecOokkRDfyxQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.0.tgz"; + sha512 = "G7KGstzhNoQwiiuVjyl64fDnNJ2Z/QsjaLDnElSUEwaqJe+0drog0wUxym/RDuVmBY//XDQfxLtG2Zl5ce4tUA=="; }; }; - "@netlify/local-functions-proxy-linux-ia32-1.0.0" = { + "@netlify/local-functions-proxy-linux-ia32-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; packageName = "@netlify/local-functions-proxy-linux-ia32"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.0.0.tgz"; - sha512 = "zOjtT2iUoXyQsSOq3Adv7DidYNYhbLZp1Y5Kg5mK1xGwq8xcGMI5tVSCWeBsJFpt7sa2rTYJLim4Mt7OiZXDMQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.0.tgz"; + sha512 = "okXWyslbX/mMm3CncfUy+CxnBW0vFoDxFaK2+tIeLz5nVizVVyPaoInTe0bs+sSrAvc3jbtt8AfV9ISmhtPx0A=="; }; }; - "@netlify/local-functions-proxy-linux-ppc64-1.0.0" = { + "@netlify/local-functions-proxy-linux-ppc64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; packageName = "@netlify/local-functions-proxy-linux-ppc64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.0.0.tgz"; - sha512 = "mliQBNFWPW+WLnAewMXrcmAAhe/TnYsvgncc3OsVyxq+eABs1lxN/HtDBNHrynPg2Cu8DGXExU/6EhSSf58UYQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.0.tgz"; + sha512 = "E3sPIN9y2QMU0bvPdNF3dmMi8pMUkGd9WYJHthpY9+fcP7j7L2d5h0uuSfG9TPEZS6/SW0c1XhK8wCDGGZIRaQ=="; }; }; - "@netlify/local-functions-proxy-linux-x64-1.0.0" = { + "@netlify/local-functions-proxy-linux-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-linux-x64"; packageName = "@netlify/local-functions-proxy-linux-x64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.0.0.tgz"; - sha512 = "SAJPQsd6WAiki7kC/lgahbmhQleTNb1Hxr4kbW4QFaGP+yRzcBh9H2nT0HIsgzbtKpaKrTSwXYozyyY5rY09sg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.0.tgz"; + sha512 = "NFuOmMm5/tCOpQpuG32cFGp4n15++rsy26rWG1u7IVezOTr9SMKOmnsFxQVJGgOT7r3zBBjBJwYJN0CCNj9J3A=="; }; }; - "@netlify/local-functions-proxy-openbsd-x64-1.0.0" = { + "@netlify/local-functions-proxy-openbsd-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; packageName = "@netlify/local-functions-proxy-openbsd-x64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.0.0.tgz"; - sha512 = "470jepQRK7KnThc7cfPexQaR1QlPOelo178Qq/AWa9Fbolf194IyCygIP3iq4FC8wUVUY8pRuscGLfNoVVr1Mg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.0.tgz"; + sha512 = "9G1lrpSAxT+Bd83IYYxlkMU1xNCZeLstL7gZvXymygRpLoE2oFHfSERaIOvOdbbDQ3ZkEWuX12OJ6d7TS7ievg=="; }; }; - "@netlify/local-functions-proxy-win32-ia32-1.0.0" = { + "@netlify/local-functions-proxy-win32-ia32-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; packageName = "@netlify/local-functions-proxy-win32-ia32"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.0.0.tgz"; - sha512 = "znys5GBoUcMCg9iraFFM+YHc+jNKFCMO5kLjBaTz80MXn+43Qh7+rvmeyV2RMECTO3xI0Q7JvwIZr+6FHe/0vw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.0.tgz"; + sha512 = "F6ET6+XyAcGVIFjX66nAmj6CkgKICPtA9ZpPDLU2b3qYzvdJxW1hgp/UIRyRSRN1IqkIPJtGQZAteHhzBqnFRQ=="; }; }; - "@netlify/local-functions-proxy-win32-x64-1.0.0" = { + "@netlify/local-functions-proxy-win32-x64-1.1.0" = { name = "_at_netlify_slash_local-functions-proxy-win32-x64"; packageName = "@netlify/local-functions-proxy-win32-x64"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.0.0.tgz"; - sha512 = "uPs7LI60p6XU11Ac7lN36P1nBTg9vUBT4wMxtztwPGmdNL9gSA4+2tRElGM6zXLdICzxdAGo4e0510S+WRN5oQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.0.tgz"; + sha512 = "8a5rRjDNovZYBEaAPfN1VSwGNG/ExZanrjo7HnuTgphO6i64StqrKNtNW9/h75IgH+WP+8ZmC6Y0lI0BKq/U5A=="; }; }; "@netlify/open-api-2.5.0" = { @@ -4351,13 +4144,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-2.19.3" = { + "@netlify/plugins-list-2.21.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.3"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.3.tgz"; - sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.21.0.tgz"; + sha512 = "uo1yeph8fJdldX+7qPIcflw7bEIXdU5repRVcxTfTgGgRrMJ75JDTVoXwujKYNlGNZN9hKj94uDSZ0B5FQq8Tw=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -4378,15 +4171,6 @@ let sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; }; }; - "@netlify/zip-it-and-ship-it-4.15.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.15.0.tgz"; - sha512 = "zEwtpomvakEogJMEnYpUxSBb+TAonxgKSo2c9B6rDd6DVUad3RtXBdnx8qizwUGRvFj7Le7QGAmnYC5yWja82A=="; - }; - }; "@netlify/zip-it-and-ship-it-4.15.1" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; @@ -4396,58 +4180,58 @@ let sha512 = "YgPzJEGY60zZxSSbaDe3mMO+jYB7pbsWyAVvv4tASod8Sys2x/MuOGJ64KmOTZ+bUqZYvJLOcfVL6fiFRSU9wg=="; }; }; - "@node-red/editor-api-2.0.3" = { + "@node-red/editor-api-2.0.4" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.3.tgz"; - sha512 = "hCOfwaid2AMSTavfRKkYBUDwh9JIPTvEN4Vq+1/mtTy8+5uBAtlDBYU6HTAXMIXUS4TYPONQqQPwwYZiV8e3aQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.4.tgz"; + sha512 = "Dw4o0LyQR5543BVeAlYBbN/dsAlCA43zsZ4PLLb+A9M/TKWa+lqV1nyC/HGkLuNT9IhxQAzK10GT+ukOAKN5Yg=="; }; }; - "@node-red/editor-client-2.0.3" = { + "@node-red/editor-client-2.0.4" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.3.tgz"; - sha512 = "vKNjIOMl3HupJTlJRm2o+qiZHvszRCwuHmmD+Zq1pFntuLINSadZggmh0ThjTmnY7fIZksjqzGj2tDITNqHFKg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.4.tgz"; + sha512 = "rIGUmv41vikOEp0bR23nIhPqcknqQHIJwG7tNEFk5RpTDyAiDOKAKVaWOaa6v4/XwJCf+8a1Kt5LI0KGIHFqXQ=="; }; }; - "@node-red/nodes-2.0.3" = { + "@node-red/nodes-2.0.4" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.3.tgz"; - sha512 = "+EnOyZtjLroJsPrYEsos8fxxVlZNl/NtNtSO2sSmt/5edIFw9bXlGFMf93r2XiztsyZq018tBGegJmRHFvKRKQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.4.tgz"; + sha512 = "sCEEexrM/vtu+CxJQuZw9euJq+liZAPu/7Z3qAPcTwRpEZo0v7kfiyV/Brrymw3bmGJSqgv9EtRqXmiCU7GTHA=="; }; }; - "@node-red/registry-2.0.3" = { + "@node-red/registry-2.0.4" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.3.tgz"; - sha512 = "psViMyuZQfQHktASYn/SbVNYbvT1qxmlMBxqZcNEDAqYipJg81Hd35beGt7l67D5840Xi3QSk0/l1HnsMzzeMA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.4.tgz"; + sha512 = "qwowUXPglcj5bOeUL17wWH1VtPOAZY8bGQ1CY4uWP7PnKvt3os0lTyfGqsZLaL78QF3bQLSuIXj+y3xZRl5XJg=="; }; }; - "@node-red/runtime-2.0.3" = { + "@node-red/runtime-2.0.4" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.3.tgz"; - sha512 = "mlqfUuVtqvil8B1OO1kW5DJX/5tKd/RdJt+cUwH99e+eL39NkP2s+rfk3qePRBphUiMkBQKIlpK+xFzDDTGUIQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.4.tgz"; + sha512 = "Jnc8OlZz0oAKNikkCljNgAa977WprzEXwPKgBAEKyNbeyIaE+2ZSlXaQqK1xQ73VPFVHc9V3n5cDC/g3lHUJtQ=="; }; }; - "@node-red/util-2.0.3" = { + "@node-red/util-2.0.4" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.3.tgz"; - sha512 = "dMtAjtgL8W2VXEI3F1daaOArJBQaVZ+jclH6xu4JQz8ds4QoiOPQGcKlrnb7XQdf0J+4D1VxtNvm+fVcjJ+2Aw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.4.tgz"; + sha512 = "Sd+vV+j8E8GYN+e/5Bzaxle11+7fEeJbeq8xt1PH0AxrAGU2L3dbB41NsVujVfUBCmOaGvehWvVD+vUO6quosw=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4486,13 +4270,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.7.1" = { + "@npmcli/arborist-2.8.0" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.1.tgz"; - sha512 = "EGDHJs6dna/52BrStr/6aaRcMLrYxGbSjT4V3JzvoTBY9/w5i2+1KNepmsG80CAsGADdo6nuNnFwb7sDRm8ZAw=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.0.tgz"; + sha512 = "R9rTyak1rGdmVTyiU14dgBb+qMllY3B6I8hp7FB4xXsU9dJDrYZJR8I+191CMo5Y1941jTDCtNcXXW9TldPEFQ=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4747,13 +4531,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.1.1" = { + "@octokit/openapi-types-9.2.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.1.1"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.1.tgz"; - sha512 = "xmyPP9tVb4T4A6Lk6SL6ScnIqAHpPV4jfMZI8VtY286212ri9J/6IFGuLsZ26daADUmriuLejake4k+azEfnaw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.2.0.tgz"; + sha512 = "c4A1Xm0At+ypvBfEETREu519wLncJYQXvY+dBGg/V5YA51eg5EwdDsPPfcOMG0cuXscqRvsIgIySTmTJUdcTNA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4783,13 +4567,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.5.1" = { + "@octokit/plugin-rest-endpoint-methods-5.5.2" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.1.tgz"; - sha512 = "Al57+OZmO65JpiPk4JS6u6kQ2y9qjoZtY1IWiSshc4N+F7EcrK8Rgy/cUJBB4WIcSFUQyF66EJQK1oKgXWeRNw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.2.tgz"; + sha512 = "1ArooY7AYQdUd2zyqWLFHQ6gver9PvZSiuM+EPAsDplv1Y6u8zHl6yZ7yGIgaf7xvWupwUkJS2WttGYyb1P0DQ=="; }; }; "@octokit/request-5.6.0" = { @@ -4810,22 +4594,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.7.1" = { + "@octokit/rest-18.7.2" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.7.1"; + version = "18.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.1.tgz"; - sha512 = "790Yv8Xpbqs3BtnMAO5hlOftVICHPdgZ/3qlTmeOoqrQGzT25BIpHkg/KKMeKG9Fg8d598PLxGhf80RswElv9g=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.2.tgz"; + sha512 = "TAedgLqNRS+rdGqS9v00sqBeS6IgyLSoqqCDu6pmoadAB7xSjFHShxzaXUAbxxJjyHtb7mencRGzgH4W/V6Myg=="; }; }; - "@octokit/types-6.21.1" = { + "@octokit/types-6.22.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.21.1"; + version = "6.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.1.tgz"; - sha512 = "PP+m3T5EWZKawru4zi/FvX8KL2vkO5f1fLthx78/7743p7RtJUevt3z7698k+7oAYRA7YuVqfXthSEHqkDvZ8g=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.22.0.tgz"; + sha512 = "Y8GR0BJHQDpO09qw/ZQpN+DXrFzCWaE0pvK4frDm3zJ+h99AktsFfBoDazbCtHxiL8d0jD8xRH4BeynlKLeChg=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4864,13 +4648,13 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-1.0.1" = { + "@opentelemetry/api-1.0.2" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz"; - sha512 = "H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.2.tgz"; + sha512 = "DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww=="; }; }; "@opentelemetry/semantic-conventions-0.22.0" = { @@ -5233,6 +5017,33 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@percy/config-1.0.0-beta.61" = { + name = "_at_percy_slash_config"; + packageName = "@percy/config"; + version = "1.0.0-beta.61"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.61.tgz"; + sha512 = "4AFqdfFOyrYpLtflWQ/GlClltdKmIYqPpocv4X20HVIGI1O5CHVSQuUuMVrBDiGzTwPKhBUAK6qOQHXdJyLjTg=="; + }; + }; + "@percy/logger-1.0.0-beta.61" = { + name = "_at_percy_slash_logger"; + packageName = "@percy/logger"; + version = "1.0.0-beta.61"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.61.tgz"; + sha512 = "3CRqpmpWr1kG815TKsmADr2k+SBRw+I7Rk2/jY3WwbN/4oP3Mij9gNkWSmIU85TRtm5Ju1SbI3LcFjEfOg7eLw=="; + }; + }; + "@percy/migrate-0.10.0" = { + name = "_at_percy_slash_migrate"; + packageName = "@percy/migrate"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@percy/migrate/-/migrate-0.10.0.tgz"; + sha512 = "3vOmOPmEeMlIZyCEDClZ2VER+4LH/Zp/YhvLkZeKH9RKxbktROF4Dnfs1u3m4YQ1gglerqK6VXFJfOjLJGyVuw=="; + }; + }; "@pm2/agent-2.0.0" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -5269,15 +5080,6 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@pmmmwh/react-refresh-webpack-plugin-0.3.3" = { - name = "_at_pmmmwh_slash_react-refresh-webpack-plugin"; - packageName = "@pmmmwh/react-refresh-webpack-plugin"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.3.tgz"; - sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; - }; - }; "@primer/octicons-14.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; @@ -5548,13 +5350,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.3" = { + "@schematics/angular-12.1.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.3"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.3.tgz"; - sha512 = "VSXHok3Oi62FuVgHvOuz/HOgS1tGPc7iTCaW/SlrBaH+DaUffmZF1qkJnU1dzdzZfox+KckK2SjXlRJgqNZhFw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz"; + sha512 = "xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5584,13 +5386,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.14.0" = { + "@serverless/components-3.14.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.14.0"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; - sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.2.tgz"; + sha512 = "mizSDUxNKT+V1hx5edZFFbMBvtWY8FkponU3seWpmkkbv1FjNPpa2wURec89T5m4WadYJDQMCpKKCwYD4DOSow=="; }; }; "@serverless/core-1.1.2" = { @@ -5620,22 +5422,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.5" = { + "@serverless/platform-client-4.2.6" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.5.tgz"; - sha512 = "PqQptakqHs6DHVY3fCqyMqdaFSKgehvUGrobWBUhcsmovnGY1Fzw9s3uqnqt2jmaCICNzPn/hPN+P+JbsG7itA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.6.tgz"; + sha512 = "TVwlUvYnNjotd4010I9Vh0Dr0c2XByaUTEjpxLJm/Ti51Ka6vLIJ44JxuNZ6TmvkRh66yFZbaZUsVv6W4wNUVQ=="; }; }; - "@serverless/platform-client-china-2.2.0" = { + "@serverless/platform-client-china-2.2.1" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.0.tgz"; - sha512 = "cNEMjQ826PfZOYSY00eIOSFZEdmy4QU4L6wU9rzhpIhURRsoULnPE5tfYAs2yTYPBRSgV9o3eqLmh5+pOcVbLw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.1.tgz"; + sha512 = "S1q6LOxpgMc872s/pXZwwat4Mr5DE8IilqKcgEcaGhydRFp85QeOqtFtunTzQ0n9Uo7OCfuIwL4GUC/i093pWA=="; }; }; "@serverless/template-1.1.4" = { @@ -7276,13 +7078,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.3" = { + "@types/node-15.14.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.3"; + version = "15.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz"; - sha512 = "gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.4.tgz"; + sha512 = "yblJrsfCxdxYDUa2fM5sP93ZLk5xL3/+3MJei+YtsNbIdY75ePy2AiCfpq+onepzax+8/Yv+OD/fLNleWpCzVg=="; }; }; "@types/node-15.6.1" = { @@ -7312,13 +7114,13 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.3" = { + "@types/node-16.4.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.3"; + version = "16.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; - sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.7.tgz"; + sha512 = "aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA=="; }; }; "@types/node-6.14.13" = { @@ -7465,6 +7267,15 @@ let sha512 = "vrZaV3Ij7j/l/3hz6OttZFtpRCu7zlq7XgkYHJP6FwVEAZkGQ095WqyJV08/GlW9eyXKVcp/xmtruHm8eHpw1g=="; }; }; + "@types/request-2.48.7" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.48.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.48.7.tgz"; + sha512 = "GWP9AZW7foLd4YQxyFZDBepl0lPsWLMEXDZUjQ/c1gqVPDPECrRZyEzuhJdnPWioFCq3Tv0qoGpMD6U+ygd4ZA=="; + }; + }; "@types/request-promise-native-1.0.18" = { name = "_at_types_slash_request-promise-native"; packageName = "@types/request-promise-native"; @@ -7834,6 +7645,15 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; + "@types/zen-observable-0.8.3" = { + name = "_at_types_slash_zen-observable"; + packageName = "@types/zen-observable"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz"; + sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; + }; + }; "@typescript-eslint/eslint-plugin-4.28.5" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; @@ -8023,13 +7843,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.1.0" = { + "@unicode/unicode-13.0.0-1.2.0" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.1.0.tgz"; - sha512 = "iOVqHDBzYSb4EOLBirZM9qNur+J7hAb6YyzGlUoAFx2ubb3Qidc+VhAuRQAxnOOWEqMcIZpnVnJ/OkTxbNmgEA=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.0.tgz"; + sha512 = "ocuWbduBe3lNt/651RUs3eVbWLCQ7S40nxCCuErm0ynDZsraAzT9TGMea2qx9mUR59/un4a+SQSTHs1vB9QfPQ=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -8626,6 +8446,15 @@ let sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; }; }; + "@wry/context-0.6.0" = { + name = "_at_wry_slash_context"; + packageName = "@wry/context"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz"; + sha512 = "sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q=="; + }; + }; "@wry/equality-0.1.11" = { name = "_at_wry_slash_equality"; packageName = "@wry/equality"; @@ -8635,6 +8464,24 @@ let sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="; }; }; + "@wry/equality-0.5.1" = { + name = "_at_wry_slash_equality"; + packageName = "@wry/equality"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz"; + sha512 = "FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw=="; + }; + }; + "@wry/trie-0.3.0" = { + name = "_at_wry_slash_trie"; + packageName = "@wry/trie"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz"; + sha512 = "Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -9157,15 +9004,6 @@ let sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; }; }; - "adm-zip-0.4.16" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.16"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz"; - sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; - }; - }; "adm-zip-0.5.5" = { name = "adm-zip"; packageName = "adm-zip"; @@ -9832,15 +9670,6 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; - "any-base-1.1.0" = { - name = "any-base"; - packageName = "any-base"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"; - sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; - }; - }; "any-observable-0.3.0" = { name = "any-observable"; packageName = "any-observable"; @@ -9940,6 +9769,15 @@ let sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; }; }; + "apollo-datasource-3.0.3" = { + name = "apollo-datasource"; + packageName = "apollo-datasource"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.0.3.tgz"; + sha512 = "oboGz50DbGW6LNaNvB/bpJRypXvYFE1SRO5VxYSUnkz1P7TDcemWfJLRjNnfxCIMVyd0hmmwrmSaGKPQZvmT9Q=="; + }; + }; "apollo-graphql-0.9.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -9976,6 +9814,15 @@ let sha512 = "B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg=="; }; }; + "apollo-reporting-protobuf-3.0.0" = { + name = "apollo-reporting-protobuf"; + packageName = "apollo-reporting-protobuf"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.0.0.tgz"; + sha512 = "jmCD+6gECt8KS7PxP460hztT/5URTbv2Kg0zgnR6iWPGce88IBmSUjcqf1Z6wJJq7Teb8Hu7WbyyMhn0vN5TxQ=="; + }; + }; "apollo-server-caching-0.7.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; @@ -9985,6 +9832,15 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; + "apollo-server-caching-3.0.1" = { + name = "apollo-server-caching"; + packageName = "apollo-server-caching"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.0.1.tgz"; + sha512 = "Cd0imFQlU6IKrkm+RNY0MQvKTMBTME+518EuwCaw3TKNUYDpir1vOuIdc4bALXDANilOR73k/UQs/oPxayXfrg=="; + }; + }; "apollo-server-core-2.25.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; @@ -9994,6 +9850,15 @@ let sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; + "apollo-server-core-3.1.1" = { + name = "apollo-server-core"; + packageName = "apollo-server-core"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.1.tgz"; + sha512 = "MLN6AD8pumdf3c4qYDqXeLkgtJONfvtx0okhvhrbN1DC1YX9W2d1mcTGQa88jTBtgDAXZQS1N5DncS9ctUekDw=="; + }; + }; "apollo-server-env-3.1.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; @@ -10003,6 +9868,15 @@ let sha512 = "iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ=="; }; }; + "apollo-server-env-4.0.3" = { + name = "apollo-server-env"; + packageName = "apollo-server-env"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.0.3.tgz"; + sha512 = "B32+RUOM4GUJAwnQqQE1mT1BG7+VfW3a0A87Bp3gv/q8iNnhY2BIWe74Qn03pX8n27g3EGVCt0kcBuHhjG5ltA=="; + }; + }; "apollo-server-errors-2.5.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; @@ -10012,6 +9886,15 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; + "apollo-server-errors-3.0.1" = { + name = "apollo-server-errors"; + packageName = "apollo-server-errors"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.0.1.tgz"; + sha512 = "PSp64IFeN1YK5EYZ3V/8iDRESMMyE00h1vE5aCr83wHL3T0mN7VRiMKoOIZ+2rUtnn7CpK73o6QLmouhxPtXsQ=="; + }; + }; "apollo-server-express-2.25.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; @@ -10021,6 +9904,15 @@ let sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; + "apollo-server-express-3.1.1" = { + name = "apollo-server-express"; + packageName = "apollo-server-express"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.1.tgz"; + sha512 = "W6VDth39mv1SCaJjnTwc0OmXIWzpELAJ3+/Id4cw+99HXdeRMJXDN5lbMENYEu+1a+pUK8iOoctwlJbikwBPGA=="; + }; + }; "apollo-server-plugin-base-0.13.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; @@ -10030,6 +9922,15 @@ let sha512 = "L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg=="; }; }; + "apollo-server-plugin-base-3.1.1" = { + name = "apollo-server-plugin-base"; + packageName = "apollo-server-plugin-base"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.1.1.tgz"; + sha512 = "gkV/UtMji6SrX8CdZ5/3IlRBVE57CM+DL6x9MA3pjNEc357OOC3dnh1SXNmp0cvqn66CB1kODGrqKGRxyl/qpA=="; + }; + }; "apollo-server-types-0.9.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; @@ -10039,6 +9940,15 @@ let sha512 = "qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg=="; }; }; + "apollo-server-types-3.1.1" = { + name = "apollo-server-types"; + packageName = "apollo-server-types"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.1.1.tgz"; + sha512 = "dTNlRxqdo+wnrcOFpFfzehdmcYHl6MQKuLnCCRzAHuVR5yOiuhQ5CIGhIjvMx2bP9ZoyON1SvXOIDTyTaU9gaQ=="; + }; + }; "apollo-tracing-0.15.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; @@ -11371,13 +11281,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.954.0" = { + "aws-sdk-2.957.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.954.0"; + version = "2.957.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.954.0.tgz"; - sha512 = "AbP7lUIBVHX1/dnDMgcmmkRYRU5FeBRqemtsV+BwHywEKeiDpVi024KNOIkZkd4NoYtRiLEOwTzUP9w1z/EnxQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.957.0.tgz"; + sha512 = "TtRv/ebZL7gWgAW8XGlRizs5xhyzlDt2KbrxoPcHcxPTH8KHlbEyOmAXafyB7K/Jf3En5TDdJN1daJ4idSKWSg=="; }; }; "aws-sign2-0.6.0" = { @@ -11731,13 +11641,13 @@ let sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; }; }; - "babel-plugin-polyfill-corejs3-0.2.3" = { + "babel-plugin-polyfill-corejs3-0.2.4" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz"; - sha512 = "rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"; + sha512 = "z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ=="; }; }; "babel-plugin-polyfill-regenerator-0.2.2" = { @@ -12415,13 +12325,13 @@ let sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw=="; }; }; - "bencode-2.0.1" = { + "bencode-2.0.2" = { name = "bencode"; packageName = "bencode"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-2.0.1.tgz"; - sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.2.tgz"; + sha512 = "0ilVjnE2diLdbec/3KN14SP0KE85wh8v/FceNRMbAB2ioc3yTj9tgqdoK9tFEH++TZ10JreTS29qTwg7+SpTiQ=="; }; }; "bent-7.3.12" = { @@ -12685,13 +12595,13 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; - "binaryextensions-4.15.0" = { + "binaryextensions-4.18.0" = { name = "binaryextensions"; packageName = "binaryextensions"; - version = "4.15.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.15.0.tgz"; - sha512 = "MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw=="; + url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.18.0.tgz"; + sha512 = "PQu3Kyv9dM4FnwB7XGj1+HucW+ShvJzJqjuw1JkKVs1mWdwOKVcRjOi+pV9X52A0tNvrPCsPkbFFQb+wE1EAXw=="; }; }; "bindings-1.2.1" = { @@ -13153,15 +13063,6 @@ let sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; }; }; - "bmp-js-0.1.0" = { - name = "bmp-js"; - packageName = "bmp-js"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"; - sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; - }; - }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -13459,15 +13360,6 @@ let sha512 = "cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A=="; }; }; - "boxen-4.1.0" = { - name = "boxen"; - packageName = "boxen"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.1.0.tgz"; - sha512 = "Iwq1qOkmEsl0EVABa864Bbj3HCL4186DRZgFW/NrFs5y5GMM3ljsxzMLgOHdWISDRvcM8beh8q4tTNzXz+mSKg=="; - }; - }; "boxen-4.2.0" = { name = "boxen"; packageName = "boxen"; @@ -14080,13 +13972,13 @@ let sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "buffer-indexof-1.1.1" = { @@ -14791,13 +14683,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001247" = { + "caniuse-lite-1.0.30001248" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001247"; + version = "1.0.30001248"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz"; - sha512 = "4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz"; + sha512 = "NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw=="; }; }; "canvas-2.8.0" = { @@ -14953,31 +14845,31 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.24" = { + "cdk8s-1.0.0-beta.26" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.24"; + version = "1.0.0-beta.26"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.24.tgz"; - sha512 = "1aezBDPxwYvVd0/k5ts2UsgB6/NrvRNUksbZxbzZK1+thHl2iOLNYjnFMEOb64m6z3LrR0QMmAE4SLrXzbyMcQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.26.tgz"; + sha512 = "CnrIxcQylFVWgtNoTc4wInqi+MU143WGm8ZY1qotG05byF7QsgIFICjIUIH7osNRkGXP/zQaEL8sxCZne1rfqQ=="; }; }; - "cdk8s-plus-17-1.0.0-beta.30" = { + "cdk8s-plus-17-1.0.0-beta.38" = { name = "cdk8s-plus-17"; packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.30"; + version = "1.0.0-beta.38"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.30.tgz"; - sha512 = "e2xfSVsbwUPz+Zv5UycVKRgIcoca7ND00ov57iIsxRkc0yJ7rbILTxtrFoJ0fkEccgDVCDSoC6KfKkKh9Xzhqw=="; + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.38.tgz"; + sha512 = "lBh6Z0yygKmtD4blPOmxVFAWhiFP7k/27h0p1n8FY69XlZXrCC8Z1LxoWjhtU5eCCCD1AeJf48nq7LqmwD2vJw=="; }; }; - "cdktf-0.4.1" = { + "cdktf-0.5.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.1.tgz"; - sha512 = "U5aap+QH+w/0ibeFRYm8T/JtaA8AkjCkQ6c60eL/5hY0K0qi8rjEBpQcEho9KljqZvWap6mD2yD+JqunbLzRGA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.5.0.tgz"; + sha512 = "V/3JOJLvD01vGy8Tvft7jH0NY3R7biKWqJ/BjGCx7+J9KAz6k9aFvtIpRhgcvXMo98B+lmdnMwSgfW2jXhnauQ=="; }; }; "center-align-0.1.3" = { @@ -15079,6 +14971,15 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha512 = "LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ=="; + }; + }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -15718,13 +15619,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.1.3" = { + "clean-css-5.1.4" = { name = "clean-css"; packageName = "clean-css"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.3.tgz"; - sha512 = "qGXzUCDpLwAlPx0kYeU4QXjzQIcIYZbJjD4FNm7NnSjoP0hYMVZhHOpUYJ6AwfkMX2cceLRq54MeCgHy/va1cA=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.4.tgz"; + sha512 = "e6JAuR0T2ahg7fOSv98Nxqh7mHWOac5TaCSgrr61h/6mkPLwlxX38hzob4h6IKj/UHlrrLXvAEjWqXlvi8r8lQ=="; }; }; "clean-deep-3.4.0" = { @@ -17491,13 +17392,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.106" = { + "constructs-3.3.108" = { name = "constructs"; packageName = "constructs"; - version = "3.3.106"; + version = "3.3.108"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.106.tgz"; - sha512 = "QJCbOQRS5UcCcM/e73L1bxNG7eeV70uOzwML5ffoAMhvlgsNYyeI8VleEcsbG0u1TTspMM+lIwD2NYud9NVq7A=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.108.tgz"; + sha512 = "7FT28bE9KIU8Pplwi7dTVLoEbCQrvW4KSpGVb9emaiVeUHA2BmUN6Ji9qICPH3H1QR2+gcn8gXZGbuha9VuuKA=="; }; }; "consume-http-header-1.0.0" = { @@ -18005,31 +17906,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.2" = { + "core-js-3.16.0" = { name = "core-js"; packageName = "core-js"; - version = "3.15.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz"; - sha512 = "tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz"; + sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; }; }; - "core-js-compat-3.15.2" = { + "core-js-compat-3.16.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz"; - sha512 = "Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz"; + sha512 = "5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q=="; }; }; - "core-js-pure-3.15.2" = { + "core-js-pure-3.16.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz"; - sha512 = "D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz"; + sha512 = "wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ=="; }; }; "core-util-is-1.0.2" = { @@ -18482,15 +18383,6 @@ let sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; - "crypto-js-4.0.0" = { - name = "crypto-js"; - packageName = "crypto-js"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"; - sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; - }; - }; "crypto-js-4.1.1" = { name = "crypto-js"; packageName = "crypto-js"; @@ -19751,6 +19643,15 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; + "date-fns-2.23.0" = { + name = "date-fns"; + packageName = "date-fns"; + version = "2.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz"; + sha512 = "5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="; + }; + }; "date-format-2.1.0" = { name = "date-format"; packageName = "date-format"; @@ -20336,15 +20237,6 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deep-scope-analyser-1.7.0" = { - name = "deep-scope-analyser"; - packageName = "deep-scope-analyser"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-scope-analyser/-/deep-scope-analyser-1.7.0.tgz"; - sha512 = "rl5Dmt2IZkFpZo6XbEY1zG8st2Wpq8Pi/dV2gz8ZF6BDYt3fnor2JNxHwdO1WLo0k6JbmYp0x8MNy8kE4l1NtA=="; - }; - }; "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; @@ -20354,6 +20246,15 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; + "deepl-translator-1.2.1" = { + name = "deepl-translator"; + packageName = "deepl-translator"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepl-translator/-/deepl-translator-1.2.1.tgz"; + sha512 = "LwCksmzPwowOQu9yrdVl43rRrTKsXwlH/uVQxgL8KoCoCEoozA6wzN7oaAEoJSocccn5CoEc6MnXlQEya6rTzw=="; + }; + }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -22199,13 +22100,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.788" = { + "electron-to-chromium-1.3.791" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.788"; + version = "1.3.791"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.788.tgz"; - sha512 = "dbMIpX4E4/Gk4gzOh1GYS7ls1vGsByWKpIqLviJi1mSmSt5BvrWLLtSqpFE5BaC7Ef4NnI0GMaiddNX2Brw6zA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.791.tgz"; + sha512 = "Tdx7w1fZpeWOOBluK+kXTAKCXyc79K65RB6Zp0+sPSZZhDjXlrxfGlXrlMGVVQUrKCyEZFQs1UBBLNz5IdbF0g=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22723,15 +22624,6 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; - "entity-decode-2.0.2" = { - name = "entity-decode"; - packageName = "entity-decode"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entity-decode/-/entity-decode-2.0.2.tgz"; - sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg=="; - }; - }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -22885,13 +22777,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.18.3" = { + "es-abstract-1.18.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz"; - sha512 = "nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.4.tgz"; + sha512 = "xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ=="; }; }; "es-get-iterator-1.1.2" = { @@ -23281,13 +23173,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.14.0" = { + "eslint-plugin-vue-7.15.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.14.0"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; - sha512 = "IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.0.tgz"; + sha512 = "br58VTAT8JB4Qe7XJVN7fNBqQgclE+hcsievoyQyGtCZsYprFMQYu+c9yHX9XkP55cMnSVZpW5fRgy3n/wZskA=="; }; }; "eslint-scope-3.7.3" = { @@ -24055,15 +23947,6 @@ let sha512 = "8ORl1YRygYGPdR+zcClMqzaU+JQuvdNIw/s0RNwYluxNecEHkDEcXFmO6A5T79p7e48KI8iXJYt6KIn4Z9z4bg=="; }; }; - "exif-parser-0.1.12" = { - name = "exif-parser"; - packageName = "exif-parser"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz"; - sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; - }; - }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -24154,13 +24037,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.90" = { + "expo-pwa-0.0.91" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.90"; + version = "0.0.91"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.90.tgz"; - sha512 = "0uVXBgpe4Vt3xBKgAu7mmT+TMxiRJHXtMcP7FhaAPv1LkCxDrtMuK+SYERRJlTYRLX/qA2yDIWix3ySzvpWWzA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.91.tgz"; + sha512 = "hwi3eJhL85yHZBvv5ekdS0A1721wmgNAM53LMv5meawTBy5W0NNg8E6Ey+N3UCrL6BP1Kk7WByxX4V4kkzGV8A=="; }; }; "express-2.5.11" = { @@ -25198,15 +25081,6 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; - "file-type-9.0.0" = { - name = "file-type"; - packageName = "file-type"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; - sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -25720,13 +25594,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.1" = { + "flatted-3.2.2" = { name = "flatted"; packageName = "flatted"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz"; - sha512 = "OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"; + sha512 = "JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="; }; }; "flatten-0.0.1" = { @@ -26206,13 +26080,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.11.0" = { + "fp-ts-2.11.1" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.0.tgz"; - sha512 = "MRss/AgPUBgScVtHaaNkKa/3+SaN3QOokYr1CnOOgdfterSwuaE2x6h/ADQOTcs3mKDC17d6NzQyZOZDFijQmA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.1.tgz"; + sha512 = "CJOfs+Heq/erkE5mqH2mhpsxCKABGmcLyeEwPxtbTlkLkItGUs6bmk2WqjB2SgoVwNwzTE5iKjPQJiq06CPs5g=="; }; }; "fraction.js-4.1.1" = { @@ -27755,6 +27629,15 @@ let sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; + "globby-11.0.3" = { + name = "globby"; + packageName = "globby"; + version = "11.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + }; + }; "globby-11.0.4" = { name = "globby"; packageName = "globby"; @@ -27881,13 +27764,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.3.0" = { + "google-auth-library-7.4.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.3.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.3.0.tgz"; - sha512 = "MPeeMlnsYnoiiVFMwX3hgaS684aiXrSqKoDP+xL4Ejg4Z0qLvIeg4XsaChemyFI8ZUO7ApwDAzNtgmhWSDNh5w=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.4.1.tgz"; + sha512 = "TNLFbGKZZKIzOLHKaSXCo1pSZQ1ZOaAZZPkVKQa4MM7vrRNfHGzRTwE2WDxWAow/35kJP1710ZTMY4Qf3jH3Gw=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28097,6 +27980,24 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; + "graphology-0.20.0" = { + name = "graphology"; + packageName = "graphology"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphology/-/graphology-0.20.0.tgz"; + sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; + }; + }; + "graphology-types-0.19.3" = { + name = "graphology-types"; + packageName = "graphology-types"; + version = "0.19.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.3.tgz"; + sha512 = "N9zuoXkhoEhx/7FaMlMTgHqPl17Mcub67YHLk0d+i8mOSsxpD9kLzvUwUo5v39xeoOUqRb3rC0Y2h9zTssZUGg=="; + }; + }; "graphql-0.11.7" = { name = "graphql"; packageName = "graphql"; @@ -30726,6 +30627,15 @@ let sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; + "ink-use-stdout-dimensions-1.0.5" = { + name = "ink-use-stdout-dimensions"; + packageName = "ink-use-stdout-dimensions"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-use-stdout-dimensions/-/ink-use-stdout-dimensions-1.0.5.tgz"; + sha512 = "rVsqnw4tQEAJUoknU09+zHdDf30GJdkumkHr0iz/TOYMYEZJkYqziQSGJAM+Z+M603EDfO89+Nxyn/Ko2Zknfw=="; + }; + }; "inline-source-map-0.6.2" = { name = "inline-source-map"; packageName = "inline-source-map"; @@ -30888,6 +30798,15 @@ let sha512 = "mzNrusCk5L6kSzlN0Ioddn8yzrhYNLli+Sn2ZxMuLechMYAzakiFCIULxsxlQb5YKzthLGfrFACcWoAvM7p04Q=="; }; }; + "inquirer-glob-prompt-0.1.0" = { + name = "inquirer-glob-prompt"; + packageName = "inquirer-glob-prompt"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-glob-prompt/-/inquirer-glob-prompt-0.1.0.tgz"; + sha512 = "Zw9XYJdrBBJ5TZjLH8Nu8PIa54huvkP0xeNOTtKh3bis0DNAJWMtdpT9PIJBkqheMUnwIPmv8jkjOr7aPKYFqg=="; + }; + }; "insert-module-globals-7.2.1" = { name = "insert-module-globals"; packageName = "insert-module-globals"; @@ -31023,6 +30942,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; "internmap-1.0.1" = { name = "internmap"; packageName = "internmap"; @@ -32301,15 +32229,6 @@ let sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; - "is-regex-1.0.5" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; - }; - }; "is-regex-1.1.3" = { name = "is-regex"; packageName = "is-regex"; @@ -32580,6 +32499,15 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; + "is-valid-domain-0.1.2" = { + name = "is-valid-domain"; + packageName = "is-valid-domain"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.2.tgz"; + sha512 = "vm/9Ynw80MusgfSMffjGRuMhO8hjk5MOxLoFL7nYWvWXTPCxTGQtACiCwO055UqHICG8xP6hIvRXK1iwnuU9GA=="; + }; + }; "is-valid-glob-1.0.0" = { name = "is-valid-glob"; packageName = "is-valid-glob"; @@ -33129,22 +33057,22 @@ let sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; }; }; - "jimp-0.12.1" = { - name = "jimp"; - packageName = "jimp"; - version = "0.12.1"; + "jimp-compact-0.16.1" = { + name = "jimp-compact"; + packageName = "jimp-compact"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/jimp/-/jimp-0.12.1.tgz"; - sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; + url = "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz"; + sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.1.5" = { + "jitdb-3.1.6" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.5.tgz"; - sha512 = "O3z6dmk4FY+Il3zt4CEnDwgbCWP89dsGvCK1Gx7pVOSsKML31WupDJMTICZ3PUagYi52NNUhvCZHUeJVJFdgTA=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.6.tgz"; + sha512 = "FnOJmSyz/z4GfULcJSuvGfHlXFuosXws77GnR9M7wgCH/KAE5TovcQkjbFt5x69o6myacPYdzWr8yHVLJMuKWA=="; }; }; "jju-1.4.0" = { @@ -33588,13 +33516,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.308" = { + "jsii-srcmak-0.1.310" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.308"; + version = "0.1.310"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.308.tgz"; - sha512 = "jm/nmU3Z9730bn2NSfCu/X0pJySpVCdO7vMQGjP4ni1qcBqbQ2hp6qWThaYoB1IfS1TR9TH5RkwtxZGiTBo8PQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.310.tgz"; + sha512 = "SxlLdZwyP6USUSlHb2qfnCTtiJAZAJ6UIl27wrBubFKqyd9I7HYVWmkZtaVoPS7gC+VCW/6LsFCygxxNffUeow=="; }; }; "json-bigint-0.2.3" = { @@ -33903,13 +33831,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.278" = { + "json2jsii-0.1.280" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.278"; + version = "0.1.280"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.278.tgz"; - sha512 = "sc7Nu9qWIDbIAWVktPahGn8LLSiNNO5/FFJLDIpIhLI6FjHrsLT1wE+97WNHEzabdrpzvuGnyVO1Zu9+DEtC9A=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.280.tgz"; + sha512 = "l7hVpZioBXKzztqKs4CKAuaDm/lUr/L4Vi7xT8LqGWHR94XFuW7lINDRQWIqKxN2dVfMI9Ru8C3w3FtIao9kuA=="; }; }; "json3-3.2.6" = { @@ -35506,15 +35434,6 @@ let sha512 = "pjAkD1VLGLvwu1Dso3HvQDcK25L/slRX8nB7hTDDEznn+rRzxBJd1sXuNaFovwJHughvK3ZxUxAHC0BfzIatEw=="; }; }; - "load-bmfont-1.4.1" = { - name = "load-bmfont"; - packageName = "load-bmfont"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz"; - sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; - }; - }; "load-ip-set-2.2.1" = { name = "load-ip-set"; packageName = "load-ip-set"; @@ -38656,13 +38575,13 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.0.1" = { + "mem-fs-editor-9.0.2" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.0.1.tgz"; - sha512 = "SqW+DkPbxZVzVldNHexoo5MiUR3YpIqiCVcZ/SZ6f7KToaSV7pMd4/URrkD5mnj35bd6NAK7SlftHSyW+Kgk4w=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.0.2.tgz"; + sha512 = "0ebt+XneyzOzYs6HqW5OEJaA997trrETuyy/7Vu92CIO7A5yfqHY0M4MVXAjqBCdX1GzjCe396ljAbm3O087Fw=="; }; }; "memfs-3.2.2" = { @@ -38935,13 +38854,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.0" = { + "mermaid-8.11.1" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.0"; + version = "8.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.0.tgz"; - sha512 = "c/SprR4mJ2Pj7A+3mEvva7XrhEkXQJUal7fIyOkMhOhsPX2u5gQjjm5CEhHQ6WdGsqP+yiR+Fcgnd1i8mpFK8w=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.1.tgz"; + sha512 = "riymn143xhMtWBgC6WDniZ+ykNg2tzepO+/ES+t63rDQLhUbWWCMor+9UHOsUfgrJIK87M3nUwHFfc7ygX5/Fg=="; }; }; "meros-1.1.4" = { @@ -39097,15 +39016,6 @@ let sha512 = "Z2uZi/IUMGQDCXASdujXRqrXXEwSY0XffUrAOllhqzQI3wpUyZbiZTiE2JuYC0HSG2G7DbCS5jZmsEKEGZuemg=="; }; }; - "microbuffer-1.0.0" = { - name = "microbuffer"; - packageName = "microbuffer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz"; - sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2"; - }; - }; "microee-0.0.6" = { name = "microee"; packageName = "microee"; @@ -39412,15 +39322,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.48.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.48.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz"; - sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; - }; - }; "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; @@ -39457,13 +39358,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.31" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.31"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; - sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "mimic-fn-1.2.0" = { @@ -40897,15 +40798,6 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "native-url-0.2.6" = { - name = "native-url"; - packageName = "native-url"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz"; - sha512 = "k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA=="; - }; - }; "natives-1.1.6" = { name = "natives"; packageName = "natives"; @@ -42817,15 +42709,6 @@ let sha512 = "wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw=="; }; }; - "object-inspect-1.7.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; - }; - }; "object-is-1.1.5" = { name = "object-is"; packageName = "object-is"; @@ -42997,6 +42880,15 @@ let sha512 = "eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="; }; }; + "obliterator-1.6.1" = { + name = "obliterator"; + packageName = "obliterator"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; + sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + }; + }; "observ-0.2.0" = { name = "observ"; packageName = "observ"; @@ -43609,6 +43501,15 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; + "optimism-0.16.1" = { + name = "optimism"; + packageName = "optimism"; + version = "0.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz"; + sha512 = "64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg=="; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -44617,33 +44518,6 @@ let sha1 = "d3460bf1ddd0dfaeed42da754242e65fb684a81f"; }; }; - "parse-bmfont-ascii-1.0.6" = { - name = "parse-bmfont-ascii"; - packageName = "parse-bmfont-ascii"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; - sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; - }; - }; - "parse-bmfont-binary-1.0.6" = { - name = "parse-bmfont-binary"; - packageName = "parse-bmfont-binary"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; - sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; - }; - }; - "parse-bmfont-xml-1.1.4" = { - name = "parse-bmfont-xml"; - packageName = "parse-bmfont-xml"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; - sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; - }; - }; "parse-conflict-json-1.1.1" = { name = "parse-conflict-json"; packageName = "parse-conflict-json"; @@ -45598,13 +45472,13 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.3.0" = { + "pg-pool-3.4.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz"; - sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; + sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; }; }; "pg-protocol-1.5.0" = { @@ -45634,15 +45508,6 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "phin-2.9.3" = { - name = "phin"; - packageName = "phin"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz"; - sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; - }; - }; "physical-cpu-count-2.0.0" = { name = "physical-cpu-count"; packageName = "physical-cpu-count"; @@ -45832,15 +45697,6 @@ let sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; }; }; - "pixelmatch-4.0.2" = { - name = "pixelmatch"; - packageName = "pixelmatch"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz"; - sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; - }; - }; "pixiv-api-client-0.25.0" = { name = "pixiv-api-client"; packageName = "pixiv-api-client"; @@ -49775,15 +49631,6 @@ let sha512 = "Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="; }; }; - "react-refresh-0.8.3" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz"; - sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="; - }; - }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -51269,13 +51116,13 @@ let sha512 = "qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="; }; }; - "resolve-1.17.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.17.0"; + "reserved-words-0.1.2" = { + name = "reserved-words"; + packageName = "reserved-words"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz"; + sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; }; }; "resolve-1.20.0" = { @@ -51809,13 +51656,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.54.0" = { + "rollup-2.55.1" = { name = "rollup"; packageName = "rollup"; - version = "2.54.0"; + version = "2.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.54.0.tgz"; - sha512 = "RHzvstAVwm9A751NxWIbGPFXs3zL4qe/eYg+N7WwGtIXVLy1cK64MiU37+hXeFm1jqipK6DGgMi6Z2hhPuCC3A=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.55.1.tgz"; + sha512 = "1P9w5fpb6b4qroePh8vHKGIvPNxwoCQhjJpIqfZGHLKpZ0xcU2/XBmFxFbc9697/6bmHpmFTLk5R1dAQhFSo0g=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -52151,13 +51998,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.2.0" = { + "rxjs-7.3.0" = { name = "rxjs"; packageName = "rxjs"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz"; - sha512 = "aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz"; + sha512 = "p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -52403,15 +52250,6 @@ let sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; }; }; - "schema-utils-0.4.7" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; - }; - }; "schema-utils-1.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -53474,13 +53312,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.41.1" = { + "simple-git-2.41.2" = { name = "simple-git"; packageName = "simple-git"; - version = "2.41.1"; + version = "2.41.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.1.tgz"; - sha512 = "n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.2.tgz"; + sha512 = "rrsqu3w6TNCwe7McW7Uany7pmz5TMteOTCu5Wfc0vVUdKJP94m+587pbEB6Kj4IsBM/vl85nGXZJ3XRSQ9ucLg=="; }; }; "simple-handshake-3.0.0" = { @@ -53789,15 +53627,6 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "slugid-1.1.0" = { - name = "slugid"; - packageName = "slugid"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slugid/-/slugid-1.1.0.tgz"; - sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; - }; - }; "slugify-1.4.7" = { name = "slugify"; packageName = "slugify"; @@ -55445,13 +55274,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.28" = { + "sscaff-1.2.31" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.28"; + version = "1.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.28.tgz"; - sha512 = "HSL0UNbfhrfqbz4Pnm/0SVVPXyrqnfu6d/RCfXDCdBtPPeGqhg8JMm5PiBwuFkZ217xacctVmnR5LDwE+2rOeA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.31.tgz"; + sha512 = "U6DtvPeVUIN2IPljBqsyNyoqH6YCDWBWl+pan6p874mWjapQ3bQbbYm7CJgsA7NIzR/kGX2aUWAZLR3s1vGBsA=="; }; }; "ssh-config-1.1.6" = { @@ -56831,13 +56660,13 @@ let sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q=="; }; }; - "stylis-3.5.4" = { + "stylis-4.0.10" = { name = "stylis"; packageName = "stylis"; - version = "3.5.4"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"; - sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; + url = "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz"; + sha512 = "m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="; }; }; "stylus-0.54.8" = { @@ -56903,6 +56732,15 @@ let sha1 = "3a26ab96e06f78cf4ace8d083f6227fa55970947"; }; }; + "sucrase-3.20.0" = { + name = "sucrase"; + packageName = "sucrase"; + version = "3.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.0.tgz"; + sha512 = "Rsp+BX7DRuCleJvBAHN7gQ3ddk7U0rJev19XlIBF6dAq9vX4Tr5mHk4E7+ig/I7BM3DLYotCmm20lfBElT2XtQ=="; + }; + }; "sudo-block-1.2.0" = { name = "sudo-block"; packageName = "sudo-block"; @@ -57056,6 +56894,15 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; + "supports-color-4.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; + sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + }; + }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -57434,13 +57281,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.12" = { + "systeminformation-5.7.13" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.12"; + version = "5.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.12.tgz"; - sha512 = "rRMi8JafAXSrGd/aIxgmIxJyGRgRzyOZd75JilvVw13vD98aEaAJzKtezba5DYlTC/86c/XiZzd6VCed5fr/sA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.13.tgz"; + sha512 = "yGzRLLdZ4xR37+3WM89rFG1zEQ10BqefeCv0YUfXp26bZGPoZtGQt/IEtIa40i1VmGBMGFTQCVClZ7/optxtvw=="; }; }; "table-3.8.3" = { @@ -57606,13 +57453,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.13.3" = { + "tape-4.14.0" = { name = "tape"; packageName = "tape"; - version = "4.13.3"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.13.3.tgz"; - sha512 = "0/Y20PwRIUkQcTCSi4AASs+OANZZwqPKaipGCEwp10dQMipVvSZwUUCi01Y/OklIGyHKFhIcjock+DKnBfLAFw=="; + url = "https://registry.npmjs.org/tape/-/tape-4.14.0.tgz"; + sha512 = "z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ=="; }; }; "tar-0.1.17" = { @@ -57786,13 +57633,13 @@ let sha512 = "6u5UyW2KpMS/hwC4DKLGlicK/rVSYCahPFgF14ioP6BzwcDwQlciHCB/oWguvxLJaYGrvY6crzLHfjupFTBPXw=="; }; }; - "telegraf-4.4.0" = { + "telegraf-4.4.1" = { name = "telegraf"; packageName = "telegraf"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.0.tgz"; - sha512 = "DjVVEz37/5Hp0n8eLhAVjErwoyrWsqLyFAoRj8sU5XiD2CVAbBOx9J6a7cLn/B46pPgDqgbrdjiOeK0fQMiLOA=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.1.tgz"; + sha512 = "jxV8fC/K6abcUTlhy/l8txJAmEJIkJoDu/cN0yXOJWLp9csfLIp+cD4qlwJ6ko+4EgOJmNZvWK7Tr2dxKolJQQ=="; }; }; "temp-0.6.0" = { @@ -58083,13 +57930,13 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; - "textextensions-5.12.0" = { + "textextensions-5.13.0" = { name = "textextensions"; packageName = "textextensions"; - version = "5.12.0"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/textextensions/-/textextensions-5.12.0.tgz"; - sha512 = "IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w=="; + url = "https://registry.npmjs.org/textextensions/-/textextensions-5.13.0.tgz"; + sha512 = "srLdv6DnJWdrddd4j6GcVmExwaydgbWsmTsxeW8OkZv6/2Je/SwkjHYdrhosImPQPiXzNT2kyjak4xh2TVccgA=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -58488,15 +58335,6 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; - "timm-1.7.1" = { - name = "timm"; - packageName = "timm"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"; - sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; - }; - }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -58542,15 +58380,6 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "tinycolor2-1.4.2" = { - name = "tinycolor2"; - packageName = "tinycolor2"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; - }; - }; "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; @@ -59316,6 +59145,15 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; + "ts-interface-checker-0.1.13" = { + name = "ts-interface-checker"; + packageName = "ts-interface-checker"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"; + sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; + }; + }; "ts-invariant-0.4.4" = { name = "ts-invariant"; packageName = "ts-invariant"; @@ -59325,6 +59163,15 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-invariant-0.9.0" = { + name = "ts-invariant"; + packageName = "ts-invariant"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.0.tgz"; + sha512 = "+JqhKqywk+ue5JjAC6eTWe57mOIxYXypMUkBDStkAzvnlfkDJ1KGyeMuNRMwOt6GXzHSC1UT9JecowpZDmgXqA=="; + }; + }; "ts-loader-8.0.4" = { name = "ts-loader"; packageName = "ts-loader"; @@ -59811,15 +59658,6 @@ let sha512 = "IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw=="; }; }; - "type-fest-0.5.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -60288,15 +60126,6 @@ let sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; - "underscore-1.12.1" = { - name = "underscore"; - packageName = "underscore"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; - sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; - }; - }; "underscore-1.13.1" = { name = "underscore"; packageName = "underscore"; @@ -61522,15 +61351,6 @@ let sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; }; }; - "utif-2.0.1" = { - name = "utif"; - packageName = "utif"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"; - sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; - }; - }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -61648,6 +61468,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -61855,6 +61684,15 @@ let sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; }; }; + "value-or-promise-1.0.10" = { + name = "value-or-promise"; + packageName = "value-or-promise"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.10.tgz"; + sha512 = "1OwTzvcfXkAfabk60UVr5NdjtjJ0Fg0T5+B1bhxtrOEwSH2fe8y4DnLgoksfCyd8yZCOQQHB0qLMQnwgCjbXLQ=="; + }; + }; "value-or-promise-1.0.6" = { name = "value-or-promise"; packageName = "value-or-promise"; @@ -63232,13 +63070,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.9.0" = { + "vue-eslint-parser-7.10.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; - sha512 = "QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz"; + sha512 = "7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -63466,13 +63304,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.4.0" = { + "web3-utils-1.5.0" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.4.0.tgz"; - sha512 = "b8mEhwh/J928Xk+SQFjtqrR2EGPhpknWLcIt9aCpVPVRXiqjUGo/kpOHKz0azu9c6/onEJ9tWXZt0cVjmH0N5Q=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.0.tgz"; + sha512 = "hNyw7Oxi6TM3ivXmv4hK5Cvyi9ML3UoKtcCYvLF9woPWh5v2dwCCVO1U3Iq5HHK7Dqq28t1d4CxWHqUfOfAkgg=="; }; }; "webassemblyjs-1.11.1" = { @@ -63520,6 +63358,15 @@ let sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; + "webmscore-0.18.0" = { + name = "webmscore"; + packageName = "webmscore"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webmscore/-/webmscore-0.18.0.tgz"; + sha512 = "/J/2/KKWKST0A+Qix/SBSVtZY0C/33GQoYI3V84XEu/V3nij2ZFIcsyGQPYVr6y0HVasj6dQtvY+y7MrmYcsTw=="; + }; + }; "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; @@ -63556,13 +63403,13 @@ let sha512 = "qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw=="; }; }; - "webpack-5.47.0" = { + "webpack-5.47.1" = { name = "webpack"; packageName = "webpack"; - version = "5.47.0"; + version = "5.47.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.47.0.tgz"; - sha512 = "soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz"; + sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -63601,15 +63448,6 @@ let sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; - "webpack-deep-scope-plugin-1.6.0" = { - name = "webpack-deep-scope-plugin"; - packageName = "webpack-deep-scope-plugin"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-deep-scope-plugin/-/webpack-deep-scope-plugin-1.6.0.tgz"; - sha512 = "ZYldKNeWQtk9SoV70x7Eb2NRmvHMtNBOjscs0wUdg/pfymntiF+0W/D9v2o76ztufjND6RNFjNVnyFQww25AZg=="; - }; - }; "webpack-dev-middleware-3.7.3" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -63709,13 +63547,13 @@ let sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; - "webpack-sources-3.0.1" = { + "webpack-sources-3.1.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.0.1.tgz"; - sha512 = "LkBxiXJ3tTuhLaS5gz6D6l77Et8mPWlghAe7bbnmi2PyN1CtkiL/YitR+I0pn9PtBC88Irqgg6F9dBJh8+sJRQ=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.1.tgz"; + sha512 = "ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ=="; }; }; "webpack-stream-6.1.0" = { @@ -64456,15 +64294,6 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "worker-loader-2.0.0" = { - name = "worker-loader"; - packageName = "worker-loader"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz"; - sha512 = "tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw=="; - }; - }; "worker-rpc-0.1.1" = { name = "worker-rpc"; packageName = "worker-rpc"; @@ -64834,13 +64663,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.50" = { + "xdl-59.0.52" = { name = "xdl"; packageName = "xdl"; - version = "59.0.50"; + version = "59.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.50.tgz"; - sha512 = "T1QdEP3U4m0BfeqRWPJ1J9ywlmicFTM8zBWPqP/1Xw6V/cpX2QHRfhLpl60uEiD7HsCcAPXTe1zIo8khDhFYvA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.52.tgz"; + sha512 = "gKyfWDxd0lXut92LmOU4xte+AWt+sIJJTYILIwkbLtw0jqq556mg6+r5EDHI8kIHz1KFM3glTYTr1+W7uJ4wHw=="; }; }; "xenvar-0.5.1" = { @@ -64942,15 +64771,6 @@ let sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; }; - "xml-parse-from-string-1.0.1" = { - name = "xml-parse-from-string"; - packageName = "xml-parse-from-string"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; - sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; - }; - }; "xml2js-0.2.4" = { name = "xml2js"; packageName = "xml2js"; @@ -65852,6 +65672,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.1.0" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz"; + sha512 = "1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -65906,6 +65735,15 @@ let sha1 = "66c6de82cc36b09734b820703776490a6fbbe624"; }; }; + "zod-1.11.17" = { + name = "zod"; + packageName = "zod"; + version = "1.11.17"; + src = fetchurl { + url = "https://registry.npmjs.org/zod/-/zod-1.11.17.tgz"; + sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; + }; + }; "zwitch-1.0.5" = { name = "zwitch"; packageName = "zwitch"; @@ -65930,22 +65768,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.3"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.3.tgz"; - sha512 = "XIywpo+8WhwJlEMlb4CXCMdnBSEbU1L1gUzcx5p0poYkWSp1c33Ssd96Jdu3moPP/9aP/49W8fMtoPiIQo3pNQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.4.tgz"; + sha512 = "LpyhyqWe3bFcuH3MrXeYoIPI1htjwG1b5ehETfq4qsMvNmuFON6QI+F7EWEpX7lItVQc2bES+ogasTZsZue/uw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.3" - sources."@angular-devkit/core-12.1.3" - sources."@angular-devkit/schematics-12.1.3" + sources."@angular-devkit/architect-0.1201.4" + sources."@angular-devkit/core-12.1.4" + sources."@angular-devkit/schematics-12.1.4" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.3" + sources."@schematics/angular-12.1.4" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -66085,8 +65923,8 @@ in sources."lru-cache-6.0.0" sources."magic-string-0.25.7" sources."make-fetch-happen-9.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" @@ -66425,8 +66263,8 @@ in sources."map-obj-4.2.1" sources."marky-1.2.2" sources."matcher-2.1.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -66634,8 +66472,8 @@ in sources."lodash-4.17.21" sources."lowdb-1.0.0" sources."lunr-2.3.9" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -66717,7 +66555,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66752,7 +66590,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-json-2.0.0" sources."buffer-json-encoding-1.0.2" sources."bulk-write-stream-1.1.4" @@ -66822,7 +66660,7 @@ in sources."encoding-down-6.3.0" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { + (sources."es-abstract-1.18.4" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -66904,6 +66742,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inspect-custom-symbol-1.1.1" + sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" sources."is-bigint-1.0.2" sources."is-binary-path-2.1.0" @@ -67071,6 +66910,7 @@ in ]; }) sources."shuffled-priority-queue-2.1.0" + sources."side-channel-1.0.4" sources."signed-varint-2.0.1" (sources."simple-handshake-3.0.0" // { dependencies = [ @@ -67129,7 +66969,7 @@ in sources."supports-color-2.0.0" sources."temp-dir-1.0.0" sources."tempy-0.1.0" - sources."textextensions-5.12.0" + sources."textextensions-5.13.0" (sources."through2-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -67247,7 +67087,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67284,9 +67124,9 @@ in sources."braces-3.0.2" sources."browserslist-4.16.6" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67313,7 +67153,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67406,8 +67246,8 @@ in sources."magic-string-0.25.7" sources."memfs-3.2.2" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -67722,7 +67562,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67811,7 +67651,7 @@ in sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -67851,7 +67691,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."busboy-0.3.1" sources."bytes-3.1.0" @@ -67865,7 +67705,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67922,12 +67762,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.2" + sources."core-js-pure-3.16.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -67993,14 +67833,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -68179,6 +68019,7 @@ in sources."supports-color-7.2.0" ]; }) + sources."internal-slot-1.0.3" sources."into-stream-2.0.1" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -68284,8 +68125,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -68512,6 +68353,7 @@ in sources."shell-quote-1.7.2" sources."shellwords-0.1.1" sources."shortid-2.2.16" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -69003,7 +68845,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -69014,7 +68856,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -69108,7 +68950,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69143,9 +68985,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69172,14 +69014,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.954.0" // { + (sources."aws-sdk-2.957.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69319,7 +69161,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-7.2.0" // { + (sources."rxjs-7.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -69383,10 +69225,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.1"; + version = "10.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; - sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.2.tgz"; + sha512 = "WkkawzLy7qGOxY0ep8+FYNpGa2+nCPDdKGzSF1HR1oBgwkzt7e1hOYpvYpRBT3tssbcm6ffw5MGejAIRImSr6w=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69399,7 +69241,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69525,7 +69367,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -69589,7 +69431,7 @@ in sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."crypto-js-4.0.0" + sources."crypto-js-4.1.1" sources."crypto-random-string-2.0.0" sources."csv-parse-4.16.0" sources."cycle-1.0.3" @@ -69942,7 +69784,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" ]; }) sources."proxy-addr-2.0.7" @@ -69976,7 +69818,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safe-compare-1.1.4" sources."safer-buffer-2.1.2" @@ -70034,7 +69876,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."telegraf-4.4.0" // { + (sources."telegraf-4.4.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -70208,8 +70050,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -70463,7 +70305,7 @@ in }) sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" @@ -70502,7 +70344,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -70530,6 +70372,7 @@ in sources."inherits-2.0.4" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" @@ -70600,6 +70443,7 @@ in sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."simple-concat-1.0.1" sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { @@ -70722,7 +70566,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bunyan-1.8.15" sources."bytes-3.1.0" sources."call-bind-1.0.2" @@ -70910,8 +70754,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -71032,7 +70876,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.41.1" + sources."simple-git-2.41.2" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -71122,7 +70966,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."addr-to-ip-port-1.5.3" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71141,7 +70985,7 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bencode-2.0.1" + sources."bencode-2.0.2" sources."bep53-range-1.1.1" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -71163,7 +71007,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -71303,8 +71147,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -71528,10 +71372,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.27"; + version = "1.0.0-beta.31"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.27.tgz"; - sha512 = "1ezPt50XBr0KDh+UaJhe/aueRsOEHpNohJlCg3IIhxXWmz3jzo4PLdKrhcT6nFNYXhb6tHo1O+YPkWHhWrEb6w=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.31.tgz"; + sha512 = "oVe2k5xGfL27WTIT2rhS+pRXellgRTFO0xx6TxtOvZ7AyIjbeU4F9XbuBaIilb7X8k9E+G5d6D3hAMkxkh5Gew=="; }; dependencies = [ sources."@jsii/spec-1.32.0" @@ -71543,8 +71387,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.24" - sources."cdk8s-plus-17-1.0.0-beta.30" + sources."cdk8s-1.0.0-beta.26" + sources."cdk8s-plus-17-1.0.0-beta.38" sources."cliui-7.0.4" sources."clone-2.1.2" (sources."codemaker-1.32.0" // { @@ -71556,7 +71400,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.106" + sources."constructs-3.3.108" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71567,7 +71411,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -71588,6 +71432,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" @@ -71629,13 +71474,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.308" // { + (sources."jsii-srcmak-0.1.310" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.278" + sources."json2jsii-0.1.280" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71671,7 +71516,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.28" + sources."sscaff-1.2.31" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71720,94 +71565,263 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.1.tgz"; - sha512 = "bDK7F4MQFFgzkZBoxMimSu297IJ4duhG1ZpOGG/YcQ9MF/IuIKqlxV6WhWUEfPupnSuZuDQMNCRf/PhKsWcy9Q=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.5.0.tgz"; + sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.4.1" + sources."@apollo/client-3.4.1" + (sources."@apollo/protobufjs-1.2.2" // { + dependencies = [ + sources."@types/node-10.17.60" + ]; + }) + sources."@apollographql/apollo-tools-0.5.1" + sources."@apollographql/graphql-playground-html-1.6.29" + (sources."@ardatan/aggregate-error-0.0.6" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.14.8" + sources."@babel/helper-validator-identifier-7.14.8" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.14.8" + sources."@babel/template-7.14.5" + sources."@babel/types-7.14.8" + sources."@cdktf/hcl2cdk-0.5.0" + sources."@cdktf/hcl2json-0.5.0" + (sources."@graphql-tools/graphql-file-loader-6.2.7" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + (sources."@graphql-tools/import-6.3.1" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + (sources."@graphql-tools/load-6.2.8" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + (sources."@graphql-tools/merge-6.2.16" // { + dependencies = [ + sources."@graphql-tools/utils-8.0.1" + ]; + }) + (sources."@graphql-tools/mock-8.1.6" // { + dependencies = [ + sources."@graphql-tools/utils-8.0.1" + ]; + }) + (sources."@graphql-tools/schema-8.0.1" // { + dependencies = [ + sources."@graphql-tools/utils-8.0.1" + ]; + }) + (sources."@graphql-tools/utils-7.10.0" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) + sources."@graphql-typed-document-node/core-3.1.0" + sources."@josephg/resolvable-1.0.1" sources."@jsii/spec-1.32.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" + sources."@types/accepts-1.3.5" + sources."@types/body-parser-1.19.1" + sources."@types/connect-3.4.35" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.24" + sources."@types/long-4.0.1" + sources."@types/mime-1.3.2" sources."@types/node-14.17.6" sources."@types/node-fetch-2.5.12" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" + sources."@types/zen-observable-0.8.3" + sources."@wry/context-0.6.0" + sources."@wry/equality-0.5.1" + sources."@wry/trie-0.3.0" + sources."accepts-1.3.7" + sources."address-1.1.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-styles-3.2.1" + (sources."anymatch-3.1.2" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) + sources."apollo-datasource-3.0.3" + sources."apollo-graphql-0.9.3" + sources."apollo-reporting-protobuf-3.0.0" + sources."apollo-server-caching-3.0.1" + (sources."apollo-server-core-3.1.1" // { + dependencies = [ + sources."@graphql-tools/schema-7.1.5" + sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" + ]; + }) + sources."apollo-server-env-4.0.3" + sources."apollo-server-errors-3.0.1" + sources."apollo-server-express-3.1.1" + sources."apollo-server-plugin-base-3.1.1" + sources."apollo-server-types-3.1.1" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ + sources."normalize-path-3.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."async-3.2.0" + sources."async-retry-1.3.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.4" sources."axios-0.21.1" + sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" sources."bl-4.1.0" + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" + sources."bytes-3.1.0" sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" + sources."camel-case-4.1.2" + sources."camelcase-6.2.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."case-1.6.3" - sources."cdktf-0.4.1" - sources."chalk-4.1.1" + sources."cdktf-0.5.0" + (sources."chalk-4.1.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chardet-0.7.0" + (sources."chokidar-3.5.2" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.0" sources."cli-truncate-2.1.0" - (sources."cliui-7.0.4" // { + sources."cli-width-3.0.0" + sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."code-excerpt-3.0.0" + (sources."codemaker-0.22.0" // { dependencies = [ - sources."wrap-ansi-7.0.0" + sources."camelcase-5.3.1" ]; }) - sources."clone-2.1.2" - sources."code-excerpt-3.0.0" - sources."codemaker-0.22.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" + sources."commander-2.20.3" sources."commonmark-0.29.3" - sources."compress-commons-4.1.1" + (sources."compress-commons-4.1.1" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) sources."concat-map-0.0.1" - sources."constructs-3.3.106" + sources."constructs-3.3.108" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" sources."convert-to-spaces-1.0.2" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-js-pure-3.16.0" sources."core-util-is-1.0.2" + sources."cors-2.8.5" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" + sources."cross-fetch-3.1.4" + sources."cross-spawn-7.0.3" + sources."cssfilter-0.0.10" + sources."date-fns-2.23.0" sources."date-format-3.0.0" - sources."debug-4.3.2" + sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."deep-equal-2.0.5" // { dependencies = [ sources."isarray-2.0.5" ]; }) + sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."delay-5.0.0" sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" + sources."detect-port-1.3.0" + sources."dir-glob-3.0.1" + sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -71815,108 +71829,166 @@ in }) sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" - sources."escape-string-regexp-2.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-3.1.2" + sources."events-3.3.0" + sources."execa-5.1.1" sources."exit-on-epipe-1.0.1" - sources."extract-zip-2.0.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."external-editor-3.1.0" + (sources."extract-zip-2.0.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."get-stream-5.2.0" + sources."ms-2.1.2" + ]; + }) + sources."fast-glob-3.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" + sources."figures-3.2.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" sources."follow-redirects-1.14.1" sources."foreach-2.0.5" sources."form-data-3.0.1" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" sources."graceful-fs-4.2.6" + sources."graphology-0.20.0" + sources."graphology-types-0.19.3" + sources."graphql-15.5.1" + sources."graphql-subscriptions-1.2.1" + sources."graphql-tag-2.12.5" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."hoist-non-react-statics-3.3.2" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."human-signals-2.1.0" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."import-from-3.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" (sources."ink-3.0.9" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."type-fest-0.12.0" + sources."wrap-ansi-6.2.0" ]; }) sources."ink-spinner-4.0.2" sources."ink-text-input-4.0.1" + sources."ink-use-stdout-dimensions-1.0.5" + sources."inquirer-8.1.2" + sources."internal-slot-1.0.3" + sources."ipaddr.js-1.9.1" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" + sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-ci-2.0.0" sources."is-date-object-1.0.4" sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" + sources."is-number-7.0.0" sources."is-number-object-1.0.5" sources."is-regex-1.1.3" sources."is-set-2.0.2" + sources."is-stream-2.0.1" sources."is-string-1.0.6" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" + sources."is-unicode-supported-0.1.0" + sources."is-valid-domain-0.1.2" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."iterall-1.3.0" sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" (sources."jsii-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) (sources."jsii-pacmak-1.32.0" // { dependencies = [ - sources."camelcase-6.2.0" + sources."clone-2.1.2" sources."codemaker-1.32.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) (sources."jsii-reflect-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) (sources."jsii-rosetta-1.32.0" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.308" // { + (sources."jsii-srcmak-0.1.310" // { dependencies = [ sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" ]; }) - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) sources."locate-path-5.0.0" @@ -71924,56 +71996,114 @@ in sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.isequal-4.5.0" sources."lodash.isplainobject-4.0.6" + sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" - sources."log4js-6.3.0" + sources."log-symbols-4.1.0" + (sources."log4js-6.3.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."loglevel-1.7.1" + sources."long-4.0.0" sources."loose-envify-1.4.0" + sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" sources."mdurl-1.0.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.4" + sources."mime-1.6.0" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.1.2" + sources."ms-2.0.0" + sources."mute-stream-0.0.8" sources."ncp-2.0.0" + sources."negotiator-0.6.2" + sources."no-case-3.0.4" sources."node-fetch-2.6.1" - sources."normalize-path-3.0.0" + sources."normalize-path-2.1.1" + sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."obliterator-1.6.1" + sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."oo-ascii-tree-1.32.0" sources."open-7.4.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."optimism-0.16.1" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-try-2.2.0" + sources."parse-gitignore-1.0.1" + sources."parseurl-1.3.3" + sources."pascal-case-3.1.2" sources."patch-console-1.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."prettier-2.3.2" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."react-16.14.0" sources."react-devtools-core-4.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" - sources."readline-sync-1.4.10" + sources."readdirp-3.6.0" sources."regexp.prototype.flags-1.3.1" + sources."remove-trailing-separator-1.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" + sources."reserved-words-0.1.2" + sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" + sources."retry-0.12.0" + sources."reusify-1.0.4" sources."rfdc-1.3.0" - sources."safe-buffer-5.1.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."scheduler-0.18.0" sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { @@ -71981,50 +72111,115 @@ in sources."semver-5.7.1" ]; }) + (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."sha.js-2.4.11" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" - sources."slice-ansi-3.0.0" + sources."slash-3.0.0" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."sort-json-2.0.0" + sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.28" - sources."stack-utils-2.0.3" + sources."sscaff-1.2.31" + (sources."stack-utils-2.0.3" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."statuses-1.5.0" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."string-width-4.2.2" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.0" - sources."supports-color-7.2.0" + sources."strip-final-newline-2.0.0" + (sources."subscriptions-transport-ws-0.9.19" // { + dependencies = [ + sources."symbol-observable-1.2.0" + ]; + }) + sources."supports-color-5.5.0" + sources."symbol-observable-4.0.0" sources."tar-stream-2.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."ts-invariant-0.9.0" + sources."tslib-2.3.0" sources."type-fest-0.15.1" + sources."type-is-1.6.18" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" + sources."unixify-1.0.0" + sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" + sources."utility-types-3.10.0" + sources."utils-merge-1.0.1" sources."uuid-8.3.2" + sources."valid-url-1.0.9" + sources."value-or-promise-1.0.10" + sources."vary-1.1.2" + sources."wcwidth-1.0.1" + sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" sources."which-typed-array-1.1.4" sources."widest-line-3.1.0" - sources."wrap-ansi-6.2.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" sources."ws-7.5.3" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" + sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" sources."y18n-4.0.3" sources."yargs-parser-18.1.3" ]; @@ -72032,8 +72227,12 @@ in sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yn-3.1.1" + sources."yocto-queue-0.1.0" sources."yoga-layout-prebuilt-1.10.0" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.1.0" sources."zip-stream-4.1.0" + sources."zod-1.11.17" ]; buildInputs = globalBuildInputs; meta = { @@ -72048,15 +72247,15 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.0.tgz"; - sha512 = "Jri2KVAcan/Y1JuEDo1rUlm3vUoGvMKSOpIL2YEPgalksvoGur/yL2KbtMF2dPs2VlMVj1afzp76Vu0KjxKfvA=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.2.tgz"; + sha512 = "NZY3lWHeeb9idk/0f37yDLeb3Y8UUiuuRCYKVVioqFJU83f3uuJUz7qIIYBgAWARv56D0MLOkwqQcq5fTtK6vQ=="; }; dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."clean-css-5.1.3" + sources."clean-css-5.1.4" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -72167,10 +72366,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.12.0.tgz"; - sha512 = "nRKGxCQLNKvi38q8QIVM+tvGpqEpi1NugCcrRTQfTF78PXofct6ImtVu9aLKDqoq3cAJk9CmngXLPEj+sdgYzQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.13.0.tgz"; + sha512 = "8YsX+hE+PwJy+r8MiHK880KocpMTMAlhLjNfK9TjBNTG8a6+BPjb27FSjwzsa1h4vAw8IJz+PfH/0Jsz+VhJKg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72618,7 +72817,7 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" @@ -72626,7 +72825,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.14.1" - sources."fp-ts-2.11.0" + sources."fp-ts-2.11.1" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -72651,6 +72850,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" + sources."internal-slot-1.0.3" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" @@ -72719,6 +72919,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."streamroller-2.2.4" // { dependencies = [ @@ -72868,7 +73069,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72930,7 +73131,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.2" + sources."core-js-3.16.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -72966,7 +73167,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73085,7 +73286,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -73977,7 +74178,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -74015,7 +74216,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74032,7 +74233,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -74389,10 +74590,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.2.tgz"; - sha512 = "bQ5bKzQ96W4ZMYZ2hkumWJsHOHtgNa/i3jS9DHqTeLLgesDg7KdHBxKDUbdVHq7BEG6TSPZF2m1BRpjxQPuS3A=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.3.tgz"; + sha512 = "dOvu5TY1zuZ/d7l/v3pGhbgYrhBVQSsmTiLNUL1dYzXCuVUuzNNm5CzZcr8yLTr3diCPU2eavLKs8iBwBvs/8g=="; }; dependencies = [ sources."typescript-4.3.5" @@ -74461,7 +74662,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.31.0" - (sources."eslint-plugin-vue-7.14.0" // { + (sources."eslint-plugin-vue-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -74496,7 +74697,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -74582,7 +74783,7 @@ in sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -75217,8 +75418,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -75482,7 +75683,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75853,7 +76054,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -75934,8 +76135,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -76210,7 +76411,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" sources."bytes-3.1.0" sources."cache-base-1.0.1" @@ -76469,7 +76670,7 @@ in }) (sources."k-rpc-socket-1.11.1" // { dependencies = [ - sources."bencode-2.0.1" + sources."bencode-2.0.2" ]; }) sources."keypress-0.2.1" @@ -76489,8 +76690,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -77039,8 +77240,8 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.5" sources."method-missing-1.2.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -77171,7 +77372,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77217,7 +77418,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."camelcase-2.1.1" @@ -77248,7 +77449,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.15.2" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -77488,8 +77689,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -77632,7 +77833,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -77824,7 +78025,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77859,7 +78060,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77896,7 +78097,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -78164,7 +78365,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.195" + sources."@microsoft/load-themed-styles-1.10.196" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -78386,7 +78587,7 @@ in sources."browserify-zlib-0.2.0" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-writer-2.0.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" @@ -79025,8 +79226,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -79306,7 +79507,7 @@ in }) sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.3.0" + sources."pg-pool-3.4.1" sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" @@ -79911,7 +80112,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -80075,7 +80276,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -80177,17 +80378,19 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.8.1"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.8.1.tgz"; - sha512 = "oks/ETtrhNKvw1CjKUxQv9vQFXRPIWb+iWKT1Xmjx111cHLDTKXtmxm8hkYXSJZ8zHgqAndlUTRlTc+tDqRbuw=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.9.1.tgz"; + sha512 = "73+efSO3vFiqQ/6jwfqPti/k2twvvS1u1v0iEoN0ylXpgFxTWO8DylTJZBqr0YdkpzljG7+yWZDrzdTspXLKww=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.14.8" // { dependencies = [ - sources."semver-5.7.1" + sources."@babel/code-frame-7.14.5" + sources."json5-2.2.0" + sources."semver-6.3.0" ]; }) sources."@babel/generator-7.14.8" @@ -80195,6 +80398,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ + sources."browserslist-4.16.6" sources."semver-6.3.0" ]; }) @@ -80229,8 +80433,10 @@ in ]; }) sources."@babel/parser-7.14.8" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" - sources."@babel/plugin-proposal-class-properties-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" @@ -80242,9 +80448,11 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-default-from-7.14.5" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" @@ -80257,6 +80465,7 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-arrow-functions-7.14.5" @@ -80303,27 +80512,38 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.12.17" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.8" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" + (sources."@babel/runtime-7.14.8" // { + dependencies = [ + sources."regenerator-runtime-0.13.9" + ]; + }) + (sources."@babel/template-7.14.5" // { + dependencies = [ + sources."@babel/code-frame-7.14.5" + ]; + }) + (sources."@babel/traverse-7.14.8" // { + dependencies = [ + sources."@babel/code-frame-7.14.5" + ]; + }) sources."@babel/types-7.14.8" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.5" - (sources."@expo/config-plugins-3.0.5" // { + sources."@expo/config-5.0.6" + (sources."@expo/config-plugins-3.0.6" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.80" // { + (sources."@expo/dev-server-0.1.81" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -80340,7 +80560,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.110" + sources."@expo/dev-tools-0.13.112" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -80348,21 +80568,16 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.15" // { + (sources."@expo/image-utils-0.3.16" // { dependencies = [ sources."mime-2.5.2" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.31" // { - dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."json5-1.0.1" - ]; - }) - sources."@expo/metro-config-0.1.80" - sources."@expo/osascript-2.0.29" - (sources."@expo/package-manager-0.0.44" // { + sources."@expo/json-file-8.2.32" + sources."@expo/metro-config-0.1.81" + sources."@expo/osascript-2.0.30" + (sources."@expo/package-manager-0.0.45" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -80374,9 +80589,9 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-2.0.5" + sources."@expo/prebuild-config-2.0.6" sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.30" // { + (sources."@expo/schemer-1.3.31" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -80384,17 +80599,21 @@ in ]; }) sources."@expo/sdk-runtime-versions-1.0.0" - sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.13.1" // { + (sources."@expo/webpack-config-0.13.3" // { dependencies = [ + (sources."@babel/core-7.9.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."@babel/runtime-7.9.0" - sources."react-refresh-0.8.3" + sources."json5-2.2.0" + sources."regenerator-runtime-0.13.9" ]; }) (sources."@expo/xcpretty-3.1.4" // { dependencies = [ - sources."@babel/code-frame-7.10.4" sources."js-yaml-4.1.0" ]; }) @@ -80410,37 +80629,6 @@ in sources."@hapi/pinpoint-1.0.2" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" - sources."@jimp/bmp-0.12.1" - sources."@jimp/core-0.12.1" - sources."@jimp/custom-0.12.1" - sources."@jimp/gif-0.12.1" - sources."@jimp/jpeg-0.12.1" - sources."@jimp/plugin-blit-0.12.1" - sources."@jimp/plugin-blur-0.12.1" - sources."@jimp/plugin-circle-0.12.1" - sources."@jimp/plugin-color-0.12.1" - sources."@jimp/plugin-contain-0.12.1" - sources."@jimp/plugin-cover-0.12.1" - sources."@jimp/plugin-crop-0.12.1" - sources."@jimp/plugin-displace-0.12.1" - sources."@jimp/plugin-dither-0.12.1" - sources."@jimp/plugin-fisheye-0.12.1" - sources."@jimp/plugin-flip-0.12.1" - sources."@jimp/plugin-gaussian-0.12.1" - sources."@jimp/plugin-invert-0.12.1" - sources."@jimp/plugin-mask-0.12.1" - sources."@jimp/plugin-normalize-0.12.1" - sources."@jimp/plugin-print-0.12.1" - sources."@jimp/plugin-resize-0.12.1" - sources."@jimp/plugin-rotate-0.12.1" - sources."@jimp/plugin-scale-0.12.1" - sources."@jimp/plugin-shadow-0.12.1" - sources."@jimp/plugin-threshold-0.12.1" - sources."@jimp/plugins-0.12.1" - sources."@jimp/png-0.12.1" - sources."@jimp/tiff-0.12.1" - sources."@jimp/types-0.12.1" - sources."@jimp/utils-0.12.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -80461,7 +80649,6 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-5.0.1" (sources."@react-native-community/cli-server-api-5.0.1" // { dependencies = [ @@ -80583,7 +80770,6 @@ in sources."ansi-html-0.0.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."any-base-1.1.0" sources."any-promise-1.3.0" sources."anymatch-3.1.2" sources."apollo-link-1.2.1" @@ -80629,7 +80815,6 @@ in sources."axios-retry-3.1.9" (sources."babel-loader-8.1.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" ]; }) @@ -80639,15 +80824,11 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-preset-fbjs-3.4.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."babel-runtime-6.26.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -80665,7 +80846,6 @@ in sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bmp-js-0.1.0" sources."bn.js-5.2.0" (sources."body-parser-1.18.3" // { dependencies = [ @@ -80679,10 +80859,9 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-4.1.0" // { + (sources."boxen-5.0.1" // { dependencies = [ - sources."chalk-2.4.2" - sources."type-fest-0.5.2" + sources."type-fest-0.20.2" ]; }) sources."bplist-creator-0.0.8" @@ -80701,10 +80880,9 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.6" - sources."buffer-5.7.1" - sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."browserslist-4.14.2" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-3.2.0" @@ -80731,9 +80909,9 @@ in sources."tslib-2.3.0" ]; }) - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80867,8 +81045,9 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ + sources."browserslist-4.16.6" sources."semver-7.0.0" ]; }) @@ -80893,7 +81072,7 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-3.6.0" // { dependencies = [ - sources."json5-1.0.1" + sources."camelcase-5.3.1" sources."loader-utils-1.4.0" sources."semver-6.3.0" ]; @@ -80939,7 +81118,6 @@ in }) sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" - sources."deep-scope-analyser-1.7.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" sources."defaults-1.0.3" @@ -80980,7 +81158,6 @@ in sources."domhandler-4.2.0" ]; }) - sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-3.3.0" @@ -81002,7 +81179,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81030,9 +81207,8 @@ in sources."err-code-2.0.3" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -81059,7 +81235,6 @@ in sources."is-stream-1.1.0" ]; }) - sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."debug-2.6.9" @@ -81080,7 +81255,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.90" // { + (sources."expo-pwa-0.0.91" // { dependencies = [ sources."commander-2.20.0" ]; @@ -81112,7 +81287,6 @@ in sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."file-loader-6.0.0" - sources."file-type-9.0.0" sources."file-uri-to-path-1.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" @@ -81187,7 +81361,6 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."global-4.4.0" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" @@ -81245,7 +81418,6 @@ in }) (sources."html-webpack-plugin-4.3.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" ]; }) @@ -81300,6 +81472,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."invariant-2.2.4" sources."ip-1.1.5" sources."ip-regex-2.1.0" @@ -81323,7 +81496,6 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.2" sources."is-glob-4.0.1" (sources."is-invalid-path-0.1.0" // { dependencies = [ @@ -81392,10 +81564,9 @@ in sources."supports-color-7.2.0" ]; }) - sources."jimp-0.12.1" + sources."jimp-compact-0.16.1" sources."joi-17.4.1" sources."join-component-1.1.0" - sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { dependencies = [ @@ -81417,7 +81588,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.2.0" + sources."json5-1.0.1" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -81434,9 +81605,13 @@ in sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" - sources."load-bmfont-1.4.1" + sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" - sources."loader-utils-2.0.0" + (sources."loader-utils-2.0.0" // { + dependencies = [ + sources."json5-2.2.0" + ]; + }) sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.assign-4.2.0" @@ -81498,14 +81673,12 @@ in ]; }) sources."mime-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."min-document-2.19.0" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ - sources."json5-1.0.1" sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; @@ -81573,7 +81746,6 @@ in sources."mz-2.7.0" sources."nan-2.14.2" sources."nanomatch-1.2.13" - sources."native-url-0.2.6" sources."ncp-2.0.0" (sources."needle-2.8.0" // { dependencies = [ @@ -81601,10 +81773,10 @@ in sources."node-html-parser-1.4.9" (sources."node-libs-browser-2.2.1" // { dependencies = [ - sources."buffer-4.9.2" sources."punycode-1.4.1" ]; }) + sources."node-modules-regexp-1.0.0" sources."node-releases-1.1.73" sources."nopt-5.0.0" sources."normalize-path-3.0.0" @@ -81664,7 +81836,6 @@ in sources."object.pick-1.3.0" sources."object.values-1.1.4" sources."obuf-1.1.2" - sources."omggif-1.0.10" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -81742,10 +81913,6 @@ in ]; }) sources."parse-asn1-5.1.6" - sources."parse-bmfont-ascii-1.0.6" - sources."parse-bmfont-binary-1.0.6" - sources."parse-bmfont-xml-1.1.4" - sources."parse-headers-2.0.3" sources."parse-json-4.0.0" sources."parse-png-2.1.0" sources."parse-srcset-1.0.2" @@ -81772,12 +81939,11 @@ in sources."path-type-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."phin-2.9.3" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pixelmatch-4.0.2" + sources."pirates-4.0.1" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" @@ -81964,7 +82130,7 @@ in sources."q-1.5.1" sources."qrcode-terminal-0.11.0" sources."qs-6.5.2" - sources."querystring-0.2.1" + sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -81981,8 +82147,6 @@ in sources."rc-1.2.8" (sources."react-dev-utils-11.0.4" // { dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -82012,7 +82176,7 @@ in sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.9" + sources."regenerator-runtime-0.11.1" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -82075,7 +82239,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.54.0" + sources."rollup-2.55.1" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82131,6 +82295,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" (sources."simple-swizzle-0.2.2" // { @@ -82140,11 +82305,6 @@ in }) sources."sisteransi-1.0.5" sources."slash-3.0.0" - (sources."slugid-1.1.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) sources."slugify-1.6.0" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { @@ -82213,7 +82373,6 @@ in }) sources."stable-0.1.8" sources."stack-trace-0.0.10" - sources."stackframe-1.2.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -82269,6 +82428,11 @@ in ]; }) sources."subscriptions-transport-ws-0.9.8" + (sources."sucrase-3.20.0" // { + dependencies = [ + sources."commander-4.1.1" + ]; + }) sources."sudo-prompt-9.1.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { @@ -82309,7 +82473,6 @@ in sources."unique-string-2.0.0" ]; }) - sources."term-size-2.2.1" sources."terminal-link-2.1.1" (sources."terser-4.8.0" // { dependencies = [ @@ -82342,9 +82505,7 @@ in sources."thunky-1.1.0" sources."timed-out-4.0.1" sources."timers-browserify-2.0.12" - sources."timm-1.7.1" sources."timsort-0.3.0" - sources."tinycolor2-1.4.2" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" @@ -82361,6 +82522,7 @@ in sources."tr46-1.0.1" sources."traverse-0.6.6" sources."tree-kill-1.2.2" + sources."ts-interface-checker-0.1.13" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" sources."tslib-1.14.1" @@ -82404,7 +82566,6 @@ in (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" - sources."querystring-0.2.0" ]; }) sources."url-join-4.0.0" @@ -82420,7 +82581,6 @@ in ]; }) sources."use-3.1.1" - sources."utif-2.0.1" (sources."util-0.11.1" // { dependencies = [ sources."inherits-2.0.3" @@ -82471,7 +82631,6 @@ in sources."fill-range-4.0.0" sources."is-number-3.0.0" sources."is-wsl-1.1.0" - sources."json5-1.0.1" sources."kind-of-3.2.2" sources."loader-utils-1.4.0" sources."lru-cache-5.1.1" @@ -82485,7 +82644,6 @@ in sources."yallist-3.1.1" ]; }) - sources."webpack-deep-scope-plugin-1.6.0" (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ sources."mime-2.5.2" @@ -82608,14 +82766,8 @@ in sources."workbox-broadcast-update-6.1.5" (sources."workbox-build-6.1.5" // { dependencies = [ - (sources."@babel/core-7.14.8" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) sources."crypto-random-string-2.0.0" sources."fs-extra-9.1.0" - sources."semver-6.3.0" sources."source-map-0.8.0-beta.0" sources."temp-dir-2.0.0" sources."tempy-0.6.0" @@ -82639,13 +82791,6 @@ in sources."workbox-webpack-plugin-6.1.5" sources."workbox-window-6.1.5" sources."worker-farm-1.7.0" - (sources."worker-loader-2.0.0" // { - dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - sources."schema-utils-0.4.7" - ]; - }) sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -82662,7 +82807,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.50" // { + (sources."xdl-59.0.52" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -82674,8 +82819,6 @@ in sources."yallist-3.1.1" ]; }) - sources."xhr-2.6.0" - sources."xml-parse-from-string-1.0.1" (sources."xml2js-0.4.23" // { dependencies = [ sources."xmlbuilder-11.0.1" @@ -82698,7 +82841,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.1.2" + (sources."yargs-parser-13.1.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" @@ -82754,7 +82901,7 @@ in sources."@babel/traverse-7.14.8" sources."@babel/types-7.14.8" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82781,7 +82928,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82806,7 +82953,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -83388,8 +83535,8 @@ in sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -83628,7 +83775,7 @@ in sources."@google-cloud/promisify-2.0.3" (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ - sources."google-auth-library-7.3.0" + sources."google-auth-library-7.4.1" ]; }) sources."@grpc/grpc-js-1.3.6" @@ -83639,7 +83786,7 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-1.0.1" + sources."@opentelemetry/api-1.0.2" sources."@opentelemetry/semantic-conventions-0.22.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -83660,7 +83807,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -84011,7 +84158,7 @@ in sources."google-auth-library-6.1.6" (sources."google-gax-2.19.0" // { dependencies = [ - sources."google-auth-library-7.3.0" + sources."google-auth-library-7.4.1" ]; }) sources."google-p12-pem-3.1.1" @@ -84179,8 +84326,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -84766,7 +84913,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -84864,8 +85011,8 @@ in sources."localforage-1.9.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -84939,11 +85086,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.4.0" // { - dependencies = [ - sources."underscore-1.12.1" - ]; - }) + sources."web3-utils-1.5.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -85074,7 +85217,7 @@ in sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -85146,6 +85289,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" @@ -85551,7 +85695,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85618,7 +85762,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85714,7 +85858,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85934,8 +86078,8 @@ in sources."micromark-extension-mdxjs-0.3.0" sources."micromark-extension-mdxjs-esm-0.3.1" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" @@ -86313,8 +86457,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -86759,7 +86903,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -86856,13 +87000,18 @@ in (sources."@graphql-tools/batch-execute-7.1.2" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) (sources."@graphql-tools/delegate-7.1.5" // { dependencies = [ + sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { @@ -86872,6 +87021,7 @@ in sources."tslib-2.2.0" ]; }) + sources."camel-case-4.1.2" sources."tslib-2.1.0" ]; }) @@ -86887,42 +87037,43 @@ in sources."tslib-2.2.0" ]; }) + (sources."camel-case-4.1.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.14" // { + (sources."@graphql-tools/merge-6.2.16" // { dependencies = [ - sources."@graphql-tools/utils-7.10.0" - sources."tslib-2.2.0" + sources."@graphql-tools/utils-8.0.1" + sources."tslib-2.3.0" ]; }) - (sources."@graphql-tools/schema-7.1.5" // { + (sources."@graphql-tools/schema-8.0.1" // { dependencies = [ - sources."@graphql-tools/utils-7.10.0" - sources."tslib-2.2.0" + sources."@graphql-tools/utils-8.0.1" + sources."tslib-2.3.0" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { dependencies = [ sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."cross-fetch-3.1.4" sources."form-data-4.0.0" sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/utils-6.2.4" // { - dependencies = [ - (sources."camel-case-4.1.1" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - ]; - }) + sources."@graphql-tools/utils-6.2.4" (sources."@graphql-tools/wrap-7.0.8" // { dependencies = [ + sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" + sources."camel-case-4.1.2" sources."tslib-2.2.0" + sources."value-or-promise-1.0.6" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -86933,7 +87084,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -86971,9 +87122,9 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { + (sources."camel-case-4.1.1" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-1.14.1" ]; }) sources."caseless-0.12.0" @@ -87027,7 +87178,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -87117,6 +87268,7 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.2" @@ -87195,8 +87347,8 @@ in sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -87358,7 +87510,7 @@ in sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" sources."valid-url-1.0.9" - sources."value-or-promise-1.0.6" + sources."value-or-promise-1.0.10" sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -87521,8 +87673,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -87678,7 +87830,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.12" + sources."systeminformation-5.7.13" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -87760,7 +87912,7 @@ in ]; }) sources."buffer-equal-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."camelcase-3.0.0" @@ -88202,7 +88354,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."camelcase-3.0.0" @@ -88645,8 +88797,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -89050,8 +89202,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -89470,8 +89622,8 @@ in sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -89663,7 +89815,7 @@ in sources."@ot-builder/trace-1.1.0" sources."@ot-builder/var-store-1.1.0" sources."@ot-builder/variance-1.1.0" - sources."@unicode/unicode-13.0.0-1.1.0" + sources."@unicode/unicode-13.0.0-1.2.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -89954,6 +90106,62 @@ in sha512 = "8xDS/I9zMH0wHuZGZ0xENBn/Ml4gHk2WLMDfShN7L2VNRK/9xowunf2c/fAwI0eNXn/aw2QcMrcgqj37uZ0gbw=="; }; dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.7" + (sources."@babel/core-7.14.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/generator-7.14.8" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.8" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."@babel/parser-7.14.8" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-flow-7.14.5" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/preset-flow-7.14.5" + sources."@babel/preset-typescript-7.14.5" + sources."@babel/register-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplin/fork-htmlparser2-4.1.28" @@ -89977,9 +90185,55 @@ in (sources."@joplin/turndown-4.0.50" // { dependencies = [ sources."css-2.2.4" + sources."source-map-0.6.1" ]; }) sources."@joplin/turndown-plugin-gfm-1.0.32" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + (sources."@oclif/errors-1.3.5" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."@oclif/plugin-help-3.2.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-6.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + sources."@percy/config-1.0.0-beta.61" + sources."@percy/logger-1.0.0-beta.61" + sources."@percy/migrate-0.10.0" + sources."@types/parse-json-4.0.0" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -89989,38 +90243,53 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.6" + sources."ajv-8.6.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" ]; }) - sources."ansi-regex-2.1.1" - (sources."ansi-styles-4.3.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-back-2.0.0" sources."array-equal-1.0.0" sources."array-flatten-3.0.0" + sources."array-union-2.1.0" + sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.954.0" // { + (sources."aws-sdk-2.957.0" // { dependencies = [ + sources."buffer-4.9.2" + sources."ieee754-1.1.13" sources."sax-1.2.1" sources."uuid-3.3.2" sources."xml2js-0.4.19" @@ -90029,52 +90298,111 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" + sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."base-64-0.1.0" sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.0" - ]; - }) + sources."bl-4.1.0" sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."buffer-4.9.2" + sources."browserslist-4.16.6" + sources."buffer-5.7.1" + sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" + sources."cache-base-1.0.1" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" + sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" - sources."chalk-4.1.1" + (sources."chalk-4.1.1" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chardet-0.7.0" sources."charenc-0.0.2" sources."chokidar-3.5.2" sources."chownr-1.1.4" sources."chroma-js-2.1.2" - sources."clean-css-4.2.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."clean-stack-3.0.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" sources."cliss-0.0.2" + sources."clone-1.0.4" + sources."clone-deep-4.0.1" sources."code-point-at-1.1.0" - sources."color-3.1.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."collection-visit-1.0.0" + (sources."color-3.1.2" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-string-1.6.0" + sources."colorette-1.2.2" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-6.2.1" + sources."commondir-1.0.1" sources."compare-version-0.1.2" sources."compare-versions-3.6.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."cosmiconfig-7.0.0" sources."cross-env-6.0.3" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ + sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" ]; }) @@ -90125,17 +90453,21 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-3.2.7" + sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-2.2.1" + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-libc-1.0.3" sources."diff-match-patch-1.0.5" + sources."dir-glob-3.0.1" (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.0" @@ -90144,16 +90476,21 @@ in sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" + sources."dompurify-2.3.0" (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; }) sources."ecc-jsbn-0.1.2" + sources."electron-to-chromium-1.3.791" + sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."highlight.js-9.12.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -90166,57 +90503,136 @@ in }) sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."entity-decode-2.0.2" + sources."error-ex-1.3.2" sources."es6-promise-pool-2.5.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."events-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) sources."expand-template-2.0.3" sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.1" sources."fault-1.0.4" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-type-10.11.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-up-2.1.0" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flow-parser-0.156.0" sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" + sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."format-0.2.2" + sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs-extra-5.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."fstream-1.0.12" + sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.1.1" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" + sources."globals-11.12.0" + sources."globby-11.0.4" sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-ansi-2.0.0" - sources."has-flag-4.0.0" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" + ]; + }) + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."he-1.2.0" sources."highlight.js-10.7.3" sources."html-encoding-sniffer-1.0.2" @@ -90229,7 +90645,8 @@ in sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" sources."ignore-walk-3.0.4" (sources."image-data-uri-2.0.1" // { dependencies = [ @@ -90239,9 +90656,22 @@ in }) sources."image-type-3.1.0" sources."immer-7.0.15" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."inquirer-glob-prompt-0.1.0" // { + dependencies = [ + sources."rxjs-6.6.7" + ]; + }) (sources."inspect-function-0.2.2" // { dependencies = [ sources."split-skip-0.0.1" @@ -90272,20 +90702,31 @@ in }) sources."iota-array-1.0.0" sources."ip-regex-2.1.0" - sources."is-absolute-0.2.6" - sources."is-arrayish-0.3.2" + (sources."is-absolute-0.2.6" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" sources."is-relative-0.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" - sources."is-windows-0.2.0" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ @@ -90294,33 +90735,60 @@ in }) sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" + (sources."jscodeshift-0.11.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) sources."jsdom-15.2.1" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" + sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."katex-0.13.13" sources."keytar-7.7.0" sources."khroma-1.4.1" + sources."kind-of-6.0.3" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" sources."linkify-it-3.0.2" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash._reinterpolate-3.0.0" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" sources."lodash.toarray-4.4.0" + sources."log-symbols-4.1.0" sources."loose-envify-1.4.0" sources."lower-case-1.1.4" (sources."lowlight-1.9.2" // { @@ -90329,7 +90797,22 @@ in ]; }) sources."lru-cache-6.0.0" - sources."magicli-0.0.8" + (sources."magicli-0.0.8" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" @@ -90356,9 +90839,12 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.11.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."merge2-1.4.1" + sources."mermaid-8.11.1" + sources."micromatch-4.0.4" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -90368,18 +90854,30 @@ in ]; }) sources."minizlib-1.3.3" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.3" + sources."ms-2.1.2" sources."multiparty-4.2.2" sources."mustache-4.2.0" + sources."mute-stream-0.0.8" sources."nanoid-3.1.23" + sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.8.0" + (sources."needle-2.8.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."neo-async-2.6.2" sources."nextgen-events-1.5.2" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { @@ -90389,6 +90887,7 @@ in }) sources."node-addon-api-3.2.1" sources."node-bitmap-0.0.1" + sources."node-dir-0.1.17" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" (sources."node-gyp-3.8.0" // { @@ -90399,6 +90898,7 @@ in sources."which-1.3.1" ]; }) + sources."node-modules-regexp-1.0.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."uuid-8.3.2" @@ -90410,6 +90910,7 @@ in sources."semver-5.7.1" ]; }) + sources."node-releases-1.1.73" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -90420,6 +90921,20 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ sources."commander-2.20.3" @@ -90427,27 +90942,43 @@ in sources."magicli-0.0.5" ]; }) + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.pick-1.3.0" sources."omggif-1.0.10" sources."once-1.4.0" + sources."onetime-5.1.2" sources."open-7.4.2" sources."optionator-0.8.3" + (sources."ora-5.4.1" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."parse5-5.1.0" + sources."pascalcase-0.1.1" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" - sources."pify-3.0.0" + sources."pify-4.0.1" sources."pipe-functions-1.3.0" + sources."pirates-4.0.1" + sources."pkg-dir-3.0.0" sources."pn-1.1.0" sources."pngjs-5.0.0" + sources."posix-character-classes-0.1.1" sources."prebuild-install-6.1.3" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -90461,20 +90992,34 @@ in sources."query-string-4.3.4" sources."querystring-0.2.0" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."re-reselect-4.0.0" - sources."read-chunk-2.1.0" - (sources."readable-stream-2.3.7" // { + (sources."read-chunk-2.1.0" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."pify-3.0.0" ]; }) + sources."readable-stream-3.6.0" sources."readdirp-3.6.0" + (sources."recast-0.20.5" // { + dependencies = [ + sources."source-map-0.6.1" + sources."tslib-2.3.0" + ]; + }) sources."reduce-flatten-1.0.1" sources."redux-3.7.2" + sources."regex-not-1.0.2" sources."relateurl-0.2.7" - sources."relative-3.0.2" + (sources."relative-3.0.2" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -90487,25 +91032,46 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-from-string-2.0.2" sources."requires-port-1.0.0" sources."reselect-4.0.0" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" sources."retry-0.10.1" - sources."rimraf-2.7.1" + sources."reusify-1.0.4" + sources."rimraf-2.6.3" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rw-1.3.3" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-3.1.11" sources."semver-7.3.5" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."seventh-0.7.40" + sources."shallow-clone-3.0.1" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -90517,35 +91083,95 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" - sources."simple-swizzle-0.2.2" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" (sources."slice-ansi-1.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."source-map-0.6.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.1" sources."split-skip-0.0.2" + sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sqlite3-5.0.2" sources."sshpk-1.16.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" sources."string-kit-0.11.10" sources."string-padding-1.0.2" - sources."string-to-stream-1.1.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."string_decoder-1.1.1" // { + (sources."string-to-stream-1.1.1" // { dependencies = [ + sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) + (sources."string-width-4.2.2" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + sources."string_decoder-1.3.0" (sources."stringify-parameters-0.0.4" // { dependencies = [ sources."commander-2.20.3" @@ -90558,8 +91184,8 @@ in ]; }) sources."strip-json-comments-2.0.1" - sources."stylis-3.5.4" - sources."supports-color-7.2.0" + sources."stylis-4.0.10" + sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" @@ -90569,51 +91195,73 @@ in ]; }) sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."tar-stream-2.2.0" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) + sources."temp-0.8.4" sources."terminal-kit-1.49.4" + sources."through-2.3.8" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."has-flag-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."is-fullwidth-code-point-2.0.0" sources."node-emoji-git+https://github.com/laurent22/node-emoji.git" sources."string-width-2.1.1" - sources."supports-color-5.5.0" + sources."wrap-ansi-3.0.1" ]; }) + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.7.0" + sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."type-fest-0.21.3" sources."typical-2.6.1" sources."uc.micro-1.0.6" (sources."uglify-js-3.4.10" // { dependencies = [ sources."commander-2.19.0" + sources."source-map-0.6.1" ]; }) sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" sources."unc-path-regex-0.1.2" + sources."union-value-1.0.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unorm-1.6.0" sources."unpack-string-0.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) sources."upper-case-1.1.3" sources."uri-js-4.4.1" sources."urix-0.1.0" @@ -90623,6 +91271,7 @@ in ]; }) sources."url-parse-1.5.3" + sources."use-3.1.1" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -90630,27 +91279,35 @@ in sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-1.1.2" + sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."which-2.0.2" - sources."wide-align-1.1.3" - sources."word-wrap-1.2.3" - sources."wordwrapjs-3.0.0" - (sources."wrap-ansi-3.0.1" // { + (sources."wide-align-1.1.3" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) + sources."widest-line-3.1.0" + sources."word-wrap-1.2.3" + sources."wordwrapjs-3.0.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; @@ -90899,8 +91556,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -91060,8 +91717,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -91452,8 +92109,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -91931,8 +92588,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" @@ -92043,7 +92700,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92120,8 +92777,8 @@ in }) sources."media-typer-0.3.0" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -92242,7 +92899,7 @@ in }) sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."bytesish-0.4.4" @@ -92290,7 +92947,7 @@ in }) sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."events-3.3.0" @@ -92323,6 +92980,7 @@ in sources."inherits-2.0.4" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" @@ -92403,6 +93061,7 @@ in sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.7.2" + sources."side-channel-1.0.4" sources."simple-concat-1.0.1" sources."slide-1.1.6" sources."source-map-0.5.7" @@ -92678,8 +93337,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -92924,8 +93583,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -93187,19 +93846,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.1" + sources."@octokit/openapi-types-9.2.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.1" + sources."@octokit/plugin-rest-endpoint-methods-5.5.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.1" - sources."@octokit/types-6.21.1" + sources."@octokit/rest-18.7.2" + sources."@octokit/types-6.22.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -93243,7 +93902,7 @@ in sources."before-after-hook-2.2.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-7.0.1" @@ -93332,7 +93991,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -93453,6 +94112,7 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.2" @@ -93541,8 +94201,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -94057,8 +94717,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -94454,8 +95114,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -94855,7 +95515,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94945,7 +95605,7 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" @@ -95015,7 +95675,7 @@ in sources."browserslist-4.16.6" sources."bser-2.1.1" sources."buffer-5.2.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" @@ -95028,7 +95688,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -95100,7 +95760,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95152,7 +95812,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95414,8 +96074,8 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -96008,8 +96668,8 @@ in sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" sources."marked-2.1.3" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -96075,7 +96735,7 @@ in sources."beeper-1.1.1" sources."bindings-1.5.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bufferstreams-1.1.3" sources."caller-path-0.1.0" sources."callsites-0.2.0" @@ -96228,8 +96888,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -96399,23 +97059,188 @@ in sha512 = "UyYOnVhvKcfh9e2S4QnK53uRa2hvdgQVo3ZT+FcaP56ZeBDNWKB3IZI/sNzAbxqJBEuRpW6HxoEzHCleis1dFw=="; }; dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.7" + (sources."@babel/core-7.14.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/generator-7.14.8" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.14.8" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.8" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@babel/parser-7.14.8" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-flow-7.14.5" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.6" + sources."@babel/preset-flow-7.14.5" + sources."@babel/preset-typescript-7.14.5" + sources."@babel/register-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.4.3" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + sources."@oclif/errors-1.3.5" + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + (sources."@oclif/plugin-help-3.2.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + sources."@percy/config-1.0.0-beta.61" + sources."@percy/logger-1.0.0-beta.61" + sources."@percy/migrate-0.10.0" + sources."@types/node-16.4.7" + sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" + sources."ajv-8.6.2" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-2.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.3.0" + ]; + }) + sources."atob-2.1.2" + sources."babel-core-7.0.0-bridge.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.2" + sources."cache-base-1.0.1" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" + sources."caniuse-lite-1.0.30001248" sources."chalk-4.1.1" + sources."chardet-0.7.0" sources."chownr-1.1.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."clean-stack-3.0.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."clone-deep-4.0.1" + sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorette-1.2.2" + sources."colors-1.4.0" sources."commander-8.1.0" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."cosmiconfig-7.0.0" + sources."cross-spawn-7.0.3" sources."d3-5.16.0" sources."d3-array-1.2.4" sources."d3-axis-1.0.12" @@ -96455,61 +97280,388 @@ in sources."dagre-0.8.5" sources."dagre-d3-0.6.4" sources."debug-4.3.1" + sources."decode-uri-component-0.2.0" + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."devtools-protocol-0.0.883894" + sources."dir-glob-3.0.1" + sources."dompurify-2.3.0" + sources."electron-to-chromium-1.3.791" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."entity-decode-2.0.2" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."esprima-4.0.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extract-zip-2.0.1" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" + sources."fastq-1.11.1" sources."fd-slicer-1.1.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."fill-range-7.0.1" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) sources."find-up-4.1.0" + sources."flow-parser-0.156.0" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" + sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" + sources."get-value-2.0.6" sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."globals-11.12.0" + sources."globby-11.0.4" + sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" + sources."has-1.0.3" sources."has-flag-4.0.0" - sources."he-1.2.0" + sources."has-symbols-1.0.2" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."inquirer-8.1.2" + (sources."inquirer-glob-prompt-0.1.0" // { + dependencies = [ + sources."rxjs-6.6.7" + ]; + }) + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-tokens-4.0.0" + (sources."jscodeshift-0.11.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-1.0.0" + sources."json5-2.2.0" + sources."jsonfile-4.0.0" sources."khroma-1.4.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.11.0" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."log-symbols-4.1.0" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."merge2-1.4.1" + sources."mermaid-8.11.1" + sources."micromatch-4.0.4" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."moment-mini-2.24.0" sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.2" + sources."node-dir-0.1.17" sources."node-fetch-2.6.1" + sources."node-modules-regexp-1.0.0" + sources."node-releases-1.1.73" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."pascalcase-0.1.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-type-4.0.0" sources."pend-1.2.0" + sources."picomatch-2.3.0" + sources."pify-4.0.1" + sources."pirates-4.0.1" sources."pkg-dir-4.2.0" + sources."posix-character-classes-0.1.1" sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" + sources."punycode-2.1.1" sources."puppeteer-10.1.0" + sources."queue-microtask-1.2.3" sources."readable-stream-3.6.0" + (sources."recast-0.20.5" // { + dependencies = [ + sources."source-map-0.6.1" + sources."tslib-2.3.0" + ]; + }) + sources."regex-not-1.0.2" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."require-from-string-2.0.2" + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rw-1.3.3" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shallow-clone-3.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-4.2.2" sources."string_decoder-1.3.0" - sources."stylis-3.5.4" + sources."strip-ansi-6.0.0" + sources."stylis-4.0.10" sources."supports-color-7.2.0" sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" + (sources."temp-0.8.4" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."tslib-1.14.1" + sources."type-fest-0.21.3" sources."unbzip2-stream-1.3.3" + sources."union-value-1.0.1" + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."wcwidth-1.0.1" + sources."which-2.0.2" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" sources."ws-7.4.6" + sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -96533,19 +97685,19 @@ in dependencies = [ sources."@fluentui/date-time-utilities-8.2.1" sources."@fluentui/dom-utilities-2.1.3" - sources."@fluentui/font-icons-mdl2-8.1.6" - sources."@fluentui/foundation-legacy-8.1.6" + sources."@fluentui/font-icons-mdl2-8.1.7" + sources."@fluentui/foundation-legacy-8.1.7" sources."@fluentui/keyboard-key-0.3.3" sources."@fluentui/merge-styles-8.1.3" sources."@fluentui/react-8.23.8" - sources."@fluentui/react-focus-8.1.8" + sources."@fluentui/react-focus-8.1.9" sources."@fluentui/react-hooks-8.2.4" sources."@fluentui/react-window-provider-2.1.3" sources."@fluentui/set-version-8.1.3" - sources."@fluentui/style-utilities-8.2.0" - sources."@fluentui/theme-2.1.4" + sources."@fluentui/style-utilities-8.2.1" + sources."@fluentui/theme-2.2.0" sources."@fluentui/utilities-8.2.1" - sources."@microsoft/load-themed-styles-1.10.195" + sources."@microsoft/load-themed-styles-1.10.196" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" @@ -96568,7 +97720,7 @@ in sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -96661,8 +97813,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -96966,8 +98118,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -96994,6 +98146,82 @@ in bypassCache = true; reconstructLock = true; }; + musescore-downloader = nodeEnv.buildNodePackage { + name = "musescore-downloader"; + packageName = "musescore-downloader"; + version = "0.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.25.0.tgz"; + sha512 = "F2qWP33AgxYrEHfvmlUw75VuXHnTAmGztGdmsZIZYQNPxB1nKusC5Qs9unmGvUF+JgyziC7kVqp6TGY5JQvsVA=="; + }; + dependencies = [ + sources."@librescore/fonts-0.4.1" + sources."@librescore/sf3-0.3.0" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."buffer-5.7.1" + sources."chalk-4.1.1" + sources."chardet-0.7.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."defaults-1.0.3" + sources."detect-node-2.1.0" + sources."emoji-regex-8.0.0" + sources."escape-string-regexp-1.0.5" + sources."external-editor-3.1.0" + sources."figures-3.2.0" + sources."has-flag-4.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."inquirer-7.3.3" + sources."is-fullwidth-code-point-3.0.0" + sources."is-interactive-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."lodash-4.17.21" + sources."log-symbols-4.1.0" + sources."mimic-fn-2.1.0" + sources."mute-stream-0.0.8" + sources."node-fetch-2.6.1" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" + sources."readable-stream-3.6.0" + sources."restore-cursor-3.1.0" + sources."run-async-2.4.1" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."signal-exit-3.0.3" + sources."string-width-4.2.2" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."tslib-1.14.1" + sources."type-fest-0.21.3" + sources."util-deprecate-1.0.2" + sources."wcwidth-1.0.1" + sources."webmscore-0.18.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "download sheet music from musescore.com for free, no login or Musescore Pro required | 免登录、免 Musescore Pro,免费下载 musescore.com 上的曲谱"; + homepage = "https://github.com/Xmader/musescore-downloader#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; @@ -97057,10 +98285,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.2.8"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.8.tgz"; - sha512 = "p6sCh6NCfU+eLtL6/ZIsCzhXXOyKUCQ8Xf4jy3HfjviT8QGbGey1ddP5ia1+opd+2pWV53xy09X11zAWMawPxw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.3.1.tgz"; + sha512 = "694ZZdsFDzJNRRSZVNpour0DYhkPX613drfRyaepz9yjHRm/vlJ3jq5i64GZW9bOjhZY1HW+cve0fhYmkIyVNQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -97194,30 +98422,12 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.1.1" // { + (sources."@netlify/build-17.3.1" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.15.1" // { - dependencies = [ - sources."execa-5.1.1" - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."pkg-dir-5.0.0" - sources."semver-7.3.5" - sources."yargs-16.2.0" - ]; - }) sources."ansi-styles-4.3.0" sources."boxen-4.2.0" sources."chalk-3.0.0" - sources."cp-file-9.1.0" - (sources."execa-3.4.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" + sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -97234,7 +98444,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-14.0.0" // { + (sources."@netlify/config-14.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -97248,18 +98458,11 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.7.2" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - (sources."@netlify/functions-utils-2.0.2" // { - dependencies = [ - sources."@netlify/zip-it-and-ship-it-4.15.1" - sources."cp-file-9.1.0" - sources."pkg-dir-5.0.0" - sources."resolve-2.0.0-next.3" - sources."yargs-16.2.0" - ]; - }) + sources."@netlify/functions-utils-2.0.2" (sources."@netlify/git-utils-2.0.0" // { dependencies = [ sources."braces-3.0.2" @@ -97270,39 +98473,43 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/local-functions-proxy-1.0.0" - sources."@netlify/local-functions-proxy-darwin-arm64-1.0.0" - sources."@netlify/local-functions-proxy-darwin-x64-1.0.0" - sources."@netlify/local-functions-proxy-freebsd-arm64-1.0.0" - sources."@netlify/local-functions-proxy-freebsd-x64-1.0.0" - sources."@netlify/local-functions-proxy-linux-arm-1.0.0" - sources."@netlify/local-functions-proxy-linux-arm64-1.0.0" - sources."@netlify/local-functions-proxy-linux-ia32-1.0.0" - sources."@netlify/local-functions-proxy-linux-ppc64-1.0.0" - sources."@netlify/local-functions-proxy-linux-x64-1.0.0" - sources."@netlify/local-functions-proxy-openbsd-x64-1.0.0" - sources."@netlify/local-functions-proxy-win32-ia32-1.0.0" - sources."@netlify/local-functions-proxy-win32-x64-1.0.0" + sources."@netlify/local-functions-proxy-1.1.0" + sources."@netlify/local-functions-proxy-darwin-arm64-1.1.0" + sources."@netlify/local-functions-proxy-darwin-x64-1.1.0" + sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.0" + sources."@netlify/local-functions-proxy-freebsd-x64-1.1.0" + sources."@netlify/local-functions-proxy-linux-arm-1.1.0" + sources."@netlify/local-functions-proxy-linux-arm64-1.1.0" + sources."@netlify/local-functions-proxy-linux-ia32-1.1.0" + sources."@netlify/local-functions-proxy-linux-ppc64-1.1.0" + sources."@netlify/local-functions-proxy-linux-x64-1.1.0" + sources."@netlify/local-functions-proxy-openbsd-x64-1.1.0" + sources."@netlify/local-functions-proxy-win32-ia32-1.1.0" + sources."@netlify/local-functions-proxy-win32-x64-1.1.0" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.6" - sources."typescript-4.3.5" ]; }) - sources."@netlify/plugins-list-2.19.3" + sources."@netlify/plugins-list-2.21.0" sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-2.0.0" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.15.0" // { + (sources."@netlify/zip-it-and-ship-it-4.15.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -97355,8 +98562,10 @@ in }) (sources."@oclif/errors-1.3.5" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -97417,18 +98626,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.1.1" + sources."@octokit/openapi-types-9.2.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.1" + sources."@octokit/plugin-rest-endpoint-methods-5.5.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.1" - sources."@octokit/types-6.21.1" + sources."@octokit/rest-18.7.2" + sources."@octokit/types-6.22.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97465,7 +98674,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97559,7 +98768,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -97582,8 +98791,10 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -97599,7 +98810,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-es6-4.9.3" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" sources."builtins-1.0.3" sources."byline-5.0.0" @@ -97621,7 +98832,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97689,7 +98900,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -97741,7 +98952,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -97845,7 +99056,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -97883,7 +99098,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -98315,6 +99530,7 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -98391,8 +99607,8 @@ in sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -98549,12 +99765,8 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -98704,7 +99916,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.54.0" + sources."rollup-2.55.1" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -98930,7 +100142,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -99015,7 +100227,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -99024,20 +100236,15 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-18.1.3" sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -99343,8 +100550,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -99589,17 +100796,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.0.3.tgz"; - sha512 = "sqhTY/p6lwO7lxjGrgbeZcml9xmpjeV1vdB/a3xXT6b5vAvq0bJgR5n+sXpZQc0JFSWGeygBXEoWvAAi39rkKQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.4.tgz"; + sha512 = "hZlBqPThweIrnnQ800RDpkpLHGiqimsgq+QSM8IiS5wGxSlFimZibZpiMjl8+Fwnv5aqF04cstpG0cG+yuIFmg=="; }; dependencies = [ sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" - sources."@node-red/editor-api-2.0.3" - sources."@node-red/editor-client-2.0.3" - (sources."@node-red/nodes-2.0.3" // { + sources."@node-red/editor-api-2.0.4" + sources."@node-red/editor-client-2.0.4" + (sources."@node-red/nodes-2.0.4" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.6.3" @@ -99612,15 +100819,15 @@ in }) ]; }) - sources."@node-red/registry-2.0.3" - sources."@node-red/runtime-2.0.3" - sources."@node-red/util-2.0.3" + sources."@node-red/registry-2.0.4" + sources."@node-red/runtime-2.0.4" + sources."@node-red/util-2.0.4" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99671,7 +100878,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."busboy-0.2.14" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" @@ -99834,8 +101041,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -100010,7 +101217,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."caseless-0.12.0" sources."chownr-2.0.0" @@ -100072,8 +101279,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -100380,7 +101587,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100884,10 +102091,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.1"; + version = "7.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.1.tgz"; - sha512 = "Fau808Ybtzja6SdOglKyUfEX1vC57Gq9zR20IfK2z+iwaLmYOHvHqf3zQoeXzNLDzT5bf+CnKns3EhHLFLguew=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.3.tgz"; + sha512 = "Kxk+NSnv+bcUKlWEKRaJ745AjEApYzM6GHxXs9AzR8VJiRMPcKvrIGMp+pdkIaF++2kEbcyg/Kx0FCrv+ySJiQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -101107,8 +102314,8 @@ in sources."make-fetch-happen-9.0.4" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -101362,8 +102569,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -101683,7 +102890,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -101735,7 +102942,7 @@ in ]; }) sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" @@ -101745,7 +102952,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101772,7 +102979,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101883,7 +103090,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101893,7 +103100,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.3" // { + (sources."es-abstract-1.18.4" // { dependencies = [ sources."object-inspect-1.11.0" ]; @@ -102011,6 +103218,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internal-slot-1.0.3" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -102114,8 +103322,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -102348,6 +103556,11 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + (sources."side-channel-1.0.4" // { + dependencies = [ + sources."object-inspect-1.11.0" + ]; + }) sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -102659,8 +103872,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -102881,7 +104094,7 @@ in sources."array-flatten-2.1.2" sources."balanced-match-1.0.2" sources."base64-js-0.0.8" - sources."bencode-2.0.1" + sources."bencode-2.0.2" sources."bep53-range-1.1.1" sources."big-integer-1.6.48" sources."bitfield-0.1.0" @@ -102907,7 +104120,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."call-bind-1.0.2" sources."camelcase-2.1.1" @@ -103231,7 +104444,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" @@ -103347,7 +104560,7 @@ in }) (sources."k-rpc-socket-1.11.1" // { dependencies = [ - sources."bencode-2.0.1" + sources."bencode-2.0.2" ]; }) (sources."lazystream-1.0.0" // { @@ -103367,8 +104580,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -103790,7 +105003,7 @@ in sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."chalk-3.0.0" sources."charm-0.1.2" @@ -103925,7 +105138,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.12" + sources."systeminformation-5.7.13" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -104254,7 +105467,7 @@ in sources."browserify-zlib-0.2.0" sources."buffer-5.2.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" @@ -104667,7 +105880,7 @@ in sources."brfs-1.6.1" sources."browser-or-node-1.3.0" sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."camelcase-5.3.1" sources."chalk-2.4.2" sources."cliui-4.1.0" @@ -104894,7 +106107,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -104911,6 +106124,7 @@ in sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internal-slot-1.0.3" sources."is-arguments-1.1.0" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" @@ -105118,7 +106332,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -105212,7 +106426,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.2.4" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" @@ -105278,7 +106492,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -105306,7 +106520,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105391,7 +106605,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.2" // { + (sources."core-js-compat-3.16.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -105535,7 +106749,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105566,7 +106780,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -105816,6 +107030,7 @@ in ]; }) sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."intersection-observer-0.7.0" sources."into-stream-3.1.0" sources."invariant-2.2.4" @@ -105934,11 +107149,7 @@ in }) sources."mime-2.5.2" sources."mime-db-1.49.0" - (sources."mime-types-2.1.31" // { - dependencies = [ - sources."mime-db-1.48.0" - ]; - }) + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -106367,6 +107578,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -106847,8 +108059,8 @@ in sources."jsdom-16.6.0" sources."levn-0.3.0" sources."lodash-4.17.21" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -106933,7 +108145,7 @@ in }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.3" + sources."@types/node-15.14.4" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -107409,10 +108621,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.54.0"; + version = "2.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.54.0.tgz"; - sha512 = "RHzvstAVwm9A751NxWIbGPFXs3zL4qe/eYg+N7WwGtIXVLy1cK64MiU37+hXeFm1jqipK6DGgMi6Z2hhPuCC3A=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.55.1.tgz"; + sha512 = "1P9w5fpb6b4qroePh8vHKGIvPNxwoCQhjJpIqfZGHLKpZ0xcU2/XBmFxFbc9697/6bmHpmFTLk5R1dAQhFSo0g=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -107599,7 +108811,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -107666,8 +108878,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -107738,7 +108950,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.54.0" + sources."rollup-2.55.1" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -108057,8 +109269,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -108152,7 +109364,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.14.0" // { + (sources."@serverless/components-3.14.2" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -108181,14 +109393,13 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.5" // { + (sources."@serverless/platform-client-4.2.6" // { dependencies = [ - sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.0" // { + (sources."@serverless/platform-client-china-2.2.1" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -108212,8 +109423,8 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.4.3" - sources."@types/request-2.48.6" + sources."@types/node-16.4.7" + sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" sources."@types/tough-cookie-4.0.1" @@ -108273,7 +109484,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.954.0" // { + (sources."aws-sdk-2.957.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108689,8 +109900,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -108818,7 +110029,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.41.1" // { + (sources."simple-git-2.41.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -109126,8 +110337,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -109628,10 +110839,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.668.0"; + version = "1.671.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.668.0.tgz"; - sha512 = "iBcq6b2OOZAunU0qwbLhSHbfG3T1FtMTqTr0FUhOUAu9wRPAN5XbknRVeOb+ap1IbtzWeV1k6weY5Mp4liWirw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.671.0.tgz"; + sha512 = "VxTqViyluEo7ggIecTNkH+OjD/JtF6cHmxHrmMwRZ+FCRCUBmtDtdtT82lMLxTdp+cmx1jwBch7SyVGg3VIDZg=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -109804,7 +111015,7 @@ in sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -109839,7 +111050,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.2" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -110105,6 +111316,7 @@ in sources."path-key-2.0.1" sources."path-type-4.0.0" sources."peek-stream-1.1.3" + sources."pegjs-0.10.0" sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" @@ -110372,7 +111584,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -110382,8 +111594,8 @@ in sources."debug-4.3.2" sources."engine.io-5.1.1" sources."engine.io-parser-4.0.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -110644,7 +111856,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -110740,11 +111952,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { - dependencies = [ - sources."object-inspect-1.11.0" - ]; - }) + sources."es-abstract-1.18.4" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -110853,6 +112061,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int53-1.0.0" + sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."irregular-plurals-1.4.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -110869,6 +112078,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-canonical-base64-1.1.1" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -110913,7 +112123,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.5" // { + (sources."jitdb-3.1.6" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -111026,7 +112236,7 @@ in }) ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -111234,7 +112444,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."resolve-1.17.0" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" @@ -111263,11 +112473,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - (sources."side-channel-1.0.4" // { - dependencies = [ - sources."object-inspect-1.11.0" - ]; - }) + sources."side-channel-1.0.4" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -111410,10 +112616,9 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.13.3" // { + (sources."tape-4.14.0" // { dependencies = [ sources."glob-7.1.7" - sources."is-regex-1.0.5" ]; }) sources."text-table-0.2.0" @@ -111580,7 +112785,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.954.0" // { + (sources."aws-sdk-2.957.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111618,7 +112823,7 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" sources."bunyan-1.8.15" @@ -111937,8 +113142,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -112418,7 +113623,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112456,7 +113661,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112472,7 +113677,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -112698,7 +113903,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -112780,7 +113985,7 @@ in sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; }; dependencies = [ - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -112944,7 +114149,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."busboy-0.2.14" // { dependencies = [ sources."isarray-0.0.1" @@ -113214,8 +114419,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -113581,8 +114786,8 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.5.2" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -113788,7 +114993,7 @@ in sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; }; dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" (sources."source-map-support-0.5.19" // { @@ -114154,7 +115359,7 @@ in }) sources."brace-expansion-1.1.11" sources."bubble-stream-error-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -114593,7 +115798,7 @@ in }; dependencies = [ sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."inherits-2.0.4" @@ -114634,7 +115839,7 @@ in sources."@types/unist-2.0.6" sources."bail-1.0.5" sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."ccount-1.1.0" sources."comma-separated-tokens-1.0.8" sources."concat-stream-2.0.0" @@ -114690,7 +115895,7 @@ in sources."@textlint/ast-node-types-4.4.3" sources."@textlint/types-1.5.5" sources."boundary-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" sources."inherits-2.0.4" sources."object-assign-4.1.1" @@ -114732,13 +115937,14 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."internal-slot-1.0.3" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" @@ -114751,6 +115957,7 @@ in sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."side-channel-1.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."unbox-primitive-1.0.1" @@ -114838,13 +116045,14 @@ in sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.3" + sources."es-abstract-1.18.4" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."internal-slot-1.0.3" sources."is-bigint-1.0.2" sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" @@ -114858,6 +116066,7 @@ in sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."side-channel-1.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."unbox-primitive-1.0.1" @@ -114924,7 +116133,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -115000,7 +116209,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.2" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -115359,10 +116568,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.130.1"; + version = "0.131.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.130.1.tgz"; - sha512 = "OSPPKcGvFSiGkG3jFrwwC76PBV/ZSrGxpBbg28bW8s9GU8r/y2spNGtEXHEb/CVqo0Ctf5Lx2rVaxQZB6OasaA=="; + url = "https://registry.npmjs.org/three/-/three-0.131.0.tgz"; + sha512 = "s05qedtr8qDG7L7MiUpFNboGWSd2xzKeSRd5iQEOjun5DD5ptRQlNsA6wKTbVCdOGbQuUH4kVXerTeznDlBjkw=="; }; buildInputs = globalBuildInputs; meta = { @@ -115460,8 +116669,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -115765,15 +116974,13 @@ in ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-2.0.0.tgz"; - sha1 = "8e6337a585abd1608a0c84958ab483ce69f6654b"; + url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.0.0.tgz"; + sha512 = "Y/ymhhYr/lLkf66BnLQBs3LjttPDE+1BJcFHq/oJN5SnZTacMWVdPfGLB5eIVnC2iT9gZ2ls/Bre2zbKq6hNsA=="; }; dependencies = [ - sources."argparse-1.0.10" - sources."microbuffer-1.0.0" - sources."sprintf-js-1.0.3" + sources."argparse-2.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -116077,8 +117284,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -116506,7 +117713,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.31.0" - (sources."eslint-plugin-vue-7.14.0" // { + (sources."eslint-plugin-vue-7.15.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -116541,7 +117748,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -116626,7 +117833,7 @@ in sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -116859,10 +118066,10 @@ in sources."browser-stdout-1.3.1" sources."browserslist-4.16.6" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001247" + sources."caniuse-lite-1.0.30001248" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116902,7 +118109,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116994,8 +118201,8 @@ in sources."merge-stream-2.0.0" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -117111,14 +118318,14 @@ in sources."vscode-debugadapter-testsupport-1.48.0" sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.47.0" + sources."webpack-5.47.1" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.0.1" + sources."webpack-sources-3.1.1" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -117323,8 +118530,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -117468,7 +118675,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117537,7 +118744,7 @@ in ]; }) sources."buefy-helper-json-1.0.3" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { @@ -117668,7 +118875,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - (sources."vue-eslint-parser-7.9.0" // { + (sources."vue-eslint-parser-7.10.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -118443,7 +119650,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.15.2" + sources."core-js-pure-3.16.0" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -118501,8 +119708,8 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -118640,7 +119847,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118690,7 +119897,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."bunyan-1.8.15" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -118828,7 +120035,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.2.1" + sources."flatted-3.2.2" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -118963,8 +120170,8 @@ in sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -119193,17 +120400,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.47.0"; + version = "5.47.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.47.0.tgz"; - sha512 = "soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz"; + sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -119225,12 +120432,12 @@ in sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" - sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001247" + sources."buffer-from-1.1.2" + sources."caniuse-lite-1.0.30001248" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.788" + sources."electron-to-chromium-1.3.791" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -119252,8 +120459,8 @@ in sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."neo-async-2.6.2" sources."node-releases-1.1.73" sources."p-limit-3.1.0" @@ -119274,7 +120481,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-3.0.1" + sources."webpack-sources-3.1.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -119367,7 +120574,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119648,8 +120855,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -120021,14 +121228,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."addr-to-ip-port-1.5.3" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bencode-2.0.1" + sources."bencode-2.0.2" sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.0.0" @@ -120069,7 +121276,7 @@ in sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."bufferutil-4.0.3" sources."cache-chunk-store-3.2.2" @@ -120393,10 +121600,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.21.1"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.1.tgz"; - sha512 = "13Ann9t+BdAmBKsPlSWoYCISUIo+UFcAVf+YQg9wc7HdLZ0FlIhL5Mhn9+l9GMeO2PGRYEiCEAMbNiGn36Y84g=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.22.0.tgz"; + sha512 = "+b2B5qsQhVdovneS3cU8HzTIZSMw8gn6zsznXqtjHYrdXUZqLCnWhnYNVRWLrWSzrxOHOyczOnx60sSuQNctJw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -120465,7 +121672,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.7.1" // { + (sources."@npmcli/arborist-2.8.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -120499,7 +121706,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.3" + sources."@types/node-15.14.4" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -120556,7 +121763,7 @@ in ]; }) sources."bin-version-check-3.0.0" - sources."binaryextensions-4.15.0" + sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -120571,7 +121778,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtins-1.0.3" (sources."cacache-15.2.0" // { dependencies = [ @@ -120620,7 +121827,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.2" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -120869,7 +122076,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.0.1" + sources."mem-fs-editor-9.0.2" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -120880,8 +122087,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -121231,7 +122438,7 @@ in ]; }) sources."text-table-0.2.0" - sources."textextensions-5.12.0" + sources."textextensions-5.13.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."titleize-1.0.1" @@ -121348,7 +122555,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" - sources."rxjs-7.2.0" + sources."rxjs-7.3.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -121399,7 +122606,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.3" + sources."@types/node-16.4.7" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" @@ -121414,8 +122621,8 @@ in sources."has-flag-4.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."node-fetch-2.6.1" sources."supports-color-7.2.0" From 143a5cf7ad5b44e0c33dd2ddc6f25497d5351352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 10:27:09 +0200 Subject: [PATCH 0938/1522] mkcl: cleanup --- pkgs/development/compilers/mkcl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 181c75c81b0..e8452f46a8a 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mkcl"; version = "1.1.11"; @@ -27,7 +27,7 @@ with lib; stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ - "GMP_CFLAGS=-I${gmp.dev}/include" + "GMP_CFLAGS=-I${lib.getDev gmp}/include" "GMP_LDFLAGS=-L${gmp.out}/lib" ]; @@ -36,9 +36,9 @@ with lib; stdenv.mkDerivation rec { cd contrib/tinycc ./configure --cc=cc \ --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${getLib stdenv.cc.libc}/lib + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib )''; postInstall = '' @@ -47,7 +47,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; From b58b4a85c418a6821f8557d6a2c19f7a2262fc0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:52:49 +0000 Subject: [PATCH 0939/1522] containerd: 1.5.4 -> 1.5.5 --- pkgs/applications/virtualization/containerd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 0c44805bedd..c86f4280e82 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.4"; + version = "1.5.5"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; + sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk="; }; vendorSha256 = null; @@ -32,15 +32,19 @@ buildGoModule rec { BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' + runHook preBuild patchShebangs . make binaries man $buildFlags + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] installShellCompletion --bash contrib/autocomplete/ctr installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + runHook postInstall ''; passthru.tests = { inherit (nixosTests) docker; }; From b5e7e053969e4aa983934a23ba4ae4537383a133 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:31:36 +0200 Subject: [PATCH 0940/1522] python3Packages.pyupgrade: 2.23.0 -> 2.23.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 202c8254f6b..3d37dcae872 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.0"; + version = "2.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i"; + sha256 = "1jc0gh0y5fz02wab50v6m4x0pfycdkjvf1vw05d8d0yqsv7ld7fw"; }; checkInputs = [ pytestCheckHook ]; From fc11b5eaa4bbd8075e4b64d237d68cda030d661e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Jul 2021 08:37:25 +0000 Subject: [PATCH 0941/1522] doc: rust: add missing semicolon --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f5c664bec20..f17e1ba8d8f 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -144,7 +144,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904"; }; - } + }; # ... } From 27d8dba3f155d79b618ee5b9b3f7a08f5eec8849 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:38:03 +0200 Subject: [PATCH 0942/1522] python3Packages.archinfo: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 40583a12ada..4f33bbb6101 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9166"; + version = "9.0.9297"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5"; + sha256 = "0hlwf98ijb8c9gc51pjy4kq4zal2cmqrr34dgk31f03dnp65yiz7"; }; checkInputs = [ From 69aecb9a5e0ae58f1dce085f3fe4de43e4b9a446 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:38:21 +0200 Subject: [PATCH 0943/1522] python3Packages.ailment: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3ddd3d366e8..12cca132ab1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz"; + sha256 = "01lj0abg93icvf4nz1ngshl04avm48lh0naqjcaaxa6ak1gxf97d"; }; propagatedBuildInputs = [ pyvex ]; From 46eed450bb5264e66841e24794dfaf1ce2444572 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:38:39 +0200 Subject: [PATCH 0944/1522] python3Packages.pyvex: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index a6c2b1d381b..ee61f4fcca0 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9166"; + version = "9.0.9297"; src = fetchPypi { inherit pname version; - sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja"; + sha256 = "1dfg7kacmwln0sazs5hakmsmfbm8m55qq1ydxi4g2ix3bfxkc1c4"; }; postPatch = lib.optionalString stdenv.isDarwin '' From 9e17af6970c9519844ff386d8636f4ad1d7f80ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:39:00 +0200 Subject: [PATCH 0945/1522] python3Packages.claripy: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 3dc930473f5..b39034f3093 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0"; + sha256 = "1lacpdzaifn050msh4rf75qphbh56dc2kdk7m426q4ki3g7026n7"; }; # Use upstream z3 implementation From 0a52bf4743235121df68d5b6a14a47eef5dfbab7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:39:11 +0200 Subject: [PATCH 0946/1522] python3Packages.cle: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 0110625eba8..f3c2f9977b0 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9166"; + version = "9.0.9297"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c"; + sha256 = "1n5ybbxmsm7mc7z40b9imbgzjzmbjq58sh6zvzjyqqnl9k657khc"; }; propagatedBuildInputs = [ From dc3da4ec5ad75cbdc298b8739536732761a65401 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:39:25 +0200 Subject: [PATCH 0947/1522] python3Packages.angrop: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1ab86c1820a..ed84b56f0f8 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m"; + sha256 = "10ky13j66ysag9wmx8hsmr4pn16h24rp34zqi3qn7hk1v2jrkkx6"; }; propagatedBuildInputs = [ From 33356775bc2edc0aa7063976031268e413636d2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 10:39:35 +0200 Subject: [PATCH 0948/1522] python3Packages.angr: 9.0.9166 -> 9.0.9297 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index acad9cb0f59..53098646db2 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x"; + sha256 = "1n0qklh0cwp75mr7zgv7a9qm58gxpfbwialhnyg8w9y00mqh6flj"; }; propagatedBuildInputs = [ From f57f936eed3fdf60ad7a1012a162d789cfdcb1c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 08:48:32 +0000 Subject: [PATCH 0949/1522] fly: 7.3.2 -> 7.4.0 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 22b7752c593..741bcfbe5a8 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.3.2"; + version = "7.4.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-ID/vqkFzKHLeuojHUxUFYURn+Dxb78XwxfJVV+S130A="; + sha256 = "sha256-UvEPTZtQWztl7ZC1XrBxE8+emlXQjMG4IJEti5vVxUM="; }; - vendorSha256 = "sha256-30rrRkPIH0sr8koKRLs1Twe6Z55+lr9gkgUDrY+WOTw="; + vendorSha256 = "sha256-IY+HGgoKNS/j3FGCX3F3EK1GehBjs3Z1K8V3O7a3swk="; doCheck = false; From 9bd0be76b2219e8984566340e26a0f85caeb89cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 29 Jul 2021 16:31:07 +0200 Subject: [PATCH 0950/1522] nix(Stable): 2.3.14 -> 2.3.15 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e60cf580426..b1ba766b78b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -218,10 +218,10 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.14"; + version = "2.3.15"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; + sha256 = "sha256-N+MxClX94eUOfUMh0puRgNHp16+cjSEdtqZn5u5OtBA="; }; boehmgc = boehmgc_nix; From c145ac7eabd6bae0f4d85002ab5e2079b2d9621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 30 Jul 2021 11:17:19 +0200 Subject: [PATCH 0951/1522] build-fhs-userenv: fix defaults on aarch64 --- pkgs/build-support/build-fhs-userenv/env.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 226904f311b..da4521b4de3 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,8 +1,11 @@ { stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: -{ name, profile ? "" -, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] -, extraBuildCommands ? "", extraBuildCommandsMulti ? "" +{ name +, profile ? "" +, targetPkgs ? pkgs: [] +, multiPkgs ? pkgs: [] +, extraBuildCommands ? "" +, extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] }: @@ -23,7 +26,8 @@ let is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - isMultiBuild = multiPkgs != null && is64Bit; + # multi-lib glibc is only supported on x86_64 + isMultiBuild = multiPkgs != null && stdenv.hostPlatform.system == "x86_64-linux"; isTargetBuild = !isMultiBuild; # list of packages (usually programs) which are only be installed for the From be33e5f4011f239c2021c2fe5e99b76997690bd4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 19:36:56 +0200 Subject: [PATCH 0952/1522] haskellPackages.cabal2nix-unstable: 2021-07-21 -> 2021-07-29 --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index eabea78fd09..c8bb4591b3a 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-07-21"; + version = "unstable-2021-07-29"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz"; - sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn"; + url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz"; + sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc"; }; isLibrary = true; isExecutable = true; From 4eb88b29d2f362e29d6321b78fd6a16c08d4a787 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 19:37:51 +0200 Subject: [PATCH 0953/1522] all-cabal-hashes: 2021-07-26T15:54:23Z -> 2021-07-29T16:00:40Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh Additional changes: * haskellPackages.distribution-nixpkgs: allow 1.6.0 * haskellPackages: regenerate using `maintainers/scripts/haskell/regenerate-hackage-packages.sh`. --- pkgs/data/misc/hackage/pin.json | 8 +- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 656 +++++++++++++++--- 3 files changed, 554 insertions(+), 111 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d36b8342fdd..81b45836a60 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e40930a03e038e12969b8eac001e86d7aa7355b4", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz", - "sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc", - "msg": "Update from Hackage at 2021-07-26T15:54:23Z" + "commit": "7060a9c8a2b0e92be86d0338296697df3e9a713f", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7060a9c8a2b0e92be86d0338296697df3e9a713f.tar.gz", + "sha256": "1dzdylg00j1rm8s0rs23jv22cvv9wy3abizzhnryq1wkp13npsc7", + "msg": "Update from Hackage at 2021-07-29T16:00:40Z" } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8bd6c316f28..e5e4672e1d5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,7 +91,6 @@ default-package-overrides: - streamly-bytestring < 0.1.3 - streamly-lmdb < 0.3.0 - streamly-process - - distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3ebdfe48fdd..a7e4322496e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7271,6 +7271,8 @@ self: { pname = "Glob"; version = "0.10.1"; sha256 = "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a"; + revision = "1"; + editedCabalFile = "1mnhsl38mv9p46njns72xi4564nikx7v6plg2s6jilr3y3sfijqp"; libraryHaskellDepends = [ base containers directory dlist filepath transformers transformers-compat @@ -10756,6 +10758,21 @@ self: { license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_7_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.7.1"; + sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -11558,6 +11575,35 @@ self: { broken = true; }) {}; + "Jikka" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, containers + , deepseq, doctest, happy, hlint, hspec, hspec-discover, mtl + , ormolu, text, transformers, vector + }: + mkDerivation { + pname = "Jikka"; + version = "5.0.11.2"; + sha256 = "03f6xvg9jhalpa43k27dr9vzc02rchhf15irwp6gbzq3g63vzqi5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base containers deepseq mtl text transformers + vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + ansi-terminal array base containers deepseq mtl text transformers + vector + ]; + testHaskellDepends = [ + ansi-terminal array base containers deepseq doctest hlint hspec mtl + ormolu text transformers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A transpiler from Python to C++ for competitive programming"; + license = lib.licenses.asl20; + }) {}; + "JsContracts" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , pretty, syb, WebBits, WebBits-Html @@ -26916,6 +26962,8 @@ self: { pname = "alsa-seq"; version = "0.6.0.8"; sha256 = "00f7873484nifbimdav0b25sipgx3rn6xx1il6qgvz0p70pzzljv"; + revision = "1"; + editedCabalFile = "1mzdlqgxrgjmr3ljf4xg8rcks1fdq0s0zpb4lkipcm1lyq0kk32j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33178,6 +33226,24 @@ self: { broken = true; }) {}; + "arrow-utils" = callPackage + ({ mkDerivation, base, QuickCheck, test-framework + , test-framework-quickcheck2, vector-sized + }: + mkDerivation { + pname = "arrow-utils"; + version = "0.1.0.0"; + sha256 = "1l8njh623a00hvfd3cczvb4ngh7c39z6f0kfhr8hr6xhbkrgwqnc"; + revision = "1"; + editedCabalFile = "1jdl1jmr8hbjiybrjnfr8rraqdf95l4qia3nna3nh9pvh8c69jln"; + libraryHaskellDepends = [ base vector-sized ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "functions for working with arrows"; + license = lib.licenses.bsd3; + }) {}; + "arrowapply-utils" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -49578,10 +49644,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.17.0"; - sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm"; - revision = "2"; - editedCabalFile = "05lb28s4l4c1s6jv1zaqpm9mwx5r4gm113akzq9xr1w5447vw2c3"; + version = "2.18.0"; + sha256 = "11hzic1l7amd2hwqwgfmy2r855z9w0m2rvvx7r52x347q0nn142b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49854,6 +49918,22 @@ self: { license = lib.licenses.asl20; }) {}; + "cached-json-file" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , http-query, time, xdg-basedir + }: + mkDerivation { + pname = "cached-json-file"; + version = "0.1.0"; + sha256 = "1w1zxzcbyf4c0p5hg4j2b531r6vg95745ah3qqwiafwb4z11l7ih"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath http-query time + xdg-basedir + ]; + description = "Locally cache a json file obtained by http"; + license = lib.licenses.bsd3; + }) {}; + "cached-traversable" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, mtl @@ -58436,18 +58516,19 @@ self: { }) {}; "coincident-root-loci" = callPackage - ({ mkDerivation, array, base, combinat, containers, random, tasty - , tasty-hunit, transformers + ({ mkDerivation, array, base, combinat, containers + , polynomial-algebra, random, tasty, tasty-hunit, transformers }: mkDerivation { pname = "coincident-root-loci"; - version = "0.2"; - sha256 = "0p6wm5gd57m809cqr0p3hb29drs1q25f539j2pf1cw03hlkahpxh"; + version = "0.3"; + sha256 = "1m7a1f2qxkq4jgbvmyn8zzz6pq44a4cfkkm74zlssg74xmx0d4ir"; libraryHaskellDepends = [ - array base combinat containers random transformers + array base combinat containers polynomial-algebra random + transformers ]; testHaskellDepends = [ - array base combinat containers tasty tasty-hunit + array base combinat containers polynomial-algebra tasty tasty-hunit ]; description = "Equivariant CSM classes of coincident root loci"; license = lib.licenses.bsd3; @@ -60569,15 +60650,12 @@ self: { }) {}; "conceit" = callPackage - ({ mkDerivation, base, bifunctors, semigroupoids, semigroups, void - }: + ({ mkDerivation, base }: mkDerivation { pname = "conceit"; - version = "0.4.0.0"; - sha256 = "02wq99h7rnsvzkkm6i7x6qk7d4fiy6llg5yr75h2zks387yalwl9"; - libraryHaskellDepends = [ - base bifunctors semigroupoids semigroups void - ]; + version = "0.5.0.0"; + sha256 = "0aprzrslrbsl3d7j49nmx0kxx71m39zi7xlfyw8wnazqpi8mfwwb"; + libraryHaskellDepends = [ base ]; description = "Concurrent actions that may fail with a value"; license = lib.licenses.bsd3; }) {}; @@ -63426,12 +63504,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "contravariant_1_5_4" = callPackage + "contravariant_1_5_5" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; - version = "1.5.4"; - sha256 = "19bwqkxvpgdfvjamk0g8wk1q4rfvbhxain6lx78ldhjmc7m5v9ql"; + version = "1.5.5"; + sha256 = "1ynz89vfn7czxpa203zmdqknkvpylzzl9rlkpasx1anph1jxcbq6"; libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = lib.licenses.bsd3; @@ -64864,6 +64942,8 @@ self: { pname = "cpuid"; version = "0.2.3"; sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq"; + revision = "1"; + editedCabalFile = "1nq08npkjpl4j047d268qrwxii5xhc30iwji7azkc8dh2gja6g2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-accessor enumset ]; @@ -69605,6 +69685,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-fix_0_3_2" = callPackage + ({ mkDerivation, base, deepseq, hashable }: + mkDerivation { + pname = "data-fix"; + version = "0.3.2"; + sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; + libraryHaskellDepends = [ base deepseq hashable ]; + description = "Fixpoint data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-fix-cse" = callPackage ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { @@ -70099,6 +70191,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-pdf-fieldreader" = callPackage + ({ mkDerivation, base, bytestring, containers, optparse-applicative + , text + }: + mkDerivation { + pname = "data-pdf-fieldreader"; + version = "0.1.0.0"; + sha256 = "1h57hva0dkhnshallf2yxwfmzfqzd6wm20cbxn8qm94jp95a627d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring containers text ]; + executableHaskellDepends = [ + base bytestring containers optparse-applicative text + ]; + description = "Read PDF form fields"; + license = lib.licenses.mit; + }) {}; + "data-pprint" = callPackage ({ mkDerivation, base, deepseq, mtl, parallel, pretty, time }: mkDerivation { @@ -77497,24 +77607,6 @@ self: { }) {}; "distribution-nixpkgs" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, hspec, language-nix, lens, pretty, process, split - }: - mkDerivation { - pname = "distribution-nixpkgs"; - version = "1.5.0"; - sha256 = "07z1dkyzz9sabxda48cy6y2pfyq14sz2m9bv6y6dajn15cy7m3pk"; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq language-nix lens - pretty process split - ]; - testHaskellDepends = [ base deepseq hspec lens ]; - description = "Types and functions to manipulate the Nixpkgs distribution"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "distribution-nixpkgs_1_6_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, hspec, language-nix, lens, pretty, process, split }: @@ -77522,6 +77614,8 @@ self: { pname = "distribution-nixpkgs"; version = "1.6.0"; sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i"; + revision = "1"; + editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens @@ -77530,7 +77624,6 @@ self: { testHaskellDepends = [ base deepseq hspec lens ]; description = "Types and functions to manipulate the Nixpkgs distribution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -84638,6 +84731,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "enumset_0_1" = callPackage + ({ mkDerivation, base, data-accessor, semigroups, storable-record + }: + mkDerivation { + pname = "enumset"; + version = "0.1"; + sha256 = "1flsyc8a9hj33pl35jkcls8sdc7yw8yc9xfflynm0h9ncq1frlcr"; + libraryHaskellDepends = [ + base data-accessor semigroups storable-record + ]; + description = "Sets of enumeration values represented by machine words"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "env-extra" = callPackage ({ mkDerivation, base, exceptions, tasty, tasty-hunit, text , transformers @@ -85445,6 +85553,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; + revision = "1"; + editedCabalFile = "08y607nwnw12vlbmwcppv1ydw726x8p3kwwx4rgaiss906hgnzrp"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -87165,6 +87275,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-transformers_0_4_0_10" = callPackage + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + , transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.10"; + sha256 = "11ghvxm32q3kzccbngz4068j2rrrhs03amlaq5i5r1vankrbxg0n"; + libraryHaskellDepends = [ base transformers transformers-compat ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-via" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -87712,6 +87840,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "exon" = callPackage + ({ mkDerivation, base, flatparse, haskell-src-exts + , haskell-src-meta, hedgehog, relude, tasty, tasty-hedgehog + , template-haskell, text + }: + mkDerivation { + pname = "exon"; + version = "0.1.0.0"; + sha256 = "014jbbzhb9ar3azxqjnagyyasack0dik32h2d0lzb6yr0yiwsv8m"; + libraryHaskellDepends = [ + base flatparse haskell-src-exts haskell-src-meta relude + template-haskell text + ]; + testHaskellDepends = [ + base flatparse haskell-src-exts haskell-src-meta hedgehog relude + tasty tasty-hedgehog template-haskell text + ]; + description = "Monoidal Quasiquote Interpolation"; + license = "BSD-2-Clause-Patent"; + }) {}; + "exotic-list-monads" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , QuickCheck @@ -89842,26 +89991,23 @@ self: { , config-ini, directory, email-validate, extra, filepath , http-conduit, http-directory, http-query, koji, lens, lens-aeson , network-uri, optparse-applicative, pretty-terminal, process - , rpmbuild-order, simple-cmd, simple-cmd-args, text, time + , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args, text, time , typed-process, unordered-containers, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "0.9"; - sha256 = "1basamg578nyyjl677q3fax31pxcckxvdpw4f48gdmnmlnd9f6vm"; + version = "0.9.1"; + sha256 = "1da3q7i2qsrc0hal97rbmmp6609n3z9hqn1i67a5lhi4z7mk8fab"; isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base http-query lens lens-aeson text time - ]; executableHaskellDepends = [ aeson async base bugzilla-redhat bytestring config-ini directory email-validate extra filepath http-conduit http-directory - http-query koji network-uri optparse-applicative pretty-terminal - process rpmbuild-order simple-cmd simple-cmd-args text time - typed-process unordered-containers utf8-string xdg-basedir + http-query koji lens lens-aeson network-uri optparse-applicative + pretty-terminal process rpm-nvr rpmbuild-order simple-cmd + simple-cmd-args text time typed-process unordered-containers + utf8-string xdg-basedir ]; - doHaddock = false; description = "Build and create Fedora package repos and branches"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; @@ -90886,6 +91032,20 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fftw-ffi" = callPackage + ({ mkDerivation, base, enumset, fftw, fftwFloat, netlib-ffi }: + mkDerivation { + pname = "fftw-ffi"; + version = "0.1"; + sha256 = "1a0a28i54s1gjyf0lk96l512gm6i2rn6ac1hh76r3gk5n7ijbx7p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base enumset netlib-ffi ]; + libraryPkgconfigDepends = [ fftw fftwFloat ]; + description = "Low-level interface to FFTW (Fast Fourier Transform)"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fftwRaw" = callPackage ({ mkDerivation, base, fftw }: mkDerivation { @@ -92255,6 +92415,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fix-whitespace_0_0_6" = callPackage + ({ mkDerivation, base, directory, extra, filepath, filepattern + , text, yaml + }: + mkDerivation { + pname = "fix-whitespace"; + version = "0.0.6"; + sha256 = "087sp7bf7k4h9clmhqdzk8j1y12rc6lhd22p2w6kp7w1ppgg06aw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath filepattern text yaml + ]; + description = "Fixes whitespace issues"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92280,6 +92458,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-length_0_2_3" = callPackage + ({ mkDerivation, base, non-empty, storable-record, tfp + , transformers, utility-ht + }: + mkDerivation { + pname = "fixed-length"; + version = "0.2.3"; + sha256 = "0g2z9vswjbzishbx6wl6vln7x4avl8glxc14kr4bjwxdlvvn2ic1"; + libraryHaskellDepends = [ + base non-empty storable-record tfp transformers utility-ht + ]; + description = "Lists with statically known length based on non-empty package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -93866,6 +94060,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "fmt_0_6_2_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, call-stack + , containers, criterion, deepseq, doctest, doctest-discover + , formatting, hspec, interpolate, microlens, neat-interpolation + , QuickCheck, text, time, time-locale-compat, vector + }: + mkDerivation { + pname = "fmt"; + version = "0.6.2.0"; + sha256 = "14h5f7nz9czfg1ar0ga9vry4ck2xf7h6rxiyk276w871yra01l9g"; + libraryHaskellDepends = [ + base base64-bytestring bytestring call-stack containers formatting + microlens text time time-locale-compat + ]; + testHaskellDepends = [ + base bytestring call-stack containers doctest hspec + neat-interpolation QuickCheck text vector + ]; + testToolDepends = [ doctest-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text vector + ]; + description = "A new formatting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fmt-for-rio" = callPackage ({ mkDerivation, base, enum-text-rio }: mkDerivation { @@ -94533,8 +94755,8 @@ self: { }: mkDerivation { pname = "forex2ledger"; - version = "1.0.0.1"; - sha256 = "0v6adrl9c9vjpf4gm8x729qxq7yl84bfbiawmdpks2jzdckxvgdb"; + version = "1.0.0.2"; + sha256 = "1x6ln7pw77psppryi71jbsz5px4z4a96ppz6wmj4kjr7rwkkbrg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134354,8 +134576,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.1.1"; - sha256 = "0s5dyia6v59vz7xk8m6gj0shdygk39pmks5yr7dlzksb8gqfgral"; + version = "1.9.1.2"; + sha256 = "1dvyvsj5f5fpqs6jgqxhrf1dfq2nwb75rf797zkyy3m4a278d58q"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -135710,8 +135932,8 @@ self: { }: mkDerivation { pname = "hs-term-emulator"; - version = "0.1.0.0"; - sha256 = "03aidqaw9pmwggd1w8ir6qhb08hlhv0q5gnl0hqa5zjj86dd0rp2"; + version = "0.1.0.3"; + sha256 = "0agl1xhidj4a9vm3nx4ahkx06kvv2kk83qxfv7l5mb9ml3myrqnp"; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring containers lens text vector @@ -147651,6 +147873,8 @@ self: { pname = "indexed-traversable"; version = "0.1.1"; sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs"; + revision = "1"; + editedCabalFile = "0krvp9v5dh4w2076kar48cpkk62ndqp769v2ai3b38rsa5bj6q74"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; @@ -149278,18 +149502,18 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, safe, time - , witherable + ({ mkDerivation, base, containers, foldl, hspec, QuickCheck, safe + , time, witherable }: mkDerivation { pname = "interval-algebra"; - version = "0.8.3"; - sha256 = "0bqsynrzkgl8350spwja96c3hx20srdd9a9g0971jmbrws8kvlpj"; + version = "0.8.6"; + sha256 = "1k9x1c7hrbrq6zgj82k8w28ak1jp1v9iq19bicl5355r4p2wiqsa"; libraryHaskellDepends = [ - base containers QuickCheck safe time witherable + base containers foldl QuickCheck safe time witherable ]; testHaskellDepends = [ - base containers hspec QuickCheck safe time + base containers hspec QuickCheck safe time witherable ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; @@ -151171,6 +151395,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "iterative-forward-search" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, fingertree + , hashable, random, time, transformers, unordered-containers + }: + mkDerivation { + pname = "iterative-forward-search"; + version = "0.1.0.0"; + sha256 = "03cnrhnr93va6vd1fi6ccqzdlng37ggkh0ff45bk9m4b25pwrgql"; + libraryHaskellDepends = [ + base containers deepseq fingertree hashable random time + transformers unordered-containers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree hashable random time + transformers unordered-containers + ]; + description = "An IFS constraint solver"; + license = lib.licenses.mit; + }) {}; + "iterio-server" = callPackage ({ mkDerivation, base, bytestring, filepath, iterIO, ListLike , monadIO, mtl, network, split, transformers, unix @@ -151754,6 +151998,8 @@ self: { pname = "jack"; version = "0.7.2"; sha256 = "0aa7nz8ybsw7s0nmf12kxnjm5z1afj88c97b1w17b7lvdwvfs3cx"; + revision = "1"; + editedCabalFile = "16g5xc67811jvckfn0xfvcwbxi0kcx1qh87pyhrqvrp4k8m68g2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154861,6 +155107,8 @@ self: { pname = "kan-extensions"; version = "5.2.2"; sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; + revision = "1"; + editedCabalFile = "1scfkj28l7dcrlzcvf0x4vlkpg8d0r4s08l3ccnwlhnxvzsmwkj7"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -154870,6 +155118,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_3" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.3"; + sha256 = "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -160437,6 +160704,27 @@ self: { license = lib.licenses.mit; }) {}; + "lazy-async" = callPackage + ({ mkDerivation, base, exceptions, hedgehog, lifted-async + , monad-control, optics-core, optics-th, rank2classes, stm + , transformers, transformers-base + }: + mkDerivation { + pname = "lazy-async"; + version = "1.0.0.0"; + sha256 = "0kk8pzwm04z4jljl38gd0n03nkxw3mxg8rg93ka0rvnibfwm8dda"; + libraryHaskellDepends = [ + base exceptions lifted-async monad-control rank2classes stm + transformers transformers-base + ]; + testHaskellDepends = [ + base exceptions hedgehog lifted-async monad-control optics-core + optics-th rank2classes stm transformers transformers-base + ]; + description = "Asynchronous actions that don't start right away"; + license = lib.licenses.mit; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -163011,19 +163299,21 @@ self: { }) {}; "libsodium" = callPackage - ({ mkDerivation, base, hedgehog, libsodium, tasty, tasty-hedgehog - , tasty-hunit + ({ mkDerivation, base, c2hs, hedgehog, libsodium, tasty + , tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "libsodium"; - version = "1.0.18.1"; - sha256 = "0injknfijncmfq10szdl1ay75wwpi8rgm3qfdl654aprd95kvpf1"; + version = "1.0.18.2"; + sha256 = "021167kkpii8szx32m5ljgmy5vhvhdijasnz350b14wr047n5iww"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ libsodium ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit ]; testPkgconfigDepends = [ libsodium ]; + testToolDepends = [ c2hs ]; description = "Low-level bindings to the libsodium C library"; license = lib.licenses.isc; }) {inherit (pkgs) libsodium;}; @@ -163867,16 +164157,16 @@ self: { "line-bot-sdk" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring , bytestring, cryptohash-sha256, deepseq, free, hspec - , hspec-expectations, hspec-wai, http-api-data, http-client - , http-client-tls, http-media, http-types, mtl, scientific, servant - , servant-client, servant-client-core, servant-server - , string-conversions, text, time, transformers, wai, wai-extra - , warp + , hspec-discover, hspec-expectations, hspec-wai, http-api-data + , http-client, http-client-tls, http-media, http-types, mtl + , scientific, servant, servant-client, servant-client-core + , servant-server, string-conversions, text, time, transformers, wai + , wai-extra, warp }: mkDerivation { pname = "line-bot-sdk"; - version = "0.7.0"; - sha256 = "05pw5qj0bd62gdb8llalsdpm62y8vhxxfch3zc18152qajn228yp"; + version = "0.7.1"; + sha256 = "0q7nzycmd3adckpzrskjfjw72bcxia278qb9z72sa991riyawscz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163894,6 +164184,7 @@ self: { http-client-tls http-types servant servant-client servant-client-core servant-server text time transformers wai warp ]; + testToolDepends = [ hspec-discover ]; description = "Haskell SDK for LINE Messaging API"; license = lib.licenses.bsd3; }) {}; @@ -166013,6 +166304,8 @@ self: { pname = "llvm-extra"; version = "0.10.1"; sha256 = "0m8fxip4345k92nq5n0dqdbjyahah0nind6lrwa5r7f9ff9j8gc9"; + revision = "1"; + editedCabalFile = "12b7icp5vk26nwl5q8jhsrcqp10h0w72yxqsw9dzr3lzca4g6wl2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166035,6 +166328,8 @@ self: { pname = "llvm-ffi"; version = "9.1.0.1"; sha256 = "19bj8gkzmzg3khnj1pnksc789p1hls0ji48kvwp72zbhhzgpr75d"; + revision = "1"; + editedCabalFile = "0iq9csqrbzrhvpzgz8nbs9k390sh3440002ipcicjlqkm4ssi330"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -166294,6 +166589,8 @@ self: { pname = "llvm-tf"; version = "9.2"; sha256 = "1p4r9m1svp6k235r0azx6dkpdarakgy3420z3kk06bdiy1m2jk1s"; + revision = "1"; + editedCabalFile = "0maav3vis08vdvp0zwclyjznf2k4r8qi7szpwxhkya0xa87fh96d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166427,6 +166724,45 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lnd-client" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base + , base16-bytestring, base64-bytestring, bytestring, chronos + , containers, cryptohash-sha256, cryptonite, deepseq, envparse + , extra, hspec, http2, http2-client, http2-client-grpc + , http2-grpc-proto-lens, http2-grpc-types, JuicyPixels, katip + , microlens, network-bitcoin, pem, persistent, proto-lens + , proto-lens-runtime, qrcode-core, qrcode-juicypixels, scientific + , stm, template-haskell, text, unbounded-delays, universum + , unliftio, x509 + }: + mkDerivation { + pname = "lnd-client"; + version = "0.1.0.0"; + sha256 = "0fjjm9gamj50scd9m55mv587klhn8xpj35x8abvms5pmpf0npzgq"; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types async base base16-bytestring + base64-bytestring bytestring chronos containers cryptohash-sha256 + cryptonite deepseq envparse extra hspec http2 http2-client + http2-client-grpc http2-grpc-proto-lens http2-grpc-types + JuicyPixels katip microlens network-bitcoin pem persistent + proto-lens proto-lens-runtime qrcode-core qrcode-juicypixels + scientific stm template-haskell text unbounded-delays universum + unliftio x509 + ]; + testHaskellDepends = [ + aeson asn1-encoding asn1-types async base base16-bytestring + base64-bytestring bytestring chronos containers cryptohash-sha256 + cryptonite deepseq envparse extra hspec http2 http2-client + http2-client-grpc http2-grpc-proto-lens http2-grpc-types + JuicyPixels katip microlens network-bitcoin pem persistent + proto-lens proto-lens-runtime qrcode-core qrcode-juicypixels + scientific stm template-haskell text unbounded-delays universum + unliftio x509 + ]; + description = "Lightning Network Daemon (LND) client library for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "load-balancing" = callPackage ({ mkDerivation, base, containers, hslogger, PSQueue, stm }: mkDerivation { @@ -166759,8 +167095,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.10.0.0"; - sha256 = "1rbp34p7a89w960rpwmqwfqrj6nvqybbc5aqiji60zldxigvy3si"; + version = "0.10.0.1"; + sha256 = "0h4b7hjxcc75swj43wx0axcp5znsndkrnhn9c8fm7f7a2gmvb8l1"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -166852,8 +167188,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.8.0.0"; - sha256 = "0vc3n53rpn3qwysp8y5i19ajaag386izsrf9h9k7c2g907k1skw6"; + version = "0.8.0.1"; + sha256 = "0bc63v9w023xw1fq0pkfnk4ac336hgliayy21ny0zaz9xf39a24l"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -168300,8 +168636,8 @@ self: { }: mkDerivation { pname = "lti13"; - version = "0.2.0.1"; - sha256 = "1fcjypadap94f238vnhbchq9dy61mhgwlqpy4v22m34881dvx8gf"; + version = "0.2.0.2"; + sha256 = "1a8ag4ny61rjyy15fa4mihrgqkinipzj5cvpasscl9yw8jik9s1i"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text @@ -176463,6 +176799,8 @@ self: { pname = "mmorph"; version = "1.2.0"; sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1"; + revision = "1"; + editedCabalFile = "13j6znh33pnnk8yfxnndqiiwal1w6rs2jigs7fgpa26883ff2788"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -177473,6 +177811,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "monad-control_1_0_3" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.3"; + sha256 = "16rdv4s85ni1xdbd8nzarm4sh331198jnmakrn5wxla9hrfwg2fi"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + description = "Lift control operations, like exception catching, through monad transformers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -190191,6 +190545,8 @@ self: { pname = "o-clock"; version = "1.2.1"; sha256 = "17y44aajipysw1p268rq8a6lhv9cdhkvxjcpcdij93sqp818q96z"; + revision = "1"; + editedCabalFile = "1n8ns0f4ljbarb5xmlwfs1lq24jg30m3hv0gmpgd26y666d3hh95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim ]; @@ -193414,6 +193770,8 @@ self: { pname = "optparse-applicative"; version = "0.16.1.0"; sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2"; + revision = "1"; + editedCabalFile = "0401ik87gm9gjpch6lmkczygp59na3f1j7bcs6mc2r929c2xgsqn"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -198027,6 +198385,8 @@ self: { pname = "patch-image"; version = "0.3.3.1"; sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k"; + revision = "1"; + editedCabalFile = "0l21xqwh95v5jdv46qbmaw6d4rfbmn1yx3zraq0srxawc1fgdfgx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -201617,10 +201977,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.3.2.0"; - sha256 = "1r52qjghqv54f2brk132cabjrd3c96jnx96c78irlks5vd0cgblk"; + version = "0.5.0.0"; + sha256 = "0lvlrjg424d5jqvplqml3zybai1nhg5zc6kmk5vd01dph2ny3zxw"; libraryHaskellDepends = [ base ]; - description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)"; + description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; }) {}; @@ -201667,8 +202027,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.5.0.1"; - sha256 = "0wrh3bmwa6l5vfjv481wvnqqd82xgm27vcbm9xg1nm7psihj6gqj"; + version = "0.6.0.0"; + sha256 = "0cr7cqc9vkim5cr30lqkglfqyxaqnpaqjicfzzfbr75wqrjljjpm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201729,8 +202089,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.5.0.1"; - sha256 = "0gif3xwcbc5v4qjyhn1qwyj36jkqj7rdrq35fzxsr7xbmjcw13h2"; + version = "0.6.0.0"; + sha256 = "0knihshb5ahrvdzabbfvgnmhxq94kv985k4cjimh4h4dkzvlmkpj"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -201768,8 +202128,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.3.0.0"; - sha256 = "192i7dr6kpzrclvym1y1j3zgabcx3fldaan07rgxhhys3k7gbqxa"; + version = "0.4.0.0"; + sha256 = "1k4s7nr6kcf2y0954grn08s8q49pwq9sq11fyzbil3vsxgb6cy82"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -201820,8 +202180,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.3.0.0"; - sha256 = "1m836lvnmzsf918jh9kx5vb8hirrjfskcbg1jyz2nar6yqijkr8z"; + version = "0.4.0.0"; + sha256 = "19g1xd50k6gvqjq58a5yzqxnq92acgv2ni8m1vp95ajw9cwacsc2"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -205383,6 +205743,8 @@ self: { pname = "poll"; version = "0.0.0.2"; sha256 = "1bllh4yr96p7k44bc10zyhdx2zdh3brl0im3gnn5a1m6irsx6j42"; + revision = "1"; + editedCabalFile = "05ghv8acp0gr86wlxsmjd0x6jaj981213ggg629hb78a95119f2q"; libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; license = lib.licenses.bsd3; @@ -206073,11 +206435,16 @@ self: { }: mkDerivation { pname = "polysemy-readline"; - version = "0.1.0.0"; - sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1"; + version = "0.2.0.0"; + sha256 = "0zkzlrwcbxkxiy2xmh3ms9saa379lmw49d9hfkmd487vi33q0isn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base exceptions haskeline polysemy polysemy-plugin ]; + executableHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; testHaskellDepends = [ base exceptions haskeline polysemy polysemy-plugin ]; @@ -207669,20 +208036,33 @@ self: { }: mkDerivation { pname = "postgresql-replicant"; - version = "0.1.0.1"; - sha256 = "1jlmbi5inwwpwyvrfg13b91fv642xcahfv8nhi0y6dqrvfj69h0q"; + version = "0.2.0.0"; + sha256 = "06r5psp6zv2pdbn4l5mp9mh8gywx4s75rny21qbbizramvl77h1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bits bytestring cereal containers keep-alive postgresql-libpq scientific stm text time ]; - executableHaskellDepends = [ base postgresql-libpq ]; + executableHaskellDepends = [ aeson base postgresql-libpq ]; testHaskellDepends = [ base binary bytestring cereal hspec ]; description = "PostgreSQL logical streaming replication library"; license = lib.licenses.bsd3; }) {}; + "postgresql-resilient" = callPackage + ({ mkDerivation, base, exceptions, postgresql-simple }: + mkDerivation { + pname = "postgresql-resilient"; + version = "0.1.0.0"; + sha256 = "178hq0mdd2cnw2ysncyqva6nqbfwxd2ka5np53zyjjp8jga59lgj"; + revision = "1"; + editedCabalFile = "0j2klssj7d379i4vyp34p6n37wrc0ipl89az6k1aknh7n92c1ga2"; + libraryHaskellDepends = [ base exceptions postgresql-simple ]; + description = "Automatic re-connection support for PostgreSQL"; + license = lib.licenses.asl20; + }) {}; + "postgresql-schema" = callPackage ({ mkDerivation, base, basic-prelude, optparse-applicative , postgresql-simple, shelly, text, time @@ -210551,14 +210931,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_13_1" = callPackage + "process_1_6_13_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.13.1"; - sha256 = "1fkaapar94w5prsvdpyybqb0j4hyjhf68czdlr5psb42i314lnj7"; + version = "1.6.13.2"; + sha256 = "01p3lqj23czqpmih4mdz1lknsy1c4z6ly3iyrnx4pxxmw9vnp2lw"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -215096,8 +215476,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.25.2"; sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"; - revision = "1"; - editedCabalFile = "0pmsq83jzf7gxr59h8j85121n6n0iqbl3smccl9v7n3gkp70kr2q"; + revision = "2"; + editedCabalFile = "1lsa3pbg4ljlk29fhm3mdklnx3hwffyga1nr5krbpcyc3ywq8fq8"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -229662,6 +230042,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "scheduler_2_0_0" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions + , genvalidity-hspec, hspec, hspec-discover, mwc-random, primitive + , pvar, QuickCheck, template-haskell, unliftio, unliftio-core + , vector + }: + mkDerivation { + pname = "scheduler"; + version = "2.0.0"; + sha256 = "1i0fz2gj2q12gfl1h8ar0ikkqksznr1rij7fsx1v0qi6qg9d7cc3"; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions primitive pvar unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck + template-haskell unliftio vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Work stealing scheduler"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -231906,6 +232309,8 @@ self: { pname = "semialign"; version = "1.2"; sha256 = "04dcyj69g7bm1sydxk89vin9mh2pmm0pqf0cm9v981i98xp6xxdj"; + revision = "1"; + editedCabalFile = "0s5s5k0xngb3wgnzyiwsqqnpy8c6nma4rn9146zk17shzsjy7ryk"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -232033,6 +232438,8 @@ self: { pname = "semigroupoids"; version = "5.3.5"; sha256 = "1c66sc9w9724xhlly9wfjhghmnnw99z9al69264i2izk7vhihbsm"; + revision = "1"; + editedCabalFile = "13ssan43xr6yk465axy35m87jrxy3rmrsbzxah055jmsldjp5bg9"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -232070,6 +232477,8 @@ self: { pname = "semigroups"; version = "0.19.1"; sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr"; + revision = "1"; + editedCabalFile = "10hp5ij4zivkgh1paxiwnwclgwf5xv3zrkfyvqkpgdf2l2mpm0nd"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = lib.licenses.bsd3; @@ -241268,6 +241677,21 @@ self: { broken = true; }) {}; + "slugger" = callPackage + ({ mkDerivation, base, hspec, text, text-icu }: + mkDerivation { + pname = "slugger"; + version = "0.1.0.1"; + sha256 = "1d1cx9c3qv8yd7q72q2vjp16mcsim4aw47dxv880q6xi5nmddcka"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text text-icu ]; + executableHaskellDepends = [ base text text-icu ]; + testHaskellDepends = [ base hspec text text-icu ]; + description = "Clean URI slugs for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "slugify" = callPackage ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, text , unicode-transforms @@ -250809,6 +251233,8 @@ self: { pname = "strict"; version = "0.4.0.1"; sha256 = "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz"; + revision = "1"; + editedCabalFile = "04js9aj6h49gr8plrgqm7jall0baw5wjkvqjxbpmi8ji0xspw62h"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -259113,7 +259539,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {libtensorflow = null;}; + }) {inherit (pkgs) libtensorflow;}; "tensorflow-core-ops" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath @@ -262351,8 +262777,8 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; - revision = "1"; - editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9"; + revision = "2"; + editedCabalFile = "16x3am622jn97j1d9879x7j5zbjn33bkfaa0dq0xyp1fbc0s7h5x"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -266586,6 +267012,8 @@ self: { pname = "transformers-base"; version = "0.4.5.2"; sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h"; + revision = "1"; + editedCabalFile = "18j122ypx12rbl9bbf622fvj8nif4rsci8z4qw2llmznbvfl09s0"; libraryHaskellDepends = [ base base-orphans stm transformers transformers-compat ]; @@ -267799,6 +268227,22 @@ self: { broken = true; }) {}; + "trimdent" = callPackage + ({ mkDerivation, base, doctest, hspec + , hspec-expectations-pretty-diff, raw-strings-qq + }: + mkDerivation { + pname = "trimdent"; + version = "0.1.0.0"; + sha256 = "1jvhfmkha9a0g2ikxqdbwv0mvafysva2hym1z7ws2sfirfx483dp"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hspec hspec-expectations-pretty-diff raw-strings-qq + ]; + description = "A utility for neat multiline string trimming"; + license = lib.licenses.agpl3Only; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -273042,8 +273486,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "6"; - editedCabalFile = "1wjy6cr4ls9gaisbq97knkw4rzk7aavcwvl4szx1vs7dbrfzrf6x"; + revision = "7"; + editedCabalFile = "1hkmb19m2mm8h2v69awip25i7cpg0967yih89q5npqsxknix4hkw"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = lib.licenses.bsd3; @@ -289118,8 +289562,8 @@ self: { }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.2.0.1"; - sha256 = "1ylwg85q6j04rmq0lclyiv7by3dgwmpya5hv1dqhaw62nlfh05r6"; + version = "0.2.0.2"; + sha256 = "19x8a3jfwrsrizg8lj8wrc9k2b0p4lga3q5fqqa60jjsr6lm73j3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 63c36ec2658f461ecd07704b5bc85d09ff4888dd Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 30 Jul 2021 09:40:38 +0000 Subject: [PATCH 0954/1522] exploitdb: 2021-07-29 -> 2021-07-30 --- pkgs/tools/security/exploitdb/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8fdf5ec0d78..9abc01aa4b9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-29"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-/ZNQcfDHFFiI3BFyUTcwDUnhbCdxA4GrS8EIjgYgKw8="; + sha256 = "sha256-7gMhp5MR4RFPv8Ob9SR3XvapPIt5llf3CspW4Yu7Puo="; }; installPhase = '' + runHook preInstall mkdir -p $out/bin cp --recursive ./* $out/bin cp ./.searchsploit_rc $out/bin + runHook postInstall ''; meta = with lib; { From 3040e34263ef07db6f585b98d4b10de785def419 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 09:40:55 +0000 Subject: [PATCH 0955/1522] gore: 0.5.2 -> 0.5.3 --- pkgs/development/tools/gore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 43bb2d2aad7..0131908d0aa 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo="; + sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A="; }; - vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY="; + vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU="; doCheck = false; From 00d5259f5e4aeed77c53e45cb1e5ea8725fef0a7 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 30 Jul 2021 02:46:45 -0700 Subject: [PATCH 0956/1522] vk-cli: Remove zulip dependency zulip is an application; it does not have any libraries. Signed-off-by: Anders Kaseorg --- .../networking/instant-messengers/vk-cli/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix index e1b3cc4f775..bb34fd7534c 100644 --- a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , curl -, zulip , p7zip , glibc , ncurses @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf $out/bin/vk-cli \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [ curl zulip glibc ]}" + --set-rpath "${lib.makeLibraryPath [ curl glibc ]}" ''; meta = with lib; { From 0dfe202312d18a84ed47af1448e4f12796badafe Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 30 Jul 2021 11:47:53 +0200 Subject: [PATCH 0957/1522] haskellPackages.cabal2nix-unstable: fix distribution-nixpkgs override --- pkgs/development/haskell-modules/configuration-common.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9bc5a936e28..1e42ad0a4ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1715,9 +1715,7 @@ self: super: { # https://github.com/obsidiansystems/database-id/issues/1 database-id-class = doJailbreak super.database-id-class; - cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override { - distribution-nixpkgs = self.distribution-nixpkgs_1_6_0; - }) { + cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; From 70af7d12dca1b78c1d6a4a8d166f0153ddbeeb9f Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 30 Jul 2021 12:04:43 +0200 Subject: [PATCH 0958/1522] cypress: 8.0.0 -> 8.1.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index ff673658272..0e1715a4c12 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.0.0"; + version = "8.1.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z"; + sha256 = "17cq88qrq3dshgfaycb77xbkzr9drw7fvw0xqijlxivvmnbvwi6i"; }; # don't remove runtime deps From 2ec9af0f0e8817da55cb040ce2d1c1a0bb2f2c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 30 Jul 2021 10:02:49 +0000 Subject: [PATCH 0959/1522] just: fix aarch64 build --- pkgs/development/tools/just/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index d7a2e733859..cad2c7e1a18 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -16,6 +16,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + postPatch = '' + # this hard codes the compiler, which breaks the aarch64 in particular + # we rather want to set the compiler ourself + rm .cargo/config + ''; + postInstall = '' installManPage man/just.1 From 1c9dda8a9b0d1b52966521602315ef14dbdc6d93 Mon Sep 17 00:00:00 2001 From: Lucas Ransan Date: Fri, 30 Jul 2021 13:35:43 +0200 Subject: [PATCH 0960/1522] cone: init at unstable-2021-07-25 --- pkgs/development/compilers/cone/default.nix | 42 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/compilers/cone/default.nix diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix new file mode 100644 index 00000000000..9344160ad76 --- /dev/null +++ b/pkgs/development/compilers/cone/default.nix @@ -0,0 +1,42 @@ +{ llvmPackages +, lib +, fetchFromGitHub +, cmake +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "cone"; + version = "unstable-2021-07-25"; + + src = fetchFromGitHub { + owner = "jondgoodwin"; + repo = pname; + rev = "5feaabc342bcff3755f638a7e25155cd12127592"; + sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + llvmPackages.llvm + ]; + + postPatch = '' + sed -i CMakeLists.txt \ + -e 's/LLVM 7/LLVM/' \ + -e '/AVR/d' + ''; + + installPhase = '' + install -Dm755 conec $out/bin/conec + install -Dm644 libconestd.a $out/lib/libconestd.a + ''; + + meta = with lib; { + description = "Cone Programming Language"; + homepage = "https://cone.jondgoodwin.com"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 107722e6e10..ff3584a38da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3958,6 +3958,10 @@ in compass = callPackage ../development/tools/compass { }; + cone = callPackage ../development/compilers/cone { + llvmPackages = llvmPackages_7; + }; + conda = callPackage ../tools/package-management/conda { }; console-bridge = callPackage ../development/libraries/console-bridge { }; From 274c4f6659c0d9861b0eece04aa4ebe86519d315 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:37:59 +0000 Subject: [PATCH 0961/1522] ktlint: 0.41.0 -> 0.42.0 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 61b4a570b81..fde540b057e 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.41.0"; + version = "0.42.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3"; + sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg="; }; nativeBuildInputs = [ makeWrapper ]; From bc6789fd7ff1ca21ef3579c3baee9bf90614df1e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 30 Jul 2021 14:38:50 +0300 Subject: [PATCH 0962/1522] =?UTF-8?q?cudatext:=201.137.2=20=E2=86=92=201.1?= =?UTF-8?q?39.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index bab29597c76..ad25fb898ba 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.137.2"; + version = "1.139.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-OiLYXx1sBkEJpMPTa/45QPHLtmeI6ZLles7GfjEBGtQ="; + sha256 = "sha256-oBdEPLnM08gC3FZNDi1uyGar2MP8EmFkWJhH+fr6gBA="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 8ca09925058..c27c482b287 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,23 +16,23 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "0cf6e09f673beb3a25d6957c97eeeee37024617b", - "sha256": "sha256-oqxzORNva7tZXNlI/mSe722p6Tbkf7Ie6GPL3TxjV98=" + "rev": "2021.07.29", + "sha256": "sha256-XgkpadcTPeMu2B3XVX+9gHLZiAaLwNuHTCnZPtjakIk=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.07.09", - "sha256": "sha256-w5f1s8yjkYfDqAcKISRgJd3fe+f2NyO3ZtFLLfiBm2Q=" + "rev": "2021.07.20", + "sha256": "sha256-yh9/2kHfg7swNzPe+7i+ON7MKhFrhxtGAT+pxL4GdVQ=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.07.02", - "sha256": "sha256-PndvBiqdqw681AC6q33UWdzUvcYHxj1WuYsVFi2HK7c=" + "rev": "2021.07.29", + "sha256": "sha256-2Wc4udsSEM0Ngzt/bokuDHcR0imKyHgkeG3RCWu3nXw=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.07.09", - "sha256": "sha256-QCG9i26m3v9J4uO1I1BiDwBerH4iX1rAJuNqx+gHLnA=" + "rev": "2021.07.29", + "sha256": "sha256-mCT3F0GPC+Hl7WOtYznxErMTyr9cH4ghaanYMum+3Fg=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -46,8 +46,8 @@ }, "CudaText-lexers": { "owner": "Alexey-T", - "rev": "2021.02.01", - "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd" + "rev": "2021.07.09", + "sha256": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" }, "bgrabitmap": { "owner": "bgrabitmap", From bee9155f517273e0f26402622734c03e85008b0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:47:55 +0000 Subject: [PATCH 0963/1522] kubelogin: 0.0.9 -> 0.0.10 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 0a928ac9299..f8bec6e0b10 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0+4hrC7A60dbf+1uvTVU2JRynvA3O/lXfgcra1fV9bI="; + sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE="; }; - vendorSha256 = "sha256-erGqCpWlAQanY1ghpNVRhzUEIXv3lCiBGRs888MmHN8="; + vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; buildFlagsArray = '' -ldflags= From 60af7ac4d8d1918cc831a23fd1fd71852d2f6e0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:52:46 +0000 Subject: [PATCH 0964/1522] kuttl: 0.9.0 -> 0.11.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index dfa06cc6968..6470cd640e2 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.9.0"; + version = "0.11.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256:1cji0py2340mvcpplwq3licdkzjx7q5f27fdjjxvbhrgksnyw6hs"; + sha256 = "sha256-42acx1UcvuzDZX2A33zExhhdNqWGkN0i6FR/Kx76WVM="; }; - vendorSha256 = "sha256:1shra42ifa2knxp58fj5hn074jg89f3nqdqk4rqbp3ybir84ahsd"; + vendorSha256 = "sha256-TUNFUI7Lj7twJhM3bIdL6ElygIVFOlRut1MoFwVRGeo="; subPackages = [ "cmd/kubectl-kuttl" ]; From 2ef8e12ff9bb1a1792cd7701d827212c1a99c453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 30 Jul 2021 13:12:00 +0100 Subject: [PATCH 0965/1522] ledger-live-desktop: 2.30.0 -> 2.31.1 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 1c6c41a0e72..f54b693f309 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.30.0"; + version = "2.31.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595"; + sha256 = "0cxf4i58l0kg9c13j7mf0w5ijrkkf9z1375vn6xghd0r8g5hvws5"; }; appimageContents = appimageTools.extractType2 { From 733594090b4ac64ef402118edf69355005b1acb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 30 Jul 2021 13:13:28 +0100 Subject: [PATCH 0966/1522] ledger-live-desktop: add andresilva as maintainer --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index f54b693f309..6e97c51afce 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood th0rgal ]; + maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; }; } From c16026700252faa5f2168b10216af8b45858c251 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 26 Jul 2021 09:19:51 +0200 Subject: [PATCH 0967/1522] rebar3: apply tmpdir patch from upstream --- .../tools/build-managers/rebar3/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 3b775eeaef1..f1aa4204a04 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchHex, erlang, makeWrapper, writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: @@ -40,12 +40,14 @@ let ''; - patches = [] - # Skips test that can write outside the designated tmp directory, potentially resulting in build failures - # due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when - # rebar3 releases with the following commit: - # https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21 - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ]; + patches = [ + # TODO: remove this on next rebar3 release + (fetchpatch { + name = "escriptize-erl-libs"; + url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch"; + sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c"; + }) + ]; checkPhase = '' HOME=. escript ./rebar3 ct From c8ca3c5de7fdf4616695aaf7a6571a455f5d98ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 14:23:52 +0200 Subject: [PATCH 0968/1522] ijq: 0.3.5 -> 0.3.6 --- pkgs/development/tools/ijq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 4165f9bd41c..caac892bf12 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ijq"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xLmjidPxjSkYmLI4lWieT2rswZsWBY/IUXFOrUFAMo="; + sha256 = "sha256-mPO3P+NGFIoHuvMFwj87S8H8LQx7QpfPy2zi91la2C0="; }; - vendorSha256 = "sha256-7UuQXnQdlUMC0ZIgHydQ5bZMB5XrE7dhx5+1NI+zFkM="; + vendorSha256 = "sha256-HbrmfZ/P5bUF7Qio5L1sb/HAYk/tL2SOmxHCXvSw72I="; nativeBuildInputs = [ installShellFiles makeWrapper scdoc ]; @@ -31,6 +31,6 @@ buildGoModule rec { description = "Interactive wrapper for jq"; homepage = "https://git.sr.ht/~gpanders/ijq"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ justinas ]; + maintainers = with maintainers; [ justinas SuperSandro2000 ]; }; } From 5e80b47d56bf2622a39e18c1ea05b1226627f834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 14:29:27 +0200 Subject: [PATCH 0969/1522] jq: format, update meta --- pkgs/development/tools/jq/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index feeb22e1d44..7206a6d7d24 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook -, onigurumaSupport ? true, oniguruma }: +{ lib +, stdenv +, fetchpatch +, fetchFromGitHub +, autoreconfHook +, onigurumaSupport ? true +, oniguruma +}: stdenv.mkDerivation rec { pname = "jq"; @@ -46,8 +52,8 @@ stdenv.mkDerivation rec { "--datadir=\${doc}/share" "--mandir=\${man}/share/man" ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" - # jq is linked to libjq: - ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + # jq is linked to libjq: + ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; installCheckTarget = "check"; @@ -63,8 +69,8 @@ stdenv.mkDerivation rec { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; - platforms = with platforms; linux ++ darwin; - downloadPage = "http://stedolan.github.io/jq/download/"; + platforms = platforms.unix; + downloadPage = "https://stedolan.github.io/jq/download/"; updateWalker = true; }; } From 6adebe1f67d3f4092d9e64248c39b2103801dc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Jul 2021 14:30:25 +0200 Subject: [PATCH 0970/1522] elfcat: remove Cargo.lock file --- pkgs/tools/misc/elfcat/Cargo.lock | 7 ------- pkgs/tools/misc/elfcat/default.nix | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 pkgs/tools/misc/elfcat/Cargo.lock diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock deleted file mode 100644 index c5b48135993..00000000000 --- a/pkgs/tools/misc/elfcat/Cargo.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "elfcat" -version = "0.1.4" diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index a9691e43c6a..54b9ce0cc49 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoSha256 = null; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries."; From db90da34820fcc2a86cd948d4aa044251b8d7831 Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Fri, 30 Jul 2021 18:28:14 +0530 Subject: [PATCH 0971/1522] grafanaPlugins.grafadruid-druid-datasource: init at 1.2.0 --- .../plugins/grafadruid-druid-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix new file mode 100644 index 00000000000..9f1d501d23f --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafadruid-druid-datasource"; + version = "1.2.0"; + zipHash = "sha256-DPeyV2jZquSQcSE+HzvxArWEefs9bFNPjZwDFp+dIjg="; + meta = with lib; { + description = "Connects Grafana to Druid"; + license = licenses.asl20; + maintainers = with maintainers; [ nukaduka ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index d763f14c75a..a99a71cffd1 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -5,6 +5,7 @@ grafanaPlugin = callPackage ./grafana-plugin.nix { }; doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; + grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 534dbcb28f654c770a6e226e66c4299182494904 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 26 Jul 2021 12:00:05 +0200 Subject: [PATCH 0972/1522] nixos/nitter: init module and test --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/nitter.nix | 326 +++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/nitter.nix | 16 ++ 4 files changed, 344 insertions(+) create mode 100644 nixos/modules/services/misc/nitter.nix create mode 100644 nixos/tests/nitter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4d1700ed99a..27f0456c11e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -530,6 +530,7 @@ ./services/misc/metabase.nix ./services/misc/mwlib.nix ./services/misc/n8n.nix + ./services/misc/nitter.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nix-optimise.nix diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix new file mode 100644 index 00000000000..095a15f21f6 --- /dev/null +++ b/nixos/modules/services/misc/nitter.nix @@ -0,0 +1,326 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nitter; + configFile = pkgs.writeText "nitter.conf" '' + ${generators.toINI { + # String values need to be quoted + mkKeyValue = generators.mkKeyValueDefault { + mkValueString = v: + if isString v then "\"" + (strings.escape ["\""] (toString v)) + "\"" + else generators.mkValueStringDefault {} v; + } " = "; + } (lib.recursiveUpdate { + Server = cfg.server; + Cache = cfg.cache; + Config = cfg.config // { hmacKey = "@hmac@"; }; + Preferences = cfg.preferences; + } cfg.settings)} + ''; + # `hmac` is a secret used for cryptographic signing of video URLs. + # Generate it on first launch, then copy configuration and replace + # `@hmac@` with this value. + # We are not using sed as it would leak the value in the command line. + preStart = pkgs.writers.writePython3 "nitter-prestart" {} '' + import os + import secrets + + state_dir = os.environ.get("STATE_DIRECTORY") + if not os.path.isfile(f"{state_dir}/hmac"): + # Generate hmac on first launch + hmac = secrets.token_hex(32) + with open(f"{state_dir}/hmac", "w") as f: + f.write(hmac) + else: + # Load previously generated hmac + with open(f"{state_dir}/hmac", "r") as f: + hmac = f.read() + + configFile = "${configFile}" + with open(configFile, "r") as f_in: + with open(f"{state_dir}/nitter.conf", "w") as f_out: + f_out.write(f_in.read().replace("@hmac@", hmac)) + ''; +in +{ + options = { + services.nitter = { + enable = mkEnableOption "If enabled, start Nitter."; + + server = { + address = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "127.0.0.1"; + description = "The address to listen on."; + }; + + port = mkOption { + type = types.port; + default = 8080; + example = 8000; + description = "The port to listen on."; + }; + + https = mkOption { + type = types.bool; + default = false; + description = "Set secure attribute on cookies. Keep it disabled to enable cookies when not using HTTPS."; + }; + + httpMaxConnections = mkOption { + type = types.int; + default = 100; + description = "Maximum number of HTTP connections."; + }; + + staticDir = mkOption { + type = types.path; + default = "${pkgs.nitter}/share/nitter/public"; + defaultText = "\${pkgs.nitter}/share/nitter/public"; + description = "Path to the static files directory."; + }; + + title = mkOption { + type = types.str; + default = "nitter"; + description = "Title of the instance."; + }; + + hostname = mkOption { + type = types.str; + default = "localhost"; + example = "nitter.net"; + description = "Hostname of the instance."; + }; + }; + + cache = { + listMinutes = mkOption { + type = types.int; + default = 240; + description = "How long to cache list info (not the tweets, so keep it high)."; + }; + + rssMinutes = mkOption { + type = types.int; + default = 10; + description = "How long to cache RSS queries."; + }; + + redisHost = mkOption { + type = types.str; + default = "localhost"; + description = "Redis host."; + }; + + redisPort = mkOption { + type = types.port; + default = 6379; + description = "Redis port."; + }; + + redisConnections = mkOption { + type = types.int; + default = 20; + description = "Redis connection pool size."; + }; + + redisMaxConnections = mkOption { + type = types.int; + default = 30; + description = '' + Maximum number of connections to Redis. + + New connections are opened when none are available, but if the + pool size goes above this, they are closed when released, do not + worry about this unless you receive tons of requests per second. + ''; + }; + }; + + config = { + base64Media = mkOption { + type = types.bool; + default = false; + description = "Use base64 encoding for proxied media URLs."; + }; + + tokenCount = mkOption { + type = types.int; + default = 10; + description = '' + Minimum amount of usable tokens. + + Tokens are used to authorize API requests, but they expire after + ~1 hour, and have a limit of 187 requests. The limit gets reset + every 15 minutes, and the pool is filled up so there is always at + least tokenCount usable tokens. Only increase this if you receive + major bursts all the time. + ''; + }; + }; + + preferences = { + replaceTwitter = mkOption { + type = types.str; + default = ""; + example = "nitter.net"; + description = "Replace Twitter links with links to this instance (blank to disable)."; + }; + + replaceYouTube = mkOption { + type = types.str; + default = ""; + example = "piped.kavin.rocks"; + description = "Replace YouTube links with links to this instance (blank to disable)."; + }; + + replaceInstagram = mkOption { + type = types.str; + default = ""; + description = "Replace Instagram links with links to this instance (blank to disable)."; + }; + + mp4Playback = mkOption { + type = types.bool; + default = true; + description = "Enable MP4 video playback."; + }; + + hlsPlayback = mkOption { + type = types.bool; + default = false; + description = "Enable HLS video streaming (requires JavaScript)."; + }; + + proxyVideos = mkOption { + type = types.bool; + default = true; + description = "Proxy video streaming through the server (might be slow)."; + }; + + muteVideos = mkOption { + type = types.bool; + default = false; + description = "Mute videos by default."; + }; + + autoplayGifs = mkOption { + type = types.bool; + default = true; + description = "Autoplay GIFs."; + }; + + theme = mkOption { + type = types.str; + default = "Nitter"; + description = "Instance theme."; + }; + + infiniteScroll = mkOption { + type = types.bool; + default = false; + description = "Infinite scrolling (requires JavaScript, experimental!)."; + }; + + stickyProfile = mkOption { + type = types.bool; + default = true; + description = "Make profile sidebar stick to top."; + }; + + bidiSupport = mkOption { + type = types.bool; + default = false; + description = "Support bidirectional text (makes clicking on tweets harder)."; + }; + + hideTweetStats = mkOption { + type = types.bool; + default = false; + description = "Hide tweet stats (replies, retweets, likes)."; + }; + + hideBanner = mkOption { + type = types.bool; + default = false; + description = "Hide profile banner."; + }; + + hidePins = mkOption { + type = types.bool; + default = false; + description = "Hide pinned tweets."; + }; + + hideReplies = mkOption { + type = types.bool; + default = false; + description = "Hide tweet replies."; + }; + }; + + settings = mkOption { + type = types.attrs; + default = {}; + description = '' + Add settings here to override NixOS module generated settings. + + Check the official repository for the available settings: + https://github.com/zedeus/nitter/blob/master/nitter.conf + ''; + }; + + redisCreateLocally = mkOption { + type = types.bool; + default = true; + description = "Configure local Redis server for Nitter."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for Nitter web interface."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !cfg.redisCreateLocally || (cfg.cache.redisHost == "localhost" && cfg.cache.redisPort == 6379); + message = "When services.nitter.redisCreateLocally is enabled, you need to use localhost:6379 as a cache server."; + } + ]; + + systemd.services.nitter = { + description = "Nitter (An alternative Twitter front-end)"; + wantedBy = [ "multi-user.target" ]; + after = [ "syslog.target" "network.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = "nitter"; + Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ]; + # Some parts of Nitter expect `public` folder in working directory, + # see https://github.com/zedeus/nitter/issues/414 + WorkingDirectory = "${pkgs.nitter}/share/nitter"; + ExecStart = "${pkgs.nitter}/bin/nitter"; + ExecStartPre = "${preStart}"; + AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + + services.redis = lib.mkIf (cfg.redisCreateLocally) { + enable = true; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.server.port ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d6ef7d42431..87dfe14bb97 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -297,6 +297,7 @@ in nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; + nitter = handleTest ./nitter.nix {}; nix-serve = handleTest ./nix-ssh-serve.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; diff --git a/nixos/tests/nitter.nix b/nixos/tests/nitter.nix new file mode 100644 index 00000000000..e17f1c47343 --- /dev/null +++ b/nixos/tests/nitter.nix @@ -0,0 +1,16 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "nitter"; + meta.maintainers = with pkgs.lib.maintainers; [ erdnaxe ]; + + nodes.machine = { + services.nitter.enable = true; + }; + + testScript = '' + machine.wait_for_unit("nitter.service") + machine.wait_for_open_port("8080") + machine.succeed("curl --fail http://localhost:8080/") + ''; +}) From d653ff37b3061075afca7de3078c13227cf39e27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 22:58:03 +0200 Subject: [PATCH 0973/1522] python3Packages.python_magic: 0.4.22 -> 0.4.24 --- .../python-modules/python-magic/default.nix | 9 ++-- .../python-magic/libmagic-path.patch | 43 ++++++++++++------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 6737f126073..02f1cc69152 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.22"; + version = "0.4.24"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6"; + sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"; }; patches = [ @@ -32,9 +32,10 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py ''; - meta = { + meta = with lib; { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch index 5a1dbec7d51..e9530d6ddf7 100644 --- a/pkgs/development/python-modules/python-magic/libmagic-path.patch +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -1,17 +1,28 @@ -diff --git a/magic/loader.py b/magic/loader.py -index 6b2bfcb..69778af 100644 ---- a/magic/loader.py -+++ b/magic/loader.py -@@ -5,11 +5,7 @@ import glob - def load_lib(): - libmagic = None - # Let's try to find magic or magic1 -- dll = ctypes.util.find_library('magic') \ -- or ctypes.util.find_library('magic1') \ -- or ctypes.util.find_library('cygmagic-1') \ -- or ctypes.util.find_library('libmagic-1') \ -- or ctypes.util.find_library('msys-magic-1') # for MSYS2 -+ dll = '@libmagic@' +diff --git i/magic/loader.py w/magic/loader.py +index 931f161..b8096d1 100644 +--- i/magic/loader.py ++++ w/magic/loader.py +@@ -35,16 +35,12 @@ def _lib_candidates(): - # necessary because find_library returns None if it doesn't find the library - if dll: + + def load_lib(): ++ lib = '@libmagic@' + +- for lib in _lib_candidates(): +- # find_library returns None when lib not found +- if lib is None: +- continue +- try: +- return ctypes.CDLL(lib) +- except OSError: +- pass +- else: +- # It is better to raise an ImportError since we are importing magic module +- raise ImportError('failed to find libmagic. Check your installation') ++ try: ++ return ctypes.CDLL(lib) ++ except OSError: ++ pass + ++ # It is better to raise an ImportError since we are importing magic module ++ raise ImportError('failed to find libmagic. Check your installation') From 8575d242979c1a0e71bd19481e770517e8fd9d9e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:37:13 -0700 Subject: [PATCH 0974/1522] buildkite-agent: 3.31.0 -> 3.32.0 (#132022) --- .../tools/continuous-integration/buildkite-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index b32eed9a166..3b98a7a7775 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.31.0"; + version = "3.32.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng="; + sha256 = "sha256-wgIqsOqdwnKL1mWD1CR1ru2erc9iSZoDXxeOtobeAQQ="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; From aee760c185efdcaf43fb0721bdcae36d44eb729d Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 30 Jul 2021 07:21:48 +0300 Subject: [PATCH 0975/1522] spotdl: 3.6.3 -> 3.7.2 --- pkgs/tools/audio/spotdl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 71e8615a114..2ecfba8772f 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.6.3"; + version = "3.7.2"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-Ok8DOw+Joy35IqN7sNOQcUWYJS8tqBeQ5/I8fUSly7Q="; + sha256 = "sha256-ftSnlruSv+RtvjTpZPYg9Z2EK4th8NbDhVlG2eIc87s="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 requests unidecode + youtube-dl ]; checkInputs = with python3.pkgs; [ From 4e0d282b7f92ba5d7b46d39068cb01a046d09c05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 14:01:35 +0000 Subject: [PATCH 0976/1522] cargo-criterion: 1.0.1 -> 1.1.0 --- pkgs/development/tools/rust/cargo-criterion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index 38723bbf3c1..d33f455c9b9 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-criterion"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bheisler"; repo = pname; rev = version; - sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg="; + sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoSha256 = "sha256-5Z9Oz8jjyM3+cHAZ++thRDdNlb0Kj54Mg7JjF9JrLdw="; + cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; From 44b0d80303d55c38210785a474e92a7e01e133c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 08:07:13 +0000 Subject: [PATCH 0977/1522] esbuild: 0.12.16 -> 0.12.17 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2802a05f8ad..59e79a6ee19 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.16"; + version = "0.12.17"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk="; + sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From b8315c660b0973ce4d036cb5ce1a2bf419bf5463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 30 Jul 2021 17:00:15 +0200 Subject: [PATCH 0978/1522] coqPackages.QuickChick: add optional version parameter This is the only package in coqPackages for which it was forgotten. --- pkgs/development/coq-modules/QuickChick/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 6490391eb63..3a629421d6b 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,9 +1,10 @@ -{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }: +{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: with lib; let recent = versions.isGe "8.7" coq.coq-version; in mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; + inherit version; defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } From 6c9dba48b115e13b60751f911fde86b7099ee6fd Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 30 Jul 2021 09:04:32 -0600 Subject: [PATCH 0979/1522] heisenbridge: 0.99.1 -> 0.99.8 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 638dba8f56c..2a97d817d9e 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "0.99.1"; + version = "0.99.8"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; rev = "v${version}"; - sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE="; + sha256 = "sha256-NUSAOixU93z77QeVAua6yNk+/eDRreS5Hv1btBWh3gs="; }; propagatedBuildInputs = with python3Packages; [ From 8a2f376b83dc55be7bd196820ebaf9a08417a480 Mon Sep 17 00:00:00 2001 From: hqurve Date: Fri, 30 Jul 2021 11:18:59 -0400 Subject: [PATCH 0980/1522] krunner-symbols: fix license --- pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix index 7a0b6162257..5255bb4b050 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword"; homepage = "https://github.com/domschrei/krunner-symbols"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; }; From 0312e69de4f908ff20f67176d7eaa8849059182a Mon Sep 17 00:00:00 2001 From: hqurve Date: Fri, 30 Jul 2021 11:28:58 -0400 Subject: [PATCH 0981/1522] pdfchain: fix license --- pkgs/tools/typesetting/pdfchain/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/tools/typesetting/pdfchain/default.nix index 09122d60bc0..84ed38b3836 100644 --- a/pkgs/tools/typesetting/pdfchain/default.nix +++ b/pkgs/tools/typesetting/pdfchain/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A graphical user interface for the PDF Toolkit (PDFtk)"; homepage = "https://pdfchain.sourceforge.io"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; }; From 1dcfd1e3298d5415d962e35f53d206b1f5845222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Wygoda?= Date: Fri, 30 Jul 2021 17:41:54 +0200 Subject: [PATCH 0982/1522] nixos/litestream: init --- nixos/modules/module-list.nix | 1 + .../litestream/default.nix | 100 ++++++++++++++++++ .../litestream/litestream.xml | 65 ++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/litestream.nix | 93 ++++++++++++++++ 5 files changed, 260 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/litestream/default.nix create mode 100644 nixos/modules/services/network-filesystems/litestream/litestream.xml create mode 100644 nixos/tests/litestream.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 980e7027c98..fd35dbb83af 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -631,6 +631,7 @@ ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/kbfs.nix ./services/network-filesystems/ipfs.nix + ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs/client.nix diff --git a/nixos/modules/services/network-filesystems/litestream/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix new file mode 100644 index 00000000000..f1806c5af0a --- /dev/null +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.litestream; + settingsFormat = pkgs.formats.yaml {}; +in +{ + options.services.litestream = { + enable = mkEnableOption "litestream"; + + package = mkOption { + description = "Package to use."; + default = pkgs.litestream; + defaultText = "pkgs.litestream"; + type = types.package; + }; + + settings = mkOption { + description = '' + See the documentation. + ''; + type = settingsFormat.type; + example = { + dbs = [ + { + path = "/var/lib/db1"; + replicas = [ + { + url = "s3://mybkt.litestream.io/db1"; + } + ]; + } + ]; + }; + }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/litestream"; + description = '' + Environment file as defined in + systemd.exec5 + . + + Secrets may be passed to the service without adding them to the + world-readable Nix store, by specifying placeholder variables as + the option value in Nix and setting these variables accordingly in the + environment file. + + By default, Litestream will perform environment variable expansion + within the config file before reading it. Any references to ''$VAR or + ''${VAR} formatted variables will be replaced with their environment + variable values. If no value is set then it will be replaced with an + empty string. + + + # Content of the environment file + LITESTREAM_ACCESS_KEY_ID=AKIAxxxxxxxxxxxxxxxx + LITESTREAM_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/xxxxxxxxx + + + Note that this file needs to be available on the host on which + this exporter is running. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + environment.etc = { + "litestream.yml" = { + source = settingsFormat.generate "litestream-config.yaml" cfg.settings; + }; + }; + + systemd.services.litestream = { + description = "Litestream"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = "${cfg.package}/bin/litestream replicate"; + Restart = "always"; + User = "litestream"; + Group = "litestream"; + }; + }; + + users.users.litestream = { + description = "Litestream user"; + group = "litestream"; + isSystemUser = true; + }; + users.groups.litestream = {}; + }; + meta.doc = ./litestream.xml; +} diff --git a/nixos/modules/services/network-filesystems/litestream/litestream.xml b/nixos/modules/services/network-filesystems/litestream/litestream.xml new file mode 100644 index 00000000000..598f9be8cf6 --- /dev/null +++ b/nixos/modules/services/network-filesystems/litestream/litestream.xml @@ -0,0 +1,65 @@ + + Litestream + + Litestream is a standalone streaming + replication tool for SQLite. + + +
+ Configuration + + + Litestream service is managed by a dedicated user named litestream + which needs permission to the database file. Here's an example config which gives + required permissions to access + grafana database: + +{ pkgs, ... }: +{ + users.users.litestream.extraGroups = [ "grafana" ]; + + systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" '' + timeout=10 + + while [ ! -f /var/lib/grafana/data/grafana.db ]; + do + if [ "$timeout" == 0 ]; then + echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db." + exit 1 + fi + + sleep 1 + + ((timeout--)) + done + + find /var/lib/grafana -type d -exec chmod -v 775 {} \; + find /var/lib/grafana -type f -exec chmod -v 660 {} \; + ''; + + services.litestream = { + enable = true; + + environmentFile = "/run/secrets/litestream"; + + settings = { + dbs = [ + { + path = "/var/lib/grafana/data/grafana.db"; + replicas = [{ + url = "s3://mybkt.litestream.io/grafana"; + }]; + } + ]; + }; + }; +} + + +
+ +
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 74160673214..9eeb36b0975 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -224,6 +224,7 @@ in libreswan = handleTest ./libreswan.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; + litestream = handleTest ./litestream.nix {}; locate = handleTest ./locate.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; diff --git a/nixos/tests/litestream.nix b/nixos/tests/litestream.nix new file mode 100644 index 00000000000..886fbfef9cf --- /dev/null +++ b/nixos/tests/litestream.nix @@ -0,0 +1,93 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "litestream"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jwygoda ]; + }; + + machine = + { pkgs, ... }: + { services.litestream = { + enable = true; + settings = { + dbs = [ + { + path = "/var/lib/grafana/data/grafana.db"; + replicas = [{ + url = "sftp://foo:bar@127.0.0.1:22/home/foo/grafana"; + }]; + } + ]; + }; + }; + systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" '' + timeout=10 + + while [ ! -f /var/lib/grafana/data/grafana.db ]; + do + if [ "$timeout" == 0 ]; then + echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db." + exit 1 + fi + + sleep 1 + + ((timeout--)) + done + + find /var/lib/grafana -type d -exec chmod -v 775 {} \; + find /var/lib/grafana -type f -exec chmod -v 660 {} \; + ''; + services.openssh = { + enable = true; + allowSFTP = true; + listenAddresses = [ { addr = "127.0.0.1"; port = 22; } ]; + }; + services.grafana = { + enable = true; + security = { + adminUser = "admin"; + adminPassword = "admin"; + }; + addr = "localhost"; + port = 3000; + extraOptions = { + DATABASE_URL = "sqlite3:///var/lib/grafana/data/grafana.db?cache=private&mode=rwc&_journal_mode=WAL"; + }; + }; + users.users.foo = { + isNormalUser = true; + password = "bar"; + }; + users.users.litestream.extraGroups = [ "grafana" ]; + }; + + testScript = '' + start_all() + machine.wait_until_succeeds("test -d /home/foo/grafana") + machine.wait_for_open_port(3000) + machine.succeed(""" + curl -sSfN -X PUT -H "Content-Type: application/json" -d '{ + "oldPassword": "admin", + "newPassword": "newpass", + "confirmNew": "newpass" + }' http://admin:admin@127.0.0.1:3000/api/user/password + """) + # https://litestream.io/guides/systemd/#simulating-a-disaster + machine.systemctl("stop litestream.service") + machine.succeed( + "rm -f /var/lib/grafana/data/grafana.db " + "/var/lib/grafana/data/grafana.db-shm " + "/var/lib/grafana/data/grafana.db-wal" + ) + machine.succeed( + "litestream restore /var/lib/grafana/data/grafana.db " + "&& chown grafana:grafana /var/lib/grafana/data/grafana.db " + "&& chmod 660 /var/lib/grafana/data/grafana.db" + ) + machine.systemctl("restart grafana.service") + machine.wait_for_open_port(3000) + machine.succeed( + "curl -sSfN -u admin:newpass http://127.0.0.1:3000/api/org/users | grep admin\@localhost" + ) + ''; +}) From 89e43d4739cb7d6a302631132135acb1fa631852 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri, 30 Jul 2021 23:25:03 +0800 Subject: [PATCH 0983/1522] less: 581.2 -> 590 --- pkgs/tools/misc/less/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index d63861ace33..9c5a4b1568b 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "581.2"; + version = "590"; src = fetchurl { url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0fyqslvrasv19qjvqrwfwz2n7mnm93y61x9bcx09ga90mxyb8d6f"; + sha256 = "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ eelco dtzWill ]; }; } From 5d0f0a980ae732184cbe387a48d660fed0b54578 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 10:19:52 -0700 Subject: [PATCH 0984/1522] linux_xanmod: 5.13.5 -> 5.13.6 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 701f5d3b104..f86134264f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,9 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.5"; - suffix = "xanmod1-cacule"; + version = "5.13.6"; + release = "2"; + suffix = "xanmod${release}-cacule"; in buildLinux (args // rec { inherit version; @@ -12,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g="; + sha256 = "sha256-sSsCgDBDFiQADHE+ZRqrMKVyGDwynirPU3NA2Olgpko="; }; structuredExtraConfig = with lib.kernel; { From 0ddbf92e95b705633d8edc577e019febb130a4d8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 30 Jul 2021 14:32:56 -0300 Subject: [PATCH 0985/1522] algol68g: Trivial fix in patch --- .../compilers/algol68g/0001-plotutils-png-support.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff index beb3cb1c8bb..14e7ccd5624 100644 --- a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff +++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff @@ -9,7 +9,7 @@ diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotu -/*------------------------------------+ -| Supported plotter type - pseudo GIF | -+------------------------------------*/ -+ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "gif")) { ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { +/*-------------------------------------------+ +| Supported plotter type - pseudo GIF or PNG | ++-------------------------------------------*/ From 2293303660461756a2003fe25c4dc8b9de3bac31 Mon Sep 17 00:00:00 2001 From: pmenke Date: Fri, 30 Jul 2021 18:20:24 +0200 Subject: [PATCH 0986/1522] soapysdr: 0.8.0 -> 0.8.1 --- pkgs/applications/radio/soapysdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index ccd4b8799ce..c6335b51c41 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -8,7 +8,7 @@ let - version = "0.8.0"; + version = "0.8.1"; modulesVersion = with lib; versions.major version + "." + versions.minor version; modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "1dy25zxk7wmg7ik82dx7h3bbbynvalbz1dxsl7kgm3374yxhnixv"; + sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; }; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; From e2d5af502a68269a30c9f73c1d6857c268909e1f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 13:48:38 -0400 Subject: [PATCH 0987/1522] lib/systems/platforms: armv7l-hf-multiplatform: fix kernel build autoModules triggers a build system bug where ks8851_mll needs to be built-in if ks8851 is also built-in. --- lib/systems/platforms.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 92285346f75..d7efe84e2b8 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -315,6 +315,12 @@ rec { # Disable OABI to have seccomp_filter (required for systemd) # https://github.com/raspberrypi/firmware/issues/651 OABI_COMPAT n + + # >=5.12 fails with: + # drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common': + # ks8851_common.c:(.text+0x179c): undefined reference to `__this_module' + # See: https://lore.kernel.org/netdev/20210116164828.40545-1-marex@denx.de/T/ + KS8851_MLL y ''; }; gcc = { From d956de3b62620b58ec5040a951fbd52acea492ca Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 30 Jul 2021 19:57:59 +0100 Subject: [PATCH 0988/1522] profile-cleaner: 2.41 -> 2.42 --- pkgs/tools/misc/profile-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 59bbe2c2ab1..0a50ff49f65 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { - version = "2.41"; + version = "2.42"; pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; + sha256 = "1d94lp91i4y896vyc7fc3ysha700cwzsdjmmmwlm6h2zp652c73y"; }; nativeBuildInputs = [ makeWrapper ]; From 14bcebe82882e4bc2c71c95da4fce1c9d1651575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 30 Jul 2021 14:11:59 -0500 Subject: [PATCH 0989/1522] =?UTF-8?q?scalafmt:=202.6.4=20=E2=86=92=202.7.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0565127f8d0..c440c83a80e 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.6.4"; + version = "2.7.5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw"; + outputHash = "1xvx9bd6lf9m1r5p05d37qnjlzny6xrbkh8m7z4q4rk7i1vl8xv0"; }; in stdenv.mkDerivation { From 42bfc113569c242947b7a0f6edf94031fbb8bac5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 30 Jul 2021 20:17:46 +0100 Subject: [PATCH 0990/1522] python3Packages.tensorflow: add patch fixing NotImplementedError with numpy 1.20 see upstream pr https://github.com/tensorflow/tensorflow/pull/47957 --- pkgs/development/python-modules/tensorflow/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e87c8aca40e..c077265bf63 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,5 +1,5 @@ { stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath +, addOpenGLRunpath, fetchpatch # Python deps , buildPythonPackage, pythonOlder, pythonAtLeast, python # Python libraries @@ -114,6 +114,12 @@ let }; patches = [ + # included from 2.6.0 onwards + (fetchpatch { + name = "fix-numpy-1.20-notimplementederror.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/b258941525f496763d4277045b6513c815720e3a.patch"; + sha256 = "19f9bzrcfsynk11s2hqvscin5c65zf7r6g3nb10jnimw79vafiry"; + }) # Relax too strict Python packages versions dependencies. ./relax-dependencies.patch # Add missing `io_bazel_rules_docker` dependency. From 988c12faed96159fd5902f3bc372739c111206ef Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 15:12:46 -0400 Subject: [PATCH 0991/1522] linux/common-config.nix: disable LPAE on armv7l-linux LPAE was enabled to support native armv7l builders running in QEMU on aarch64, but this option disables support for processors which don't support LPAE, which are still relatively common. In particular, Beaglebones use the Cortex-A8, which doesn't support LPAE. Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it, it fails before even earlycon is initialized. This makes the problem difficult to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fce451ee889..3fec8d38ac9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -880,8 +880,6 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; - } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") { - ARM_LPAE = yes; }; }; in From eb7120dc79966d5ed168321fd213de38de13a2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 22 Jul 2021 17:38:31 +0200 Subject: [PATCH 0992/1522] nixos/etc: Replace make-etc.sh with nix and bash The main goal of this commit is to replace the rather fragile passing of multiple arrays which could break in cases like #130935. While I could have just added proper shell escaping to the variables being passed, I opted for the more painful approach of replacing the fragile and somewhat strange construct with the 5 bash lists. While there are currently no more problems present with the current approach (at least none that I know of), the new approach seems more solid and might get around problems that could arise in the future stemming from either the multiple-lists situation or from the absence of proper shell quoting all over the script. --- nixos/modules/system/boot/systemd.nix | 2 +- nixos/modules/system/etc/etc.nix | 64 ++++++++++++++++++++++----- nixos/modules/system/etc/make-etc.sh | 45 ------------------- 3 files changed, 53 insertions(+), 58 deletions(-) delete mode 100644 nixos/modules/system/etc/make-etc.sh diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index abd8ab29cae..e1909775926 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1045,7 +1045,7 @@ in done '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' rm -f $out/${removePrefix "tmpfiles.d/" name} - '') config.system.build.etc.targets; + '') config.system.build.etc.passthru.targets; }) + "/*"; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index a450f303572..183de729210 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,21 +8,61 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.stdenvNoCC.mkDerivation { - name = "etc"; - - builder = ./make-etc.sh; - + etc = pkgs.runCommand "etc" { preferLocalBuild = true; allowSubstitutes = false; - /* !!! Use toXML. */ - sources = map (x: x.source) etc'; - targets = map (x: x.target) etc'; - modes = map (x: x.mode) etc'; - users = map (x: x.user) etc'; - groups = map (x: x.group) etc'; - }; + # This is needed for the systemd module + passthru.targets = map (x: x.target) etc'; + } /* sh */ '' + set -euo pipefail + + makeEtcEntry() { + src="$1" + target="$2" + mode="$3" + user="$4" + group="$5" + + if [[ "$src" = *'*'* ]]; then + # If the source name contains '*', perform globbing. + mkdir -p "$out/etc/$target" + for fn in $src; do + ln -s "$fn" "$out/etc/$target/" + done + else + + mkdir -p "$out/etc/$(dirname "$target")" + if ! [ -e "$out/etc/$target" ]; then + ln -s "$src" "$out/etc/$target" + else + echo "duplicate entry $target -> $src" + if [ "$(readlink "$out/etc/$target")" != "$src" ]; then + echo "mismatched duplicate entry $(readlink "$out/etc/$target") <-> $src" + ret=1 + + continue + fi + fi + + if [ "$mode" != symlink ]; then + echo "$mode" > "$out/etc/$target.mode" + echo "$user" > "$out/etc/$target.uid" + echo "$group" > "$out/etc/$target.gid" + fi + fi + } + + mkdir -p "$out/etc" + ${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [ + "makeEtcEntry" + etcEntry.source + etcEntry.target + etcEntry.mode + etcEntry.user + etcEntry.group + ]) etc'} + ''; in diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh deleted file mode 100644 index aabfb5e88a6..00000000000 --- a/nixos/modules/system/etc/make-etc.sh +++ /dev/null @@ -1,45 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/etc - -set -f -sources_=($sources) -targets_=($targets) -modes_=($modes) -users_=($users) -groups_=($groups) -set +f - -for ((i = 0; i < ${#targets_[@]}; i++)); do - source="${sources_[$i]}" - target="${targets_[$i]}" - - if [[ "$source" =~ '*' ]]; then - - # If the source name contains '*', perform globbing. - mkdir -p $out/etc/$target - for fn in $source; do - ln -s "$fn" $out/etc/$target/ - done - - else - - mkdir -p $out/etc/$(dirname $target) - if ! [ -e $out/etc/$target ]; then - ln -s $source $out/etc/$target - else - echo "duplicate entry $target -> $source" - if test "$(readlink $out/etc/$target)" != "$source"; then - echo "mismatched duplicate entry $(readlink $out/etc/$target) <-> $source" - exit 1 - fi - fi - - if test "${modes_[$i]}" != symlink; then - echo "${modes_[$i]}" > $out/etc/$target.mode - echo "${users_[$i]}" > $out/etc/$target.uid - echo "${groups_[$i]}" > $out/etc/$target.gid - fi - - fi -done From c8de54957257a810ed019c883f5bdd9e2fc0fe47 Mon Sep 17 00:00:00 2001 From: Greizgh Date: Fri, 30 Jul 2021 22:40:03 +0200 Subject: [PATCH 0993/1522] chirp: 20200807 -> 20210724 --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index e9b446dc584..2e4b3b30d22 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200807"; + version = "20210724"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; + sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb"; }; propagatedBuildInputs = with python2.pkgs; [ From ecead7ce510fa177275f9d8521a7431efc6fa688 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:04:02 +0200 Subject: [PATCH 0994/1522] metasploit: 6.0.54 -> 6.0.55 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 30 +++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 34 ++++++++++----------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 5fa9ad3b4d6..d9ca1bb29a8 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.54" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.55" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index e23841b82a5..eb3c1b2ee0d 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398 - ref: refs/tags/6.0.54 + revision: bdf054bcc84e23bba81c387cc9247bf3c4052afb + ref: refs/tags/6.0.55 specs: - metasploit-framework (6.0.54) + metasploit-framework (6.0.55) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -127,23 +127,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-core (3.117.0) + aws-partitions (1.482.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.4) @@ -279,7 +279,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -416,4 +416,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6bee3ddf81c..c0a4d585747 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.54"; + version = "6.0.55"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o="; + sha256 = "sha256-Wf6Aj/mYHs7KdAYWjNzoD+Q5xK9DOsPiRTIEY7lac8M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e1ebae7da23..0295e7a5c6f 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh"; + sha256 = "14l1w0ka4r54rx18c856dpn5dg1fnqlriiscjj89ap6vzg8r5pl4"; type = "gem"; }; - version = "1.479.0"; + version = "1.482.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax"; + sha256 = "1azyn5hj41q1r9wcr0k12xb9j3v1v9ikyxnzjpizhsla44lg3270"; type = "gem"; }; - version = "3.117.0"; + version = "3.119.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7"; + sha256 = "1i06ml61fr7qlxfbi98dg4lg40skjj5abfpz60jx7ml5dma13qma"; type = "gem"; }; - version = "1.251.0"; + version = "1.254.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y"; + sha256 = "16am0mpagfzi5n6gsnd4yyiwy8ni312b3kxswq0jvr3wh8ab0r5h"; type = "gem"; }; - version = "1.57.0"; + version = "1.59.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm"; + sha256 = "0h70lz5pblw0sy82j6kv4q4d8h2rb1p6v650kaq8lh6iyjc6il9a"; type = "gem"; }; - version = "1.44.0"; + version = "1.46.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw"; + sha256 = "0799n1j8cxcn79k5zhy8vcpbh4q8vyi1fxqqs20sxh7yhyhrybw9"; type = "gem"; }; - version = "1.96.2"; + version = "1.98.0"; }; aws-sigv4 = { groups = ["default"]; @@ -594,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398"; - sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202"; + rev = "bdf054bcc84e23bba81c387cc9247bf3c4052afb"; + sha256 = "1hvkbawn611j8pic6fj3mz23kr0gx3f8q5h6fk5cw7lqz67q1zjr"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.54"; + version = "6.0.55"; }; metasploit-model = { groups = ["default"]; @@ -886,10 +886,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; + sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; type = "gem"; }; - version = "5.3.2"; + version = "5.4.0"; }; racc = { groups = ["default"]; From 61c966595a2fd5944c2a1b1b90bf7a09e0e09eda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:09:19 +0200 Subject: [PATCH 0995/1522] python3Packages.motioneye-client: 0.3.10 -> 0.3.11 --- pkgs/development/python-modules/motioneye-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index a7981feb205..35632e780e7 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.10"; + version = "0.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "0ilh9wfzggnbfz068vkz66g64ar6isl3m2vcp7jf2zbaj0bqsjax"; + sha256 = "0f34ig8njyn7dzy8272m0b1nlnnhir58ar3vx4zps10i0dc32hb2"; }; nativeBuildInputs = [ From 60587b92d1a3412b41eee2304d8446e2503aedc1 Mon Sep 17 00:00:00 2001 From: Jacob Vallejo Date: Fri, 30 Jul 2021 14:14:15 -0700 Subject: [PATCH 0996/1522] ripcord: 0.4.28 -> 0.4.29 Signed-off-by: Jacob Vallejo --- .../networking/instant-messengers/ripcord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index dbcd447d156..76f93d9d217 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.28"; + version = "0.4.29"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv"; + sha256 = "sha256-4yDLPEBDsPKWtLwdpmSyl3b5XCwLAr2/EVtNRrFmmJk="; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { From 56ca1d12a5d8c779e55457e08cbfd83e384b27fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:21:26 +0200 Subject: [PATCH 0997/1522] python3Packages.pywemo: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/pywemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index ad2574bd86c..80d69a04333 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.6.5"; + version = "0.6.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA="; + sha256 = "04h4av65x0a2iv3a4rpsq19m9pi7wk8j447rr5z7jwap870gs8nd"; }; nativeBuildInputs = [ From 1a68ddfc242d49b3117436f0b0f435150a7a4e33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:38:47 +0200 Subject: [PATCH 0998/1522] python3Packages.hap-python: 3.5.2 -> 4.0.0 --- pkgs/development/python-modules/hap-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index c4811677655..e48826eae9f 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.2"; + version = "4.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd"; + sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; }; propagatedBuildInputs = [ From 20da7e698283cb15f02ce9d4ad724ad6ee64ea0f Mon Sep 17 00:00:00 2001 From: Josh Moller-Mara Date: Fri, 30 Jul 2021 14:42:15 -0700 Subject: [PATCH 0999/1522] obs-studio-plugins.obs-websocket: fix attribute name obs-websocket.nix existed, but no attribute was made for it. --- pkgs/applications/video/obs-studio/plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index ef360487a6b..67425e2fee0 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -5,6 +5,7 @@ obs-move-transition = callPackage ./obs-move-transition.nix {}; obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {}; obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {}; + obs-websocket = libsForQt5.callPackage ./obs-websocket.nix {}; wlrobs = callPackage ./wlrobs.nix {}; looking-glass-obs = callPackage ./looking-glass-obs.nix {}; } From 4de3b8f551c40ae1068c30ac4fd243869f22a919 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:46:42 +0200 Subject: [PATCH 1000/1522] python3Packages.iaqualink: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/iaqualink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 223f3893e18..5806104d419 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iaqualink"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; rev = "v${version}"; - sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw"; + sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq"; }; nativeBuildInputs = [ pytest-runner ]; From bd8eeec9c0e8993c82ad8441867a5ea3fd0a87df Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 22 Jul 2021 07:39:18 +0300 Subject: [PATCH 1001/1522] {uptimed,nixos/uptimed}: switch to /var/lib/ and fix perms --- .../manual/from_md/release-notes/rl-2111.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/system/uptimed.nix | 10 +++++++--- pkgs/tools/system/uptimed/default.nix | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index de2cd7bef6d..edc6b5c50d0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -596,6 +596,14 @@ + + + services.uptimed now uses + /var/lib/uptimed as its stateDirectory + instead of /var/spool/uptimed. Make sure to + move all files to the new directory. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1ce78a4d774..d49d6af26a5 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -151,6 +151,8 @@ pt-services.clipcat.enable). - `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer` - `golang.Go` -> `golang.go` +- `services.uptimed` now uses `/var/lib/uptimed` as its stateDirectory instead of `/var/spool/uptimed`. Make sure to move all files to the new directory. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 1e256c51408..67a03876e19 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.uptimed; - stateDir = "/var/spool/uptimed"; + stateDir = "/var/lib/uptimed"; in { options = { @@ -21,12 +21,16 @@ in }; config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.uptimed ]; + users.users.uptimed = { description = "Uptimed daemon user"; home = stateDir; - createHome = true; uid = config.ids.uids.uptimed; + group = "uptimed"; }; + users.groups.uptimed = {}; systemd.services.uptimed = { unitConfig.Documentation = "man:uptimed(8) man:uprecords(1)"; @@ -41,7 +45,7 @@ in PrivateTmp = "yes"; PrivateNetwork = "yes"; NoNewPrivileges = "yes"; - ReadWriteDirectories = stateDir; + StateDirectory = [ "uptimed" ]; InaccessibleDirectories = "/home"; ExecStart = "${pkgs.uptimed}/sbin/uptimed -f -p ${stateDir}/pid"; }; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 5d0d49f198e..ac991436f53 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; patches = [ ./no-var-spool-install.patch ]; + postPatch = '' + substituteInPlace libuptimed/urec.h \ + --replace /var/spool /var/lib + ''; + meta = with lib; { description = "Uptime record daemon"; longDescription = '' From 531cd69bcd63d79023730d59fc9c3f72d921a456 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 22:19:22 +0000 Subject: [PATCH 1002/1522] free42: 3.0.5 -> 3.0.6 --- pkgs/applications/misc/free42/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 2dd70acb9a7..0aae4ab3baf 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc="; + sha256 = "sha256-PIHokB7GlGtx1A0IqFX9+HA/Vab1CDpVS/qhk/y8Nzk="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; From bc32030066d09589203afa751cfe23d4a81e4eab Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:00:41 +0300 Subject: [PATCH 1003/1522] easyeffects: 6.0.0 -> 6.0.3 --- pkgs/applications/audio/easyeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ee4d16d6b36..1e85d57c3f7 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.0.0"; + version = "6.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch"; + sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg="; }; nativeBuildInputs = [ From a7f41de6bafc95088f8e5cc4d5ec872cffea5d10 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:17:43 +0300 Subject: [PATCH 1004/1522] libfilezilla: 0.27.0 -> 0.30.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index c7d84d9d8af..8107ff3c98e 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs="; + sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 55c1dc095e8d551c889bc8a4f72abca29468e89b Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:18:45 +0300 Subject: [PATCH 1005/1522] filezilla: 3.53.1 -> 3.55.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5472782758c..56dd02e9786 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.53.1"; + version = "3.55.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-ZWh08ursVGcscvQepeoUnFAZfFDeXWdIu0HXIr/D93k="; + sha256 = "sha256-rnDrQYDRNr4pu61vzdGI5JfiBfxBbqPkE9znzYyrnII="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 From fea6f5cd190790dbc2c77f65582e4b0e3385178a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 30 Jul 2021 16:57:28 -0600 Subject: [PATCH 1006/1522] yubikey-manager: 4.0.3 -> 4.0.5 --- pkgs/tools/misc/yubikey-manager/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index ed4f76fa627..cf2226cad54 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,15 +1,20 @@ -{ python3Packages, fetchurl, lib, - yubikey-personalization, libu2f-host, libusb1 }: +{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1 }: python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.3"; + version = "4.0.5"; - srcs = fetchurl { - url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ="; + src = fetchFromGitHub { + repo = "yubikey-manager"; + rev = version; + owner = "Yubico"; + sha256 = "sha256:0ycp7k6lkxzqwkc16fifhyqaqi7hl3351pwddsn18r5l83jnzdn2"; }; + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ click From a995595c5244d389e03b544e26212271879e47c1 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:41:01 +0300 Subject: [PATCH 1007/1522] jitsi-meet-electron: 2.8.8 -> 2.8.9 --- .../instant-messengers/jitsi-meet-electron/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index b932e699ac6..a80e65482f0 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,20 +2,20 @@ , fetchurl , appimageTools , makeWrapper -, electron_12 +, electron_13 , xorg }: let - electron = electron_12; + electron = electron_13; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-ORj0xSFzdyOVuybaDyTrawsVkJymKEHLbFxGUgzXNWY="; + sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E="; name = "${pname}-${version}.AppImage"; }; From 79bb3ad9047901e121669ac95172546bafbca543 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 16:50:18 -0700 Subject: [PATCH 1008/1522] rpiboot-unstable: unstable-2020-10-20 -> 2021.07.01 --- pkgs/development/misc/rpiboot/unstable.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index d0cb663fb74..941c7ce904e 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libusb1 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rpiboot"; - version = "unstable-2020-10-20"; + version = "2021.07.01"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "d3760e119385a179765f43a50a8e051a44127c25"; - sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r"; + rev = "v${version}"; + sha256 = "sha256-BkNyYCrasfiRs7CbJa7tCo2k70TLGcXkOX+zGPyZGGE="; }; nativeBuildInputs = [ libusb1 ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; - description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; + description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; license = licenses.asl20; maintainers = with maintainers; [ cartr ]; platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; From 1a182deb8c3c656a14875c6a56c710ae640c41a2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 16:50:30 -0700 Subject: [PATCH 1009/1522] rpiboot-unstable -> rpiboot --- pkgs/development/misc/rpiboot/{unstable.nix => default.nix} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/misc/rpiboot/{unstable.nix => default.nix} (100%) diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/default.nix similarity index 100% rename from pkgs/development/misc/rpiboot/unstable.nix rename to pkgs/development/misc/rpiboot/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85a63f37802..d50316d2a40 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -711,6 +711,7 @@ mapAliases ({ radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 + rpiboot-unstable = rpiboot; # added 2021-07-30 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb15..eaec5e11d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8567,7 +8567,7 @@ in rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; - rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; + rpiboot = callPackage ../development/misc/rpiboot { }; rpm = callPackage ../tools/package-management/rpm { python = python3; From 6463828755b6a03f6af7e549216bef837b03b3e1 Mon Sep 17 00:00:00 2001 From: Artturi Date: Sat, 31 Jul 2021 03:40:22 +0300 Subject: [PATCH 1010/1522] openmw: add wrapQtAppsHook (#132131) dontWrapQtApps was blanket added in 5590e365e4775f138610b1036a75f8886921843e --- pkgs/games/openmw/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8e6ed3cdb82..cfde63ac726 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, wrapQtAppsHook , openscenegraph , mygui , bullet @@ -37,7 +38,7 @@ mkDerivation rec { sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 @@ -57,8 +58,6 @@ mkDerivation rec { "-DOpenGL_GL_PREFERENCE=LEGACY" ]; - dontWrapQtApps = true; - meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; From 876513113b420f7134b1a3d07463bd343576eb8c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 24 Jun 2021 12:02:32 -0400 Subject: [PATCH 1011/1522] builbot: add updateScript --- pkgs/development/python-modules/buildbot/default.nix | 1 + pkgs/development/python-modules/buildbot/update.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100755 pkgs/development/python-modules/buildbot/update.sh diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 8d8e5ec00dc..c242a2eaaa8 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -97,6 +97,7 @@ let passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/development/python-modules/buildbot/update.sh b/pkgs/development/python-modules/buildbot/update.sh new file mode 100755 index 00000000000..3406f05db3e --- /dev/null +++ b/pkgs/development/python-modules/buildbot/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update +set -eu -o pipefail + +nix-update python3Packages.buildbot +nix-update --version=skip python3Packages.buildbot-worker +nix-update --version=skip python3Packages.buildbot-pkg +nix-update --version=skip python3Packages.buildbot-plugins.www +nix-update --version=skip python3Packages.buildbot-plugins.console-view +nix-update --version=skip python3Packages.buildbot-plugins.waterfall-view +nix-update --version=skip python3Packages.buildbot-plugins.grid-view +nix-update --version=skip python3Packages.buildbot-plugins.wsgi-dashboards From 906997c95bf1cc9a3330234ed5c46b79964f0de4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 24 Jun 2021 12:06:41 -0400 Subject: [PATCH 1012/1522] buildbot: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c242a2eaaa8..f6405e1b68d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -26,11 +26,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; + sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index b00a2ece568..94cca457b9c 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6"; + sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 62f32a00fb4..f01967337a1 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c"; + sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1"; + sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86"; + sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b"; + sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy"; + sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4313d16d0b7..f873eeee98a 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m"; + sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo="; }; propagatedBuildInputs = [ twisted future ]; From b4ce66c0bbd37c1bc53bc9a5e048031cd21aca90 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 22:46:57 -0400 Subject: [PATCH 1013/1522] buildbot: fix compatibility with SQLAlchemy 1.4 --- .../python-modules/buildbot/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index f6405e1b68d..de34be979f3 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k , python, twisted, jinja2, zope_interface, sqlalchemy , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial @@ -78,6 +78,19 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + # Fix compatibility with SQLAlchemy 1.4 + (fetchpatch { + url = "https://github.com/buildbot/buildbot/pull/6156.patch"; + sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my"; + stripLen = 1; + excludes = [ + ".bbtravis.yml" + "buildbot/test/unit/db/test_enginestrategy.py" + "buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py" + "requirements-ci.txt" + "requirements-cidb.txt" + ]; + }) ]; postPatch = '' From a3a0a6edc2a1d45a978394ba51ef59f3ca72bb00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 03:42:57 +0000 Subject: [PATCH 1014/1522] i3status-rust: 0.20.2 -> 0.20.3 --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index fe0cde61c6f..d9d4df4c00f 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PXvQrh0gmn/G+b7sbQffQkPnUKu1eVrvUoJlRBsOEM="; + sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g="; }; - cargoSha256 = "sha256-6orDR2Ml1Fy20uT47EDkEk0rGFxO0djHZsFiqlS1Tk8="; + cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54="; nativeBuildInputs = [ pkg-config makeWrapper ]; From c8ff5bc6f74a2960fab5ae417cd2bb055eab1002 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 30 Jul 2021 20:19:16 -0700 Subject: [PATCH 1015/1522] coqPackages.category-theory: v20210730, for Coq versions 8.10-8.13 --- pkgs/development/coq-modules/category-theory/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 339bcb9d6b0..d24cf147930 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -5,6 +5,8 @@ with lib; mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; + release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af"; + release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f"; release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; release."20190414".sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; release."20180709".rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; @@ -12,6 +14,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "20210730"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; From f4491a0f38b0d8b591c7e35adcf19bc552664a52 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sat, 31 Jul 2021 14:17:45 +0800 Subject: [PATCH 1016/1522] archiver: add meta.mainProgram --- pkgs/applications/misc/archiver/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 1691ab07361..4d46047bb96 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; homepage = "https://github.com/mholt/archiver"; + mainProgram = "arc"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; From f5b0f06a5da43e7ff72a4b4a01c13a89fc67912b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 31 Jul 2021 03:34:18 -0300 Subject: [PATCH 1017/1522] yabasic: 2.89.1 -> 2.90.1 --- pkgs/development/interpreters/yabasic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 414171082e3..02d3dbeb9fd 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.89.1"; + version = "2.90.1"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg="; + hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.yabasic.de/"; + homepage = "http://2484.de/yabasic/"; description = "Yet another BASIC"; longDescription = '' Yabasic is a traditional basic-interpreter. It comes with goto and various From 95f1154f993bc788bad7df1feed1b98c7e7381cb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 31 Jul 2021 14:31:23 +0700 Subject: [PATCH 1018/1522] coqPackages.interval: 4.1.1 -> 4.3.0 (#131818) --- pkgs/development/coq-modules/interval/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index cdb90452365..82d88b4a62e 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,16 +1,18 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: -with lib; mkCoqDerivation { +with lib; mkCoqDerivation rec { pname = "interval"; owner = "coqinterval"; domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.8" ; out = "4.1.1"; } + { case = isGe "8.8" ; out = "4.3.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; + release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp"; release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0"; @@ -18,8 +20,11 @@ with lib; mkCoqDerivation { releaseRev = v: "interval-${v}"; nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ]; + propagatedBuildInputs = [ bignums coquelicot flocq ] + ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; + mlPlugin = true; + enableParallelBuilding = true; meta = with lib; { description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; From 99cea37cd52b2ef72e75c220c5378f5f02034584 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 10:05:50 +0200 Subject: [PATCH 1019/1522] tfsec: 0.52.1 -> 0.55.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 570054a3686..45ba1223e84 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.52.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay"; + sha256 = "1l71r9il45svdwydvi08hnyh310j0gha11qhyqvdz14d8czf8ahn"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 809562692ce929a2014ba35034975a295030211c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 10:19:21 +0200 Subject: [PATCH 1020/1522] python3Packages.praw: 7.3.0 -> 7.4.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index e104dbff4f6..1196a6575da 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; + sha256 = "1wcr59k1bncwfza5k8mllaxz8fwfyqbwgm5xp908w2449i71wl7r"; }; propagatedBuildInputs = [ From 088b985a714d46d7fa09191173450120e42747d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 19:08:59 +0000 Subject: [PATCH 1021/1522] erlang: 24.0.4 -> 24.0.5 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index b4e9ebba797..8d1d114e12c 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.4"; - sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM="; + version = "24.0.5"; + sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q="; } From 66b3e4a71f2d487b7bdee020e8431d657d835a24 Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 28 Jul 2021 20:38:05 +0200 Subject: [PATCH 1022/1522] maintainers: add yayayayaka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c2469d7211..2e9e546005b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11692,6 +11692,12 @@ githubId = 3705333; name = "Dmitry V."; }; + yayayayaka = { + email = "nixpkgs@uwu.is"; + github = "yayayayaka"; + githubId = 73759599; + name = "Lara A."; + }; yegortimoshenko = { email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; From 2cb0107550a9c40664cf423931ff8adeb3b1000f Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 28 Jul 2021 16:59:08 +0000 Subject: [PATCH 1023/1522] arch-install-scripts: init at 24 --- .../misc/arch-install-scripts/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/tools/misc/arch-install-scripts/default.nix diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix new file mode 100644 index 00000000000..0b6984526e4 --- /dev/null +++ b/pkgs/tools/misc/arch-install-scripts/default.nix @@ -0,0 +1,68 @@ +{ lib +, resholvePackage +, fetchFromGitHub +, asciidoc +, bash +, coreutils +, gawk +, gnum4 +, testVersion +, util-linux +}: + +resholvePackage rec { + pname = "arch-install-scripts"; + version = "24"; + + src = fetchFromGitHub { + owner = "archlinux"; + repo = "arch-install-scripts"; + rev = "v${version}"; + sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq"; + }; + + nativeBuildInputs = [ asciidoc gnum4 ]; + + preBuild = '' + substituteInPlace ./Makefile \ + --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" + + # https://github.com/archlinux/arch-install-scripts/pull/10 + substituteInPlace ./common \ + --replace "print '%s' \"\$1\"" "printf '%s' \"\$1\"" + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + solutions = { + # Give each solution a short name. This is what you'd use to + # override its settings, and it shows in (some) error messages. + profile = { + # the only *required* arguments are the 3 below + + # Specify 1 or more $out-relative script paths. Unlike many + # builders, resholvePackage modifies the output files during + # fixup (to correctly resolve in-package sourcing). + scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ]; + + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. + interpreter = "${bash}/bin/bash"; + + # packages resholve should resolve executables from + inputs = [ coreutils gawk util-linux ]; + }; + }; + + meta = with lib; { + description = "Useful scripts for installing Arch Linux"; + longDescription = '' + A small suite of scripts aimed at automating some menial tasks when installing Arch Linux. + ''; + homepage = "https://github.com/archlinux/arch-install-scripts"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ yayayayaka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaec5e11d81..c1b3d8d17dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -870,6 +870,8 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; + arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + auditwheel = callPackage ../tools/package-management/auditwheel { }; amidst = callPackage ../tools/games/minecraft/amidst { }; From cf3dcef38b69f7c02847ab35b38b03be4a81010e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 16:11:56 +0000 Subject: [PATCH 1024/1522] cargo-release: 0.16.0 -> 0.16.2 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index aeb18f2efde..6b4e450a70c 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA="; + sha256 = "sha256-o3AKA/uP6VWMO4c62H3ey0P98KIhbzhnng5ggKjNeZ8="; }; - cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo="; + cargoSha256 = "sha256-SHLiUVH5LiQNd/Ipj/xrjSG0X2HXfcAwswqsbqweJBs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From d55bba14daa28dc4df9014a1f2774cab998b82a4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 31 Jul 2021 11:42:52 +0900 Subject: [PATCH 1025/1522] wrangler: 1.18.0 -> 1.19.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index b26d5a8a9db..55c2d3139e9 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg="; + sha256 = "sha256-z6fL2uvv8E6NDBbbQKZ2Xhc6PI+e0Zl6mUvxIRhduH0="; }; - cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI="; + cargoSha256 = "sha256-xGoOVp0Pt6cpCBK8IkyFCIcBNucDo98o3f7T3TQQhZY="; nativeBuildInputs = [ pkg-config ]; From e721776cbbaeedf7d7da434fba5845f2d81685b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:04:52 +0000 Subject: [PATCH 1026/1522] Revert "notmuch: skip T568-lib-thread" This reverts commit a4380866507afa5899cf0f1e05f0a7179145d3cf. > This should be fixed in commit a37d5f5, which was part of Notmuch > 0.31.4. https://nmbug.notmuchmail.org/nmweb/show/878s1o54c1.fsf%40tethera.net --- .../applications/networking/mailreaders/notmuch/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb..e1a235c8309 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,12 +86,6 @@ stdenv.mkDerivation rec { gdb man emacs ]; - # Expects there to always be a thread with ID - # thread:0000000000000009, but notmuch new is non-deterministic so - # this isn't always the case. Upstream bug report: - # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is - NOTMUCH_SKIP_TESTS = "lib-thread"; - installTargets = [ "install" "install-man" "install-info" ]; postInstall = lib.optionalString withEmacs '' From 3b3ef3b8653eaddeb4e61fad0e4880dbd921894f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 09:16:43 +0000 Subject: [PATCH 1027/1522] bibletime: 3.0 -> 3.0.1 --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index aae4a960a37..30088f52436 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,14 +4,14 @@ mkDerivation rec { - version = "3.0"; + version = "3.0.1"; pname = "bibletime"; src = fetchurl { url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "08i6nb9a7z0jpsq76q0kr62hw6ph9chqjpjcvkimbcj4mmifzgnn"; + sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; }; nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; From 15eec2111fc06cca2b0abd7b3de1b6922fabf21e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:34:41 +0000 Subject: [PATCH 1028/1522] notmuch: 0.32.1 -> 0.32.2; clarify license Also fix an incorrect (but apparently harmless) use of lib.optional. --- .../networking/mailreaders/notmuch/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb..71cb68d0deb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.32.1"; + version = "0.32.2"; pname = "notmuch"; passthru = { @@ -20,10 +20,9 @@ stdenv.mkDerivation rec { inherit version; }; - src = fetchgit { - url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "sha256:06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16"; - rev = version; + src = fetchurl { + url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; + sha256 = "1myylb19hj5nb1vriqng252vfjwwkgbi3gxj93pi2q1fzyw7w2lf"; }; nativeBuildInputs = [ @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL - ] ++ optional withEmacs [ emacs ]; + ] ++ optional withEmacs emacs; buildInputs = [ gnupg # undefined dependencies @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { meta = { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; From c5b20238a32a4de07a787a138dff31fa315452b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 09:54:00 +0000 Subject: [PATCH 1029/1522] cargo-watch: 7.8.1 -> 8.0.0 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index c7cdf92dcd8..f2d5793f767 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.8.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg="; + sha256 = "sha256-3IgzMUCkcKUkhTb/ZNRONdvB6Ci0OBB1dcjtc65U8xE="; }; - cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk="; + cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; From 7d0285d139bac124364e59687771cf523d01329c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 10:29:45 +0000 Subject: [PATCH 1030/1522] crawl: 0.26.1 -> 0.27.0 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 11ac23fcef3..6595f1ee0dc 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk="; + sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo="; }; # Patch hard-coded paths and remove force library builds From 6eef84d697b1e07c85892241e53c746a9ecc6bf5 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 31 Jul 2021 12:33:43 +0200 Subject: [PATCH 1031/1522] mu: 1.6.0 -> 1.6.1 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index da7ef58f199..b6fce962d75 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; + sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI="; }; postPatch = lib.optionalString (batchSize != null) '' From 682442d027e2d00085f71e46cf7e78322598d301 Mon Sep 17 00:00:00 2001 From: Yuka Date: Sat, 31 Jul 2021 12:55:43 +0200 Subject: [PATCH 1032/1522] tdesktop: 2.8.11 -> 2.9.0 (#132195) --- .../telegram/tdesktop/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5f023e1cc9b..972fb1eab27 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , extra-cmake-modules , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash @@ -25,7 +25,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.11"; + version = "2.9.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -34,17 +34,9 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb"; + sha256 = "0964as7rkjq1px6z15z6kmkiz4zw69wmm3namwn940bsja123qls"; }; - patches = [(fetchpatch { - # ref: https://github.com/desktop-app/lib_webview/pull/9 - url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch"; - sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0="; - stripLen = 1; - extraPrefix = "Telegram/lib_webview/"; - })]; - postPatch = '' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' From a2e6029290a87bdfdca4c1f0af6a267263e09c5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 11:03:16 +0000 Subject: [PATCH 1033/1522] docker-buildx: 0.6.0 -> 0.6.1 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 020e22db601..4cdb253505b 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU="; + sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE="; }; vendorSha256 = null; From ce28b01ea34c346d697348b6082c90c0b9613ede Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 31 Jul 2021 12:55:16 +0200 Subject: [PATCH 1034/1522] maintainers/haskell/package-list: Only read one line from password-cmd --- .../scripts/haskell/upload-nixos-package-list-to-hackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index c49ea68fbfb..9e243052f25 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -12,10 +12,10 @@ # ~/.cabal/config file. # e.g. username: maralorn -# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression.) +# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.) # Those fields are specified under `upload` on the `cabal` man page. package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") -curl -u "$username:$($password_command)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv From 3209d25fd2355dbb68bf231ee1c1b3b442d42e86 Mon Sep 17 00:00:00 2001 From: cas1no <44465831+cas1no@users.noreply.github.com> Date: Sat, 31 Jul 2021 14:58:53 +0300 Subject: [PATCH 1035/1522] viber: add 'QML2_IMPORT_PATH' to the wrap --- .../networking/instant-messengers/viber/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 66d33533a73..53eea50767f 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -82,7 +82,8 @@ stdenv.mkDerivation { wrapProgram $out/opt/viber/Viber \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QML2_IMPORT_PATH "$out/opt/viber/qml" ln -s $out/opt/viber/Viber $out/bin/viber mv $out/usr/share $out/share From 75524662af31ac0f513edafddcba8d32f6ccfb98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 13:53:12 +0000 Subject: [PATCH 1036/1522] hugo: 0.86.0 -> 0.86.1 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index e8c927b79a6..42d3985244b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.86.0"; + version = "0.86.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50="; + sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q="; }; vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; From 501ec4cf5d9eb49ded40fe05ec33ad01f6fcffc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 14:02:22 +0000 Subject: [PATCH 1037/1522] hydroxide: 0.2.19 -> 0.2.20 --- pkgs/applications/networking/hydroxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index a8c6e87ab20..451449420bd 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKZdsFEUlXk0w11v7Y6sKiu4bOjmau2yAifcTpN0J+U="; + sha256 = "sha256-VTUpiuSsI795XDSxJJvLQlVNPLiekHyKcCazRBky9nU="; }; - vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY="; + vendorSha256 = "sha256-AuZnHpJ1Xel/L9dG3ATdXnoTeUxtieah/ea+0svw3oA="; doCheck = false; From 45547332afaa948ec9a47ced6f393762779dcd2d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 16:17:17 +0200 Subject: [PATCH 1038/1522] python3Packages.pytesseract: 0.3.7 -> 0.3.8 ChangeLog: https://github.com/madmaze/pytesseract/releases/tag/v0.3.8 --- pkgs/development/python-modules/pytesseract/default.nix | 4 ++-- .../python-modules/pytesseract/tesseract-binary.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index a7af2d1db03..6fcb9f97d32 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "4ecfc898d00a70fcc38d2bce729de1597c67e7bc5d2fa26094714c9f5b573645"; + sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; }; patches = [ diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch index 27b042bbaa5..78dfacb94ab 100644 --- a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch +++ b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch @@ -1,7 +1,7 @@ -diff --git a/src/pytesseract.py b/src/pytesseract.py +diff --git a/pytesseract/pytesseract.py b/pytesseract/pytesseract.py index 132f59b..f161e5c 100755 ---- a/src/pytesseract.py -+++ b/src/pytesseract.py +--- a/pytesseract/pytesseract.py ++++ b/pytesseract/pytesseract.py @@ -23,7 +23,7 @@ except ImportError: import Image From 2bace832c4fc2b28215fd10b4664e9ba536c56d1 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 10:23:56 -0400 Subject: [PATCH 1039/1522] buildbot: 3.2.0 -> 3.3.0 --- .../python-modules/buildbot/default.nix | 19 +++---------------- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 +++++----- .../python-modules/buildbot/worker.nix | 2 +- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index de34be979f3..a2471e45cfa 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k , python, twisted, jinja2, zope_interface, sqlalchemy , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial @@ -26,11 +26,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; + sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE="; }; propagatedBuildInputs = [ @@ -78,19 +78,6 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch - # Fix compatibility with SQLAlchemy 1.4 - (fetchpatch { - url = "https://github.com/buildbot/buildbot/pull/6156.patch"; - sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my"; - stripLen = 1; - excludes = [ - ".bbtravis.yml" - "buildbot/test/unit/db/test_enginestrategy.py" - "buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py" - "requirements-ci.txt" - "requirements-cidb.txt" - ]; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 94cca457b9c..45254ca83f8 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk="; + sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index f01967337a1..12c4146b513 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0="; + sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk="; + sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8="; + sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo="; + sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0="; + sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index f873eeee98a..a31ba928bb9 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo="; + sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU="; }; propagatedBuildInputs = [ twisted future ]; From 293ff939461b5b7fd0eca0d057645d4db4acbe12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 14:44:37 +0000 Subject: [PATCH 1040/1522] keycloak: 14.0.0 -> 15.0.0 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 8cfefcf9796..61d5cd26b4b 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "14.0.0"; + version = "15.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-NH2uNiYZZrEYE5DG2kDXzLN7/GgXR8IfBqRb6EoKA9s="; + sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE="; }; nativeBuildInputs = [ makeWrapper ]; From 9b0a99f64c9e61b6176238d9c3eabdcfa61723db Mon Sep 17 00:00:00 2001 From: brprice Date: Sat, 31 Jul 2021 14:54:37 +0000 Subject: [PATCH 1041/1522] nixos-rebuild: print run-*-vm location with bootloader (#130385) Previously when doing a nixos-rebuild build-vm we see a message saying how to run the VM, but with nixos-rebuild build-vm-with-bootloader we did not. We now show it in both cases. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6d082cb100e..b0363fa7a7c 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -520,7 +520,7 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = d fi -if [ "$action" = build-vm ]; then +if [ "$action" = build-vm -o "$action" = build-vm-with-bootloader ]; then cat >&2 < Date: Sat, 31 Jul 2021 15:19:00 +0000 Subject: [PATCH 1042/1522] nixos/tt-rss: fix eval --- nixos/modules/services/web-apps/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 7a6dc5f0a4e..ed13845915c 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -568,7 +568,7 @@ let systemd.services = { phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { - restartTriggers = [ tt-rss-config tt-rss ]; + restartTriggers = [ tt-rss-config pkgs.tt-rss ]; }; tt-rss = { From e17c7def698a6efede9fc09e7d6f70e4c467f25c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 18:05:27 +0200 Subject: [PATCH 1043/1522] diffoscope: fix build, 178 -> 179 ChangeLog: https://diffoscope.org/news/diffoscope-179-released/ Also fixed the build by disabling a failing test because of `file-v5.40`[1][2]. [1] Upstream bug: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 [2] Similar to: https://github.com/archlinux/svntogit-community/commit/3f906acae3d3c276bae7ed65727052017be84938 --- pkgs/tools/misc/diffoscope/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 629c8accfb9..d804b5200d2 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "178"; + version = "179"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; + sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4="; }; outputs = [ "out" "man" ]; @@ -66,6 +66,10 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" + + # Failing because of file-v5.40 has a slightly different output. + # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 + "test_text_proper_indentation" ]; meta = with lib; { From b826d7228a3102903fb9baec353b514114c5246c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 18:33:18 +0200 Subject: [PATCH 1044/1522] python3Packages.pysma: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 4f04038d650..f538830a7fb 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hnvbQOilsoHn1qc/pKJ2Eq1VwJi+HbGlAAJwiME1Pgc="; + sha256 = "0kabwx8mi2kkbxxg7abnxwggxvidjrzgp5yidiyll5iba0ghhgnw"; }; propagatedBuildInputs = [ From 738f92f2baf8652c5c81d43067acba801c6ee89b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 18:38:29 +0200 Subject: [PATCH 1045/1522] epson-escpr2: 1.1.34 -> 1.1.38 --- pkgs/misc/drivers/epson-escpr2/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 130be517bb8..bcb56ac0051 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, cups }: +{ lib, stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.34"; + version = "1.1.38"; src = fetchurl { # To find new versions, visit @@ -11,15 +11,26 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" - "https://web.archive.org/web/20210627160654/https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm" + "https://web.archive.org/web/20210731163511/https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm" ]; - sha256 = "sha256-sHBGWbkZ+zolHehyXQR8U2AyKSrgDSPmrkrcfcx/bAs="; + sha256 = "sha256-rQtmWREZKtu5MuqEn91/1+SfGol4f8jKzd1mQ0e3h1c="; }; + unpackPhase = '' + runHook preUnpack + + rpm2cpio $src | cpio -idmv + tar xvf ${pname}-${version}-1lsb3.2.tar.gz + cd ${pname}-${version} + + runHook postUnpack + ''; + patches = [ ./cups-filter-ppd-dirs.patch ]; buildInputs = [ cups ]; + nativeBuildInputs = [ busybox ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; From fff5923ab5b054a7481772829a6e5e1812571ee7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 19:01:07 +0200 Subject: [PATCH 1046/1522] python3Packages.httpx: 0.18.0 -> 0.18.2 --- pkgs/development/python-modules/httpx/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index e5db065defc..6a9300566d5 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, brotli +, brotlicffi , certifi , h2 , httpcore @@ -11,25 +11,25 @@ , pytestCheckHook , pytest-asyncio , pytest-trio -, pytest-cov +, typing-extensions , trustme , uvicorn }: buildPythonPackage rec { pname = "httpx"; - version = "0.18.0"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U="; + sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4"; }; propagatedBuildInputs = [ - brotli + brotlicffi certifi h2 httpcore @@ -41,8 +41,8 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-trio - pytest-cov trustme + typing-extensions uvicorn ]; @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc fab ]; }; } From 2f94991628ea21ff82227c79aac8a57582c9576d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 1 Aug 2021 00:01:50 +0700 Subject: [PATCH 1047/1522] treewide: fix redirected URLs Using the script in maintainers/scripts/update-redirected-urls.sh --- pkgs/applications/audio/friture/default.nix | 2 +- pkgs/applications/audio/spectmorph/default.nix | 2 +- pkgs/applications/editors/ne/default.nix | 2 +- pkgs/applications/graphics/scantailor/default.nix | 2 +- pkgs/applications/misc/audio/wavesurfer/default.nix | 2 +- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- pkgs/applications/misc/mkgmap/splitter/default.nix | 4 ++-- pkgs/applications/misc/mkgmap/splitter/testinputs.nix | 2 +- pkgs/applications/misc/mkgmap/testinputs.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/office/osmo/default.nix | 2 +- pkgs/applications/science/logic/verifast/default.nix | 2 +- pkgs/applications/science/math/nauty/default.nix | 6 +++--- pkgs/applications/virtualization/bochs/default.nix | 2 +- pkgs/data/fonts/terminus-font-ttf/default.nix | 4 ++-- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/interpreters/io/default.nix | 2 +- pkgs/development/libraries/libnetfilter_acct/default.nix | 2 +- .../development/libraries/libnetfilter_cthelper/default.nix | 2 +- pkgs/development/libraries/libnetfilter_queue/default.nix | 2 +- pkgs/development/libraries/libnfnetlink/default.nix | 2 +- pkgs/development/libraries/librdf/raptor.nix | 2 +- pkgs/development/libraries/librdf/raptor2.nix | 2 +- pkgs/development/libraries/librdf/rasqal.nix | 2 +- pkgs/development/libraries/librdf/redland.nix | 2 +- pkgs/development/libraries/libroxml/default.nix | 2 +- pkgs/development/libraries/libvmi/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/raylib/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- pkgs/development/node-packages/node-packages.nix | 6 +++--- pkgs/development/ocaml-modules/cudf/default.nix | 2 +- pkgs/development/ocaml-modules/dose3/default.nix | 2 +- pkgs/development/python-modules/autologging/default.nix | 2 +- pkgs/development/python-modules/pweave/default.nix | 2 +- pkgs/development/python-modules/pyfantom/default.nix | 2 +- pkgs/development/python-modules/pyqtgraph/default.nix | 2 +- pkgs/development/python-modules/python-uinput/default.nix | 2 +- pkgs/development/python-modules/vispy/default.nix | 2 +- .../python-modules/xstatic-jquery-file-upload/default.nix | 2 +- pkgs/development/tools/ammonite/default.nix | 2 +- pkgs/development/tools/lattice-diamond/default.nix | 2 +- pkgs/development/tools/ocaml/camlidl/default.nix | 2 +- pkgs/development/web/remarkjs/node-packages.nix | 2 +- pkgs/games/freedroidrpg/default.nix | 2 +- .../linux/firmware/broadcom-bt-firmware/default.nix | 2 +- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 4 ++-- pkgs/servers/nosql/aerospike/default.nix | 2 +- pkgs/tools/misc/kermit/default.nix | 2 +- pkgs/tools/package-management/holo-build/default.nix | 2 +- pkgs/tools/text/jumanpp/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 6 +++--- pkgs/tools/video/vnc2flv/default.nix | 2 +- 55 files changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index e4bd79a08e3..99ce726ca17 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -38,7 +38,7 @@ in py.buildPythonApplication rec { meta = with lib; { description = "A real-time audio analyzer"; - homepage = "http://friture.org/"; + homepage = "https://friture.org/"; license = licenses.gpl3; platforms = platforms.linux; # fails on Darwin maintainers = [ maintainers.laikq ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 6292d771a51..9b549e02f77 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "spectmorph"; version = "0.5.2"; src = fetchurl { - url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; + url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; }; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index fde6542f160..172b30dbb0f 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The nice editor"; - homepage = "http://ne.di.unimi.it/"; + homepage = "https://ne.di.unimi.it/"; longDescription = '' ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any UN*X machine. ne is easy to use for the beginner, diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 291825770ac..898cc3336a5 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 libjpeg libtiff boost ]; meta = { - homepage = "http://scantailor.org/"; + homepage = "https://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index b7e738cfc12..9c8a99a5934 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = "http://www.speech.kth.se/wavesurfer/"; + homepage = "https://www.speech.kth.se/wavesurfer/"; license = lib.licenses.bsd0; }; } diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index f82881eb5bd..d6fa24c19ba 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "4608"; src = fetchurl { - url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; + url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0="; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; - downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html"; + downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index c78d81771ca..9e034b58110 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "598"; src = fetchurl { - url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; + url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "http://www.mkgmap.org.uk"; - downloadPage = "http://www.mkgmap.org.uk/download/splitter.html"; + downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix index ab81b07ed8d..0d73f971029 100644 --- a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix +++ b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix @@ -2,7 +2,7 @@ let fetchTestInput = { res, sha256 }: fetchurl { inherit sha256; - url = "http://www.mkgmap.org.uk/testinput/${res}"; + url = "https://www.mkgmap.org.uk/testinput/${res}"; name = builtins.replaceStrings [ "/" ] [ "__" ] res; }; in diff --git a/pkgs/applications/misc/mkgmap/testinputs.nix b/pkgs/applications/misc/mkgmap/testinputs.nix index 0c4516190e0..93c858a3889 100644 --- a/pkgs/applications/misc/mkgmap/testinputs.nix +++ b/pkgs/applications/misc/mkgmap/testinputs.nix @@ -2,7 +2,7 @@ let fetchTestInput = { res, sha256 }: fetchurl { inherit sha256; - url = "http://www.mkgmap.org.uk/testinput/${res}"; + url = "https://www.mkgmap.org.uk/testinput/${res}"; name = builtins.replaceStrings [ "/" ] [ "__" ] res; }; in diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index ef93b5cbdb0..589ce21fe87 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -109,7 +109,7 @@ let ''; meta = with lib; { - homepage = "http://hadoop.apache.org/"; + homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 77cc087c66b..975305a7217 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A handy personal organizer"; - homepage = "http://clayo.org/osmo/"; + homepage = "https://clayo.org/osmo/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index e426f7b8098..a33c4941ac4 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; - homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; + homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index a941a633450..c435c63ab2e 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "nauty"; version = "27r1"; src = fetchurl { - url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; + url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz"; sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"; }; outputs = [ "out" "dev" ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # I'm not sure if the filename will remain the same for future changelog or # if it will track changes to minor releases. Lets see. Better than nothing # in any case. - changelog = "http://pallini.di.uniroma1.it/changes24-27.txt"; - homepage = "http://pallini.di.uniroma1.it/"; + changelog = "https://pallini.di.uniroma1.it/changes24-27.txt"; + homepage = "https://pallini.di.uniroma1.it/"; }; } diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index e614b3da2b0..002848380c2 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://bochs.sourceforge.io/"; + homepage = "https://bochs.sourceforge.io/"; description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 1a65798891f..1ebf987fcd5 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "terminus-font-ttf-${version}"; - url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; postFetch = '' unzip -j $downloadedFile @@ -26,7 +26,7 @@ in fetchzip { Monospaced bitmap font designed for long work with computers (TTF version, mainly for Java applications) ''; - homepage = "http://files.ax86.net/terminus-ttf"; + homepage = "https://files.ax86.net/terminus-ttf"; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; }; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 3174744fdde..9919973de24 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A low-level counterpart to Lua"; - homepage = "http://terralang.org/"; + homepage = "https://terralang.org/"; platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 seylerius thoughtpolice ]; license = licenses.mit; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 48462a333bc..9f6ecb2516e 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Io programming language"; - homepage = "http://iolanguage.org/"; + homepage = "https://iolanguage.org/"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 72766471d2f..6c52d7f7b56 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; meta = with lib; { - homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index b8b05e57dad..294f776192d 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { library, you register, configure, enable and disable user-space helpers. This library is used by conntrack-tools. ''; - homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_cthelper/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 7dafcd42223..d1783289965 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnfnetlink ]; meta = with lib; { - homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 4c7b4a5cc2d..a070d2e3af2 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { This library is not meant as a public API for application developers. It is only used by other netfilter.org projects, like the aforementioned ones. ''; - homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; + homepage = "https://www.netfilter.org/projects/libnfnetlink/index.html"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 8d1b1f2a0ea..ef755b82155 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index bb8aeefa102..65655814685 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 88acc372f7f..0dd5b87377f 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; - homepage = "http://librdf.org/rasqal"; + homepage = "https://librdf.org/rasqal"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 731d1cf1868..5ac2c711104 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; - homepage = "http://librdf.org/"; + homepage = "https://librdf.org/"; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index de1877f2ab4..39c8eab5a65 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; }; meta = with lib; { - homepage = "http://www.libroxml.net/"; + homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 9d9e47407b6..36fd026eeed 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libvmi.com/"; + homepage = "https://libvmi.com/"; description = "A C library for virtual machine introspection"; longDescription = '' LibVMI is a C library with Python bindings that makes it easy to monitor the low-level diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ed93d86a197..5856e0b84b5 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -229,7 +229,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = "http://qt-project.org/"; + homepage = "https://qt-project.org/"; description = "A cross-platform application framework for C++"; license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 836bafd4280..9843141fc00 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and easy-to-use library to enjoy videogames programming"; - homepage = "http://www.raylib.com/"; + homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 8750bdf2ac6..8c97d0224c6 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "The Snack Sound Toolkit (Tcl)"; - homepage = "http://www.speech.kth.se/snack/"; + homepage = "https://www.speech.kth.se/snack/"; license = lib.licenses.gpl2; broken = true; }; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 45cc5cdeac6..3acc583f8a0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -89128,7 +89128,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "http://github.com/remy/inliner"; + homepage = "https://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -90816,7 +90816,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "MIT"; }; production = true; @@ -103950,7 +103950,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "http://pm2.keymetrics.io/"; + homepage = "https://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index d2090cda676..22de0e690c8 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A library for CUDF format"; - homepage = "http://www.mancoosi.org/cudf/"; + homepage = "https://www.mancoosi.org/cudf/"; downloadPage = "https://gforge.inria.fr/projects/cudf/"; license = licenses.lgpl3; maintainers = with maintainers; [ superherointj ]; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 3397527fd63..733427cdb91 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { meta = with lib; { description = "Dose library (part of Mancoosi tools)"; downloadPage = "https://gitlab.com/irill/dose3/"; - homepage = "http://www.mancoosi.org/software/"; + homepage = "https://www.mancoosi.org/software/"; license = licenses.lgpl3Plus; longDescription = '' The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository. diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index fdd935303d0..1b3a7d65218 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://ninthtest.info/python-autologging/"; + homepage = "https://ninthtest.info/python-autologging/"; description = "Easier logging and tracing for Python classes"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index 1b8e1a3cc6f..b97d5149652 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = "http://mpastell.com/pweave/"; + homepage = "https://mpastell.com/pweave/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index d7c77e763e7..d27cccfbd8c 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { doCheck = false; meta = with lib; { - homepage = "http://pyfantom.ni.fr.eu.org/"; + homepage = "https://pyfantom.ni.fr.eu.org/"; description = "Wrapper for the LEGO Mindstorms Fantom Driver"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 54a136d5dcd..49401bf1f84 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; - homepage = "http://www.pyqtgraph.org/"; + homepage = "https://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 8d82ffb6b3b..efb1288943a 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; - homepage = "http://tjjr.fi/sw/python-uinput/"; + homepage = "https://tjjr.fi/sw/python-uinput/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 5524258a7e8..849f25ef0df 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "vispy" ]; meta = with lib; { - homepage = "http://vispy.org/index.html"; + homepage = "https://vispy.org/index.html"; description = "Interactive scientific visualization in Python"; license = licenses.bsd3; maintainers = with maintainers; [ goertzenator ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index 0316a849376..ce3f8c76dfa 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = "http://plugins.jquery.com/project/jQuery-File-Upload"; + homepage = "https://plugins.jquery.com/project/jQuery-File-Upload"; description = "jquery-file-upload packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index ffd3b78cedd..ab1ea2a82a3 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -66,7 +66,7 @@ let with a lot of ergonomic improvements and configurability that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. ''; - homepage = "http://www.lihaoyi.com/Ammonite/"; + homepage = "https://www.lihaoyi.com/Ammonite/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index ce352542061..e8bc4c1b1be 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation { for cost- sensitive, low-power Lattice FPGA architectures. It is the next-generation replacement for ispLEVER. ''; - homepage = "http://www.latticesemi.com/latticediamond"; + homepage = "https://www.latticesemi.com/latticediamond"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index a464996ff38..36a1c7f755e 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -2,7 +2,7 @@ let pname = "camlidl"; - webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/"; + webpage = "https://caml.inria.fr/pub/old_caml_site/camlidl/"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 5f5d3576b76..9add677c248 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3674,7 +3674,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "MIT"; }; production = true; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 53b008d11dd..e0582c524ec 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ''; - homepage = "http://www.freedroid.org/"; + homepage = "https://www.freedroid.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 5118d0a0b9b..a0985cad0db 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; - homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; + homepage = "https://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index dd9fadfd02f..7b4322657e5 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.14"; src = fetchurl { - url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; + url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-kmod=no" ]; meta = with lib; { - homepage = "http://ipset.netfilter.org/"; + homepage = "https://ipset.netfilter.org/"; description = "Administration tool for IP sets"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index a2fbdde95aa..f3a953576ec 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://qt-project.org/wiki/jom"; + homepage = "https://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index a86dd8471ce..ac9b015480e 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # needs to find a local perl module during build PERL_USE_UNSAFE_INC = "1"; - # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 + # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass doCheck = false; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { interface. Munin can help analyze resource trends and 'what just happened to kill our performance?' problems. ''; - homepage = "http://munin-monitoring.org/"; + homepage = "https://munin-monitoring.org/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 33347a73a20..db7b39ac5c7 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flash-optimized, in-memory, NoSQL database"; - homepage = "http://aerospike.com/"; + homepage = "https://aerospike.com/"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index 1a561f0bef4..8af0674f54b 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://www.kermitproject.org/ck90.html"; + homepage = "https://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 8f88ae08762..20e3b555fd2 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Cross-distribution system package compiler"; - homepage = "http://holocm.org/"; + homepage = "https://holocm.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5578ed417a2..5fb5ec88d67 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { plausibility of word sequences by using a recurrent neural network language model (RNNLM). ''; - homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; + homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index e2f5952077f..7cfb2d2d6a4 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${appname}-${version}"; src = fetchzip { - url = "http://getpopfile.org/downloads/${appname}-${version}.zip"; + url = "https://getpopfile.org/downloads/${appname}-${version}.zip"; sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63"; stripRoot = false; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = (with perlPackages; [ ## These are all taken from the popfile documentation as applicable to Linux - ## http://getpopfile.org/docs/howtos:allplatformsrequireperl + ## https://getpopfile.org/docs/howtos:allplatformsrequireperl perl DBI DBDSQLite @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Should work on macOS, but havent tested it. # Windows support is more complicated. - # http://getpopfile.org/docs/faq:systemrequirements + # https://getpopfile.org/docs/faq:systemrequirements platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 88ec2f22b89..fdaf2ee2746 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; - homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; + homepage = "https://www.unixuser.org/~euske/python/vnc2flv/"; license = lib.licenses.mit; }; } From cbcee79dad077676c1521a39995eacd3f83f58d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 20:10:55 +0300 Subject: [PATCH 1048/1522] kazam: switch to a maintained fork --- pkgs/applications/video/kazam/default.nix | 55 ++++++++++++++--------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index f99b4930870..4ba0fe98df0 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,24 +1,44 @@ -{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection -, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio -, fetchpatch }: +{ lib +, fetchFromGitHub +, substituteAll +, python3Packages +, gst_all_1 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, libwnck +, keybinder3 +, intltool +, libcanberra-gtk3 +, libappindicator-gtk3 +, libpulseaudio +, libgudev +}: -python3.pkgs.buildPythonApplication rec { - name = "kazam-${version}"; - version = "1.4.5"; - namePrefix = ""; +python3Packages.buildPythonApplication rec { + pname = "kazam"; + version = "unstable-2021-06-22"; - src = fetchurl { - url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; - sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; + src = fetchFromGitHub { + owner = "niknah"; + repo = "kazam"; + rev = "13f6ce124e5234348f56358b9134a87121f3438c"; + sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ]; buildInputs = [ - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck - keybinder3 libappindicator-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gtk3 + libwnck + keybinder3 + libappindicator-gtk3 + libgudev ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ]; # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; @@ -30,11 +50,6 @@ python3.pkgs.buildPythonApplication rec { libcanberra = libcanberra-gtk3; inherit libpulseaudio; }) - # https://github.com/hzbd/kazam/pull/21 - (fetchpatch { - url = "https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch"; - sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z"; - }) ]; # no tests @@ -42,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A screencasting program created with design in mind"; - homepage = "https://code.launchpad.net/kazam"; + homepage = "https://github.com/niknah/kazam"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; From cde201489132fba639d22f592af8c93fd8746cb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 19:14:01 +0200 Subject: [PATCH 1049/1522] python3Packages.httpx-socks: init at 0.4.1 --- .../python-modules/httpx-socks/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/httpx-socks/default.nix diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix new file mode 100644 index 00000000000..f73d81cc6aa --- /dev/null +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -0,0 +1,57 @@ +{ lib +, async-timeout +, buildPythonPackage +, curio +, fetchFromGitHub +, flask +, httpcore +, httpx +, pytest-asyncio +, pytest-trio +, pytestCheckHook +, python-socks +, pythonOlder +, sniffio +, trio +, yarl +}: + +buildPythonPackage rec { + pname = "httpx-socks"; + version = "0.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "romis2012"; + repo = pname; + rev = "v${version}"; + sha256 = "1rz69z5fcw7d5nzy5q2q0r9gxrsqijgpg70cnyr5br6xnfgy01ar"; + }; + + propagatedBuildInputs = [ + async-timeout + curio + httpcore + httpx + python-socks + sniffio + trio + ]; + + checkInputs = [ + flask + pytest-asyncio + pytest-trio + pytestCheckHook + yarl + ]; + + pythonImportsCheck = [ "httpx_socks" ]; + + meta = with lib; { + description = "Proxy (HTTP, SOCKS) transports for httpx"; + homepage = "https://github.com/romis2012/httpx-socks"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1c4e4392b5..7ea7fd92679 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3383,6 +3383,8 @@ in { httpx = callPackage ../development/python-modules/httpx { }; + httpx-socks = callPackage ../development/python-modules/httpx-socks { }; + huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; huey = callPackage ../development/python-modules/huey { }; From 8921779f0af1422ea1d7cf23d47f8d688b21d193 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Jul 2021 13:29:39 +0200 Subject: [PATCH 1050/1522] mtools: 4.0.33 -> 4.0.34 Fix bug for recursive use, see release announcement: https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00010.html --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f82b008e41d..d6fa4c41643 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.33"; + version = "4.0.34"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w"; + sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; From 01c5b01858ff6870ec138c5fefdfaa13e9f6725e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 19:21:17 +0300 Subject: [PATCH 1051/1522] udocker: 1.1.3 -> 1.3.1 and make usable --- pkgs/tools/virtualization/udocker/default.nix | 49 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index fb067de8212..6584c5bee5c 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,35 +1,42 @@ -{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib +, fetchFromGitHub +, singularity +, python3Packages +}: -buildPythonApplication rec { - - version = "1.1.3"; +python3Packages.buildPythonApplication rec { pname = "udocker"; + version = "1.3.1"; src = fetchFromGitHub { owner = "indigo-dc"; - repo = "udocker" ; + repo = "udocker"; rev = "v${version}"; - sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; + sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x"; }; - buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; + # crun patchelf proot runc fakechroot + # are download statistically linked during runtime + buildInputs = [ + singularity + ] ++ (with python3Packages; [ + pytest-runner + pycurl + ]); - postPatch = '' - substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH - substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod - substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" - ''; - - checkInputs = [ - nose - mock + checkInputs = with python3Packages; [ + pytestCheckHook ]; - checkPhase = '' - NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py - ''; + disabledTests = [ + "test_05__get_volume_bindings" + ]; + + disabledTestPaths = [ + # Network + "tests/unit/test_curl.py" + "tests/unit/test_dockerioapi.py" + ]; meta = with lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb15..b986fa71e37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27668,7 +27668,7 @@ in umurmur = callPackage ../applications/networking/umurmur { }; - udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + udocker = callPackage ../tools/virtualization/udocker { }; uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; From bd3eb499b8dbca992fd8a0c7a2b41e3a55fd64ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 19:52:05 +0200 Subject: [PATCH 1052/1522] python3Packages.httpx-ntlm: init at 0.0.10 --- .../python-modules/httpx-ntlm/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/httpx-ntlm/default.nix diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix new file mode 100644 index 00000000000..b3ac17cf7f0 --- /dev/null +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, httpx +, ntlm-auth +}: + +buildPythonPackage rec { + pname = "httpx-ntlm"; + version = "0.0.10"; + + src = fetchPypi { + pname = "httpx_ntlm"; + inherit version; + sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz"; + }; + + propagatedBuildInputs = [ + cryptography + httpx + ntlm-auth + ]; + + # https://github.com/ulodciv/httpx-ntlm/issues/5 + doCheck = false; + + pythonImportsCheck = [ "httpx_ntlm" ]; + + meta = with lib; { + description = "NTLM authentication support for HTTPX"; + homepage = "https://github.com/ulodciv/httpx-ntlm"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ea7fd92679..168ed4d7a48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3383,6 +3383,8 @@ in { httpx = callPackage ../development/python-modules/httpx { }; + httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { }; + httpx-socks = callPackage ../development/python-modules/httpx-socks { }; huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; From 72dce4c560ae2a6f687d2304ee3bbbc845bfbc11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 19:53:32 +0200 Subject: [PATCH 1053/1522] wapiti: 3.0.4 -> 3.0.5 --- pkgs/tools/security/wapiti/default.nix | 31 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 945f78dc559..cd89d4039e5 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; rev = version; - sha256 = "0wnz4nq1q5y74ksb1kcss9vdih0kbrmnkfbyc2ngd9id1ixfamxb"; + sha256 = "0663hzpmn6p5xh65d2gk4yk2zh992lfd9lhdwwabhpv3n85nza75"; }; nativeBuildInputs = with python3.pkgs; [ @@ -21,24 +21,34 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 browser-cookie3 + cryptography Mako markupsafe pysocks - requests + httpx + httpx-ntlm + httpx-socks six tld yaswfp ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ]; checkInputs = with python3.pkgs; [ - responses + respx + pytest-asyncio pytestCheckHook ]; postPatch = '' - # Is already fixed in the repo. Will be part of the next release + # Ignore pinned versions substituteInPlace setup.py \ - --replace "importlib_metadata==2.0.0" "importlib_metadata" + --replace "==" ">=" + substituteInPlace setup.cfg \ + --replace " --cov" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); ''; disabledTests = [ @@ -47,6 +57,10 @@ python3.pkgs.buildPythonApplication rec { "test_bad_separator_used" "test_blind" "test_chunked_timeout" + "test_cookies" + "test_drop_cookies" + "test_save_and_restore_state" + "test_explorer_extract_links" "test_cookies_detection" "test_csrf_cases" "test_detection" @@ -63,6 +77,8 @@ python3.pkgs.buildPythonApplication rec { "test_no_crash" "test_options" "test_out_of_band" + "test_multi_detection" + "test_vulnerabilities" "test_partial_tag_name_escape" "test_prefix_and_suffix_detection" "test_qs_limit" @@ -85,6 +101,9 @@ python3.pkgs.buildPythonApplication rec { "test_xss_with_strong_csp" "test_xss_with_weak_csp" "test_xxe" + # Requires a PHP installation + "test_timesql" + "test_cookies" ]; pythonImportsCheck = [ "wapitiCore" ]; From d0556404f6d437aab5527e05854b119b5f14c61d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 18:08:28 +0000 Subject: [PATCH 1054/1522] pony-corral: 0.5.1 -> 0.5.3 --- pkgs/development/compilers/ponyc/pony-corral.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index 3f40a4d7889..43fe247b79f 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1g4dkf5hsnykn3x6yx6ycjzmzzr1nwl59lj13j7zyka1ibv53hwf"; + sha256 = "sha256-27J1Y3+tbZK7RX+63xVV2eaX/LF525vBR3Ff9EYDEl0="; }; buildInputs = [ ponyc ]; From 598266b34c7c6cccd26f8c65c16d9397932153d7 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Sat, 31 Jul 2021 19:33:49 +0100 Subject: [PATCH 1055/1522] calibre: 5.17.0 -> 5.24.0 - No need to pin zeroconf to older version. - Override apsw to compile with load_extension support. [1] [1] https://bugs.launchpad.net/calibre/+bug/1935747 --- pkgs/applications/misc/calibre/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 07e0a62b901..85a644e5f1b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,15 +22,16 @@ , libmtp , xdg-utils , removeReferencesTo +, libstemmer }: mkDerivation rec { pname = "calibre"; - version = "5.17.0"; + version = "5.24.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs="; + hash = "sha256:18dr577nv7ijw3ar6mrk2xrc54mlrqkaj5jrc6s5sirl0710fdfg"; }; patches = [ @@ -65,6 +66,7 @@ mkDerivation rec { libjpeg libmtp libpng + libstemmer libusb1 podofo poppler_utils @@ -73,7 +75,9 @@ mkDerivation rec { xdg-utils ] ++ ( with python3Packages; [ - apsw + (apsw.overrideAttrs (oldAttrs: rec { + setupPyBuildFlags = [ "--enable=load_extension" ]; + })) beautifulsoup4 cchardet css-parser @@ -95,15 +99,7 @@ mkDerivation rec { python regex sip - (zeroconf.overrideAttrs (oldAttrs: rec { - version = "0.31.0"; - src = fetchFromGitHub { - owner = "jstasiak"; - repo = "python-zeroconf"; - rev = version; - sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; - }; - })) + zeroconf # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll From 6dac1b7a09564d1d362c8fc9cfed0a6264e85a72 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 28 Jul 2021 16:51:49 +0200 Subject: [PATCH 1056/1522] coqPackages.VST: build and install more modules from floyd/ Fixes #131203 --- pkgs/development/coq-modules/VST/default.nix | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 5ee1df77418..1d2a1a3c05f 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,4 +1,16 @@ -{ lib, mkCoqDerivation, coq, compcert, version ? null }: +{ lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: + +# A few modules that are not built and installed by default +# but that may be useful to some users. +# They depend on ITree. +let extra_floyd_files = [ + "ASTsize.v" + "io_events.v" + "powerlater.v" + "printf.v" + "quickprogram.v" + ]; +in with lib; mkCoqDerivation { pname = "coq${coq.coq-version}-VST"; @@ -12,9 +24,14 @@ with lib; mkCoqDerivation { ] null; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; + extraBuildInputs = [ ITree ]; propagatedBuildInputs = [ compcert ]; - preConfigure = "patchShebangs util"; + preConfigure = '' + patchShebangs util + substituteInPlace Makefile \ + --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' + ''; makeFlags = [ "BITSIZE=64" From 10cd1a5497a906f951591a3bfa0a56649ecf9ed9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 22:07:44 +0200 Subject: [PATCH 1057/1522] python3Packages.sentry-sdk: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 9b387582252..ff58edbeb31 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UhCnEt1X2I0iXB/D/jo2Jv7kk2N7zVTiBIJs8EuNdpw="; + sha256 = "0v72zzghlk6kvjg7fg4c4mfr1kasnwlpjzk1wyqd864nz9293sgb"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond From 47177fcf4eb86928e69bf3cfd1890f97f405edf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 22:14:30 +0200 Subject: [PATCH 1058/1522] python3Packages.pg8000: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/pg8000/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index db18611f20a..07efa604cad 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.20.0"; + version = "1.21.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SQ7CKpJgHwRUs+1MjU7N3DD2bA4/eD8OzFgQN3SajFU="; + sha256 = "1msj0vk14fbsis8yfk0my1ygpcli9jz3ivwdi9k6ii5i6330i4f9"; }; propagatedBuildInputs = [ @@ -21,11 +21,6 @@ buildPythonPackage rec { scramp ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "scramp==1.4.0" "scramp>=1.4.0" - ''; - # Tests require a running PostgreSQL instance doCheck = false; pythonImportsCheck = [ "pg8000" ]; From e5cf1f11c21c3cc31521021fa069dc169b51f919 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 22:20:12 +0200 Subject: [PATCH 1059/1522] python3Packages.phonenumbers: 8.12.26 -> 8.12.28 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index fa869c5d75d..6d2a4cac36b 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.26"; + version = "8.12.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zbq269vg7FGWx0YmlJdI21M30jiVqrwe+PXXKEeHmYo="; + sha256 = "1g86bf791lr9ggrfgllah9liwa3bx917h9ffrdb01kjwdna4zsj2"; }; checkInputs = [ From 6e9195f6687d05d4225521a34d1702dd9c0a4444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 31 Jul 2021 21:46:16 +0200 Subject: [PATCH 1060/1522] linux_zen: 5.13.5 -> 5.13.7 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 3955b1851d3..7cbeedda726 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.13.5"; + version = "5.13.7"; suffix = "zen1"; in @@ -14,11 +14,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; + sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; extraMeta = { - branch = "5.12/master"; + branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; From ec6c669d5ee5fe67693d4826bd8d10879649542d Mon Sep 17 00:00:00 2001 From: wheelsandmetal Date: Tue, 20 Jul 2021 12:30:03 +0100 Subject: [PATCH 1061/1522] sentry-native: init at 0.4.11 --- .../libraries/sentry-native/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/sentry-native/default.nix diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix new file mode 100644 index 00000000000..a20cc7d917b --- /dev/null +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, breakpad, pkg-config }: + +stdenv.mkDerivation rec { + pname = "sentry-native"; + version = "0.4.11"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-native"; + rev = version; + sha256 = "sha256-kasZ5OAtl32Oxed4BkxvHXEFqEvBaBwyslHO7Ga5TRY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl breakpad pkg-config ]; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DSENTRY_BREAKPAD_SYSTEM=On" + ]; + + meta = with lib; { + homepage = "https://github.com/getsentry/sentry-native"; + description = "Sentry SDK for C, C++ and native applications."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wheelsandmetal ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5024a4d8d3..8181754eed4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9769,6 +9769,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sentry-native = callPackage ../development/libraries/sentry-native { }; + vtun = callPackage ../tools/networking/vtun { openssl = openssl_1_0_2; }; From a895c83b03ec053665f82599e97e35411b7c62f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 22:45:32 +0200 Subject: [PATCH 1062/1522] python3Packages.pipdate: 0.5.2 -> 0.5.5 --- .../python-modules/pipdate/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 35fbb624e6b..627e2b0a6fa 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -2,23 +2,23 @@ , buildPythonPackage , fetchPypi , pythonOlder -, isPy27 , appdirs , importlib-metadata , requests -, pytest +, rich +, setuptools , wheel }: buildPythonPackage rec { pname = "pipdate"; - version = "0.5.2"; + version = "0.5.5"; format = "pyproject"; - disabled = isPy27; # abandoned + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "507065231f2d50b6319d483432cba82aadad78be21b7a2969b5881ed8dee9ab4"; + sha256 = "03hr9i691cpg9q2xc1xr4lpd90xs8rba0xjh6qmc1vg7lgcdgbaa"; }; nativeBuildInputs = [ wheel ]; @@ -26,25 +26,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs requests + rich + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - HOME=$(mktemp -d) pytest test/test_pipdate.py - ''; - - # tests require network access + # Tests require network access and pythonImportsCheck requires configuration file doCheck = false; meta = with lib; { description = "pip update helpers"; homepage = "https://github.com/nschloe/pipdate"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ costrouc ]; }; } From ab21b704130458c4fc5e5e840cf1e7ac2094f93e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 22:56:43 +0200 Subject: [PATCH 1063/1522] python3Packages.plexapi: 4.6.1 -> 4.7.0 --- pkgs/development/python-modules/plexapi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index d2e04586e38..2df3e3a17c8 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -4,19 +4,19 @@ , requests , tqdm , websocket-client -, isPy27 +, pythonOlder }: buildPythonPackage rec { - pname = "PlexAPI"; - version = "4.6.1"; - disabled = isPy27; + pname = "plexapi"; + version = "4.7.0"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-WL5UBsvAdtfOCkVX9NI0Z2fJ2CAO+NwD8wvkvkJ2uww="; + sha256 = "1gh36ln9ki69rs7ml9syqq956i996rdi145qffjwb3736zylrzkp"; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # Tests require a running Plex instance doCheck = false; + pythonImportsCheck = [ "plexapi" ]; meta = with lib; { From eb6202d5e7ea1ec3f761cadc61f9dbfa24aeb6b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 23:01:53 +0200 Subject: [PATCH 1064/1522] python3Packages.neo: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/neo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index e5db8450e78..27da5b71b68 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -4,15 +4,17 @@ , nose , numpy , quantities +, pythonOlder }: buildPythonPackage rec { pname = "neo"; - version = "0.9.0"; + version = "0.10.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6e31c88d7c52174fa2512df589b2b5003e9471fde27fca9f315f4770ba3bd3cb"; + sha256 = "0lw3r9p1ky1cswhrs9radc0vq1qfzbrk7qd00f34g96g30zab4g5"; }; propagatedBuildInputs = [ numpy quantities ]; From 604d0dd0d68daf696a9ba5494b63500e9db36874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 31 Jul 2021 22:59:41 +0200 Subject: [PATCH 1065/1522] linux_zen: actually enable patchset --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 7cbeedda726..2b91a259232 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -17,6 +17,10 @@ buildLinux (args // { sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; + structuredExtraConfig = with lib.kernel; { + ZEN_INTERACTIVE = yes; + }; + extraMeta = { branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; From f85d58f97845131e9959f5915bd9ec3ecdd0a743 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 23:07:17 +0200 Subject: [PATCH 1066/1522] python3Packages.nbxmpp: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/nbxmpp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index c145b9d888f..75a8f884fad 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,17 +4,16 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "2.0.2"; + version = "2.0.3"; disabled = pythonOlder "3.7"; - # Tests aren't included in PyPI tarball. src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "python-nbxmpp"; rev = "nbxmpp-${version}"; - sha256 = "0z27mxgfk7hvpx0xdrd8g9441rywv74yk7s83zjnc2mc7xvpwhf4"; + sha256 = "0gzyd25sja7n49f1ihyg6gch1b0r409r0p3qpwn8w8xy7jgn6ysc"; }; buildInputs = [ precis-i18n ]; From 83d432ea5aac1bc5a9a8bd2778b3abb093da139d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 23:12:24 +0200 Subject: [PATCH 1067/1522] python3Packages.nbxmpp: enable tests --- .../python-modules/nbxmpp/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 75a8f884fad..44460a21d5b 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromGitLab -, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitLab +, gobject-introspection +, idna +, libsoup +, precis-i18n +, pygobject3 +, pyopenssl +, pytestCheckHook }: buildPythonPackage rec { @@ -16,8 +25,21 @@ buildPythonPackage rec { sha256 = "0gzyd25sja7n49f1ihyg6gch1b0r409r0p3qpwn8w8xy7jgn6ysc"; }; - buildInputs = [ precis-i18n ]; - propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; + buildInputs = [ + precis-i18n + ]; + + propagatedBuildInputs = [ + gobject-introspection + idna + libsoup + pygobject3 + pyopenssl + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "nbxmpp" ]; From 5ba6336647cb7d015a2463df1dd822a06518fa4b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 31 Jul 2021 18:48:08 -0300 Subject: [PATCH 1068/1522] rst2html5: 1.10.6 -> 2.0 --- pkgs/tools/text/rst2html5/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index c9e8b046986..5ae0caa34e1 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -1,22 +1,23 @@ { lib, python3Packages }: -let +python3Packages.buildPythonPackage rec { pname = "rst2html5"; - version = "1.10.6"; - format = "wheel"; -in python3Packages.buildPythonPackage { - inherit pname version format; + version = "2.0"; src = python3Packages.fetchPypi { - inherit pname version format; - sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg="; + inherit pname version; + hash = "sha256-Ejjja/fm6wXTf9YtjCYZsNDB8X5oAtyPoUIsYFDuZfc="; }; - propagatedBuildInputs = with python3Packages; - [ docutils genshi pygments beautifulsoup4 ]; + buildInputs = with python3Packages; [ + beautifulsoup4 + docutils + genshi + pygments + ]; meta = with lib;{ - homepage = "https://pypi.org/project/rst2html5/"; + homepage = "https://rst2html5.readthedocs.io/en/latest/"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; From a7dbb32253ed33b1c8fba5eb0ad10025cbe3f7f8 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 18:19:14 -0400 Subject: [PATCH 1069/1522] findutils: remove upstreamed patch The patch for 32-bit ARM was included in 4.8.0, and therefore needs to be removed. --- pkgs/tools/misc/findutils/default.nix | 5 +-- .../misc/findutils/fix-gnulib-tests-arm.patch | 45 ------------------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 57839f73056..8c8b8c7b2b4 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' ''; - patches = [ ./no-install-statedir.patch ] - # fix gnulib tests on 32-bit ARM. Included on findutils master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + patches = [ ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch b/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch deleted file mode 100644 index 39bd29f8439..00000000000 --- a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gnulib-tests/test-perror2.c -+++ b/gnulib-tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gnulib-tests/test-strerror_r.c -+++ b/gnulib-tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - From ce2d6c8e978a686435acdba4929b8c34e99989e6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 31 Jul 2021 19:26:30 -0300 Subject: [PATCH 1070/1522] zchunk: 1.1.11 -> 1.1.16 --- pkgs/development/libraries/zchunk/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index cf0063f7780..ddbd95b55d9 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.11"; - - outputs = [ "out" "lib" "dev" ]; + version = "1.1.16"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-r+qWJOUnTyPJjM9eW44Q2DMKxx4HloyfNrQ6xWDO9vQ="; + hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; }; nativeBuildInputs = [ @@ -33,6 +31,13 @@ stdenv.mkDerivation rec { zstd ] ++ lib.optional stdenv.isDarwin argp-standalone; + + outputs = [ + "out" + "lib" + "dev" + ]; + meta = with lib; { homepage = "https://github.com/zchunk/zchunk"; description = "File format designed for highly efficient deltas while maintaining good compression"; From e8b00e9eebf7d6138a767107758920bb98b47a22 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 18:40:30 -0400 Subject: [PATCH 1071/1522] mavproxy: 1.8.39 -> 1.8.40 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index ba0c2530849..4f83f957dbf 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.39"; + version = "1.8.40"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1RXuAiz9i5ZnLtDGQ+o3DNgWJ2FDJGIoelmlDmEzrts="; + sha256 = "cad317e2e879f1f7cb59af078788aaf0d09cd761ecd91ad091adf7ac6cc1bcdb"; }; postPatch = '' From c9e991bd649c231e673bef17dd8820b71fb90f64 Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Sun, 1 Aug 2021 00:44:02 +0200 Subject: [PATCH 1072/1522] mpvScripts.simple-mpv-webui: 1.0.0 -> 2.1.0 This also adds a test. The current packaged version (1.0.0) is broken, it cannot find relevant files. --- nixos/tests/all-tests.nix | 1 + nixos/tests/mpv.nix | 28 +++++++++++++++++++ .../video/mpv/scripts/simple-mpv-webui.nix | 6 ++-- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/mpv.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ae2aff2226b..1a71e8f86b9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -259,6 +259,7 @@ in morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; mpd = handleTest ./mpd.nix {}; + mpv = handleTest ./mpv.nix {}; mumble = handleTest ./mumble.nix {}; musescore = handleTest ./musescore.nix {}; munin = handleTest ./munin.nix {}; diff --git a/nixos/tests/mpv.nix b/nixos/tests/mpv.nix new file mode 100644 index 00000000000..bcfc17cf332 --- /dev/null +++ b/nixos/tests/mpv.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +let + port = toString 4321; +in +{ + name = "mpv"; + meta.maintainers = with maintainers; [ zopieux ]; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ + pkgs.curl + (pkgs.mpv-with-scripts.override { + scripts = [ pkgs.mpvScripts.simple-mpv-webui ]; + }) + ]; + }; + + testScript = '' + machine.execute("set -m; mpv --script-opts=webui-port=${port} --idle=yes &") + machine.wait_for_open_port(${port}) + assert "simple-mpv-webui" in machine.succeed("curl -s localhost:${port}") + ''; +}) diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index 99b731757ff..01f2c3a099f 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -2,13 +2,13 @@ , fetchFromGitHub }: stdenvNoCC.mkDerivation rec { pname = "simple-mpv-ui"; - version = "1.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "open-dynaMIX"; repo = "simple-mpv-webui"; rev = "v${version}"; - sha256 = "1glrnnl1slcl0ri0zs4j64lc9aa52p9ffh6av0d81fk95nm98917"; + sha256 = "1z0y8sdv5mbxznxqh43w5592ym688vkvqg7w26p8cinrhf09pbw8"; }; dontBuild = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer"; homepage = "https://github.com/open-dynaMIX/simple-mpv-webui"; - maintainers = [ maintainers.cript0nauta ]; + maintainers = with maintainers; [ cript0nauta zopieux ]; longDescription = '' You can access the webui when accessing http://127.0.0.1:8080 or http://[::1]:8080 in your webbrowser. By default it listens on From 71394c34478e5e53a8839980481e3eaea39254cd Mon Sep 17 00:00:00 2001 From: David <dlesl@users.noreply.github.com> Date: Sat, 31 Jul 2021 17:36:06 +0200 Subject: [PATCH 1073/1522] erlang-ls: skip tests on darwin --- pkgs/development/beam-modules/erlang-ls/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 7635e46237b..f2ba9a1815d 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: let version = "0.17.0"; owner = "erlang-ls"; @@ -32,7 +32,8 @@ rebar3Relx { HOME=. rebar3 ct HOME=. rebar3 proper --constraint_tries 100 ''; - doCheck = true; + # tests seem to be a bit flaky on darwin, skip them for now + doCheck = !stdenv.isDarwin; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/ From bf3fd5a7db0af881356e2433ef3dce82619329f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sat, 31 Jul 2021 23:02:39 +0000 Subject: [PATCH 1074/1522] gensio: 2.2.7 -> 2.2.8 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 3978c05f2c7..0cd2f79ea55 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g="; + sha256 = "sha256-6+hYytLMg5E1KTBPWSteVu2VjF0APkcoOiigqzrBI+U="; }; passthru = { From da663a953bb3345288acc0f890173ae3e5b34880 Mon Sep 17 00:00:00 2001 From: Robert Hensing <robert@roberthensing.nl> Date: Sun, 1 Aug 2021 01:03:57 +0200 Subject: [PATCH 1075/1522] ghostunnel: 1.5.3 -> 1.6.0 --- pkgs/tools/networking/ghostunnel/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 5d00b493bc3..d93ac670500 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,16 +7,25 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "15rmd89j7sfpznzznss899smizbyshprsrvsdmrbhb617myd9fpy"; + sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw="; }; - vendorSha256 = "1i95fx4a0fh6id6iy6afbva4pazr7ym6sbwi9r7la6gxzyncd023"; + vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU="; + + deleteVendor = true; + + # The certstore directory isn't recognized as a subpackage, but is when moved + # into the vendor directory. + postUnpack = '' + mkdir -p $sourceRoot/vendor/ghostunnel + mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/ + ''; meta = with lib; { description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications"; From 9a6d7eab73b9642eaea666e04bd9c18460511c40 Mon Sep 17 00:00:00 2001 From: Robert Hensing <robert@roberthensing.nl> Date: Sun, 1 Aug 2021 01:11:28 +0200 Subject: [PATCH 1076/1522] ghostunnel: Add passthru.tests.podman --- pkgs/tools/networking/ghostunnel/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index d93ac670500..c5b7d3db0f1 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -35,4 +35,5 @@ buildGoModule rec { }; passthru.tests.nixos = nixosTests.ghostunnel; + passthru.tests.podman = nixosTests.podman-tls-ghostunnel; } From 2730f105acd2aa4f866b45e33caf4c619558ef7d Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sat, 31 Jul 2021 20:20:19 -0300 Subject: [PATCH 1077/1522] arcan: 0.6.1pre1+unstable=2021-07-10 -> 0.6.1pre1+unstable=2021-07-30 --- pkgs/desktops/arcan/arcan.nix | 6 +++--- pkgs/desktops/arcan/wrapper.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan.nix index c6a57ecc3bd..6cd31001fa7 100644 --- a/pkgs/desktops/arcan/arcan.nix +++ b/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-10"; + version = "0.6.1pre1+unstable=2021-07-30"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "25da999e6e03688c71c7df3852314c01ed610e0d"; - hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44="; + rev = "885b2f0c9e031fd157af21302af2027ecbe3fe1f"; + hash = "sha256-tj5kPa5OWCGt7LTzo4ZYV1UjBpOrjQHER/K+ZfL3h+8="; }; postUnpack = '' diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index 4368b0ad3a5..e394e2e0897 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -20,9 +20,10 @@ symlinkJoin rec { --set ARCAN_BINPATH "${placeholder "out"}/bin/arcan_frameserver" \ --set ARCAN_LIBPATH "${placeholder "out"}/lib/" \ --set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \ - --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \ - --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/" + --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" done ''; } # TODO: set ARCAN_FONTPATH to a set of fonts that can be provided in a parameter +# TODO: set ARCAN_STATEBASEPATH to $HOME/.arcan/resources/savestates/ - possibly +# via a suitable script From bf0cd1ce16321de4823ede4fd7e6ac4c03a74d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <smancill@smancill.dev> Date: Thu, 29 Jul 2021 16:51:25 -0400 Subject: [PATCH 1078/1522] libcanberra/libcanberra-gtk2: fix build on darwin All libcanberra/libcanberra-gtk2/libcanberra-gtk3 packages were marked as broken on commit 806d814516c (libcanberra: mark broken on darwin, 2021-02-11), but only libcanberra-gtk3 is broken due to the missing header. This commit refactors how to enable GTK support, to mark just libcanberra-gtk3 as broken and allow building libcanberra and libcanberra-gtk2. libcanberra builds but the linker fails with: ld: file not found: /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon for architecture x86_64 clang-7: error: linker command failed with exit code 1 (use -v to see invocation) Adding Carbon to the inputs solves the problem. libcanberra-gtk2 builds and the linker finishes without the above error, most likely because it depends on gtk2 and gtk2 depends on Cocoa. Also fix some issues with the derivation: - Use pname/version instead of name. - Use lib.optionalString to set postPatch. - Only set passthru if building with GTK support, and ensure that the proper directory is passed for each GTK version. --- .../libraries/libcanberra/default.nix | 23 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 ++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 5d4bca0f1b9..92f05b8cd30 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,22 +1,25 @@ { stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool -, gtk ? null +, gtk2-x11, gtk3-x11 , gtkSupport ? null , libpulseaudio, gst_all_1, libvorbis, libcap -, CoreServices +, Carbon, CoreServices , withAlsa ? stdenv.isLinux, alsa-lib }: stdenv.mkDerivation rec { - name = "libcanberra-0.30"; + pname = "libcanberra"; + version = "0.30"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz"; + url = "http://0pointer.de/lennart/projects/libcanberra/${pname}-${version}.tar.xz"; sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ - libpulseaudio libvorbis gtk + libpulseaudio libvorbis ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) - ++ lib.optional stdenv.isDarwin CoreServices + ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 + ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 + ++ lib.optionals stdenv.isDarwin [Carbon CoreServices] ++ lib.optional stdenv.isLinux libcap ++ lib.optional withAlsa alsa-lib; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = (lib.optional stdenv.isDarwin) '' + postPatch = lib.optionalString stdenv.isDarwin '' patch -p0 < ${fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff"; sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31"; @@ -43,8 +46,8 @@ stdenv.mkDerivation rec { done ''; - passthru = { - gtkModule = "/lib/gtk-2.0/"; + passthru = lib.optionalAttrs (gtkSupport != null) { + gtkModule = if gtkSupport == "gtk2" then "/lib/gtk-2.0" else "/lib/gtk-3.0/"; }; meta = with lib; { @@ -62,6 +65,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found # #include <gdk/gdkx.h> - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && (gtkSupport == "gtk3"); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ef3ab8e60e..1fb91e0c20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,13 +16295,13 @@ in libcacard = callPackage ../development/libraries/libcacard { }; libcanberra = callPackage ../development/libraries/libcanberra { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; }; libcanberra-gtk2 = pkgs.libcanberra.override { - gtk = gtk2-x11; + gtkSupport = "gtk2"; }; libcanberra-gtk3 = pkgs.libcanberra.override { - gtk = gtk3-x11; + gtkSupport = "gtk3"; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) From db915d4cca276cddb5957bc97a4072a6e25a5d72 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sat, 31 Jul 2021 21:48:07 -0300 Subject: [PATCH 1079/1522] yambar: 1.6.1 -> 1.6.2 --- pkgs/applications/misc/yambar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 375b802d5c1..933f352e5e8 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { pname = "yambar"; - version = "1.6.1"; + version = "1.6.2"; src = fetchgit { url = "https://codeberg.org/dnkl/yambar.git"; rev = version; - sha256 = "p47tFsEWsYNe6IVV65xGG211u6Vm2biRf4pmUDylBOQ="; + sha256 = "sha256-oUNkaWrYIcsK2u+aeRg6DHmH4M1VZ0leNSM0lV9Yy1Y="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; From 72d43569121a8e3053e717a20dabb1ec550b40d0 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Sun, 1 Aug 2021 04:09:48 +0300 Subject: [PATCH 1080/1522] enlightenment: add wayland support --- pkgs/desktops/enlightenment/enlightenment/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 84cadd20949..76beac1392d 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -13,6 +13,7 @@ , xkeyboard_config , udisks2 +, waylandSupport ? false, wayland-protocols, xwayland , bluetoothSupport ? true, bluez5 , pulseSupport ? !stdenv.isDarwin, libpulseaudio }: @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection + ++ lib.optionals waylandSupport [ wayland-protocols xwayland ] ; patches = [ @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-D systemdunitdir=lib/systemd/user" - ]; + ] ++ lib.optional waylandSupport "-Dwl=true"; passthru.providedSessions = [ "enlightenment" ]; From 75b4fccfa4dde18a2761f5e3eb2b7a19baa32faf Mon Sep 17 00:00:00 2001 From: Mauricio Collares <mauricio@collares.org> Date: Sat, 31 Jul 2021 21:54:41 -0300 Subject: [PATCH 1081/1522] ecl: make sure boehmgc is available to gcc/linker --- pkgs/development/compilers/ecl/default.nix | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 083998049c1..d75418b41ef 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -47,20 +47,24 @@ stdenv.mkDerivation { (if threadSupport then "--enable-threads" else "--disable-threads") "--with-gmp-prefix=${gmp.dev}" "--with-libffi-prefix=${libffi.dev}" - ] - ++ - (lib.optional (! noUnicode) - "--enable-unicode") - ; + ] + ++ + (lib.optional useBoehmgc + "--with-libgc-prefix=${boehmgc.dev}") + ++ + (lib.optional (! noUnicode) + "--enable-unicode") + ; hardeningDisable = [ "format" ]; - postInstall = '' + postInstall = let + ldArgs = lib.strings.concatMapStringsSep " " + (l: ''--prefix NIX_LDFLAGS ' ' "-L${l.lib or l.out or l}/lib"'') + ([ gmp libffi ] ++ lib.optional useBoehmgc boehmgc); + in '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config - wrapProgram "$out/bin/ecl" \ - --prefix PATH ':' "${gcc}/bin" \ - --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \ - --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib" + wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs} ''; meta = { From d4d9dd61a192f98f88d86f62d3b5484fec0f2e17 Mon Sep 17 00:00:00 2001 From: Kevin Cox <kevincox@kevincox.ca> Date: Sat, 31 Jul 2021 20:20:28 -0400 Subject: [PATCH 1082/1522] dwarf-fortress-packages.twbt: Fix twbt version to match tfhack version. Otherwise you get an error upon starting the game: ``` Plugin twbt was not built for this version of DFHack. Plugin: 0.47.05-beta1, DFHack: 0.47.05-r1 ``` --- pkgs/games/dwarf-fortress/twbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 7882cf06a07..7d2816d97a4 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -52,8 +52,8 @@ let }; "0.47.05" = { twbtRelease = "6.xx"; - dfhackRelease = "0.47.05-beta1"; - sha256 = "sha256-Y6G0qBMHvotp/oyiqANlzXZVklL270dhskd135PnE9Q="; + dfhackRelease = "0.47.05-r1"; + sha256 = "1nqhaf7271bm9rq9dmilhhk9q7v3841d0rv4y3fid40vfi4gpi3p"; prerelease = true; }; }; From 4f0545c3d44ca09cbaa6295e17370abfadbf2d56 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <personal@ilanjoselevich.com> Date: Fri, 30 Jul 2021 11:57:06 +0300 Subject: [PATCH 1083/1522] vial: 0.4 -> 0.4.1 --- pkgs/tools/misc/vial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index c8d38d826d1..f1295e2b9dc 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.4"; + version = "0.4.1"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; + sha256 = "sha256-aN0wvgahWPNSXP/JmV1JWaEnARIOTyRdz1ko6eC7Y5s="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; From 092851ddeb92a08d674c03af7078ca14beec4240 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <personal@ilanjoselevich.com> Date: Fri, 30 Jul 2021 11:58:42 +0300 Subject: [PATCH 1084/1522] vial: gpl2Only -> gpl2Plus --- pkgs/tools/misc/vial/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index f1295e2b9dc..5685141e446 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; - license = licenses.gpl2Only; + license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes ]; platforms = [ "x86_64-linux" ]; }; From ad5c19a72808ef82b9299f1b516fdc6e22b0d277 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg <andersk@mit.edu> Date: Thu, 29 Jul 2021 20:57:14 -0700 Subject: [PATCH 1085/1522] =?UTF-8?q?zulip:=205.8.0=20=E2=86=92=205.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg <andersk@mit.edu> --- .../networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 6e3ef93ec77..1fce1a6b6e5 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.8.0"; + version = "5.8.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0z8lp56j6qvm57sfqdyqrqzj9add3drh1z4zsckg45jfw6yn3jdv"; + sha256 = "02m18y5j6jmmlygv8ycwaaq6n7mvj97ljhd3l9pvii0adwcvrpfz"; name="${pname}-${version}.AppImage"; }; From 6395aaba171b8be4d0c67f6e843051b834ccf0f0 Mon Sep 17 00:00:00 2001 From: Angus Trau <me@angus.ws> Date: Sat, 31 Jul 2021 21:39:12 +1000 Subject: [PATCH 1086/1522] darwin.apple_sdk.frameworks.AVFoundation: Add missing dependencies --- pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix | 9 +++++++++ pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index 6e987c5dfb4..228a084d250 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -141,6 +141,15 @@ in rec { cp -r ${MacOSX-SDK}/usr/include/libDER $out/include ''; }; + + simd = stdenv.mkDerivation { + name = "apple-lib-simd"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/include + cp -r ${MacOSX-SDK}/usr/include/simd $out/include + ''; + }; }; overrides = super: { diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index c8f8ccc4a08..96c0475c087 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -1,7 +1,7 @@ { frameworks, libs, libobjc, Libsystem, libnetwork }: with frameworks; with libs; { AGL = { inherit Carbon OpenGL; }; - AVFoundation = { inherit ApplicationServices AVFCapture AVFCore CoreGraphics; }; + AVFoundation = { inherit ApplicationServices AVFCapture AVFCore CoreGraphics simd UniformTypeIdentifiers; }; AVKit = {}; Accelerate = { inherit CoreWLAN IOBluetooth; }; Accessibility = {}; From 9ab9a8118c821ec22ce36eb26a4f69814c4a5d0a Mon Sep 17 00:00:00 2001 From: Angus Trau <me@angus.ws> Date: Sat, 31 Jul 2021 21:37:45 +1000 Subject: [PATCH 1087/1522] libgme: fix build on apple silicon --- pkgs/development/libraries/audio/libgme/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 2761eaf3753..d78756b0ca4 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake removeReferencesTo ]; + # These checks fail on aarch64-darwin + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; + # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. disallowedReferences = [ stdenv.cc.cc ]; From 6decab67c64131058021370653286d3e99e774bd Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 00:35:19 -0300 Subject: [PATCH 1088/1522] stella: 6.5.2 -> 6.5.3 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index ff90ae8908b..73e5990e112 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.5.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - hash = "sha256-CDLMOqSgRx75tjBoLycis/cckCNwgdlb9TRBlD3Dd04="; + hash = "sha256-Y9rEh9PZalQNj+d7OXN/8z5P8Hti4R3c2RL1BY+J1y4="; }; nativeBuildInputs = [ pkg-config ]; From bbf384f4cd71bf3646e7058719436c0996761e16 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 00:11:43 -0300 Subject: [PATCH 1089/1522] tcsh: 6.22.03 -> 6.22.04 --- pkgs/shells/tcsh/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 4d6c9556501..4fd4e5730a4 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.22.03"; + version = "6.22.04"; src = fetchurl { urls = [ @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc="; + hash = "sha256-6xY1YkMhjDLzngcljXK/iyHmLOlLsOipXjGLFROX4jE="; }; buildInputs = [ ncurses ]; @@ -28,12 +28,13 @@ stdenv.mkDerivation rec { }); meta = with lib; { + homepage = "https://www.tcsh.org/"; description = "An enhanced version of the Berkeley UNIX C shell (csh)"; longDescription = '' - tcsh is an enhanced but completely compatible version of the - Berkeley UNIX C shell, csh. It is a command language interpreter - usable both as an interactive login shell and a shell script - command processor. + tcsh is an enhanced but completely compatible version of the Berkeley UNIX + C shell, csh. It is a command language interpreter usable both as an + interactive login shell and a shell script command processor. + It includes: - command-line editor - programmable word completion @@ -41,10 +42,9 @@ stdenv.mkDerivation rec { - history mechanism - job control ''; - homepage = "https://www.tcsh.org/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; passthru = { From 556fd07764fcdd5320c1c173c0275e64c16c6226 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 01:01:36 -0300 Subject: [PATCH 1090/1522] qmplay2: 20.12.16 -> 21.06.07 --- pkgs/applications/video/qmplay2/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index 0e0580b9f2a..538f540c63b 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , cmake @@ -19,25 +20,27 @@ , vulkan-tools , wrapQtAppsHook }: - -let +stdenv.mkDerivation rec { pname = "qmplay2"; - version = "20.12.16"; -in stdenv.mkDerivation { - inherit pname version; + version = "21.06.07"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-+XXlQI9MyENioYmzqbbZYQ6kaMATBjPrPaErR2Vqhus="; + sha256 = "sha256-NV9uglYnqebXhMx8uL0DhGe9l5TBVjlSIaB4IWC8YAc="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ alsa-lib ffmpeg + libXv libass libcddb libcdio @@ -45,7 +48,6 @@ in stdenv.mkDerivation { libpulseaudio libsidplayfp libva - libXv qtbase qttools taglib From 35a3cbc754eb21cae5eb5f96d6e9ef0cc983d856 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 01:47:45 -0300 Subject: [PATCH 1091/1522] openmsx: 16.0 -> 17.0 --- pkgs/misc/emulators/openmsx/default.nix | 59 ++++++++++++++++++------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 61d416e17ac..f054b954b59 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,28 +1,55 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, SDL2_image +, SDL2_ttf +, alsa-lib +, freetype +, glew +, libGL +, libogg +, libpng +, libtheora +, libvorbis , python -, alsa-lib, glew, libGL, libpng -, libogg, libtheora, libvorbis -, SDL2, SDL2_image, SDL2_ttf -, freetype, tcl, zlib +, tcl +, zlib }: stdenv.mkDerivation rec { pname = "openmsx"; - version = "16.0"; + version = "17.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5"; + sha256 = "sha256-9PdUNahJZ2O6ASkzLW/uudP3hiIzTDpxzFy6Pjb8JiU="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config python ]; + nativeBuildInputs = [ + pkg-config + python + ]; - buildInputs = [ alsa-lib glew libGL libpng - libogg libtheora libvorbis freetype - SDL2 SDL2_image SDL2_ttf tcl zlib ]; + buildInputs = [ + SDL2 + SDL2_image + SDL2_ttf + alsa-lib + freetype + glew + libGL + libogg + libpng + libtheora + libvorbis + tcl + zlib + ]; postPatch = '' cp ${./custom-nix.mk} build/custom.mk @@ -30,19 +57,19 @@ stdenv.mkDerivation rec { dontAddPrefix = true; - # Many thanks @mthuurne from OpenMSX project - # for providing support to Nixpkgs :) + # Many thanks @mthuurne from OpenMSX project for providing support to + # Nixpkgs! :) TCL_CONFIG="${tcl}/lib/"; - meta = with lib;{ + meta = with lib; { + homepage = "https://openmsx.org"; description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. ''; - homepage = "https://openmsx.org"; + license = with licenses; [ bsd2 boost gpl2Plus ]; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - license = with licenses; [ bsd2 boost gpl2 ]; }; } From b12ba3668482b49bb275dad733da30becafbd9ff Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 01:12:59 -0300 Subject: [PATCH 1092/1522] mgba: 0.9.0 -> 0.9.2 --- pkgs/misc/emulators/mgba/default.nix | 35 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index fa25609dcdb..4d0f9855271 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -18,26 +18,15 @@ , wrapQtAppsHook }: -let - desktopItem = makeDesktopItem { - name = "mgba"; - exec = "mgba-qt"; - icon = "mgba"; - comment = "A Game Boy Advance Emulator"; - desktopName = "mgba"; - genericName = "Game Boy Advance Emulator"; - categories = "Game;Emulator;"; - startupNotify = "false"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mgba"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - hash = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; + hash = "sha256-A48PVUCekdRYel/BddPCeIcEDllOvcU7pk4i4P58dpo="; }; nativeBuildInputs = [ @@ -59,9 +48,21 @@ in stdenv.mkDerivation rec { qttools ]; - postInstall = '' - cp -r ${desktopItem}/share/applications $out/share - ''; + postInstall = let + desktopItem = makeDesktopItem { + name = "mgba"; + exec = "mgba-qt"; + icon = "mgba"; + comment = "A Game Boy Advance Emulator"; + desktopName = "mgba"; + genericName = "Game Boy Advance Emulator"; + categories = "Game;Emulator;"; + startupNotify = "false"; + }; + in + '' + cp -r ${desktopItem}/share/applications $out/share + ''; meta = with lib; { homepage = "https://mgba.io"; From 1437fd4a855f19f2b9686f9864bd22e356c02171 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Sun, 1 Aug 2021 04:02:18 -0300 Subject: [PATCH 1093/1522] dialog: 1.3-20210324 -> 1.3-20210621 --- pkgs/tools/misc/dialog/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix index 744f55aed10..dd31fed3583 100644 --- a/pkgs/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210324"; + version = "1.3-20210621"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM="; + hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g="; }; buildInputs = [ @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" ]; - installTargets = [ "install${lib.optionalString withLibrary "-full"}" ]; + installTargets = [ + "install${lib.optionalString withLibrary "-full"}" + ]; meta = with lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; From 555c3afaf2b17af6ad06ae82b545ca06e252bcd1 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Sat, 31 Jul 2021 12:36:49 +0200 Subject: [PATCH 1094/1522] chromium: Restructure gnFlags This doesn't cause any rebuilds because we use a set but should make it a bit easier to understand what's going on. This also moves two flags that where incorrectly in "optionalAttrs pulseSupport" (enabled by default) out of there. The native client deprecation is stated here: https://developer.chrome.com/docs/native-client/ --- .../networking/browsers/chromium/common.nix | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 377835489a2..15d415fdd54 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -259,25 +259,12 @@ let ''; gnFlags = mkGnFlags ({ + # Main build and toolchain settings: is_official_build = true; custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - use_sysroot = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gio = gnomeSupport; - # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', - # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it - enable_nacl = false; - # Enabling the Widevine component here doesn't affect whether we can - # redistribute the chromium package; the Widevine component is either - # added later in the wrapped -wv build or downloaded from Google. - enable_widevine = true; - use_cups = cupsSupport; - # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture. - rtc_use_pipewire = true; - + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; treat_warnings_as_errors = false; clang_use_chrome_plugins = false; blink_symbol_level = 0; @@ -288,6 +275,31 @@ let # Note: The API key is for NixOS/nixpkgs use ONLY. # For your own distribution, please get your own set of keys. google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + + # Optional features: + use_cups = cupsSupport; + use_gio = gnomeSupport; + use_gnome_keyring = gnomeKeyringSupport; + + # Feature overrides: + # Native Client support was deprecated in 2020 and support will end in June 2021: + enable_nacl = false; + # Enabling the Widevine component here doesn't affect whether we can + # redistribute the chromium package; the Widevine component is either + # added later in the wrapped -wv build or downloaded from Google: + enable_widevine = true; + # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: + rtc_use_pipewire = true; + + # TODOs: + # Disable PGO (defaults to 2 since M89) because it fails without additional changes: + # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version + chrome_pgo_phase = 0; # TODO + # Disable build with TFLite library because it fails without additional changes: + # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it + # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz + # See also chrome/services/machine_learning/README.md + build_with_tflite_lib = false; # TODO } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -296,14 +308,6 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - # Disable PGO (defaults to 2 since M89) because it fails without additional changes: - # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version - chrome_pgo_phase = 0; - # Disable build with TFLite library because it fails without additional changes: - # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it - # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz - # See also chrome/services/machine_learning/README.md - build_with_tflite_lib = false; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; From 7ad795da18399c3e1dc07bef876a8046fcf6a702 Mon Sep 17 00:00:00 2001 From: Enno Richter <enno@nerdworks.de> Date: Mon, 21 Jun 2021 12:45:59 +0200 Subject: [PATCH 1095/1522] snmpcheck: init at 1.9 --- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/tools/networking/snmpcheck/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/ruby-packages.nix | 10 +++++++ 4 files changed, 43 insertions(+) create mode 100644 pkgs/tools/networking/snmpcheck/default.nix diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index b3ddb5b1310..a3e7f41a2a0 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -131,6 +131,7 @@ source 'https://rubygems.org' do gem 'sinatra' gem 'slop' gem 'snappy' + gem 'snmp' gem 'sqlite3' gem 'taglib-ruby' gem 'thrift' diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/tools/networking/snmpcheck/default.nix new file mode 100644 index 00000000000..e27ead59e97 --- /dev/null +++ b/pkgs/tools/networking/snmpcheck/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, ruby }: + +let + rubyEnv = ruby.withPackages (ps: [ ps.snmp ]); +in +stdenv.mkDerivation rec { + pname = "snmpcheck"; + version = "1.9"; + src = fetchurl { + url = "http://www.nothink.org/codes/snmpcheck/snmpcheck-${version}.rb"; + sha256 = "sha256-9xkLqbgxU1uykx+M9QsbPAH8OI/Cqn9uw6ALe23Lbq0="; + executable = true; + }; + + dontUnpack = true; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/snmp-check + ''; + + meta = with lib; { + description = "SNMP enumerator"; + homepage = "http://www.nothink.org/codes/snmpcheck/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fb91e0c20e..2a7c09a710c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8944,6 +8944,8 @@ in libpng = libpng12; }; + snmpcheck = callPackage ../tools/networking/snmpcheck {}; + sniffglue = callPackage ../tools/networking/sniffglue { }; snort = callPackage ../applications/networking/ids/snort { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 957fe10d48f..c04c88697d1 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2522,6 +2522,16 @@ }; version = "0.2.0"; }; + snmp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xr7rwfk7mwxzqcgir0glmyy4j27g6yixfaswsbd2qn6r8c980qf"; + type = "gem"; + }; + version = "1.3.2"; + }; solargraph = { dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; From 6e4c660f49644bd2860b5149a2bb52f36d526712 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Sat, 31 Jul 2021 19:32:47 +0000 Subject: [PATCH 1096/1522] eksctl: 0.58.0 -> 0.59.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 aeeb6b2ca42..81585c92476 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.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-g7Lfx8Q2yEFk6/3r8+MUl8jehbRfVGfrZb1+WgA6TYA="; + sha256 = "sha256-qSZos1BO48Z5aiay8B/9DFGPgAOC8ib7IRjlFhzFh5Y="; }; vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; From 7c312a6cf9be35d7bde0e0c92fa21e4658f7e030 Mon Sep 17 00:00:00 2001 From: Aaron Janse <aaron@ajanse.me> Date: Sat, 31 Jul 2021 01:23:50 -0700 Subject: [PATCH 1097/1522] tahoe-lafs: 1.13.0 -> 2021-07-09 --- .../networking/p2p/tahoe-lafs/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index d55a46f609b..9f3ba60af84 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,18 +1,20 @@ -{ fetchurl, lib, nettools, pythonPackages, texinfo }: +{ lib, nettools, python3Packages, texinfo, fetchFromGitHub }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -pythonPackages.buildPythonApplication rec { - version = "1.13.0"; +python3Packages.buildPythonApplication rec { + version = "2021-07-09"; pname = "tahoe-lafs"; namePrefix = ""; - src = fetchurl { - url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; + src = fetchFromGitHub { + owner = "tahoe-lafs"; + repo = "tahoe-lafs"; + rev = "8e28a9d0e02fde2388aca549da2b5c452ac4337f"; + sha256 = "sha256-MuD/ZY+die7RCsuVdcePSD0DdwatXRi7CxW2iFt22L0="; }; outputs = [ "out" "doc" "info" ]; @@ -38,26 +40,30 @@ pythonPackages.buildPythonApplication rec { cd src/allmydata/test # Buggy? - rm cli/test_create.py test_backupdb.py + rm cli/test_create.py test_client.py # These require Tor and I2P. rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py + # Fails due to the above tests missing + rm test_python3.py + # Expensive rm test_system.py ) ''; - nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + nativeBuildInputs = with python3Packages; [ sphinx texinfo ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = with pythonPackages; [ - twisted foolscap nevow simplejson zfec pycryptopp darcsver - setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml magic-wormhole treq characteristic + propagatedBuildInputs = with python3Packages; [ + appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future + html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark + service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec + zope_interface ]; - checkInputs = with pythonPackages; [ mock hypothesis twisted ]; + checkInputs = with python3Packages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' @@ -90,6 +96,5 @@ pythonPackages.buildPythonApplication rec { license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; - broken = true; }; } From a5d975648da42e79dc4da422939d0fc588b23765 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 11:10:05 +0200 Subject: [PATCH 1098/1522] python3Packages.dufte: 0.2.12 -> 0.2.27 --- .../python-modules/dufte/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index d1c9680cb7b..b9a96cbc829 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -1,23 +1,23 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k +, fetchFromGitHub , pythonOlder , importlib-metadata , matplotlib , numpy -, exdown , pytestCheckHook }: buildPythonPackage rec { pname = "dufte"; - version = "0.2.12"; - disabled = !isPy3k; + version = "0.2.27"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "0ag1d7h1wijkc7v2vpgkbqjlnpiwd4nh8zhxiby0989bpmlp3jr3"; + src = fetchFromGitHub { + owner = "nschloe"; + repo = pname; + rev = version; + sha256 = "1i68h224hx9clxj3l0rd2yigsi6fqsr3x10vj5hf3j6s69iah7r3"; }; format = "pyproject"; @@ -28,13 +28,10 @@ buildPythonPackage rec { importlib-metadata ]; - preCheck = '' - export HOME=$TMPDIR - mkdir -p $HOME/.matplotlib - echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - ''; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ exdown pytestCheckHook ]; pythonImportsCheck = [ "dufte" ]; meta = with lib; { From 5b683507ec4be2d17540df047614b5fa692ee24e Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 11:11:21 +0200 Subject: [PATCH 1099/1522] python3Packages.perfplot: 0.9.5 -> 0.9.6 --- .../python-modules/perfplot/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 76f2f8d2931..8e15cc0be8d 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -7,20 +7,20 @@ , pipdate , tqdm , rich -, pytest -, isPy27 +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "perfplot"; - version = "0.9.5"; - disabled = isPy27; + version = "0.9.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; - repo = "perfplot"; + repo = pname; rev = "v${version}"; - sha256 = "1nr31a7qvipqjycw2flkabnhnc4drbi1xpjm8yjxw2gjzznd1jg4"; + sha256 = "11f31d6xqxp04693symc2dl8890gjaycrb2a35y5xy023abwir5b"; }; format = "pyproject"; @@ -34,20 +34,15 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - export HOME=$TMPDIR - mkdir -p $HOME/.matplotlib - echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - pytest test/perfplot_test.py - ''; + pythonImportsCheck = [ "perfplot" ]; meta = with lib; { description = "Performance plots for Python code snippets"; homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 85a09cf3a3edbdef5cd71856d424b3ce16b5978a Mon Sep 17 00:00:00 2001 From: Angus Trau <me@angus.ws> Date: Sat, 31 Jul 2021 21:38:12 +1000 Subject: [PATCH 1100/1522] pulseaudio: fix build on aarch64-darwin --- pkgs/servers/pulseaudio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 10b18dd1ae1..232b228394b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -92,7 +92,10 @@ stdenv.mkDerivation rec { "--with-bash-completion-dir=${placeholder "out"}/share/bash-completions/completions" ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" - ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" + ++ lib.optionals stdenv.isDarwin [ + "--with-mac-sysroot=/" + "--disable-neon-opt" + ] ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-gsettings"; From bc3416a2dddd3c7a2a3182373c392292ed8e22b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz> Date: Sun, 1 Aug 2021 11:28:58 +0200 Subject: [PATCH 1101/1522] squashfsTools: patch a channel-blocking bug Fixes #132286. --- pkgs/tools/filesystems/squashfs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2c8cd317f66..bec34463151 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , zlib , xz , lz4 @@ -23,6 +24,12 @@ stdenv.mkDerivation rec { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch + # Otherwise sizes of some files may break in our ISO; see + # https://github.com/NixOS/nixpkgs/issues/132286 + (fetchpatch { + url = "https://github.com/plougher/squashfs-tools/commit/19b161c1cd3e31f7a396ea92dea4390ad43f27b9.diff"; + sha256 = "15ng8m2my3a6a9hnfx474bip2vwdh08hzs2k0l5gwd36jv2z1h3f"; + }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd lz4 lzo ]; From 2808286add3e873db6e16e01b7062d3811d61afb Mon Sep 17 00:00:00 2001 From: Jamie McClymont <jamie@kwiius.com> Date: Sun, 1 Aug 2021 21:31:07 +1200 Subject: [PATCH 1102/1522] squashfsTools: add NixOS cdrom boot as passthru test This is the same test which blocks nixos-unstable-small. It recently caused a long blockage, due to a regression in squashfsTools itself corrupting the iso image, see #132286. --- pkgs/tools/filesystems/squashfs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index bec34463151..ee6a9d9a4c3 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -7,6 +7,7 @@ , lz4 , lzo , zstd +, nixosTests }: stdenv.mkDerivation rec { @@ -47,6 +48,10 @@ stdenv.mkDerivation rec { "LZO_SUPPORT=1" ]; + passthru.tests = { + nixos-iso-boots-and-verifies = nixosTests.boot.biosCdrom; + }; + meta = with lib; { homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; From abdd33edea66b9668c3b2d941d3cda2f6cb40730 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 11:48:12 +0200 Subject: [PATCH 1103/1522] python3Packages.pyfma: fix build --- .../python-modules/pyfma/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index d53c62e2f3a..e41d51c1771 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -1,31 +1,37 @@ { lib , buildPythonPackage -, isPy27 -, fetchPypi -, pybind11 -, exdown +, fetchFromGitHub +, importlib-metadata , numpy +, pybind11 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyfma"; version = "0.1.4"; + disabled = pythonOlder "3.7"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "5bc6bf57d960a5232b7a56bd38e9fe3dce0911016746029931044b66bdec46e9"; + src = fetchFromGitHub { + owner = "nschloe"; + repo = pname; + rev = "v${version}"; + sha256 = "1wkcl41j2d1yflc5dl30ys1yxx68w9zn3vj8brwkm1ar9jnfmg4h"; }; + format = "pyproject"; buildInputs = [ pybind11 ]; - checkInputs = [ - exdown + propagatedBuildInputs = [ numpy + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ pytestCheckHook ]; @@ -35,6 +41,6 @@ buildPythonPackage rec { description = "Fused multiply-add for Python"; homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; - maintainers = [ maintainers.costrouc]; + maintainers = with maintainers; [ costrouc ]; }; } From 976fbe0f1354485c326fbb85632eaa017f385299 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 12:09:34 +0200 Subject: [PATCH 1104/1522] python3Packages.dipy: 1.3.0 -> 1.4.1 --- pkgs/development/python-modules/dipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index 51d689f9859..3712dfbaee1 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.3.0"; + version = "1.4.1"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dipy"; repo = pname; rev = version; - sha256 = "0555abx0fwqmk6dc3im7r45d9j7r9xh6gm9mbwfwvlf7laf8h098"; + sha256 = "0zaqsiq73vprbqbzvzswjfmqgappl5vhpl2fwjrrda33c27klpzj"; }; nativeBuildInputs = [ cython packaging ]; From 28411cd6b0cab92cf6ae705ab09401fbacd88053 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 12:20:07 +0200 Subject: [PATCH 1105/1522] python3Packages.emoji: 1.4.1 -> .1.4.2 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 97a969abf16..0dabc80b1ca 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v.${version}"; - sha256 = "0gakvh8hfmfdjyp46bl18b2zm3grm3k5shiqrpzqlipbaxb7ifrk"; + sha256 = "072m0l1wcbz1jiyc2x5dx0b4ks5zri7m5lhjjy9sgq4qwlqsnr5n"; }; checkInputs = [ From 2d3fb59dbfade0bc3816412672b5a48833c226e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 12:31:17 +0200 Subject: [PATCH 1106/1522] python3Packages.datasets: 1.8.0 -> 1.11.0 --- pkgs/development/python-modules/datasets/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0141b79f5d6..27ee2ebedcf 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.8.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; + sha256 = "0pm14cp7xaagpf4j96v0ybi5gn3r9p0if3pc197ckwx6sw3lx29p"; }; propagatedBuildInputs = [ @@ -39,12 +39,6 @@ buildPythonPackage rec { xxhash ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' \ - --replace "huggingface_hub==0.0.2" "huggingface_hub>=0.0.2" - ''; - # Tests require pervasive internet access. doCheck = false; From 1005c971f5198f050d7be5a7c270fe6b869f2efe Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 1 Aug 2021 21:34:14 +1000 Subject: [PATCH 1107/1522] gdu: 5.3.0 -> 5.5.0 https://github.com/dundee/gdu/releases/tag/v5.4.0 https://github.com/dundee/gdu/releases/tag/v5.5.0 --- pkgs/tools/system/gdu/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index c50b2a4c84e..480645f1c94 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,21 +7,20 @@ buildGoModule rec { pname = "gdu"; - version = "5.3.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0="; + sha256 = "sha256-cnDYeL1BdxBaCZtK+DnIbtsTVUr3AujA50ttchPX6V0="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" From 3fc1cc5c033ce800ae92b0be748952595e5d3d4a Mon Sep 17 00:00:00 2001 From: Andrei Pampu <pampu.s.andrei@gmail.com> Date: Sun, 1 Aug 2021 14:38:44 +0300 Subject: [PATCH 1108/1522] bazarr: fix build --- pkgs/servers/bazarr/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index d15844e682e..63a8b13f4f8 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -1,25 +1,28 @@ -{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }: +{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }: stdenv.mkDerivation rec { pname = "bazarr"; version = "0.9.6"; + sourceRoot = "."; + src = fetchurl { - url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "sha256-aO9PIE/YlSIGEcntDCdxIYuuvV5jG266ldhC2QfT+e4="; + url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; + sha256 = "sha256-ZSQzDlObnv5DEra2+YgXhox583KPyGIjia0SJyTUPWo="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' - mkdir -p $out/src - cp -r * $out/src - - mkdir -p $out/bin - makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \ + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} + makeWrapper "${ + (python3.withPackages + (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ])).interpreter + }" \ $out/bin/bazarr \ - --add-flags "$out/src/bazarr.py" \ - --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \ + --add-flags "$out/share/${pname}-${version}/bazarr.py" \ + --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} ''; passthru.tests = { From 6376458424433ced446cbb9045641cb23c9b832d Mon Sep 17 00:00:00 2001 From: Profpatsch <mail@profpatsch.de> Date: Fri, 30 Jul 2021 14:58:39 +0200 Subject: [PATCH 1109/1522] sane: Add support for the unfree Fujitsu ScanSnap drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds the scanner files already linked from the `etc/sane.d/epjitsu.conf` file, which are extracted from the Windows drivers and mirrored on GitHub. Being a Japanese hardware vendor, Fujitsu’s software release & licensing methods are horrifying, but their scanners are some of the best, so we should definitly have discoverable support for them, which this patch hopefully adds. Inspiration was taken from the following sources: https://www.josharcher.uk/code/install-scansnap-s1300-drivers-linux/ https://ubuntuforums.org/archive/index.php/t-1461915.html https://github.com/stevleibelt/scansnap-firmware --- nixos/modules/services/hardware/sane.nix | 27 ++++++++++++++++++- .../graphics/sane/backends/default.nix | 13 ++++++++- pkgs/applications/graphics/sane/drivers.nix | 13 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/sane/drivers.nix diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 8c1bde7b415..ccf726bd182 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -4,7 +4,10 @@ with lib; let - pkg = pkgs.sane-backends; + pkg = pkgs.sane-backends.override { + scanSnapDriversUnfree = config.hardware.sane.drivers.scanSnap.enable; + scanSnapDriversPackage = config.hardware.sane.drivers.scanSnap.package; + }; sanedConf = pkgs.writeTextFile { name = "saned.conf"; @@ -98,6 +101,28 @@ in ''; }; + hardware.sane.drivers.scanSnap.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable drivers for the Fujitsu ScanSnap scanners. + + The driver files are unfree and extracted from the Windows driver image. + ''; + }; + + hardware.sane.drivers.scanSnap.package = mkOption { + type = types.package; + default = pkgs.sane-drivers.epjitsu; + description = '' + Epjitsu driver package to use. Useful if you want to extract the driver files yourself. + + The process is described in the <literal>/etc/sane.d/epjitsu.conf</literal> file in + the <literal>sane-backends</literal> package. + ''; + }; + services.saned.enable = mkOption { type = types.bool; default = false; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 821a97e3587..3d3c752dcde 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -2,12 +2,16 @@ , gettext, pkg-config, python3 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp , curl, systemd, libxml2, poppler +, sane-drivers # List of { src name backend } attibute sets - see installFirmware below: , extraFirmware ? [] # For backwards compatibility with older setups; use extraFirmware instead: , gt68xxFirmware ? null, snapscanFirmware ? null + +# Not included by default, scan snap drivers require fetching of unfree binaries. +, scanSnapDriversUnfree ? false, scanSnapDriversPackage ? sane-drivers.epjitsu }: stdenv.mkDerivation { @@ -88,7 +92,14 @@ stdenv.mkDerivation { # net.conf conflicts with the file generated by the nixos module rm $out/etc/sane.d/net.conf - '' + lib.concatStrings (builtins.map installFirmware compatFirmware); + + '' + + lib.optionalString scanSnapDriversUnfree '' + # the ScanSnap drivers live under the epjitsu subdirectory, which was already created by the build but is empty. + rmdir $out/share/sane/epjitsu + ln -svT ${scanSnapDriversPackage} $out/share/sane/epjitsu + '' + + lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with lib; { description = "SANE (Scanner Access Now Easy) backends"; diff --git a/pkgs/applications/graphics/sane/drivers.nix b/pkgs/applications/graphics/sane/drivers.nix new file mode 100644 index 00000000000..9f1a644f4fa --- /dev/null +++ b/pkgs/applications/graphics/sane/drivers.nix @@ -0,0 +1,13 @@ +{ lib, fetchFromGitHub }: + +{ + # Fujitsu ScanSnap + epjitsu = fetchFromGitHub { + name = "scansnap-firmware"; + owner = "stevleibelt"; + repo = "scansnap-firmware"; + rev = "96c3a8b2a4e4f1ccc4e5827c5eb5598084fd17c8"; + sha256 = "1inchnvaqyw9d0skpg8hp5rpn27c09q58lsr42by4bahpbx5qday"; + meta.license = lib.licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fb91e0c20e..63c64bb3e3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31830,6 +31830,8 @@ in sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); + sane-drivers = callPackage ../applications/graphics/sane/drivers.nix {}; + senv = callPackage ../applications/misc/senv { }; brlaser = callPackage ../misc/cups/drivers/brlaser { }; From b2402c5cd3aa0ef5d46e6f894079f20005d6dee5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sun, 1 Aug 2021 12:03:56 +0000 Subject: [PATCH 1110/1522] grpc: fix cross I couldn't find any alternative to setting _gRPC_PROTOBUF_PROTOC_EXECUTABLE. protobuf.cmake uses find_program when cross-compiling, which finds the host platform's protoc instead of the build platform's. I even tried giving protobuf multiple outputs and not including the one with the binary in buildInputs, but it didn't help. --- pkgs/development/libraries/grpc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2bf843241a6..62f0c2e3d31 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf +{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages +, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf, grpc , abseil-cpp, libnsl }: @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; buildInputs = [ c-ares.cmake-config openssl protobuf ] ++ lib.optionals stdenv.isLinux [ libnsl ]; @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_CXX_STANDARD=17" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ]; # CMake creates a build directory by default, this conflicts with the From 12bbb0fd7bd2d88ee232cf505b917f3873be0f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li> Date: Sun, 1 Aug 2021 14:44:46 +0200 Subject: [PATCH 1111/1522] nixos/syncthing: fix curl not retrying on network errors --- nixos/modules/services/networking/syncthing.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 63b249df735..2e92fe51e90 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -37,13 +37,9 @@ let do sleep 1; done curl() { - while - ${pkgs.curl}/bin/curl -Ss -H "X-API-Key: $api_key" \ - --retry 100 --retry-delay 1 --retry-connrefused "$@" - status=$? - [ "$status" -eq 52 ] # retry on empty reply from server - do sleep 1; done - return "$status" + ${pkgs.curl}/bin/curl -sS -H "X-API-Key: $api_key" \ + --retry 1000 --retry-delay 1 --retry-all-errors \ + "$@" } # query the old config @@ -547,6 +543,7 @@ in { cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {} ) { description = "Syncthing configuration updater"; + requisite = [ "syncthing.service" ]; after = [ "syncthing.service" ]; wantedBy = [ "multi-user.target" ]; From 0e43bf2e5c1d7960edcfdce49df6fb4b30b322a5 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com> Date: Sun, 1 Aug 2021 15:54:54 +0100 Subject: [PATCH 1112/1522] coursera-dl: fix tests --- pkgs/applications/misc/coursera-dl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 954501c0b7f..13386699ecb 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }: +{ lib, fetchFromGitHub, fetchpatch, glibcLocales, pandoc, python3 }: let pythonPackages = python3.pkgs; @@ -36,6 +36,13 @@ in pythonPackages.buildPythonApplication rec { py.test -k 'not test_get_credentials_with_keyring' . ''; + patches = [ + (fetchpatch { + url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch"; + sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; + }) + ]; + meta = with lib; { description = "CLI for downloading Coursera.org videos and naming them"; homepage = "https://github.com/coursera-dl/coursera-dl"; From ac7935480a8b786d267b20e5b84fdee842c954d0 Mon Sep 17 00:00:00 2001 From: Vladyslav M <dywedir@gra.red> Date: Sun, 1 Aug 2021 18:22:09 +0300 Subject: [PATCH 1113/1522] broot: add dywedir to maintainers --- pkgs/tools/misc/broot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index a5c456c0050..ac65ffcec2b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dywedir ]; license = with licenses; [ mit ]; }; } From cd3cb8a9e40b366462cb2edd86410b9aee18f1aa Mon Sep 17 00:00:00 2001 From: Vladyslav M <dywedir@gra.red> Date: Sun, 1 Aug 2021 18:24:16 +0300 Subject: [PATCH 1114/1522] broot: 1.6.0 -> 1.6.2 --- 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 ac65ffcec2b..9193e18d116 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.6.0"; + version = "1.6.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-H/QT/fmQI9sHjl6wMJjrfjvbOhY9VyBkAGetvcUqGrE="; + sha256 = "sha256-SjfTMBGby2jzmeNEtBVYqumLExhXW8nqxpbaeeaRM3w="; }; - cargoHash = "sha256-5mqLVbB/dLAk3Ck7ilHhVn0CB/6Ln82SaTxZ/vkx+9k="; + cargoHash = "sha256-BdSqTzXu7Glhr0fQGmnkg5BXYgdQS6jgfH3A9hPpECY="; nativeBuildInputs = [ installShellFiles From 173a37e7b5bb79566ca91876820235a88acea03d Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sun, 1 Aug 2021 12:22:53 +0000 Subject: [PATCH 1115/1522] lib.systems.doubles: re-sort These were alphabetically sorted until m68k and s390 were added. --- lib/systems/doubles.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index aa630b51ed8..741839de3aa 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,9 +26,9 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" - "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" - "m68k-linux" "s390-linux" + "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" + "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" + "riscv64-linux" "s390-linux" "x86_64-linux" # MMIXware "mmix-mmixware" @@ -39,9 +39,9 @@ let "riscv64-netbsd" "x86_64-netbsd" # none - "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" - "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" "m68k-none" - "s390-none" "x86_64-none" + "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" + "msp430-none" "or1k-none" "m68k-none" "powerpc-none" + "riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" From 3669b12f35aa4cce673191e061349e70bb3d4ddd Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sun, 1 Aug 2021 12:25:45 +0000 Subject: [PATCH 1116/1522] lib.systems: add m68k-netbsd support m68k was recently added for Linux and none, but NetBSD also supports m68k. Nothing will build yet, but I want to make sure we at least encode the existence of NetBSD support for every applicable architecture we support for other operating systems. --- lib/systems/doubles.nix | 4 ++-- lib/systems/parse.nix | 7 ++++--- lib/tests/systems.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 741839de3aa..e577059687b 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -35,8 +35,8 @@ let # NetBSD "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" - "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" - "riscv64-netbsd" "x86_64-netbsd" + "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" + "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 386f252f2ba..77e941a913c 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -127,9 +127,10 @@ rec { # GNU build systems assume that older NetBSD architectures are using a.out. gnuNetBSDDefaultExecFormat = cpu: - if (cpu.family == "x86" && cpu.bits == 32) || - (cpu.family == "arm" && cpu.bits == 32) || - (cpu.family == "sparc" && cpu.bits == 32) + if (cpu.family == "arm" && cpu.bits == 32) || + (cpu.family == "sparc" && cpu.bits == 32) || + (cpu.family == "m68k" && cpu.bits == 32) || + (cpu.family == "x86" && cpu.bits == 32) then execFormats.aout else execFormats.elf; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 6bd43f0d0d0..661b9bc8690 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests { testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ]; - testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; + testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); From c925232e679cd639fbb3185fee0d267365e99d39 Mon Sep 17 00:00:00 2001 From: Tom Repetti <trepetti@cs.columbia.edu> Date: Tue, 27 Jul 2021 17:10:26 -0400 Subject: [PATCH 1117/1522] lemon-graph: init at 1.3.1 --- .../libraries/lemon-graph/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/lemon-graph/default.nix diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix new file mode 100644 index 00000000000..04f0514781b --- /dev/null +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchurl +, cmake +}: + +stdenv.mkDerivation rec { + pname = "lemon-graph"; + version = "1.3.1"; + + src = fetchurl { + url = "https://lemon.cs.elte.hu/pub/sources/lemon-${version}.tar.gz"; + sha256 = "1j6kp9axhgna47cfnmk1m7vnqn01hwh7pf1fp76aid60yhjwgdvi"; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://lemon.cs.elte.hu/trac/lemon"; + description = "Efficient library for combinatorial optimization tasks on graphs and networks"; + license = licenses.boost; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.all; + broken = stdenv.isAarch64 || stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9edbebedf..9dc43e1dedc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16109,6 +16109,8 @@ in lmdbxx = callPackage ../development/libraries/lmdbxx { }; + lemon-graph = callPackage ../development/libraries/lemon-graph { }; + levmar = callPackage ../development/libraries/levmar { }; leptonica = callPackage ../development/libraries/leptonica { }; From a9b07d1cb70ff23d9f251e3b9323af3dd6222195 Mon Sep 17 00:00:00 2001 From: Jan Solanti <jhs@psonet.com> Date: Sun, 1 Aug 2021 18:48:48 +0300 Subject: [PATCH 1118/1522] renderdoc: 1.14 -> 1.15 --- pkgs/applications/graphics/renderdoc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index d6a2658d862..c48441b66c4 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -2,6 +2,7 @@ , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath +, waylandSupport ? false, wayland }: let custom_swig = fetchFromGitHub { @@ -11,22 +12,24 @@ let sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; }; pythonPackages = python3Packages; + cmakeBool = b: if b then "ON" else "OFF"; in mkDerivation rec { - version = "1.14"; + version = "1.15"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw="; + sha256 = "HSWl3FC5YDIADO3h6oHxHdwsrFQKKj2zTtH2e3cc5iI="; }; buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]); + ] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]) # TODO: figure out how to make cmake recognise pyside2 + ++ (lib.optional waylandSupport wayland); nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; @@ -42,6 +45,7 @@ mkDerivation rec { "-DBUILD_VERSION_DIST_VER=${version}" "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" "-DBUILD_VERSION_STABLE=ON" + "-DENABLE_WAYLAND=${cmakeBool waylandSupport}" ]; # TODO: define these in the above array via placeholders, once those are widely supported From bd13bd24ba3fbc6f46487f0d814fc1e41624ad5a Mon Sep 17 00:00:00 2001 From: davidak <davidak@users.noreply.github.com> Date: Sat, 31 Jul 2021 21:47:19 +0200 Subject: [PATCH 1119/1522] xboxdrv: update url --- pkgs/misc/drivers/xboxdrv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index e2894802839..bd4022526ed 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { dontUseSconsInstall = true; meta = with lib; { - homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; + homepage = "https://xboxdrv.gitlab.io/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ ]; From 88a326a9268b66c7182c669ad5066b2d10b6ead3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 1 Aug 2021 18:06:01 +0200 Subject: [PATCH 1120/1522] tt-rss-plugin-auth-ldap: fix compat with latest tt-rss --- pkgs/servers/tt-rss/plugin-auth-ldap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index d48db311ea1..23425b0a2d0 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { url = "https://github.com/Mic92/TTRSS-Auth-LDAP/commit/7534fa54babc377a070e05e326a46a252b5e3884.patch"; sha256 = "1p7zas0n627z0g226dp5m5dg1ai2z3vi69n3xivp517iv3lch70l"; }) + # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40 + (fetchpatch { + url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch"; + sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A="; + }) ]; installPhase = '' From 2682531c67cefc5110adfa546bfdc66e6374e91f Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Sun, 1 Aug 2021 09:06:53 +0200 Subject: [PATCH 1121/1522] chromium: Drop two gn overrides that are not required anymore The chromium and chromiumBeta builds still succeed. --- .../networking/browsers/chromium/common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 15d415fdd54..eb28146b09f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -290,16 +290,6 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; - - # TODOs: - # Disable PGO (defaults to 2 since M89) because it fails without additional changes: - # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version - chrome_pgo_phase = 0; # TODO - # Disable build with TFLite library because it fails without additional changes: - # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it - # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz - # See also chrome/services/machine_learning/README.md - build_with_tflite_lib = false; # TODO } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 9980dffc9bf5742dbb7257672d068f24dbee2acd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 1 Aug 2021 18:34:16 +0200 Subject: [PATCH 1122/1522] haskellPackages.tmp-postgres: disable flaky deps --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1e42ad0a4ac..935e56a9b97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -749,6 +749,9 @@ self: super: { # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { + # Flaky tests: https://github.com/jfischoff/tmp-postgres/issues/274 + doCheck = false; + preCheck = '' export HOME="$TMPDIR" '' + (drv.preCheck or ""); From 8c35a69a6ea206204ddfd3116c4497020b9f2724 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sun, 1 Aug 2021 19:04:49 +0200 Subject: [PATCH 1123/1522] nixos/captive-browser: fix startup It seems as since Chromium 92, `chromium` crashes on startup if `XDG_CONFIG_HOME` points to a read-only (store-)path. --- nixos/modules/programs/captive-browser.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 1f223e2475c..007b0369ec1 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,6 +27,7 @@ in browser = mkOption { type = types.str; default = concatStringsSep " " [ + ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' ''${pkgs.chromium}/bin/chromium'' ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' ''--proxy-server="socks5://$PROXY"'' @@ -111,6 +112,7 @@ in security.wrappers.captive-browser = { capabilities = "cap_net_raw+p"; source = pkgs.writeShellScript "captive-browser" '' + export PREV_CONFIG_HOME="$XDG_CONFIG_HOME" export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' browser = """${cfg.browser}""" dhcp-dns = """${cfg.dhcp-dns}""" From 0307a8af6ce903e217377d053d1157f816aa06fe Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 1 Aug 2021 18:19:11 +0200 Subject: [PATCH 1124/1522] pkgs/top-level/release.nix: build pkgsLLVM.stdenv as part of trunk Having pkgsLLVM.stdenv built with nixpkgs:trunk will make building anything in pkgsLLVM decidedly less painful since it will eliminate the need to build LLVM and clang locally, which shouldn't be as bad on hydra. Darwin is disabled for now since it doesn't evaluate correctly there (infinite recursion problem with the SDK). --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e04b6e7e681..dfb3b639b27 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -194,6 +194,7 @@ let idrisPackages = packagePlatforms pkgs.idrisPackages; agdaPackages = packagePlatforms pkgs.agdaPackages; + pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ]; pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ]; pkgsStatic.stdenv = [ "x86_64-linux" "aarch64-linux" ]; From 9fc2cddf24ad1819f17174cbae47789294ea6dc4 Mon Sep 17 00:00:00 2001 From: David Reaver <johndreaver@gmail.com> Date: Sun, 1 Aug 2021 10:18:03 -0700 Subject: [PATCH 1125/1522] 1password: 1.9.1 -> 1.11.2 (#131497) * 1password: 1.9.1 -> 1.11.2 Also, we are using the new `apple_universal` package 1password added to support amd64 and the new M1 architecture. If this is a problem, we can revert to 1.11.0 for now, which is the last version that uses the old `darwin_amd64` package. Co-authored-by: Mario Rodas <marsam@users.noreply.github.com> --- pkgs/applications/misc/1password/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index afe15949ee8..8f4ea3df18d 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.9.1"; + version = "1.11.2"; src = if stdenv.isLinux then fetchzip { url = { @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1x5khnp6yqrjf513x3y6l38rb121nib7d4aiz4cz7fh029kxjhd1"; - "x86_64-linux" = "1ar8lzkndl7xzcinv93rzg8q25vb23fggbjkhgchgc5x9wkwk8hw"; - "aarch64-linux" = "1q81pk6qmp96p1dbhx1ijln8f54rac8r81d4ghqx9v756s9szrr1"; + "i686-linux" = "0rh5bakj9qd43cf6wj5v46a3h98kcwqyc0f1yw72wvcacvjycyjz"; + "x86_64-linux" = "00nf0cb8cxk1pvzr1wq778wvikzrlzy38r3rzkq44whdpdj50jzx"; + "aarch64-linux" = "1gv282z49bj3ln5na4wb1z5455a64cyd54fp5i96k8shaxd0apxf"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0904wwy3wdhfvbkvpdap8141a9gqmn0dw45ikrzsqpg7pv1r2zch"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg"; + sha256 = "1pqdjr6d23j9fpwgahb0s1ni1bpjv9jajs1hapgq5kdrww2w7nhm"; }; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; From 28e5412f087c3ecf58fd959b65b35e0efe0dbee8 Mon Sep 17 00:00:00 2001 From: Louis Bettens <louis@bettens.info> Date: Sun, 1 Aug 2021 19:18:58 +0200 Subject: [PATCH 1126/1522] chia: unbreak --- pkgs/applications/blockchains/chia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 2c8e986fa86..d0ecdc4f72a 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { --replace "click==7.1.2" "click>=7.1.2" \ --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \ --replace "clvm==0.9.7" "clvm>=0.9.7" \ + --replace "bitstring==3.1.7" "bitstring>=3.1.9" \ ''; preCheck = '' From f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach <asbachb.github@impl.it> Date: Sun, 1 Aug 2021 12:11:12 -0600 Subject: [PATCH 1127/1522] soapui: 5.5.0 -> 5.6.0 (#131307) Co-authored-by: Benjamin Asbach <asbachb@users.noreply.github.com> --- nixos/tests/soapui.nix | 24 +++++++++++++++++++ .../networking/soapui/default.nix | 13 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/soapui.nix diff --git a/nixos/tests/soapui.nix b/nixos/tests/soapui.nix new file mode 100644 index 00000000000..205128df91f --- /dev/null +++ b/nixos/tests/soapui.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "soapui"; + meta = with pkgs.lib.maintainers; { + maintainers = [ asbachb ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment.systemPackages = [ pkgs.soapui ]; + }; + + testScript = '' + machine.wait_for_x() + machine.succeed("soapui &") + machine.wait_for_window(r"SoapUI \d+\.\d+\.\d+") + machine.sleep(1) + machine.screenshot("soapui") + ''; +}) diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 12301981f65..96d3de98d89 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,25 +1,30 @@ -{ fetchurl, lib, stdenv, writeText, jdk, maven, makeWrapper }: +{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper }: stdenv.mkDerivation rec { pname = "soapui"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "0v1wiy61jgvlxjk8qdvcnyn1gh2ysxf266zln7r4wpzwd5gc3dpw"; + sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk maven ]; + buildInputs = [ jdk ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java cp -R bin lib $out/share/java makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java + + runHook postInstall ''; patches = [ + # Adjust java path to point to derivation paths (writeText "soapui-${version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63c64bb3e3b..2a13a470668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8952,7 +8952,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - soapui = callPackage ../applications/networking/soapui { }; + soapui = callPackage ../applications/networking/soapui { + jdk = jdk11; + }; spglib = callPackage ../development/libraries/spglib { }; From 2c79ed45859a07565a49212a262bfd1f29e1546d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Sun, 1 Aug 2021 15:12:02 -0300 Subject: [PATCH 1128/1522] vimPlugins.onedark-nvim: Add lush-nvim dependency (#131987) * vimPlugins.onedark-nvim: Add lush-nvim dependency * Update pkgs/misc/vim-plugins/overrides.nix Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- pkgs/misc/vim-plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 60bd11803ca..de1789ca347 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -433,6 +433,10 @@ self: super: { }); }); + onedark-nvim = super.onedark-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); From b5fab53628e8f080bae24ea1396f72d9d21e1f9b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Sun, 1 Aug 2021 18:59:08 +0000 Subject: [PATCH 1129/1522] nixos/virtualbox-image: cast baseImageFreeSpace into str This fixes an evaluation error that's blocking the nixos-unstable channel (#132328). --- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 853dd642a76..1a0c4df42cb 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -136,7 +136,7 @@ in { inherit pkgs lib config; partitionTableType = "legacy"; diskSize = cfg.baseImageSize; - additionalSpace = cfg.baseImageFreeSpace; + additionalSpace = "${toString cfg.baseImageFreeSpace}M"; postVM = '' From a7b75189c61a798cda172d804c13a213ca181311 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 21:18:52 +0200 Subject: [PATCH 1130/1522] python3Packages.types-requests: 2.25.0 -> 2.25.1 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 0450da3f1a7..a291b23d3e2 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.0"; + version = "2.25.1"; src = fetchPypi { inherit pname version; - sha256 = "022q31fgiyq6zfjv4pbpg10hh9m7x91wqfc6bdyin50hf980q3gf"; + sha256 = "0vyr1vgg03a1gkjcz59iwqc1q9mx4ij7slslsp08z2h8fbhlwl9d"; }; # Modules doesn't have tests From ecae25c3ef137d972e909eb0e85960d90481789e Mon Sep 17 00:00:00 2001 From: David Arnold <dgx.arnold@gmail.com> Date: Wed, 28 Jul 2021 07:54:00 -0500 Subject: [PATCH 1131/1522] nixos/nix-daemon: fix registry flake type Before this commit, the `flake` option was typed with `types.unspecified`. This type get's merged via [`mergeDefaultOption`](https://github.com/NixOS/nixpkgs/blob/ebb592a04c5282f316d60cd4aba066f6e5d74b65/lib/options.nix#L119-L128), which has a line ```nix else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list) ``` `lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as a function and hence this line substitutes such attrs with a function (f: f x). If now, a flake input has a `__functor` as it's output, this will coerce the once attrs to a function. This breaks a lot of things later in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will fail for obious reasons. According to @infinisil, `types.unspecified` is due to deprecation. In the meantime this PR provides a specific fix for the specific problem discovered. --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 133e96da0ec..70b27b7d3d0 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -458,7 +458,7 @@ in description = "The flake reference to which <option>from></option> is to be rewritten."; }; flake = mkOption { - type = types.unspecified; + type = types.nullOr types.attrs; default = null; example = literalExample "nixpkgs"; description = '' From f95d9678a9d5444fa7c95665b9cad5eac654e2f2 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 22:48:53 +0200 Subject: [PATCH 1132/1522] tools/networking: replace name with pname&version --- pkgs/tools/networking/ahcpd/default.nix | 5 +++-- pkgs/tools/networking/aircrack-ng/default.nix | 5 +++-- pkgs/tools/networking/arpoison/default.nix | 5 +++-- pkgs/tools/networking/bsd-finger/default.nix | 5 +++-- pkgs/tools/networking/cadaver/default.nix | 5 +++-- pkgs/tools/networking/carddav-util/default.nix | 4 ++-- pkgs/tools/networking/cksfv/default.nix | 5 +++-- pkgs/tools/networking/curl-unix-socket/default.nix | 3 ++- pkgs/tools/networking/dhcpdump/default.nix | 7 ++++--- pkgs/tools/networking/dnstop/default.nix | 5 +++-- pkgs/tools/networking/dropbear/default.nix | 5 +++-- pkgs/tools/networking/email/default.nix | 3 ++- pkgs/tools/networking/filegive/default.nix | 5 +++-- pkgs/tools/networking/flvstreamer/default.nix | 6 +++--- pkgs/tools/networking/fping/default.nix | 5 +++-- pkgs/tools/networking/gftp/default.nix | 7 ++++--- pkgs/tools/networking/hyenae/default.nix | 7 ++++--- pkgs/tools/networking/iftop/default.nix | 7 ++++--- pkgs/tools/networking/imapproxy/default.nix | 8 +++++--- pkgs/tools/networking/imapsync/default.nix | 6 ++++-- pkgs/tools/networking/jnettop/default.nix | 7 ++++--- pkgs/tools/networking/jwhois/default.nix | 7 ++++--- pkgs/tools/networking/lsh/default.nix | 6 ++++-- pkgs/tools/networking/maildrop/default.nix | 7 ++++--- pkgs/tools/networking/miniupnpd/default.nix | 7 ++++--- pkgs/tools/networking/mpack/default.nix | 5 +++-- pkgs/tools/networking/nbd/default.nix | 9 +++++---- pkgs/tools/networking/ndisc6/default.nix | 5 +++-- pkgs/tools/networking/netboot/default.nix | 6 ++++-- pkgs/tools/networking/netcat/default.nix | 7 ++++--- pkgs/tools/networking/netkit/tftp/default.nix | 9 +++++---- pkgs/tools/networking/nss-mdns/default.nix | 5 +++-- pkgs/tools/networking/ntp/default.nix | 5 +++-- 33 files changed, 114 insertions(+), 79 deletions(-) diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 75a7fc83858..83647d17ae3 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ahcpd-0.53"; + pname = "ahcpd"; + version = "0.53"; src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz"; sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4"; }; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 33a90636659..f836fdf052f 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,10 +3,11 @@ , autoreconfHook, usbutils }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.6"; + pname = "aircrack-ng"; + version = "1.6"; src = fetchurl { - url = "https://download.aircrack-ng.org/${name}.tar.gz"; + url = "https://download.aircrack-ng.org/aircrack-ng-${version}.tar.gz"; sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"; }; diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index 6268d958204..64b3229fad6 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchzip, libnet }: stdenv.mkDerivation rec { - name = "arpoison-0.7"; + pname = "arpoison"; + version = "0.7"; buildInputs = [ libnet ]; src = fetchzip { - url = "http://www.arpoison.net/${name}.tar.gz"; + url = "http://www.arpoison.net/arpoison-${version}.tar.gz"; sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37"; }; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 189f636cd1f..354c669b336 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -3,10 +3,11 @@ # !!! Duplication: this package is almost exactly the same as `bsd-finger'. stdenv.mkDerivation rec { - name = "bsd-finger-0.17"; + pname = "bsd-finger"; + version = "0.17"; src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 70c7972bd65..7ded22f0103 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}: stdenv.mkDerivation rec { - name = "cadaver-0.23.3"; + pname = "cadaver"; + version = "0.23.3"; src = fetchurl { - url = "http://www.webdav.org/cadaver/${name}.tar.gz"; + url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz"; sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; }; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 300e03761a6..ed3f78d4da4 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, python3Packages, makeWrapper }: stdenv.mkDerivation { - - name = "carddav-0.1-2014-02-26"; + pname = "carddav"; + version = "0.1-2014-02-26"; src = fetchgit { url = "git://github.com/ljanyst/carddav-util"; diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 581d39636fa..cef09241420 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cksfv-1.3.15"; + pname = "cksfv"; + version = "1.3.15"; src = fetchurl { - url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; + url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2"; sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; }; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index ab4c3292ea5..3366001042d 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,7 +1,8 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { - name = "curl-unix-socket-2015-04-10"; + pname = "curl-unix-socket"; + version = "unstable-2015-04-10"; src = fetchFromGitHub { owner = "Soulou"; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index dba08fea795..b8bd1d88bf2 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation { - name = "dhcpdump-1.8"; +stdenv.mkDerivation rec { + pname = "dhcpdump"; + version = "1.8"; src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz"; + url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz"; sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; }; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index cee24f1976f..7669f6eec8f 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpcap, ncurses }: stdenv.mkDerivation rec { - name = "dnstop-20140915"; + pname = "dnstop"; + version = "2014-09-15"; src = fetchurl { - url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz"; + url = "http://dns.measurement-factory.com/tools/dnstop/src/dnstop-${lib.replaceStrings ["-"] [""] version}.tar.gz"; sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l"; }; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index f922a70344c..1fd686735b7 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2020.81"; + pname = "dropbear"; + version = "2020.81"; src = fetchurl { - url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"; }; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 5c24acb912f..2a6faa9c173 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -20,7 +20,8 @@ let in stdenv.mkDerivation { - name = "email-git-2016-01-31"; + pname = "email-git"; + version = "unstable-2016-01-31"; src = eMailSrc; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 1d7bf884edd..60dbd1c323b 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,10 +1,11 @@ { buildGoPackage, lib, fetchurl }: buildGoPackage rec { - name = "filegive-0.7.4"; + pname = "filegive"; + version = "0.7.4"; src = fetchurl { - url = "http://viric.name/soft/filegive/${name}.tar.gz"; + url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz"; sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index d31751e7d5c..2829b3967f9 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - - name = "flvstreamer-2.1c1"; + pname = "flvstreamer"; + version = "2.1c1"; src = fetchurl { - url = "mirror://savannah/flvstreamer/source/${name}.tar.gz"; + url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz"; sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; }; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 7974fdd244b..8e87eaf6942 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-5.0"; + pname = "fping"; + version = "5.0"; src = fetchurl { - url = "https://www.fping.org/dist/${name}.tar.gz"; + url = "https://www.fping.org/dist/fping-${version}.tar.gz"; sha256 = "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d"; }; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index b228967a73b..ab956a45b49 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: -stdenv.mkDerivation { - name = "gftp-2.0.19"; +stdenv.mkDerivation rec { + pname = "gftp"; + version = "2.0.19"; src = fetchurl { - url = "https://www.gftp.org/gftp-2.0.19.tar.bz2"; + url = "https://www.gftp.org/gftp-${version}.tar.bz2"; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index 5007a69fb9b..b0e579de220 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -1,12 +1,13 @@ {lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}: -stdenv.mkDerivation { - name = "hyenae-0.36-1"; +stdenv.mkDerivation rec { + pname = "hyenae"; + version = "0.36-1"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz"; + url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz"; sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index c3e71e6132d..abdb7d05b28 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: -stdenv.mkDerivation { - name = "iftop-1.0pre4"; +stdenv.mkDerivation rec { + pname = "iftop"; + version = "1.0pre4"; src = fetchurl { - url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz"; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index dd149f57432..ca0ce6f933f 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, openssl, ncurses}: -stdenv.mkDerivation { - name = "imapproxy-1.2.7"; +stdenv.mkDerivation rec { + pname = "imapproxy"; + version = "1.2.7"; + src = fetchurl { - url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2"; + url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2"; sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; }; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index bec0b197c18..4c91fb9096b 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: stdenv.mkDerivation rec { - name = "imapsync-1.727"; + pname = "imapsync"; + version = "1.727"; + src = fetchurl { - url = "https://releases.pagure.org/imapsync/${name}.tgz"; + url = "https://releases.pagure.org/imapsync/imapsync-${version}.tgz"; sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr"; }; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index bd31235b6f9..91f92236ecf 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,10 +1,11 @@ { fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }: -stdenv.mkDerivation { - name = "jnettop-0.13.0"; +stdenv.mkDerivation rec { + pname = "jnettop"; + version = "0.13.0"; src = fetchurl { - url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz"; + url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz"; sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 6eb26de82fc..5a79a09281c 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, lynx, fetchurl}: -stdenv.mkDerivation { - name = "jwhois-4.0"; +stdenv.mkDerivation rec { + pname = "jwhois"; + version = "4.0"; src = fetchurl { - url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz"; + url = "mirror://gnu/jwhois/jwhois-${version}.tar.gz"; sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs"; }; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index b03098d540a..5893579b1a7 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -2,9 +2,11 @@ , nettools, lsof, procps }: stdenv.mkDerivation rec { - name = "lsh-2.0.4"; + pname = "lsh"; + version = "2.0.4"; + src = fetchurl { - url = "mirror://gnu/lsh/${name}.tar.gz"; + url = "mirror://gnu/lsh/lsh-${version}.tar.gz"; sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091"; }; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index b258c638df5..14317273591 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, pcre, perl }: -stdenv.mkDerivation { - name = "maildrop-2.6.0"; +stdenv.mkDerivation rec { + pname = "maildrop"; + version = "2.6.0"; src = fetchurl { - url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2"; + url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2"; sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index aea0faddf5d..da950cdd2b8 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -7,12 +7,13 @@ let scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { - name = "miniupnpd-2.1.20190502"; + pname = "miniupnpd"; + version = "2.1.20190502"; src = fetchurl { - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz"; sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b"; - name = "${name}.tar.gz"; + name = "miniupnpd-${version}.tar.gz"; }; buildInputs = [ iptables libuuid ]; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 3aca81596e0..2c9bf4ff2d3 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mpack-1.6"; + pname = "mpack"; + version = "1.6"; src = fetchurl { - url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz"; + url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz"; sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 6478a15aa1a..3f3a9b2b723 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.21"; + pname = "nbd"; + version = "3.21"; src = fetchurl { - url = "mirror://sourceforge/nbd/${name}.tar.xz"; + url = "mirror://sourceforge/nbd/nbd-${version}.tar.xz"; sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk="; }; @@ -14,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" - cp README.md "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/nbd-${version}" + cp README.md "$out/share/doc/nbd-${version}/" ''; doCheck = true; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 6612315c6f2..6a728ec30bf 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.4"; + pname = "ndisc6"; + version = "1.0.4"; src = fetchurl { - url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2"; sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index e7d984a798b..fdd1857ef10 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot-0.10.2"; + name = "netboot"; + version = "0.10.2"; + src = fetchurl { - url = "mirror://sourceforge/netboot/${name}.tar.gz"; + url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz"; sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 7b325b2f484..ef035d3c671 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "netcat-gnu-0.7.1"; +stdenv.mkDerivation rec { + pname = "netcat-gnu"; + version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2"; + url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2"; sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 3a7a3a1deb4..3ebfa3b96bc 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "netkit-tftp-0.17"; + pname = "netkit-tftp"; + version = "0.17"; src = fetchurl { urls = [ - "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" - "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz" - "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" + "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" + "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" ]; sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 212f7bfc287..6faf1f06dbb 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, fetchpatch }: stdenv.mkDerivation rec { - name = "nss-mdns-0.10"; + pname = "nss-mdns"; + version = "0.10"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz"; sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 8c62e3b0d64..c8af08a3a30 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,10 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p15"; + pname = "ntp"; + version = "4.2.8p15"; src = fetchurl { - url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; + url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; From a3925908e47a25698eca625248e2664f37346e70 Mon Sep 17 00:00:00 2001 From: figsoda <figsoda@pm.me> Date: Sun, 1 Aug 2021 17:01:13 -0400 Subject: [PATCH 1133/1522] doc: rust: improve documentation on cargoLock.lockFile --- doc/languages-frameworks/rust.section.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f17e1ba8d8f..9de9a06465f 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -129,7 +129,15 @@ rustPlatform.buildRustPackage rec { ``` This will retrieve the dependencies using fixed-output derivations from -the specified lockfile. +the specified lockfile. Note that setting `cargoLock.lockFile` doesn't +add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still required +to build a rust package. A simple fix is to use: + +```nix +postPatch = '' + cp ${./Cargo.lock} Cargo.lock +''; +``` The output hash of each dependency that uses a git source must be specified in the `outputHashes` attribute. For example: From bee0468d7ba37fffc19d509eaffdd49bf30ed9e1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sun, 1 Aug 2021 23:13:09 +0200 Subject: [PATCH 1134/1522] captive-browser: 2019-04-16 -> 2021-08-01 Changes: https://github.com/FiloSottile/captive-browser/compare/08450562e58bf9564ee98ad64ef7b2800e53338f...9c707dc32afc6e4146e19b43a3406329c64b6f3c --- .../networking/browsers/captive-browser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 335223883fa..d764f74b614 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -2,20 +2,20 @@ buildGoPackage rec { pname = "captive-browser"; - version = "2019-04-16"; + version = "2021-08-01"; goPackagePath = pname; src = fetchFromGitHub { owner = "FiloSottile"; repo = "captive-browser"; - rev = "08450562e58bf9564ee98ad64ef7b2800e53338f"; - sha256 = "17icgjg7h0xm8g4yy38qjhsvlz9pmlmj9kydz01y2nyl0v02i648"; + rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; + sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y="; }; meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ volth ma27 ]; }; } From 1fd29a27e9ad2845599eb8ac7a29126522c07a00 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Mon, 26 Jul 2021 20:22:35 -0700 Subject: [PATCH 1135/1522] phosh: 0.12.0 -> 0.12.1 --- pkgs/applications/window-managers/phosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 9fa0959ed50..985814a0a13 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -37,14 +37,14 @@ let }; in stdenv.mkDerivation rec { pname = "phosh"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs"; + sha256 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq"; }; nativeBuildInputs = [ From acbf47a239bbd44a0805810570bd82fc91487f12 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Sun, 1 Aug 2021 13:03:19 -0700 Subject: [PATCH 1136/1522] phoc: 0.7.1 -> 0.8.0 --- pkgs/applications/misc/phoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index aad2a4d0e48..e599ffa39d7 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -36,14 +36,14 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn"; + sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; }; nativeBuildInputs = [ From 24bd0775ac7adb6d7b5a74cf945e6b8a5faf528f Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:50:58 +0200 Subject: [PATCH 1137/1522] psysh: deprecate phases --- pkgs/development/php-packages/psysh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index c12eb6b4585..6b7277130c0 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "sha256-6opSBKR5eI5HlaJy4A94JrxYfUtCCNVlyntmLZbWfOE="; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 1cdbdf986f39d2acd1c107cb2c4cb20f70c117c2 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:52:09 +0200 Subject: [PATCH 1138/1522] psalm: deprecate phases --- pkgs/development/php-packages/psalm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index b5c5550806f..95d8ca425fc 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "0d8gxkpm4rc00a8br5wzjpglkwx95kr15s4z3cvxyf6iik1j5r47"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From d3ea470996ca5809f958914061eb65ae6d985266 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:53:06 +0200 Subject: [PATCH 1139/1522] phpstan: deprecate phases --- pkgs/development/php-packages/phpstan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 048ae71ff29..90486c8c399 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 05f0fbc037cd98b7a90856bdf129dbbb51f4dc05 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:56:33 +0200 Subject: [PATCH 1140/1522] phpmd: deprecate phases --- pkgs/development/php-packages/phpmd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index bf6979f88ea..764d56475c4 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 9dc4202f94b81aaf78e7202c19d1187c2f8a4d28 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:57:28 +0200 Subject: [PATCH 1141/1522] php-cs-fixer: deprecate phases --- pkgs/development/php-packages/php-cs-fixer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 0c76ff56a60..2e6cc6723be 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "141rkcr0wbsqnc4s5vg4bk4dmxwigwxa3j0vi5c42b5k1lq3sgwr"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From d82296b1b95dcc1c07c6b1b7854ae75c00023a63 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:58:17 +0200 Subject: [PATCH 1142/1522] phpcs: deprecate phases --- pkgs/development/php-packages/phpcs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index 87433066ea9..baad111cec5 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 1ea3fb383037354877b088a879aca4a8a665f3d3 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:58:52 +0200 Subject: [PATCH 1143/1522] phpcbf: deprecate phases --- pkgs/development/php-packages/phpcbf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index caf3b515aab..cef7c2986e8 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 7fdeccc7b6b3ce170100cdabb8e9bbf6526e5b58 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 23:59:46 +0200 Subject: [PATCH 1144/1522] php/box: deprecate phases --- pkgs/development/php-packages/box/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 8ff61920ac8..b19b275019d 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -11,7 +11,8 @@ mkDerivation { sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18"; }; - phases = [ "installPhase" ]; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 05d1d550a0e8ea15abe3a05c3d96d528958da4d1 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:06:21 +0200 Subject: [PATCH 1145/1522] lilypond-fonts: deprecate phases --- pkgs/misc/lilypond/fonts.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index ca87db757cc..f1c80ad761b 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -13,8 +13,6 @@ let repo = fontName; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' local fontsdir="$out/share/lilypond/${lilypond.version}/fonts" From 6dd36f95f22836d6f5a1eb0b286a14f433413e2f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Sun, 1 Aug 2021 15:06:50 -0700 Subject: [PATCH 1146/1522] linux_xanmod: 5.13.6 -> 5.13.7 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index f86134264f3..62e88d01853 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.6"; - release = "2"; + version = "5.13.7"; + release = "1"; suffix = "xanmod${release}-cacule"; in buildLinux (args // rec { @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-sSsCgDBDFiQADHE+ZRqrMKVyGDwynirPU3NA2Olgpko="; + sha256 = "sha256-6SppDriZWzLu6Qye1e6ciiE+Ro63vDyabxfgWS/PTSo="; }; structuredExtraConfig = with lib.kernel; { From 6ef245969667210bac50e214f79a0cb84f825341 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski <markus.kowalewski@gmail.com> Date: Mon, 2 Aug 2021 00:12:34 +0200 Subject: [PATCH 1147/1522] rdma-core: 35.0 -> 36.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 25a8f3bdafa..242a4d03811 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "35.0"; + version = "36.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0ra0m1s0029qgcq0li7md6pkri7pcc4iy3cd6jrrqs9c6n1clnnd"; + sha256 = "0x3mpwmhln6brwrwix9abdq1bs9zi4qnr3r64vwqk7l6f43mqd30"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; From abea7db0ae0cdef21549eab9918491cac137a400 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:22:29 +0200 Subject: [PATCH 1148/1522] estudio: deprecate phases --- pkgs/misc/cups/drivers/estudio/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index 37b39556d93..5dd4c881505 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - phases = [ "unpackPhase" - "patchPhase" - "installPhase" ]; - patchPhase = '' patchShebangs lib/ gunzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz From 5a7d7dc19f774e66f83c7e214007107c7d89da2d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Sun, 1 Aug 2021 22:22:35 +0000 Subject: [PATCH 1149/1522] nixos/display-managers: update set-session for new "SessionType" property GDM 40.1 switched from storing X11 sessions in the "XSession" property on AccountService to "Session" with a "x11" "SessionType". For compatibility reasons, we should set both, since AccountService doesn't seem to provide the compatibility for us. --- nixos/modules/services/x11/display-managers/set-session.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/set-session.py b/nixos/modules/services/x11/display-managers/set-session.py index 0cca80af44e..75940efe32b 100755 --- a/nixos/modules/services/x11/display-managers/set-session.py +++ b/nixos/modules/services/x11/display-managers/set-session.py @@ -72,11 +72,14 @@ def main(): f"Setting session name: {session}, as we found the existing wayland-session: {session_file}" ) user.set_session(session) + user.set_session_type("wayland") elif is_session_xsession(session_file): logging.debug( f"Setting session name: {session}, as we found the existing xsession: {session_file}" ) user.set_x_session(session) + user.set_session(session) + user.set_session_type("x11") else: logging.error(f"Couldn't figure out session type for {session_file}") sys.exit(1) From a551dba0adbe57221545d9fec5bcefb1625e74e7 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:22:38 +0200 Subject: [PATCH 1150/1522] mfcl2700dncupswrapper: deprecate phases --- pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index d32968cc45c..0b145dfa385 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From 781875fac778bfd16d089911b0ec186919b629cd Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:23:08 +0200 Subject: [PATCH 1151/1522] mfcl2700dnlpr: deprecate phases --- pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 0d11579e954..4b60f548aad 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From 34aefcaa4084fd11c771a98f9c3f5578dce6b653 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:23:29 +0200 Subject: [PATCH 1152/1522] mfcl2720dwcupswrapper: deprecate phases --- pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 5d4980da9d1..f30f9abae33 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From de333f96fe4fc1992dcbe8ec0dd6547b593484a6 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:23:43 +0200 Subject: [PATCH 1153/1522] mfcl2720dwlpr: deprecate phases --- pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 2b6c458e745..fabcee4dc02 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From fcded91e5e43534e60866126a95dee5eabc18ad7 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:24:01 +0200 Subject: [PATCH 1154/1522] mfcl8690cdwcupswrapper: deprecate phases --- pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index ebb2e439298..a7fd86a3169 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From 78e576af86d045ada180b0f26f90c848584e973b Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:24:15 +0200 Subject: [PATCH 1155/1522] mfcl8690cdwlpr: deprecate phases --- pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 2b5dc44cead..ee9e8a07baa 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out From 7900764af668cd338ba3087d48592eada507ca3c Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 00:24:29 +0200 Subject: [PATCH 1156/1522] splix: deprecate phases --- pkgs/misc/cups/drivers/splix/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 1125e769711..eae42124063 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -10,8 +10,6 @@ let sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/share/cups/profiles/samsung cp * $out/share/cups/profiles/samsung/ From dde3503cfe095768fd41f9d5cb3b6d43756a998d Mon Sep 17 00:00:00 2001 From: davidak <git@davidak.de> Date: Mon, 2 Aug 2021 00:43:34 +0200 Subject: [PATCH 1157/1522] maintainers: add bobby285271 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e9e546005b..471ede67171 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1412,6 +1412,12 @@ githubId = 10221570; name = "Bo Bakker"; }; + bobby285271 = { + name = "Bobby Rong"; + email = "rjl931189261@126.com"; + github = "bobby285271"; + githubId = 20080233; + }; bobvanderlinden = { email = "bobvanderlinden@gmail.com"; github = "bobvanderlinden"; From 99172dc3d0ca0c2d3ab8c271c78b2f793380374f Mon Sep 17 00:00:00 2001 From: davidak <git@davidak.de> Date: Wed, 5 May 2021 21:39:54 +0200 Subject: [PATCH 1158/1522] maintainers: add pantheon team --- maintainers/team-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ff7d9eb3fb4..385f16ce1ec 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -167,6 +167,14 @@ with lib.maintainers; { scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; }; + pantheon = { + members = [ + davidak + bobby285271 + ]; + scope = "Maintain Pantheon desktop environment and platform."; + }; + php = { members = [ aanderse From 9f629693f349ec0064a67bfdbffdfd1e8f2fb08c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier <mail@sebastian-sellmeier.de> Date: Mon, 26 Jul 2021 17:41:07 +0200 Subject: [PATCH 1159/1522] seahorse: add glib-networking for sync --- pkgs/desktops/gnome/apps/seahorse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index d46aed7bbe9..d09a4c9ff3e 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -7,6 +7,7 @@ , pkg-config , gtk3 , glib +, glib-networking , wrapGAppsHook , itstool , gnupg @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib + glib-networking gcr gsettings-desktop-schemas gnupg From 08f3bf4844ab9a8e6b5235da0a4c73138ac7b9cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 01:01:10 +0000 Subject: [PATCH 1160/1522] bacon: 1.1.6 -> 1.1.8 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 52f0d29ed60..d883f3dccb8 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "1.1.6"; + version = "1.1.8"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0/fQhBHkoI/0PhuUDLGfyjytgEEJWSr1P67Rh0vGDnA="; + sha256 = "sha256-VM+suU3PLxGWXVIH26hbXFIfvRuJicLJX8D8fo1mZCM="; }; - cargoSha256 = "sha256-O1jJXnvPLxJmcnf3qpdcpdrogQ7FtjHF8uUxQRWLDyg="; + cargoSha256 = "sha256-FgqYKmCEBbyv6+2GD5NwEvRz3582IZtkuVPaAT77bvY="; buildInputs = lib.optional stdenv.isDarwin CoreServices; From b9c66d1b746bf7d707d4469d1ca2e2cf828b4709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 01:41:24 +0000 Subject: [PATCH 1161/1522] bupstash: 0.9.1 -> 0.10.0 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 44d16549cdd..e04f1b9e2eb 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DzRGhdUxfBW6iazpCHlQ9J8IL10FVxhac8kx6yBSGNk="; + sha256 = "sha256-0vDty8JPUOt7mmBzQ9t1lnUyExBYW4hPmzvvhLSZhcs="; }; - cargoSha256 = "sha256-IKk4VsO/oH4nC6F1W+JA3Agl7oXXNJ7zpP2PYpPLREU="; + cargoSha256 = "sha256-8W6uNLHCiCHB6mYyGnixiaHj1IyTnqjd8NaQG18W/uM="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From b8f14c331176c1fde5740b29fe8a27a2957a7bb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 01:57:46 +0000 Subject: [PATCH 1162/1522] checkstyle: 8.44 -> 8.45 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 4c735de89de..998dce59a8d 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.44"; + version = "8.45"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-tXTU5A4mKQ0DDWCE3VUXB3fbanHyFNSIcTMJ3NRlj6A="; + sha256 = "sha256-XFeufPaMz5rk+Ym0zXFCitoi9+mDs/PZUByIeZrj538="; }; nativeBuildInputs = [ makeWrapper ]; From df3c1f60d31158537b96ad4f19a9adbf83e84477 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 02:02:02 +0000 Subject: [PATCH 1163/1522] chezmoi: 2.1.2 -> 2.1.3 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index fd289f9cfb8..c1889b0e8c1 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA="; + sha256 = "sha256-F4ad2P4NF7MSp6Lttk9hjAixiMTG/vtMe7YItmXdc4w="; }; - vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; + vendorSha256 = "sha256-S/aP+oBH+bChoTLqqcB0aDzR7xtg9/qBqxxcLCwAbqY="; doCheck = false; From 5b6d308cd796a5dd7bf2acf7555f170b63e9b4eb Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane <starcraft66@gmail.com> Date: Sun, 1 Aug 2021 22:07:26 -0400 Subject: [PATCH 1164/1522] velero: 1.6.0 -> 1.6.2 --- .../networking/cluster/velero/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index b38787e2968..dd64d264ba4 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -3,15 +3,15 @@ buildGoModule rec { pname = "velero"; # When updating, change the commit underneath - version = "1.6.0"; - commit = "5bd70fd8eef316d220317245e46dc6016c348dce"; + version = "1.6.2"; + commit = "8c9cdb9603446760452979dc77f93b17054ea1cc"; src = fetchFromGitHub { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "sha256-2d4xsffh5DpxGahmzXpgUBRFAt5CsDnHCm8xU1ksqyQ="; + sha256 = "sha256-JYa+5lP9uo/6/5wTxNz8xa2usHo6WfXSndbwrMpHhcg="; }; buildFlagsArray = '' @@ -22,11 +22,15 @@ buildGoModule rec { -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; - vendorSha256 = "sha256-aQjtebIyV69nRwc/zvK/9v0mX3pAPKfOunSL/FpFZJU="; + vendorSha256 = "sha256-Rmj2qGY2w1gsnKAuRQ8cQyqfoM556t4/MookkuPmbDM="; - excludedPackages = [ "issue-template-gen" ]; + excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" ]; - doCheck = false; + doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e + doInstallCheck = true; + installCheckPhase = '' + $out/bin/velero version --client-only | grep ${version} > /dev/null + ''; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -43,6 +47,5 @@ buildGoModule rec { "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; - platforms = platforms.linux ++ platforms.darwin; }; } From db5c790cfde40ed5df99c03e299efd9979ce7827 Mon Sep 17 00:00:00 2001 From: klDen <kl@kenzymele.com> Date: Sun, 1 Aug 2021 22:12:52 -0400 Subject: [PATCH 1165/1522] jetbrains-jdk: 11.0.10-b1427 -> 11_0_11-b1504.13 The homepage has been updated. --- pkgs/development/compilers/jetbrains-jdk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index f3bd5d9f4a3..e36dedf3c87 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11.0.10-b1427"; + version = "11_0_11-b1504.13"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; - rev = "jb${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-2cn+FiFfGpp7CBeQMAASVZwTm6DOFaXaWxAL/nVC2Nk="; + rev = "jb${version}"; + sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i"; }; patches = []; meta = with lib; { @@ -23,7 +23,7 @@ openjdk11.overrideAttrs (oldAttrs: rec { JetBrains Runtime is not a certified build of OpenJDK. Please, use at your own risk. ''; - homepage = "https://bintray.com/jetbrains/intellij-jdk/"; + homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk11.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo petabyteboy ]; }; From 09dd17eaadf2c167c60c92c01e9e80ddff686f5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 02:58:17 +0000 Subject: [PATCH 1166/1522] disfetch: 2.2 -> 2.7 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 27407987d85..25c018a068a 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.2"; + version = "2.7"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "sha256-93nh1MDE2YO53lH2jDdKxgHh6v2KkAFo2Oyg+6ZpD+M="; + sha256 = "sha256-9VPyH7tJEOKCB95VtoIZJ6pL2hEiKTXrp9C7HBD+oxc="; }; dontBuild = true; From 10f574757c8040a565768c8de6b55f789353d6db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 04:49:08 +0000 Subject: [PATCH 1167/1522] gobgpd: 2.29.0 -> 2.30.0 --- pkgs/servers/misc/gobgpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 570b2b40c15..0a09293226e 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; + sha256 = "sha256-YerInFAUHFGEU0XSYeqKly9EiCq/uSjtMLnzI/ekSJ4="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; From a201a4877feaf177256a041e5be613df5222c9a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 05:31:40 +0000 Subject: [PATCH 1168/1522] headscale: 0.3.4 -> 0.3.6 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index bece609fc4e..c79d70e2617 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4="; + sha256 = "sha256-cjaA62YRfZSbXwbW1pz51hc/opCLsN26GxWnBcVTvyE="; }; - vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; + vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile From da4eadf384243a20bd6cd8066955bc067f360f12 Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Mon, 2 Aug 2021 07:49:30 +0200 Subject: [PATCH 1169/1522] =?UTF-8?q?ocamlPackages.dolmen:=200.2=20?= =?UTF-8?q?=E2=86=92=200.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/dolmen/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 815e1acd72a..56b87a4e971 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, menhirLib }: +{ lib, fetchurl, buildDunePackage +, menhir, menhirLib +, fmt +}: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-dolmen-${version}"; - version = "0.2"; - src = fetchFromGitHub { - owner = "Gbury"; - repo = "dolmen"; - rev = "v${version}"; - sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; +buildDunePackage rec { + pname = "dolmen"; + version = "0.6"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-v${version}.tbz"; + sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - buildInputs = [ ocaml findlib ocamlbuild menhir ]; - propagatedBuildInputs = [ menhirLib ]; + buildInputs = [ menhir ]; + propagatedBuildInputs = [ menhirLib fmt ]; - makeFlags = [ "-C" "src" ]; - - createFindlibDestdir = true; + doCheck = true; meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; + homepage = "https://github.com/Gbury/dolmen"; }; } From cbe6469cd7af668cd49c9c6e2b8c258b286408fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Mon, 2 Aug 2021 06:15:45 +0000 Subject: [PATCH 1170/1522] iosevka-bin: 8.0.2 -> 9.0.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 96d2ee8f013..860a7a8004f 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "8.0.2"; + version = "9.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 143cd225d27..f4847b482f3 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1gx0hkxch4m21yqwp8sifp6hzvn579w0jf5c2vfgp771yrilhj41"; - iosevka-aile = "1x4gjwj1a6q8vpihvyy0bpqsw3s1b546b5yi7918yqlam31kbfyl"; - iosevka-curly = "11w7f2v05zgdc5ac96v3dr93a2sganw6ggpl6vdhiqiqn1asfldi"; - iosevka-curly-slab = "052cwri7fc25yn314qqnjjjw1xssjjx4nin65r11589scyxzrh97"; - iosevka-etoile = "0p677iagypvyfx8gyja4qv0b5g39i2mh27cik6cjm22ri6fq3n8y"; - iosevka-slab = "05dzpd33ivsp2fjc7zdrsgad0ym8iq2lpdj5ic5ja3lkacnm7r9j"; - iosevka-ss01 = "1ln7fz9yjwgrrw069k3v65q0jp02298a4r68f7hk2l6bgj8c6dml"; - iosevka-ss02 = "11rihmzccq0yw0r08yclspksqs0rdyrfrfkhfzv0f9fh6c5qd30q"; - iosevka-ss03 = "1zyylszp4iykj2jyx9457jsl3m7lr2irc177m1wvvv68xg1vqjrv"; - iosevka-ss04 = "14pay7d0a5yymwkdhs6vsmcvzh27nml3asdy86dlpix0byzm72qi"; - iosevka-ss05 = "00y744phcvlbwwvk4kq05m1f8l1w7b3gk400yk3y1cmx4a4168jw"; - iosevka-ss06 = "1g7pj3js22kmcnv654n6d0fdykf9jkarwbji3vzajnxqgpv03j5x"; - iosevka-ss07 = "1rv1bf9vffqc99l8dhh4v9ms6pkbxxjgzf7skq02gfr27avj1lln"; - iosevka-ss08 = "0s54csx64khdyzlb7k6m9cx9cqjj9cdymsbzhksv0fdbf3cc71ns"; - iosevka-ss09 = "0zvy010ll38dlisjggmgw8k991wwcnzzvpjyqybxpxb8hk3jfxyn"; - iosevka-ss10 = "1b5fk4hwzqg7p1b7h9vw9nc65pl0sp5h6k41jrmpdjr0nkjhm0zl"; - iosevka-ss11 = "1b9bpg43n0vh0bigaq6y510w7lpsf54v82nvdxl48vp225kibr52"; - iosevka-ss12 = "0w2ykjzjqxmp4r7yl10cpr802xpmww4nvi7nca7kj5scl30mrd4g"; - iosevka-ss13 = "1cg59jx44yyi5y6rvdvasmq0n0vqdbcli1rxhfqgwfx1rkwnxy27"; - iosevka-ss14 = "0xi6jpa8fapk72c77yljp07zdl0hdmdg9giyysllih3j2r4l1mrw"; - iosevka-ss15 = "1qv7qh4wzkq7d5rmn19hhmv447sc8hd390nrajwk2a900vfh8xlk"; - iosevka-ss16 = "1gkrhqn1k5y6q87p09nz1lcafmryl7l3s5aqx265y0dqfrni5rfg"; - iosevka-ss17 = "18plv1f9brn8kh7b3jz2imjwash72vlzbnciam41q8i4m47m7dj7"; - iosevka-ss18 = "177qy927siihpzaf4k4sfl9zbp2krbmlg56qzrcm2jbswlnmkyjx"; - sgr-iosevka = "1np4v340r33vrb92cwx68lvsk6prg2swj4a6x9iig8lbc7fjk7fy"; - sgr-iosevka-aile = "09fyslcr7vazfw7js27s0pd7immqd7ics4dihj54k12w8mjfj0fg"; - sgr-iosevka-curly = "1yva4sx4dgfh4274c5sdkllr2d973ifxpn5jkxp428xhpyx9aq5b"; - sgr-iosevka-curly-slab = "1vsngc45l30lmksvlnfr5b8xxnjsvpaqia4fzvx70napm5z6py4w"; - sgr-iosevka-etoile = "033b8w59qbjg17qlbw1lsc8shwklbcvbr0m0ldk0frd08qz2kpmk"; - sgr-iosevka-fixed = "0qyf6pmichpd4yd821k17dy0chb3rslifqm7jjhbl8kkrylf1f2c"; - sgr-iosevka-fixed-curly = "01y8zc5w7jbb7m959db63msdfhp93ckfmm4nxh8fzg6ps3zpf4dy"; - sgr-iosevka-fixed-curly-slab = "04dn2pirw771d5la702l1n8yxc46k6mlivryqlr3kd7z6c4jylca"; - sgr-iosevka-fixed-slab = "1fnzlwlp67mwrw8l4mpylpv2mfday5b9mcjjwc9diymg85gvmz38"; - sgr-iosevka-fixed-ss01 = "0259mn0p6z43ks13355czbm8pnrb7d8qwfl8kfyrnb6gaj1wa0fd"; - sgr-iosevka-fixed-ss02 = "074jdv3w6461bg3iqgwxv8wfrp0ph2sgqc51y1hg7cx26nrs727x"; - sgr-iosevka-fixed-ss03 = "0s5f2138js5w87khv1b5wzg1h96rhv77vw652m45qhqml0ivj5i6"; - sgr-iosevka-fixed-ss04 = "1mbsjgbfj8m95bb4v0dw3f30hx2kq94bz9q9xv57bs80nmyb8a9b"; - sgr-iosevka-fixed-ss05 = "1zkb9q20f9yb3qp7a092kfaag9izsqxi1nljksbg8qya4iiy22fw"; - sgr-iosevka-fixed-ss06 = "1xkd6nrh0s7dwk326bjk1wn6sa9d3d5r54q48i6giz43fg1j5six"; - sgr-iosevka-fixed-ss07 = "0vxwwy5cizq0d5dswakwbncn9jq299ppc17c7dxqjmgxwkawrd06"; - sgr-iosevka-fixed-ss08 = "08asq61zv353975h9zfv0rrn0g9x5c2l542aqhvi8kbcr702a8an"; - sgr-iosevka-fixed-ss09 = "1qldik6k3ycgq1w95z5l1iwr55jjgc94w3d10gncwl41agz8mav8"; - sgr-iosevka-fixed-ss10 = "00mylfjic10aiyfrzv0inq3i18qj97f999f86szrf8mxf9na8b73"; - sgr-iosevka-fixed-ss11 = "1ggnkqf8l8fdkyimcpjgrlc1sdkzdhd79zaygfzg4fhbfxvm7g9w"; - sgr-iosevka-fixed-ss12 = "13lgy12crxxvlj99iy3l0ag2wc20migx9l4abz04mjjh8cgvk10b"; - sgr-iosevka-fixed-ss13 = "0vk7b5xg67myrw69m5gjxchsgp4af5pwspdscklb739w66v42daq"; - sgr-iosevka-fixed-ss14 = "1dap836qgkm62p7xivdc4jmirr75m9m5w9srr1qwsc5vfly4w63j"; - sgr-iosevka-fixed-ss15 = "12alzyp3c8c9h89kqkiw7spwwahi89w9mcgrggizgjqzm5n6qvwc"; - sgr-iosevka-fixed-ss16 = "1h0wa3g6vrpi86qshx187c2a26kh7ccy89rxi2kxajqis8lc9c25"; - sgr-iosevka-fixed-ss17 = "1hlhi5fllz3sb3p25im7ymvcvhf761iafkiass2cw83l2ypbh9ph"; - sgr-iosevka-fixed-ss18 = "0cwkbj232kb0nwvy59wjinxk6ncck5yg9594p49fx6016qxsv022"; - sgr-iosevka-slab = "1imc9pamhxd5pm3xv274yv2qbnsd258rxz0skq7kc5f647bfb1dn"; - sgr-iosevka-ss01 = "0j97757fj595mlr9mgc5vkqxriskxzc1cch0sk9fb2qvr0gpyjvk"; - sgr-iosevka-ss02 = "0j1i9zakq2svfp727sxhcnqhrb0962pzdc7g0bdxgvxwdhmqzqn1"; - sgr-iosevka-ss03 = "1bz95n1xpx756sfsgyshnaqrrygvh3pmcmxjqjyc0yk5f3aawqgm"; - sgr-iosevka-ss04 = "11c4q2dsfkqbw1ppw2r2x932mhlr6bq8sc1hr6z7pvflx3kvdgdg"; - sgr-iosevka-ss05 = "1jwy3wfd4yk6q4cyrry2s3hgkg0pbnn8mmr7w5wpgph4sg2lyrs4"; - sgr-iosevka-ss06 = "0b4rilasn6zkrwf6dfxgrd957r8sjkw259acp1fnsc2wjpi27krf"; - sgr-iosevka-ss07 = "0rvprfprypd54rnjsza0z6xswx22k4mva6pq8qs8fl8kfp3b92kk"; - sgr-iosevka-ss08 = "0jfq72pi9bfmldxk8rnb3hv5kq7bps4pbs15k307avadj80dy107"; - sgr-iosevka-ss09 = "1rlckb7djrkv1bicrp8nkszvk5wkkyhm6f88br13prqhsfbkdfpi"; - sgr-iosevka-ss10 = "0v6jqs75s0xqplgxxk09ah7gpbajajwbyfcmifq2db4sv65bkalj"; - sgr-iosevka-ss11 = "1avc38qc0r7ylmvmyw9lcdimsmh3xha675qzz7gxwalp1mp6d2zp"; - sgr-iosevka-ss12 = "1y9sbvq0mdhzwkaih2gh9jg07993jzjymjgmcn52kvygyn4jc8vf"; - sgr-iosevka-ss13 = "1xsgm6301vfpvsp0z3n3wbv03557whrnkw0cb9vkb9hbww5sjcq6"; - sgr-iosevka-ss14 = "0fvj6amlgifnppfwgvl39vq76aww170wiici596zqvbddl8hhf0k"; - sgr-iosevka-ss15 = "1ihsw196wbkr6cmisf7yasd3cfipz17033crjhsmh6f5q85705l7"; - sgr-iosevka-ss16 = "1b6w69cjmaa0a29yklly9b26m5ivrn5rpygrsbzsrfadgm6h9xcb"; - sgr-iosevka-ss17 = "1zvqrpg1m5i9af80qs847lz139zj1awx6akr7m3alwpz6jm178yd"; - sgr-iosevka-ss18 = "1vw5swd09a0xplz367f26li0ksf5c54a0rf65dr62nviilvlphmx"; - sgr-iosevka-term = "0zc1n1ansv5r4ph9xshm8vaj96m718ypagg4v9in0a0mdgpdp6il"; - sgr-iosevka-term-curly = "1z487mq31afz0cpc7mfpny5x1wq8vdf2c0mmzhr46bcncinwinll"; - sgr-iosevka-term-curly-slab = "15iw3mpy75486ybws9ya4x1bn9y00v1v40clcxjcbk276bfw121p"; - sgr-iosevka-term-slab = "0y6wym3knhcvw1dlrqy9h8f68rsfpwwlb2hl9kdcfrv5zmd8mngy"; - sgr-iosevka-term-ss01 = "03q1j73jwhi54hp3dfx3yj4vabmsrgiy8g5jk6lqcmqk6d42zhgq"; - sgr-iosevka-term-ss02 = "10i1wb4if30zf61ridmqks7j2915yrs72plbv6wy7c4x1qdawhy1"; - sgr-iosevka-term-ss03 = "05ywks1ikwgwxksx0jxawp2a9gaka76gknzxxxzxxvd3x7g6qh4v"; - sgr-iosevka-term-ss04 = "15n5ky9yppcb5gz1pqm77hqihc2br0v52silg2d5yaj1fp4lzjpr"; - sgr-iosevka-term-ss05 = "05p8sc1cjj9412bnyq3xda0v8xrzgf5g6ikgkanps3glvvvlkf3m"; - sgr-iosevka-term-ss06 = "0w6zra0hpdyl0pkm9hdv4171fcgksv1s75wmwrh50dwnlv2hlns3"; - sgr-iosevka-term-ss07 = "0zg9bnrfh3kbq69v4ih8yna70hzdbkbz1x0fminp79s0j9c66fjs"; - sgr-iosevka-term-ss08 = "0sqv98xg1z5p30npg66s2z2wh139prs7960d8y06s09k0npjzlsz"; - sgr-iosevka-term-ss09 = "0cqw79mf969kwbz5gwif3qg0zxk7pdbncpvq24m6kdws7sry06p4"; - sgr-iosevka-term-ss10 = "15vaj99l2xrlcqg7712ksjcz0nwba7nlqcfc2angmw8zy163qg23"; - sgr-iosevka-term-ss11 = "0rcn1761jv9wzi1nzl7sy57msw754yxys468jkacdpskqymfrhly"; - sgr-iosevka-term-ss12 = "0l1f60gvvswnc02w8ylzsk37px0j0jv75pbc572p012x3mvkqipw"; - sgr-iosevka-term-ss13 = "0nl7qbgas1zybi7gm6jr5rgzmk2vylh3ky8ggzlkljn9zw4mm1sn"; - sgr-iosevka-term-ss14 = "0nyvayy0xj9gv21s6yjfp9xa6g4qih8lpvsrsinic4jgjhjxxn1l"; - sgr-iosevka-term-ss15 = "14p7cq5rfr8f7lzi5q7q48a5rrvrd9mghkwr09a0m9fyqav2bnwh"; - sgr-iosevka-term-ss16 = "17b88cv3ylnlybw4zlaa2y55s63p4ylrjk8y15p27knkwf0j7km3"; - sgr-iosevka-term-ss17 = "1fh3b47g6faswq4ppksa6kkq5l1wpkq8c523ffakmjgjw92za7qi"; - sgr-iosevka-term-ss18 = "161afvra35nfvk5crri1jfnwm579wbdn6r16afzq8fr5g46ddcla"; + iosevka = "051yyvdhb8an7v5qsv9fd70z3dqrvg1y67mr0xf4wsbfpxpd10zh"; + iosevka-aile = "1f7yvybfgf1in9b0w1zqzbcla7brzdx7hh00nk7mjbpl943qjcls"; + iosevka-curly = "0bf294ccnp2ppzqr9xs142pgkch7vvh2p9s4dh2xmilrzrqi1qmr"; + iosevka-curly-slab = "0ga30kwxd6984db4wfqzxfh6frqj3lp7745m4iqknx874p80gg3n"; + iosevka-etoile = "11xxq6c8ppcr2y3wdzk2hklml32ga29vxw1qdmsbnj9pqykm0ik6"; + iosevka-slab = "1b88f6y39d9qfpmv5lkrwnpkn5b6khj6nc2isbc49fprr7i5ycqf"; + iosevka-ss01 = "1q0l0bi19bsq76y485l6mz9nl3bs2jqkyk6ny7z77kzdz3azipg9"; + iosevka-ss02 = "1d44anwkmvvmw3z48w4p1n8pz7w0b7vwng3r087cmad8xhq1hcr1"; + iosevka-ss03 = "1wihzc299f3ybw4c52xxmv2my129qbwmpr5n8z0rx939h951f9m3"; + iosevka-ss04 = "1xzp2bkwl70c3524n7ajvjlb3zpgz35qrjbfhfr6hp42n8gj1ygx"; + iosevka-ss05 = "17y8ham2dpa8yl3x393vic550f11bcjbgqlqdhpikwgb30012znw"; + iosevka-ss06 = "0bb870gxv4f1jx1mc3znk7nh6cqjywx27y1w36brzp44lg20cjkp"; + iosevka-ss07 = "12rh1a2499dr4bbmrq79b9qrf4a27ib5l8yvk817kig0dz8fvr7h"; + iosevka-ss08 = "1bf307b0qr657jy73gq4y1wk3fwwzhpqyvcyhwl8ayanml99yiz8"; + iosevka-ss09 = "1ydr6bjymsbpkplnxkav5v8ghnadrcghjz34gj6xb8lgk1kx5d1n"; + iosevka-ss10 = "0429lnsc3vg1vlr0yxpah7j7bm352ys0yhl9vclqabbmkxjr9fjz"; + iosevka-ss11 = "0ibqd20l3aalf72cia4k7z6a20sdaflb9kdiz90h5g769x0yc10a"; + iosevka-ss12 = "1sjgk4nfgis4qbdyj9lfa7piwdixirx92769xmdgh8b0wwg1vhyq"; + iosevka-ss13 = "0sgrxgss14ar104hc12zfim1pjs9nishmf4w8pyl0yjnxdmap9qq"; + iosevka-ss14 = "176a3y0sk7fw93g8c7gwxsmiid3237k2mlff3qbm1nvcyxqnsxbi"; + iosevka-ss15 = "1cb2g5aqxjbisyvy729sk70b169rvxcb0414nhrwa3jgcr807i31"; + iosevka-ss16 = "12x58vdjchfyp0gak7r5wqfv1bc9scr0d76kmibscyrlc8ml50n0"; + iosevka-ss17 = "1wh5vcch2wlbw9cg44lz8ic8d24r228p7kqjr11sapkcmaxd3dyk"; + iosevka-ss18 = "1vzjad7r8h9k0qb744vbpqcm2l16s52sz53s1pq1jnqkhd3vmhx4"; + sgr-iosevka = "1cd5na66986rjygvkq4b1nlk0f449z5dlz47wlifmqa503faqydd"; + sgr-iosevka-aile = "1735ircj24xv8aajs6plfj9zfmvzjzhswwswjs8ccqc66dlgk47l"; + sgr-iosevka-curly = "1jh9shgqldpqqmpapapagqsqlg3w3gldics9zabwnzbd6g9af8zx"; + sgr-iosevka-curly-slab = "1cyn19c2wvh4mlpgc5zvizcxxlvz1x21ag73hcmn931czlcbxy74"; + sgr-iosevka-etoile = "0kb7bfpj9cdbqmc9xbyq0hnw5sm66811sn330a7z0ypis6l0w2hi"; + sgr-iosevka-fixed = "0lcdzlar9jgxqakb0j6ppwwdkyd4d8ih9dvav56frryikhdxyjxq"; + sgr-iosevka-fixed-curly = "1rvb1yk1yy407pp4bp71zj60xyixxsji3igla8acwxhwv7rd5l66"; + sgr-iosevka-fixed-curly-slab = "0kaifwrvy380i44p4v5h2cm9bpkdfkgdk961igc8v73yahlffyla"; + sgr-iosevka-fixed-slab = "0nla5hma45ys56df9p2f0wr2zc2bg8448bdxif8ssybzm3mpgyqx"; + sgr-iosevka-fixed-ss01 = "13g13jwdis724l1c9y7xbbvg9vik52pwfz4qvzmnxhj4wfvph0zy"; + sgr-iosevka-fixed-ss02 = "08xwpi9nf4vcr3s6nq87sxsihrwdfn7325gdjbfp1pivy7r1bfzm"; + sgr-iosevka-fixed-ss03 = "1gc6xhh388sdpqi1rdhr2kyq5j7z57vgn34fvfavs9l7m8qi5fa9"; + sgr-iosevka-fixed-ss04 = "1bkbfqxkc2z0yvd5kcd5ldva4miz7bc2p29ld46cgb0c21k5wjf7"; + sgr-iosevka-fixed-ss05 = "15bws3g53jzd15mhkj5dnkqqd5jqsq9ci9aiqvdd0q1vdcin28jk"; + sgr-iosevka-fixed-ss06 = "098zqg3vdlkmfaq3aqp3il9im45dvpf3kxf8fqm0x110566vbgsm"; + sgr-iosevka-fixed-ss07 = "0ba135blpvwwm07fp96lzi3c0wj6f3fglp5g0fivrblgy55qz0zg"; + sgr-iosevka-fixed-ss08 = "0894yd8l1f9iymi27kv6wqp8c6s2hqvn60c860xp544vzm2w8xvc"; + sgr-iosevka-fixed-ss09 = "133hw6xn4nx53s5hnlsx75c740w39kdfa04azidk2ar7sln4m1yr"; + sgr-iosevka-fixed-ss10 = "0rlkjp9scawvii23fs9d5pcayarkrnl3pvr4naan2pc0cvcpl83f"; + sgr-iosevka-fixed-ss11 = "07klrb1frrzwi10fc58ws8sykzjja1nnmifrl69489g23nm1dc19"; + sgr-iosevka-fixed-ss12 = "0c22nc9pdmc0024im6xw6ims39qkd9zjd5kc0ndw4pq167w011pg"; + sgr-iosevka-fixed-ss13 = "0lqa9q7y0hl1jwvhv5p7kbm03xgc1xba6ylhpg4yw2gsi2hkmw31"; + sgr-iosevka-fixed-ss14 = "0i0jd33m0dwpyj1wylfa0pqay3qhlipxrlpshgrdjfq0kl8zik9l"; + sgr-iosevka-fixed-ss15 = "0mp3qdd9042i4w2p9c2qrbzhw2rkdw49qcmmxhi0kl8nllfv9lpq"; + sgr-iosevka-fixed-ss16 = "0c15z9m9kbb62d2kpmvsgxqpvcv1yhxwi70cln5s27w4i0nxggkj"; + sgr-iosevka-fixed-ss17 = "17rdqagp7gxyyc2w0q0mjnbwd99v06750vb2ldcwcrq8pghyzr3v"; + sgr-iosevka-fixed-ss18 = "0ghzg6p2ds3rs6nk484gssai9435k2p648l8070v1wj07llki4np"; + sgr-iosevka-slab = "1ndnfnap3pkxfzw2sci7ds49fs2y43ck47xiww616kr8bj8xx852"; + sgr-iosevka-ss01 = "1fvz4zhq4d3cv02y82pjrlmyvq8skvfp5l98walf62yjq2kqaak6"; + sgr-iosevka-ss02 = "0xd67vvi07l8xfjq4pgz6n4xjslp60gdkh5hf9clc7z4y1q9649w"; + sgr-iosevka-ss03 = "17nchy0izlpsi7vaqp9h3nffy0r4f3qh5gvsbxfrl0z5i23sfvif"; + sgr-iosevka-ss04 = "0hpnfci9ddqxzylpl219bv4d9nbbcv5hiknddmdlrdry2ybz7yy3"; + sgr-iosevka-ss05 = "1am0aqzzaqsajs8bk57rnc7r6j3qip6fcgqp4f3i3j6kfvmlvf3l"; + sgr-iosevka-ss06 = "1jwmgxnhj7jninjzkn1vh557lcxxbpq6m6c0qh2wrlqan005q0xw"; + sgr-iosevka-ss07 = "1ls5gbi4789fci20rsf1b4clqj703jzy5ffs78pl5rbxjfxgraqn"; + sgr-iosevka-ss08 = "0c6ksaapnl21dnbmizihbgvkzqcww2bgfxm51sz3a0difgcwn9na"; + sgr-iosevka-ss09 = "1ibpqi67f7rhg1jcpiy28cd4k4wrk542kd84ad10i64jb47lhwqq"; + sgr-iosevka-ss10 = "13wq32l0gxc53hdbj3i8j1zkfm82g8a01xjpmh68hcllpmgr4yvd"; + sgr-iosevka-ss11 = "1mbq0cykvybl487fzp79glbwsiwq1z4xk96992pqbv106nsqh9z9"; + sgr-iosevka-ss12 = "1rggnmmgp33dpvbvlxkkvhlqx9arbwx3nrsxml9vjvf2c7875f3r"; + sgr-iosevka-ss13 = "1nwqlqpqlvkq5h2l3kh04r8jadr4ar4n1w98hv1rd2pmhlh6izq8"; + sgr-iosevka-ss14 = "1b3hlhy1lk8wi7ny9rkbb6my8sbc7k4ypc8hn62sc6a4spvfs14q"; + sgr-iosevka-ss15 = "10b7rgff1jn4j3szrykljklisbmfs4lajii1h2lyx8vbwx1rahbp"; + sgr-iosevka-ss16 = "0p4in5lwa3694lgz745fxsp85aypwgck6m7zgmc2dkjvvrhxxhm2"; + sgr-iosevka-ss17 = "0j7088wnf2rvm0iad1kkkm3pryr2c4rh643mrllzr71dpbzvvxqn"; + sgr-iosevka-ss18 = "1v8jrvjkakc2qks9yjwgg3b28gpgqv42d6k091a4nb8yn8ni7z1m"; + sgr-iosevka-term = "1kwxp9a7ld9xvgf7zhims66yihlz03q6vmzz782xwx5j6rrrvh28"; + sgr-iosevka-term-curly = "00ahf2lfrzpdplrjdgsjxfsfp40i5p79plxz7rz0dsvj6w3xivsg"; + sgr-iosevka-term-curly-slab = "0vyya2p7c89ig2qmgsai45baj69hd5l9jfabnbz7bq78s0a7al9w"; + sgr-iosevka-term-slab = "1fd2h5cnfla140fq8ydwygn156lyy3dyplkhmqvq8i1shgkj5z8i"; + sgr-iosevka-term-ss01 = "0x19yg4w8v1i9r5l5n6azn8kqw89dmj9nv2gsxn3s603fd22yna5"; + sgr-iosevka-term-ss02 = "19c5jz2an9azb1cgx9a9zhv976g3paklcyl8x7a5j9r2lxga75fm"; + sgr-iosevka-term-ss03 = "0718n4x0q08v1m5sk498aw787i1m6fzrp93nqhlql61ym3l9bqvm"; + sgr-iosevka-term-ss04 = "139614513mn6g3rs4dzp0wkdmwiv797w157xg66vcaxp03s2syl3"; + sgr-iosevka-term-ss05 = "094zly2a5y36n152q8bgf00n9pad9qsbb2pniwh1hc3n5ydx9zgj"; + sgr-iosevka-term-ss06 = "1z339061q3c8rj6j35y28qacpf630fd5xjam0lqi0vzxa6dx2x64"; + sgr-iosevka-term-ss07 = "0g15gbihafa30sv2xysr96b99wxq7dfib5h72vfjhp8hrg5p92kc"; + sgr-iosevka-term-ss08 = "17jyx4qb04s66klcw0zmnh55rdkskaifahd0v2xpf9gj5z0zbqvk"; + sgr-iosevka-term-ss09 = "17i9wghxij2vn071hwj1zsn5pw0vgmgb7qay0fy5i6s87pjsnyi4"; + sgr-iosevka-term-ss10 = "0kgmccymijlnamb4ag4gviyg21dm2si3m1p292lym3zw7f2m8is7"; + sgr-iosevka-term-ss11 = "1lals7p4qbl4igsvy03vqfxwbapbqizwcgyk4fwj67padyv7xhca"; + sgr-iosevka-term-ss12 = "181kgmmfllhwmz37gn28b84rffiac30d1dzgvm1hm8h9p5qrpj3q"; + sgr-iosevka-term-ss13 = "1m5vaf22dq2a4hkfm47yy1mwm74sykmw450pxfi194s595kkxxqh"; + sgr-iosevka-term-ss14 = "0gvxk2rsshcp35wg0vb4byrc9091lx1jq3nk4jypfrp97sz19nw7"; + sgr-iosevka-term-ss15 = "1hbmpg4rdsm3fr3v2gvggmjqz80c6rwyjs30ql3bwzzc61cjp13f"; + sgr-iosevka-term-ss16 = "078jcvzc2s490nbyzxa0vkvgws1a60s03xqws70yr5n8advf0px2"; + sgr-iosevka-term-ss17 = "1yklfki4s1il1lgcax8q6sf8ivpqh40yvds97nsik412pyrncsnh"; + sgr-iosevka-term-ss18 = "0qc2kwwl83z3czgfy3jsw1iri1gwxp1f14vz0dmdh2z9i349ayza"; } From 80e5563d5f26629bd6013672e7c393461d8d56a6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 2 Aug 2021 03:51:13 -0300 Subject: [PATCH 1171/1522] tfk8s: 0.1.5 -> 0.1.6 --- pkgs/tools/misc/tfk8s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index d9c9ad0451b..086a05c9016 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.5"; + version = "0.1.6"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ="; + sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI="; }; vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; From 2afe544fe56bb9f70a259031e7bd0adbfd056f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz> Date: Mon, 2 Aug 2021 09:18:06 +0200 Subject: [PATCH 1172/1522] knot-dns: 3.0.8 -> 3.1.0 NEWS + migration guide: https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.0 https://www.knot-dns.cz/docs/3.1/html/migration.html#upgrade-3-0-x-to-3-1-x --- pkgs/servers/dns/knot-dns/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e5192b7b3c1..fb4efba383c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring -, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests }: @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.8"; + version = "3.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0"; + sha256 = "54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed"; }; outputs = [ "bin" "out" "dev" ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { libiconv lmdb libintl nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) + libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? ] From 970b2d4c1052d27b34dbd2ab3b34decd3af7698a Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Mon, 2 Aug 2021 08:58:09 +0100 Subject: [PATCH 1173/1522] protoc-gen-grpc-web: init at 1.2.1 --- .../tools/protoc-gen-grpc-web/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/protoc-gen-grpc-web/default.nix diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix new file mode 100644 index 00000000000..c50894b31e1 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, protobuf }: + +stdenv.mkDerivation rec { + pname = "protoc-gen-grpc-web"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc-web"; + rev = version; + sha256 = "sha256-NBENyc01O8NPo84z1CeZ7YvFvVGY2GSlcdxacRrQALw="; + }; + + sourceRoot = "source/javascript/net/grpc/web"; + + # remove once PR merged + # https://github.com/grpc/grpc-web/pull/1107 + patches = [ + (fetchpatch { + name = "add-prefix.patch"; + url = "https://github.com/06kellyjac/grpc-web/commit/b0803be1080fc635a8d5b88da971835a888a0c77.patch"; + stripLen = 4; + sha256 = "sha256-Rw9Z7F8cYrc/UIGUN6yXOus4v+Qn9Yf1Nc301TFx85A="; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ protobuf ]; + buildInputs = [ protobuf ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/grpc/grpc-web"; + changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md"; + description = "gRPC web support for Google's protocol buffers"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb15..b43a5300dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -317,6 +317,8 @@ in protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; From 8505750ac89a1aee154038f6ac9c30cbdd221cfe Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Sun, 1 Aug 2021 18:41:56 +0200 Subject: [PATCH 1174/1522] chromium: Drop our closure_compiler patch for Java Hopefully the Java dependency can be dropped soon: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875#c5 --- .../networking/browsers/chromium/common.nix | 6 ++-- ...-Use-the-Java-binary-from-the-system.patch | 31 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index eb28146b09f..777e5148e40 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -42,7 +42,6 @@ buildFun: with lib; let - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 python2WithPackages = python2.withPackages(ps: with ps; [ ply jinja2 setuptools ]); @@ -152,7 +151,6 @@ let libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL mesa # required for libgbm pciutils protobuf speechd libXdamage at-spi2-core - jre pipewire libva libdrm wayland mesa.drivers libxkbcommon @@ -167,7 +165,6 @@ let ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch - ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ # Required as dependency for the next patch: (githubPatch { @@ -242,9 +239,10 @@ let sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc patchShebangs . - # use our own nodejs + # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node + ln -s "${jre8}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py diff --git a/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch b/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch deleted file mode 100644 index f6b10b679c7..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Sun, 11 Apr 2021 18:05:12 +0200 -Subject: [PATCH] closure_compiler: Use the Java binary from the system - -The bundled Java binary (third_party/jdk/current/bin/java) is missing in -the tarball and we want to use the one from the system anyway. -This reverts part of [0]. - -[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794 ---- - third_party/closure_compiler/compiler.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py -index 75690ceb9749..7b9c76f74290 100755 ---- a/third_party/closure_compiler/compiler.py -+++ b/third_party/closure_compiler/compiler.py -@@ -13,8 +13,7 @@ import subprocess - - - _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) --_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") --assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" -+_JAVA_PATH = "java" - - class Compiler(object): - """Runs the Closure compiler on given source files to typecheck them --- -2.20.1 - From 29658275efb11e11f34c45bc04b538a73c0644e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:14:19 +0200 Subject: [PATCH 1175/1522] mgba: cleanup --- pkgs/misc/emulators/mgba/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 4d0f9855271..c15c8a0ad76 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -9,6 +9,7 @@ , libedit , libelf , libzip +, copyDesktopItems , makeDesktopItem , minizip , pkg-config @@ -48,8 +49,8 @@ stdenv.mkDerivation rec { qttools ]; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { name = "mgba"; exec = "mgba-qt"; icon = "mgba"; @@ -58,11 +59,8 @@ stdenv.mkDerivation rec { genericName = "Game Boy Advance Emulator"; categories = "Game;Emulator;"; startupNotify = "false"; - }; - in - '' - cp -r ${desktopItem}/share/applications $out/share - ''; + }) + ]; meta = with lib; { homepage = "https://mgba.io"; From add631d16fd3e512b50ef435fa4dfeb7bf75e8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:14:33 +0200 Subject: [PATCH 1176/1522] tahoe-lafs: cleanup --- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 9f3ba60af84..b0f4cd1f788 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,9 +6,8 @@ # some loss of functionality because of it. python3Packages.buildPythonApplication rec { - version = "2021-07-09"; pname = "tahoe-lafs"; - namePrefix = ""; + version = "unstable-2021-07-09"; src = fetchFromGitHub { owner = "tahoe-lafs"; @@ -84,7 +83,7 @@ python3Packages.buildPythonApplication rec { trial --rterrors allmydata ''; - meta = { + meta = with lib; { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. @@ -92,9 +91,9 @@ python3Packages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = "http://tahoe-lafs.org/"; - license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; + homepage = "https://tahoe-lafs.org/"; + license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + platforms = platforms.gnu ++ platforms.linux; }; } From 476f8e0e178b1280d5df4845e7ba9c418a436888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:17:07 +0200 Subject: [PATCH 1177/1522] ecl: cleanup --- pkgs/development/compilers/ecl/default.nix | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index d75418b41ef..269beef9e7a 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -45,16 +45,10 @@ stdenv.mkDerivation { configureFlags = [ (if threadSupport then "--enable-threads" else "--disable-threads") - "--with-gmp-prefix=${gmp.dev}" - "--with-libffi-prefix=${libffi.dev}" - ] - ++ - (lib.optional useBoehmgc - "--with-libgc-prefix=${boehmgc.dev}") - ++ - (lib.optional (! noUnicode) - "--enable-unicode") - ; + "--with-gmp-prefix=${lib.getDev gmp}" + "--with-libffi-prefix=${lib.getDev libffi}" + ] ++ lib.optional useBoehmgc "--with-libgc-prefix=${lib.getDev boehmgc}" + ++ lib.optional (!noUnicode) "--enable-unicode"; hardeningDisable = [ "format" ]; @@ -67,13 +61,12 @@ stdenv.mkDerivation { wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs} ''; - meta = { - inherit (s) version; + meta = with lib; { description = "Lisp implementation aiming to be small, fast and easy to embed"; homepage = "https://common-lisp.net/project/ecl/"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.mit ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG"; }; } From b4c40c665cf47c250350ef421d84873be6f5c692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:18:47 +0200 Subject: [PATCH 1178/1522] ghostunnel: format --- pkgs/tools/networking/ghostunnel/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index c5b7d3db0f1..43cfe481290 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -1,8 +1,7 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - nixosTests, +{ buildGoModule +, fetchFromGitHub +, lib +, nixosTests }: buildGoModule rec { @@ -27,13 +26,15 @@ buildGoModule rec { mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/ ''; + passthru.tests = { + nixos = nixosTests.ghostunnel; + podman = nixosTests.podman-tls-ghostunnel; + }; + meta = with lib; { description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; license = licenses.asl20; maintainers = with maintainers; [ roberth ]; }; - - passthru.tests.nixos = nixosTests.ghostunnel; - passthru.tests.podman = nixosTests.podman-tls-ghostunnel; } From 6cd1b4ef26b758c22884e92e3d4079a77bb2c97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:19:27 +0200 Subject: [PATCH 1179/1522] zchunk: format --- pkgs/development/libraries/zchunk/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index ddbd95b55d9..c2ddda7a6c5 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -31,12 +31,7 @@ stdenv.mkDerivation rec { zstd ] ++ lib.optional stdenv.isDarwin argp-standalone; - - outputs = [ - "out" - "lib" - "dev" - ]; + outputs = [ "out" "lib" "dev" ]; meta = with lib; { homepage = "https://github.com/zchunk/zchunk"; From b459d42e3c4fa1ce629a528804f62a093320e9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:23:47 +0200 Subject: [PATCH 1180/1522] notmuch: cleanup --- .../mailreaders/notmuch/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 07a4ec8a905..8bb16acd59e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -9,16 +9,9 @@ , withEmacs ? true }: -with lib; - stdenv.mkDerivation rec { - version = "0.32.2"; pname = "notmuch"; - - passthru = { - pythonSourceRoot = "${src.name}/bindings/python"; - inherit version; - }; + version = "0.32.2"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; @@ -30,7 +23,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL - ] ++ optional withEmacs emacs; + ] ++ lib.optional withEmacs emacs; buildInputs = [ gnupg # undefined dependencies @@ -41,12 +34,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs configure - patchShebangs test/ + patchShebangs configure test/ substituteInPlace lib/Makefile.local \ --replace '-install_name $(libdir)' "-install_name $out/lib" - '' + optionalString withEmacs '' + '' + lib.optionalString withEmacs '' substituteInPlace emacs/notmuch-emacs-mua \ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient' @@ -56,9 +48,9 @@ stdenv.mkDerivation rec { "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions" "--infodir=${placeholder "info"}/share/info" - ] ++ optional (!withEmacs) "--without-emacs" - ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" - ++ optional (isNull ruby) "--without-ruby"; + ] ++ lib.optional (!withEmacs) "--without-emacs" + ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" + ++ lib.optional (isNull ruby) "--without-ruby"; # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends @@ -66,7 +58,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs"; preCheck = let @@ -78,7 +69,8 @@ stdenv.mkDerivation rec { mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz ''; - doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3"); + + doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); checkTarget = "test"; checkInputs = [ which dtach openssl bash @@ -93,7 +85,12 @@ stdenv.mkDerivation rec { dontGzipMan = true; # already compressed - meta = { + passthru = { + pythonSourceRoot = "${src.name}/bindings/python"; + inherit version; + }; + + meta = with lib; { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3Plus; From 7db52ad591ad04c23024a0bc01e76bddcd0c6096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:25:59 +0200 Subject: [PATCH 1181/1522] interval: format --- pkgs/development/coq-modules/interval/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 82d88b4a62e..12fe66b50da 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "interval"; owner = "coqinterval"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isGe "8.8" ; out = "4.3.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { nativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ bignums coquelicot flocq ] - ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; + ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; enableParallelBuilding = true; From 7251411f95cbaa92e12ad47025e4824035c36074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:29:33 +0200 Subject: [PATCH 1182/1522] jitsi-meet-electron: format --- .../instant-messengers/jitsi-meet-electron/default.nix | 5 +---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index a80e65482f0..99f9f5aded9 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,13 +2,10 @@ , fetchurl , appimageTools , makeWrapper -, electron_13 +, electron , xorg }: -let - electron = electron_13; -in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; version = "2.8.9"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce2622ff95..85859bc4ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32601,7 +32601,9 @@ in btcdeb = callPackage ../applications/blockchains/btcdeb { }; - jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; + jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { + electron = electron_13; + }; zenstates = callPackage ../os-specific/linux/zenstates {}; From a8f2d2ca7879f5b1ecae9413d584936195ed01d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:29:41 +0200 Subject: [PATCH 1183/1522] QuickChick: format --- .../coq-modules/QuickChick/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 3a629421d6b..fcaaaac615e 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: -with lib; -let recent = versions.isGe "8.7" coq.coq-version; in + +let recent = lib.versions.isGe "8.7" coq.coq-version; in mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; inherit version; - defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ + defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; } @@ -30,19 +30,19 @@ mkCoqDerivation { release."20170512".sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg"; releaseRev = v: "v${v}"; - preConfigure = optionalString recent + preConfigure = lib.optionalString recent "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; - extraBuildInputs = optional recent coq.ocamlPackages.num; + extraBuildInputs = lib.optional recent coq.ocamlPackages.num; propagatedBuildInputs = [ ssreflect ] - ++ optionals recent [ coq-ext-lib simple-io ] - ++ optional recent coq.ocamlPackages.ocamlbuild; + ++ lib.optionals recent [ coq-ext-lib simple-io ] + ++ lib.optional recent coq.ocamlPackages.ocamlbuild; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; - meta = { + meta = with lib; { description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; }; From 94f66d6b9f8a962d2e217be3a1d54f2db304bfc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:32:30 +0200 Subject: [PATCH 1184/1522] dune-release: remove -f from rm -rf --- pkgs/development/tools/ocaml/dune-release/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 4e0f8d80f78..a5d97b65b2f 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -41,7 +41,7 @@ in buildDunePackage rec { preCheck = '' # it fails when it tries to reference "./make_check_deterministic.exe" - rm -fr tests/bin/check + rm -r tests/bin/check ''; # tool specific env vars have been deprecated, use PATH From a322ea2345742026d8d68f1aba297b9c35516a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:36:11 +0200 Subject: [PATCH 1185/1522] renderdoc: format, cleanup --- pkgs/applications/graphics/renderdoc/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index c48441b66c4..771a32d5a73 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -11,12 +11,11 @@ let rev = "renderdoc-modified-7"; sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; }; - pythonPackages = python3Packages; cmakeBool = b: if b then "ON" else "OFF"; in mkDerivation rec { - version = "1.15"; pname = "renderdoc"; + version = "1.15"; src = fetchFromGitHub { owner = "baldurk"; @@ -27,9 +26,9 @@ mkDerivation rec { buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]) + ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2]) # TODO: figure out how to make cmake recognise pyside2 - ++ (lib.optional waylandSupport wayland); + ++ lib.optional waylandSupport wayland; nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; @@ -75,7 +74,7 @@ mkDerivation rec { of any application using Vulkan, D3D11, OpenGL or D3D12 across Windows 7 - 10, Linux or Android. ''; - maintainers = [maintainers.jansol]; - platforms = ["i686-linux" "x86_64-linux"]; + maintainers = [ maintainers.jansol ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 939f7ca6d16459efb8e0a5fb687c16879a2ecd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 09:38:14 +0200 Subject: [PATCH 1186/1522] keynav: format --- pkgs/tools/X11/keynav/default.nix | 44 +++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 077e41b10be..847d13315f8 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext -, libXinerama, libXrandr, glib, cairo, xdotool }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libX11 +, xorgproto +, libXtst +, libXi +, libXext +, libXinerama +, libXrandr +, glib +, cairo +, xdotool +}: let release = "20180821"; in stdenv.mkDerivation { @@ -14,21 +27,30 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr - glib cairo xdotool ]; + buildInputs = [ + libX11 + xorgproto + libXtst + libXi + libXext + libXinerama + libXrandr + glib + cairo + xdotool + ]; - patchPhase = '' + postPatch = '' echo >>VERSION MAJOR=0 echo >>VERSION RELEASE=${release} echo >>VERSION REVISION=0 ''; - installPhase = - '' - mkdir -p $out/bin $out/share/keynav/doc - cp keynav $out/bin - cp keynavrc $out/share/keynav/doc - ''; + installPhase = '' + mkdir -p $out/bin $out/share/keynav/doc + cp keynav $out/bin + cp keynavrc $out/share/keynav/doc + ''; meta = with lib; { description = "Generate X11 mouse clicks from keyboard"; From 9cf07919cc89e89a4395bb7c89063a1f507168ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 10:00:56 +0200 Subject: [PATCH 1187/1522] openafs: cleanup --- pkgs/servers/openafs/1.8/module.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index a2613844d4c..4f1404b6282 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: +, kernel, glibc, perl, libtool_2, libkrb5 }: with (import ./srcs.nix { inherit fetchurl; @@ -55,7 +55,7 @@ in stdenv.mkDerivation { homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; + maintainers = with maintainers; [ maggesi spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; } From 42e77915565d38b2209e79c3b0c81bede7e27662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 10:47:21 +0200 Subject: [PATCH 1188/1522] grpc: format --- pkgs/development/libraries/grpc/default.nix | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 62f0c2e3d31..0b05126f3bb 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -4,8 +4,9 @@ }: stdenv.mkDerivation rec { - version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; + version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; @@ -13,6 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd"; fetchSubmodules = true; }; + patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { @@ -27,19 +29,19 @@ stdenv.mkDerivation rec { buildInputs = [ c-ares.cmake-config openssl protobuf ] ++ lib.optionals stdenv.isLinux [ libnsl ]; - cmakeFlags = - [ "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_RE2_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - "-DgRPC_ABSL_PROVIDER=package" - "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DCMAKE_CXX_STANDARD=17" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" - ]; + cmakeFlags = [ + "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DCMAKE_CXX_STANDARD=17" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" + ]; # CMake creates a build directory by default, this conflicts with the # basel BUILD file on case-insensitive filesystems. @@ -58,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; - maintainers = [ maintainers.lnl7 maintainers.marsam ]; + maintainers = with maintainers; [ lnl7 marsam ]; homepage = "https://grpc.io/"; platforms = platforms.all; changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; From 468cf873d5e867ceeecbbee3a14c046cb3c25b7e Mon Sep 17 00:00:00 2001 From: iko <ilyakooo0@gmail.com> Date: Sat, 31 Jul 2021 16:04:33 +0300 Subject: [PATCH 1189/1522] maintainers: add ilyakooo0 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e9e546005b..35882821253 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4541,6 +4541,12 @@ githubId = 592849; name = "Ilya Kolpakov"; }; + ilyakooo0 = { + name = "Ilya Kostyuchenko"; + email = "ilyakooo0@gmail.com"; + github = "ilyakooo0"; + githubId = 6209627; + }; imalison = { email = "IvanMalison@gmail.com"; github = "IvanMalison"; From 60069171ea59c3266c291a5022eca269377114a3 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman <yaymukund@gmail.com> Date: Mon, 2 Aug 2021 11:13:41 +0100 Subject: [PATCH 1190/1522] rust-analyzer: 2021-07-12 -> 2021-08-02 --- .../node-packages/node-packages.nix | 1621 ++++++++--------- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/update.sh | 3 - .../rust-analyzer/build-deps/package.json | 28 +- 4 files changed, 818 insertions(+), 840 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2fb4479a61b..2d2202569df 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -67,15 +67,6 @@ let sha512 = "zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA=="; }; }; - "@angular-devkit/core-12.1.3" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "12.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.3.tgz"; - sha512 = "69bM4wYUxbHUuZvx97pxVxzNYPrUPsMuszHpYdS6/lsAgpa15EDuBoQHgob4chFiQaNoG9mzOsumlUkoI3mEbg=="; - }; - }; "@angular-devkit/core-12.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; @@ -94,15 +85,6 @@ let sha512 = "iW3XuDHScr3TXuunlEjF5O01zBpwpLgfr1oEny8PvseFGDlHK4Nj8zNIoIn3Yg936aiFO4GJAC/UXsT8g5vKxQ=="; }; }; - "@angular-devkit/schematics-12.1.3" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "12.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.3.tgz"; - sha512 = "QTfGurkNDdEwNheoe1lILWc4YUNSbqOeXRRkwFp1+QwxwlxXoeJ1zNMAo8ytQodnBRsomw7Wu9l1xSWfOL25nA=="; - }; - }; "@angular-devkit/schematics-12.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -112,13 +94,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-cli-12.1.3" = { + "@angular-devkit/schematics-cli-12.1.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "12.1.3"; + version = "12.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.3.tgz"; - sha512 = "fpf1448DoF9xIBUGx/DNeaw+KmvVIGzvAUwBu5yGIEjbw93ODcKqaE8DX7FNOe9kHvTEoqYaS/aCb2tHa4KS5A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-12.1.4.tgz"; + sha512 = "BJiyZu7TaOJUnH4XH4OKz1LjW1364BLAhpwCBAueu11YkI7hghlsx/ogvvd5RYX9JmQL70iVOVkBsoYA7XVreg=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -364,13 +346,13 @@ let sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.7" = { + "@babel/compat-data-7.14.9" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.7"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz"; - sha512 = "nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz"; + sha512 = "p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw=="; }; }; "@babel/core-7.10.5" = { @@ -400,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.8" = { + "@babel/generator-7.14.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; - sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz"; + sha512 = "4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -598,13 +580,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.8" = { + "@babel/helper-validator-identifier-7.14.9" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; - sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -652,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.8" = { + "@babel/parser-7.14.9" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; - sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz"; + sha512 = "RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -679,13 +661,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.7" = { + "@babel/plugin-proposal-async-generator-functions-7.14.9" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.7"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz"; - sha512 = "RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz"; + sha512 = "d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw=="; }; }; "@babel/plugin-proposal-class-properties-7.14.5" = { @@ -1057,13 +1039,13 @@ let sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; }; }; - "@babel/plugin-transform-classes-7.14.5" = { + "@babel/plugin-transform-classes-7.14.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz"; - sha512 = "J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz"; + sha512 = "NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A=="; }; }; "@babel/plugin-transform-computed-properties-7.14.5" = { @@ -1192,13 +1174,13 @@ let sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.14.7" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.14.7"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz"; - sha512 = "DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; }; }; "@babel/plugin-transform-new-target-7.14.5" = { @@ -1255,13 +1237,13 @@ let sha512 = "07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ=="; }; }; - "@babel/plugin-transform-react-jsx-7.14.5" = { + "@babel/plugin-transform-react-jsx-7.14.9" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz"; - sha512 = "7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz"; + sha512 = "30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.14.5" = { @@ -1273,13 +1255,13 @@ let sha512 = "rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.14.5" = { + "@babel/plugin-transform-react-jsx-self-7.14.9" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.14.5"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz"; - sha512 = "M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz"; + sha512 = "Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw=="; }; }; "@babel/plugin-transform-react-jsx-source-7.14.5" = { @@ -1399,13 +1381,13 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.14.8" = { + "@babel/preset-env-7.14.9" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; - sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.9.tgz"; + sha512 = "BV5JvCwBDebkyh67bPKBYVCC6gGw0MCzU6HfKe5Pm3upFpPVqiC/hB33zkOe0tVdAzaMywah0LSXQeD9v/BYdQ=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1498,22 +1480,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.8" = { + "@babel/runtime-corejs3-7.14.9" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; - sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz"; + sha512 = "64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw=="; }; }; - "@babel/standalone-7.14.8" = { + "@babel/standalone-7.14.9" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; - sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.9.tgz"; + sha512 = "EEAwahkk3VW8WOlEAd3xtKN4tVDcgbSiDCc50qD4IgjyMowI2mvLnIZbRpZU5G/yZBGZsEPg7FssT/+yLFBlQQ=="; }; }; "@babel/template-7.14.5" = { @@ -1525,13 +1507,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.8" = { + "@babel/traverse-7.14.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; - sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz"; + sha512 = "bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g=="; }; }; "@babel/types-7.13.12" = { @@ -1543,13 +1525,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.8" = { + "@babel/types-7.14.9" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.8"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; - sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz"; + sha512 = "u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -2344,13 +2326,13 @@ let sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; }; }; - "@fluentui/react-7.173.1" = { + "@fluentui/react-7.174.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.173.1"; + version = "7.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.1.tgz"; - sha512 = "+6PB+CwwL2GNHy4GrDR6871ng7A7FRGXSHQzGqfeLq7Dr7vjO82fGuIsrIaFO1Ry1lug6c41uC5Bon/mKcs1KQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.174.0.tgz"; + sha512 = "nPng19/ncq34ZwbHMa26US3Fu+7Q3GBo7DDcGnj5+csvw+XaGkJ+OeKDx0PyulkI5WM+hkR358VwxDJ87jlH1A=="; }; }; "@fluentui/react-8.23.8" = { @@ -2380,13 +2362,13 @@ let sha512 = "vYnenLKUj2Uxj5sjuv6AJJ1kYCqq/stM4ZMCQmJWq2qiMm2TpqW3vMpRspuxwD9BqOVbIFNoj9pEWpxAaTCEqw=="; }; }; - "@fluentui/react-hooks-8.2.4" = { + "@fluentui/react-hooks-8.2.5" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.4"; + version = "8.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.4.tgz"; - sha512 = "qc/j0YdxC0zAWVqh8BJppZuK3o9/rfyu5psY4N/AL9dmKrTFWszRgTSB5uiRShN99L88UUEV9RtlfknnLDGrUg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.5.tgz"; + sha512 = "8x0sK59kM2naaps88vG++uY5DmYOJX7okGRSHtda8vtgE/03edpGkIgwBGloYJnk3b/EJvcLBjyVlkd1LcbvbQ=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -3865,13 +3847,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.196" = { + "@microsoft/load-themed-styles-1.10.197" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.196"; + version = "1.10.197"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.196.tgz"; - sha512 = "eImlYYB/ZJH8Y3t2d/JbjxwSwWVeiQ7x+Xl5mTlTAlByzAiEs7tB3LUOEEz0XrlasvYV9ynq2i8b1+Gi/+KlMQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.197.tgz"; + sha512 = "w/RyqDpXR5unGjcFpzla6CE4L/r6AMbVkrxbK8Xq4Wl1GMfmK/5YWUz0wdCBHqCb+FuhQKni+ThGPti2pzI2mg=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3946,13 +3928,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.3.1" = { + "@netlify/build-17.4.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.3.1"; + version = "17.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.3.1.tgz"; - sha512 = "xHxhdefsugGOzeoj4vLabZ29mDN6MRTT+Q3IR/iQKbDk5vlMr3pcT8EhowLBLhSoC1NnfskRbaFBtftxn5VWPw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.4.1.tgz"; + sha512 = "g3DdM6AGpqLmJOUKhemkwySybsKS1lvjchRz1PXWZOUFa5npXDuQ4YL9E2fiQrbKB3vc4FhMKonR+iL9CUcphw=="; }; }; "@netlify/cache-utils-2.0.0" = { @@ -4180,58 +4162,58 @@ let sha512 = "YgPzJEGY60zZxSSbaDe3mMO+jYB7pbsWyAVvv4tASod8Sys2x/MuOGJ64KmOTZ+bUqZYvJLOcfVL6fiFRSU9wg=="; }; }; - "@node-red/editor-api-2.0.4" = { + "@node-red/editor-api-2.0.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.4.tgz"; - sha512 = "Dw4o0LyQR5543BVeAlYBbN/dsAlCA43zsZ4PLLb+A9M/TKWa+lqV1nyC/HGkLuNT9IhxQAzK10GT+ukOAKN5Yg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.5.tgz"; + sha512 = "efiWLuNk/lwpIULt4Bu8WycW9+v6xVx0VHAK+j1y8Kl5S6u6sbfkTlmDDpaN2NqPHGdMT+roF9EHKHISTmVN9g=="; }; }; - "@node-red/editor-client-2.0.4" = { + "@node-red/editor-client-2.0.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.4.tgz"; - sha512 = "rIGUmv41vikOEp0bR23nIhPqcknqQHIJwG7tNEFk5RpTDyAiDOKAKVaWOaa6v4/XwJCf+8a1Kt5LI0KGIHFqXQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.5.tgz"; + sha512 = "C/Vu7NZX3VGTU/LEXxDUTxEEDu/NFIbAOCAJAcvJKdNPEL4InwTF75PRRiWsfeDu8DhBnvFqFe9XTS4fr+nrPA=="; }; }; - "@node-red/nodes-2.0.4" = { + "@node-red/nodes-2.0.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.4.tgz"; - sha512 = "sCEEexrM/vtu+CxJQuZw9euJq+liZAPu/7Z3qAPcTwRpEZo0v7kfiyV/Brrymw3bmGJSqgv9EtRqXmiCU7GTHA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.5.tgz"; + sha512 = "o9hdie+2YtjoMFFe+vAcIkkHPJIO5pkPrRUNQcx7EHzXPEMP0uxhhr/DpC/J6AQ0tOlfS6shWKge0E4bBKfJDQ=="; }; }; - "@node-red/registry-2.0.4" = { + "@node-red/registry-2.0.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.4.tgz"; - sha512 = "qwowUXPglcj5bOeUL17wWH1VtPOAZY8bGQ1CY4uWP7PnKvt3os0lTyfGqsZLaL78QF3bQLSuIXj+y3xZRl5XJg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.5.tgz"; + sha512 = "UVM1UFuyNGtyLIL3Fjme67uvlxiiQlYVrabFwzUa0u2zHWf0YpzIQgcwtFY9kIuj3h0rVIN+EzuPZIbQZVISNw=="; }; }; - "@node-red/runtime-2.0.4" = { + "@node-red/runtime-2.0.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.4.tgz"; - sha512 = "Jnc8OlZz0oAKNikkCljNgAa977WprzEXwPKgBAEKyNbeyIaE+2ZSlXaQqK1xQ73VPFVHc9V3n5cDC/g3lHUJtQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.5.tgz"; + sha512 = "eK55TQ+iTX0xZy8k4eW3JJCHywgnxpszuKg1aXurKD1sBURGa9qNztB/IW+0T0upnRYgQSTTI8j//msG6s76LQ=="; }; }; - "@node-red/util-2.0.4" = { + "@node-red/util-2.0.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.4.tgz"; - sha512 = "Sd+vV+j8E8GYN+e/5Bzaxle11+7fEeJbeq8xt1PH0AxrAGU2L3dbB41NsVujVfUBCmOaGvehWvVD+vUO6quosw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.5.tgz"; + sha512 = "+RF8i+LxgyXcAIKjKyht3rRZFBEhrvgXKN2/HlkMWerADwiDTNfBL8JjQZoMKlFKl1cgapp8vp4P1Xf3glH+fQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -5017,22 +4999,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@percy/config-1.0.0-beta.61" = { + "@percy/config-1.0.0-beta.62" = { name = "_at_percy_slash_config"; packageName = "@percy/config"; - version = "1.0.0-beta.61"; + version = "1.0.0-beta.62"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.61.tgz"; - sha512 = "4AFqdfFOyrYpLtflWQ/GlClltdKmIYqPpocv4X20HVIGI1O5CHVSQuUuMVrBDiGzTwPKhBUAK6qOQHXdJyLjTg=="; + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.62.tgz"; + sha512 = "MhtjzNvjGvCv4n9pjXtIf0yKcuEOK592biaEtGAchfNJRC+kFpxQBF6wihR6AWN27uKa+8EXOuq62gqhpOJvIw=="; }; }; - "@percy/logger-1.0.0-beta.61" = { + "@percy/logger-1.0.0-beta.62" = { name = "_at_percy_slash_logger"; packageName = "@percy/logger"; - version = "1.0.0-beta.61"; + version = "1.0.0-beta.62"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.61.tgz"; - sha512 = "3CRqpmpWr1kG815TKsmADr2k+SBRw+I7Rk2/jY3WwbN/4oP3Mij9gNkWSmIU85TRtm5Ju1SbI3LcFjEfOg7eLw=="; + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.62.tgz"; + sha512 = "ILdCq9S6Prok5hfoCxqthA7we/rAg7SttNZRTaFogewdPnpJ99KBAzVx9wQWGEbpIGjlQt2PHb+ymQ1yIXz56A=="; }; }; "@percy/migrate-0.10.0" = { @@ -5179,13 +5161,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.16.0" = { + "@putdotio/api-client-8.17.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.16.0"; + version = "8.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.16.0.tgz"; - sha512 = "9a00sd5aArb5s1R8MBsHULP3gcRsD9ivokRUCtS3oBf8M53u9XUAx/D79sehhiWbMR20DYxwUFfSoEvM/daq3Q=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.17.0.tgz"; + sha512 = "iLLe3tgQd9W8ZMbfaMXIzoWj/wc5xg5cwys5WEV39RDRL5x7uP6YvELJ0QDNxQTX9S+bT6SzwJiBEmX8DADPHA=="; }; }; "@reach/router-1.3.4" = { @@ -5305,6 +5287,15 @@ let sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; + "@rollup/plugin-node-resolve-13.0.4" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz"; + sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; + }; + }; "@rollup/plugin-replace-2.4.2" = { name = "_at_rollup_slash_plugin-replace"; packageName = "@rollup/plugin-replace"; @@ -6133,6 +6124,15 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; + "@tokenizer/token-0.3.0" = { + name = "_at_tokenizer_slash_token"; + packageName = "@tokenizer/token"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"; + sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="; + }; + }; "@toml-tools/lexer-0.3.1" = { name = "_at_toml-tools_slash_lexer"; packageName = "@toml-tools/lexer"; @@ -7033,15 +7033,6 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-12.12.70" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "12.12.70"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.70.tgz"; - sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; - }; - }; "@types/node-13.13.52" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7060,13 +7051,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.6" = { + "@types/node-14.17.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.6"; + version = "14.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.6.tgz"; - sha512 = "iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.7.tgz"; + sha512 = "SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag=="; }; }; "@types/node-15.12.5" = { @@ -7078,13 +7069,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.4" = { + "@types/node-15.14.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.4"; + version = "15.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.4.tgz"; - sha512 = "yblJrsfCxdxYDUa2fM5sP93ZLk5xL3/+3MJei+YtsNbIdY75ePy2AiCfpq+onepzax+8/Yv+OD/fLNleWpCzVg=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.5.tgz"; + sha512 = "6ewfMNmkumZieB/EeJ4cdP1bbJyOlOt5MTwbKMr7WKxyCt2j09H8YWRK6zOd/Jh35Vu/gls39ZUmeu4vHu1WKQ=="; }; }; "@types/node-15.6.1" = { @@ -7114,13 +7105,13 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.7" = { + "@types/node-16.4.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.7"; + version = "16.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.7.tgz"; - sha512 = "aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.10.tgz"; + sha512 = "TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ=="; }; }; "@types/node-6.14.13" = { @@ -8986,13 +8977,13 @@ let sha512 = "LjwZql59OKrQgppreOvRcgJDYrnj9XKVW2gb5Q1ZyGG3CH46VCiiNHJB6nYMgOntLo+DPQwQQPOSknZ1zW+wTw=="; }; }; - "addr-to-ip-port-1.5.3" = { + "addr-to-ip-port-1.5.4" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.3.tgz"; - sha512 = "8azR4KaQNuAFyTX2taTTBAWmE/WpX/q0K0Hz4h0P18Ero2ngYiA2x/OVRB8T2jjt9u/qSMF3CO/us7OxwSdX3Q=="; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.4.tgz"; + sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; "address-1.1.2" = { @@ -11281,13 +11272,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.957.0" = { + "aws-sdk-2.958.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.957.0"; + version = "2.958.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.957.0.tgz"; - sha512 = "TtRv/ebZL7gWgAW8XGlRizs5xhyzlDt2KbrxoPcHcxPTH8KHlbEyOmAXafyB7K/Jf3En5TDdJN1daJ4idSKWSg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.958.0.tgz"; + sha512 = "D5/2mW+hl5+CYvAniB209VUN3lFo7ZypCdO0RxyKG49DjoB+h3wvNxJo/BKL3A0sSiMOlrT61vDWsmkeE34S/g=="; }; }; "aws-sign2-0.6.0" = { @@ -11362,6 +11353,15 @@ let sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; + "azure-devops-node-api-11.0.1" = { + name = "azure-devops-node-api"; + packageName = "azure-devops-node-api"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz"; + sha512 = "YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A=="; + }; + }; "b24.js-1.0.3" = { name = "b24.js"; packageName = "b24.js"; @@ -12523,22 +12523,22 @@ let sha512 = "wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg=="; }; }; - "bin-version-2.0.0" = { + "bin-version-3.1.0" = { name = "bin-version"; packageName = "bin-version"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz"; - sha1 = "2cc95d83b522bdef2e99978e76aeb5491c8114ff"; + url = "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz"; + sha512 = "Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ=="; }; }; - "bin-version-check-3.0.0" = { + "bin-version-check-4.0.0" = { name = "bin-version-check"; packageName = "bin-version-check"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz"; - sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; + url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz"; + sha512 = "sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ=="; }; }; "binary-0.3.0" = { @@ -12928,13 +12928,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.10.0" = { + "blessed-contrib-4.10.1" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.0.tgz"; - sha512 = "NbMkaBNPNZikQo5XBKsXTGIu/gxAywRANHPt2Zc4oFmtiXGHgAGgl6Q6mg6sr9SvG08zidPxokRDcgso+HGmzw=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.1.tgz"; + sha512 = "S3jE7riCbWnAK8OT+ta4Z8RX/X6nfISxzn0SDIMFYuY90qUwqx7w7e9fIsc2m2ODwma7dFcXNwGSjyayfKd1DQ=="; }; }; "blgr-0.1.8" = { @@ -14845,22 +14845,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.26" = { + "cdk8s-1.0.0-beta.27" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.26"; + version = "1.0.0-beta.27"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.26.tgz"; - sha512 = "CnrIxcQylFVWgtNoTc4wInqi+MU143WGm8ZY1qotG05byF7QsgIFICjIUIH7osNRkGXP/zQaEL8sxCZne1rfqQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.27.tgz"; + sha512 = "6WGhwIQ0zRrJfGDIxfpqwCsj6Varuds90xp3dEwym68ZLfROn/sq8Kdwr8QlMWf50qbcja+TLdqKgAt185a/ig=="; }; }; - "cdk8s-plus-17-1.0.0-beta.38" = { + "cdk8s-plus-17-1.0.0-beta.42" = { name = "cdk8s-plus-17"; packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.38"; + version = "1.0.0-beta.42"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.38.tgz"; - sha512 = "lBh6Z0yygKmtD4blPOmxVFAWhiFP7k/27h0p1n8FY69XlZXrCC8Z1LxoWjhtU5eCCCD1AeJf48nq7LqmwD2vJw=="; + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.42.tgz"; + sha512 = "GIe4xGLtd9zF7OPag8g4NVb7bsw/x/UcVH2w1WSTuXPe3ZFPNJ+zUAeEhuOL4BB90Czg0QIMDvIo7Vw00y3MmQ=="; }; }; "cdktf-0.5.0" = { @@ -14971,15 +14971,6 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "chalk-2.1.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ=="; - }; - }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -15025,6 +15016,15 @@ let sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; }; }; + "chalk-4.1.2" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -17392,13 +17392,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.108" = { + "constructs-3.3.111" = { name = "constructs"; packageName = "constructs"; - version = "3.3.108"; + version = "3.3.111"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.108.tgz"; - sha512 = "7FT28bE9KIU8Pplwi7dTVLoEbCQrvW4KSpGVb9emaiVeUHA2BmUN6Ji9qICPH3H1QR2+gcn8gXZGbuha9VuuKA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.111.tgz"; + sha512 = "RcpVo5LPMcjzZuDSmHUNnQruXkFqmKqdgPQKrP372Cd+PcdxKrQQEwvgXhswrgLX4IFT07fS5RHyQhJhAq/C2w=="; }; }; "consume-http-header-1.0.0" = { @@ -20246,15 +20246,6 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; - "deepl-translator-1.2.1" = { - name = "deepl-translator"; - packageName = "deepl-translator"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deepl-translator/-/deepl-translator-1.2.1.tgz"; - sha512 = "LwCksmzPwowOQu9yrdVl43rRrTKsXwlH/uVQxgL8KoCoCEoozA6wzN7oaAEoJSocccn5CoEc6MnXlQEya6rTzw=="; - }; - }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -22064,13 +22055,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-notarize-1.0.0" = { + "electron-notarize-1.0.1" = { name = "electron-notarize"; packageName = "electron-notarize"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz"; - sha512 = "dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og=="; + url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.1.tgz"; + sha512 = "5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg=="; }; }; "electron-osx-sign-0.5.0" = { @@ -22100,13 +22091,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.791" = { + "electron-to-chromium-1.3.792" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.791"; + version = "1.3.792"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.791.tgz"; - sha512 = "Tdx7w1fZpeWOOBluK+kXTAKCXyc79K65RB6Zp0+sPSZZhDjXlrxfGlXrlMGVVQUrKCyEZFQs1UBBLNz5IdbF0g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.792.tgz"; + sha512 = "RM2O2xrNarM7Cs+XF/OE2qX/aBROyOZqqgP+8FXMXSuWuUqCfUUzg7NytQrzZU3aSqk1Qq6zqnVkJsbfMkIatg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22777,13 +22768,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.18.4" = { + "es-abstract-1.18.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.4"; + version = "1.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.4.tgz"; - sha512 = "xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz"; + sha512 = "DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA=="; }; }; "es-get-iterator-1.1.2" = { @@ -23128,13 +23119,13 @@ let sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; - "eslint-7.31.0" = { + "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; - sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; "eslint-config-prettier-8.3.0" = { @@ -23812,15 +23803,6 @@ let sha512 = "nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w=="; }; }; - "execa-0.1.1" = { - name = "execa"; - packageName = "execa"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.1.1.tgz"; - sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; - }; - }; "execa-0.10.0" = { name = "execa"; packageName = "execa"; @@ -25369,13 +25351,13 @@ let sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; }; - "find-versions-2.0.0" = { + "find-versions-3.2.0" = { name = "find-versions"; packageName = "find-versions"; - version = "2.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz"; - sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c"; + url = "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz"; + sha512 = "P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww=="; }; }; "find-yarn-workspace-root-2.0.0" = { @@ -25936,13 +25918,13 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.2.13" = { + "fork-ts-checker-webpack-plugin-6.3.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.2.13"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.13.tgz"; - sha512 = "+j/DfwevcZeSXn5WOv32c/shbcbhcKi88asC2A4TDPtURS3MW/qXiVucGiL1PXdt9PCGB88R3BfaSWZ1C/XGHA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.3.1.tgz"; + sha512 = "uxqlKTEeSJ5/JRr0zaCiw2U+kOV8F4/MhCnnRf6vbxj4ZU3Or0DLl/0CNtXro7uLWDssnuR7wUN7fU9w1I0REA=="; }; }; "form-data-1.0.0-rc3" = { @@ -27782,13 +27764,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.19.0" = { + "google-gax-2.20.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.19.0.tgz"; - sha512 = "2a6WY+p6YMVMmwXmkRqiLreXx67xHDZhkmflcL8aDUkl1csx9ywxEI01veoDXy6T1l0JJD6zLbl5TIbWimmXrw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.20.0.tgz"; + sha512 = "V5aaN8cvnE77atybA7CaQTa0tGV6ZqncRGvpObEGpadSps2NIzTPXCtngxgPz7cGz1KhABl1VmSLUlRXGgjX+g=="; }; }; "google-p12-pem-3.1.1" = { @@ -33111,13 +33093,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-17.4.1" = { + "joi-17.4.2" = { name = "joi"; packageName = "joi"; - version = "17.4.1"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz"; - sha512 = "gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ=="; + url = "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz"; + sha512 = "Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw=="; }; }; "join-component-1.1.0" = { @@ -33435,13 +33417,13 @@ let sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; }; }; - "jsdom-16.6.0" = { + "jsdom-16.7.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.6.0"; + version = "16.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz"; - sha512 = "Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"; + sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; "jsdom-7.2.2" = { @@ -33516,13 +33498,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.310" = { + "jsii-srcmak-0.1.313" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.310"; + version = "0.1.313"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.310.tgz"; - sha512 = "SxlLdZwyP6USUSlHb2qfnCTtiJAZAJ6UIl27wrBubFKqyd9I7HYVWmkZtaVoPS7gC+VCW/6LsFCygxxNffUeow=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.313.tgz"; + sha512 = "7050z22Kp6mg58MVBva0OuO6qPa5IK/6i3wDDY+heUQuOCqNeSPsKngYVffYmEFintXsnRIVHpJ6q8rFSHRnIg=="; }; }; "json-bigint-0.2.3" = { @@ -33831,13 +33813,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.280" = { + "json2jsii-0.1.283" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.280"; + version = "0.1.283"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.280.tgz"; - sha512 = "l7hVpZioBXKzztqKs4CKAuaDm/lUr/L4Vi7xT8LqGWHR94XFuW7lINDRQWIqKxN2dVfMI9Ru8C3w3FtIao9kuA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.283.tgz"; + sha512 = "Jzekj3NokX/pSBUxTn4WhIlvmU7lTEIS+WzIEyEl9WrC9MtUt1TCbG5+kkDTMOFB0jzAS+qlt/72J/aM+RciKA=="; }; }; "json3-3.2.6" = { @@ -38575,13 +38557,13 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.0.2" = { + "mem-fs-editor-9.1.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.0.2"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.0.2.tgz"; - sha512 = "0ebt+XneyzOzYs6HqW5OEJaA997trrETuyy/7Vu92CIO7A5yfqHY0M4MVXAjqBCdX1GzjCe396ljAbm3O087Fw=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.1.0.tgz"; + sha512 = "BrfhBTJ2oEmE9HRCbv70e7gnpflIDnV7OvDrCt5bcgoORTyleyXz7WberDt5+S/gqMpGfXpwkoXcsGoSMfb2xg=="; }; }; "memfs-3.2.2" = { @@ -38854,13 +38836,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.1" = { + "mermaid-8.11.2" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.1"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.1.tgz"; - sha512 = "riymn143xhMtWBgC6WDniZ+ykNg2tzepO+/ES+t63rDQLhUbWWCMor+9UHOsUfgrJIK87M3nUwHFfc7ygX5/Fg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.2.tgz"; + sha512 = "a5aj6hmDfdPGmhB8so4VtwYZjhwGV0OvyQcRTrI3IrlWk5ZxYtEcS1GsIDJVwCX4bJMZbXYh9zbL+lArptCoSg=="; }; }; "meros-1.1.4" = { @@ -39871,6 +39853,15 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; + "mocha-9.0.3" = { + name = "mocha"; + packageName = "mocha"; + version = "9.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz"; + sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg=="; + }; + }; "mock-require-3.0.3" = { name = "mock-require"; packageName = "mock-require"; @@ -41691,13 +41682,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.7" = { + "node-object-hash-2.3.8" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.7.tgz"; - sha512 = "ybV3ZKZZoHJPSelxgRY5LYRHQToMtxvJxNbkY8WtWCy5Z/t3V0gyy/6O6kGoh0PrzZIATxVVDG2q+eM6iZMjKQ=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.8.tgz"; + sha512 = "hg/4TUqBOFdEhKjLF4jnn64utX3OWPVPWunVaDsaKxY+TVoViOFyW4lu34DES8yAqAqULSFm2jFL9SqVGes0Zg=="; }; }; "node-persist-2.1.0" = { @@ -42943,13 +42934,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.173.1" = { + "office-ui-fabric-react-7.174.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.173.1"; + version = "7.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.1.tgz"; - sha512 = "7FKJ4lVXGkVRQccPz3XDeCAysE0h687elFyaRir3BUVAtkqoye9IB7IF/68SsUQahv6Q0LI3YTWym0IG/tlBEQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.174.0.tgz"; + sha512 = "hnuISSifwA7nSihuxpdNlh5plAmaPJqcDZUdhswak964Kb/8/ckMz/7BRQf+u9pGNs6LR14iDfRF/4RjLLzs6g=="; }; }; "omggif-1.0.10" = { @@ -43762,13 +43753,13 @@ let sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; }; }; - "os-name-4.0.0" = { + "os-name-4.0.1" = { name = "os-name"; packageName = "os-name"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz"; - sha512 = "caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg=="; + url = "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz"; + sha512 = "xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw=="; }; }; "os-shim-0.1.3" = { @@ -45355,13 +45346,13 @@ let sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; }; }; - "peek-readable-4.0.0" = { + "peek-readable-4.0.1" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.0.tgz"; - sha512 = "kLbU4cz6h86poGVBKgAVMpFmD47nX04fPPQNKnv9fuj+IJZYkEBjsYAVu5nDbZWx0ZsWwWlMzeG90zQa5KLBaA=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.1.tgz"; + sha512 = "7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ=="; }; }; "peek-stream-1.1.3" = { @@ -48749,13 +48740,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.158" = { + "pyright-1.1.159" = { name = "pyright"; packageName = "pyright"; - version = "1.1.158"; + version = "1.1.159"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.158.tgz"; - sha512 = "gT+uy5OYyRTbB7997hag74kUuDh7XdMFYjj6AgBQ5Zp53e7oL09RH10zNDVHvI9nzuooiWjYkIS0rhuapfDL0g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz"; + sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ=="; }; }; "q-0.9.7" = { @@ -52160,13 +52151,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.36.0" = { + "sass-1.37.0" = { name = "sass"; packageName = "sass"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.36.0.tgz"; - sha512 = "fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz"; + sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w=="; }; }; "sax-0.5.8" = { @@ -52583,13 +52574,13 @@ let sha512 = "d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ=="; }; }; - "semver-regex-1.0.0" = { + "semver-regex-2.0.0" = { name = "semver-regex"; packageName = "semver-regex"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; + sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; }; }; "semver-truncate-1.1.2" = { @@ -53312,13 +53303,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.41.2" = { + "simple-git-2.42.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.41.2"; + version = "2.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.2.tgz"; - sha512 = "rrsqu3w6TNCwe7McW7Uany7pmz5TMteOTCu5Wfc0vVUdKJP94m+587pbEB6Kj4IsBM/vl85nGXZJ3XRSQ9ucLg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.42.0.tgz"; + sha512 = "illpUX0bcrdB3AyvBGLz0ToRVP7lXNJOGVybGVuVk7PpivPNK5YKJx2aagKdKbveaMtt0DCLK4/jfjDb6b2M2g=="; }; }; "simple-handshake-3.0.0" = { @@ -55274,13 +55265,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.31" = { + "sscaff-1.2.34" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.31"; + version = "1.2.34"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.31.tgz"; - sha512 = "U6DtvPeVUIN2IPljBqsyNyoqH6YCDWBWl+pan6p874mWjapQ3bQbbYm7CJgsA7NIzR/kGX2aUWAZLR3s1vGBsA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.34.tgz"; + sha512 = "J3tgewePIaRry/KOsdo9N+vl/RmMzrgiPT33B/a+fnqKYFtdcxfyq985e+dlYUXNorB0e4j0OV/hV9pGGwpZ1Q=="; }; }; "ssh-config-1.1.6" = { @@ -56561,13 +56552,13 @@ let sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; }; }; - "strtok3-6.2.2" = { + "strtok3-6.2.4" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.2"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.2.tgz"; - sha512 = "iUzLl3UhF2RfqQah80JngnfltQFLEidGyTX8+hHFMQFjzUj3UpIpOx824FtFmRI9bwyywReENpdHGDkFJwJlGQ=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; + sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; }; }; "structured-source-3.0.2" = { @@ -56894,15 +56885,6 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "supports-color-4.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -57281,13 +57263,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.13" = { + "systeminformation-5.7.14" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.13"; + version = "5.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.13.tgz"; - sha512 = "yGzRLLdZ4xR37+3WM89rFG1zEQ10BqefeCv0YUfXp26bZGPoZtGQt/IEtIa40i1VmGBMGFTQCVClZ7/optxtvw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.14.tgz"; + sha512 = "T928Nvxy5uA/NQR00gGCm4wnNGPcXYyPXDnZsMR1wG5rk25CwaVcshsSGvl91s0DPUyC87tUfQOWVg4EvNwsOA=="; }; }; "table-3.8.3" = { @@ -57507,15 +57489,6 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; - "tar-6.1.0" = { - name = "tar"; - packageName = "tar"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; - sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; - }; - }; "tar-6.1.2" = { name = "tar"; packageName = "tar"; @@ -57930,13 +57903,13 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; - "textextensions-5.13.0" = { + "textextensions-5.14.0" = { name = "textextensions"; packageName = "textextensions"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/textextensions/-/textextensions-5.13.0.tgz"; - sha512 = "srLdv6DnJWdrddd4j6GcVmExwaydgbWsmTsxeW8OkZv6/2Je/SwkjHYdrhosImPQPiXzNT2kyjak4xh2TVccgA=="; + url = "https://registry.npmjs.org/textextensions/-/textextensions-5.14.0.tgz"; + sha512 = "4cAYwNFNYlIAHBUo7p6zw8POUvWbZor+/R0Tanv+rIhsauEyV9QSrEXL40pI+GfTQxKX8k6Tyw6CmdSDSmASrg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -59739,13 +59712,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.4.2" = { + "typegram-3.4.3" = { name = "typegram"; packageName = "typegram"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.4.2.tgz"; - sha512 = "Z+FaPrD+oyzvchLZHmfyz55MuPhJ51tYm6i+gbeZ0W8Yr4LLWQfI0mBlR2v08PzjHuRx26bmZBEM30jSrGbfbg=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.3.tgz"; + sha512 = "pH0TQJzCWM2+7y6yiBoQVNt7PO9ZvAu/lQukVx4sm68FIBBZEBWI+2MzuMcdbwrD5mD5NrEMAyml9N6DupUZag=="; }; }; "typescript-2.9.2" = { @@ -62476,6 +62449,15 @@ let sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; + "vsce-1.96.1" = { + name = "vsce"; + packageName = "vsce"; + version = "1.96.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vsce/-/vsce-1.96.1.tgz"; + sha512 = "KnEVqjfc1dXrpZsbJ8J7B9VQ7GAAx8o5RqBNk42Srv1KF9+e2/aXchQHe9QZxeUs/FiliHoMGpGvnHTXwKIT2A=="; + }; + }; "vscode-css-languageservice-3.0.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -63394,13 +63376,13 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.46.0" = { + "webpack-5.45.1" = { name = "webpack"; packageName = "webpack"; - version = "5.46.0"; + version = "5.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.46.0.tgz"; - sha512 = "qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; + sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; "webpack-5.47.1" = { @@ -63547,13 +63529,13 @@ let sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; - "webpack-sources-3.1.1" = { + "webpack-sources-3.2.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.1.tgz"; - sha512 = "ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="; }; }; "webpack-stream-6.1.0" = { @@ -63601,13 +63583,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.3" = { + "webtorrent-1.3.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.3.tgz"; - sha512 = "JfnAqUguJQHT+jnQPkxD2mGKN1vAbBokrhwsb63q+lBi15xDY26Dx3Uvvfqk1ugr7RpqMpsg7IxW64pTrTfRkQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.4.tgz"; + sha512 = "C7WsNxOJ2YG5tTd533fUDxUUklnPOUxHvBhljrue0e1GRCrCHKAtlWm6kgaO9qHRJnnx1m66vVDGoiKaDYPmLw=="; }; }; "well-known-symbols-2.0.0" = { @@ -65573,22 +65555,22 @@ let sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; }; }; - "yeoman-doctor-4.0.0" = { + "yeoman-doctor-5.0.0" = { name = "yeoman-doctor"; packageName = "yeoman-doctor"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-4.0.0.tgz"; - sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-5.0.0.tgz"; + sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.4.1" = { + "yeoman-environment-3.5.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.4.1.tgz"; - sha512 = "Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.5.1.tgz"; + sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; }; }; "yesno-0.3.1" = { @@ -65818,7 +65800,7 @@ in sources."builtins-1.0.3" sources."cacache-15.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" @@ -66416,7 +66398,7 @@ in sources."big-integer-1.6.48" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -66463,7 +66445,7 @@ in sources."is-potential-custom-element-name-1.0.1" sources."is-promise-2.2.2" sources."is-wsl-2.2.0" - (sources."jsdom-16.6.0" // { + (sources."jsdom-16.7.0" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -66555,7 +66537,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66660,7 +66642,7 @@ in sources."encoding-down-6.3.0" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - (sources."es-abstract-1.18.4" // { + (sources."es-abstract-1.18.5" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -66969,7 +66951,7 @@ in sources."supports-color-2.0.0" sources."temp-dir-1.0.0" sources."tempy-0.1.0" - sources."textextensions-5.13.0" + sources."textextensions-5.14.0" (sources."through2-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -67047,22 +67029,22 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.1.0.tgz"; - sha512 = "n+IllUA4uqf+U+5RmV6HsD5V5+kLWKJ8G3ObSIpPK01St1376/X0Pps6AmLMyHC7vzPK5AtQTThKGIUI43PBXw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.1.1.tgz"; + sha512 = "Jo/vYyrDHJhRIoFevO+A955KX7aLSAV6gn0sbIJBDTKiha1yxfgEbHOk8qP24gNFLwiDn2CKbwph2g6z0v/mNw=="; }; dependencies = [ - sources."@angular-devkit/core-12.1.3" - sources."@angular-devkit/schematics-12.1.3" - (sources."@angular-devkit/schematics-cli-12.1.3" // { + sources."@angular-devkit/core-12.1.4" + sources."@angular-devkit/schematics-12.1.4" + (sources."@angular-devkit/schematics-cli-12.1.4" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."inquirer-8.1.1" ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -67079,7 +67061,7 @@ in sources."@angular-devkit/schematics-12.0.5" sources."ajv-8.2.0" sources."ajv-formats-2.0.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."ora-5.4.0" ]; }) @@ -67087,7 +67069,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67153,7 +67135,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67179,9 +67161,9 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.2.13" // { + (sources."fork-ts-checker-webpack-plugin-6.3.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."fs-extra-9.1.0" ]; }) @@ -67205,7 +67187,7 @@ in sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."interpret-1.4.0" @@ -67238,7 +67220,7 @@ in sources."lodash.toarray-4.4.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."lru-cache-6.0.0" @@ -67262,10 +67244,10 @@ in sources."onetime-5.1.2" (sources."ora-5.4.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) - sources."os-name-4.0.0" + sources."os-name-4.0.1" sources."os-tmpdir-1.0.2" sources."p-limit-3.1.0" sources."parent-module-1.0.1" @@ -67339,7 +67321,7 @@ in sources."tsconfig-paths-3.10.1" (sources."tsconfig-paths-webpack-plugin-3.5.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."tslib-1.14.1" @@ -67350,7 +67332,7 @@ in sources."util-deprecate-1.0.2" sources."watchpack-2.2.0" sources."wcwidth-1.0.1" - (sources."webpack-5.46.0" // { + (sources."webpack-5.45.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -67400,9 +67382,9 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" @@ -67423,14 +67405,14 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -67465,7 +67447,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -67480,7 +67462,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -67495,7 +67477,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.8" + sources."@babel/preset-env-7.14.9" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -67508,8 +67490,8 @@ in }) sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67562,7 +67544,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67833,14 +67815,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -68008,7 +67990,7 @@ in (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -68728,12 +68710,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.8" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/generator-7.14.9" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.8" + sources."@babel/types-7.14.9" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68808,13 +68790,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.14.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -68830,14 +68812,14 @@ in sources."@babel/helper-replace-supers-7.14.5" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -68856,7 +68838,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68950,7 +68932,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -68987,7 +68969,7 @@ in sources."browserslist-4.16.6" sources."caniuse-lite-1.0.30001248" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69014,14 +68996,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.957.0" // { + (sources."aws-sdk-2.958.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69039,7 +69021,7 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."bytes-3.1.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" @@ -69225,10 +69207,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.2"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.2.tgz"; - sha512 = "WkkawzLy7qGOxY0ep8+FYNpGa2+nCPDdKGzSF1HR1oBgwkzt7e1hOYpvYpRBT3tssbcm6ffw5MGejAIRImSr6w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.3.tgz"; + sha512 = "z28OLydw1ShAWmnSJFdcES0krIoR1+SXxKarPo2fOPg5VzcNxttaSnWEO5BSsB1E64fJ4EImyMhhwKCZ9uB2xA=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69241,7 +69223,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69352,7 +69334,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -69529,7 +69511,7 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."external-editor-3.1.0" @@ -69675,7 +69657,7 @@ in (sources."log-symbols-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."supports-color-7.2.0" ]; }) @@ -69736,7 +69718,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" @@ -69784,7 +69766,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" ]; }) sources."proxy-addr-2.0.7" @@ -69899,13 +69881,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.4.2" + sources."typegram-3.4.3" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."import-lazy-2.1.0" sources."supports-color-7.2.0" ]; @@ -70344,7 +70326,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -70504,10 +70486,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/parser-7.14.9" + sources."@babel/types-7.14.9" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70876,7 +70858,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.41.2" + sources."simple-git-2.42.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -70966,8 +70948,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.7" - sources."addr-to-ip-port-1.5.3" + sources."@types/node-16.4.10" + sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" sources."ansi-regex-1.1.1" @@ -71372,10 +71354,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.31"; + version = "1.0.0-beta.34"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.31.tgz"; - sha512 = "oVe2k5xGfL27WTIT2rhS+pRXellgRTFO0xx6TxtOvZ7AyIjbeU4F9XbuBaIilb7X8k9E+G5d6D3hAMkxkh5Gew=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.34.tgz"; + sha512 = "a46brzT/snqVY0abj4qv+HLY7poqpc9VFlE/E7wHQzSR1BLAr+ysudLfn33YJt6fNvHRlfhIIqh1zXL0JelvPA=="; }; dependencies = [ sources."@jsii/spec-1.32.0" @@ -71387,8 +71369,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.26" - sources."cdk8s-plus-17-1.0.0-beta.38" + sources."cdk8s-1.0.0-beta.27" + sources."cdk8s-plus-17-1.0.0-beta.42" sources."cliui-7.0.4" sources."clone-2.1.2" (sources."codemaker-1.32.0" // { @@ -71400,7 +71382,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.108" + sources."constructs-3.3.111" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71411,7 +71393,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -71474,13 +71456,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.310" // { + (sources."jsii-srcmak-0.1.313" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.280" + sources."json2jsii-0.1.283" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71516,7 +71498,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.31" + sources."sscaff-1.2.34" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71585,16 +71567,16 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.8" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/generator-7.14.9" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.8" + sources."@babel/types-7.14.9" sources."@cdktf/hcl2cdk-0.5.0" sources."@cdktf/hcl2json-0.5.0" (sources."@graphql-tools/graphql-file-loader-6.2.7" // { @@ -71658,7 +71640,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.6" + sources."@types/node-14.17.7" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -71738,7 +71720,7 @@ in }) sources."case-1.6.3" sources."cdktf-0.5.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -71779,7 +71761,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.108" + sources."constructs-3.3.111" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -71821,7 +71803,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -71978,7 +71960,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.310" // { + (sources."jsii-srcmak-0.1.313" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -72136,7 +72118,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.31" + sources."sscaff-1.2.34" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -72817,7 +72799,7 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" @@ -72990,7 +72972,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -73072,7 +73054,7 @@ in sources."caniuse-lite-1.0.30001248" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -73167,14 +73149,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.31.0" // { + (sources."eslint-7.32.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -73966,13 +73948,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.158"; + version = "1.1.159"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.158.tgz"; - sha512 = "+aEgJAgklX3jRe+NkV4e5IgvU+6j0TtZFcjaKA50dYLiYUzjut7utjsxmBkrmacOEqRjcYlyWcHNpF20QaNZFQ=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.159.tgz"; + sha512 = "0CoePhEzGBHBin0mGtGhUV+hkg6Uh8+Qz0tN4a1A+vqiip/juRRmokB/yxMyFbhUftDXmkiF/JmrSC04uYCTAw=="; }; dependencies = [ - sources."pyright-1.1.158" + sources."pyright-1.1.159" ]; buildInputs = globalBuildInputs; meta = { @@ -74046,10 +74028,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.3"; + version = "0.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.3.tgz"; - sha512 = "S7ccnNNqL0ucbVuWlRA/41m/0dwwbD65p3/2IfQ5p2EyV74bcIVcTtU04rRfX9G2pdYOqWcCtmXT0hXfjHEZHQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.48.0.tgz"; + sha512 = "qI+bODEl34n6dFTrbQoc5kjXhRUCLxVhfs0TFvz3iqKBj4Yz9lI5fYxH76DXce9ETlTQNQDt1XQVycC5pPyUdA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74123,9 +74105,9 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" @@ -74137,7 +74119,7 @@ in sources."@babel/helper-replace-supers-7.14.5" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { @@ -74145,10 +74127,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -74179,7 +74161,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-lite-1.0.30001248" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -74216,7 +74198,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74503,7 +74485,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74618,7 +74600,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -74640,7 +74622,7 @@ in sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -74661,7 +74643,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" + sources."eslint-7.32.0" (sources."eslint-plugin-vue-7.15.0" // { dependencies = [ sources."semver-6.3.0" @@ -75676,14 +75658,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -76054,7 +76036,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -77173,7 +77155,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.6" + sources."@types/node-14.17.7" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -77372,7 +77354,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77424,7 +77406,7 @@ in sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."chromium-pickle-js-0.2.0" @@ -77485,7 +77467,7 @@ in sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."electron-notarize-1.0.0" // { + (sources."electron-notarize-1.0.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -77981,13 +77963,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -78005,27 +77987,27 @@ in sources."@babel/helper-replace-supers-7.14.5" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -78097,7 +78079,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -78130,7 +78112,7 @@ in (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -78140,7 +78122,7 @@ in (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -78340,7 +78322,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -78351,7 +78333,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.173.1" + sources."@fluentui/react-7.174.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -78365,7 +78347,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.196" + sources."@microsoft/load-themed-styles-1.10.197" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -79392,7 +79374,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.173.1" + sources."office-ui-fabric-react-7.174.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -79619,7 +79601,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.36.0" // { + (sources."sass-1.37.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -80035,14 +80017,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; - sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -80063,7 +80045,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -80203,7 +80185,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -80226,7 +80208,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -80245,7 +80227,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" + sources."eslint-7.32.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -80385,7 +80367,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."@babel/code-frame-7.14.5" @@ -80393,7 +80375,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -80423,7 +80405,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" @@ -80432,9 +80414,9 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -80472,7 +80454,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -80487,15 +80469,15 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-assign-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-display-name-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/plugin-transform-react-jsx-self-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" + sources."@babel/plugin-transform-react-jsx-self-7.14.9" sources."@babel/plugin-transform-react-jsx-source-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" @@ -80512,7 +80494,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.14.9" // { dependencies = [ sources."semver-6.3.0" ]; @@ -80528,12 +80510,12 @@ in sources."@babel/code-frame-7.14.5" ]; }) - (sources."@babel/traverse-7.14.8" // { + (sources."@babel/traverse-7.14.9" // { dependencies = [ sources."@babel/code-frame-7.14.5" ]; }) - sources."@babel/types-7.14.8" + sources."@babel/types-7.14.9" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.6" @@ -80913,7 +80895,7 @@ in sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -81179,7 +81161,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81208,7 +81190,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -81565,7 +81547,7 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.4.1" + sources."joi-17.4.2" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -82870,9 +82852,9 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" @@ -82886,22 +82868,22 @@ in sources."@babel/helper-replace-supers-7.14.5" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82953,7 +82935,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82983,7 +82965,7 @@ in (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -83145,17 +83127,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83174,7 +83156,7 @@ in sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-4.0.0" @@ -83254,7 +83236,7 @@ in sources."bluebird-3.7.2" (sources."boxen-5.0.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; @@ -83399,7 +83381,7 @@ in sources."fastq-1.11.1" (sources."faunadb-4.3.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; @@ -83807,7 +83789,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -84156,7 +84138,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.19.0" // { + (sources."google-gax-2.20.0" // { dependencies = [ sources."google-auth-library-7.4.1" ]; @@ -84610,7 +84592,7 @@ in dependencies = [ sources."boxen-5.0.1" sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."global-dirs-3.0.0" sources."has-flag-4.0.0" sources."ini-2.0.0" @@ -84733,7 +84715,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84754,7 +84736,7 @@ in sources."astral-regex-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" @@ -84913,7 +84895,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -84936,7 +84918,7 @@ in sources."buffer-to-arraybuffer-0.0.5" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -85217,7 +85199,7 @@ in sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -85554,7 +85536,7 @@ in sources."@medv/blessed-2.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -85609,14 +85591,14 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.14.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85639,7 +85621,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { @@ -85647,19 +85629,19 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/runtime-7.14.8" - sources."@babel/standalone-7.14.8" + sources."@babel/standalone-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85695,7 +85677,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85764,7 +85746,7 @@ in sources."camelcase-5.3.1" sources."caniuse-lite-1.0.30001248" sources."ccount-1.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -85858,7 +85840,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -86028,7 +86010,7 @@ in ]; }) sources."jest-get-type-25.2.6" - (sources."joi-17.4.1" // { + (sources."joi-17.4.2" // { dependencies = [ sources."@hapi/hoek-9.2.0" sources."@hapi/topo-5.1.0" @@ -86094,7 +86076,7 @@ in sources."no-case-3.0.4" sources."node-eta-0.9.0" sources."node-fetch-2.6.1" - sources."node-object-hash-2.3.7" + sources."node-object-hash-2.3.8" sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -86624,7 +86606,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86676,7 +86658,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -86983,7 +86965,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -87084,7 +87066,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -87178,7 +87160,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -87774,7 +87756,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.10.0" + sources."blessed-contrib-4.10.1" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -87807,7 +87789,7 @@ in (sources."marked-terminal-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."supports-color-7.2.0" ]; }) @@ -87830,7 +87812,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.13" + sources."systeminformation-5.7.14" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -89280,7 +89262,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "https://github.com/remy/inliner"; + homepage = "http://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -89574,7 +89556,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -89777,7 +89759,7 @@ in (sources."@ot-builder/cli-help-shower-1.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -89944,7 +89926,7 @@ in (sources."verda-1.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -90107,13 +90089,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -90133,7 +90115,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { @@ -90145,7 +90127,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -90160,8 +90142,8 @@ in sources."@babel/preset-typescript-7.14.5" sources."@babel/register-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplin/fork-htmlparser2-4.1.28" @@ -90230,8 +90212,8 @@ in }) ]; }) - sources."@percy/config-1.0.0-beta.61" - sources."@percy/logger-1.0.0-beta.61" + sources."@percy/config-1.0.0-beta.62" + sources."@percy/logger-1.0.0-beta.62" sources."@percy/migrate-0.10.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.5" @@ -90286,7 +90268,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.957.0" // { + (sources."aws-sdk-2.958.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -90327,7 +90309,7 @@ in sources."camelcase-4.1.0" sources."caniuse-lite-1.0.30001248" sources."caseless-0.12.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -90483,7 +90465,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -90840,7 +90822,7 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."mermaid-8.11.1" + sources."mermaid-8.11.2" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -91393,7 +91375,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -91473,7 +91455,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "https://jshint.com/"; + homepage = "http://jshint.com/"; license = "MIT"; }; production = true; @@ -91616,7 +91598,7 @@ in ]; }) sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" (sources."cliui-7.0.4" // { @@ -92461,7 +92443,11 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@putdotio/api-client-8.16.0" + (sources."@putdotio/api-client-8.17.0" // { + dependencies = [ + sources."axios-0.21.1" + ]; + }) sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -92470,11 +92456,17 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.19.2" + (sources."axios-0.19.2" // { + dependencies = [ + sources."debug-3.1.0" + sources."follow-redirects-1.5.10" + sources."ms-2.0.0" + ]; + }) sources."braces-3.0.2" sources."call-bind-1.0.2" sources."cardinal-2.1.1" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -92539,12 +92531,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.14.1" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" @@ -92651,6 +92638,7 @@ in sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."urijs-1.19.7" + sources."uuid-8.3.2" sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" @@ -92700,7 +92688,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92947,7 +92935,7 @@ in }) sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."events-3.3.0" @@ -93724,7 +93712,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93912,7 +93900,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -93991,7 +93979,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -95389,9 +95377,9 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" @@ -95412,7 +95400,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" @@ -95421,10 +95409,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -95459,7 +95447,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -95473,7 +95461,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -95488,13 +95476,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.8" + sources."@babel/preset-env-7.14.9" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -95515,7 +95503,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -95812,7 +95800,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96634,7 +96622,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -97060,13 +97048,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -97086,7 +97074,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { @@ -97100,7 +97088,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -97115,8 +97103,8 @@ in sources."@babel/preset-typescript-7.14.5" sources."@babel/register-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@braintree/sanitize-url-3.1.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -97155,10 +97143,10 @@ in }) ]; }) - sources."@percy/config-1.0.0-beta.61" - sources."@percy/logger-1.0.0-beta.61" + sources."@percy/config-1.0.0-beta.62" + sources."@percy/logger-1.0.0-beta.62" sources."@percy/migrate-0.10.0" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -97198,7 +97186,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."caniuse-lite-1.0.30001248" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-1.1.4" (sources."class-utils-0.3.6" // { @@ -97287,7 +97275,7 @@ in sources."devtools-protocol-0.0.883894" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -97454,7 +97442,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" - sources."mermaid-8.11.1" + sources."mermaid-8.11.2" sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -97691,13 +97679,13 @@ in sources."@fluentui/merge-styles-8.1.3" sources."@fluentui/react-8.23.8" sources."@fluentui/react-focus-8.1.9" - sources."@fluentui/react-hooks-8.2.4" + sources."@fluentui/react-hooks-8.2.5" sources."@fluentui/react-window-provider-2.1.3" sources."@fluentui/set-version-8.1.3" sources."@fluentui/style-utilities-8.2.1" sources."@fluentui/theme-2.2.0" sources."@fluentui/utilities-8.2.1" - sources."@microsoft/load-themed-styles-1.10.196" + sources."@microsoft/load-themed-styles-1.10.197" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" @@ -97973,7 +97961,7 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-6.2.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; @@ -98149,10 +98137,10 @@ in musescore-downloader = nodeEnv.buildNodePackage { name = "musescore-downloader"; packageName = "musescore-downloader"; - version = "0.25.0"; + version = "0.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.25.0.tgz"; - sha512 = "F2qWP33AgxYrEHfvmlUw75VuXHnTAmGztGdmsZIZYQNPxB1nKusC5Qs9unmGvUF+JgyziC7kVqp6TGY5JQvsVA=="; + url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.26.0.tgz"; + sha512 = "AHA5wSaEJLwfEEQDl8kLfin7l4uejXYTzWtn/BgUiyWKw4AbuUK2/xfDmULW2KxUfsK2RoLl0bFtIvdvvm4CNA=="; }; dependencies = [ sources."@librescore/fonts-0.4.1" @@ -98163,7 +98151,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.0" @@ -98285,20 +98273,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.3.1.tgz"; - sha512 = "694ZZdsFDzJNRRSZVNpour0DYhkPX613drfRyaepz9yjHRm/vlJ3jq5i64GZW9bOjhZY1HW+cve0fhYmkIyVNQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.4.1.tgz"; + sha512 = "Eoc/5wAH6D1sAWOhfdbim3H0IQNDcQDmXzxWqKkaa3TuOIvImysEbQz0Qr5njQUKwTvVoQ4zSnmdim8uK0SkJg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -98327,7 +98315,7 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" @@ -98340,9 +98328,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -98375,7 +98363,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -98389,7 +98377,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -98403,7 +98391,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.14.9" // { dependencies = [ sources."semver-6.3.0" ]; @@ -98411,8 +98399,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@bugsnag/browser-7.11.0" sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" @@ -98422,7 +98410,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.3.1" // { + (sources."@netlify/build-17.4.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -98489,7 +98477,7 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.6" + sources."@types/node-14.17.7" ]; }) sources."@netlify/plugins-list-2.21.0" @@ -98674,7 +98662,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -98834,7 +98822,7 @@ in sources."camelcase-5.3.1" sources."caniuse-lite-1.0.30001248" sources."cardinal-2.1.1" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -99098,7 +99086,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -100796,17 +100784,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.0.4.tgz"; - sha512 = "hZlBqPThweIrnnQ800RDpkpLHGiqimsgq+QSM8IiS5wGxSlFimZibZpiMjl8+Fwnv5aqF04cstpG0cG+yuIFmg=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.5.tgz"; + sha512 = "S3vhm/EqQwEvHDBw/375j4f5vVT9YknfTEeQjbA/Fa2XAK0WLCC+ENLV+4HzkpSAIi+9hmrF3TpdhjVLksmk1A=="; }; dependencies = [ sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" - sources."@node-red/editor-api-2.0.4" - sources."@node-red/editor-client-2.0.4" - (sources."@node-red/nodes-2.0.4" // { + sources."@node-red/editor-api-2.0.5" + sources."@node-red/editor-client-2.0.5" + (sources."@node-red/nodes-2.0.5" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.6.3" @@ -100819,15 +100807,15 @@ in }) ]; }) - sources."@node-red/registry-2.0.4" - sources."@node-red/runtime-2.0.4" - sources."@node-red/util-2.0.4" + sources."@node-red/registry-2.0.5" + sources."@node-red/runtime-2.0.5" + sources."@node-red/util-2.0.5" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -101155,7 +101143,7 @@ in sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" - (sources."tar-6.1.0" // { + (sources."tar-6.1.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -101561,7 +101549,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -101587,7 +101575,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -101628,7 +101616,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -102174,7 +102162,7 @@ in }) sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" @@ -102708,7 +102696,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."json5-2.2.0" @@ -102716,7 +102704,7 @@ in sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.14.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -102749,14 +102737,14 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -102791,7 +102779,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -102806,12 +102794,12 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" @@ -102821,7 +102809,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.14.9" // { dependencies = [ sources."semver-6.3.0" ]; @@ -102829,8 +102817,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -103090,7 +103078,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103100,7 +103088,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.4" // { + (sources."es-abstract-1.18.5" // { dependencies = [ sources."object-inspect-1.11.0" ]; @@ -104079,7 +104067,7 @@ in sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; }; dependencies = [ - sources."addr-to-ip-port-1.5.3" + sources."addr-to-ip-port-1.5.4" sources."airplay-protocol-2.0.2" (sources."airplayer-2.0.0" // { dependencies = [ @@ -104397,7 +104385,7 @@ in }; dependencies = [ sources."accepts-1.3.7" - sources."addr-to-ip-port-1.5.3" + sources."addr-to-ip-port-1.5.4" sources."after-0.8.2" sources."ajv-6.12.6" sources."archiver-3.1.1" @@ -104761,7 +104749,7 @@ in sha512 = "jT/sptM1ZG++FNk+jnJYNoWLDQXYd7hqpnBhd5j18SNW1jJzNYo55RahuCiD0KN0PX9mb53GWCqKM0ia/mJytA=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -104782,7 +104770,7 @@ in }) sources."braces-3.0.2" sources."buffer-5.7.1" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chownr-1.1.4" sources."cliui-7.0.4" sources."code-point-at-1.1.0" @@ -105138,7 +105126,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.13" + sources."systeminformation-5.7.14" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -105163,7 +105151,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "https://pm2.keymetrics.io/"; + homepage = "http://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; @@ -105173,10 +105161,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.10.3"; + version = "6.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.3.tgz"; - sha512 = "GdxerBN3hhe9x9W0mAMmiWoDELy7KekrmHbYdo7WeHC1MthP/gI7MGVYIgcKj9Vy4zWLO9v1hVYOgKUrewkDVg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.11.5.tgz"; + sha512 = "TXMSRyncP88F4GTdKFIIi3kdXSYf+v3uvIKLfNjPTt2YjsrbKmYNCR3VsGjYwlMVSnH2UEo2/sM2VNSefH9Isw=="; }; buildInputs = globalBuildInputs; meta = { @@ -105258,7 +105246,7 @@ in sources."at-least-node-1.0.0" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."cliui-7.0.4" sources."color-convert-2.0.1" @@ -105845,10 +105833,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.158"; + version = "1.1.159"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.158.tgz"; - sha512 = "gT+uy5OYyRTbB7997hag74kUuDh7XdMFYjj6AgBQ5Zp53e7oL09RH10zNDVHvI9nzuooiWjYkIS0rhuapfDL0g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz"; + sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -106107,7 +106095,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -106199,13 +106187,13 @@ in dependencies = [ sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -106234,14 +106222,14 @@ in sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -106277,7 +106265,7 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" - sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" @@ -106291,13 +106279,13 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-display-name-7.14.5" - sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-react-jsx-development-7.14.5" sources."@babel/plugin-transform-react-pure-annotations-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" @@ -106314,7 +106302,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.8" // { + (sources."@babel/preset-env-7.14.9" // { dependencies = [ sources."semver-6.3.0" ]; @@ -106325,14 +106313,14 @@ in sources."@babel/register-7.14.5" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -106749,7 +106737,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106780,7 +106768,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -107021,7 +107009,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."figures-3.2.0" @@ -108056,7 +108044,7 @@ in sources."iconv-lite-0.4.24" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-16.6.0" + sources."jsdom-16.7.0" sources."levn-0.3.0" sources."lodash-4.17.21" sources."mime-db-1.49.0" @@ -108114,7 +108102,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.8" // { + (sources."@babel/generator-7.14.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -108125,13 +108113,13 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -108140,12 +108128,12 @@ in sources."@redocly/ajv-8.6.2" (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ - sources."@types/node-14.17.6" + sources."@types/node-14.17.7" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.4" + sources."@types/node-15.14.5" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -108646,7 +108634,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -108664,7 +108652,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@rollup/plugin-commonjs-17.1.0" - sources."@rollup/plugin-node-resolve-11.2.1" + sources."@rollup/plugin-node-resolve-13.0.4" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ sources."estree-walker-1.0.1" @@ -108676,7 +108664,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-12.12.70" + sources."@types/node-14.17.7" sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" sources."@types/vscode-1.58.1" @@ -108700,7 +108688,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."asynckit-0.4.0" - sources."azure-devops-node-api-10.2.2" + sources."azure-devops-node-api-11.0.1" sources."balanced-match-1.0.2" sources."big-integer-1.6.48" sources."binary-0.3.0" @@ -108718,7 +108706,7 @@ in sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."chainsaw-0.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -108729,7 +108717,7 @@ in }) sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" sources."cliui-7.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -108768,7 +108756,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.31.0" // { + (sources."eslint-7.32.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -108851,6 +108839,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" + sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -108866,7 +108855,7 @@ in sources."lodash.clonedeep-4.5.0" sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" (sources."markdown-it-10.0.0" // { @@ -108883,7 +108872,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.4.0" // { + (sources."mocha-9.0.3" // { dependencies = [ sources."argparse-2.0.1" (sources."debug-4.3.1" // { @@ -108891,16 +108880,15 @@ in sources."ms-2.1.2" ]; }) - sources."glob-7.1.6" sources."has-flag-4.0.0" - sources."js-yaml-4.0.0" + sources."js-yaml-4.1.0" sources."ms-2.1.3" sources."supports-color-8.1.1" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.1.20" + sources."nanoid-3.1.23" sources."natural-compare-1.4.0" sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" @@ -108942,7 +108930,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."regexpp-3.2.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -108954,7 +108942,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -108986,7 +108974,7 @@ in ]; }) sources."text-table-0.2.0" - sources."tmp-0.0.29" + sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" sources."tslib-2.3.0" @@ -109008,7 +108996,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.88.0" // { + (sources."vsce-1.96.1" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -109031,7 +109019,7 @@ in ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.1.0" + sources."workerpool-6.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109155,10 +109143,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.36.0.tgz"; - sha512 = "fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz"; + sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -109423,7 +109411,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -109484,7 +109472,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.957.0" // { + (sources."aws-sdk-2.958.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -109553,7 +109541,7 @@ in sources."traverse-0.3.9" ]; }) - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -110029,7 +110017,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.41.2" // { + (sources."simple-git-2.42.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -110839,10 +110827,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.671.0"; + version = "1.673.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.671.0.tgz"; - sha512 = "VxTqViyluEo7ggIecTNkH+OjD/JtF6cHmxHrmMwRZ+FCRCUBmtDtdtT82lMLxTdp+cmx1jwBch7SyVGg3VIDZg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.673.0.tgz"; + sha512 = "qu6UpvUaC+NbHCvdA6COYHzb/S5fPiJrPDMQP7q1lEVAi0JnXASJrYuUVheAz+Uh8G4SPiQCAu5EimuPUf8fkg=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -110888,7 +110876,7 @@ in (sources."@snyk/inquirer-7.3.3-patch" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" ]; }) @@ -111005,7 +110993,7 @@ in (sources."boxen-5.0.1" // { dependencies = [ sources."camelcase-6.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" sources."type-fest-0.20.2" sources."wrap-ansi-7.0.0" @@ -111237,7 +111225,7 @@ in sources."lodash.values-4.3.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" ]; }) sources."lowercase-keys-2.0.0" @@ -111278,7 +111266,7 @@ in sources."open-7.4.2" (sources."ora-5.4.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."strip-ansi-6.0.0" ]; }) @@ -111376,7 +111364,7 @@ in sources."snyk-config-4.0.0" (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."tslib-2.3.0" ]; }) @@ -111528,7 +111516,7 @@ in sources."upath-2.0.1" (sources."update-notifier-5.1.0" // { dependencies = [ - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."semver-7.3.5" ]; }) @@ -111584,7 +111572,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111952,7 +111940,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -112785,7 +112773,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.957.0" // { + (sources."aws-sdk-2.958.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -113568,9 +113556,9 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.7" + sources."@babel/compat-data-7.14.9" sources."@babel/core-7.14.8" - sources."@babel/generator-7.14.8" + sources."@babel/generator-7.14.9" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" @@ -113582,7 +113570,7 @@ in sources."@babel/helper-replace-supers-7.14.5" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { @@ -113590,10 +113578,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.8" + sources."@babel/parser-7.14.9" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.8" - sources."@babel/types-7.14.8" + sources."@babel/traverse-7.14.9" + sources."@babel/types-7.14.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -113624,7 +113612,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-lite-1.0.30001248" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -113661,7 +113649,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -113903,7 +113891,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -113985,7 +113973,7 @@ in sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; }; dependencies = [ - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -113995,7 +113983,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."callsites-3.1.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."chokidar-3.5.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -114056,7 +114044,7 @@ in sources."@trysound/sax-0.1.1" sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" @@ -114825,7 +114813,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.4.2" + sources."typegram-3.4.3" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -115319,7 +115307,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -115937,7 +115925,7 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" @@ -116045,7 +116033,7 @@ in sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.4" + sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" @@ -116129,11 +116117,11 @@ in dependencies = [ sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.6" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -116433,7 +116421,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-4.0.1" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -116518,14 +116506,18 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.2.4" sources."supports-color-7.2.0" sources."tar-4.4.15" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + (sources."token-types-2.1.1" // { + dependencies = [ + sources."@tokenizer/token-0.1.1" + ]; + }) sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" @@ -116568,10 +116560,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.131.0"; + version = "0.131.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.131.0.tgz"; - sha512 = "s05qedtr8qDG7L7MiUpFNboGWSd2xzKeSRd5iQEOjun5DD5ptRQlNsA6wKTbVCdOGbQuUH4kVXerTeznDlBjkw=="; + url = "https://registry.npmjs.org/three/-/three-0.131.1.tgz"; + sha512 = "1vojiLBfH7e2GZDEzFBfmzU0b/5uraxdg630PcVCRdzgGOttGe6HmG+n71lLCZZnPOxU9f7UVPiSkKPMsyiB/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -117144,7 +117136,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.6" + sources."@types/node-14.17.7" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -117669,7 +117661,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -117691,7 +117683,7 @@ in sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."callsites-3.1.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -117712,7 +117704,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.31.0" + sources."eslint-7.32.0" (sources."eslint-plugin-vue-7.15.0" // { dependencies = [ sources."semver-6.3.0" @@ -118070,7 +118062,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."caniuse-lite-1.0.30001248" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; @@ -118109,7 +118101,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -118325,7 +118317,7 @@ in ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.1.1" + sources."webpack-sources-3.2.0" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -118658,7 +118650,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -118675,7 +118667,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -119598,7 +119590,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.8" + sources."@babel/runtime-corejs3-7.14.9" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -119696,7 +119688,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-potential-custom-element-name-1.0.1" sources."isarray-1.0.0" - sources."jsdom-16.6.0" + sources."jsdom-16.7.0" sources."json5-2.2.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" @@ -119821,7 +119813,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -119847,7 +119839,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -120410,7 +120402,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -120437,7 +120429,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.791" + sources."electron-to-chromium-1.3.792" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -120481,7 +120473,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-3.1.1" + sources."webpack-sources-3.2.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -120574,7 +120566,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -121228,8 +121220,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.7" - sources."addr-to-ip-port-1.5.3" + sources."@types/node-16.4.10" + sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -121287,7 +121279,7 @@ in ]; }) sources."castv2-client-1.2.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."charset-1.0.1" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -121522,7 +121514,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.3" // { + (sources."webtorrent-1.3.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -121662,10 +121654,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-4.2.0.tgz"; - sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; + url = "https://registry.npmjs.org/yo/-/yo-4.3.0.tgz"; + sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ sources."@babel/runtime-7.14.8" @@ -121706,7 +121698,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.4" + sources."@types/node-15.14.5" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -121738,7 +121730,6 @@ in sources."array-differ-3.0.0" sources."array-find-index-1.0.2" sources."array-union-2.1.0" - sources."array-uniq-1.0.3" sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" @@ -121757,12 +121748,8 @@ in sources."write-file-atomic-3.0.3" ]; }) - (sources."bin-version-2.0.0" // { - dependencies = [ - sources."execa-0.1.1" - ]; - }) - sources."bin-version-check-3.0.0" + sources."bin-version-3.1.0" + sources."bin-version-check-4.0.0" sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ @@ -121831,12 +121818,6 @@ in sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" - (sources."cross-spawn-async-2.2.5" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" @@ -121893,7 +121874,7 @@ in sources."fill-range-7.0.1" sources."filter-obj-2.0.2" sources."find-up-2.1.0" - sources."find-versions-2.0.0" + sources."find-versions-3.2.0" sources."find-yarn-workspace-root2-1.2.16" sources."first-chunk-stream-2.0.0" sources."foreachasync-3.0.0" @@ -122076,7 +122057,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.0.2" + sources."mem-fs-editor-9.1.0" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -122177,7 +122158,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -122330,7 +122311,7 @@ in sources."semver-5.7.1" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" - sources."semver-regex-1.0.0" + sources."semver-regex-2.0.0" sources."semver-truncate-1.1.2" (sources."serialize-error-7.0.1" // { dependencies = [ @@ -122438,7 +122419,7 @@ in ]; }) sources."text-table-0.2.0" - sources."textextensions-5.13.0" + sources."textextensions-5.14.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."titleize-1.0.1" @@ -122510,13 +122491,13 @@ in sources."supports-color-3.2.3" ]; }) - sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-3.4.1" // { + sources."yeoman-doctor-5.0.0" + (sources."yeoman-environment-3.5.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."color-convert-2.0.1" @@ -122606,11 +122587,11 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.7" + sources."@types/node-16.4.10" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 7daeaac14b1..25b6ff68041 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-07-12"; - cargoSha256 = "sha256-wlo3GlB9OhyVXys5pHAqWPKHWZHzNjcQ0hiaYnp2SUc="; + version = "2021-08-02"; + cargoSha256 = "10mdkqf6fqbzx49gwc283ms56yvrcdlvyk4y98jf33b8g5jmr8j5"; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-nd8valnltycywxBObSVFbt4fySEYQknFsFf5ZnEbgOk="; + sha256 = "1nh1naaqc6f40raz31a0vwypaxm5drzdl2bwjfqx2gydy6051gcl"; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 3010b9bf385..a67b6c927a8 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -51,9 +51,6 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ >"$build_deps/package.json.new" -# FIXME: vsce@1.93.0 breaks the build. -sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place "$build_deps/package.json.new" - if cmp --quiet "$build_deps"/package.json{.new,}; then echo "package.json not changed, skip updating nodePackages" rm "$build_deps"/package.json.new diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index d54ad42b1f6..a1a43a8f3d3 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -6,22 +6,22 @@ "node-fetch": "^2.6.1", "vscode-languageclient": "^7.1.0-next.5", "@rollup/plugin-commonjs": "^17.0.0", - "@rollup/plugin-node-resolve": "^11.0.0", - "@types/glob": "^7.1.3", - "@types/mocha": "^8.0.4", - "@types/node": "~12.12.6", - "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.53.0", - "@typescript-eslint/eslint-plugin": "^4.9.0", - "@typescript-eslint/parser": "^4.9.0", - "eslint": "^7.15.0", + "@rollup/plugin-node-resolve": "^13.0.0", + "@types/glob": "^7.1.4", + "@types/mocha": "^8.2.3", + "@types/node": "~14.17.5", + "@types/node-fetch": "^2.5.11", + "@types/vscode": "^1.57.0", + "@typescript-eslint/eslint-plugin": "^4.28.2", + "@typescript-eslint/parser": "^4.28.2", + "eslint": "^7.30.0", "glob": "^7.1.6", - "mocha": "^8.2.1", - "rollup": "^2.34.2", - "tslib": "^2.0.3", - "typescript": "^4.1.2", + "mocha": "^9.0.2", + "rollup": "^2.51.1", + "tslib": "^2.3.0", + "typescript": "^4.3.5", "typescript-formatter": "^7.2.2", - "vsce": "=1.88.0", + "vsce": "^1.95.1", "vscode-test": "^1.5.1" } } From a6581d356df2f9e497e4413e011659f0fc8b0115 Mon Sep 17 00:00:00 2001 From: iko <ilyakooo0@gmail.com> Date: Sat, 31 Jul 2021 15:53:35 +0300 Subject: [PATCH 1191/1522] chia-plotter: init at unstable-2021-07-12 --- .../blockchains/chia-plotter/default.nix | 65 +++++++++++++++++++ .../dont_fetch_dependencies.patch | 50 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 117 insertions(+) create mode 100644 pkgs/applications/blockchains/chia-plotter/default.nix create mode 100644 pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix new file mode 100644 index 00000000000..39f2e3cb0ed --- /dev/null +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, stdenv +, libsodium +, cmake +, substituteAll +, pythonPackages +}: + +stdenv.mkDerivation { + pname = "chia-plotter"; + version = "unstable-2021-07-12"; + + src = fetchFromGitHub { + owner = "madMAx43v3r"; + repo = "chia-plotter"; + rev = "974d6e5f1440f68c48492122ca33828a98864dfc"; + sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja"; + fetchSubmodules = true; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pythonPackages.pybind11.src; + relic_src = fetchFromGitHub { + owner = "relic-toolkit"; + repo = "relic"; + rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; + hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + }; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libsodium ]; + + # These flags come from the upstream build script: + # https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7 + CXXFLAGS = "-O3 -fmax-errors=1"; + cmakeFlags = [ + "-DARITH=easy" + "-DBUILD_BLS_PYTHON_BINDINGS=false" + "-DBUILD_BLS_TESTS=false" + "-DBUILD_BLS_BENCHMARKS=false" + ]; + + installPhase = '' + runHook preInstall + + install -D -m 755 chia_plot $out/bin/chia_plot + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/madMAx43v3r/chia-plotter"; + description = "New implementation of a chia plotter which is designed as a processing pipeline"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch new file mode 100644 index 00000000000..05486473eef --- /dev/null +++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch @@ -0,0 +1,50 @@ +diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt +index 255e3bb..5f99c3a 100644 +--- a/lib/bls-signatures/python-bindings/CMakeLists.txt ++++ b/lib/bls-signatures/python-bindings/CMakeLists.txt +@@ -6,8 +6,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11 relic) + +diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt +index b762b5d..e06073b 100644 +--- a/lib/bls-signatures/src/CMakeLists.txt ++++ b/lib/bls-signatures/src/CMakeLists.txt +@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17) + # CMake 3.14+ + include(FetchContent) + +-if (DEFINED ENV{RELIC_MAIN}) +- set(RELIC_GIT_TAG "origin/main") +-else () +- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +-endif () +- + message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") + + FetchContent_Declare( + relic +- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git +- GIT_TAG ${RELIC_GIT_TAG} ++ SOURCE_DIR @relic_src@ + ) + FetchContent_MakeAvailable(relic) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 970ec74..948441a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,6 +38,7 @@ include_directories( + ${BLAKE3_PATH} + ${CMAKE_BINARY_DIR}/_deps/relic-src/include + ${CMAKE_BINARY_DIR}/_deps/relic-build/include ++ @relic_src@/include + ) + + IF (WIN32) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1b3d8d17dd..e03a3726943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28636,6 +28636,8 @@ in chia = callPackage ../applications/blockchains/chia { }; + chia-plotter = callPackage ../applications/blockchains/chia-plotter { }; + clightning = callPackage ../applications/blockchains/clightning { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { From 3f6650ddb11102b368611c32da70a2831d74e85d Mon Sep 17 00:00:00 2001 From: Louis Bettens <louis@bettens.info> Date: Wed, 28 Jul 2021 14:42:33 +0200 Subject: [PATCH 1192/1522] chia: fix farming with a pool by fetching submodules https://github.com/NixOS/nixpkgs/issues/131809 --- pkgs/applications/blockchains/chia/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index d0ecdc4f72a..7e44fc80dc3 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -1,4 +1,5 @@ { lib +, cacert , fetchFromGitHub , fetchpatch , python3Packages @@ -12,7 +13,8 @@ python3Packages.buildPythonApplication rec { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M="; + fetchSubmodules = true; + sha256 = "sha256-nK/Zk2zgIdrRtw3+VkUXQWfI9j29XFDOR95Dvbn07eA="; }; patches = [ @@ -73,6 +75,8 @@ python3Packages.buildPythonApplication rec { --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \ --replace "clvm==0.9.7" "clvm>=0.9.7" \ --replace "bitstring==3.1.7" "bitstring>=3.1.9" \ + + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem ''; preCheck = '' From 95c29de58f50352a49c332e9b0bcb1c9fb4adb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:11:50 +0200 Subject: [PATCH 1193/1522] pivx: cleanup, format --- .../applications/blockchains/pivx/default.nix | 53 +++++++++++++------ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix index 58986a10676..fd562edf93f 100644 --- a/pkgs/applications/blockchains/pivx/default.nix +++ b/pkgs/applications/blockchains/pivx/default.nix @@ -1,38 +1,57 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null -, openssl, db48, boost, zlib, miniupnpc, gmp -, qrencode, glib, protobuf, yasm, libevent -, util-linux, qtbase ? null, qttools ? null +{ fetchFromGitHub +, lib +, stdenv +, pkg-config +, autoreconfHook +, wrapQtAppsHook +, openssl +, db48 +, boost +, zlib +, miniupnpc +, gmp +, qrencode +, glib +, protobuf +, yasm +, libevent +, util-linux +, qtbase +, qttools , enableUpnp ? false , disableWallet ? false , disableDaemon ? false -, withGui ? false }: +, withGui ? false +}: -with lib; stdenv.mkDerivation rec { - name = "pivx-${version}"; + pname = "pivx"; version = "4.1.1"; src = fetchFromGitHub { owner = "PIVX-Project"; - repo= "PIVX"; + repo = "PIVX"; rev = "v${version}"; sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optional enableUpnp "--enable-upnp-default" - ++ optional disableWallet "--disable-wallet" - ++ optional disableDaemon "--disable-daemon" - ++ optionals withGui [ "--with-gui=yes" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + ++ lib.optional enableUpnp "--enable-upnp-default" + ++ lib.optional disableWallet "--disable-wallet" + ++ lib.optional disableDaemon "--disable-daemon" + ++ lib.optionals withGui [ + "--with-gui=yes" + "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin" + ]; enableParallelBuilding = true; - doChecks = true; + doCheck = true; postBuild = '' mkdir -p $out/share/applications $out/share/icons cp contrib/debian/pivx-qt.desktop $out/share/applications/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4799e5774c..94f162769ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28786,6 +28786,9 @@ in pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx { withGui = false; + qtbase = null; + qttools = null; + wrapQtAppsHook = null; autoreconfHook = buildPackages.autoreconfHook269; }; From 76341deaabda66096f3711b33ee7eb5defe9a7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:12:04 +0200 Subject: [PATCH 1194/1522] grpc: format --- pkgs/development/libraries/grpc/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 0b05126f3bb..640136ec8b0 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages -, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf, grpc -, abseil-cpp, libnsl +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, buildPackages +, cmake +, zlib +, c-ares +, pkg-config +, re2 +, openssl +, protobuf +, grpc +, abseil-cpp +, libnsl }: stdenv.mkDerivation rec { From 0b06ccd7bec896d116d50c10d523c9be709abfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:12:10 +0200 Subject: [PATCH 1195/1522] knot-dns: cleanup --- pkgs/servers/dns/knot-dns/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fb4efba383c..3e3bcaf1e00 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,8 +3,6 @@ , autoreconfHook, nixosTests }: -let inherit (lib) optional optionals; in - stdenv.mkDerivation rec { pname = "knot-dns"; version = "3.1.0"; @@ -39,12 +37,10 @@ stdenv.mkDerivation rec { libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? - ] - ++ optionals stdenv.isLinux [ - libcap_ng systemd - libbpf # XDP support - ] - ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng systemd + libbpf # XDP support + ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; From 361c55a03df3202444d7fa0c138ab55a1b41caeb Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Mon, 2 Aug 2021 12:13:37 +0100 Subject: [PATCH 1196/1522] cosign: 1.0.0 -> 1.0.1 --- pkgs/tools/security/cosign/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index d13762080c2..344c74d573c 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "0s9mv580habr8pprdz2n5jisxakd10vv1y79fhwfcs29njr7yi7v"; + sha256 = "sha256-j1C4OGyVY41bG+rRr6chbii94H4yeRCum52A8XcnP6g="; }; buildInputs = @@ -17,14 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "0njvgykzpiym5w5b4ddnnq597qm90hcng51lf01yf6csir7nyr12"; + vendorSha256 = "sha256-9/KrgokCqSWqC4nOgA1e9H0sOx6O/ZFGFEPxiPEKoNI="; excludedPackages = "\\(copasetic\\)"; preBuild = '' buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) ''; - ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; From 9733d7e0774cb8776184e33cda144c6914f84679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:14:13 +0200 Subject: [PATCH 1197/1522] toxvpn: format, cleanup --- pkgs/tools/networking/toxvpn/default.nix | 35 ++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c433d7d0a66..c5aaec66d9e 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,33 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nlohmann_json, - libtoxcore, libsodium, libcap, zeromq, - systemd ? null }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nlohmann_json +, libtoxcore +, libsodium +, libcap +, zeromq +, systemd +}: stdenv.mkDerivation { - name = "toxvpn-2019-09-09"; + name = "toxvpn"; + version = "unstable-2019-09-09"; src = fetchFromGitHub { - owner = "cleverca22"; - repo = "toxvpn"; - rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; + owner = "cleverca22"; + repo = "toxvpn"; + rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ optionals stdenv.isLinux [ libcap systemd ]; + ++ lib.optionals stdenv.isLinux [ libcap systemd ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; + cmakeFlags = lib.optional stdenv.isLinux [ "-DSYSTEMD=1" ]; postInstall = "$out/bin/toxvpn -h"; meta = with lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; - homepage = "https://github.com/cleverca22/toxvpn"; - license = licenses.gpl3; + homepage = "https://github.com/cleverca22/toxvpn"; + license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz toonn ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From ae99f5aa96b91fe9d6ca9c5e115b410a033d3404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:15:47 +0200 Subject: [PATCH 1198/1522] ssmtp: cleanup, format --- pkgs/tools/networking/ssmtp/default.nix | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 6957d43e791..ec309a4a2ce 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -1,12 +1,11 @@ -{lib, stdenv, fetchurl, tlsSupport ? true, openssl ? null}: +{ lib, stdenv, fetchurl, tlsSupport ? true, openssl }: -assert tlsSupport -> openssl != null; - -stdenv.mkDerivation { - name = "ssmtp-2.64"; +stdenv.mkDerivation rec { + pname = "ssmtp"; + version = "2.64"; src = fetchurl { - url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2"; + url = "mirror://debian/pool/main/s/ssmtp/ssmtp_${version}.orig.tar.bz2"; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; @@ -19,16 +18,15 @@ stdenv.mkDerivation { (lib.enableFeature tlsSupport "ssl") ]; - postConfigure = - '' - # Don't run the script that interactively generates a config file. - # Also don't install the broken, cyclic symlink /lib/sendmail. - sed -e '/INSTALLED_CONFIGURATION_FILE/d' \ - -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \ - -i Makefile - substituteInPlace Makefile \ - --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' - ''; + postConfigure = '' + # Don't run the script that interactively generates a config file. + # Also don't install the broken, cyclic symlink /lib/sendmail. + sed -e '/INSTALLED_CONFIGURATION_FILE/d' \ + -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \ + -i Makefile + substituteInPlace Makefile \ + --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' + ''; installFlags = [ "etcdir=$(out)/etc" ]; @@ -39,6 +37,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto"; meta = with lib; { + description = "simple MTA to deliver mail from a computer to a mail hub"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ basvandijk ]; From c052a6d83ef9842577cfaffe533adf804a1687e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 13:28:17 +0200 Subject: [PATCH 1199/1522] azureus: drop --- pkgs/tools/networking/p2p/azureus/builder.sh | 19 ------------------- pkgs/tools/networking/p2p/azureus/default.nix | 16 ---------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/azureus/builder.sh delete mode 100644 pkgs/tools/networking/p2p/azureus/default.nix diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh deleted file mode 100644 index 9d41dba2e43..00000000000 --- a/pkgs/tools/networking/p2p/azureus/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/azureus.jar - -mkdir -p $out/bin -cat > $out/bin/azureus <<EOF -#! $SHELL -e -azureusHome=$out -if test -n "\$HOME"; then - azureusHome=\$HOME/.Azureus -fi -exec $jdk/bin/java -Xms16m -Xmx128m \ - -cp $out/jars/azureus.jar:$swt/jars/swt.jar \ - -Djava.library.path=$swt/lib \ - -Dazureus.install.path=\$azureusHome \ - org.gudy.azureus2.ui.swt.Main -EOF -chmod +x $out/bin/azureus diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix deleted file mode 100644 index 1c72be0c510..00000000000 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{lib, stdenv, fetchurl, jdk, swt}: - -stdenv.mkDerivation { - name = "azureus-2.3.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; - sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; - }; - - inherit jdk swt; - - meta = { - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d50316d2a40..c7a5617cb0a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 + azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4799e5774c..b7ba0e16e31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1868,11 +1868,6 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { - jdk = jdk8; - swt = swt_jdk8; - }; - b3sum = callPackage ../tools/security/b3sum {}; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; From 23203bff787d335a2b3e7dbf5c7f9721e09fa03c Mon Sep 17 00:00:00 2001 From: Sandro <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 11:59:26 +0000 Subject: [PATCH 1200/1522] ntfy-webpush: init at 0.1.3 (#132404) --- pkgs/tools/misc/ntfy-webpush/default.nix | 34 ++++++++++++++++++++++++ pkgs/tools/misc/ntfy/default.nix | 1 + pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/ntfy-webpush/default.nix diff --git a/pkgs/tools/misc/ntfy-webpush/default.nix b/pkgs/tools/misc/ntfy-webpush/default.nix new file mode 100644 index 00000000000..27559dabbdd --- /dev/null +++ b/pkgs/tools/misc/ntfy-webpush/default.nix @@ -0,0 +1,34 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonPackage rec { + pname = "ntfy-webpush"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "dschep"; + repo = "ntfy-webpush"; + rev = "v${version}"; + sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n"; + }; + + postPatch = '' + # break dependency loop + substituteInPlace setup.py \ + --replace "'ntfy', " "" + ''; + + propagatedBuildInputs = with python3Packages; [ + pywebpush + py-vapid + ]; + + # no tests, just a script + doCheck = false; + + meta = with lib; { + description = "cloudbell webpush notification support for ntfy"; + homepage = "https://dschep.github.io/ntfy-webpush/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index e2bb64ef529..3f85e7f01a4 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { psutil matrix-client dbus-python + ntfy-webpush ]; checkPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30f9b2b8800..2ca1b80fb72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4901,6 +4901,8 @@ in { nsapi = callPackage ../development/python-modules/nsapi { }; + ntfy-webpush = callPackage ../tools/misc/ntfy-webpush { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; From 1c0eb8111f22a088cf3fe69cdc1e0317888458f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 14:12:16 +0200 Subject: [PATCH 1201/1522] wezterm: install desktop file --- pkgs/applications/terminal-emulators/wezterm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index d214d6fabc3..e3e10f6e0f9 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -34,7 +34,7 @@ let zlib fontconfig freetype - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals stdenv.isLinux [ libX11 xcbutil libxcb @@ -49,7 +49,7 @@ let libGLU libGL openssl - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals stdenv.isDarwin [ Foundation CoreGraphics Cocoa @@ -90,6 +90,10 @@ rustPlatform.buildRustPackage rec { mkdir -p $terminfo/share/terminfo/w $out/nix-support tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + + install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png + install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop + install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml ''; preFixup = lib.optionalString stdenv.isLinux '' From 56a3acd04b1b71f3dd6ed4f683c48307e5e4934b Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Mon, 2 Aug 2021 14:51:53 +0200 Subject: [PATCH 1202/1522] plex: 1.23.5.4862-0f739d462 -> 1.23.6.4881-e2e58f321 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6bde2ed5a57..1d404f1fa19 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.5.4862-0f739d462"; + version = "1.23.6.4881-e2e58f321"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq"; + sha256 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc"; + sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9"; }; outputs = [ "out" "basedb" ]; From 463edc0d407550ee38254ccb2e088e4bef10e6f6 Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Mon, 2 Aug 2021 14:13:42 +0100 Subject: [PATCH 1203/1522] terraform-ls: 0.19.1 -> 0.20.0 --- .../tools/misc/terraform-ls/default.nix | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 86afbcc9421..75b75733af6 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,36 +2,27 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ag8Dq3lhLoKE4rgrnWLHtKRHEnw/ytyXI+pRt5CgZJI="; + sha256 = "sha256-G1i5SS1BY+h8qPPjrZ9HCnKX3o2VkwvpeHPNxW6rnuI="; }; - vendorSha256 = "sha256-/lpjlThr6HPkuJ6om9ifBsdsh0x4kVXM6PAonk7GJCY="; + vendorSha256 = "sha256-nRElOa9IQ31Wh01wTFM6pazDYFnmR06vkU4CI8Gx4Vw="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; - preCheck = '' - # Remove tests that requires networking - rm internal/terraform/exec/exec_test.go - '' + lib.optionalString stdenv.isAarch64 '' - # Not all test failures have tracking issues as HashiCorp do not have - # aarch64 testing infra easily available, see issue 549 below. + # There's a mixture of tests that use networking and several that fail on aarch64 + doCheck = false; - # Remove file that contains `TestLangServer_workspaceExecuteCommand_modules_multiple` - # which fails on aarch64: https://github.com/hashicorp/terraform-ls/issues/549 - rm internal/langserver/handlers/execute_command_modules_test.go - - # `TestModuleManager_ModuleCandidatesByPath` variants fail - rm internal/terraform/module/module_manager_test.go - - # internal/terraform/module/module_ops_queue_test.go:17:15: undefined: testLogger - # internal/terraform/module/watcher_test.go:39:11: undefined: testLogger - # internal/terraform/module/watcher_test.go:79:14: undefined: testLogger - rm internal/terraform/module/{watcher_test,module_ops_queue_test}.go + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/terraform-ls --help + $out/bin/terraform-ls version | grep "v${version}" + runHook postInstallCheck ''; meta = with lib; { From 62458ae639a5cf1f475f0c05835b5eee6ec64d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com> Date: Mon, 2 Aug 2021 16:21:09 +0300 Subject: [PATCH 1204/1522] matcha-gtk-theme: 2021-07-20 -> 2021-08-02 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 711354026d8..aedda712e4e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-07-20"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic"; + sha256 = "sha256-vvWRHtE0Fgz41Aa5kaxNfbupodaWNc8gRJ1qW7vIyuc="; }; buildInputs = [ gdk-pixbuf librsvg ]; From 344cfbe8664a3742f044515658c66aa838e9b9c5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 2 Aug 2021 07:41:18 +1000 Subject: [PATCH 1205/1522] shfmt: 3.3.0 -> 3.3.1 https://github.com/mvdan/sh/releases/tag/v3.3.1 --- pkgs/tools/text/shfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 29a5a157a67..b7b344ab135 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "shfmt"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-pD1nkbBw5NBCyuhn2DYop2AR+1T8p6/zTa6FeWiya7Q="; + sha256 = "sha256-43v64TQS1xpmU9pyjSTgV03n7xYJR+JAfZVoK3vwbiY="; }; - vendorSha256 = "sha256-euJYStN21xFYosouWYXpHN3MWCKR4NT8z6OSonM0HW8="; + vendorSha256 = "sha256-t1Zdn+NaHrKde6F5o86e+FmN3tH55YpZLuDhTv2lIf4="; subPackages = [ "cmd/shfmt" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; nativeBuildInputs = [ installShellFiles scdoc ]; From bbc054abae36364bcd270912456c95be1d3a4c5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 2 Aug 2021 09:15:04 +1000 Subject: [PATCH 1206/1522] dasel: 1.15.0 -> 1.16.1 https://github.com/TomWright/dasel/blob/master/CHANGELOG.md#v1160---2021-08-01 --- pkgs/applications/misc/dasel/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index ded30233d4c..a6d7659531f 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,20 +5,20 @@ buildGoModule rec { pname = "dasel"; - version = "1.15.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJSWdXGa1qkkMfETUV8xx9oaMdNVFdO27/GvDvczjG8="; + sha256 = "sha256-BrtTBy/Tb4xfs7UHk1acRzKZWNZJqhufHG1ItcM8TPs="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" + ]; doInstallCheck = true; installCheckPhase = '' From 88cb7c8f6329327d99e619050184325869044d21 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 23 Jul 2021 15:58:52 -0300 Subject: [PATCH 1207/1522] telegram-cli: init 20200106 Co-authored-by: @sikmir @SuperSandro2000 --- .../telegram/telegram-cli/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix new file mode 100644 index 00000000000..bff3d3769a7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages +, makeWrapper, openssl, pkg-config, python3, readline, zlib +}: + +stdenv.mkDerivation rec { + pname = "telegram-cli"; + version = "20200106"; + + src = fetchFromGitHub { + owner = "kenorb-contrib"; + repo = "tg"; + rev = "refs/tags/${version}"; + sha256 = "sha256-wYBPr2b8IOycO9y/CNyGjnRsyGyYl3oiXYtTzwTurVA="; + fetchSubmodules = true; + }; + + buildInputs = [ + jansson + libconfig + libevent + libgcrypt + lua + lua53Packages.lgi + openssl + python3 + readline + zlib + ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + installPhase = '' + runHook preInstall + install -Dm755 ./bin/telegram-cli $out/bin/telegram-cli-keyless + install -Dm644 ./tg-server.pub -t $out/share/telegram-cli + makeWrapper $out/bin/telegram-cli-keyless $out/bin/telegram-cli \ + --add-flags "-k $out/share/telegram-cli/tg-server.pub" + runHook postInstall + ''; + + meta = with lib; { + description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library"; + downloadPage = "https://github.com/kenorb-contrib/tg"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea4..8407a2cb492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27335,6 +27335,8 @@ in tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; + telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; From b0f33d7c2e170a3a4c55b40dc61e50873ad1036c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de> Date: Mon, 2 Aug 2021 15:23:07 +0200 Subject: [PATCH 1208/1522] rabbitmq-server: 3.8.9 -> 3.9.1 --- nixos/tests/rabbitmq.nix | 2 ++ pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 8a7fcc0e899..69be29b0f9e 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -8,6 +8,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine = { services.rabbitmq.enable = true; + # Ensure there is sufficient extra disk space for rabbitmq to be happy + virtualisation.diskSize = 1024; }; testScript = '' diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index c2d13b00aa8..f7ee83e7208 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.9"; + version = "3.9.1"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv"; + sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a13a470668..1ac7522d769 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20265,8 +20265,6 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = beam_nox.interpreters.elixir_1_8; - erlang = beam_nox.interpreters.erlangR23; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; From 895ce97eeadded30c897022b1768b645df21501e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz> Date: Mon, 2 Aug 2021 16:29:01 +0200 Subject: [PATCH 1209/1522] knot-dns: disable tests broken on aarch64-darwin Upstream is aware but they don't have a fix yet. I'm not aware of NixPkgs being used for another platform affected by this (e.g. ppc64le). --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fb4efba383c..d5f06610665 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; + # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE). + # The journal most likely works fine, but some of the tests currently don't. + postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) '' + sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am + ''; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring From 72cffab613a59e61033b1822ec85e5e88d523fd4 Mon Sep 17 00:00:00 2001 From: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com> Date: Mon, 2 Aug 2021 17:34:02 +0300 Subject: [PATCH 1210/1522] kratos: 0.6.0-alpha.2 -> 0.7.1-alpha.1 (#132399) --- pkgs/applications/misc/kratos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 65b32c45863..8912a0e71e5 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.6.0-alpha.2"; + version = "0.7.1-alpha.1"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "0zg6afzqi5fmr7hmy1cd7fknd1bcplz3h0f7z67l75v8k2n73md1"; + sha256 = "0n0qjnwavr34g8b6vr000wgpbnmyq7n1grcy79cvzdrnc8jxkgxi"; }; - vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw"; + vendorSha256 = "14x2flimhvd2wdkajvsm5bqbqikgirynzxs27mzlx0bvhliv247s"; subPackages = [ "." ]; From 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 Mon Sep 17 00:00:00 2001 From: Markus Partheymueller <markus.partheymueller@cyberus-technology.de> Date: Mon, 2 Aug 2021 16:40:32 +0200 Subject: [PATCH 1211/1522] virtualbox: 6.1.22 -> 6.1.26 (#132223) Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- .../virtualization/virtualbox/default.nix | 7 +++++-- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/fix-configure-pkgconfig-qt.patch | 11 +++++++++++ .../virtualbox/guest-additions/default.nix | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0bc3af364e6..31f48576803 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.22"; + version = "6.1.26"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"; + sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195"; }; outputs = [ "out" "modsrc" ]; @@ -104,6 +104,9 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch + # Temporary workaround for broken build + # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html + ./fix-configure-pkgconfig-qt.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 8c64337c6cb..5ed763fa2e7 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87"; + let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch new file mode 100644 index 00000000000..0594a2f19d4 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch @@ -0,0 +1,11 @@ +Index: /trunk/configure +=================================================================== +--- a/configure (revision 90360) ++++ b/configure (revision 90377) +@@ -1588,5 +1588,5 @@ + if [ $? -eq 0 ]; then + echo "(Qt5 from pkg-config)" >> $LOG +- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags` ++ FLGQT5=`pkg-config Qt5Core --cflags` + # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk) + [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11" diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 218d4983ca5..66bd2966f5d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9"; + sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From 0d315b7f70a36063f177b49b3f68c1ef07abaf54 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones <ivar.scholten@protonmail.com> Date: Mon, 2 Aug 2021 16:29:56 +0200 Subject: [PATCH 1212/1522] androidStudioPackages.{canary,dev}: properly fix interpreter paths of deployed scripts --- pkgs/applications/editors/android-studio/common.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 42e3b7588af..cc3f898a29b 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -65,10 +65,14 @@ let sha256 = sha256Hash; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ + nativeBuildInputs = [ + unzip makeWrapper ]; + + # Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand + dontPatchShebangs = true; + installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ @@ -152,9 +156,6 @@ let ''; }; - # Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand - dontPatchShebangs = true; - desktopItem = makeDesktopItem { name = drvName; exec = pname; From 6b317b740464a2802197e8f1f3eaf362599eee91 Mon Sep 17 00:00:00 2001 From: Victor Nawothnig <dminuoso+git@icloud.com> Date: Mon, 2 Aug 2021 16:41:37 +0200 Subject: [PATCH 1213/1522] nixos/redis: Use toString for interpolating slaveOf.port --- nixos/modules/services/databases/redis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 9c0740f28c9..8873f6d00e0 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -272,7 +272,7 @@ in { } (mkIf (cfg.bind != null) { bind = cfg.bind; }) (mkIf (cfg.unixSocket != null) { unixsocket = cfg.unixSocket; unixsocketperm = "${toString cfg.unixSocketPerm}"; }) - (mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${cfg.slaveOf.port}"; }) + (mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}"; }) (mkIf (cfg.masterAuth != null) { masterauth = cfg.masterAuth; }) (mkIf (cfg.requirePass != null) { requirepass = cfg.requirePass; }) ]; From 55692c5a0a65a18947431f323aad73baa53c824f Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Mon, 2 Aug 2021 17:57:09 +0300 Subject: [PATCH 1214/1522] perlPackages.PerlMagick: 7.0.10 -> 7.0.11-1 --- pkgs/top-level/perl-packages.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b798f462f7e..c4ae704312d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16969,20 +16969,15 @@ let PerlMagick = buildPerlPackage rec { pname = "PerlMagick"; - version = "7.0.10"; + version = "7.0.11-1"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz"; - sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx"; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; + sha256 = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL - - # Enable HDRI support to match the native ImageMagick 7 defaults - # See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538 - substituteInPlace Makefile.PL \ - --replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1' ''; }; From 20c4bc3508075004e5ea513e849d412e519cadb3 Mon Sep 17 00:00:00 2001 From: Alex Martens <alexmgit@protonmail.com> Date: Mon, 2 Aug 2021 08:09:19 -0700 Subject: [PATCH 1215/1522] probe-run: 0.2.4 -> 0.2.5 --- pkgs/development/tools/rust/probe-run/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index dcbff79a3c8..4980baf85e2 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "069f4vai1cw69xw3q7xyd81k3rklyb0bs77jfsrwq97vy7b78i92"; + sha256 = "0bj5arngc49mdz1i7bbg4l7rb741x7dhalpdxrn55vzlvgbig8fv"; }; - cargoSha256 = "0j5bl1sh3hcx38qckrjlfggsfsczzw2vbb3ks5x59dqakqh5fb7v"; + cargoSha256 = "1kqgl1f91aa7kz1yprpyf9pl1vp4ahhw8ka5hrvfvk5i5i54pigz"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] From 749620cd4f8001d1509c6af150814515003f3e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Mon, 2 Aug 2021 17:23:54 +0200 Subject: [PATCH 1216/1522] enableRedistributableFirmware: add rtw89-firmware --- nixos/modules/hardware/all-firmware.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 524dae57010..a4e4fa8d0ed 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -58,6 +58,7 @@ in { rtl8723bs-firmware rtl8761b-firmware rtw88-firmware + rtw89-firmware zd1211fw alsa-firmware sof-firmware From 6b021012c5d8e53a7129c08996aa3d8c7067d407 Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Mon, 2 Aug 2021 18:04:54 +0200 Subject: [PATCH 1217/1522] nixos/tests/gitlab: disable gitlab-pages tests --- nixos/tests/gitlab.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 696ebabb580..fc153bb06ec 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -51,10 +51,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { host = "localhost"; port = 143; }; - pages = { - enabled = true; - host = "localhost"; - }; + # https://github.com/NixOS/nixpkgs/issues/132295 + # pages = { + # enabled = true; + # host = "localhost"; + # }; }; secrets = { secretFile = pkgs.writeText "secret" "Aig5zaic"; @@ -90,7 +91,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { waitForServices = '' gitlab.wait_for_unit("gitaly.service") gitlab.wait_for_unit("gitlab-workhorse.service") - gitlab.wait_for_unit("gitlab-pages.service") + # https://github.com/NixOS/nixpkgs/issues/132295 + # gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-mailroom.service") gitlab.wait_for_unit("gitlab.service") gitlab.wait_for_unit("gitlab-sidekiq.service") From 4d5c2bc76e650b6fb5f58cc6c45d4aea093b2a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de> Date: Mon, 2 Aug 2021 18:19:53 +0200 Subject: [PATCH 1218/1522] rabbitmq-server: Apply nixpkgs-review hints --- pkgs/servers/amqp/rabbitmq-server/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f7ee83e7208..3f2e595b31f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc"; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; buildInputs = - [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ] + [ erlang elixir python libxml2 libxslt glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; @@ -40,13 +40,6 @@ stdenv.mkDerivation rec { # rabbitmq-env calls to sed/coreutils, so provide everything early sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|' - # rabbitmq-server script uses `dirname` to get hold of a - # rabbitmq-env, so let's provide this file directly. After that - # point everything is OK - the PATH above will kick in - substituteInPlace $out/sbin/rabbitmq-server \ - --replace '`dirname $0`/rabbitmq-env' \ - "$out/sbin/rabbitmq-env" - # We know exactly where rabbitmq is gonna be, so we patch that into the env-script. # By doing it early we make sure that auto-detection for this will # never be executed (somewhere below in the script). From 18ed0855baceb757ef6f58101f62c4a8ddadb8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz> Date: Mon, 2 Aug 2021 18:41:36 +0200 Subject: [PATCH 1219/1522] knot-dns: only depend on libmnl on Linux I didn't realize that it's only relevant for Linux, and it unnecessarily disabled builds for *-darwin. --- pkgs/servers/dns/knot-dns/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e6f17b599a2..34032aa3597 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -40,12 +40,11 @@ stdenv.mkDerivation rec { libiconv lmdb libintl nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) - libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? ] ++ lib.optionals stdenv.isLinux [ libcap_ng systemd - libbpf # XDP support + libbpf libmnl # XDP support (it's Linux kernel API) ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; From 70e001f35cc363eb789ea0a04eff11b86c440ba3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Sun, 1 Aug 2021 12:34:16 +0200 Subject: [PATCH 1220/1522] python3Packages.cbor2: 5.4.0 -> 5.4.1 --- pkgs/development/python-modules/cbor2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 7f417acd360..ef7b79989c4 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a7926f7244b08c413f1a4fa71a81aa256771c75bdf1a4fd77308547a2d63dd48"; + sha256 = "1jga5wj3kalf6zj5gyrmy6kwmxxkld52mvcgxc5gb5dmdhpl7gx8"; }; nativeBuildInputs = [ setuptools-scm ]; From f173c7747616dd11e8b5b9d2db77980df30a4052 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Mon, 2 Aug 2021 20:05:00 +0300 Subject: [PATCH 1221/1522] perlPackages.ImageMagick: rename from perlPackages.PerlMagick --- pkgs/applications/graphics/gscan2pdf/default.nix | 2 +- pkgs/applications/graphics/shutter/default.nix | 2 +- .../graphics/timelapse-deflicker/default.nix | 2 +- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- pkgs/applications/science/biology/cd-hit/default.nix | 2 +- pkgs/tools/typesetting/docbook2odf/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 9 +++++---- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index a44d4f6408c..b279bb0e70c 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec { ImagePNGLibpng ImageSane SetIntSpan - PerlMagick + ImageMagick ConfigGeneral ListMoreUtils HTMLParser diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 2d2e332977f..bbcfcf03900 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -8,7 +8,7 @@ let Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON - PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS + ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index f695cb2b0d7..c752d7e3f71 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = with perlPackages; [ makeWrapper perl - PerlMagick TermProgressBar ImageExifTool + ImageMagick TermProgressBar ImageExifTool FileType ClassMethodMaker ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 8865435339c..2a6302f5bce 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight +{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase + RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index ba1d6c27ccb..474c0f292af 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i"; }; - propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ]; + propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.ImageMagick ]; nativeBuildInputs = [ zlib makeWrapper ]; buildInputs = lib.optional stdenv.cc.isClang openmp; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index affa12c4019..cd10ac9117c 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/docbook2odf" \ --prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \ - --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}" + --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.ImageMagick ]}" ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb15..08486d63f3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25030,7 +25030,7 @@ in ikiwiki = callPackage ../applications/misc/ikiwiki { python = python3; - inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; + inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; }; iksemel = callPackage ../development/libraries/iksemel { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4ae704312d..078c01349c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9246,7 +9246,7 @@ let }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; - checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ make test @@ -11099,7 +11099,7 @@ let sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; outputs = [ "out" "tex" ]; - propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ]; + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent ImageMagick PodParser TextUnidecode XMLLibXSLT ]; preCheck = '' rm t/931_epub.t # epub test fails ''; @@ -16967,8 +16967,9 @@ let }; }; - PerlMagick = buildPerlPackage rec { - pname = "PerlMagick"; + PerlMagick = ImageMagick; # added 2021-08-02 + ImageMagick = buildPerlPackage rec { + pname = "Image-Magick"; version = "7.0.11-1"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; From 8f02a4486d78ce4a1b5307cca053af5d3171c8d9 Mon Sep 17 00:00:00 2001 From: davidak <git@davidak.de> Date: Mon, 2 Aug 2021 02:46:24 +0200 Subject: [PATCH 1222/1522] pantheon: add maintainers team --- nixos/modules/services/desktops/bamf.nix | 4 ++-- nixos/modules/services/desktops/geoclue2.nix | 4 +++- nixos/modules/services/desktops/tumbler.nix | 4 ++-- nixos/modules/services/desktops/zeitgeist.nix | 4 ++-- .../services/x11/display-managers/account-service-util.nix | 2 +- .../x11/display-managers/lightdm-greeters/pantheon.nix | 4 ++-- nixos/modules/services/x11/display-managers/lightdm.nix | 4 ++-- pkgs/applications/audio/vocal/default.nix | 2 +- pkgs/applications/display-managers/lightdm/default.nix | 2 +- pkgs/applications/graphics/fondo/default.nix | 2 +- pkgs/applications/misc/notejot/default.nix | 2 +- pkgs/applications/misc/olifant/default.nix | 2 +- pkgs/applications/networking/ftp/taxi/default.nix | 2 +- pkgs/applications/office/notes-up/default.nix | 2 +- pkgs/data/fonts/open-sans/default.nix | 2 +- pkgs/desktops/pantheon/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- 17 files changed, 24 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index 37121c219a3..13de3a44328 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -5,8 +5,8 @@ with lib; { - meta = { - maintainers = with maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index e9ec787e5ad..cb5c948ecf7 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -266,5 +266,7 @@ in } // mapAttrs' appConfigToINICompatible cfg.appConfig); }; - meta.maintainers = with lib.maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; + }; } diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index 8d9248cb983..f5341df2f7a 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -18,8 +18,8 @@ in "") ]; - meta = { - maintainers = with maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index fb0218da304..297fd1d3ff2 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -6,8 +6,8 @@ with lib; { - meta = { - maintainers = with maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index dec5c06cb3c..861976d1186 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication { ''; meta = with lib; { - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 76f16646cf5..f18e4a914e5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -10,8 +10,8 @@ let in { - meta = { - maintainers = with maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; options = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 3d497c9f25e..945222296fa 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -69,8 +69,8 @@ let in { - meta = { - maintainers = with maintainers; [ ]; + meta = with lib; { + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; # Note: the order in which lightdm greeter modules are imported diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index f06f950f13f..a2fea468de9 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 7ca4da69d07..d49dd646fc5 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index c2cb4c92d47..19d93cee79b 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/calo001/fondo"; description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index bd30fa2bb21..b1fac789fe1 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index bde2ae07c92..48fe90423a9 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; homepage = "https://github.com/cleac/olifant"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 66692f96c66..8e9966a3f8e 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Alecaddd/taxi"; description = "The FTP Client that drives you anywhere"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index de09bc1c761..4422968efbc 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2Only; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index 0c9cf7b6a35..0c7f8dce57a 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -26,6 +26,6 @@ in fetchFromGitLab { homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 5ff368a642e..dc1245e1b15 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.lib.maintainers; [ ]; + maintainers = lib.teams.pantheon.members; mutter = pkgs.gnome.mutter334; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index e3a005564d0..bd001d5a10e 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ] ++ teams.pantheon.members; }; }); From f27dd09ec11e951df0c9b77c02795d912011983c Mon Sep 17 00:00:00 2001 From: Chris Pickard <chrispickard9@gmail.com> Date: Mon, 2 Aug 2021 12:55:31 -0400 Subject: [PATCH 1223/1522] tmuxPlugins.better-mouse-mode: init at 2021-08-02 [tmux-better-mouse-mode](https://github.com/NHDaly/tmux-better-mouse-mode) is a tmux plugin to better manage the mouse it emulates mouse support for full-screen programs like `less` which don't provide mouse support it exits copy mode and returns you to the prompt by scolling back all the down to the bottom it adjusts scrolling speed intended for tmux versions 2.1 and later --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/misc/tmux-plugins/default.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35882821253..4d6fd1cceff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1905,6 +1905,12 @@ githubId = 811527; name = "Christopher Jefferson"; }; + chrispickard = { + email = "chrispickard9@gmail.com"; + github = "chrispickard"; + githubId = 1438690; + name = "Chris Pickard"; + }; chrisrosset = { email = "chris@rosset.org.uk"; github = "chrisrosset"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b4978e200ab..826feace271 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -63,6 +63,32 @@ in rec { }; }; + better-mouse-mode = mkTmuxPlugin { + pluginName = "better-mouse-mode"; + version = "unstable-2021-08-02"; + src = fetchFromGitHub { + owner = "NHDaly"; + repo = "tmux-better-mouse-mode"; + rev = "aa59077c635ab21b251bd8cb4dc24c415e64a58e"; + sha256 = "06346ih3hzwszhkj25g4xv5av7292s6sdbrdpx39p0n3kgf5mwww"; + }; + meta = { + homepage = "https://github.com/NHDaly/tmux-better-mouse-mode"; + description = "better mouse support for tmux"; + longDescription = + '' + Features: + + * Emulate mouse-support for full-screen programs like less that don't provide built in mouse support. + * Exit copy-mode and return to your prompt by scrolling back all the way down to the bottom. + * Adjust your scrolling speed. + ''; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ chrispickard ]; + }; + }; + continuum = mkTmuxPlugin { pluginName = "continuum"; version = "unstable-2020-10-16"; From d1ec2fae863e38de150626e3d5f1479032f48d33 Mon Sep 17 00:00:00 2001 From: Sumner Evans <me@sumnerevans.com> Date: Mon, 2 Aug 2021 11:20:54 -0600 Subject: [PATCH 1224/1522] element-{web,desktop}: 1.7.33 -> 1.7.34 --- .../element/element-desktop-package.json | 14 +- .../element/element-desktop-yarndeps.nix | 3168 +++-------------- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- 4 files changed, 603 insertions(+), 2587 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index e9f1c0d4eb5..7968c96fb7a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.7.33", + "version": "1.7.34", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -20,7 +20,8 @@ "asar-webapp": "asar p webapp webapp.asar", "start": "yarn run build:ts && yarn run build:res && electron .", "lint": "yarn lint:types && yarn lint:js", - "lint:js": "eslint src/ scripts/ hak/", + "lint:js": "eslint --max-warnings 0 src scripts hak", + "lint:js-fix": "eslint --fix src scripts hak", "lint:types": "tsc --noEmit", "build:native": "yarn run hak", "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink", @@ -55,7 +56,7 @@ "@typescript-eslint/parser": "^4.17.0", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "12.0.11", + "electron": "^13.1.7", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -70,19 +71,18 @@ "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", - "npm": "^6.14.11", + "pacote": "^11.3.5", "rimraf": "^3.0.2", - "semver": "^7.3.4", "tar": "^6.1.0", "typescript": "^4.1.3" }, "hakDependencies": { - "matrix-seshat": "^2.2.3", + "matrix-seshat": "^2.3.0", "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "12.0.14", + "electronVersion": "13.1.6", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 59669ebc48b..d4a48f31e91 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -10,115 +10,107 @@ }; } { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; - sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_babel_generator___generator_7.14.8.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_babel_generator___generator_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; + sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; }; } { - name = "_babel_generator___generator_7.13.16.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz"; - sha1 = "0befc287031a201d84cdfc173b46b320ae472d14"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; }; } { - name = "_babel_highlight___highlight_7.5.0.tgz"; + name = "_babel_highlight___highlight_7.14.5.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; - sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; }; } { - name = "_babel_highlight___highlight_7.13.10.tgz"; + name = "_babel_parser___parser_7.14.8.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; - sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; + name = "_babel_parser___parser_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; + sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; }; } { - name = "_babel_parser___parser_7.13.16.tgz"; + name = "_babel_runtime___runtime_7.14.8.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz"; - sha1 = "0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"; + name = "_babel_runtime___runtime_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz"; + sha1 = "7119a56f421018852694290b9f9148097391b446"; }; } { - name = "_babel_runtime___runtime_7.11.2.tgz"; + name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.11.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; - sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; }; } { - name = "_babel_template___template_7.12.13.tgz"; + name = "_babel_traverse___traverse_7.14.8.tgz"; path = fetchurl { - name = "_babel_template___template_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + name = "_babel_traverse___traverse_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; + sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; }; } { - name = "_babel_traverse___traverse_7.13.17.tgz"; + name = "_babel_types___types_7.14.8.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.13.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz"; - sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3"; - }; - } - { - name = "_babel_types___types_7.13.17.tgz"; - path = fetchurl { - name = "_babel_types___types_7.13.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz"; - sha1 = "48010a115c9fba7588b4437dd68c9469012b38b4"; + name = "_babel_types___types_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; + sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; }; } { @@ -153,14 +145,6 @@ sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; }; } - { - name = "_iarna_cli___cli_1.2.0.tgz"; - path = fetchurl { - name = "_iarna_cli___cli_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz"; - sha1 = "0f7af5e851afe895104583c4ca07377a8094d641"; - }; - } { name = "_jimp_bmp___bmp_0.16.1.tgz"; path = fetchurl { @@ -442,11 +426,59 @@ }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.7.tgz"; + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; - sha1 = "94c23db18ee4653e129abd26fb06f870ac9e1ee2"; + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + }; + } + { + name = "_npmcli_git___git_2.1.0.tgz"; + path = fetchurl { + name = "_npmcli_git___git_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz"; + sha1 = "2fbd77e147530247d37f325930d457b3ebe894f6"; + }; + } + { + name = "_npmcli_installed_package_contents___installed_package_contents_1.0.7.tgz"; + path = fetchurl { + name = "_npmcli_installed_package_contents___installed_package_contents_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"; + sha1 = "ab7408c6147911b970a8abe261ce512232a3f4fa"; + }; + } + { + name = "_npmcli_move_file___move_file_1.1.2.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha1 = "1a82c3e372f7cae9253eb66d72543d6b8685c674"; + }; + } + { + name = "_npmcli_node_gyp___node_gyp_1.0.2.tgz"; + path = fetchurl { + name = "_npmcli_node_gyp___node_gyp_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; + sha1 = "3cdc1f30e9736dbc417373ed803b42b1a0a29ede"; + }; + } + { + name = "_npmcli_promise_spawn___promise_spawn_1.3.2.tgz"; + path = fetchurl { + name = "_npmcli_promise_spawn___promise_spawn_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz"; + sha1 = "42d4e56a8e9274fba180dabc0aea6e38f29274f5"; + }; + } + { + name = "_npmcli_run_script___run_script_1.8.5.tgz"; + path = fetchurl { + name = "_npmcli_run_script___run_script_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz"; + sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"; }; } { @@ -466,19 +498,19 @@ }; } { - name = "_types_auto_launch___auto_launch_5.0.1.tgz"; + name = "_tootallnate_once___once_1.1.2.tgz"; path = fetchurl { - name = "_types_auto_launch___auto_launch_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/auto-launch/-/auto-launch-5.0.1.tgz"; - sha1 = "388a047edc0e754d8e8978cbd9ed4672b36be2c4"; + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; }; } { - name = "_types_color_name___color_name_1.1.1.tgz"; + name = "_types_auto_launch___auto_launch_5.0.2.tgz"; path = fetchurl { - name = "_types_color_name___color_name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; - sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + name = "_types_auto_launch___auto_launch_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/auto-launch/-/auto-launch-5.0.2.tgz"; + sha1 = "4970f01e5dd27572489b7fe77590204a19f86bd0"; }; } { @@ -490,75 +522,67 @@ }; } { - name = "_types_debug___debug_4.1.5.tgz"; + name = "_types_debug___debug_4.1.6.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; - sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + name = "_types_debug___debug_4.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.6.tgz"; + sha1 = "0b7018723084918a865eff99249c490505df2163"; }; } { - name = "_types_fs_extra___fs_extra_9.0.11.tgz"; + name = "_types_fs_extra___fs_extra_9.0.12.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz"; - sha1 = "8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"; + name = "_types_fs_extra___fs_extra_9.0.12.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.12.tgz"; + sha1 = "9b8f27973df8a7a3920e8461517ebf8a7d4fdfaf"; }; } { - name = "_types_glob___glob_7.1.3.tgz"; + name = "_types_glob___glob_7.1.4.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; - sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; + name = "_types_glob___glob_7.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz"; + sha1 = "ea59e21d2ee5c517914cb4bc8e4153b99e566672"; }; } { - name = "_types_json_schema___json_schema_7.0.7.tgz"; + name = "_types_json_schema___json_schema_7.0.8.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; + name = "_types_json_schema___json_schema_7.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz"; + sha1 = "edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"; }; } { - name = "_types_minimatch___minimatch_3.0.4.tgz"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; }; } { - name = "_types_minimist___minimist_1.2.1.tgz"; + name = "_types_minimist___minimist_1.2.2.tgz"; path = fetchurl { - name = "_types_minimist___minimist_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz"; - sha1 = "283f669ff76d7b8260df8ab7a4262cc83d988256"; + name = "_types_minimist___minimist_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz"; + sha1 = "ee771e2ba4b3dc5b372935d549fd9617bf345b8c"; }; } { - name = "_types_node___node_13.7.1.tgz"; + name = "_types_node___node_16.4.0.tgz"; path = fetchurl { - name = "_types_node___node_13.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz"; - sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d"; + name = "_types_node___node_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz"; + sha1 = "2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272"; }; } { - name = "_types_node___node_14.14.21.tgz"; + name = "_types_node___node_14.17.5.tgz"; path = fetchurl { - name = "_types_node___node_14.14.21.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz"; - sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; - }; - } - { - name = "_types_node___node_14.17.4.tgz"; - path = fetchurl { - name = "_types_node___node_14.17.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; - sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; + name = "_types_node___node_14.17.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz"; + sha1 = "b59daf6a7ffa461b5648456ca59050ba8e40ed54"; }; } { @@ -570,91 +594,83 @@ }; } { - name = "_types_verror___verror_1.10.4.tgz"; + name = "_types_verror___verror_1.10.5.tgz"; path = fetchurl { - name = "_types_verror___verror_1.10.4.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz"; - sha1 = "805c0612b3a0c124cf99f517364142946b74ba3b"; + name = "_types_verror___verror_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; + sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; }; } { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; }; } { - name = "_types_yargs___yargs_16.0.3.tgz"; + name = "_types_yargs___yargs_16.0.4.tgz"; path = fetchurl { - name = "_types_yargs___yargs_16.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz"; - sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; + name = "_types_yargs___yargs_16.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz"; + sha1 = "26aad98dd2c2a38e421086ea9ad42b9e51642977"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.1.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz"; - sha1 = "c045e440196ae45464e08e20c38aff5c3a825947"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; + sha1 = "e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.1.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz"; - sha1 = "3869489dcca3c18523c46018b8996e15948dbadc"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; + sha1 = "9c70c35ebed087a5c70fb0ecd90979547b7fec96"; }; } { - name = "_typescript_eslint_parser___parser_4.28.1.tgz"; + name = "_typescript_eslint_parser___parser_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.1.tgz"; - sha1 = "5181b81658414f47291452c15bf6cd44a32f85bd"; + name = "_typescript_eslint_parser___parser_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz"; + sha1 = "bc462dc2779afeefdcf49082516afdc3e7b96fab"; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.1.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz"; - sha1 = "fd3c20627cdc12933f6d98b386940d8d0ce8a991"; + name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; + sha1 = "bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"; }; } { - name = "_typescript_eslint_types___types_4.28.1.tgz"; + name = "_typescript_eslint_types___types_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.1.tgz"; - sha1 = "d0f2ecbef3684634db357b9bbfc97b94b828f83f"; + name = "_typescript_eslint_types___types_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz"; + sha1 = "41acbd79b5816b7c0dd7530a43d97d020d3aeb42"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.1.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz"; - sha1 = "af882ae41740d1f268e38b4d0fad21e7e8d86a81"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; + sha1 = "252e6863278dc0727244be9e371eb35241c46d00"; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.1.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz"; - sha1 = "162a515ee255f18a6068edc26df793cdc1ec9157"; - }; - } - { - name = "JSONStream___JSONStream_1.3.5.tgz"; - path = fetchurl { - name = "JSONStream___JSONStream_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; - sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; + sha1 = "92dacfefccd6751cbb0a964f06683bfd72d0c4d3"; }; } { @@ -666,11 +682,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; }; } { @@ -682,51 +698,35 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; }; } { - name = "agent_base___agent_base_4.2.1.tgz"; + name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz"; - sha1 = "d89e5999f797875674c07d87f260fc41e83e8ca9"; + name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; + sha1 = "d928028a4862cb11718e55227872e842a44c945b"; }; } { - name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz"; - sha1 = "a113924dd3fa24a0bc3b78108c450c2abee00f67"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; - }; - } - { - name = "ajv___ajv_6.12.3.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz"; - sha1 = "18c5af38a111ddeb4f2697bd78d68abc1cabd706"; - }; - } - { - name = "ajv___ajv_6.12.2.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; - sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { @@ -738,35 +738,11 @@ }; } { - name = "ajv___ajv_6.12.5.tgz"; + name = "ajv___ajv_8.6.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.5.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; - sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; - }; - } - { - name = "ajv___ajv_6.10.2.tgz"; - path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; - }; - } - { - name = "ajv___ajv_8.5.0.tgz"; - path = fetchurl { - name = "ajv___ajv_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; - sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; - }; - } - { - name = "ansi_align___ansi_align_2.0.0.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + name = "ajv___ajv_8.6.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz"; + sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571"; }; } { @@ -826,27 +802,11 @@ }; } { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; - }; - } - { - name = "ansicolors___ansicolors_0.3.2.tgz"; - path = fetchurl { - name = "ansicolors___ansicolors_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - } - { - name = "ansistyles___ansistyles_0.1.3.tgz"; - path = fetchurl { - name = "ansistyles___ansistyles_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz"; - sha1 = "5de60415bda071bb37127854c864f41b23254539"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; }; } { @@ -897,14 +857,6 @@ sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; }; } - { - name = "aproba___aproba_2.0.0.tgz"; - path = fetchurl { - name = "aproba___aproba_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; - sha1 = "52520b8ae5b569215b354efc0caa3fe1e45a8adc"; - }; - } { name = "archiver_utils___archiver_utils_2.1.0.tgz"; path = fetchurl { @@ -921,14 +873,6 @@ sha1 = "dd3e097624481741df626267564f7dd8640a45ba"; }; } - { - name = "archy___archy_1.0.0.tgz"; - path = fetchurl { - name = "archy___archy_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - } { name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; path = fetchurl { @@ -962,19 +906,11 @@ }; } { - name = "asap___asap_2.0.6.tgz"; + name = "asar___asar_2.1.0.tgz"; path = fetchurl { - name = "asap___asap_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; - }; - } - { - name = "asar___asar_2.0.1.tgz"; - path = fetchurl { - name = "asar___asar_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-2.0.1.tgz"; - sha1 = "8518a1c62c238109c15a5f742213e83a09b9fd38"; + name = "asar___asar_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-2.1.0.tgz"; + sha1 = "97c6a570408c4e38a18d4a3fb748a621b5a7844e"; }; } { @@ -1074,11 +1010,11 @@ }; } { - name = "aws4___aws4_1.9.0.tgz"; + name = "aws4___aws4_1.11.0.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz"; - sha1 = "24390e6ad61386b0a747265754d2a17219de862c"; + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; }; } { @@ -1089,14 +1025,6 @@ sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } - { - name = "base64_js___base64_js_1.3.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; - }; - } { name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { @@ -1113,22 +1041,6 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } - { - name = "bin_links___bin_links_1.1.7.tgz"; - path = fetchurl { - name = "bin_links___bin_links_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.7.tgz"; - sha1 = "34b79ea9d0e575d7308afeff0c6b2fc24c793359"; - }; - } - { - name = "bin_links___bin_links_1.1.8.tgz"; - path = fetchurl { - name = "bin_links___bin_links_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz"; - sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; - }; - } { name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { @@ -1138,11 +1050,11 @@ }; } { - name = "bl___bl_4.0.3.tgz"; + name = "bl___bl_4.1.0.tgz"; path = fetchurl { - name = "bl___bl_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; - sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; }; } { @@ -1178,19 +1090,11 @@ }; } { - name = "boxen___boxen_1.3.0.tgz"; + name = "boxen___boxen_5.0.1.tgz"; path = fetchurl { - name = "boxen___boxen_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; - sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; - }; - } - { - name = "boxen___boxen_5.0.0.tgz"; - path = fetchurl { - name = "boxen___boxen_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz"; - sha1 = "64fe9b16066af815f51057adcc800c3730120854"; + name = "boxen___boxen_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz"; + sha1 = "657528bdd3f59a772b8279b831f27ec2c744664b"; }; } { @@ -1249,14 +1153,6 @@ sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; }; } - { - name = "buffer___buffer_5.6.0.tgz"; - path = fetchurl { - name = "buffer___buffer_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; - sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; - }; - } { name = "builder_util_runtime___builder_util_runtime_8.7.5.tgz"; path = fetchurl { @@ -1282,35 +1178,11 @@ }; } { - name = "byline___byline_5.0.0.tgz"; + name = "cacache___cacache_15.2.0.tgz"; path = fetchurl { - name = "byline___byline_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; - }; - } - { - name = "byte_size___byte_size_5.0.1.tgz"; - path = fetchurl { - name = "byte_size___byte_size_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz"; - sha1 = "4b651039a5ecd96767e71a3d7ed380e48bed4191"; - }; - } - { - name = "cacache___cacache_12.0.4.tgz"; - path = fetchurl { - name = "cacache___cacache_12.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; - sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; - }; - } - { - name = "cacache___cacache_12.0.3.tgz"; - path = fetchurl { - name = "cacache___cacache_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; - sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + name = "cacache___cacache_15.2.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz"; + sha1 = "73af75f77c58e72d8c630a7a2858cb18ef523389"; }; } { @@ -1321,14 +1193,6 @@ sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; }; } - { - name = "call_limit___call_limit_1.1.1.tgz"; - path = fetchurl { - name = "call_limit___call_limit_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz"; - sha1 = "ef15f2670db3f1992557e2d965abc459e6e358d4"; - }; - } { name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { @@ -1337,22 +1201,6 @@ sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; }; } - { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } - { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; - }; - } { name = "camelcase___camelcase_6.2.0.tgz"; path = fetchurl { @@ -1361,14 +1209,6 @@ sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; }; } - { - name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; - path = fetchurl { - name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; - sha1 = "a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"; - }; - } { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -1385,14 +1225,6 @@ sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } - { - name = "chalk___chalk_4.1.0.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; - }; - } { name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { @@ -1433,14 +1265,6 @@ sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; } - { - name = "ci_info___ci_info_1.6.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; - sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; - }; - } { name = "ci_info___ci_info_2.0.0.tgz"; path = fetchurl { @@ -1458,19 +1282,11 @@ }; } { - name = "cidr_regex___cidr_regex_2.0.10.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { - name = "cidr_regex___cidr_regex_2.0.10.tgz"; - url = "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-2.0.10.tgz"; - sha1 = "af13878bd4ad704de77d6dc800799358b3afa70d"; - }; - } - { - name = "cli_boxes___cli_boxes_1.0.0.tgz"; - path = fetchurl { - name = "cli_boxes___cli_boxes_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; }; } { @@ -1481,22 +1297,6 @@ sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; }; } - { - name = "cli_columns___cli_columns_3.1.2.tgz"; - path = fetchurl { - name = "cli_columns___cli_columns_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz"; - sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; - }; - } - { - name = "cli_table3___cli_table3_0.5.1.tgz"; - path = fetchurl { - name = "cli_table3___cli_table3_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; - sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; - }; - } { name = "cli_truncate___cli_truncate_1.1.0.tgz"; path = fetchurl { @@ -1505,22 +1305,6 @@ sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; }; } - { - name = "cliui___cliui_3.2.0.tgz"; - path = fetchurl { - name = "cliui___cliui_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - } - { - name = "cliui___cliui_5.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; - sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; - }; - } { name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { @@ -1537,22 +1321,6 @@ sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; } - { - name = "clone___clone_1.0.4.tgz"; - path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; - }; - } - { - name = "cmd_shim___cmd_shim_3.0.3.tgz"; - path = fetchurl { - name = "cmd_shim___cmd_shim_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz"; - sha1 = "2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"; - }; - } { name = "code_point_at___code_point_at_1.1.0.tgz"; path = fetchurl { @@ -1601,22 +1369,6 @@ sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; } - { - name = "colors___colors_1.4.0.tgz"; - path = fetchurl { - name = "colors___colors_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; - sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; - }; - } - { - name = "columnify___columnify_1.5.4.tgz"; - path = fetchurl { - name = "columnify___columnify_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz"; - sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; - }; - } { name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { @@ -1650,11 +1402,11 @@ }; } { - name = "compress_commons___compress_commons_4.1.0.tgz"; + name = "compress_commons___compress_commons_4.1.1.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; - sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; + name = "compress_commons___compress_commons_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; + sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; }; } { @@ -1689,22 +1441,6 @@ sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; }; } - { - name = "config_chain___config_chain_1.1.12.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.12.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; - sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; - }; - } - { - name = "configstore___configstore_3.1.2.tgz"; - path = fetchurl { - name = "configstore___configstore_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz"; - sha1 = "c6f25defaeef26df12dd33414b001fe81a543f8f"; - }; - } { name = "configstore___configstore_5.0.1.tgz"; path = fetchurl { @@ -1722,19 +1458,11 @@ }; } { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + name = "core_js___core_js_3.15.2.tgz"; path = fetchurl { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; - }; - } - { - name = "core_js___core_js_3.15.1.tgz"; - path = fetchurl { - name = "core_js___core_js_3.15.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.1.tgz"; - sha1 = "6c08ab88abdf56545045ccf5fd81f47f407e7f1a"; + name = "core_js___core_js_3.15.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; + sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; }; } { @@ -1762,11 +1490,11 @@ }; } { - name = "crc32_stream___crc32_stream_4.0.1.tgz"; + name = "crc32_stream___crc32_stream_4.0.2.tgz"; path = fetchurl { - name = "crc32_stream___crc32_stream_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; - sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; + name = "crc32_stream___crc32_stream_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha1 = "c922ad22b38395abe9d3870f02fa8134ed709007"; }; } { @@ -1777,22 +1505,6 @@ sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; }; } - { - name = "create_error_class___create_error_class_3.0.2.tgz"; - path = fetchurl { - name = "create_error_class___create_error_class_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - } - { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - } { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { @@ -1801,14 +1513,6 @@ sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; }; } - { - name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; - }; - } { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; path = fetchurl { @@ -1825,14 +1529,6 @@ sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; }; } - { - name = "cyclist___cyclist_1.0.1.tgz"; - path = fetchurl { - name = "cyclist___cyclist_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; - sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; - }; - } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -1858,11 +1554,11 @@ }; } { - name = "debug___debug_3.1.0.tgz"; + name = "debug___debug_4.3.2.tgz"; path = fetchurl { - name = "debug___debug_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; - sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; }; } { @@ -1881,62 +1577,6 @@ sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; }; } - { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } - { - name = "debug___debug_4.1.1.tgz"; - path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; - }; - } - { - name = "debug___debug_4.3.1.tgz"; - path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; - }; - } - { - name = "debug___debug_4.3.2.tgz"; - path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; - }; - } - { - name = "debuglog___debuglog_1.0.1.tgz"; - path = fetchurl { - name = "debuglog___debuglog_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"; - sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; - }; - } - { - name = "decamelize___decamelize_1.2.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - } - { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - } { name = "decompress_response___decompress_response_3.3.0.tgz"; path = fetchurl { @@ -1962,19 +1602,11 @@ }; } { - name = "defaults___defaults_1.0.3.tgz"; + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; path = fetchurl { - name = "defaults___defaults_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - } - { - name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; - path = fetchurl { - name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz"; - sha1 = "88ae694b93f67b81815a2c8c769aef6574ac8f2f"; + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; }; } { @@ -2002,11 +1634,11 @@ }; } { - name = "detect_indent___detect_indent_5.0.0.tgz"; + name = "depd___depd_1.1.2.tgz"; path = fetchurl { - name = "detect_indent___detect_indent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; } { @@ -2017,14 +1649,6 @@ sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; } - { - name = "detect_newline___detect_newline_2.1.0.tgz"; - path = fetchurl { - name = "detect_newline___detect_newline_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; - sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; - }; - } { name = "detect_node___detect_node_2.1.0.tgz"; path = fetchurl { @@ -2033,14 +1657,6 @@ sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; }; } - { - name = "dezalgo___dezalgo_1.0.3.tgz"; - path = fetchurl { - name = "dezalgo___dezalgo_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz"; - sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; - }; - } { name = "dir_compare___dir_compare_2.4.0.tgz"; path = fetchurl { @@ -2082,27 +1698,19 @@ }; } { - name = "dom_walk___dom_walk_0.1.1.tgz"; + name = "dom_walk___dom_walk_0.1.2.tgz"; path = fetchurl { - name = "dom_walk___dom_walk_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz"; - sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + name = "dom_walk___dom_walk_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz"; + sha1 = "0c548bef048f4d1f2a97249002236060daa3fd84"; }; } { - name = "dot_prop___dot_prop_4.2.1.tgz"; + name = "dot_prop___dot_prop_5.3.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz"; - sha1 = "45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"; - }; - } - { - name = "dot_prop___dot_prop_5.2.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; - sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; }; } { @@ -2113,14 +1721,6 @@ sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; }; } - { - name = "dotenv___dotenv_5.0.1.tgz"; - path = fetchurl { - name = "dotenv___dotenv_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz"; - sha1 = "a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"; - }; - } { name = "dotenv___dotenv_9.0.2.tgz"; path = fetchurl { @@ -2137,14 +1737,6 @@ sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; } - { - name = "duplexify___duplexify_3.7.1.tgz"; - path = fetchurl { - name = "duplexify___duplexify_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; - sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; - }; - } { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { @@ -2153,14 +1745,6 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } - { - name = "editor___editor_1.0.0.tgz"; - path = fetchurl { - name = "editor___editor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; - }; - } { name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { @@ -2186,11 +1770,11 @@ }; } { - name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; + name = "electron_devtools_installer___electron_devtools_installer_3.2.0.tgz"; path = fetchurl { - name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.1.1.tgz"; - sha1 = "7b56c8c86475c5e4e10de6917d150c53c9ceb55e"; + name = "electron_devtools_installer___electron_devtools_installer_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz"; + sha1 = "acc48d24eb7033fe5af284a19667e73b78d406d0"; }; } { @@ -2226,11 +1810,11 @@ }; } { - name = "electron___electron_12.0.11.tgz"; + name = "electron___electron_13.1.7.tgz"; path = fetchurl { - name = "electron___electron_12.0.11.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-12.0.11.tgz"; - sha1 = "555dc1cf663e320f2f2cbdf89319352b08fc59f2"; + name = "electron___electron_13.1.7.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.7.tgz"; + sha1 = "7e17f5c93a8d182a2a486884fed3dc34ab101be9"; }; } { @@ -2282,51 +1866,19 @@ }; } { - name = "env_paths___env_paths_2.2.0.tgz"; + name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { - name = "env_paths___env_paths_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; - sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; }; } { - name = "err_code___err_code_1.1.2.tgz"; + name = "err_code___err_code_2.0.3.tgz"; path = fetchurl { - name = "err_code___err_code_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; - }; - } - { - name = "errno___errno_0.1.7.tgz"; - path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; - }; - } - { - name = "es_abstract___es_abstract_1.16.3.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.16.3.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz"; - sha1 = "52490d978f96ff9f89ec15b5cf244304a5bca161"; - }; - } - { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha1 = "23c2f3b756ffdfc608d30e27c9a941024807e7f9"; }; } { @@ -2337,22 +1889,6 @@ sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; }; } - { - name = "es6_promise___es6_promise_4.2.8.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -2394,11 +1930,11 @@ }; } { - name = "53000626a9256811f6b355de4eafeb5575bda7fc"; + name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; path = fetchurl { - name = "53000626a9256811f6b355de4eafeb5575bda7fc"; - url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/53000626a9256811f6b355de4eafeb5575bda7fc"; - sha1 = "12617a8105ab0ea2e7df2567928260a41ebffd58"; + name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; + sha1 = "ecd130b39eb8bc2f11acdfb859b3529748a364e1"; }; } { @@ -2425,14 +1961,6 @@ sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; }; } - { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; - }; - } { name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { @@ -2474,11 +2002,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -2497,14 +2025,6 @@ sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } - { - name = "estraverse___estraverse_5.1.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; - sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; - }; - } { name = "estraverse___estraverse_5.2.0.tgz"; path = fetchurl { @@ -2529,14 +2049,6 @@ sha1 = "98261c91958551536b44482238e9783fb73d292a"; }; } - { - name = "execa___execa_0.7.0.tgz"; - path = fetchurl { - name = "execa___execa_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - } { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { @@ -2585,14 +2097,6 @@ sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; } - { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; - }; - } { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { @@ -2602,19 +2106,19 @@ }; } { - name = "fast_glob___fast_glob_3.2.6.tgz"; + name = "fast_glob___fast_glob_3.2.7.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz"; - sha1 = "434dd9529845176ea049acc9343e8282765c6e1a"; + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -2626,11 +2130,11 @@ }; } { - name = "fastq___fastq_1.11.0.tgz"; + name = "fastq___fastq_1.11.1.tgz"; path = fetchurl { - name = "fastq___fastq_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; - sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; + name = "fastq___fastq_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz"; + sha1 = "5d8175aae17db61947f8b162cfc7f63264d22807"; }; } { @@ -2641,14 +2145,6 @@ sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } - { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; - }; - } { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { @@ -2666,11 +2162,11 @@ }; } { - name = "filelist___filelist_1.0.1.tgz"; + name = "filelist___filelist_1.0.2.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; - sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + name = "filelist___filelist_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; + sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; }; } { @@ -2689,14 +2185,6 @@ sha1 = "8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"; }; } - { - name = "find_up___find_up_2.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - } { name = "find_up___find_up_3.0.0.tgz"; path = fetchurl { @@ -2714,19 +2202,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.1.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; - }; - } - { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - path = fetchurl { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + name = "flatted___flatted_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz"; + sha1 = "bbef080d95fca6709362c73044a1634f7c6e7d05"; }; } { @@ -2753,22 +2233,6 @@ sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; }; } - { - name = "from2___from2_1.3.0.tgz"; - path = fetchurl { - name = "from2___from2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz"; - sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; - }; - } - { - name = "from2___from2_2.3.0.tgz"; - path = fetchurl { - name = "from2___from2_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; - }; - } { name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { @@ -2801,14 +2265,6 @@ sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; }; } - { - name = "fs_extra___fs_extra_9.0.1.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz"; - sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc"; - }; - } { name = "fs_minipass___fs_minipass_1.2.7.tgz"; path = fetchurl { @@ -2818,27 +2274,11 @@ }; } { - name = "fs_minipass___fs_minipass_2.0.0.tgz"; + name = "fs_minipass___fs_minipass_2.1.0.tgz"; path = fetchurl { - name = "fs_minipass___fs_minipass_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz"; - sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1"; - }; - } - { - name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; - path = fetchurl { - name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; - url = "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; - sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; - }; - } - { - name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - path = fetchurl { - name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; }; } { @@ -2857,14 +2297,6 @@ sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; }; } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; - }; - } { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; path = fetchurl { @@ -2881,38 +2313,6 @@ sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; } - { - name = "genfun___genfun_5.0.0.tgz"; - path = fetchurl { - name = "genfun___genfun_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz"; - sha1 = "9dd9710a06900a5c4a5bf57aca5da4e52fe76537"; - }; - } - { - name = "gentle_fs___gentle_fs_2.3.0.tgz"; - path = fetchurl { - name = "gentle_fs___gentle_fs_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.0.tgz"; - sha1 = "13538db5029400f98684be4894e8a7d8f0d1ea7f"; - }; - } - { - name = "gentle_fs___gentle_fs_2.3.1.tgz"; - path = fetchurl { - name = "gentle_fs___gentle_fs_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz"; - sha1 = "11201bf66c18f930ddca72cf69460bdfa05727b1"; - }; - } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -2921,14 +2321,6 @@ sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; }; } - { - name = "get_stream___get_stream_3.0.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - } { name = "get_stream___get_stream_4.1.0.tgz"; path = fetchurl { @@ -2938,11 +2330,11 @@ }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { @@ -2969,14 +2361,6 @@ sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } - { - name = "glob___glob_7.1.6.tgz"; - path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; - }; - } { name = "glob___glob_7.1.7.tgz"; path = fetchurl { @@ -2993,14 +2377,6 @@ sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; }; } - { - name = "global_dirs___global_dirs_0.1.1.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; - sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; - }; - } { name = "global_dirs___global_dirs_3.0.0.tgz"; path = fetchurl { @@ -3018,11 +2394,11 @@ }; } { - name = "global___global_4.3.2.tgz"; + name = "global___global_4.4.0.tgz"; path = fetchurl { - name = "global___global_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz"; - sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + name = "global___global_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz"; + sha1 = "3e7b105179006a323ed71aafca3e9c57a5cc6406"; }; } { @@ -3057,14 +2433,6 @@ sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; }; } - { - name = "got___got_6.7.1.tgz"; - path = fetchurl { - name = "got___got_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; - }; - } { name = "got___got_9.6.0.tgz"; path = fetchurl { @@ -3073,14 +2441,6 @@ sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; }; } - { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; - }; - } { name = "graceful_fs___graceful_fs_4.2.6.tgz"; path = fetchurl { @@ -3089,14 +2449,6 @@ sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; }; } - { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; - }; - } { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; path = fetchurl { @@ -3113,14 +2465,6 @@ sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; } - { - name = "har_validator___har_validator_5.1.3.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; - }; - } { name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { @@ -3145,14 +2489,6 @@ sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; }; } - { - name = "has_symbols___has_symbols_1.0.1.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; - }; - } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -3169,22 +2505,6 @@ sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; }; } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; - }; - } - { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; - }; - } { name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; path = fetchurl { @@ -3194,27 +2514,19 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; }; } { - name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha1 = "495704773277eeef6e43f9ab2c2c7d259dda25c5"; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; - sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; }; } { @@ -3226,11 +2538,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; - sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; }; } { @@ -3274,35 +2586,11 @@ }; } { - name = "ieee754___ieee754_1.1.13.tgz"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; path = fetchurl { - name = "ieee754___ieee754_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; - }; - } - { - name = "iferr___iferr_0.1.5.tgz"; - path = fetchurl { - name = "iferr___iferr_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; - }; - } - { - name = "iferr___iferr_1.0.2.tgz"; - path = fetchurl { - name = "iferr___iferr_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/iferr/-/iferr-1.0.2.tgz"; - sha1 = "e9fde49a9da06dc4a4194c6c9ed6d08305037a6d"; - }; - } - { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha1 = "c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"; }; } { @@ -3337,14 +2625,6 @@ sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; }; } - { - name = "import_fresh___import_fresh_3.2.1.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; - }; - } { name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { @@ -3369,6 +2649,14 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } { name = "indexof___indexof_0.0.1.tgz"; path = fetchurl { @@ -3417,30 +2705,6 @@ sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } - { - name = "init_package_json___init_package_json_1.10.3.tgz"; - path = fetchurl { - name = "init_package_json___init_package_json_1.10.3.tgz"; - url = "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz"; - sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; - }; - } - { - name = "invert_kv___invert_kv_1.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - } - { - name = "ip_regex___ip_regex_2.1.0.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; - }; - } { name = "ip___ip_1.1.5.tgz"; path = fetchurl { @@ -3449,14 +2713,6 @@ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - } { name = "is_binary_path___is_binary_path_2.1.0.tgz"; path = fetchurl { @@ -3465,22 +2721,6 @@ sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; }; } - { - name = "is_callable___is_callable_1.1.4.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; - }; - } - { - name = "is_ci___is_ci_1.2.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; - sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; - }; - } { name = "is_ci___is_ci_2.0.0.tgz"; path = fetchurl { @@ -3497,22 +2737,6 @@ sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; }; } - { - name = "is_cidr___is_cidr_3.1.0.tgz"; - path = fetchurl { - name = "is_cidr___is_cidr_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-cidr/-/is-cidr-3.1.0.tgz"; - sha1 = "72e233d8e1c4cd1d3f11713fcce3eba7b0e3476f"; - }; - } - { - name = "is_date_object___is_date_object_1.0.1.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; - }; - } { name = "is_extglob___is_extglob_2.1.1.tgz"; path = fetchurl { @@ -3546,11 +2770,11 @@ }; } { - name = "is_function___is_function_1.0.1.tgz"; + name = "is_function___is_function_1.0.2.tgz"; path = fetchurl { - name = "is_function___is_function_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz"; - sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + name = "is_function___is_function_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz"; + sha1 = "4f097f30abf6efadac9833b17ca5dc03f8144e08"; }; } { @@ -3561,14 +2785,6 @@ sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; }; } - { - name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; - sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; - }; - } { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; path = fetchurl { @@ -3578,11 +2794,11 @@ }; } { - name = "is_npm___is_npm_1.0.0.tgz"; + name = "is_lambda___is_lambda_1.0.1.tgz"; path = fetchurl { - name = "is_npm___is_npm_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + name = "is_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; }; } { @@ -3601,14 +2817,6 @@ sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; }; } - { - name = "is_obj___is_obj_1.0.1.tgz"; - path = fetchurl { - name = "is_obj___is_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - } { name = "is_obj___is_obj_2.0.0.tgz"; path = fetchurl { @@ -3617,14 +2825,6 @@ sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; }; } - { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; - }; - } { name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { @@ -3633,46 +2833,6 @@ sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } - { - name = "is_redirect___is_redirect_1.0.0.tgz"; - path = fetchurl { - name = "is_redirect___is_redirect_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - } - { - name = "is_regex___is_regex_1.0.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; - }; - } - { - name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; - path = fetchurl { - name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha1 = "d778488bd0a4666a3be8a1482b9f2baafedea8b4"; - }; - } - { - name = "is_stream___is_stream_1.1.0.tgz"; - path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - } - { - name = "is_symbol___is_symbol_1.0.3.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; - }; - } { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -3689,14 +2849,6 @@ sha1 = "d502d3382590ea3004893746754c89139973e232"; }; } - { - name = "isarray___isarray_0.0.1.tgz"; - path = fetchurl { - name = "isarray___isarray_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -3762,11 +2914,11 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { @@ -3802,11 +2954,11 @@ }; } { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; path = fetchurl { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; }; } { @@ -3874,11 +3026,11 @@ }; } { - name = "jsonfile___jsonfile_6.0.1.tgz"; + name = "jsonfile___jsonfile_6.1.0.tgz"; path = fetchurl { - name = "jsonfile___jsonfile_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz"; - sha1 = "98966cba214378c8c84b82e085907b40bf614179"; + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; }; } { @@ -3898,11 +3050,11 @@ }; } { - name = "jszip___jszip_3.5.0.tgz"; + name = "jszip___jszip_3.6.0.tgz"; path = fetchurl { - name = "jszip___jszip_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz"; - sha1 = "b4fd1f368245346658e781fec9675802489e15f6"; + name = "jszip___jszip_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz"; + sha1 = "839b72812e3f97819cc13ac4134ffced95dd6af9"; }; } { @@ -3913,14 +3065,6 @@ sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; }; } - { - name = "latest_version___latest_version_3.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; - }; - } { name = "latest_version___latest_version_5.1.0.tgz"; path = fetchurl { @@ -3929,22 +3073,6 @@ sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; }; } - { - name = "lazy_property___lazy_property_1.0.0.tgz"; - path = fetchurl { - name = "lazy_property___lazy_property_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz"; - sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; - }; - } - { - name = "lazy_val___lazy_val_1.0.4.tgz"; - path = fetchurl { - name = "lazy_val___lazy_val_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz"; - sha1 = "882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"; - }; - } { name = "lazy_val___lazy_val_1.0.5.tgz"; path = fetchurl { @@ -3961,14 +3089,6 @@ sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; } - { - name = "lcid___lcid_1.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - } { name = "levn___levn_0.4.1.tgz"; path = fetchurl { @@ -3977,86 +3097,6 @@ sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; }; } - { - name = "libcipm___libcipm_4.0.8.tgz"; - path = fetchurl { - name = "libcipm___libcipm_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.8.tgz"; - sha1 = "dcea4919e10dfbce420327e63901613b9141bc89"; - }; - } - { - name = "libnpm___libnpm_3.0.1.tgz"; - path = fetchurl { - name = "libnpm___libnpm_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/libnpm/-/libnpm-3.0.1.tgz"; - sha1 = "0be11b4c9dd4d1ffd7d95c786e92e55d65be77a2"; - }; - } - { - name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; - path = fetchurl { - name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.2.tgz"; - sha1 = "8b2d72345ba3bef90d3b4f694edd5c0417f58923"; - }; - } - { - name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; - path = fetchurl { - name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; - sha1 = "c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"; - }; - } - { - name = "libnpmhook___libnpmhook_5.0.3.tgz"; - path = fetchurl { - name = "libnpmhook___libnpmhook_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.3.tgz"; - sha1 = "4020c0f5edbf08ebe395325caa5ea01885b928f7"; - }; - } - { - name = "libnpmorg___libnpmorg_1.0.1.tgz"; - path = fetchurl { - name = "libnpmorg___libnpmorg_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.1.tgz"; - sha1 = "5d2503f6ceb57f33dbdcc718e6698fea6d5ad087"; - }; - } - { - name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; - path = fetchurl { - name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.3.tgz"; - sha1 = "e3782796722d79eef1a0a22944c117e0c4ca4280"; - }; - } - { - name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; - path = fetchurl { - name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.2.tgz"; - sha1 = "9a4f059102d38e3dd44085bdbfe5095f2a5044cf"; - }; - } - { - name = "libnpmteam___libnpmteam_1.0.2.tgz"; - path = fetchurl { - name = "libnpmteam___libnpmteam_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.2.tgz"; - sha1 = "8b48bcbb6ce70dd8150c950fcbdbf3feb6eec820"; - }; - } - { - name = "libnpx___libnpx_10.2.4.tgz"; - path = fetchurl { - name = "libnpx___libnpx_10.2.4.tgz"; - url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz"; - sha1 = "ef0e3258e29aef2ec7ee3276115e20e67f67d4ee"; - }; - } { name = "lie___lie_3.3.0.tgz"; path = fetchurl { @@ -4073,22 +3113,6 @@ sha1 = "c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"; }; } - { - name = "load_json_file___load_json_file_2.0.0.tgz"; - path = fetchurl { - name = "load_json_file___load_json_file_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - } - { - name = "locate_path___locate_path_2.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - } { name = "locate_path___locate_path_3.0.0.tgz"; path = fetchurl { @@ -4097,46 +3121,6 @@ sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; }; } - { - name = "lock_verify___lock_verify_2.2.0.tgz"; - path = fetchurl { - name = "lock_verify___lock_verify_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.0.tgz"; - sha1 = "12432feb68bb647071c78c44bde16029a0f7d935"; - }; - } - { - name = "lockfile___lockfile_1.0.4.tgz"; - path = fetchurl { - name = "lockfile___lockfile_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; - sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; - }; - } - { - name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; - path = fetchurl { - name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; - sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; - }; - } - { - name = "lodash._createset___lodash._createset_4.0.3.tgz"; - path = fetchurl { - name = "lodash._createset___lodash._createset_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz"; - sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; - }; - } - { - name = "lodash._root___lodash._root_3.0.1.tgz"; - path = fetchurl { - name = "lodash._root___lodash._root_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - } { name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; path = fetchurl { @@ -4193,22 +3177,6 @@ sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; } - { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - path = fetchurl { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - } - { - name = "lodash.without___lodash.without_4.4.0.tgz"; - path = fetchurl { - name = "lodash.without___lodash.without_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz"; - sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -4233,22 +3201,6 @@ sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; }; } - { - name = "lru_cache___lru_cache_4.1.5.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; - sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; - }; - } - { - name = "lru_cache___lru_cache_5.1.1.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; - sha1 = "1da27e6710271947695daf6848e847f01d84b920"; - }; - } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -4257,22 +3209,6 @@ sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; }; } - { - name = "make_dir___make_dir_1.3.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; - sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; - }; - } - { - name = "make_dir___make_dir_3.0.2.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz"; - sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; - }; - } { name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { @@ -4282,11 +3218,11 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; - sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; + name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; + sha1 = "ceaa100e60e0ef9e8d1ede94614bb2ba83c8bb24"; }; } { @@ -4298,27 +3234,11 @@ }; } { - name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; + name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; path = fetchurl { - name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; - url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/63f9119bc0bc304e83d4e8e22364caa7850e7671"; - sha1 = "17709c5ad5da065d2718fffe873b8d0a1a53a4cd"; - }; - } - { - name = "meant___meant_1.0.3.tgz"; - path = fetchurl { - name = "meant___meant_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz"; - sha1 = "67769af9de1d158773e928ae82c456114903554c"; - }; - } - { - name = "mem___mem_1.1.0.tgz"; - path = fetchurl { - name = "mem___mem_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d"; }; } { @@ -4338,19 +3258,19 @@ }; } { - name = "mime_db___mime_db_1.42.0.tgz"; + name = "mime_db___mime_db_1.48.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.42.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz"; - sha1 = "3e252907b4c7adb906597b4b65636272cf9e7bac"; + name = "mime_db___mime_db_1.48.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; + sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; }; } { - name = "mime_types___mime_types_2.1.25.tgz"; + name = "mime_types___mime_types_2.1.31.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.25.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz"; - sha1 = "39772d46621f93e2a80a856c53b86a62156a6437"; + name = "mime_types___mime_types_2.1.31.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; + sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; }; } { @@ -4369,14 +3289,6 @@ sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; - }; - } { name = "mimic_fn___mimic_fn_2.1.0.tgz"; path = fetchurl { @@ -4417,22 +3329,6 @@ sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; }; } - { - name = "minimist___minimist_0.0.8.tgz"; - path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - } - { - name = "minimist___minimist_1.2.3.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz"; - sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; - }; - } { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { @@ -4441,6 +3337,54 @@ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_fetch___minipass_fetch_1.3.4.tgz"; + path = fetchurl { + name = "minipass_fetch___minipass_fetch_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.4.tgz"; + sha1 = "63f5af868a38746ca7b33b03393ddf8c291244fe"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_json_stream___minipass_json_stream_1.0.1.tgz"; + path = fetchurl { + name = "minipass_json_stream___minipass_json_stream_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"; + sha1 = "7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha1 = "70ee5a7c5052070afacfbc22977ea79def353b70"; + }; + } { name = "minipass___minipass_2.9.0.tgz"; path = fetchurl { @@ -4450,11 +3394,11 @@ }; } { - name = "minipass___minipass_3.1.1.tgz"; + name = "minipass___minipass_3.1.3.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; - sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; }; } { @@ -4473,22 +3417,6 @@ sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; }; } - { - name = "mississippi___mississippi_3.0.0.tgz"; - path = fetchurl { - name = "mississippi___mississippi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; - sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; - }; - } - { - name = "mkdirp___mkdirp_0.5.1.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - } { name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { @@ -4498,19 +3426,11 @@ }; } { - name = "mkdirp___mkdirp_1.0.3.tgz"; + name = "mkdirp___mkdirp_1.0.4.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz"; - sha1 = "4cf2e30ad45959dddea53ad97d518b6c8205e1ea"; - }; - } - { - name = "move_concurrently___move_concurrently_1.0.1.tgz"; - path = fetchurl { - name = "move_concurrently___move_concurrently_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; }; } { @@ -4537,14 +3457,6 @@ sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; }; } - { - name = "mute_stream___mute_stream_0.0.8.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; - sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; - }; - } { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { @@ -4554,11 +3466,19 @@ }; } { - name = "needle___needle_2.5.0.tgz"; + name = "needle___needle_2.8.0.tgz"; path = fetchurl { - name = "needle___needle_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz"; - sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"; + name = "needle___needle_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz"; + sha1 = "1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; }; } { @@ -4570,27 +3490,11 @@ }; } { - name = "node_fetch_npm___node_fetch_npm_2.0.4.tgz"; + name = "node_gyp___node_gyp_7.1.2.tgz"; path = fetchurl { - name = "node_fetch_npm___node_fetch_npm_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz"; - sha1 = "6507d0e17a9ec0be3bec516958a497cec54bf5a4"; - }; - } - { - name = "node_gyp___node_gyp_5.1.0.tgz"; - path = fetchurl { - name = "node_gyp___node_gyp_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz"; - sha1 = "8e31260a7af4a2e2f994b0673d4e0b3866156332"; - }; - } - { - name = "node_gyp___node_gyp_5.1.1.tgz"; - path = fetchurl { - name = "node_gyp___node_gyp_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz"; - sha1 = "eb915f7b631c937d282e33aed44cb7a025f62a3e"; + name = "node_gyp___node_gyp_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz"; + sha1 = "21a810aebb187120251c3bcec979af1587b188ae"; }; } { @@ -4601,14 +3505,6 @@ sha1 = "c2fc383276b74c7ffa842925241553e8b40f1087"; }; } - { - name = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - } { name = "nopt___nopt_4.0.3.tgz"; path = fetchurl { @@ -4618,11 +3514,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + name = "nopt___nopt_5.0.0.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha1 = "530942bb58a512fccafe53fe210f13a25355dc88"; }; } { @@ -4642,27 +3538,11 @@ }; } { - name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; + name = "npm_bundled___npm_bundled_1.1.2.tgz"; path = fetchurl { - name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz"; - sha1 = "8226deeb253b55176ed147592a3995442f2179ed"; - }; - } - { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; - }; - } - { - name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; - path = fetchurl { - name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; - sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; + name = "npm_bundled___npm_bundled_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha1 = "944c78789bd739035b70baa2ca5cc32b8d860bc1"; }; } { @@ -4674,35 +3554,11 @@ }; } { - name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + name = "npm_install_checks___npm_install_checks_4.0.0.tgz"; path = fetchurl { - name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz"; - sha1 = "ab2e32ad27baa46720706908e5b14c1852de44d9"; - }; - } - { - name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; - path = fetchurl { - name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz"; - sha1 = "de6975c7d8df65f5150db110b57cce498b0b604c"; - }; - } - { - name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; - path = fetchurl { - name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz"; - sha1 = "9882d3642b8c82c815782a12e6a1bfeed0026309"; - }; - } - { - name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; - path = fetchurl { - name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz"; - sha1 = "44610141ca24664cad35d1e607176193fd8f5b88"; + name = "npm_install_checks___npm_install_checks_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz"; + sha1 = "a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"; }; } { @@ -4714,11 +3570,11 @@ }; } { - name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + name = "npm_package_arg___npm_package_arg_8.1.5.tgz"; path = fetchurl { - name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; - sha1 = "02168cb0a49a2b75bf988a28698de7b529df5cb7"; + name = "npm_package_arg___npm_package_arg_8.1.5.tgz"; + url = "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz"; + sha1 = "3369b2d5fe8fdc674baa7f1786514ddc15466e44"; }; } { @@ -4730,59 +3586,27 @@ }; } { - name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; + name = "npm_packlist___npm_packlist_2.2.2.tgz"; path = fetchurl { - name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz"; - sha1 = "f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"; + name = "npm_packlist___npm_packlist_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz"; + sha1 = "076b97293fa620f632833186a7a8f65aaa6148c8"; }; } { - name = "npm_profile___npm_profile_4.0.2.tgz"; + name = "npm_pick_manifest___npm_pick_manifest_6.1.1.tgz"; path = fetchurl { - name = "npm_profile___npm_profile_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.2.tgz"; - sha1 = "8272a71c19634d0dce9c35a5daf8ee589cbb0f52"; + name = "npm_pick_manifest___npm_pick_manifest_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz"; + sha1 = "7b5484ca2c908565f43b7f27644f36bb816f5148"; }; } { - name = "npm_profile___npm_profile_4.0.4.tgz"; + name = "npm_registry_fetch___npm_registry_fetch_11.0.0.tgz"; path = fetchurl { - name = "npm_profile___npm_profile_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.4.tgz"; - sha1 = "28ee94390e936df6d084263ee2061336a6a1581b"; - }; - } - { - name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; - path = fetchurl { - name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; - sha1 = "57951bf6541e0246b34c9f9a38ab73607c9449d7"; - }; - } - { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - } - { - name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; - path = fetchurl { - name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz"; - sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561"; - }; - } - { - name = "npm___npm_6.14.11.tgz"; - path = fetchurl { - name = "npm___npm_6.14.11.tgz"; - url = "https://registry.yarnpkg.com/npm/-/npm-6.14.11.tgz"; - sha1 = "e0b5598d7b9a42d275e61d8bd28cd7eee0074a3b"; + name = "npm_registry_fetch___npm_registry_fetch_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"; + sha1 = "68c1bb810c46542760d62a6a965f85a702d43a76"; }; } { @@ -4817,14 +3641,6 @@ sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; } - { - name = "object_inspect___object_inspect_1.7.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; - }; - } { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { @@ -4833,14 +3649,6 @@ sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } - { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; - }; - } { name = "omggif___omggif_1.0.10.tgz"; path = fetchurl { @@ -4858,19 +3666,11 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; - }; - } - { - name = "opener___opener_1.5.2.tgz"; - path = fetchurl { - name = "opener___opener_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; - sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { @@ -4889,14 +3689,6 @@ sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; } - { - name = "os_locale___os_locale_2.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; - sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -4922,35 +3714,11 @@ }; } { - name = "p_finally___p_finally_1.0.0.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - } - { - name = "p_limit___p_limit_1.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; - sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; - }; - } - { - name = "p_limit___p_limit_2.2.1.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; - sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; - }; - } - { - name = "p_locate___p_locate_2.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -4962,11 +3730,11 @@ }; } { - name = "p_try___p_try_1.0.0.tgz"; + name = "p_map___p_map_4.0.0.tgz"; path = fetchurl { - name = "p_try___p_try_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; }; } { @@ -4977,14 +3745,6 @@ sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; }; } - { - name = "package_json___package_json_4.0.1.tgz"; - path = fetchurl { - name = "package_json___package_json_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; - }; - } { name = "package_json___package_json_6.5.0.tgz"; path = fetchurl { @@ -4994,11 +3754,11 @@ }; } { - name = "pacote___pacote_9.5.12.tgz"; + name = "pacote___pacote_11.3.5.tgz"; path = fetchurl { - name = "pacote___pacote_9.5.12.tgz"; - url = "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz"; - sha1 = "1e11dd7a8d736bcc36b375a9804d41bb0377bf66"; + name = "pacote___pacote_11.3.5.tgz"; + url = "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz"; + sha1 = "73cf1fc3772b533f575e39efa96c50be8c3dc9d2"; }; } { @@ -5009,14 +3769,6 @@ sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } - { - name = "parallel_transform___parallel_transform_1.2.0.tgz"; - path = fetchurl { - name = "parallel_transform___parallel_transform_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; - }; - } { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { @@ -5057,14 +3809,6 @@ sha1 = "5e8e7512383d140ba02f0c7aa9f49b4399c92515"; }; } - { - name = "parse_json___parse_json_2.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - } { name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { @@ -5081,22 +3825,6 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } - { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - path = fetchurl { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; - }; - } - { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - } { name = "path_key___path_key_3.1.1.tgz"; path = fetchurl { @@ -5105,22 +3833,6 @@ sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; }; } - { - name = "path_parse___path_parse_1.0.6.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; - }; - } - { - name = "path_type___path_type_2.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - } { name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { @@ -5161,14 +3873,6 @@ sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; }; } - { - name = "pify___pify_2.3.0.tgz"; - path = fetchurl { - name = "pify___pify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - } { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -5210,11 +3914,11 @@ }; } { - name = "png_to_ico___png_to_ico_2.1.1.tgz"; + name = "png_to_ico___png_to_ico_2.1.2.tgz"; path = fetchurl { - name = "png_to_ico___png_to_ico_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.1.tgz"; - sha1 = "35be46f93c1ac8d77025f6f4b60c1fa567c1d47c"; + name = "png_to_ico___png_to_ico_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.2.tgz"; + sha1 = "9787178b849f1a7b3aa3e5f2d57ac4cbfabc7c24"; }; } { @@ -5233,14 +3937,6 @@ sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; }; } - { - name = "prepend_http___prepend_http_1.0.4.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - } { name = "prepend_http___prepend_http_2.0.0.tgz"; path = fetchurl { @@ -5266,11 +3962,11 @@ }; } { - name = "process___process_0.5.2.tgz"; + name = "process___process_0.11.10.tgz"; path = fetchurl { - name = "process___process_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz"; - sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; } { @@ -5290,19 +3986,11 @@ }; } { - name = "promise_retry___promise_retry_1.1.1.tgz"; + name = "promise_retry___promise_retry_2.0.1.tgz"; path = fetchurl { - name = "promise_retry___promise_retry_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - } - { - name = "promzard___promzard_0.3.0.tgz"; - path = fetchurl { - name = "promzard___promzard_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz"; - sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha1 = "ff747a13620ab57ba688f5fc67855410c370da22"; }; } { @@ -5313,38 +4001,6 @@ sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; } - { - name = "protoduck___protoduck_5.0.1.tgz"; - path = fetchurl { - name = "protoduck___protoduck_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz"; - sha1 = "03c3659ca18007b69a50fd82a7ebcc516261151f"; - }; - } - { - name = "prr___prr_1.0.1.tgz"; - path = fetchurl { - name = "prr___prr_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; - }; - } - { - name = "pseudomap___pseudomap_1.0.2.tgz"; - path = fetchurl { - name = "pseudomap___pseudomap_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - } - { - name = "psl___psl_1.6.0.tgz"; - path = fetchurl { - name = "psl___psl_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz"; - sha1 = "60557582ee23b6c43719d9890fb4170ecd91e110"; - }; - } { name = "psl___psl_1.8.0.tgz"; path = fetchurl { @@ -5353,14 +4009,6 @@ sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } - { - name = "pump___pump_2.0.1.tgz"; - path = fetchurl { - name = "pump___pump_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; - sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; - }; - } { name = "pump___pump_3.0.0.tgz"; path = fetchurl { @@ -5369,22 +4017,6 @@ sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; }; } - { - name = "pumpify___pumpify_1.5.1.tgz"; - path = fetchurl { - name = "pumpify___pumpify_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; - sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; - }; - } - { - name = "punycode___punycode_1.4.1.tgz"; - path = fetchurl { - name = "punycode___punycode_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - } { name = "punycode___punycode_2.1.1.tgz"; path = fetchurl { @@ -5401,14 +4033,6 @@ sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; }; } - { - name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; - path = fetchurl { - name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; - sha1 = "bb5b699ef7f9f0505092a3748be4464fe71b5819"; - }; - } { name = "qs___qs_6.5.2.tgz"; path = fetchurl { @@ -5417,14 +4041,6 @@ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } - { - name = "query_string___query_string_6.10.1.tgz"; - path = fetchurl { - name = "query_string___query_string_6.10.1.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-6.10.1.tgz"; - sha1 = "30b3505f6fca741d5ae541964d1b3ae9dc2a0de8"; - }; - } { name = "queue_microtask___queue_microtask_1.2.3.tgz"; path = fetchurl { @@ -5433,14 +4049,6 @@ sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; }; } - { - name = "qw___qw_1.0.1.tgz"; - path = fetchurl { - name = "qw___qw_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz"; - sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; - }; - } { name = "rc___rc_1.2.8.tgz"; path = fetchurl { @@ -5449,14 +4057,6 @@ sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } - { - name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; - path = fetchurl { - name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz"; - sha1 = "87e43eba50098ba5a32d0ceb583ab8e43b961c16"; - }; - } { name = "read_config_file___read_config_file_6.2.0.tgz"; path = fetchurl { @@ -5466,51 +4066,11 @@ }; } { - name = "read_installed___read_installed_4.0.3.tgz"; + name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; path = fetchurl { - name = "read_installed___read_installed_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz"; - sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; - }; - } - { - name = "read_package_json___read_package_json_2.1.1.tgz"; - path = fetchurl { - name = "read_package_json___read_package_json_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz"; - sha1 = "16aa66c59e7d4dad6288f179dd9295fd59bb98f1"; - }; - } - { - name = "read_package_tree___read_package_tree_5.3.1.tgz"; - path = fetchurl { - name = "read_package_tree___read_package_tree_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz"; - sha1 = "a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"; - }; - } - { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - } - { - name = "read_pkg___read_pkg_2.0.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - } - { - name = "read___read_1.0.7.tgz"; - path = fetchurl { - name = "read___read_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz"; - sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; + sha1 = "2dcb24d9e8dd50fb322042c8c35a954e6cc7ac9e"; }; } { @@ -5529,14 +4089,6 @@ sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } - { - name = "readable_stream___readable_stream_1.1.14.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_1.1.14.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - } { name = "readdir_glob___readdir_glob_1.1.1.tgz"; path = fetchurl { @@ -5545,14 +4097,6 @@ sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; }; } - { - name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; - path = fetchurl { - name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz"; - sha1 = "8d45407b4f870a0dcaebc0e28670d18e74514309"; - }; - } { name = "readdirp___readdirp_3.6.0.tgz"; path = fetchurl { @@ -5570,35 +4114,19 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; + name = "regexpp___regexpp_3.2.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; }; } { - name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; path = fetchurl { - name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; - sha1 = "d7446815433f5d5ed6431cd5dca21048f66b397e"; - }; - } - { - name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; - sha1 = "30e55961eec77379da551ea5c4cf43cbf03522be"; - }; - } - { - name = "registry_url___registry_url_3.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; }; } { @@ -5609,14 +4137,6 @@ sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; }; } - { - name = "request___request_2.88.0.tgz"; - path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; - }; - } { name = "request___request_2.88.2.tgz"; path = fetchurl { @@ -5641,22 +4161,6 @@ sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; }; } - { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - } - { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; - }; - } { name = "resolve_from___resolve_from_4.0.0.tgz"; path = fetchurl { @@ -5665,14 +4169,6 @@ sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; }; } - { - name = "resolve___resolve_1.13.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz"; - sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16"; - }; - } { name = "responselike___responselike_1.0.2.tgz"; path = fetchurl { @@ -5681,14 +4177,6 @@ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; }; } - { - name = "retry___retry_0.10.1.tgz"; - path = fetchurl { - name = "retry___retry_0.10.1.tgz"; - url = "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; - }; - } { name = "retry___retry_0.12.0.tgz"; path = fetchurl { @@ -5737,14 +4225,6 @@ sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; }; } - { - name = "run_queue___run_queue_1.0.3.tgz"; - path = fetchurl { - name = "run_queue___run_queue_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; - }; - } { name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { @@ -5793,14 +4273,6 @@ sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; }; } - { - name = "semver_diff___semver_diff_2.1.0.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; - }; - } { name = "semver_diff___semver_diff_3.1.1.tgz"; path = fetchurl { @@ -5825,22 +4297,6 @@ sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } - { - name = "semver___semver_7.3.2.tgz"; - path = fetchurl { - name = "semver___semver_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; - sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; - }; - } - { - name = "semver___semver_7.3.4.tgz"; - path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; - }; - } { name = "semver___semver_7.3.5.tgz"; path = fetchurl { @@ -5873,22 +4329,6 @@ sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; } - { - name = "sha___sha_3.0.0.tgz"; - path = fetchurl { - name = "sha___sha_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/sha/-/sha-3.0.0.tgz"; - sha1 = "b2f2f90af690c16a3a839a6a6c680ea51fedd1ae"; - }; - } - { - name = "shebang_command___shebang_command_1.2.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - } { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { @@ -5897,14 +4337,6 @@ sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; }; } - { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - } { name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { @@ -5914,11 +4346,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { @@ -5945,14 +4377,6 @@ sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; }; } - { - name = "slide___slide_1.1.6.tgz"; - path = fetchurl { - name = "slide___slide_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - } { name = "smart_buffer___smart_buffer_4.1.0.tgz"; path = fetchurl { @@ -5962,35 +4386,19 @@ }; } { - name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz"; - sha1 = "3c8991f3145b2799e70e11bd5fbc8b1963116386"; + name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; + sha1 = "032fb583048a29ebffec2e6a73fca0761f48177e"; }; } { - name = "socks___socks_2.3.3.tgz"; + name = "socks___socks_2.6.1.tgz"; path = fetchurl { - name = "socks___socks_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz"; - sha1 = "01129f0a5d534d2b897712ed8aceab7ee65d78e3"; - }; - } - { - name = "sorted_object___sorted_object_2.0.1.tgz"; - path = fetchurl { - name = "sorted_object___sorted_object_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz"; - sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; - }; - } - { - name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; - path = fetchurl { - name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; - sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; + name = "socks___socks_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz"; + sha1 = "989e6534a07cf337deb1b1c94aaa44296520d30e"; }; } { @@ -6017,46 +4425,6 @@ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; }; } - { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; - }; - } - { - name = "split_on_first___split_on_first_1.1.0.tgz"; - path = fetchurl { - name = "split_on_first___split_on_first_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz"; - sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; - }; - } { name = "sprintf_js___sprintf_js_1.1.2.tgz"; path = fetchurl { @@ -6082,11 +4450,11 @@ }; } { - name = "ssri___ssri_6.0.2.tgz"; + name = "ssri___ssri_8.0.1.tgz"; path = fetchurl { - name = "ssri___ssri_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; - sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; + name = "ssri___ssri_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; + sha1 = "638e4e439e2ffbd2cd289776d5ca457c4f51a2af"; }; } { @@ -6097,38 +4465,6 @@ sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; }; } - { - name = "stream_each___stream_each_1.2.3.tgz"; - path = fetchurl { - name = "stream_each___stream_each_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; - sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; - }; - } - { - name = "stream_iterate___stream_iterate_1.2.0.tgz"; - path = fetchurl { - name = "stream_iterate___stream_iterate_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz"; - sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; - }; - } - { - name = "stream_shift___stream_shift_1.0.1.tgz"; - path = fetchurl { - name = "stream_shift___stream_shift_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; - sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; - }; - } - { - name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; - path = fetchurl { - name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; - sha1 = "b9c7330c7042862f6b142dc274bbcc5866ce3546"; - }; - } { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { @@ -6154,27 +4490,11 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; - }; - } - { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; - path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; - sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; - }; - } - { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; - path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; - sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { @@ -6185,14 +4505,6 @@ sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; }; } - { - name = "string_decoder___string_decoder_0.10.31.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_0.10.31.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -6201,14 +4513,6 @@ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; }; } - { - name = "stringify_package___stringify_package_1.0.1.tgz"; - path = fetchurl { - name = "stringify_package___stringify_package_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz"; - sha1 = "e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"; - }; - } { name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { @@ -6241,22 +4545,6 @@ sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } - { - name = "strip_bom___strip_bom_3.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - } - { - name = "strip_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - } { name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; path = fetchurl { @@ -6290,11 +4578,11 @@ }; } { - name = "supports_color___supports_color_7.1.0.tgz"; + name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; - sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; }; } { @@ -6337,14 +4625,6 @@ sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; }; } - { - name = "term_size___term_size_1.2.0.tgz"; - path = fetchurl { - name = "term_size___term_size_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; - }; - } { name = "text_table___text_table_0.2.0.tgz"; path = fetchurl { @@ -6353,30 +4633,6 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } - { - name = "through2___through2_2.0.5.tgz"; - path = fetchurl { - name = "through2___through2_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; - sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - } - { - name = "timed_out___timed_out_4.0.1.tgz"; - path = fetchurl { - name = "timed_out___timed_out_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; - }; - } { name = "timm___timm_1.7.1.tgz"; path = fetchurl { @@ -6385,14 +4641,6 @@ sha1 = "96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f"; }; } - { - name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; - path = fetchurl { - name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz"; - sha1 = "fa08aad501ed730f31cc043181d995c39a935e07"; - }; - } { name = "tinycolor2___tinycolor2_1.4.2.tgz"; path = fetchurl { @@ -6457,14 +4705,6 @@ sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; }; } - { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; - }; - } { name = "tough_cookie___tough_cookie_2.5.0.tgz"; path = fetchurl { @@ -6489,6 +4729,14 @@ sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } + { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha1 = "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"; + }; + } { name = "tsutils___tsutils_3.21.0.tgz"; path = fetchurl { @@ -6578,27 +4826,11 @@ }; } { - name = "typescript___typescript_4.3.4.tgz"; + name = "typescript___typescript_4.3.5.tgz"; path = fetchurl { - name = "typescript___typescript_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz"; - sha1 = "3f85b986945bcf31071decdd96cf8bfa65f9dcbc"; - }; - } - { - name = "uid_number___uid_number_0.0.6.tgz"; - path = fetchurl { - name = "uid_number___uid_number_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; - }; - } - { - name = "umask___umask_1.1.0.tgz"; - path = fetchurl { - name = "umask___umask_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz"; - sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + name = "typescript___typescript_4.3.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz"; + sha1 = "4d1c37cc16e893973c45a06886b7113234f119f4"; }; } { @@ -6617,14 +4849,6 @@ sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; }; } - { - name = "unique_string___unique_string_1.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; - }; - } { name = "unique_string___unique_string_2.0.0.tgz"; path = fetchurl { @@ -6641,14 +4865,6 @@ sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; }; } - { - name = "universalify___universalify_1.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz"; - sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d"; - }; - } { name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { @@ -6657,14 +4873,6 @@ sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; }; } - { - name = "unpipe___unpipe_1.0.0.tgz"; - path = fetchurl { - name = "unpipe___unpipe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - } { name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { @@ -6681,22 +4889,6 @@ sha1 = "d5324147b104a8aed9ae8639c95521f6f7cda292"; }; } - { - name = "unzip_response___unzip_response_2.0.1.tgz"; - path = fetchurl { - name = "unzip_response___unzip_response_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; - }; - } - { - name = "update_notifier___update_notifier_2.5.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; - sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; - }; - } { name = "update_notifier___update_notifier_5.1.0.tgz"; path = fetchurl { @@ -6706,19 +4898,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; - }; - } - { - name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -6753,38 +4937,6 @@ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; } - { - name = "util_extend___util_extend_1.0.3.tgz"; - path = fetchurl { - name = "util_extend___util_extend_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; - sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; - }; - } - { - name = "util_promisify___util_promisify_2.1.0.tgz"; - path = fetchurl { - name = "util_promisify___util_promisify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz"; - sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; - }; - } - { - name = "util.promisify___util.promisify_1.0.0.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; - sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; - }; - } - { - name = "uuid___uuid_3.3.3.tgz"; - path = fetchurl { - name = "uuid___uuid_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; - sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; - }; - } { name = "uuid___uuid_3.4.0.tgz"; path = fetchurl { @@ -6794,19 +4946,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { @@ -6833,30 +4977,6 @@ sha1 = "60ec8631cfd23276ae1e7363ce11d626452e1ef3"; }; } - { - name = "wcwidth___wcwidth_1.0.1.tgz"; - path = fetchurl { - name = "wcwidth___wcwidth_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - } - { - name = "which_module___which_module_2.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; - }; - } { name = "which___which_2.0.2.tgz"; path = fetchurl { @@ -6873,14 +4993,6 @@ sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; }; } - { - name = "widest_line___widest_line_2.0.1.tgz"; - path = fetchurl { - name = "widest_line___widest_line_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz"; - sha1 = "7438764730ec7ef4381ce4df82fb98a53142a3fc"; - }; - } { name = "widest_line___widest_line_3.1.0.tgz"; path = fetchurl { @@ -6905,30 +5017,6 @@ sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } - { - name = "worker_farm___worker_farm_1.7.0.tgz"; - path = fetchurl { - name = "worker_farm___worker_farm_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; - sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; - }; - } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - } - { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; - }; - } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -6946,27 +5034,11 @@ }; } { - name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; - sha1 = "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"; - }; - } - { - name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz"; - sha1 = "558328352e673b5bb192cf86500d60b230667d4b"; - }; - } - { - name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; }; } { @@ -6978,11 +5050,11 @@ }; } { - name = "xhr___xhr_2.5.0.tgz"; + name = "xhr___xhr_2.6.0.tgz"; path = fetchurl { - name = "xhr___xhr_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz"; - sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; + name = "xhr___xhr_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz"; + sha1 = "b69d4395e792b4173d6b7df077f0fc5e4e2b249d"; }; } { @@ -6994,11 +5066,11 @@ }; } { - name = "xml2js___xml2js_0.4.22.tgz"; + name = "xml2js___xml2js_0.4.23.tgz"; path = fetchurl { - name = "xml2js___xml2js_0.4.22.tgz"; - url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz"; - sha1 = "4fa2d846ec803237de86f30aa9b5f70b6600de02"; + name = "xml2js___xml2js_0.4.23.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz"; + sha1 = "a0c69516752421eb2ac758ee4d4ccf58843eac66"; }; } { @@ -7042,27 +5114,11 @@ }; } { - name = "y18n___y18n_3.2.2.tgz"; + name = "y18n___y18n_5.0.8.tgz"; path = fetchurl { - name = "y18n___y18n_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz"; - sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696"; - }; - } - { - name = "y18n___y18n_4.0.3.tgz"; - path = fetchurl { - name = "y18n___y18n_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; - sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; - }; - } - { - name = "y18n___y18n_5.0.5.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; - sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; }; } { @@ -7073,14 +5129,6 @@ sha1 = "1d195c78aa9b5bf8479c895b9504fd4f0847984e"; }; } - { - name = "yallist___yallist_2.1.2.tgz"; - path = fetchurl { - name = "yallist___yallist_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; - }; - } { name = "yallist___yallist_3.1.1.tgz"; path = fetchurl { @@ -7098,35 +5146,11 @@ }; } { - name = "yargs_parser___yargs_parser_15.0.1.tgz"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_15.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz"; - sha1 = "54786af40b820dcb2fb8025b11b4d659d76323b3"; - }; - } - { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; - sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; - }; - } - { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - } - { - name = "yargs___yargs_14.2.3.tgz"; - path = fetchurl { - name = "yargs___yargs_14.2.3.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz"; - sha1 = "1a1c3edced1afb2a2fea33604bc6d1d8d688a414"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } { @@ -7137,14 +5161,6 @@ sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; }; } - { - name = "yargs___yargs_8.0.2.tgz"; - path = fetchurl { - name = "yargs___yargs_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - } { name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index a45ead37efb..0d35372ecc4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.33"; + version = "1.7.34"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-1JmuKyJt6Q80lLXXrFw+h6/0JzWcr0qMIU9mTO+K56I="; + sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 0a0363860d1..8b14820656a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.33"; + version = "1.7.34"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-MhbXvl+FUCL6D6y2Oa5Kf5ie9fU85wEO/tQe881CD8I="; + sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30="; }; installPhase = '' From f73b3543b5113c2fee419ec903864503ecb10b1a Mon Sep 17 00:00:00 2001 From: Malte-Christian <3236302+malte-christian@users.noreply.github.com> Date: Mon, 2 Aug 2021 17:30:29 +0000 Subject: [PATCH 1225/1522] verifpal: 0.13.7 -> 0.26.0 (#132429) --- pkgs/tools/security/verifpal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 930b44cb4c6..d65d3512272 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "verifpal"; - version = "0.13.7"; + version = "0.26.0"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; rev = "v${version}"; - sha256 = "1ia3mxwcvcxghga2vvhf6mia59cm3jl7vh8laywh421bfj42sh9d"; + sha256 = "1ag1fpgk4xa5041y6a0pchmh32j876bl0iqjb7lxxqg5nc76d3v1"; }; - vendorSha256 = "0cmj6h103igg5pcs9c9wrcmrsf0mwp9vbgzf5amsnj1206ryb1p2"; + vendorSha256 = "XHeXonzRDHXayge5G3apvDarbOfTiV+UQ+IqSbrLkCk="; doCheck = false; From 3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= <andre.vmatos@gmail.com> Date: Mon, 2 Aug 2021 17:42:47 +0000 Subject: [PATCH 1226/1522] nvidia_x11: fix suspend script paths since 470.57.02 (#131838) nvidia 470.57.02 changed the path of `nvidia-sleep.sh` and systemd scripts, making `builder.sh` miss them and suspend-to-ram on systems where `hardware.nvidia.powerManagement.enable = true` is set fail. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index e6ad62b1128..448e91986fc 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -46,11 +46,17 @@ installPhase() { fi # Install systemd power management executables + if [ -e systemd/nvidia-sleep.sh ]; then + mv systemd/nvidia-sleep.sh ./ + fi if [ -e nvidia-sleep.sh ]; then sed -E 's#(PATH=).*#\1"$PATH"#' nvidia-sleep.sh > nvidia-sleep.sh.fixed install -Dm755 nvidia-sleep.sh.fixed $out/bin/nvidia-sleep.sh fi + if [ -e systemd/system-sleep/nvidia ]; then + mv systemd/system-sleep/nvidia ./ + fi if [ -e nvidia ]; then sed -E "s#/usr(/bin/nvidia-sleep.sh)#$out\\1#" nvidia > nvidia.fixed install -Dm755 nvidia.fixed $out/lib/systemd/system-sleep/nvidia From 8a42a17c7fad28b555ee5acab87357a810d9afd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Thu, 29 Jul 2021 16:15:13 -0300 Subject: [PATCH 1227/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 372 ++++++++++++++-------------- 1 file changed, 186 insertions(+), 186 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b2d5a726fa2..13caad4b8ad 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-23"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "530b38de342a21cce330a32af0c1b66671d335c2"; - sha256 = "1qvdywgn79fvjdyk2bj7ym9fa65l96dcnp69yhravb9rinrawb5i"; + rev = "dce088a4f07c55f7cff4eef90224fa85aa402877"; + sha256 = "17i58pfyq9950pkjcaiknx2bmp34x2sc3vswjpxj905d0ni36z9d"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -113,12 +113,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-06-01"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "804099202b72ffd4bf4ea4ce24d8d7bac8b9ae2d"; - sha256 = "0p93g0zi8j6bf5zh0ng9vdl9f76dan524g22jpb8c0xmm6ywns5l"; + rev = "40e28ee318b968c09a1724cd25cd450330b136c9"; + sha256 = "09fcn2mdi05alhzkk89namymk7lryycb303nah9i63km39h5rs12"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-25"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "393fbc24cab3fdfaffca85e286e01c84bcf748c9"; - sha256 = "08pcp6dh6kibppndf97nzj90iw1qv51s4zk3vq59z16w32zwkzda"; + rev = "75fa52709d1eb4a981075ef7e3cb9e220cc45bf3"; + sha256 = "0syb3f0m7d5pv4ikj7ss8c81vzz0a71axfplvs9i9z9q1qrp3jkj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -569,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-22"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "479b4ac1d09cec838a232e49ad54b79f2217ad4c"; - sha256 = "0lxpcyvgii8xal6s16aw6y4430709xsba3kn1jwm1lbnrz5mhqwb"; + rev = "bdd11f8bfbe38522e20e49c97739d747c9db5bcf"; + sha256 = "0a3y0ldj6y7xc3nbkzj2af1zs430z69wkzf5y8mcgxcavfg3krz4"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -690,12 +690,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-19"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "82d2139de0279a20a70da61320042adf31b94798"; - sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5"; + rev = "d0256c802411e0e76c979e2b7e150f4f8a71a6b0"; + sha256 = "1crryfvkr9f2dnva565m23cy0v0hz7jkc0ck110ya3ib2r929pmx"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -798,12 +798,12 @@ final: prev: context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2021-06-05"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "eca5b28dca1bace3b5694eb20b3ab244f65180e0"; - sha256 = "0n0av5x6js5ld4xnlq5nh18cdwhvrljdsx17gq2sf54q342hlwp0"; + rev = "89496f3c110d907605319355ea9fc2a560827719"; + sha256 = "09shjaxqr71nfq4yj15xkvkh204l7fjr7na0cyx3k3mflmldha8w"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -846,12 +846,12 @@ final: prev: cpsm = buildVimPluginFrom2Nix { pname = "cpsm"; - version = "2020-08-01"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "nixprime"; repo = "cpsm"; - rev = "42cfb0f83083b33640619c208341629bff67bd8a"; - sha256 = "0wcq442wj73ra0agflljjkhcwlma7r703l7l9hn7zd8wfb4iv48s"; + rev = "814961aef3eba4412e5e63342575c46f87eaead4"; + sha256 = "13qp6qaghaw355wjwmmd8d7cakb3ry9ijpnz06mj8yza50w7p3fx"; }; meta.homepage = "https://github.com/nixprime/cpsm/"; }; @@ -1316,12 +1316,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-22"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "dea0e244bca3a89479e9225b531a319cd812cd52"; - sha256 = "0gf1x10ix3p6ls1g1cbx57fxd5ln13p3abhv52wqy2gkdl3syvw4"; + rev = "2411f5303192a9c8056ec174fb995773f90b52b8"; + sha256 = "03ssikggkymsxwvf5c9w7w9jv4b0ivk25p3b0i0lwvw3fpzdbsgn"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1388,24 +1388,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-19"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2"; - sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b"; + rev = "d80cb807ab6101567862e99568c13a7b6093f2f7"; + sha256 = "031lrwzipamm1sbr7kjmisfya35p2magvaq5i919ncnjpvfcmgws"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2021-07-20"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "1c4f781f2439469e5342217131886260c9445fc6"; - sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8"; + rev = "3078cd10b28904e57d878c0d0dab42aa0a9fdc89"; + sha256 = "1zjwhg3g56skqi9lndjhn9fh8hr478yvns8xz9xpnzcgzdaqbi1w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1522,12 +1522,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; - version = "2021-07-24"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "fb51d6ba6363d10d6fc9e14d0fcef09fd402e431"; - sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; + rev = "cfc0ecfd5e6d37e45ca5102e76cbbbc8f5a03d26"; + sha256 = "03qjlbby7ayy7q4wasz6k3blvfwy2ph7nvw3zmfw8rwmb2n7w6hc"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1643,12 +1643,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter-nvim"; - version = "2021-07-15"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "9efa18bc9552a8b2a00644f79d41f279be322e45"; - sha256 = "0hfq580ng3wlzkc9g44pz1ciwa9ax46ylka3s3y4v79szhviykby"; + rev = "51f10c8acc610d787cad2257224cee92b40216e5"; + sha256 = "15jkrypcd3fa6vcz035yvcpd1rfrxcwvp93mqnihm0g1a74klrql"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1703,12 +1703,12 @@ final: prev: fwatch-nvim = buildVimPluginFrom2Nix { pname = "fwatch-nvim"; - version = "2021-04-26"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "rktjmp"; repo = "fwatch.nvim"; - rev = "5fd6bff00d7fa432cdc847819563dad90bcf649d"; - sha256 = "1jc3kv0w3767593p9capif3p0msf8ac5xal170757ghfiy2jhsp9"; + rev = "83600d71e7d7dd73194375adcea938789a41249a"; + sha256 = "1kqmyqzx4g45dayhbbck4bavfdr2y41lwjdv5z4bwd9hqys7s4rz"; }; meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; @@ -1871,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-23"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "22a1d6db29a2c6b485a48512d2c38ac84d6a78bb"; - sha256 = "1dxz6zjhf2z4n2pqdk95ifdj379fravfr55k401plgy223hmpkip"; + rev = "0d45fff0a28cebdc87604117c0fc46f3a64550f6"; + sha256 = "11mbcblgzsp7mzsy1knjd3cjcl60x45d57jf2nbcnf0ml312m1qc"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2003,12 +2003,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-07-05"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "ac0948e28203cba5d0510cf3443906228645e3eb"; - sha256 = "0g9j2gqsgx7la96xhc72l7rb535phqjpb5mva191wjfn13j0hkda"; + rev = "05da7d5a8199522c27ad746e655593b5933fe5d0"; + sha256 = "1dnpc83sv49gs5i9xbyj7m0cgfbjahsy5fxpgy5a79yj0czphid7"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2616,12 +2616,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-16"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "62f02aabce3b5af190cf113d5bdf4a8271a966c3"; - sha256 = "1cckxvr035vsall3891j60yc1a12p8q63rjnm7ac1wzdhh7d8c38"; + rev = "98841f4c3262214513f4f0de7d944d8384d50803"; + sha256 = "0d0kwip2yds2m25q3f5mmrsqk8jmv3zl17mvg1jbdwmklyqwkk9f"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2700,12 +2700,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-19"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e"; - sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33"; + rev = "9fcc1de38e861a42433ec25c3513b4c2f98d2422"; + sha256 = "0sgh7nz3w7whfyvwwbpi610svwdq95wbr3awx17sjvvxhp5pcavj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2760,12 +2760,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-24"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e9f4d03aaacc8af6ebd17833dfb5804a6abbd021"; - sha256 = "0k86j2rq5ykav8i6gna91v893j4panyr7l2cyp6vrrkj441bx5ww"; + rev = "631a1551c9e0d983e9545d37c79fb024f4680a83"; + sha256 = "0jiq37bfn8wpbrk62xrknglfkh3hbsx325crgg7amsk0bkhi8nav"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3108,12 +3108,12 @@ final: prev: neco-look = buildVimPluginFrom2Nix { pname = "neco-look"; - version = "2019-11-19"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "ujihisa"; repo = "neco-look"; - rev = "4d7f1fd7e406c302fba2a1358017c5a76d0f9fc1"; - sha256 = "1brvzg15ni5j60wncpvxhs5k36wz83lhvfcnvja2l9yrngcgh6vr"; + rev = "d98e550b741265fa8ca2b18f51c19adb2d3ff00a"; + sha256 = "01bb5d3n7k7m5gd1rn78qhrjf9cvsccwib390zh0h22aryswzqnx"; }; meta.homepage = "https://github.com/ujihisa/neco-look/"; }; @@ -3336,12 +3336,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-05-29"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "a5d1663185bee20bfb120c9ab212144444514982"; - sha256 = "03799774h9f7k52gwjnhjjm2w9s6ip5zdrpljinwp6lfavxd4w8a"; + rev = "85364c56c4d85af69ac6c57262b40812a77be1e4"; + sha256 = "0qvy4ragn5f93ckmnph5zb90yfp7sv47zhz68f9cmvfrvc8hfa6i"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -3360,12 +3360,12 @@ final: prev: nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2021-06-04"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "bca0ed63883d028e6afc7f11a78c56fcaf34d363"; - sha256 = "1j5llx2l36hgr10mjjdrp8xdv9mhmc6panpjgdxzdg5ncwn4ndzm"; + rev = "ff9b14f14dceecb6c08cb05053ad649c3b6ac250"; + sha256 = "1q2zjbg3j4j4746ljp2ccssgp2sykrn3zp4kyc9n0hlqaiwmhbm9"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3420,12 +3420,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-06-07"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "abf700104c0450bac10be3ece613ff88997f47e4"; - sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s"; + rev = "9de4725aff31c196602274ab9521ac740c9c801f"; + sha256 = "0fjws1k352ij01gfz3dr5r5x5h8r3lh4s6bfz2apjc4m47nghiy7"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3480,12 +3480,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-24"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "52286ee4d11016b3366481935c12211c44d43777"; - sha256 = "0lf0d2b2yajjv39l9zy0h5cmrnah8ig7fk3ckmlpvcfhrlqry9j8"; + rev = "7c50ca73dc2f89b128f1c42a4e04144d1213e7dc"; + sha256 = "1qd7hmsxcn6w5fvqn28nb48xp33nl2hzgvh0fy12mzyq39d0n6ld"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3528,12 +3528,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-24"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e3e105b11a3b34e93bdcee0c895801cf3ed2a835"; - sha256 = "0pgg4xvq0dxn4rzip7nzzy1sscm8v1fixkwlpr9jdbp86s9kkq87"; + rev = "ad40d49f4512cf77c6527cb6aa9ee6b1c97855c9"; + sha256 = "0qmdyr26va3il80lb166n0cadkxxq1vf0q56zj6vqihv4rn9nas5"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3564,24 +3564,24 @@ final: prev: nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2021-05-21"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "9a1f0f3ed55db86f66ad87f72639269ac1374169"; - sha256 = "0f10pik2msm7rdi9lx9ll7jgh1gk9y3q8756ri6jdzk4bwd8j4is"; + rev = "17d17a4b16e5b5a7403470a8b5afc10772d4e84a"; + sha256 = "1x14kiwklrnd264ihib84x2l3xgdshnv7yxvjdia5rdsvxny4kvb"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-22"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "789c204cbec3ec060eb345a8820c3788c0ac4335"; - sha256 = "14h1h47fijw4r76pdav6p3nrl4chhf6l4vmml89chill34lspdab"; + rev = "7bf463cf7c61faa9f24222bba9412230d4cc1dc7"; + sha256 = "12x4lnhxv2sij47drrdxxk814hsmghfz7sv8fc2c5wbbdg9ygg5a"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3636,48 +3636,48 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-24"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "b557bf8d503c966a4233a72449a80ebcaaed5415"; - sha256 = "0p6jq9a6xgbxpjcffm6bk88aicqg05cnk0an5j0cy60s7hp5vvv7"; + rev = "c8a5ec7ec32c1fe1697437ad83bd26ba3b997abd"; + sha256 = "07qy81zpdh0wnxmiawj2yfbyvbvswvrlgj8pm95fwy7fvr7gbrnk"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-07-24"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "10a57a6b6973661d7082589df3bafc949f004346"; - sha256 = "10w6wxn3gf3pn6xw9ws05pxqp4a4ssg252bq7bsq8xys9saf12gy"; + rev = "0b5f6cf6da0884d0788239d9270a2bd89855ec09"; + sha256 = "04ha4zjjb78i98vn21v404g3fki77mwax7lq5w1hmmsp4qxmyv5k"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-06-12"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "c07c23f52e1019b237927f9520c691e57adb9e6a"; - sha256 = "0pa1xjp6h5ny7lnql8nsqszx0gpzc1fa9xiksq3k1k5yjjj4wm1z"; + rev = "ebd0a7850432e2c9b9651b8e4091e74e59604c77"; + sha256 = "17z8g124cg3m28fn418d3rgia6aa44xyw70h7kkl0w1xpa908n03"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-06-07"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "53bfce7a254651469ce9577349811bc76d9af46c"; - sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz"; + rev = "388d1f952cf849d8ff066f87c13d7d162ae49e89"; + sha256 = "001s0g80kv1xx6zjza0nai0x10p7j0ysvf31xm6clbl2r023zv2h"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3720,12 +3720,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-07-12"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "391e55bb5f90bc23e47c3b57eed6c6fcc95b0e7f"; - sha256 = "1djjdllr1klzy9yggkwmv7cv8gcpyb96mw1c9qfq9vdi5fmhcsyn"; + rev = "e5ed033f610837c1b145c904063ef7164ae1c435"; + sha256 = "1ga7k2rhhlkd97157qq2symmck6ygrc8mfvpn0w4pqgpgw54dyfq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3744,12 +3744,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-24"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "00028be5527abbc829ae8263cb3319dcae08e8ec"; - sha256 = "17vxq8b70v9kq7labi3di0r6rgdhf4vz4mkiw6ji26pa60bfxy8w"; + rev = "3df7c2afa4e6e5c9e9c9f85ab275837248ed7db4"; + sha256 = "16krk21g2r45h9hds2jpgplchqzcqgpqg6pdw89pvzx3b5qazab2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3792,12 +3792,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-07-20"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96"; - sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5"; + rev = "53d9d8057ca33151e0dfe5c3e31021ab2461831f"; + sha256 = "059ww0s49li41wy7l48xg33nj3vsp36ksbadhzpzbykxs2kwdqfj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3816,12 +3816,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-22"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "895f8e2485267640ccd11fe3fbf1ab5fe178bc4c"; - sha256 = "1jmg13618r9yxidb2y6fs1y342qqnqa19m1srfkczsxgqr89wrsh"; + rev = "f9ffba63cc77837edaceae61a5b9de6e77c88e7f"; + sha256 = "0j5znzrpmxmzkb2l2rpp9iaxggmnjz5lns648a67x1bkilcrmnx4"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3840,12 +3840,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-24"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "296fe9b8611061a1054c05922dbaa134f2b712b2"; - sha256 = "0qxdd3z4696xf3nnaxmww3gs0ijfi2bw5aq9ywnqxpb3n734iapd"; + rev = "dedd74ebdbb8a921d95e3c670be9684d9f655c34"; + sha256 = "1bkakcshw8f5j1iq4hm723jyc9dwwixa4fz5hb32wl7mxxqh9x82"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3888,36 +3888,36 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-07-20"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "7f36db566c66998e04ea569723174c42d8190903"; - sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx"; + rev = "04a3fbe657581f6f45c0bb11735a6a4bcecdc46f"; + sha256 = "1widam8cji1l7z628gsv3s15iid5jfq83df62iamfcjrbxzqcw56"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-23"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "fabcc1ac8392cc9a5beae8020b6c80538a725077"; - sha256 = "1a3871n3kwvwgz40a74c74lyy5p2l4rih75asb6rnjrrknkk47fb"; + rev = "dab7f11a14155fbc6076dccbb48cb7ab14bcbde5"; + sha256 = "00bcbkskfigf3c83b28zgckiafh3xlv7azrw492ardf4ks3zdv79"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-05-19"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "da717e19678bd6ec33008cf92da05da1b8ceb87d"; - sha256 = "0jvvjpbxdgch0wvgdmihkqng84rwifq74q858cvfahrx3y5y1cnw"; + rev = "80ec3ba1aa3fd4005c4679b7b03da37435bc1654"; + sha256 = "1pmg2qp6sdk2ijcav4s1la1zax05cwd9vvbrr3s283lqsqwzflax"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4056,12 +4056,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-25"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "92dcbe5b1052c2cec1b5455a624710dd1e899777"; - sha256 = "0mh3ghbz38inwlcv4sqrpmyzwxr62j10d4873p9d5zb6j68ajxn9"; + rev = "637520cbd85629bfee9e8bd2eb15d775d4c85373"; + sha256 = "03s35f49lasx5bxigsd5miqfkm2jdz6mh72y9hllk8rzimi59agz"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4152,12 +4152,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-07-13"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "2715d35f27cbdfe6231e48212d12be383013f442"; - sha256 = "0z1vlsdmhlw6pbga9nypsihzjybglyr8is3maqbyqswrmz1yg87h"; + rev = "deb887b3f49d66654d9faa9778e8949fe0d80bc3"; + sha256 = "10jlgsqkplisa1fd7i36yb46fdsa0cx069bpwp2yl4ki2jys953j"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -4213,12 +4213,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-07-23"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "a695e5d653e3a864e11a5ad777e1274eaae90494"; - sha256 = "0ahvklrll8wswzzhqqc6qqp1f023njrkqbry439l8s21zsnq63dh"; + rev = "f2a0dd50c67a62cea144775a120c1246a645f5ed"; + sha256 = "08di6dfzvn2jzr4ym2ikcf036ycm2pi4s4qwn36nfxyg3zbii71q"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4501,12 +4501,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-24"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "27e1555146331f42ebb07fb7ba0a196b75e03dde"; - sha256 = "13dr30nifxrkjj7rf8dyv9p942dinjcpiy24sbfwni2ibmyf2p52"; + rev = "858bb2a293e74b7c45b281491afd8e67cd8810c6"; + sha256 = "1sjyffv375j1jgkhhpmbg880dvakn2ckw8h5a0wpvyxaqd84yrpv"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4730,12 +4730,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-19"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd"; - sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn"; + rev = "f4f43c13af9d1dfb5bbe7c43d76de27d2af2d1cd"; + sha256 = "1yqqgckjg7hr8q33q49rxf678crl8dk9avs56h9yrgi0f8zs90qk"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4863,12 +4863,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-22"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "e47e911d4fba1c584cfb31dd710c1f2a03961561"; - sha256 = "0bb1bsswffp45g38fn41dcbr5dx2gfaz1xhr470h5ln7ywkwv2hi"; + rev = "9a34db8c7e1eda84754420eaced9fdf00f43a929"; + sha256 = "1nh6zwx4lcyx8vdvdfr04z5vwvpcbg8ns2pfxmcgjpcajhawg3nx"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4959,12 +4959,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-07-21"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6a51c637dd8deb4c1e398932651b3a635d1694e2"; - sha256 = "1hxdklzbci1cxaq6mvy6f2zih8cxyp4s8y6yrnz9w2587pxh0c7j"; + rev = "81c615a9f108093b64b2b8f1b30837a34a8486cc"; + sha256 = "1dqgxl7748mvagz3s58hfqb0yxwqx2vww1402zw20qv9736kcfsv"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5044,12 +5044,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-06-24"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "2da3443f5fb78aa0b9a60bb5b2926d72df734e14"; - sha256 = "0xihnfp1jv3ixhinqvnfig1v5k8swf3vcqjavspchd94lnb4b2h4"; + rev = "a0a5714910d29ac3bfe91a2529a9c8cb28de77cc"; + sha256 = "0y31fi2103ggv5s2lg9wqxvc0xghh3i3iwhzrwxylvimajcv4s0f"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5189,12 +5189,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-23"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c0f1999b0280bb042bba01c930dd94a4bfdee363"; - sha256 = "13igy3nph7vg1pnq7hjvql71i0031xdxgkiyd1h38chcs7whvxzf"; + rev = "82f4d3028b64ad930123a5c713c538c872185a80"; + sha256 = "08dv4vxa8rn5xbdakv9j4vd1287bpdgckzayl3bmy4rn9djmk8vs"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5418,12 +5418,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-06-15"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "aec91caefec10741722927cf073703a528fe7a8f"; - sha256 = "1a5527adkaawgcj1pm5qp0qiq084x70ljj7a35abjil20f3s7y85"; + rev = "8803960a4e09daf1ad4d82e16a25bbdb4c78530e"; + sha256 = "09d86328387f0qvrn3afh69889bcc67n3fxqxysxfrsifwsxqy74"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5814,12 +5814,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-07-10"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "9be0a3c46a45c7a790022e5e3e293635469446fb"; - sha256 = "16xgidkd2v2g5zljfpdx82nai7cxq4nzw1irdfsdllv4ns9q27si"; + rev = "aeea4d67e377659077d7db99cf3c582211e941eb"; + sha256 = "07lyyxhf79mwlwrkyp9yq61nfvj2mb2xhcf3gb60adwy7qxcfl2k"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -6066,12 +6066,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-22"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "111ef624c0d39fe5fcf869fba01c16036e106fbd"; - sha256 = "0xgdvk362fk6491pk5dv46a2cg77gk57gk6dvhzf3ldi5zshckfj"; + rev = "5fa131dc95a7b3e03fa1307802b3a43419571921"; + sha256 = "10viqhmyvw8lik53gbslfxfsv36f1vl8qi0vzn7zi6waqdrr3n79"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6402,12 +6402,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-07-16"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0a11dae811e6c8b939fe80aeb750469f8ca44d67"; - sha256 = "07lgjzi10h1gfvr2ij1pc4qxj63n4bg3jvj01ilj6yas56a3hk09"; + rev = "aa13718e367c44d27a784291a546923eb562fd2a"; + sha256 = "0vvdjqickp1c13ixkams6yayqasrz05r6bqqfb4qbwpqmispvwkl"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -6666,12 +6666,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2021-04-05"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "dbbbf853fc523d312f61b4bbdf2e13297645dcde"; - sha256 = "0lwkzxz76pcmash56p14pf54blz9v9kw17qj2i5wa8wdcymia98l"; + rev = "e8b1be581b88de524fc62cd24265d602f8caac19"; + sha256 = "08gcwnayp6k0xm62rrw6zqkdacs3mng2h29vnbpfgsviazxa6b85"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -6846,12 +6846,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-24"; + version = "2021-07-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "75b2a9a8daf6589f9747ff4f2d068fdea54e92ea"; - sha256 = "1c265bq5a60y7ndpvwdn54kdzb6spdfnkfdaffp47rgq0y1pfphj"; + rev = "058ffa406d8013ab8431b7543ae29dec72fd24e5"; + sha256 = "1gnc4cxdq3srfbzl9v9cgbj7yyr5mjn5gnggr6af69q7ps7f81dg"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7773,12 +7773,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-24"; + version = "2021-07-25"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "8ae49bf65c960f6260f2d475b35b068bc6b822f2"; - sha256 = "1r0car7vbz57b5fq7kjibsdi6knw50n8az145dbfq8svkf7s1fvy"; + rev = "80315c2933aa495b8af5833750e8534bf5b1d3bf"; + sha256 = "0f7j7cl7p8d5ac2wz7xhxzxgnm743wgb7360yav1pazivx0i5h5c"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8313,12 +8313,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-07-08"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "554a6ac7575f87b5b85d1b2bf60e7071c4164cbc"; - sha256 = "0qh3gzvv3y4fjjk9cqz8nqqh87181rq9pxp4j4ly52jpk7hca7qc"; + rev = "ce31cd1d2f4e8eee9fd91325e4599f15cb9566fd"; + sha256 = "16wxmqq90n2153w1lkycq2drpcgdxmrsfiizz0m2vi17ph69avnr"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -8433,12 +8433,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-07-18"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "7bb7586896b7afe6e6f26bcbaf70ad8517d98018"; - sha256 = "1mqnawfpg23rwjp3zpz85s3dpspcl8zrh9dymv5p0pqbn27mlf5n"; + rev = "f92bf8c0b343870faec2be09243ca0d778524049"; + sha256 = "06s46pl9gz6802nfcdfa3bgvzfhlc3bhi5qxnl185jn5mv6vz50i"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -8565,12 +8565,12 @@ final: prev: vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-06-08"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b"; - sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak"; + rev = "0415be8b5989e56f6c9e382a04906b7f719cfb38"; + sha256 = "1v7akjwrk62q2bk03iqhvziw6s13wnh2lk0vppzvlksv6rj0cmpi"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -8949,12 +8949,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-07-11"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "e82e635e1e188b1d00fa9ed3de21794c07ea1445"; - sha256 = "1623rkqni2xbz6jl8cs848db0gydnpsp0nxss6rg2cp9l813k68f"; + rev = "48c9dcd59e40d028fde5e5899deacc4aff27bb15"; + sha256 = "0ym3w45aw3h1wjw2lxazfind1b6wmdllpsfhdwxc9ldy39bsnnfc"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -9406,12 +9406,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-07-11"; + version = "2021-07-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "46c082aad84fd83c3c3d962c65afa800c2c33d85"; - sha256 = "1i3vz8c2v0ygk2m512phkpb8hcz1jj60k583yjkra9l78y7dj7y5"; + rev = "ccb024c03dda7eb01a5c057408b1828334d97e0a"; + sha256 = "1p4hlxifmmhr7rg4cfxnwph1z5i895kwqq2nbdd8dashrqcl0vc9"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9514,12 +9514,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2021-06-04"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "dca1a1827513497def6362411d093ae6b3cff7f8"; - sha256 = "1ij2j35bskk20wyiwjg1krqr9fi5fk043gfpxihhlbxd7yxlbpq1"; + rev = "0edeebdfa95c0a1fc5fbb83b8faf6b0b2cc3bf7e"; + sha256 = "0f9jfb9x1p43q3apyj68200dp8821qv8bdybax0c33hyxyzbz6n6"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -9767,12 +9767,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-24"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d1439f47a481b8665fbfa8511c6ae4e7514bdfc7"; - sha256 = "0brs97yhnfbkyyz6fzhs7s7kjwgwrw6kkinyycq51idxqdqvk4s8"; + rev = "6e3d52a23972b309b2d9f1ade7a16ed37a88d26e"; + sha256 = "0650gjgicavqjapp86w7634ya0bjykcfkvdrcvpx72vnfjl7myiz"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9996,12 +9996,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-07-23"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "8411859f48c8066a3b6f29c1a8e3bfa2d0653551"; - sha256 = "0yx2aig7pk8f99d539p85q3csb3l7bf2575r24w3fvchwj8w2pqy"; + rev = "8c6081c79b2250467c45f475332e3a3a33028467"; + sha256 = "1m0yjngysk0hngrp7awc7m5ahg39yb6hg17zd2fj0ywcf18fw7kf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 543cf3e9895ef3705c0608a4d5537c538aae109c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Thu, 29 Jul 2021 16:15:43 -0300 Subject: [PATCH 1228/1522] vimPlugins.gruvbox-material: init at 2021-07-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 13caad4b8ad..0b80612a248 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2001,6 +2001,18 @@ final: prev: meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; + gruvbox-material = buildVimPluginFrom2Nix { + pname = "gruvbox-material"; + version = "2021-07-29"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "gruvbox-material"; + rev = "7a1d276a3d938d488d2d592fbb52ecec642268fc"; + sha256 = "1pvdlci25qr122gzrb661bpl62sfz81vxsbyzwwnf16b18qsxi5r"; + }; + meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; + }; + gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; version = "2021-07-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c880f3583cf..96f2ce18256 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -595,6 +595,7 @@ rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim sainnhe/edge +sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim From 2adaddd1d3520257a6c26e464960c08bc0c67a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Mon, 2 Aug 2021 14:04:44 -0300 Subject: [PATCH 1229/1522] vimPlugins.vim-clap: Update cargo sha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index de1789ca347..0ae30ec468b 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -647,7 +647,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-J5BCLcwOPB+EfOmdITCHgec9XDkm2oCGfRo/sKjEOIg="; + cargoSha256 = "sha256-E16fwBb9ZDRrcs+rZVKG0UESDqrVIcybr+kbFIxrS1o="; }; in '' From 28390562062f77b572cefe4a9b1295f6e9f9f375 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:50:44 +0200 Subject: [PATCH 1230/1522] apparmor-kernel-patches: deprecate phases --- pkgs/os-specific/linux/apparmor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 1b1fb415451..5acf8e560e3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -256,7 +256,7 @@ let name = "apparmor-kernel-patches-${apparmor-version}"; src = apparmor-sources; - phases = "unpackPhase installPhase"; + dontBuild = true; installPhase = '' mkdir "$out" From a3556b20058f79cfdc278639b9094573376702df Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:56:43 +0200 Subject: [PATCH 1231/1522] zenstates: deprecate phases --- pkgs/os-specific/linux/zenstates/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix index a56337cfef2..8e31073151b 100644 --- a/pkgs/os-specific/linux/zenstates/default.nix +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; - phases = [ "installPhase" ]; - installPhase = '' mkdir -p $out/bin cp $src/zenstates.py $out/bin/zenstates From 127ee35a573997a852358eaa7e4c7202ce70493a Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:56:59 +0200 Subject: [PATCH 1232/1522] i810switch: deprecate phases --- pkgs/os-specific/linux/i810switch/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index ffca983a35e..993a19caadf 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -3,8 +3,6 @@ stdenv.mkDerivation { name = "i810switch-0.6.5"; - phases = "unpackPhase installPhase"; - installPhase = " sed -i -e 's+/usr++' Makefile sed -i -e 's+^\\(.*putenv(\"PATH=\\).*$+\\1${pciutils}/sbin\");+' i810switch.c From 0561d480b2b1dc54a6750df4c4f5dfdf11bf876f Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:57:22 +0200 Subject: [PATCH 1233/1522] rtl8723bs-firmware: deprecate phases --- pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index 36580d4b1b9..c587994ccec 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; inherit (linuxPackages.rtl8723bs) src; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' mkdir -p "$out/lib/firmware/rtlwifi" From d6db3ac67f289df5bfa0a17acea9b3e1e04a569f Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:57:37 +0200 Subject: [PATCH 1234/1522] rtl8192su-firmware: deprecate phases --- pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 34c2b683ea4..6cbaa4acb8d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' for i in rtl8192sfw.bin \ From abd4f4a03596a9cbd2fbe070815d4b8dac8668f1 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:58:03 +0200 Subject: [PATCH 1235/1522] b43-firmware-6: remove phases --- pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index c0226065ea2..45019dd5a98 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ b43FirmwareCutter ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "."; installPhase = '' From 8952b6df3ca0952e2368f2fdc73dcc50b15846b7 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 20:58:15 +0200 Subject: [PATCH 1236/1522] b43-firmware-5: remove phases --- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 42444d784d5..1355d5bc9a0 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { buildInputs = [ b43FirmwareCutter ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/lib/firmware b43-fwcutter -w $out/lib/firmware linux/wl_apsta.o From a1479b3998fd641be47736475312683c4b35c2dd Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Mon, 2 Aug 2021 16:03:56 -0300 Subject: [PATCH 1237/1522] icewm: 2.3.4 -> 2.6.0 --- .../window-managers/icewm/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 77ed0c561cd..1584b7fed01 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,9 +1,8 @@ { lib , stdenv , fetchFromGitHub -, cmake -, pkg-config , asciidoc +, cmake , expat , fontconfig , freetype @@ -11,6 +10,7 @@ , gdk-pixbuf , gdk-pixbuf-xlib , gettext +, giflib , glib , imlib2 , libICE @@ -30,22 +30,22 @@ , libpthreadstubs , libsndfile , libtiff -, giflib , libxcb , mkfontdir , pcre , perl +, pkg-config }: stdenv.mkDerivation rec { pname = "icewm"; - version = "2.3.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A="; + hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { gdk-pixbuf gdk-pixbuf-xlib gettext + giflib glib imlib2 libICE @@ -81,13 +82,15 @@ stdenv.mkDerivation rec { libpthreadstubs libsndfile libtiff - giflib libxcb mkfontdir pcre ]; - cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ]; + cmakeFlags = [ + "-DPREFIX=$out" + "-DCFGDIR=/etc/icewm" + ]; # install legacy themes postInstall = '' From c07e7d877b6adfbaef07946b9719ea6e30a86293 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 21:19:44 +0200 Subject: [PATCH 1238/1522] postscript-lexmark: remove phases --- pkgs/misc/drivers/postscript-lexmark/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index ebc6439dd5c..64a38239a9b 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ rpmextract ]; - phases = [ "unpackPhase" "installPhase"]; - sourceRoot = "."; unpackPhase = '' From b3cda4163a0a53ceb83cab26258c234c4ee1e6c4 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 21:20:00 +0200 Subject: [PATCH 1239/1522] gutenprint-bin: deprecate phases --- pkgs/misc/drivers/gutenprint/bin.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 58b77cb9107..891421d3312 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation { buildInputs = [ rpm cpio ]; - phases = "buildPhase"; + dontUnpack = true; + dontInstall = true; + dontFixup = true; libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib ]; From 2ab5a84bac03c50d41848de104770d9ccb55f77d Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 21:20:20 +0200 Subject: [PATCH 1240/1522] sundtek: deprecate phases and fix sha256 --- pkgs/misc/drivers/sundtek/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index d52f9dd7cde..d81a278ec13 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -10,18 +10,19 @@ let else if isi686 then "32bit" else throw "${system} not considered in build derivation. Might still be supported."; + sha256 = with stdenv; + if isx86_64 then "1jfsng5n3phw5rqpkid9m5j7m7zgj5bifh7swvba7f97y6imdaax" + else "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; in stdenv.mkDerivation { src = fetchurl { url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; - sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; + sha256 = sha256; }; pname = "sundtek"; inherit version; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - sourceRoot = "."; installPhase = '' From ced7721191dbc31b29f467a432a590e9df8385be Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Mon, 2 Aug 2021 20:50:35 +0200 Subject: [PATCH 1241/1522] linux: only configure IDE to "no" pre-5.14 When trying to build a 5.14 (rc-*), this fails to build otherwise: > error: unused option: IDE --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3fec8d38ac9..2a23c8d3ea5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -758,7 +758,7 @@ let POSIX_MQUEUE = yes; FRONTSWAP = yes; FUSION = yes; # Fusion MPT device support - IDE = no; # deprecated IDE support + IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol From 41d6e94bdf9f9122e1d911446521edc15500e6d6 Mon Sep 17 00:00:00 2001 From: Julian Stecklina <js@alien8.de> Date: Sat, 31 Jul 2021 15:38:15 +0200 Subject: [PATCH 1242/1522] djv: init at 2.0.8-unstable-2021-07-31 --- pkgs/applications/graphics/djv/default.nix | 152 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 154 insertions(+) create mode 100644 pkgs/applications/graphics/djv/default.nix diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/applications/graphics/djv/default.nix new file mode 100644 index 00000000000..95a29f243e4 --- /dev/null +++ b/pkgs/applications/graphics/djv/default.nix @@ -0,0 +1,152 @@ +{ stdenv +, cmake +, fetchFromGitHub +, lib +, alsa-lib +, libGL +, libX11 +, libXinerama +, libXi +, zlib +, rtaudio +, rapidjson +, ilmbase +, glm +, glfw3 +, libpng +, opencolorio_1 +, freetype +}: + +let + + # The way third-party dependencies are packaged has changed + # significantly from the 2.0.8 release. This means any packaging + # effort for the 2.0.8 release would have to be redone for the next + # release. Hence we package the git version for now and can easily + # jump onto the next release once it's available. + djvVersion = "2.0.8-unstable-2021-07-31"; + + djvSrc = fetchFromGitHub { + owner = "darbyjohnston"; + repo = "djv"; + rev = "ae31712c4f2802a874217ac194bde26287993934"; + sha256 = "1qgia6vqb6fhyfj8w925xl6k6zidrp2gj5f32bpi94lwwhi6p9pd"; + }; + + # DJV's build system tries to automatically pull in FSeq, another + # library by the DJV author. + # + # When updating, check the following file in the DJV source: + # etc/SuperBuild/cmake/Modules/BuildFSeq.cmake + # + # If there is revision or tag specified, DJV wants to use the most + # recent master version + fseqSrc = fetchFromGitHub { + owner = "darbyjohnston"; + repo = "fseq"; + rev = "545fac6018100f7fca474b8ee4f1efa7cbf6bf45"; + sha256 = "0qfhbrzji05hh5kwgd1wvq2lbf81ylbi7v7aqk28aws27f8d2hk0"; + }; + + djv-deps = stdenv.mkDerivation rec { + pname = "djv-dependencies"; + version = djvVersion; + + src = djvSrc; + + sourceRoot = "source/etc/SuperBuild"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + libGL + ]; + + postPatch = '' + chmod -R +w . + + sed -i 's,GIT_REPOSITORY https://github.com/darbyjohnston/FSeq.git,SOURCE_DIR ${fseqSrc},' \ + cmake/Modules/BuildFSeq.cmake + + # We pull these projects in as normal Nix dependencies. No need + # to build them again here. + + sed -i CMakeLists.txt \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS RapidJSON)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS RtAudio)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS IlmBase)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLM)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLFW)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS ZLIB)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS PNG)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS FreeType)/d' \ + -e '/list(APPEND DJV_THIRD_PARTY_DEPS OCIO)/d' + + # The "SuperBuild" wants to build DJV right here. This is + # inconvenient, because then the `make install` target is not generated + # by CMake. We build DJV in its own derivation below. This also makes + # the build a bit more modular. + + sed -i '/include(BuildDJV)/d' \ + CMakeLists.txt + ''; + + cmakeFlags = [ + "-DDJV_THIRD_PARTY_OpenEXR:BOOL=False" + "-DDJV_THIRD_PARTY_JPEG:BOOL=False" + "-DDJV_THIRD_PARTY_TIFF:BOOL=False" + ]; + + dontInstall = true; + doCheck = true; + }; + +in +stdenv.mkDerivation rec { + pname = "djv"; + version = djvVersion; + + src = djvSrc; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + alsa-lib + libGL + libX11 + libXinerama + libXi + rapidjson + rtaudio + ilmbase + glm + glfw3 + zlib.dev + libpng + freetype + opencolorio_1 + djv-deps + ]; + + postPatch = '' + chmod -R +w . + + # When linking opencolorio statically this results in failing to + # pull in opencolorio's dependencies (tixml and yaml libraries). Avoid + # this by linking it statically instead. + + sed -i cmake/Modules/FindOCIO.cmake \ + -e 's/PATH_SUFFIXES static//' \ + -e '/OpenColorIO_STATIC/d' + ''; + + # GLFW requires a working X11 session. + doCheck = false; + + meta = with lib; { + description = "A professional review software for VFX, animation, and film production"; + homepage = "https://darbyjohnston.github.io/DJV/"; + platforms = platforms.linux; + maintainers = [ maintainers.blitz ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63c64bb3e3b..6dada82c444 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2551,6 +2551,8 @@ in dino = callPackage ../applications/networking/instant-messengers/dino { }; + djv = callPackage ../applications/graphics/djv { }; + dlx = callPackage ../misc/emulators/dlx { }; dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; From 22239a1c266c18527bf0d86aa834beb93b7d7a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 26 Jul 2021 01:30:39 +0200 Subject: [PATCH 1243/1522] mysql_jdbc: modernize, 5.1.46 -> 5.1.49 --- pkgs/servers/sql/mysql/jdbc/builder.sh | 9 --------- pkgs/servers/sql/mysql/jdbc/default.nix | 23 ++++++++++++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 pkgs/servers/sql/mysql/jdbc/builder.sh diff --git a/pkgs/servers/sql/mysql/jdbc/builder.sh b/pkgs/servers/sql/mysql/jdbc/builder.sh deleted file mode 100644 index 56336e04135..00000000000 --- a/pkgs/servers/sql/mysql/jdbc/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -set -e - -unzip $src -cd mysql-connector-java-* - -mkdir -p $out/share/java -cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 7e6422a6f53..612d103876b 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,19 +1,28 @@ -{lib, stdenv, fetchurl, ant, unzip}: +{ lib, stdenv, fetchurl, ant, unzip }: stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "5.1.46"; - builder = ./builder.sh; + version = "5.1.49"; src = fetchurl { - url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip"; - sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; + url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-${version}.zip"; + sha256 = "1bm4mm4xka4pq2rwxx3k8xlcpa1vjcglr3pf4ls2i4hamww047yk"; }; + installPhase = '' + mkdir -p $out/share/java + cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar + ''; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant ]; - meta = { - platforms = lib.platforms.unix; + meta = with lib; { + description = "MySQL Connector/J"; + homepage = "https://dev.mysql.com/doc/connector-j/8.0/en/"; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + license = licenses.gpl2; }; } From ddb42a08ae3b41c564033732a8a48949bdbe53a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 2 Aug 2021 22:11:41 +0200 Subject: [PATCH 1244/1522] python3Packages.python-lsp-server: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/python-lsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 90ab506d651..9c6b8c31e12 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "1akdpfnylqg2mcwpkqmdwcg6j6hab23slp5rfjfidhphig2f2yjv"; + sha256 = "09wnnbf7lqqni6xkpzzk7nmcqjm5bx49xqzmp5fkb9jk50ivcrdz"; }; propagatedBuildInputs = [ From b7d9b2a9e9d26dc98e264087e31bce151adfd7f7 Mon Sep 17 00:00:00 2001 From: Harrison Houghton <hora.rhino@gmail.com> Date: Mon, 2 Aug 2021 16:14:32 -0400 Subject: [PATCH 1245/1522] libsigrok_0_3: fix Apparently we have an old-version override and it doesn't make the bindings at all, so only run the installCheck when we know it should succeed. --- pkgs/development/tools/libsigrok/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 52272e61956..9db3df42823 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python3 -, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" +, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4", doInstallCheck ? true }: stdenv.mkDerivation rec { - inherit version; + inherit version doInstallCheck; pname = "libsigrok"; src = fetchurl { @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; - doInstallCheck = true; installCheckPhase = '' # assert that c++ bindings are included + # note that this is only true for modern (>0.5) versions; the 0.3 series does not have these [[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \ || { echo 'C++ bindings were not generated; check configure output'; false; } ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f61bb8b91d1..cbd3aa6c526 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13522,6 +13522,7 @@ in libsigrok_0_3 = libsigrok.override { version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + doInstallCheck = false; }; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { From e4baf816b1675f46caf08cb0aafb07c596457e86 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" <me@bcc32.com> Date: Mon, 2 Aug 2021 17:10:28 -0400 Subject: [PATCH 1246/1522] parallel: 20210322 -> 20210722 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 0667327d062..519d928c695 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20210322"; + version = "20210722"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ="; + sha256 = "0jaa5137sjw2szvmnnslkqv1n3gg2rkkgr71j7hpp5a3q15hjf9j"; }; outputs = [ "out" "man" "doc" ]; From b3d8b97db668c8555ba6433ab1ee51fc41c327b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@protonmail.com> Date: Mon, 2 Aug 2021 18:14:06 -0300 Subject: [PATCH 1247/1522] jwasm: 2.13 -> 2.14 --- pkgs/development/compilers/jwasm/default.nix | 43 ++++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index 2f1727ae0de..88e9450ef9d 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -1,33 +1,42 @@ -{ lib, stdenv, fetchFromGitHub -, cmake }: +{ lib +, stdenv +, fetchFromGitHub +}: -with lib; stdenv.mkDerivation rec { pname = "jwasm"; - version = "2.13"; + version = "2.14"; src = fetchFromGitHub { - owner = "JWasm"; + owner = "Baron-von-Riedesel"; repo = "JWasm"; - rev = version; - sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w"; + rev = "v${version}"; + hash = "sha256-BUSsF73Q2vq6tF/YHMUyAmmFE/WWVQLRFJZkOD8T7f8="; }; - nativeBuildInputs = [ cmake ]; + outputs = [ "out" "doc" ]; - installPhase = '' - install -Dpm755 jwasm -t $out/bin/ - install -Dpm644 $src/History.txt $src/Readme.txt \ - $src/Doc/enh.txt $src/Doc/fixes.txt \ - $src/Doc/gencode.txt $src/Doc/overview.txt \ - -t $out/share/doc/jwasm/ + dontConfigure = true; + + preBuild = '' + cp ${if stdenv.cc.isClang then "CLUnix.mak" else "GccUnix.mak"} Makefile + substituteInPlace Makefile \ + --replace "/usr/local/bin" "${placeholder "out"}/bin" ''; - meta = { + postInstall = '' + install -Dpm644 $src/Html/License.html \ + $src/Html/Manual.html \ + $src/Html/Readme.html \ + -t $doc/share/doc/jwasm/ + ''; + + meta = with lib; { + homepage = "https://github.com/Baron-von-Riedesel/JWasm/"; description = "A MASM-compatible x86 assembler"; - homepage = "http://jwasm.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.unix; }; } +# TODO: generalize for Windows builds From 125da3a2c6d3266bf55237fe0a80ea6b4c9e1c40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 2 Aug 2021 23:26:30 +0200 Subject: [PATCH 1248/1522] python3Packages.regenmaschine: 3.1.4 -> 3.1.5 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 0f1240549af..2239b5824e1 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.4"; + version = "3.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "07ldbajm1y92szdc36z5cl02dpvbarsb8clq9m45849gm8g7yczd"; + sha256 = "0jm4x66kk7aa19hablkij43vsnsyy85a638zjfjsqghwqppwklgw"; }; nativeBuildInputs = [ From 335f1878009ff226aeea7fca694a31f3df7f35ea Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 3 Aug 2021 07:43:35 +1000 Subject: [PATCH 1249/1522] skopeo: 1.3.1 -> 1.4.0 https://github.com/containers/skopeo/releases/tag/v1.4.0 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index ed704b0639a..6bfd2354a79 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-ARNsNt5xpXn4ifnnRdmkhJAJq98ri3+oAF+Uov+byI0="; + sha256 = "sha256-ocbZs4z6jxLC4l6po07QPyM7R5vFowK7hsMRfwALfoY="; }; outputs = [ "out" "man" ]; From 1609a02da6195727e81f4c71a6ba84ee0436b707 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 23:59:29 +0200 Subject: [PATCH 1250/1522] win-virtio: deprecate phases --- pkgs/applications/virtualization/driver/win-virtio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 7de6498ab5b..060cc4b4ebf 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "win-virtio"; version = "0.1.196-1"; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; From 065ce585eb0fab439230495c4a386f192eeb75b0 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:00:09 +0200 Subject: [PATCH 1251/1522] win-signed-gplpv-drivers: deprecate phases --- .../virtualization/driver/win-signed-gplpv-drivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index c4c5cb80728..e9ad3b86338 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { name = "gplpv-0.11.0.373"; version = "0.11.0.373"; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' mkdir -p x86 From 560eac26d02199a0e26775cc3d887fd664ef6fba Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:00:37 +0200 Subject: [PATCH 1252/1522] win-qemu: deprecate phases --- pkgs/applications/virtualization/driver/win-qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index d8e233e3523..7c1eb0055a3 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "win-qemu-0.1.105-1"; version = "0.1.105-1"; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso"; From 0378bdd5cb668ae2d48e6a2a6f2925949bf718a8 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:01:02 +0200 Subject: [PATCH 1253/1522] webtorrent_desktop: remove phases --- pkgs/applications/video/webtorrent_desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 3b486654aeb..b4f8af61fca 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -63,7 +63,6 @@ url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; }; - phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ dpkg ]; installPhase = '' mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps} From e9f78bd7ff145cec72f08097fbc2bdda9d5aa8ca Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:01:29 +0200 Subject: [PATCH 1254/1522] epgstation: deprecate phases --- pkgs/applications/video/epgstation/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index f1f89b10907..3d910ad4c0e 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -27,7 +27,7 @@ let # FIXME: This should be removed when a complete fix is available # https://github.com/svanderburg/node2nix/issues/145 name = "workaround-opencollective-buildfailures"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin touch $out/bin/opencollective-postinstall From 188af2bf8baa0ffbb9b15330b899e670a9e0e06f Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:01:56 +0200 Subject: [PATCH 1255/1522] sublime-merge: deprecate phases --- pkgs/applications/version-management/sublime-merge/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index e6c83eb55d8..cb78411527d 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec { inherit pname; version = buildVersion; - phases = [ "installPhase" ]; + dontUnpack = true; ${primaryBinary} = binaryPackage; From 21ba91610cdeaf4b42094de8c265d098b89db26a Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:02:22 +0200 Subject: [PATCH 1256/1522] git-annex-remote-rclone: remove phases --- .../git-and-tools/git-annex-remote-rclone/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index 843a8d34881..cc916baec94 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin cp git-annex-remote-rclone $out/bin From a1a2c3621a3d664b7d4c9ee5192cecb99fde8c5f Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:02:37 +0200 Subject: [PATCH 1257/1522] bfg-repo-cleaner: deprecate phases --- .../git-and-tools/bfg-repo-cleaner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 036eef1c9c3..42ac2ed4508 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -18,7 +18,7 @@ in nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/java From 44cb64dba6006f837b972781dfab73d6768f5de3 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:02:58 +0200 Subject: [PATCH 1258/1522] quantomatic: deprecate phases --- pkgs/applications/science/physics/quantomatic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index c1400869a25..8c33a8ae6b1 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/libexec/quantomatic From 7b20eb9e37b297e40b35ebf8a730d350e9cfec87 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:03:12 +0200 Subject: [PATCH 1259/1522] scilab-bin: remove phases --- pkgs/applications/science/math/scilab-bin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index f9abdee2d14..5dea2c7653a 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation { xorg.libXxf86vm ]; - phases = [ "unpackPhase" "fixupPhase" "installPhase" ]; - fixupPhase = '' sed -i 's|\$(/bin/|$(|g' bin/scilab sed -i 's|/usr/bin/||g' bin/scilab From f67a0a37f08dc5648f57d27dcc6af3e0c71c0637 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:03:41 +0200 Subject: [PATCH 1260/1522] saw-tools: remove phases --- pkgs/applications/science/logic/saw-tools/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 3eabc9422e3..df99d067f08 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -48,8 +48,6 @@ stdenv.mkDerivation { done ''; - phases = "unpackPhase installPhase fixupPhase"; - meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; From e3dd43360e645aa13e9970ce4ea08a8c2ab58cfb Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:03:58 +0200 Subject: [PATCH 1261/1522] eagle7: deprecate phases --- pkgs/applications/science/electronics/eagle/eagle7.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index 2804fc3c8d7..8ea75a3ec48 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libX11 libXext libXi ]; - phases = [ "installPhase" ]; + dontUnpack = true; # NOTES: # Eagle for Linux comes as a self-extracting shell script with embedded From 4b883542feb8340e014546cc8c801f52819da962 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:04:16 +0200 Subject: [PATCH 1262/1522] varscan: deprecate phases --- pkgs/applications/science/biology/varscan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 2a232d64693..7b09f601ad6 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/libexec/varscan From be219752d275c855bee3e2fd7a0d20a21c456a1c Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:04:29 +0200 Subject: [PATCH 1263/1522] picard-tools: deprecate phases --- pkgs/applications/science/biology/picard-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index ed0d043cd54..979080745ff 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/libexec/picard From 5ac283b2374644777c435f1d8187b58deee0c55e Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:04:51 +0200 Subject: [PATCH 1264/1522] tremc: deprecate phases --- pkgs/applications/networking/p2p/tremc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index dfbe66ac856..3518c86790b 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -32,7 +32,8 @@ python3Packages.buildPythonApplication rec { ] ++ lib.optional useGeoIP GeoIP; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + doCheck = false; makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; From d14ed0c56f9585996f09ee2f5109137a8b69ec8d Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:05:05 +0200 Subject: [PATCH 1265/1522] freenet: deprecate phases --- pkgs/applications/networking/p2p/freenet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 83cc191f1b3..cfb228514cb 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation { jars = freenet-jars; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin From 1d31fb66de6b48837673c6a362bd1744c4bfe1fa Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:05:24 +0200 Subject: [PATCH 1266/1522] thunderbird-bin: remove phases --- .../networking/mailreaders/thunderbird-bin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ae4999b4f5f..5b03f893b4b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -75,8 +75,6 @@ stdenv.mkDerivation { inherit (source) sha256; }; - phases = "unpackPhase installPhase"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib From f95cb05e201dde6c466a9548c0c6732a4fb84d02 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 00:05:38 +0200 Subject: [PATCH 1267/1522] firefox-bin: remove phases --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5ef51028136..9f4923a7ec5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -89,8 +89,6 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib From 7d0b3f65aa1eb7500e4638ceaa9770e86c07788c Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Mon, 2 Aug 2021 22:41:43 +0000 Subject: [PATCH 1268/1522] linux: 4.4.276 -> 4.4.277 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6c2595386e0..9f0f566494d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.276"; + version = "4.4.277"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y"; + sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 32c78c9e12cfe3fed66c81ba47d575f365e25fd7 Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Mon, 2 Aug 2021 22:41:49 +0000 Subject: [PATCH 1269/1522] linux: 4.9.276 -> 4.9.277 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0dc5cfeae6e..5d3a556da3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.276"; + version = "4.9.277"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv"; + sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From b4aa8884d19a3a10a57b836a089d0000188f284c Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Mon, 2 Aug 2021 22:42:12 +0000 Subject: [PATCH 1270/1522] linux: 5.13.6 -> 5.13.7 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index bece15821a8..2f2dc1516b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.6"; + version = "5.13.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56"; + sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From e56d304d73b5415b8b08a91e04dc6807160bc84b Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Mon, 2 Aug 2021 22:42:45 +0000 Subject: [PATCH 1271/1522] linux_latest-libre: 18191 -> 18210 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index f02c1ad1250..854218f74d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18191"; - sha256 = "0ggaccg7z540kh5if48v6sjy39xllzvznqx5srvrlycrs2r89iyr"; + rev = "18210"; + sha256 = "1vp3d44ha68hhhk13g86j9lk0isfwqfkk1rbm0gihzjjzvpkxbab"; } , ... }: From 5d2da0969dc019dfa58ee9d11f00df528d319764 Mon Sep 17 00:00:00 2001 From: ollieh <3164917+ollieh@users.noreply.github.com> Date: Mon, 2 Aug 2021 23:55:58 +0100 Subject: [PATCH 1272/1522] remove maintainer vozz --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/python-modules/exifread/default.nix | 2 +- pkgs/development/python-modules/inifile/default.nix | 2 +- pkgs/development/python-modules/lektor/default.nix | 2 +- pkgs/tools/X11/ksuperkey/default.nix | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e9e546005b..b73b093de77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11328,10 +11328,6 @@ githubId = 3413119; name = "Vonfry"; }; - vozz = { - email = "oliver.huntuk@gmail.com"; - name = "Oliver Hunt"; - }; vq = { email = "vq@erq.se"; name = "Daniel Nilsson"; diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index e26f616f8db..16c5441803e 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files"; homepage = "https://github.com/ianare/exif-py"; license = licenses.bsd0; - maintainers = with maintainers; [ vozz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index c94c12ab0a8..1aac6dad012 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A small INI library for Python"; homepage = "https://github.com/mitsuhiko/python-inifile"; license = licenses.bsd0; - maintainers = with maintainers; [ vozz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index febb1b1f0b1..a094bf6b37e 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { description = "A static content management system"; homepage = "https://www.getlektor.com/"; license = licenses.bsd0; - maintainers = with maintainers; [ vozz costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index 14484120930..8b77ae55030 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A tool to be able to bind the super key as a key rather than a modifier"; homepage = "https://github.com/hanschen/ksuperkey"; license = licenses.gpl3; - maintainers = [ maintainers.vozz ]; + maintainers = [ ]; platforms = platforms.linux; }; } From 8e88b57e054c5ffcfb7222c5c2e44673fbf7ed5f Mon Sep 17 00:00:00 2001 From: Tom <twitchyliquid64@ciphersink.net> Date: Sun, 1 Aug 2021 15:22:00 -0700 Subject: [PATCH 1273/1522] maintainers: add twitchyliquid64 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 46605231d1e..9947ae10c4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11012,6 +11012,12 @@ fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; }]; }; + twitchyliquid64 = { + name = "Tom"; + email = "twitchyliquid64@ciphersink.net"; + github = "twitchyliquid64"; + githubId = 6328589; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; From fc8a8266d798da8e1bcf432f451db0155356b788 Mon Sep 17 00:00:00 2001 From: Tom <twitchyliquid64@ciphersink.net> Date: Sun, 1 Aug 2021 15:28:44 -0700 Subject: [PATCH 1274/1522] sirula: init at unstable-2021-07-11 This commit packages sirula, a simple app launcher for wayland. --- pkgs/tools/wayland/sirula/default.nix | 32 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/wayland/sirula/default.nix diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix new file mode 100644 index 00000000000..b58f37368f0 --- /dev/null +++ b/pkgs/tools/wayland/sirula/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, gtk3 +, gtk-layer-shell +}: + +rustPlatform.buildRustPackage rec { + pname = "sirula"; + version = "unstable-2021-07-11"; + + src = fetchFromGitHub { + owner = "DorianRudolph"; + repo = "sirula"; + rev = "574725bc307fc704c42380cd0fa50b0b80c4764d"; + sha256 = "1m58j1hymjw4l2z1jdfirw1vb3rblc1qffpvc2lqy99frfz0dlvp"; + }; + + cargoSha256 = "0wk90p20qkbpr866h8cvdshr8cl2kmc3dh2zxws5mlsh3sx2ld4w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "Simple app launcher for wayland written in rust"; + homepage = "https://github.com/DorianRudolph/sirula"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ twitchyliquid64 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c52ad74e2ee..8d0aadfddae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -658,6 +658,8 @@ in singularity-tools = callPackage ../build-support/singularity-tools { }; + sirula = callPackage ../tools/wayland/sirula { }; + srcOnly = callPackage ../build-support/src-only { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; From 128d3d1ad79415cc8eacef62a424012f29150a2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 02:44:07 +0000 Subject: [PATCH 1275/1522] bupstash: 0.10.0 -> 0.10.2 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index e04f1b9e2eb..ccf9115c1e7 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0vDty8JPUOt7mmBzQ9t1lnUyExBYW4hPmzvvhLSZhcs="; + sha256 = "sha256-0PKQYvKmAGP4/15nKhB+aZh8PF9dtDFjXEuPCA5tDYk="; }; - cargoSha256 = "sha256-8W6uNLHCiCHB6mYyGnixiaHj1IyTnqjd8NaQG18W/uM="; + cargoSha256 = "sha256-6zVWKVtTL6zbB4Uulq+sK4vm3qAC0B5kf0DmDv5aneo="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From 0687032f691a8af5e1ed26a61f00de7ae93c1914 Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Tue, 3 Aug 2021 03:09:58 +0000 Subject: [PATCH 1276/1522] xorg.xorgserver: 1.20.12 -> 1.20.13 https://lists.x.org/archives/xorg-announce/2021-July/003100.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9a75403cec6..07831027146 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { pname = "xorg-server"; - version = "1.20.12"; + version = "1.20.13"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz"; - sha256 = "1b4ckvxaiiiwdxwyfzbbfkr384qqy5qzfsm37z0fr08x8f9w0v9k"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz"; + sha256 = "003371ad64bz7i2hx7idnh90yw12dbh116ssy40s70balnb4xaj0"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 42cb2da3a0d..575a6f316a3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz +mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz From 273b06dd039a4ee74332ca6de481638263dbfb09 Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Tue, 3 Aug 2021 03:20:16 +0000 Subject: [PATCH 1277/1522] xorg.xeyes: 1.1.2 -> 1.2.0 https://lists.x.org/archives/xorg-announce/2021-August/003101.html --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9a75403cec6..5b510299f46 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1915,17 +1915,17 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, libXext, libXi, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { pname = "xeyes"; - version = "1.1.2"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; - sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; + url = "mirror://xorg/individual/app/xeyes-1.2.0.tar.bz2"; + sha256 = "1nxn443pfhddmwl59wplpjkslhlyfk307qx18nrimvvb2hipx8gq"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; + buildInputs = [ libX11 libxcb libXext libXi libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 42cb2da3a0d..85ca7769f79 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -36,7 +36,7 @@ mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.3.tar.bz2 -mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 +mirror://xorg/individual/app/xeyes-1.2.0.tar.bz2 mirror://xorg/individual/app/xfd-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 From 77396b3e38722f994031e332eb973f0a751f5b72 Mon Sep 17 00:00:00 2001 From: Rob Brewer <rwb123@gmail.com> Date: Mon, 2 Aug 2021 23:31:27 -0400 Subject: [PATCH 1278/1522] unixcw: use libsForQt5, enable qt wrapper (#131816) --- pkgs/applications/radio/unixcw/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 8d28215ae25..0d352609cf0 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,5 +1,6 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsa-lib , pkg-config, qt5}: -stdenv.mkDerivation rec { +{ lib, mkDerivation, fetchurl, libpulseaudio, alsa-lib , pkg-config, qtbase }: + +mkDerivation rec { pname = "unixcw"; version = "3.5.1"; src = fetchurl { @@ -9,11 +10,9 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsa-lib pkg-config qt5.qtbase]; + buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ]; CFLAGS ="-lasound -lpulse-simple"; - dontWrapQtApps = true; - meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0aadfddae..8132d590cc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32045,7 +32045,7 @@ in unicode-paracode = callPackage ../tools/misc/unicode { }; - unixcw = callPackage ../applications/radio/unixcw { }; + unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; vault = callPackage ../tools/security/vault { }; From a51c130827581ce711081b3ca59fde16f33bac1d Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Tue, 3 Aug 2021 03:35:29 +0000 Subject: [PATCH 1279/1522] xorg.xwd: 1.0.7 -> 1.0.8 https://lists.x.org/archives/xorg-announce/2021-August/003102.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 4 ---- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9a75403cec6..83899ad8080 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3312,11 +3312,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { pname = "xwd"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; - sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; + url = "mirror://xorg/individual/app/xwd-1.0.8.tar.bz2"; + sha256 = "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a52e1a7b0a5..ec43ae9d59d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -844,10 +844,6 @@ self: super: postInstall = "mkdir $out/bin"; }); - xwd = super.xwd.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [libXt]; - }); - xrdb = super.xrdb.overrideAttrs (attrs: { configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 42cb2da3a0d..9da33a05738 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -70,7 +70,7 @@ mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 -mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 +mirror://xorg/individual/app/xwd-1.0.8.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 From ebfc5eef67e73b2980d4b26e798bd145a485087d Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 2 Aug 2021 22:40:50 +0200 Subject: [PATCH 1280/1522] python3Packages.pyintesishome: 1.7.7 -> 1.8.0 --- pkgs/development/python-modules/pyintesishome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index 87ed0234729..6e8b8fef32f 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.7.7"; + version = "1.8.0"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; rev = version; - sha256 = "1wjh6bib6bg9rf4q9z6dlrf3gncj859hz4i20a9w06jci7b2yaaz"; + sha256 = "1y1agdr32p7m4dbb6kzchh0vb49gy0rqp8hq9zadwrq2vp70k5sn"; }; propagatedBuildInputs = [ From 3c502503aa45979e998a2f72c85f1aadb58288d5 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi <ryan.horiguchi@gmail.com> Date: Mon, 2 Aug 2021 22:40:24 +0200 Subject: [PATCH 1281/1522] vscode-extensions.hashicorp.terraform: 2.13.2 -> 2.14.0 --- .../vscode-extensions/terraform/default.nix | 6 +- .../terraform/fix-terraform-ls.patch | 60 ++++++------------- 2 files changed, 21 insertions(+), 45 deletions(-) diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index e934f03b209..b40da25d2c4 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.13.2"; + version = "2.14.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa"; + sha256 = "1q43a28l6xfp3yw6wlr1kcidik0dbp8b7lg9vc83rhw4rjgvjsfm"; }; patches = [ ./fix-terraform-ls.patch ]; postPatch = '' - substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls ''; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 9153276d367..2f34d09fd11 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,43 +1,19 @@ -diff --git a/out/clientHandler.js b/out/clientHandler.js -index 7f9716d..a543d60 100644 ---- a/out/clientHandler.js -+++ b/out/clientHandler.js -@@ -33,8 +33,7 @@ class ClientHandler { - this.reporter.sendTelemetryEvent('usePathToBinary'); - } - else { -- const installPath = path.join(context.extensionPath, 'lsp'); -- this.pathToBinary = path.join(installPath, 'terraform-ls'); -+ this.pathToBinary = 'TERRAFORM-LS-PATH'; - } +diff --git a/out/serverPath.js b/out/serverPath.js +index ffb1b80..990ca2b 100644 +--- a/out/serverPath.js ++++ b/out/serverPath.js +@@ -8,7 +8,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary'; + class ServerPath { + constructor(context) { + this.context = context; +- this.customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME); ++ ++ const customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME); ++ if (!customBinPath) { ++ this.customBinPath = 'TERRAFORM-LS-PATH'; ++ } else { ++ this.customBinPath = customBinPath; ++ } } - startClients(folders) { -diff --git a/out/extension.js b/out/extension.js -index 7a271fc..726bbf8 100644 ---- a/out/extension.js -+++ b/out/extension.js -@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) { - updateLanguageServer(clientHandler, installPath); - }, 24 * hour); - // skip install if a language server binary path is set -- if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { -- const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); -- const install = yield installer.needsInstall(); -- if (install) { -- yield clientHandler.stopClients(); -- try { -- yield installer.install(); -- } -- catch (err) { -- console.log(err); // for test failure reporting -- reporter.sendTelemetryException(err); -- throw err; -- } -- finally { -- yield installer.cleanupZips(); -- } -- } -- } - return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op - }); - } + installPath() { + return this.context.asAbsolutePath(INSTALL_FOLDER_NAME); From 6754fbb8b2f376b9b286d9d9ac93b0266c5e39b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 04:19:50 +0000 Subject: [PATCH 1282/1522] duckdb: 0.2.7 -> 0.2.8 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index e63f2c3cfd6..92f6accd426 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj"; + sha256 = "sha256-X8zk9D7BQQ6iHdfvpaTZ8wS779wt3nRthH7OG4p9bTg="; }; nativeBuildInputs = [ cmake ]; From 3ca56ec7346ba2d1c591ee9a9a3ef0cb8127f90c Mon Sep 17 00:00:00 2001 From: Vanilla <neko@hydev.org> Date: Fri, 30 Jul 2021 22:01:59 +0800 Subject: [PATCH 1283/1522] v2ray: 4.41.0 -> 4.41.1 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 8c82c379c38..33fbd5bc92f 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.41.0"; + version = "4.41.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1300gl6y94i1488ja6kic0m5fa2qxakbdc06qd0lgkg6inzbm6gz"; + sha256 = "14zqvmf7xa4knmc57ck1ns0i0va0223qdp64qmm3q2w82dh9mnb8"; }; - vendorSha256 = "sha256-oHKXDzufvTzOzBqFjBzu3vCwTF/FJMomopY3cUktwiM="; + vendorSha256 = "sha256-K8gFF9TbhVgNOySz7nhPFIdSNWNYKUyFD0LIk6acnkc="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202106240309"; - geoipSha256 = "0ypydpgvizf9pfdxna3f6fqn1svsrkac0p3j9s63y55gbqpglacq"; + geoipRev = "202107290023"; + geoipSha256 = "14xgy0bsamj2k4knfs1r453yp27wq8qmjqifq63zbp4lb9v8xnjy"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210626145509"; - geositeSha256 = "0skhwwlzlyh8rvzyblg1l2xw1bawqs12i6zw5sv3d55pnw7wmf2z"; + geositeRev = "20210727125446"; + geositeSha256 = "14z1419dkbippm12z6gvwh3q1wd6x1p4sk6zp2i4qa408i1gc81c"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From 62812cb5f83da5ff7aa98f2bebeefe81c5f5d2f2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <personal@ilanjoselevich.com> Date: Mon, 2 Aug 2021 00:44:13 +0300 Subject: [PATCH 1284/1522] jellyfin-media-player: 1.6.0 -> 1.6.1 --- pkgs/applications/video/jellyfin-media-player/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index f7abc95cb0c..b73907a7f75 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-u19WJupSqIzA8W0QG9mue8Ticy+HxBAniuKIUFl7ONs="; + sha256 = "sha256-iqwOv95JFxQ1j/9B+oBFAp7mD1/1g2EJYvvUKbrDQes="; }; jmpDist = fetchzip { From 03507abd3d3f0896a23fb01b7159e1d2427c0cd0 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <personal@ilanjoselevich.com> Date: Mon, 2 Aug 2021 00:45:45 +0300 Subject: [PATCH 1285/1522] jellyfin-media-player: added kranzes (myself) as a maintainer --- pkgs/applications/video/jellyfin-media-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index b73907a7f75..8c23bfc5c29 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -105,7 +105,7 @@ mkDerivation rec { description = "Jellyfin Desktop Client based on Plex Media Player"; license = with licenses; [ gpl2Only mit ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch kranzes ]; mainProgram = "jellyfinmediaplayer"; }; } From 5f3413e8c9ae7b03ab3edb3b57b4dbaa256dbc64 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Mon, 2 Aug 2021 23:58:57 +0300 Subject: [PATCH 1286/1522] python3Packages.pikepdf: 2.12.2 -> 2.16.1 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c5462a555b5..a7d9faf98a9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "2.12.2"; + version = "2.16.1"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5ff35499b1ae7b181277f78ce5b1bcc8d3009182bb389917791c5dc811fcc8e4"; + sha256 = "sha256-4k3/avMfHrcy/LXbRniDXR8xJkOZb9zZ2+uKylK8Dd4="; }; buildInputs = [ From ef17d8b90652b56bafbea6d19655060c58241e07 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 04:48:30 +0000 Subject: [PATCH 1287/1522] exoscale-cli: 1.37.0 -> 1.38.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 4fb11de26c3..950bc6e53d2 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.37.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU="; + sha256 = "sha256-o4jol44ayA13VDChQfOY1eoFOGUCvzfqjbQCqpXairY="; }; goPackagePath = "github.com/exoscale/cli"; From e74b69a37578f0726098bc9bef77d7354bb9c691 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 06:14:28 +0000 Subject: [PATCH 1288/1522] goreleaser: 0.174.1 -> 0.174.2 --- pkgs/tools/misc/goreleaser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index d2446829b28..44b52e27c4a 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.174.1"; + version = "0.174.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oHH5/w1G0xlhmnUe6/qS0++qtBdDd6dUw6JfWYAWIh8="; + sha256 = "sha256-o/rDqYjOI+HxThQA7cflWUhCdsb6m4XOuzI753upmio="; }; vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0="; From 71691444a68a86e04e23c8c96287ac934ac87218 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 06:38:53 +0000 Subject: [PATCH 1289/1522] grafana-agent: 0.17.0 -> 0.18.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 4c9d0437d79..318b945a592 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-rHJGVQWbvgcvwPzt8e2uWs1n4bbaAZz6lQjyvmqmLZw="; + sha256 = "sha256-FUAaM4jYjyYeu5TX5I8icuzjGv80ZzZPWSsNwE5w84U="; }; - vendorSha256 = "sha256-jA8M8ZdJWmrGRQb0W1duVV+XwxqJVQ/ek0Yhw6JZvX8="; + vendorSha256 = "sha256-xQNsRL0hFuJ/gm1K/1IpzAGIqpyN2CF1EeX/cEfcBBM="; patches = [ # https://github.com/grafana/agent/issues/731 From a7594a9611b10547c2b880ce6d25e8aef8c2cba9 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru <applePrincess@applePrincess.io> Date: Tue, 3 Aug 2021 06:56:38 +0000 Subject: [PATCH 1290/1522] exploitdb: 2021-07-30 -> 2021-08-03 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9abc01aa4b9..e12e19a5570 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-30"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-7gMhp5MR4RFPv8Ob9SR3XvapPIt5llf3CspW4Yu7Puo="; + sha256 = "sha256-cgd4J6d493uQRo079eq7CjjmhofPeuafS0mWAjVfOck="; }; installPhase = '' From 8839db9828668f11d05561ffb4f57e8dae9cfb91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 09:13:52 +0200 Subject: [PATCH 1291/1522] python3Packages.aiowinreg: 0.0.6 -> 0.0.7 --- pkgs/development/python-modules/aiowinreg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 3bfbbf7c12b..59a2483d02e 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.6"; + version = "0.0.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0h0r9xrz1n8y75f2p21f7phqrlpsymyiipmgzr0lj591irzjmjjy"; + sha256 = "1p88q2b6slm1sw3234r40s9jd03fqlkcx8y3iwg6ihf0z4ww14d1"; }; propagatedBuildInputs = [ From bafb83e3225a991167ba523605409da0e10e3c96 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 00:19:10 -0700 Subject: [PATCH 1292/1522] roon-bridge: support aarch64-linux --- pkgs/servers/roon-bridge/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 4f188b7f5cf..74851446c99 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -7,7 +7,10 @@ , stdenv , zlib }: - +let + inherit (stdenv.targetPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; +in stdenv.mkDerivation rec { pname = "roon-bridge"; version = "1.8-814"; @@ -16,10 +19,16 @@ stdenv.mkDerivation rec { # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 - src = fetchurl { - url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; - sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; - }; + src = { + x86_64-linux = fetchurl { + url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; + sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; + }; + aarch64-linux = fetchurl { + url = "https://web.archive.org/web/20210803071334/http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2"; + sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; + }; + }.${system} or throwSystem; buildInputs = [ alsa-lib From cfdc62259d5be708f20593f87a511ae68f20fbe7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 00:22:32 -0700 Subject: [PATCH 1293/1522] nixos/roon-bridge: register module in module-list --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a6d8599e7e..a4295be63c9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -251,6 +251,7 @@ ./services/audio/mpd.nix ./services/audio/mpdscribble.nix ./services/audio/mopidy.nix + ./services/audio/roon-bridge.nix ./services/audio/roon-server.nix ./services/audio/slimserver.nix ./services/audio/snapserver.nix From 7015db7881584aa264e5cd21df03429ce64b14d0 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Tue, 3 Aug 2021 09:28:55 +0200 Subject: [PATCH 1294/1522] chromium: 92.0.4515.107 -> 92.0.4515.131 https://chromereleases.googleblog.com/2021/08/the-stable-channel-has-been-updated-to.html This update includes 10 security fixes. CVEs: CVE-2021-30590 CVE-2021-30591 CVE-2021-30592 CVE-2021-30593 CVE-2021-30594 CVE-2021-30596 CVE-2021-30597 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f7be43f9bd5..a0a8fd23e6b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "92.0.4515.107", - "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", - "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj", + "version": "92.0.4515.131", + "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", + "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", "deps": { "gn": { "version": "2021-05-07", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "92.0.4515.43", - "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw", - "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f" + "version": "92.0.4515.107", + "sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3", + "sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp" } }, "beta": { From b82d742a875419c56822b6e73f87a9ffce221cb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 09:54:43 +0200 Subject: [PATCH 1295/1522] python3Packages.respx: 0.17.0 -> 0.17.1 --- .../python-modules/respx/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 0a3fa27a808..0d7f509b4a0 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -3,40 +3,46 @@ , fetchFromGitHub , httpcore , httpx +, flask , pytest-asyncio -, pytest-cov , pytestCheckHook +, starlette , trio }: buildPythonPackage rec { pname = "respx"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4="; + sha256 = "0w8idh6l2iq04ydz7r2qisq9jsxq8wszkx97kx4g3yjwg4ypvc6k"; }; - # Coverage is under 100 % due to the excluded tests - postPatch = '' - substituteInPlace setup.cfg --replace "--cov-fail-under 100" "" - ''; - - propagatedBuildInputs = [ httpx ]; + propagatedBuildInputs = [ + httpx + ]; checkInputs = [ httpcore httpx + flask pytest-asyncio - pytest-cov pytestCheckHook + starlette trio ]; - disabledTests = [ "test_pass_through" ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + disabledTests = [ + "test_pass_through" + ]; + pythonImportsCheck = [ "respx" ]; meta = with lib; { From b38d8b99609ceb0363136c05e9115db758172f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <mcsinyx@disroot.org> Date: Tue, 3 Aug 2021 14:57:06 +0700 Subject: [PATCH 1296/1522] flare: 1.12rc2 -> 1.12 --- pkgs/games/flare/default.nix | 2 +- pkgs/games/flare/engine.nix | 4 ++-- pkgs/games/flare/game.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 8cd70aed614..9b4b6848aea 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,7 +1,7 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.12rc2"; + name = "flare-1.12"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 1f1f35a3762..fc7415ba3ec 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.12rc2"; + version = "1.12"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq"; + sha256 = "0swav6fzz970wj4iic3b7y06haa05720s2wivc8w7wcw9nzcac7j"; }; patches = [ ./desktop.patch ]; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 10e27b4d39c..9903f0b5820 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.12rc2"; + version = "1.12"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9"; + sha256 = "15k9r7w587pvkzrln0670hhq5fzif8k7xmrhb0nl3z3fi6dw3mmc"; }; nativeBuildInputs = [ cmake ]; From 9b06d00d8b586157cd24eee88aa7fd23d9ba56af Mon Sep 17 00:00:00 2001 From: Sascha Grunert <sgrunert@redhat.com> Date: Tue, 3 Aug 2021 09:58:20 +0200 Subject: [PATCH 1297/1522] buildah: 1.21.1 -> 1.22.0 Signed-off-by: Sascha Grunert <sgrunert@redhat.com> --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index c92b229f05a..d7e546ec44f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.4"; + version = "1.22.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA="; + sha256 = "sha256-F2PUqqzW7e6wmme1rTEJ736Sy/SRR1XVf20j5zDI9/s="; }; outputs = [ "out" "man" ]; From 3215de26a22926ea0ac3269da9aa1d01eb8873d6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 01:27:55 -0700 Subject: [PATCH 1298/1522] networkaudiod: init at 4.1.1-46 --- pkgs/servers/networkaudiod/default.nix | 71 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/servers/networkaudiod/default.nix diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix new file mode 100644 index 00000000000..fcf713d9fe8 --- /dev/null +++ b/pkgs/servers/networkaudiod/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, autoPatchelfHook +, dpkg +, fetchurl +, lib +, alsa-lib +}: +let + inherit (stdenv.targetPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; +in +stdenv.mkDerivation rec { + pname = "networkaudiod"; + version = "4.1.1-46"; + + src = { + x86_64-linux = fetchurl { + url = "https://www.signalyst.eu/bins/naa/linux/buster/${pname}_${version}_amd64.deb"; + sha256 = "sha256-un5VcCnvCCS/KWtW991Rt9vz3flYilERmRNooEsKCkA="; + }; + aarch64-linux = fetchurl { + url = "https://www.signalyst.eu/bins/naa/linux/buster/${pname}_${version}_arm64.deb"; + sha256 = "sha256-fjSCWX9VYhVJ43N2kSqd5gfTtDJ1UiH4j5PJ9I5Skag="; + }; + }.${system} or throwSystem; + + unpackPhase = '' + dpkg -x $src . + ''; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ + alsa-lib + stdenv.cc.cc.lib + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # main executable + mkdir -p $out/bin + cp ./usr/sbin/networkaudiod $out/bin + + # systemd service file + mkdir -p $out/lib/systemd/system + cp ./lib/systemd/system/networkaudiod.service $out/lib/systemd/system + + # documentation + mkdir -p $out/share/doc/networkaudiod + cp -r ./usr/share/doc/networkaudiod $out/share/doc/ + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/networkaudiod.service \ + --replace /usr/sbin/networkaudiod $out/bin/networkaudiod + ''; + + meta = with lib; { + homepage = "https://www.signalyst.com/index.html"; + description = "Network Audio Adapter daemon"; + license = licenses.unfree; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa642484b2d..87e43e2d894 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19847,6 +19847,8 @@ in neard = callPackage ../servers/neard { }; + networkaudiod = callPackage ../servers/networkaudiod { }; + unit = callPackage ../servers/http/unit { }; ncdns = callPackage ../servers/dns/ncdns { }; From a8998d11c9a5075dfc41bb59c548df886a3cbae7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 01:36:53 -0700 Subject: [PATCH 1299/1522] nixos/networkaudiod: init --- nixos/modules/module-list.nix | 1 + .../modules/services/audio/networkaudiod.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nixos/modules/services/audio/networkaudiod.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9bcd8b46311..4203c858272 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -251,6 +251,7 @@ ./services/audio/mpd.nix ./services/audio/mpdscribble.nix ./services/audio/mopidy.nix + ./services/audio/networkaudiod.nix ./services/audio/roon-bridge.nix ./services/audio/roon-server.nix ./services/audio/slimserver.nix diff --git a/nixos/modules/services/audio/networkaudiod.nix b/nixos/modules/services/audio/networkaudiod.nix new file mode 100644 index 00000000000..265a4e1d95d --- /dev/null +++ b/nixos/modules/services/audio/networkaudiod.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "networkaudiod"; + cfg = config.services.networkaudiod; +in { + options = { + services.networkaudiod = { + enable = mkEnableOption "Networkaudiod (NAA)"; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.networkaudiod ]; + systemd.services.networkaudiod.wantedBy = [ "multi-user.target" ]; + }; +} From d2c084830a5cef2b929373f0acb3c86b45d60c03 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:45:31 +0200 Subject: [PATCH 1300/1522] 90secondportraits: deprecate phases --- pkgs/games/90secondportraits/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index a5b504995f7..07458cc6446 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From c77f8555c47b81f54e250a33fa784c4f6c175468 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:45:48 +0200 Subject: [PATCH 1301/1522] anki: deprecate phases --- pkgs/games/anki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 6edddfeed5c..d1def374009 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -48,7 +48,7 @@ let rev = rev-manual; sha256 = sha256-manual; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + dontInstall = true; nativeBuildInputs = [ asciidoc ]; patchPhase = '' # rsync isnt needed From 816a29f9c4e54593b4207cca13308fc7fd715253 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:46:05 +0200 Subject: [PATCH 1302/1522] duckmarines: deprecate phases --- pkgs/games/duckmarines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index ca2a7439141..af34742b9fd 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' From a7d44252c30b0f81fa059c0422c2e9ead4f9d2ec Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:47:55 +0200 Subject: [PATCH 1303/1522] dwarf-fortress: remove phases --- pkgs/games/dwarf-fortress/soundsense.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 5202c13b5b8..8ed1e7be1b2 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; nativeBuildInputs = [ dos2unix ]; buildPhase = '' dos2unix soundSense.sh From 4911c06d52654015769fd7d371842d563b2296c5 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:48:14 +0200 Subject: [PATCH 1304/1522] mari0: remove phases --- pkgs/games/mari0/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index cb3349960f0..55ef9f51d5b 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love_11 zip ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/games/lovegames $out/share/applications From 96dfb5fa712a8b91a47aac453e740421e8974f1d Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:48:34 +0200 Subject: [PATCH 1305/1522] mrrescue: deprecate phases --- pkgs/games/mrrescue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index ae7519c948b..2328c20ef91 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ lua love makeWrapper ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 6c9e39afa09047b5b6e300a31939de3bc5767a83 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:48:50 +0200 Subject: [PATCH 1306/1522] nottetris2: remove phases --- pkgs/games/nottetris2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/nottetris2/default.nix b/pkgs/games/nottetris2/default.nix index 42e5a33cad7..179673c05b6 100644 --- a/pkgs/games/nottetris2/default.nix +++ b/pkgs/games/nottetris2/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ zip makeWrapper ]; buildInputs = [ love_0_7 ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/games/lovegames $out/share/applications From 4dafca2c7a9baf8dad4fbfa8769321ca75484d04 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:49:09 +0200 Subject: [PATCH 1307/1522] rimshot: remove phases --- pkgs/games/rimshot/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 1f4efa5097b..997da768c6d 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ lua love ]; - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' unzip -j $src ''; From 1b7a0e8dbb0330ca134a155edbb4382b61b4bd5e Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:49:27 +0200 Subject: [PATCH 1308/1522] scrolls: remove phases --- pkgs/games/scrolls/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index cdeab7b10d3..fad783571c5 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { libpulseaudio ]; - phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mkdir -p "$out/opt/Scrolls" cp -r ../Scrolls "$out/opt/Scrolls/" From b2071530e297dc29bbe01b34ef080e4a5bf8e9d5 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:50:01 +0200 Subject: [PATCH 1309/1522] sienna: deprecate phases --- pkgs/games/sienna/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 24f5fc08876..59f01f6a2c4 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 76fff62cad8b4e907aa5bcd54cb8d36ff55a9ab5 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:50:22 +0200 Subject: [PATCH 1310/1522] vapor: deprecate phases --- pkgs/games/vapor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 71028065263..2fa7ca18927 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' From 11ba3977529b545298f8311ad9ef7a53140710f8 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 10:50:40 +0200 Subject: [PATCH 1311/1522] flightgear: deprecate phases --- pkgs/games/flightgear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 0996d4bd512..bfbb705da38 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -17,7 +17,7 @@ let sha256 = "sha256-/KFumHRkmRvsU/L1i11jG/KbqobnOEP7l4lyPMKHycA="; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p "$out/share/FlightGear" From 3de5e226b26b4fc661cfc6846fb7888cfd619329 Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Mon, 2 Aug 2021 11:42:09 +0200 Subject: [PATCH 1312/1522] recutils: replace name with pname&version --- pkgs/tools/misc/recutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 5453ab75a4a..d6a5b517a84 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { - name = "recutils-1.8"; + pname = "recutils"; + version = "1.8"; src = fetchurl { - url = "mirror://gnu/recutils/${name}.tar.gz"; + url = "mirror://gnu/recutils/recutils-${version}.tar.gz"; sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz"; }; From a6a6de159f01bbfd7c53124c772a22b6066dd12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 16:13:30 +0200 Subject: [PATCH 1313/1522] rabbitmq-server: format --- pkgs/servers/amqp/rabbitmq-server/default.nix | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3f2e595b31f..bfee2031070 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,13 +1,32 @@ -{ lib, stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto -, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat -, procps, coreutils, gnused, systemd, glibcLocales -, AppKit, Carbon, Cocoa +{ lib +, stdenv +, fetchurl +, erlang +, elixir +, python +, libxml2 +, libxslt +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, zip +, unzip +, rsync +, getconf +, socat +, procps +, coreutils +, gnused +, systemd +, glibcLocales +, AppKit +, Carbon +, Cocoa , nixosTests }: stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.1"; # when updating, consider bumping elixir version in all-packages.nix @@ -17,8 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; - buildInputs = - [ erlang elixir python libxml2 libxslt glibcLocales ] + buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; @@ -33,9 +51,12 @@ stdenv.mkDerivation rec { runtimePath = lib.makeBinPath ([ erlang getconf # for getting memory limits - socat procps - gnused coreutils # used by helper scripts + socat + procps + gnused + coreutils # used by helper scripts ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check + postInstall = '' # rabbitmq-env calls to sed/coreutils, so provide everything early sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|' @@ -53,15 +74,15 @@ stdenv.mkDerivation rec { rm $out/INSTALL ''; - meta = { - homepage = "https://www.rabbitmq.com/"; - description = "An implementation of the AMQP messaging protocol"; - license = lib.licenses.mpl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ Profpatsch ]; - }; - passthru.tests = { vm-test = nixosTests.rabbitmq; }; + + meta = with lib; { + homepage = "https://www.rabbitmq.com/"; + description = "An implementation of the AMQP messaging protocol"; + license = licenses.mpl20; + platforms = platforms.unix; + maintainers = with maintainers; [ Profpatsch ]; + }; } From 503f72bfa6cb3426a6646e554142a624ff4c26ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 2 Aug 2021 16:24:42 +0200 Subject: [PATCH 1314/1522] pythonPackages: sphinxcontrib_plantuml -> sphinxcontrib-plantuml --- .../default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{sphinxcontrib_plantuml => sphinxcontrib-plantuml}/default.nix (93%) diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix similarity index 93% rename from pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix rename to pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 473a625ae63..490b2d25a22 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; + maintainers = with maintainers; [ ]; license = with licenses; [ bsd2 ]; }; - } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 82841080070..ba92d25afc7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -73,6 +73,7 @@ mapAliases ({ setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + sphinxcontrib_plantuml = sphinxcontrib-plantuml; topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a0a9fe1460..ff292debd20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8256,7 +8256,7 @@ in { sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { + sphinxcontrib-plantuml = callPackage ../development/python-modules/sphinxcontrib-plantuml { inherit (pkgs) plantuml; }; From 342f2d390b9ba56749d9161376d081e14199e172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Tue, 3 Aug 2021 12:03:29 +0200 Subject: [PATCH 1315/1522] ikiwiki: format, cleanup --- pkgs/applications/misc/ikiwiki/default.nix | 45 ++++++++-------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 2a6302f5bce..135132bd431 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,39 +1,28 @@ { lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight -, gitSupport ? false, git ? null -, docutilsSupport ? false, python ? null, docutils ? null -, monotoneSupport ? false, monotone ? null -, bazaarSupport ? false, breezy ? null -, cvsSupport ? false, cvs ? null, cvsps ? null -, subversionSupport ? false, subversion ? null -, mercurialSupport ? false, mercurial ? null +, gitSupport ? false, git +, docutilsSupport ? false, python, docutils +, monotoneSupport ? false, monotone +, bazaarSupport ? false, breezy +, cvsSupport ? false, cvs, cvsps +, subversionSupport ? false, subversion +, mercurialSupport ? false, mercurial , extraUtils ? [] }: -assert docutilsSupport -> (python != null && docutils != null); -assert gitSupport -> (git != null); -assert monotoneSupport -> (monotone != null); -assert bazaarSupport -> (breezy != null); -assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); -assert subversionSupport -> (subversion != null); -assert mercurialSupport -> (mercurial != null); - -let - name = "ikiwiki"; +stdenv.mkDerivation rec { + pname = "ikiwiki"; version = "3.20200202.3"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; + url = "mirror://debian/pool/main/i/ikiwiki/ikiwiki_${version}.orig.tar.xz"; sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase - NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext + RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase + NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]) ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] @@ -80,11 +69,11 @@ stdenv.mkDerivation { checkTarget = "test"; doCheck = true; - meta = { + meta = with lib; { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.peti ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.peti ]; }; } From 4e0e49400a2ec1e9cfa231175fb642101131940a Mon Sep 17 00:00:00 2001 From: Sascha Grunert <sgrunert@redhat.com> Date: Tue, 3 Aug 2021 11:52:00 +0200 Subject: [PATCH 1316/1522] slirp4netns: 1.1.11 -> 1.1.12 Signed-off-by: Sascha Grunert <sgrunert@redhat.com> --- pkgs/tools/networking/slirp4netns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index c08f234ab5b..44b08bc1372 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.11"; + version = "1.1.12"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8="; + sha256 = "sha256-NhE5XxInNfGN6hTyZItc7+4HBjcyBLAFTpirEidcipk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 09fc3e402ea2169a3f7eac8a3a04cb96bd07f211 Mon Sep 17 00:00:00 2001 From: fortuneteller2k <lythe1107@gmail.com> Date: Tue, 3 Aug 2021 18:47:24 +0800 Subject: [PATCH 1317/1522] kile-wl: 2021-06-24 -> 2021-08-02 --- pkgs/applications/misc/kile-wl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 9146f38df36..03786a62997 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-06-24"; + version = "unstable-2021-08-03"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "6a306b0b5af0f250135eb88e0e72a5038fccd6a8"; - sha256 = "sha256-DznIDzI5rNrlKJdXjpOpsLL8IO6tuIvW0pNdRN8N6Go="; + rev = "7f0b1578352d935084d3d56ef42487d2a8cfbfe8"; + sha256 = "sha256-Ir9LNQt7/7TjhCJ69HYx1tBXeq/i7F3ydmenvchZgDI="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-LFRqhgvziQ7a8OWRzXqNIfziP6bRHTe2oF55N09rFy8="; + cargoSha256 = "sha256-195rPxX3BTxJ0xLgye14aWuBd5OuJ30wyUa4wrbQ3Xo="; nativeBuildInputs = [ scdoc ]; From 0b41b8fe122c5f7efb259797837e11d4a0fe1361 Mon Sep 17 00:00:00 2001 From: fortuneteller2k <lythe1107@gmail.com> Date: Tue, 3 Aug 2021 19:05:04 +0800 Subject: [PATCH 1318/1522] river: 2021-06-27 -> 2021-08-03 --- pkgs/applications/window-managers/river/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 317c08c5d89..5c809097ee1 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-06-27"; + version = "unstable-2021-08-03"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "39578db1344ca298f2bb2fe2278a35108d5f2b66"; - sha256 = "sha256-DQroN+FV7sq0PyczERZgnW73YKAVvj2JJQjfzidlBI8="; + rev = "2fc0875a3e17a0328d14d0c6323bd8022d5b15de"; + sha256 = "sha256-Cs9RRubxy0DY6ILRZY36HtcoqBvzbN7NEfpREq1KBBQ="; fetchSubmodules = true; }; From 04de1306ba22e1b2147c4a8028e9209ffcd8884c Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Tue, 3 Aug 2021 11:52:20 +0000 Subject: [PATCH 1319/1522] vimPlugins.himalaya-vim: fix failing build (#132517) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix `himalaya-vim` failing build I’m unsure as to why the configure phase `cd vim/` is no longer working, but this patch phase copying files up a directory workaround is building for my NixOS locally. * consistent comment indentation * Apply suggestions from code review Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- pkgs/misc/vim-plugins/overrides.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0ae30ec468b..af0c6d4c806 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -298,8 +298,12 @@ self: super: { himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; - configurePhase = "cd vim/"; dependencies = with self; [ himalaya ]; + patchPhase = '' + rm -rf !"vim/" + cp -vaR vim/. . + rm -rf vim/ + ''; preFixup = '' substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ --replace 'if !executable("himalaya")' 'if v:false' From 55e6716c516d9cfe37d617a68aaf3dc094dcc598 Mon Sep 17 00:00:00 2001 From: Michael Adler <therisen06@gmail.com> Date: Tue, 3 Aug 2021 14:29:31 +0200 Subject: [PATCH 1320/1522] go-task: 3.6.0 -> 3.7.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index d9b32c2c524..c1cff6562f2 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-3DTjxcMxgaTMunctHaCgOX5/P85lJDRin6RpMuv9Rfg="; + sha256 = "sha256-EksCnhSde25hradmKaDSOfIa/QnMAlIbgbQWX6k5v+4="; }; - vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; + vendorSha256 = "sha256-Y2Yuc2pcxW0M1CJfN3dezPB9cg6MvOUg5A+yFHCwntk="; doCheck = false; From cf0a38bb4bf1d911485737ef24a86073cc0989ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=22Vin=C3=ADcius=20M=C3=BCller=22?= <"vinigm.nho@gmail.com"> Date: Tue, 3 Aug 2021 09:45:38 -0300 Subject: [PATCH 1321/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 322 ++++++++++++++-------------- 1 file changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 0b80612a248..1c9d66f1177 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-28"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "dce088a4f07c55f7cff4eef90224fa85aa402877"; - sha256 = "17i58pfyq9950pkjcaiknx2bmp34x2sc3vswjpxj905d0ni36z9d"; + rev = "fa032b1b7fde1cb00bfa3e16a0d3ebd37a7d8be4"; + sha256 = "0gdascxqbydpf60rnk9zqrvjjhplc6qgy16k4m5k2x6q1zh7g64a"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-06-12"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "33639e53d0bf69444275ed048c5bfd7e29396634"; - sha256 = "0zqc4j0nbdhap8a67529n2k4k53xnqxrjsn2a4sdqdwvm207y6r9"; + rev = "f677f1d93be06c41eaabc87d845cdd5bd46a259f"; + sha256 = "1crd8gyzqgycbcb9aipn31kphz3j1y1rlzqivfvgk2zqf550dqis"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "75fa52709d1eb4a981075ef7e3cb9e220cc45bf3"; - sha256 = "0syb3f0m7d5pv4ikj7ss8c81vzz0a71axfplvs9i9z9q1qrp3jkj"; + rev = "2dfc18f269ea74502cfbb8fed0e6ef5408fc5aea"; + sha256 = "1sf65kgjd8glx2y7jm4ysmk5yn1hrcmprd6ybc2n5gyi9b2ikrzq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -521,12 +521,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-06-26"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "5b133aaa8c15f1c6fa831713892efd87189b0637"; - sha256 = "18cb39d113z8yxriidc0dmkkkzpp6x5hl414n5fcqwhjk5h514rn"; + rev = "415535475c43fedb8bccd72fbcc00bb850113eb7"; + sha256 = "02blpv258ibzk2bz1bjcjcqiab9lb6ilhclj5s1abwblvn713i47"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -726,12 +726,12 @@ final: prev: completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-07-03"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "22624f0aa5d1fdd0c84456300d2390b223c1a226"; - sha256 = "133zmiblkh145abrv9xagzq3qw504g1nvm5v1vmxhxsa7rilr376"; + rev = "139fb6cfbd9f7384a5489d3e4afdacb8ed977ab0"; + sha256 = "1641gx74mqbsp42m6z695l8xlr56b79vklghjdxywi35xbz4yq22"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -822,12 +822,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-07-21"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "2cad943df739c1fcf4d923854ae642fde38b477f"; - sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb"; + rev = "570c13efcab0191e1ab3837c712c711944cbb21d"; + sha256 = "09iwiicasv9qj8lbs3gljgha91s35xd8cbchmjn6k0ldc8nc19n7"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1510,24 +1510,24 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-07-22"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "b5977da87ab7725d5bd9f46fd691eca433503835"; - sha256 = "1j5b2nhmc4kq23dzhwsspwqx9shxpqp57175j0zr53phx01q3qcr"; + rev = "37fc982d56f8bfe1cce8209414752e046effc65c"; + sha256 = "1qzkvbdgr4h7bmql33na5h93jrjcf2m96j5y9vi79rvsl8wwjqww"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; - version = "2021-07-28"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "cfc0ecfd5e6d37e45ca5102e76cbbbc8f5a03d26"; - sha256 = "03qjlbby7ayy7q4wasz6k3blvfwy2ph7nvw3zmfw8rwmb2n7w6hc"; + rev = "9977073d8f5c064785ff6b44aad30cbc6d887da0"; + sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1546,12 +1546,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-07-24"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "a4d4288a11d0e50214c4f5745da5f8ce39cb2a6d"; - sha256 = "1ldv2ar8dm2arawxkzi2r7r1c6wacl9g9dkmyib038bdmr4qfn1g"; + rev = "ff74cd42ca7e76691e826dbdc7efe7ab683e9856"; + sha256 = "0h7i45rwzf3b8xm1rbyly287769fq1xyvl51sa44nghdy6zhx7vi"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-07-24"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "d5bf63e50c1c7923f1de2d10d8d822f6eb8c872e"; - sha256 = "14h8kd01674i82npc2b58ivhj2d80nb1x8v0j7ag5c5n24p1nphf"; + rev = "459179fd7711fcec5c4926903e0785a8f464b21d"; + sha256 = "1fvx3513pbsasar4bh06jaxaj8vaq1y65id2pppkgxp7jsknrf4i"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1871,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0d45fff0a28cebdc87604117c0fc46f3a64550f6"; - sha256 = "11mbcblgzsp7mzsy1knjd3cjcl60x45d57jf2nbcnf0ml312m1qc"; + rev = "97ff7471a88e35dd1e73be1f8d70d274f44dcb26"; + sha256 = "0m880kdyyarjj8gyqlq2vfhf6bxmax04p0a8k8yc8sz6lvl78avj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2099,12 +2099,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram-nvim"; - version = "2021-06-14"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "d8300f996fde96fc37c02b89f70642c1c44057a3"; - sha256 = "0g9i5mgd69kgkl27my1xnyd3yf77c8313ikbhm7cn6i6iqml1blf"; + rev = "5598fea84f0bab236293793a6398fb7fbbf1cbc6"; + sha256 = "0a5fgnqh475ngv4n4xbxzisvcx9vs1w4qn1k4imh8p61n02q0h8w"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -2231,12 +2231,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-07-19"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "0257caac96b28ec9efd80a00c13d31c469357f5b"; - sha256 = "0r5c99xzsizqpk4h35lp3ip8lqang2vvg01vrv0bad3wqnjqq1d7"; + rev = "e3b218d15f97f8108e2f2864ee78343df612fe99"; + sha256 = "022hkbs0ngb1m1pxdx8k3f3nv7h06jlwnhmbc7r88g0bzscg53d9"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2628,12 +2628,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "98841f4c3262214513f4f0de7d944d8384d50803"; - sha256 = "0d0kwip2yds2m25q3f5mmrsqk8jmv3zl17mvg1jbdwmklyqwkk9f"; + rev = "8668745f3209a79204056d076d23a69d540b9156"; + sha256 = "09fy66ifj5nxg57vs4mdz3nyyl447a0qc8idvbd64xi4h2kavcf8"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2712,24 +2712,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "9fcc1de38e861a42433ec25c3513b4c2f98d2422"; - sha256 = "0sgh7nz3w7whfyvwwbpi610svwdq95wbr3awx17sjvvxhp5pcavj"; + rev = "fbec3fe2b885ef365431146296bcce29de9478a8"; + sha256 = "1d6mp96gx03n5087zwsydm33zyll8daw03wx3lsg0wpvp5ph43cd"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-05-22"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "3469f0c9a6767625d532a74a167f5d6ba2b8c5bf"; - sha256 = "1ff1i6m9kk3n36n24c109g6yddcbbzm10iigvi0pv1z2fdpsrl07"; + rev = "7ffcfe88334d0887833c9d8ca6f1231a11612cb5"; + sha256 = "0i40z1a5h8rk4blwadcxpid10i264gbl7lhl16hjllyl77bbvvgs"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -2772,12 +2772,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-25"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "631a1551c9e0d983e9545d37c79fb024f4680a83"; - sha256 = "0jiq37bfn8wpbrk62xrknglfkh3hbsx325crgg7amsk0bkhi8nav"; + rev = "34918ba5f7bccf2be6f98fbb120f52eb6fa84c09"; + sha256 = "074z42nhrhfg6f5v9vn6cm2gv4vfcgi019y4cf08vgm7lhlbz27r"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3192,12 +3192,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-07-18"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "ee83d4fa8ac946e5e0064e65a5276e1ea030ae28"; - sha256 = "0mrydz0xl2yqgsp1nsz4p55mjhx7x7z7pahcq3y5mzzla687dnqg"; + rev = "c8485a2fc40a24dff58c0a380cac6ee21e59d808"; + sha256 = "0ksj2b3ccnkq5h1cvagbrp0y0x22g21v86h0m7hl77kcdn6y9vwr"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3240,12 +3240,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-17"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "7f9f1d328c218b041ce899def4923334a5355c14"; - sha256 = "1f7acjy3xhiz2yzkdp5x5f4p28zz583h7snyzrc2l8w7fwz600x9"; + rev = "156bfdab640c6f57a6933e5e4fa60f9648f19857"; + sha256 = "0x3rryszciai5012c6kv7dyb8jlyn3w04j22k9x7n9nids42xhqx"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3348,12 +3348,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-07-29"; + version = "2021-07-31"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "85364c56c4d85af69ac6c57262b40812a77be1e4"; - sha256 = "0qvy4ragn5f93ckmnph5zb90yfp7sv47zhz68f9cmvfrvc8hfa6i"; + rev = "2c87cae76ed88f3b0c957df68c03573ecafa3728"; + sha256 = "0byi8yrz9hjaprx6wqsa6p96vm59hzqmscjld0znjf83ljg83w3r"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -3432,12 +3432,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-07-29"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "9de4725aff31c196602274ab9521ac740c9c801f"; - sha256 = "0fjws1k352ij01gfz3dr5r5x5h8r3lh4s6bfz2apjc4m47nghiy7"; + rev = "ed06cc9f0e40e96bb7e3900bf6a56858db21e3f7"; + sha256 = "0qr7j9wf7kdkcv9a151nz0sjzvcx926dxss17b7mwrq3bpwhckvh"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3492,12 +3492,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "7c50ca73dc2f89b128f1c42a4e04144d1213e7dc"; - sha256 = "1qd7hmsxcn6w5fvqn28nb48xp33nl2hzgvh0fy12mzyq39d0n6ld"; + rev = "c18add556757ac176effe8328f98702f7c703b94"; + sha256 = "1m12knmxvvhxdqhwdww7p7an8s7cja2fqp71l1gmsn1cv14iiij8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3540,12 +3540,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-29"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "ad40d49f4512cf77c6527cb6aa9ee6b1c97855c9"; - sha256 = "0qmdyr26va3il80lb166n0cadkxxq1vf0q56zj6vqihv4rn9nas5"; + rev = "8b937f612e44e62c29db497b6af149719c30b9aa"; + sha256 = "1s32zby1h0id8ciyi927wl63b8plzg3cg38akj73iqpv7dhdqgls"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3660,12 +3660,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-07-28"; + version = "2021-07-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "0b5f6cf6da0884d0788239d9270a2bd89855ec09"; - sha256 = "04ha4zjjb78i98vn21v404g3fki77mwax7lq5w1hmmsp4qxmyv5k"; + rev = "a47408920f8dd5ffb1db821ce72dd6ef21730c63"; + sha256 = "1g9nlkdcvhzs6ds7493fcrgi5gizn4h517h65ynr31cfnajxm8wb"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3684,24 +3684,24 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-07-29"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "388d1f952cf849d8ff066f87c13d7d162ae49e89"; - sha256 = "001s0g80kv1xx6zjza0nai0x10p7j0ysvf31xm6clbl2r023zv2h"; + rev = "f2c8d5b70f4cad18db5f15e897ba006aeba08f80"; + sha256 = "0vq9lb2vir0am85nwjqphdmlx7akvpvcfgw3mr15rvnc9spzh8ix"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-07-19"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2"; - sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86"; + rev = "f95263e2d0d9177143d3203bb32adc8b24d34c0c"; + sha256 = "1r5nlsbrs8sigs7ny23hiywr475dg1n15aqashzan4m1sgn37nab"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3732,12 +3732,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-07-27"; + version = "2021-07-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e5ed033f610837c1b145c904063ef7164ae1c435"; - sha256 = "1ga7k2rhhlkd97157qq2symmck6ygrc8mfvpn0w4pqgpgw54dyfq"; + rev = "a0c6b2756f5faabf997a27fdbb085b3931f5945b"; + sha256 = "14p445rdhimr4pykz4wyra3ya3h4x70vh7xlajfrdpsb3wwd94mc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3756,12 +3756,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-28"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3df7c2afa4e6e5c9e9c9f85ab275837248ed7db4"; - sha256 = "16krk21g2r45h9hds2jpgplchqzcqgpqg6pdw89pvzx3b5qazab2"; + rev = "4bcc485e2e6ccb4ed7bdd9f1e12c9c4ad6fe1f0e"; + sha256 = "18csqavwmdz7yn6j1wp9ypmpdkw6147xvn4gmd50wkphfh74bc67"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3804,12 +3804,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-07-28"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "53d9d8057ca33151e0dfe5c3e31021ab2461831f"; - sha256 = "059ww0s49li41wy7l48xg33nj3vsp36ksbadhzpzbykxs2kwdqfj"; + rev = "8cba9eee2ae26209a05fb5e511f123677d108c96"; + sha256 = "1brbjjjsi8gdzqqba8l0v8n2d5chs396w9mr152iflck6vqfad9c"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3828,48 +3828,48 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-28"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "f9ffba63cc77837edaceae61a5b9de6e77c88e7f"; - sha256 = "0j5znzrpmxmzkb2l2rpp9iaxggmnjz5lns648a67x1bkilcrmnx4"; + rev = "66a7ea31fb571fddbfab9244d343612c83ae40f0"; + sha256 = "143sj5kqx880bfabd816x4h0ckrvd3mc5wqv9h1rbw4vlbpk5zj0"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-07-19"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36"; - sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j"; + rev = "7bed04718e146787c54784853817797258703f0a"; + sha256 = "1g1vb9kgc13mqji3yrd4wjpryrvf605yf251k6gfkpnaz0mhzlz9"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-29"; + version = "2021-07-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dedd74ebdbb8a921d95e3c670be9684d9f655c34"; - sha256 = "1bkakcshw8f5j1iq4hm723jyc9dwwixa4fz5hb32wl7mxxqh9x82"; + rev = "27f5e99cdd1b4e7f6a5cc30016d990ebf81a561c"; + sha256 = "1msnzijwz4bj7hv8zkzp0x3y3dwwm3v5n63pmdx865d8ggb8dln6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-06-05"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "bdc598b519cfbfdf61baf9a27953da2fc1642b23"; - sha256 = "1slyjfjcrna06b23kbw4vf81qbncgimzhw1qsqwsqldnvdc35lcr"; + rev = "b7c04d6701b67795687c5d3b088be0218945b561"; + sha256 = "0hqc8avln563bjdm7lsxjll37k3njy5nd767bg8yg8vm0mv8zn0p"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3904,20 +3904,20 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "04a3fbe657581f6f45c0bb11735a6a4bcecdc46f"; - sha256 = "1widam8cji1l7z628gsv3s15iid5jfq83df62iamfcjrbxzqcw56"; + rev = "b100e6188c4b1e90af4066593e36a9f4ca7364b7"; + sha256 = "1npcs5dxylny79hbkk1cnp3xp2yh4s3s6j314721k2v5mhim3dw2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-26"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "dab7f11a14155fbc6076dccbb48cb7ab14bcbde5"; - sha256 = "00bcbkskfigf3c83b28zgckiafh3xlv7azrw492ardf4ks3zdv79"; + rev = "94138b1ba193d81f130dbe9fc1f255f97b7697d5"; + sha256 = "1ha31j31yv8r46pl607s06xgjri7rp47w5zjf0k7qrg1cqgp9i5h"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4068,12 +4068,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-29"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "637520cbd85629bfee9e8bd2eb15d775d4c85373"; - sha256 = "03s35f49lasx5bxigsd5miqfkm2jdz6mh72y9hllk8rzimi59agz"; + rev = "2794f0767920c884736b746d1c0824cc55874f4b"; + sha256 = "19cwjm98nq0f9z0kxc8l4350pkaw3m2dv5wb7nlwcz0m9w3dri0w"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4176,12 +4176,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-07-12"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974"; - sha256 = "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny"; + rev = "a7e62e27689e6c2ea71f4e03cc06403f092a5ce3"; + sha256 = "0mx1ybp3hv9q4p65wcqyl3i2156qh4g00qvjizcbdxcs2xxgiy35"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4513,24 +4513,24 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-28"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "858bb2a293e74b7c45b281491afd8e67cd8810c6"; - sha256 = "1sjyffv375j1jgkhhpmbg880dvakn2ckw8h5a0wpvyxaqd84yrpv"; + rev = "8ead43e5fb5cf94976f1a40319d8f5e74d204e68"; + sha256 = "02hvy6ffzyc0gf7bngp6pngyf5an18f63mzdpxc3ldnxrd5dimjj"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2021-02-15"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "87c745d8d506fc1eecc1d81df15d5bde1658a2fc"; - sha256 = "0v0ip731lclh9aqrmlqwnnz4skgawaq3invghh1c7lh0zdq22lzb"; + rev = "7a66142d0ddfb18fc746f76396af0218b6b6146f"; + sha256 = "16q5m64jhv41sphpk553zdsdhvc08lgyla256qby462sfhcvp80a"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -4850,12 +4850,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-07-17"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "e5c60658d9aca5af479ef6371037cc6453a6b1eb"; - sha256 = "07l7acnhp9nwwkmybjs2fdprql5nanyxxn9z3wl59y8jx2ca44p7"; + rev = "a27352edee29fad650f129a41908bc62efc82978"; + sha256 = "111z3kc3wc8n8cdmc0v4aysh8irfg4px0n0224wvsswax8ql2q74"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4971,12 +4971,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-07-29"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "81c615a9f108093b64b2b8f1b30837a34a8486cc"; - sha256 = "1dqgxl7748mvagz3s58hfqb0yxwqx2vww1402zw20qv9736kcfsv"; + rev = "cc3334e140dd3c21246fbd58233db5f01856ed56"; + sha256 = "0z1kfkfwl9fx9a4imh9xyjxnip83yh98an22c3nghmvick5ssryi"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5056,12 +5056,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-07-27"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "a0a5714910d29ac3bfe91a2529a9c8cb28de77cc"; - sha256 = "0y31fi2103ggv5s2lg9wqxvc0xghh3i3iwhzrwxylvimajcv4s0f"; + rev = "23ea1961b97b6d33bb7226d7415d9c3338defa13"; + sha256 = "11zvsclgfrc05q4k0sj14h596hv5gfh00dx3h987w2hawn0qbsk8"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5201,12 +5201,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "82f4d3028b64ad930123a5c713c538c872185a80"; - sha256 = "08dv4vxa8rn5xbdakv9j4vd1287bpdgckzayl3bmy4rn9djmk8vs"; + rev = "f8caad1d6bd19dbd79945850342b49df41928525"; + sha256 = "1liwcrb5w5s9bgniz6byw1c68x42z6162lsshhl1cm8s5ywh4sn5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6366,12 +6366,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2021-05-12"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "09fb2f51dcd022a6be20b48a730df493f4b3ca2d"; - sha256 = "1bsy8illa9xsawx6lfs67y2xri38fpxdb4xz25ajy43snls41say"; + rev = "e79b6cca4bfd7c56542353775d337a08dcbd9486"; + sha256 = "1m5ipmgw45svdlqp8rj5kpdfczzn03rgav2j7qraqrl37bwlkxzd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -6510,12 +6510,12 @@ final: prev: vim-docbk-snippets = buildVimPluginFrom2Nix { pname = "vim-docbk-snippets"; - version = "2019-09-13"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "jhradilek"; repo = "vim-snippets"; - rev = "b8604893f46f6c570a55efff733f0371ac8a805d"; - sha256 = "1qz3azgzv9718s2a6h8xw5nrvs4j776csmzsn9chvykdpx8rwim1"; + rev = "81a8dcb66886a0717e9ca73c8857ee90c3989063"; + sha256 = "0d6532qx66aiawpq2fdji0mnmvnlg5dnbvds5s4pgzafydikpr70"; }; meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; @@ -6978,12 +6978,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-06-28"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "32bcf757e455ab3b87c9201247b9a6b091d44ea0"; - sha256 = "1ymd4dqd8725962iz12slrdgjp2sxqrrmznq18za4q14psy6dcin"; + rev = "2ee4f84fa9871ce666d89907d3a3985d5109647f"; + sha256 = "1554919qfr22831hw708hfvi006izzd66ygkymxjc3lsgywp1rl8"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7508,12 +7508,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-07-02"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "dedbd5358a5b3b519f1f2c9c032ea6e4ff41d6b4"; - sha256 = "01jgblg1qfq9149fab5kcaa3q5fa7d8psxvgs8gkbs109nxkrjc4"; + rev = "68c64c36778dcaca6c94275ffcb703e772aad19f"; + sha256 = "0x79w4lm3qfph4s86jdksyb6m1df2w32gp9yg2vqazk4szbcvd8z"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -7712,12 +7712,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-07-17"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "4e4404dffbd99159af9cfe816d13a6e69aadcee2"; - sha256 = "1a1k27gvsd2ssnw3w8b29z3q8z2w2jxgcwpx5gd6djk1id26rhb6"; + rev = "d520f12ef8e93f457f5b78ff84d464f83f778484"; + sha256 = "07hm7sz6wazb3shjf5iggkgmif7ahyjzln855808dggglsxn765j"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -8181,12 +8181,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-06-09"; + version = "2021-07-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "1c56693951ce81f344cff0d7c8a6f7ea62a06981"; - sha256 = "017g2cq05pfxjmcdm42qz6pv2cf2v18lnnrfnizm1cd388r9byll"; + rev = "38476f9e61582d17d5e724fd3977913a9c0af5a4"; + sha256 = "1zadap09iqdbssmqf44543hhkga696bxfv3gjcxln6xjfwmvmrck"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -9370,12 +9370,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2020-04-26"; + version = "2021-08-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "4afbe5ebf32ad85341b4c02b0e1d8ca96a64c561"; - sha256 = "052amdb4bd2qbip3z9xz7h1cv61k4p038j65yijm68vy0hf2724y"; + rev = "ee21252c035004efd6fea40335cd311e71cf7a33"; + sha256 = "1grl78f5nhdryg1w0xh9j6fs1xd3j6dcv92vcvl9rp87ixgnmbag"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9418,12 +9418,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-07-27"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "ccb024c03dda7eb01a5c057408b1828334d97e0a"; - sha256 = "1p4hlxifmmhr7rg4cfxnwph1z5i895kwqq2nbdd8dashrqcl0vc9"; + rev = "015c02c0246150d87f66e88f226e73e37a296191"; + sha256 = "01m20bng31bs8r99bayw6qrkg5p1pqnwpc9k6cljpn7a52gbapwk"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9766,12 +9766,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-07-13"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "9c806d2a014a21ef4bce49a18791d04e1a66bdf7"; - sha256 = "0imqzcdw28d5nmv2837x1m07pmir1yh9zbf52nsnvibw09z26kg8"; + rev = "27eb464b8ec3df416cf72803a787edbf2e60440e"; + sha256 = "1swgz7yjlkx6fqgf03kypywqhpqsb0pkjk3a9qvhj1wv6z5f9g0q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9779,12 +9779,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-28"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "6e3d52a23972b309b2d9f1ade7a16ed37a88d26e"; - sha256 = "0650gjgicavqjapp86w7634ya0bjykcfkvdrcvpx72vnfjl7myiz"; + rev = "b704fd3dc9979ca6b9ddf2894177af950a01f0be"; + sha256 = "17rwbfq1vxd9ar6dwwq380qq1vkqwz6nq3x22bkbhj4jdaqp069x"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9839,12 +9839,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-06-16"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "d709462958f2167008c9653a9cbc9de1067bfa2d"; - sha256 = "1fq4ah4jzfddg2w7n1sy9fjfy6z9ab3jslfx48n991i0kwbw4vp0"; + rev = "cb908f21c23d9c9ebce678c8dbc7a0f876384b8c"; + sha256 = "0s2r7k1g7bzwy0yc7hx6iqyha3839jngr2db5gdihnc1niq9z8q5"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; From 0fb2c3063121e80f1e2088179e6fea72fb7a08b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=22Vin=C3=ADcius=20M=C3=BCller=22?= <"vinigm.nho@gmail.com"> Date: Tue, 3 Aug 2021 09:46:24 -0300 Subject: [PATCH 1322/1522] vimPlugins.wilder-nvim: init at 2021-08-02 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1c9d66f1177..501c08a5f49 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -9897,6 +9897,18 @@ final: prev: meta.homepage = "https://github.com/folke/which-key.nvim/"; }; + wilder-nvim = buildVimPluginFrom2Nix { + pname = "wilder-nvim"; + version = "2021-08-02"; + src = fetchFromGitHub { + owner = "gelguy"; + repo = "wilder.nvim"; + rev = "a8a2feda01b8d498b49ef133f648297959de2fa8"; + sha256 = "0sbcgv6zw9i7mv8plv7kr14zpvd24wlbgpx1k0hdfs3wbb8md9ya"; + }; + meta.homepage = "https://github.com/gelguy/wilder.nvim/"; + }; + wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire-vim"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 96f2ce18256..e9dc945f433 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -164,6 +164,7 @@ fszymanski/deoplete-emoji garbas/vim-snipmate gcmt/taboo.vim gcmt/wildfire.vim +gelguy/wilder.nvim gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon @@ -494,9 +495,9 @@ nvim-telescope/telescope-symbols.nvim nvim-telescope/telescope-z.nvim@main nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter -nvim-treesitter/nvim-treesitter@0.5-compat nvim-treesitter/nvim-treesitter-refactor nvim-treesitter/nvim-treesitter-textobjects@0.5-compat +nvim-treesitter/nvim-treesitter@0.5-compat nvim-treesitter/playground oberblastmeister/termwrapper.nvim ocaml/vim-ocaml From c3c4ef859a31d59e223433eba61fbaf0140208f8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 13:52:40 +0200 Subject: [PATCH 1323/1522] gprbuild, xmlada: init at 21.0.0 GPRbuild is a multi language build system developed by AdaCore which is mostly used for build Ada-related projects using GNAT. Since GPRbuild is used to build itself and its dependency library XML/Ada we first build a bootstrap version of it using the provided bash build script bootstrap.sh as the gprbuild-boot derivation. gprbuild-boot is then used to build xmlada and the proper gprbuild derivation. GPRbuild has its own search path mechanism via GPR_PROJECT_PATH which we address via a setupHook. It currently works quite similar to the pkg-config one: It accumulates all inputs into GPR_PROJECT_PATH, GPR_PROJECT_PATH_FOR_BUILD etc. However this is quite limited at the moment as we don't have a gprbuild wrapper yet which understands the _FOR_BUILD suffix. However, we'll need to address this in the future as it is currently basically impossible to test since the distinction only affects cross-compilation, but it is not possible to build a GNAT cross-compiler in nixpkgs at the moment (I'm working on changing that, however). Another issue we had to solve was GPRbuild not finding the right GNAT via its gprconfig tool: GPRbuild has a knowledge base with compiler definitions which run some checks and collect info about binaries which are in PATH. In the end the first compiler in PATH that supports the desired language is selected. We want GPRbuild to discover our wrapped GNAT since the unwrapped one is incapable of producing working binaries since it won't find the crt*.o objects distributed with libc. GPRbuild however needs to find the Ada runtime distributed with GNAT which is not part of the wrapper derivation, so it will skip the wrapper and select the unwrapped GNAT. Symlinking the unwrapped's lib directory into the wrapper fixes this problem, but breaks linking in some cases (e. g. when linking against OMP from gcc, the runtime variant will shadow the problem dynamic lib from buildInputs). Additionally it uses gnatls as an indicator it has found GNAT which is not part of the wrapper. The solution we opted to adopt here is to install a custom compiler description into gprbuild's knowledge base which properly detects the nixpkgs GNAT wrapper: It uses gnatmake to detect GNAT instead of gnatls and discovers the runtime via a symlink we add to `$out/nix-support`. This additional definition is enough to properly detect GNAT, since the plain wrapped gcc detection works out of the box. It may, however, be necessary to add special definitions for other languages in the future where gprbuild also needs to discover the runtime. One future improvement would be to install libgpr into a separate output or split it into a separate derivation (which would require to link gprbuild statically always since otherwise we end up with a cyclical dependency). --- pkgs/build-support/cc-wrapper/default.nix | 5 ++ .../libraries/ada/xmlada/default.nix | 35 ++++++++ .../tools/build-managers/gprbuild/boot.nix | 90 +++++++++++++++++++ .../tools/build-managers/gprbuild/default.nix | 65 ++++++++++++++ .../gprbuild/gpr-project-path-hook.sh | 8 ++ .../build-managers/gprbuild/nixpkgs-gnat.xml | 56 ++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 7 files changed, 265 insertions(+) create mode 100644 pkgs/development/libraries/ada/xmlada/default.nix create mode 100644 pkgs/development/tools/build-managers/gprbuild/boot.nix create mode 100644 pkgs/development/tools/build-managers/gprbuild/default.nix create mode 100644 pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh create mode 100644 pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 235d244a7c0..678027f9bf4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -234,6 +234,11 @@ stdenv.mkDerivation { wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind wrap ${targetPrefix}gnatlink ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatlink + + # this symlink points to the unwrapped gnat's output "out". It is used by + # our custom gprconfig compiler description to find GNAT's ada runtime. See + # ../../development/tools/build-managers/gprbuild/{boot.nix, nixpkgs-gnat.xml} + ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped '' + optionalString cc.langD or false '' diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/libraries/ada/xmlada/default.nix new file mode 100644 index 00000000000..b855166d559 --- /dev/null +++ b/pkgs/development/libraries/ada/xmlada/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, fetchFromGitHub +, gnat +# use gprbuild-boot since gprbuild proper depends +# on this xmlada derivation. +, gprbuild-boot +}: + +stdenv.mkDerivation rec { + pname = "xmlada"; + version = "21.0.0"; + + src = fetchFromGitHub { + name = "xmlada-${version}-src"; + owner = "AdaCore"; + repo = "xmlada"; + rev = "v${version}"; + sha256 = "00vljkvck951nj853v9sda5qbfm1mp8y2k61ja2595rmp8qcrazw"; + }; + + nativeBuildInputs = [ + gnat + gprbuild-boot + ]; + + meta = with lib; { + description = "XML/Ada: An XML parser for Ada"; + homepage = "https://github.com/AdaCore/xmlada"; + maintainers = [ maintainers.sternenseemann ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix new file mode 100644 index 00000000000..352cd0b137b --- /dev/null +++ b/pkgs/development/tools/build-managers/gprbuild/boot.nix @@ -0,0 +1,90 @@ +{ stdenv +, lib +, fetchFromGitHub +, gnat +, which +, xmlada # for src +}: + +let + version = "21.0.0"; + + gprConfigKbSrc = fetchFromGitHub { + name = "gprconfig-kb-${version}-src"; + owner = "AdaCore"; + repo = "gprconfig_kb"; + rev = "v${version}"; + sha256 = "11qmzfdd0ipmhxl4k2hjidqc9i40bywrfkbiivd3lhscxca5pxpg"; + }; +in + +stdenv.mkDerivation { + pname = "gprbuild-boot"; + inherit version; + + src = fetchFromGitHub { + name = "gprbuild-${version}"; + owner = "AdaCore"; + repo = "gprbuild"; + rev = "v${version}"; + sha256 = "1knpwasbrz6sxh3dhkc4izchcz4km04j77r4vxxhi23fbd8v1ynj"; + }; + + nativeBuildInputs = [ + gnat + which + ]; + + postPatch = '' + # The Makefile uses gprbuild to build gprbuild which + # we can't do at this point, delete it to prevent the + # default phases from failing. + rm Makefile + + # make sure bootstrap script runs + patchShebangs --build bootstrap.sh + ''; + + # This setupHook populates GPR_PROJECT_PATH which is used by + # gprbuild to find dependencies. It works quite similar to + # the pkg-config setupHook in the sense that it also splits + # dependencies into GPR_PROJECT_PATH and GPR_PROJECT_PATH_FOR_BUILD, + # but gprbuild itself doesn't support this, so we'll need to + # introducing a wrapper for it in the future remains TODO. + # For the moment this doesn't matter since we have no situation + # were gprbuild is used to build something used at build time. + setupHook = ./gpr-project-path-hook.sh; + + installPhase = '' + runHook preInstall + + ./bootstrap.sh \ + --with-xmlada=${xmlada.src} \ + --with-kb=${gprConfigKbSrc} \ + --prefix=$out + + # Install custom compiler description which can detect nixpkgs' + # GNAT wrapper as a proper Ada compiler. The default compiler + # description expects the runtime library to be installed in + # the same prefix which isn't the case for nixpkgs. As a + # result, it would detect the unwrapped GNAT as a proper + # compiler which is unable to produce working binaries. + # + # Our compiler description is very similar to the upstream + # GNAT description except that we use a symlink in $out/nix-support + # created by the cc-wrapper to find the associated runtime + # libraries and use gnatmake instead of gnatls to find GNAT's + # bin directory. + install -m644 ${./nixpkgs-gnat.xml} $out/share/gprconfig/nixpkgs-gnat.xml + + runHook postInstall + ''; + + meta = with lib; { + description = "Multi-language extensible build tool"; + homepage = "https://github.com/AdaCore/gprbuild"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/development/tools/build-managers/gprbuild/default.nix new file mode 100644 index 00000000000..3155151ae0f --- /dev/null +++ b/pkgs/development/tools/build-managers/gprbuild/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, gprbuild-boot +, which +, gnat +, xmlada +}: + +stdenv.mkDerivation { + pname = "gprbuild"; + + # See ./boot.nix for an explanation of the gprbuild setupHook, + # our custom knowledge base entry and the situation wrt a + # (future) gprbuild wrapper. + inherit (gprbuild-boot) + version + src + setupHook + meta + ; + + nativeBuildInputs = [ + gnat + gprbuild-boot + which + ]; + + propagatedBuildInputs = [ + xmlada + ]; + + makeFlags = [ + "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}" + "PROCESSORS=$(NIX_BUILD_CORES)" + # confusingly, for gprbuild --target is autoconf --host + "TARGET=${stdenv.hostPlatform.config}" + "prefix=${placeholder "out"}" + ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + "LIBRARY_TYPE=relocatable" + ]; + + # Fixes gprbuild being linked statically always + patches = lib.optional (!stdenv.hostPlatform.isStatic) (fetchpatch { + name = "gprbuild-relocatable-build.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/relocatable-build.patch?h=gprbuild&id=1d4e8a5cb982e79135a0aaa3ef87654bed1fe4f0"; + sha256 = "1r3xsp1pk9h666mm8mdravkybmd5gv2f751x2ffb1kxnwq1rwiyn"; + }); + + buildFlags = [ "all" "libgpr.build" ]; + + installFlags = [ "all" "libgpr.install" ]; + + # link gprconfig_kb db from gprbuild-boot into build dir, + # the install process copies its contents to $out + preInstall = '' + ln -sf ${gprbuild-boot}/share/gprconfig share/gprconfig + ''; + + # no need for the install script + postInstall = '' + rm $out/doinstall + ''; +} diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh new file mode 100644 index 00000000000..f98b2ab9e58 --- /dev/null +++ b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh @@ -0,0 +1,8 @@ +addAdaObjectsPath() { + local role_post + getHostRoleEnvHook + + addToSearchPath "GPR_PROJECT_PATH${role_post}" "$1/share/gpr" +} + +addEnvHooks "$targetOffset" addAdaObjectsPath diff --git a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml b/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml new file mode 100644 index 00000000000..ead88dc365c --- /dev/null +++ b/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" ?> +<gprconfig> + <!-- This differs from the default GNAT compiler description + in the following ways: + + * gnatmake is used over gnatls to detect the GNAT version + since the latter is not part of the wrapper. + * to find the runtime libraries, we rely on the symlink + ../nix-support/gprconfig-gnat-unwrapped which is a + gprconfig-specific addition to the cc-wrapper we employ + for Ada compilers (which is only GNAT at the moment). + + For documentation on this file format and its use refer to + https://docs.adacore.com/gprbuild-docs/html/gprbuild_ug/companion_tools.html#the-gprconfig-knowledge-base + --> + <compiler_description> + <!-- We would like to name this something different, so users + of gprconfig know this is something custom, nixpkgs-related, + but unfortunately the knowledge base depends on the name of + the compiler for e. g. linker settings. + --> + <name>GNAT</name> + <executable prefix="1">(.*-.*-.*)?gnatmake</executable> + <version> + <external>${PREFIX}gnatmake -v</external> + <grep regexp="^GNATMAKE.+?(\d+(\.\d+)?)" group="1"></grep> + </version> + <languages>Ada</languages> + <variable name="gcc_version"> + <external>${PREFIX}gcc -v</external> + <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> + </variable> + <!-- The ada runtime libraries and objects are only part of the unwrapped + GNAT derivation. We can't symlink them into the wrapper derivation + (at least not the canonical location) since that screws with linking + against libraries distributed with gcc. + + As a workaround, we create a symlink to the unwrapped GNAT's "out" + output in the cc-wrapper which we can read into a variable here and + use to find GNAT's Ada runtime. + --> + <variable name="gnat_unwrapped"> + <external>readlink -n ${PATH}/../nix-support/gprconfig-gnat-unwrapped</external> + </variable> + <runtimes default="default,kernel,native"> + <directory group="default" >$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory> + <directory group="default" contents="^rts-">$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory> + <directory group="2" >$gnat_unwrapped/lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory> + <directory group="1" >$gnat_unwrapped/$TARGET/lib/gnat/(.*)/adalib/</directory> + </runtimes> + <target> + <external>${PREFIX}gcc -dumpmachine</external> + <grep regexp="[^\r\n]+"></grep> + </target> + </compiler_description> +</gprconfig> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa642484b2d..23e5dd061e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13772,6 +13772,10 @@ in gotty = callPackage ../servers/gotty { }; + gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { }; + + gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; + gputils = callPackage ../development/tools/misc/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -19098,6 +19102,8 @@ in ]; }; + xmlada = callPackage ../development/libraries/ada/xmlada { }; + xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; xmlsec = callPackage ../development/libraries/xmlsec { }; From f4e018075e86bfb5f0e3dba72a8cbe831adac8d8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:26:29 +0200 Subject: [PATCH 1324/1522] gnatcoll-core: init at 21.0.0 --- .../libraries/ada/gnatcoll/core.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/ada/gnatcoll/core.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/development/libraries/ada/gnatcoll/core.nix new file mode 100644 index 00000000000..f5f84342137 --- /dev/null +++ b/pkgs/development/libraries/ada/gnatcoll/core.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, gnat +, gprbuild +, fetchFromGitHub +, xmlada +, which +}: + +stdenv.mkDerivation rec { + pname = "gnatcoll-core"; + version = "21.0.0"; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "gnatcoll-core"; + rev = "v${version}"; + sha256 = "0jgs2299zfbr6jg5bxlhqizi60si2m8vw7zq6ns4yhr38qqdskqg"; + }; + + nativeBuildInputs = [ + gprbuild + which + gnat + ]; + + # propagate since gprbuild needs to find + # referenced GPR project definitions + propagatedBuildInputs = [ + gprbuild # libgpr + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + "PROCESSORS=$(NIX_BUILD_CORES)" + # confusingly, for gprbuild --target is autoconf --host + "TARGET=${stdenv.hostPlatform.config}" + ]; + + meta = with lib; { + homepage = "https://github.com/AdaCore/gnatcoll-core"; + description = "GNAT Components Collection - Core packages"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23e5dd061e5..3e82f2e4fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15610,6 +15610,8 @@ in # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; From 41f190a3606b1d371b12135441e0ecd2f494d2de Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:30:38 +0200 Subject: [PATCH 1325/1522] gnatcoll-*: init gnatcoll-bindings at 21.0.0 gnatcoll-gmp: init at 21.0.0 gnatcoll-iconv: init at 21.0.0 gnatcoll-lzma: init at 21.0.0 gnatcoll-omp: init at 21.0.0 gnatcoll-python3: init at 21.0.0 gnatcoll-readline: init at 21.0.0 gnatcoll-syslog: init at 21.0.0 gnatcoll-zlib: init at 21.0.0 This inits a bunch of gnatcoll-* packages which are managed in the gnatcoll-bindings repository. I have chosen not to include "bindings" in their derivation or attribute names, since the GPR project definitions themselves all don't contain that as well, instead they are name `gnatcoll_${component}.gpr`. --- .../libraries/ada/gnatcoll/bindings.nix | 88 +++++++++++++++++++ .../ada/gnatcoll/omp-setup-text-mode.patch | 23 +++++ pkgs/top-level/all-packages.nix | 10 +++ 3 files changed, 121 insertions(+) create mode 100644 pkgs/development/libraries/ada/gnatcoll/bindings.nix create mode 100644 pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/libraries/ada/gnatcoll/bindings.nix new file mode 100644 index 00000000000..666989af0ac --- /dev/null +++ b/pkgs/development/libraries/ada/gnatcoll/bindings.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, fetchFromGitHub +, gnat +, gprbuild +, gnatcoll-core +, component +# component dependencies +, gmp +, libiconv +, xz +, gcc-unwrapped +, readline +, zlib +, python3 +, ncurses +}: + +let + # omit python (2.7), no need to introduce a + # dependency on an EOL package for no reason + libsFor = { + iconv = [ libiconv ]; + gmp = [ gmp ]; + lzma = [ xz ]; + readline = [ readline ]; + python3 = [ python3 ncurses ]; + syslog = [ ]; + zlib = [ zlib ]; + }; +in + + +stdenv.mkDerivation rec { + pname = "gnatcoll-${component}"; + version = "21.0.0"; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "gnatcoll-bindings"; + rev = "v${version}"; + sha256 = "1214hf0m8iz289rjpxdiddnixj65l2xjwbcr7mq5ysbddmig5992"; + }; + + patches = [ + ./omp-setup-text-mode.patch + ]; + + nativeBuildInputs = [ + gprbuild + gnat + python3 + ]; + + # propagate since gprbuild needs to find referenced .gpr files + # and all dependency C libraries when statically linking a + # downstream executable. + propagatedBuildInputs = [ + gnatcoll-core + ] ++ libsFor."${component}" or []; + + # explicit flag for GPL acceptance because upstreams + # allows a gcc runtime exception for all bindings + # except for readline (since it is GPL w/o exceptions) + buildFlags = lib.optionals (component == "readline") [ + "--accept-gpl" + ]; + + buildPhase = '' + runHook preBuild + python3 ${component}/setup.py build $buildFlags + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + python3 ${component}/setup.py install --prefix $out + runHook postInstall + ''; + + meta = with lib; { + description = "GNAT Components Collection - Bindings to C libraries"; + homepage = "https://github.com/AdaCore/gnatcoll-bindings"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch b/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch new file mode 100644 index 00000000000..07953809bb2 --- /dev/null +++ b/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch @@ -0,0 +1,23 @@ +commit 37c815ee660d1bf37256638d23b0346ad7cc19e7 +Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> +Date: Wed Jul 21 00:18:30 2021 +0200 + + omp/setup.py: open version_information in text mode + + Otherwise saving the config in setup_support.py will fail as a bytes + object is not encodeable as JSON. Luckily, version_information is text + anyways. + +diff --git a/omp/setup.py b/omp/setup.py +index 942ab1f5..5281398e 100755 +--- a/omp/setup.py ++++ b/omp/setup.py +@@ -25,7 +25,7 @@ class GNATCollOMP(SetupApp): + + # Set library version + with open(os.path.join(config.source_dir, '..', +- 'version_information'), 'rb') as fd: ++ 'version_information'), 'r') as fd: + version = fd.read().strip() + config.set_data('GNATCOLL_VERSION', version, sub='gprbuild') + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e82f2e4fc8..390a21a530f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15612,6 +15612,16 @@ in gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; + # gnatcoll-bindings repository + gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; }; + gnatcoll-iconv = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "iconv"; }; + gnatcoll-lzma = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "lzma"; }; + gnatcoll-omp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "omp"; }; + gnatcoll-python3 = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "python3"; }; + gnatcoll-readline = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "readline"; }; + gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; }; + gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; From 9bc1e429d022727f988fdbed89b1ef4ad44f149e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:43:11 +0200 Subject: [PATCH 1326/1522] gnatcoll-*: init gnatcoll-db at 21.0.0 gnatcoll-sql: init at 21.0.0 gnatcoll-sqlite: init at 21.0.0 gnatcoll-xref: init at 21.0.0 gnatcoll-postgres: init at 21.0.0 gnatcoll-db2ada: init at 21.0.0 gnatinspect: init at 21.0.0 Ada database interaction libraries and related tools which are managed in the gnatcoll-db repository. The attribute and derivation names don't include "db" since the GPR project files upstream also don't: They are named `gnatcoll_${component}.gpr` usually, except for the executables. --- .../development/libraries/ada/gnatcoll/db.nix | 110 ++++++++++++++++++ .../gnatcoll-db-sqlite-static-external.patch | 18 +++ pkgs/top-level/all-packages.nix | 14 +++ 3 files changed, 142 insertions(+) create mode 100644 pkgs/development/libraries/ada/gnatcoll/db.nix create mode 100644 pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/libraries/ada/gnatcoll/db.nix new file mode 100644 index 00000000000..d0512507db2 --- /dev/null +++ b/pkgs/development/libraries/ada/gnatcoll/db.nix @@ -0,0 +1,110 @@ +{ stdenv +, lib +, fetchFromGitHub +, gnat +, gprbuild +, which +, gnatcoll-core +, xmlada +, component +# components built by this derivation other components depend on +, gnatcoll-sql +, gnatcoll-sqlite +, gnatcoll-xref +# component specific extra dependencies +, gnatcoll-iconv +, gnatcoll-readline +, sqlite +, postgresql +}: + +let + libsFor = { + gnatcoll_db2ada = [ + gnatcoll-sql + ]; + gnatinspect = [ + gnatcoll-sqlite + gnatcoll-readline + gnatcoll-xref + ]; + postgres = [ + gnatcoll-sql + postgresql + ]; + sqlite = [ + gnatcoll-sql + sqlite + ]; + xref = [ + gnatcoll-iconv + gnatcoll-sqlite + ]; + }; + + # These components are just tools and don't install a library + onlyExecutable = builtins.elem component [ + "gnatcoll_db2ada" + "gnatinspect" + ]; +in + +stdenv.mkDerivation rec { + pname = "gnatcoll-${component}"; + version = "21.0.0"; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "gnatcoll-db"; + rev = "v${version}"; + sha256 = "0fdfng3yfy645nlw8l3c2za0zkn6pdhkvyrw20wnjx4k26glgb6r"; + }; + + patches = lib.optionals (component == "sqlite") [ + # fixes build of the static sqlite component + # when building against the system libsqlite3 + # See https://github.com/AdaCore/gprbuild/issues/27#issuecomment-298444608 + ./gnatcoll-db-sqlite-static-external.patch + ]; + + # Link executables dynamically unless specified by the platform, + # as we usually do in nixpkgs where possible + postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + for f in gnatcoll_db2ada/Makefile gnatinspect/Makefile; do + substituteInPlace "$f" --replace "=static" "=relocatable" + done + ''; + + nativeBuildInputs = [ + gnat + gprbuild + which + ]; + + # Propagate since GPRbuild needs to find referenced .gpr files + # and other libraries to link against when static linking is used. + # For executables this is of course not relevant and we can reduce + # the closure size dramatically + ${if onlyExecutable then "buildInputs" else "propagatedBuildInputs"} = [ + gnatcoll-core + ] ++ libsFor."${component}" or []; + + makeFlags = [ + "-C" component + "PROCESSORS=$(NIX_BUILD_CORES)" + # confusingly, for gprbuild --target is autoconf --host + "TARGET=${stdenv.hostPlatform.config}" + "prefix=${placeholder "out"}" + ] ++ lib.optional (component == "sqlite") [ + # link against packaged, not vendored libsqlite3 + "GNATCOLL_SQLITE=external" + ]; + + meta = with lib; { + description = "GNAT Components Collection - Database packages"; + homepage = "https://github.com/AdaCore/gnatcoll-db"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch b/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch new file mode 100644 index 00000000000..f67837d7d51 --- /dev/null +++ b/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch @@ -0,0 +1,18 @@ +diff --git a/sqlite/gnatcoll_sqlite.gpr b/sqlite/gnatcoll_sqlite.gpr +index 5bd53d35..580739f8 100644 +--- a/sqlite/gnatcoll_sqlite.gpr ++++ b/sqlite/gnatcoll_sqlite.gpr +@@ -69,7 +69,12 @@ project GnatColl_Sqlite is + for Source_Dirs use (".", "amalgamation"); + when "external" => + for Source_Dirs use ("."); +- for Library_Options use ("-lsqlite3") & Thread_Lib; ++ case Library_Type is ++ when "relocatable" => ++ for Library_Options use ("-lsqlite3") & Thread_Lib; ++ when others => ++ null; ++ end case; + end case; + + package Compiler is diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 390a21a530f..6b48b32f58e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13732,6 +13732,14 @@ in global = callPackage ../development/tools/misc/global { }; + gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix { + component = "gnatcoll_db2ada"; + }; + + gnatinspect = callPackage ../development/libraries/ada/gnatcoll/db.nix { + component = "gnatinspect"; + }; + gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; @@ -15622,6 +15630,12 @@ in gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; }; gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; }; + # gnatcoll-db repository + gnatcoll-postgres = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "postgres"; }; + gnatcoll-sql = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sql"; }; + gnatcoll-sqlite = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sqlite"; }; + gnatcoll-xref = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "xref"; }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; From 66f8529d91e8104d6535a42e0400bebeab0d2411 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 14:47:01 +0200 Subject: [PATCH 1327/1522] emacsPackages.ada-mode: build tools needed at runtime ada-mode includes extra binaries which are used by it at runtime. They require gnat, gprbuild, gnatcoll-core and wisi's source checked out in `../wisi-*`. --- .../emacs/elisp-packages/elpa-packages.nix | 33 ++++++++++++++++++- pkgs/top-level/emacs-packages.nix | 2 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 69db13fec19..2fcfa9b84dd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText, gcc }: +{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }: self: let @@ -57,6 +57,37 @@ self: let project = if lib.versionAtLeast self.emacs.version "28" then null else super.project; + # Compilation instructions for the Ada executables: + # https://www.nongnu.org/ada-mode/ada-mode.html#Ada-executables + ada-mode = super.ada-mode.overrideAttrs (old: { + # actually unpack source of ada-mode and wisi + # which are both needed to compile the tools + # we need at runtime + phases = "unpackPhase " + old.phases; # not a list, interestingly… + srcs = [ + super.ada-mode.src + self.wisi.src + ]; + + sourceRoot = "ada-mode-${self.ada-mode.version}"; + + nativeBuildInputs = [ + buildPackages.gnat + buildPackages.gprbuild + ]; + + buildInputs = [ + pkgs.gnatcoll-xref + ]; + + preInstall = '' + ./build.sh + ''; + + postInstall = '' + ./install.sh --prefix=$out + ''; + }); }; elpaPackages = super // overrides; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4d4c172296a..3fa2d2ea5dc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText gcc; + inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages; inherit lib; }; From 4affbbd371602cfdea414815af095ec9895987e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li> Date: Tue, 3 Aug 2021 14:22:25 +0200 Subject: [PATCH 1328/1522] alacritty: 0.8.0 -> 0.9.0 https://github.com/alacritty/alacritty/releases/tag/v0.9.0 https://github.com/alacritty/alacritty/compare/v0.8.0...v0.9.0 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index e4c5eb752d7..0a23d63e3ea 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -53,16 +53,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9pQqnsLMkzhKTs7WGhf6lac/LGot6EmJQxgFBTrHA4E="; + sha256 = "sha256-kgZEbOGmO+uRKaWR+oQBiGkBzDSuCznUyWNUoMICHhk="; }; - cargoSha256 = "sha256-NtDeXS2g+5RzKHJdDrbzL5oReS42SzuEubkfZ4gbkFc="; + cargoSha256 = "sha256-JqnYMDkagWNGliUxi5eqJN92ULsvT7Fwmah8um1xaRw="; nativeBuildInputs = [ cmake @@ -99,6 +99,7 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ + install -D extra/linux/io.alacritty.Alacritty.appdata.xml -t $out/share/appdata/ install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg # patchelf generates an ELF that binutils' "strip" doesn't like: From 8417e7f3daf0485b538713db7ea6c52d41c3bd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com> Date: Tue, 3 Aug 2021 11:09:04 -0300 Subject: [PATCH 1329/1522] marwaita: 9.5 -> 10.0 --- pkgs/data/themes/marwaita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7d13e794219..cdb7b4ed6e0 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "9.5"; + version = "10.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0hhiwims4nxq06kakc0hc4rn4hvnlrpbx6ca929vd2qbi6wa2k9h"; + sha256 = "19xy6p3v4jqpw448ywmx1i6mbjpy06qa1rdwkdpxdlhf45fbdacr"; }; buildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; - license = licenses.cc0; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; From d5dde029f17db5bc00b8ce2a1d03ba2632c5b156 Mon Sep 17 00:00:00 2001 From: Artturi <Artturin@artturin.com> Date: Tue, 3 Aug 2021 17:15:53 +0300 Subject: [PATCH 1330/1522] openscad: move templates to Resources on darwin (#132552) --- pkgs/applications/graphics/openscad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index ac41a23f8bb..c7be99469b0 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ - $out/share/openscad/{examples,color-schemes,locale,libraries,fonts} + $out/share/openscad/{examples,color-schemes,locale,libraries,fonts,templates} rmdir $out/share/openscad ''; From d4fe38632ea78f6d2f0c797ff81e2c99f558692f Mon Sep 17 00:00:00 2001 From: Bobby Rong <rjl931189261@126.com> Date: Tue, 3 Aug 2021 20:00:57 +0800 Subject: [PATCH 1331/1522] quilter: drop package --- pkgs/applications/editors/quilter/default.nix | 55 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/applications/editors/quilter/default.nix diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix deleted file mode 100644 index 2d04ad1629c..00000000000 --- a/pkgs/applications/editors/quilter/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pkg-config, meson, ninja, python3, vala -, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon -, libgee, discount, wrapGAppsHook }: - -stdenv.mkDerivation rec { - pname = "quilter"; - version = "2.5.4"; - - src = fetchFromGitHub { - owner = "lainsce"; - repo = pname; - rev = version; - sha256 = "sha256-A8Ov0rITHuMLDYTueeDO89KtxlP0pNk1pA7O4x3Q9fE="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - vala - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - discount - gtk3 - gtksourceview - gtkspell3 - libgee - pantheon.elementary-icon-theme - pantheon.granite - webkitgtk - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "Focus on your writing - designed for elementary OS"; - homepage = "https://github.com/lainsce/quilter"; - license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c7a5617cb0a..3f977123d29 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -682,6 +682,7 @@ mapAliases ({ qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 + quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 qvim = throw "qvim has been removed."; # added 2020-08-31 qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 qwt6 = libsForQt5.qwt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa642484b2d..5072d29a862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26849,8 +26849,6 @@ in quirc = callPackage ../tools/graphics/quirc {}; - quilter = callPackage ../applications/editors/quilter { }; - quisk = python38Packages.callPackage ../applications/radio/quisk { }; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; From e03daba08cead5b6597dbca9fcf33a6a7e0cd0b8 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov <fear@loathing.in> Date: Tue, 3 Aug 2021 15:34:46 +0300 Subject: [PATCH 1332/1522] vimPlugins.telescope-fzf-native-nvim: enable build phase --- pkgs/misc/vim-plugins/overrides.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index af0c6d4c806..086877dd5a1 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -501,7 +501,10 @@ self: super: { telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; + + dontBuild = false; buildPhase = "make"; + meta.platforms = lib.platforms.all; }); From 78090fd990c0f2df96ee98d9e1da400248ef5af3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <mcoudron@hotmail.com> Date: Mon, 2 Aug 2021 23:26:41 +0200 Subject: [PATCH 1333/1522] kubernetes-helm-wrapped: fix the wrapper placeholder out doesn't return a full store path so fixing the derivation --- pkgs/applications/networking/cluster/helm/wrapper.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix index 21a29e31243..b912e9abe5b 100644 --- a/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -10,8 +10,6 @@ let let initialMakeWrapperArgs = [ - "${helm}/bin/helm" "${placeholder "out"}/bin/helm" - "--argv0" "$0" "--set" "HELM_PLUGINS" "${pluginsDir}" ]; pluginsDir = symlinkJoin { @@ -26,7 +24,8 @@ in # extra actions upon postBuild = '' rm $out/bin/helm - makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} + makeWrapper "${helm}/bin/helm" "$out/bin/helm" "--argv0" "$0" \ + "--set" "HELM_PLUGINS" "${pluginsDir}" ${extraMakeWrapperArgs} ''; paths = [ helm pluginsDir ]; From fd2ea3574169b5e1ac4583f66c2ffd016669d345 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Tue, 3 Aug 2021 17:54:59 +0300 Subject: [PATCH 1334/1522] perlPackages.Gtk3ImageView: 6 -> 9 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 078c01349c5..83e3092373c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9237,16 +9237,16 @@ let }; }; - Gtk3ImageView = buildPerlPackage { + Gtk3ImageView = buildPerlPackage rec { pname = "Gtk3-ImageView"; - version = "6"; + version = "9"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz"; - sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0"; + url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz"; + sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w="; }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; - checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + checkInputs = [ TestDifferences TestDeep ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ make test From a5542798bca19894463619c868569ca2c73f3cea Mon Sep 17 00:00:00 2001 From: Malte <3236302+malte-christian@users.noreply.github.com> Date: Tue, 3 Aug 2021 17:10:56 +0200 Subject: [PATCH 1335/1522] verifpal: enable tests --- pkgs/tools/security/verifpal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index d65d3512272..02f41477c7e 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -16,8 +16,6 @@ buildGoModule rec { vendorSha256 = "XHeXonzRDHXayge5G3apvDarbOfTiV+UQ+IqSbrLkCk="; - doCheck = false; - nativeBuildInputs = [ pigeon ]; subPackages = [ "cmd/verifpal" ]; From cc4f71d619ddf6d33da203af3881da9a28b5421e Mon Sep 17 00:00:00 2001 From: Stig Palmquist <stig@stig.io> Date: Sun, 25 Jul 2021 04:10:33 +0200 Subject: [PATCH 1336/1522] perlPackages.SQLTranslator: fix scripts shebang --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6124fc5859e..f51d3be7ac8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18807,6 +18807,18 @@ let }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; + + postPatch = '' + patchShebangs script + ''; + + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + for file in $out/bin/*; do + shortenPerlShebang $file + done + ''; + meta = { description = "SQL DDL transformations and more"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From d65cee7b07f7dec99472751aa787aa4485d16def Mon Sep 17 00:00:00 2001 From: pacien <pacien.trangirard@pacien.net> Date: Sun, 25 Jul 2021 04:14:52 +0200 Subject: [PATCH 1337/1522] perlPackages.SQLTranslator: add missing deps This adds missing dependencies for the `sqlt*` scripts provided in the SQLTranslator package. --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f51d3be7ac8..5718edc7b02 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18806,7 +18806,7 @@ let sha256 = "096fq62iphmxgcfcayg4i0wf09y1rl1ar6hrcxfqsbrsmkwlzk8a"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; - propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; + propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny GraphViz GD ]; postPatch = '' patchShebangs script From 7e2a1bb7dd92949faa55e241aa611a4c17a756af Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Tue, 3 Aug 2021 17:56:24 +0200 Subject: [PATCH 1338/1522] emscripten: build multi-threaded libc --- pkgs/development/compilers/emscripten/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index a142008e2e3..47ae2f76b75 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -92,8 +92,10 @@ stdenv.mkDerivation rec { # wasm2c doesn't work with PIC $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c - for RELOCATABLE in "" "-s RELOCATABLE"; do - $out/bin/emcc $RELOCATABLE $LTO test.c + for MT in "" "-s USE_PTHREADS"; do + for RELOCATABLE in "" "-s RELOCATABLE"; do + $out/bin/emcc $RELOCATABLE $MT $LTO test.c + done done done popd From 61dd23eeaf998ff94a25150bc51099835842f145 Mon Sep 17 00:00:00 2001 From: Artturi <Artturin@artturin.com> Date: Tue, 3 Aug 2021 19:07:23 +0300 Subject: [PATCH 1339/1522] samba4: add wrapPythonPrograms (#132373) --- pkgs/servers/samba/4.x.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index fe2891f2ac7..eb03ea3ef6e 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,6 @@ { lib, stdenv , buildPackages , fetchurl -, python3 , wafHook , pkg-config , bison @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python3 + python3Packages.python wafHook pkg-config bison @@ -83,7 +82,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python3 + python3Packages.python + python3Packages.wrapPython readline popt dbus @@ -146,6 +146,8 @@ stdenv.mkDerivation rec { # module, which works correctly in all cases. PYTHON_CONFIG = "/invalid"; + pythonPath = [ python3Packages.dnspython tdb ]; + preBuild = '' export MAKEFLAGS="-j $NIX_BUILD_CORES" ''; @@ -167,7 +169,10 @@ stdenv.mkDerivation rec { # Samba does its own shebang patching, but uses build Python find "$out/bin" -type f -executable -exec \ - sed -i '1 s^#!${python3.pythonForBuild}/bin/python.*^#!${python3.interpreter}^' {} \; + sed -i '1 s^#!${python3Packages.python.pythonForBuild}/bin/python.*^#!${python3Packages.python.interpreter}^' {} \; + + # Fix PYTHONPATH for some tools + wrapPythonPrograms ''; passthru = { From 7467b025a02cede6e2ed885509e4af086b7bbe51 Mon Sep 17 00:00:00 2001 From: Daniel Olsen <daniel.olsen99@gmail.com> Date: Tue, 3 Aug 2021 18:12:38 +0200 Subject: [PATCH 1340/1522] randtype: init at 1.13 --- pkgs/games/randtype/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/games/randtype/default.nix diff --git a/pkgs/games/randtype/default.nix b/pkgs/games/randtype/default.nix new file mode 100644 index 00000000000..0eaf2c09216 --- /dev/null +++ b/pkgs/games/randtype/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchzip, zlib }: + +stdenv.mkDerivation rec { + pname = "randtype"; + version = "1.13"; + + src = fetchzip { + url = "mirror://sourceforge/randtype/${pname}-${version}.tar.gz"; + sha256 = "055xs02qwpgbkn2l57bwghbsrsysg1zhm2asp0byvjpz4sc4w1rd"; + }; + + buildInputs = [ zlib ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/man/man1 $out/bin + install -cp randtype.1.gz $out/share/man/man1 + install -cps randtype $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "semi-random text typer"; + homepage = "https://benkibbey.wordpress.com/randtype/"; + maintainers = with maintainers; [ dandellion ]; + license = licenses.gpl2Only; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b48b32f58e..c09173f15dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29526,6 +29526,8 @@ in racer = callPackage ../games/racer { }; + randtype = callPackage ../games/randtype { }; + redeclipse = callPackage ../games/redeclipse { }; residualvm = callPackage ../games/residualvm { }; From 93bb396edb02974d1c744de8685df3bc443a7ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Tue, 3 Aug 2021 13:23:23 -0300 Subject: [PATCH 1341/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 501c08a5f49..00dfc66f9da 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2235,8 +2235,8 @@ final: prev: src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "e3b218d15f97f8108e2f2864ee78343df612fe99"; - sha256 = "022hkbs0ngb1m1pxdx8k3f3nv7h06jlwnhmbc7r88g0bzscg53d9"; + rev = "0bac1e1a73c4f7e1ab9cca5f9f5ca557eb65c246"; + sha256 = "0gxmn5kiwgxbkh3hghiqsq6jg5bkbcn8lk6yz6fjrs9ndb917hvc"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2772,12 +2772,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-02"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "34918ba5f7bccf2be6f98fbb120f52eb6fa84c09"; - sha256 = "074z42nhrhfg6f5v9vn6cm2gv4vfcgi019y4cf08vgm7lhlbz27r"; + rev = "511f733cf2c6247f7a1b62b90e4bf0dfdae17a9f"; + sha256 = "0h32ghhmlpa4xpblxvsjlrivnfz55rpm84fri9diisshk48dkn62"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3144,12 +3144,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2020-11-10"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "2b1dca6ca16d6f5655748fcd4d54d772fcfd0d81"; - sha256 = "1prnclm9i7m09v1ip0sgkgddxwclas3x48zc8c800vxmmvjhzd7j"; + rev = "fb97a98717450fca16e5d2f8db667f7df227ba3c"; + sha256 = "1d0l7d2mlm0dq6m13mr8958qc257bhhgl0y4xilpdkfgx35vir34"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3196,8 +3196,8 @@ final: prev: src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c8485a2fc40a24dff58c0a380cac6ee21e59d808"; - sha256 = "0ksj2b3ccnkq5h1cvagbrp0y0x22g21v86h0m7hl77kcdn6y9vwr"; + rev = "3226b98318518bef47f55218041adfdf99c36e9a"; + sha256 = "09r6k5afd940cf44gdb62ffnh0ns32qr20vxxqgsw3rdi5558wfc"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3456,12 +3456,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-24"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "f58f77dee66babac1a859c2b552797d8128e1f86"; - sha256 = "12jway928hhm8s9sbwaqzjjzdgrpvz1gr09q4q5wxicfqaln4cd1"; + rev = "8f845e0a21b1d28cd41709b40b042f2e96113e47"; + sha256 = "04avnpb4xils6hj7raxyvygj6cbwwkmn96fk9q7mvhy33534crm1"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3496,8 +3496,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "c18add556757ac176effe8328f98702f7c703b94"; - sha256 = "1m12knmxvvhxdqhwdww7p7an8s7cja2fqp71l1gmsn1cv14iiij8"; + rev = "2c9690964b91e34b421326dc4839b322a7b1a6cd"; + sha256 = "0cany30kzcf2qy0lfhalxcinnyz7ff3ss3cxx2x9fmh74b9jhgrk"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3708,12 +3708,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-07-17"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1df774df358e70cbc9f74f34d38a82e756ceb001"; - sha256 = "1zf5i30g49f7ks6hhvr84ac3ka57lv96c124cpr1d4h9xld1n9q8"; + rev = "ada900452b2f7100c5e6bafafb87ec2979f1b423"; + sha256 = "1qiisd6r1571b9f2agc7xphrh2a7g24yz9a2xaajissxddf3330g"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4180,8 +4180,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a7e62e27689e6c2ea71f4e03cc06403f092a5ce3"; - sha256 = "0mx1ybp3hv9q4p65wcqyl3i2156qh4g00qvjizcbdxcs2xxgiy35"; + rev = "d897b4d9fdbc51febd71a1f96c96001ae4fa6121"; + sha256 = "0rgqby4aakqamiw3ykvzhn3vd2grjkzgfxrpzjjp1ipkd2qak8mb"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5140,12 +5140,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native-nvim"; - version = "2021-07-06"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "fe8c8d8cf7ff215ac83e1119cba87c016070b27e"; - sha256 = "0kzxf3kzw45mlccp8z5zl3cfda4n5afymmdyir3kd248ll904jy1"; + rev = "2fd60ebe4c372199e0d953310640b1aeaf06166f"; + sha256 = "0zs4fs62nbfm6vi0gmi49c3j430g7bzp81p6r4jl9vpqvb7hfpi2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6858,12 +6858,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-29"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "058ffa406d8013ab8431b7543ae29dec72fd24e5"; - sha256 = "1gnc4cxdq3srfbzl9v9cgbj7yyr5mjn5gnggr6af69q7ps7f81dg"; + rev = "7a087725eebedf4c23b621d9a25ca6fac9a0a985"; + sha256 = "0gvgi6sp6imjf865jfj5di8zvivm8hsfpg2qjjx0q4kss821yznm"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; From f4799162c3e9e0d564edd97a8dd306171f29f946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= <vinigm.nho@gmail.com> Date: Tue, 3 Aug 2021 13:24:13 -0300 Subject: [PATCH 1342/1522] vimPlugins.vim-lfe: init at 2018-04-30 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 00dfc66f9da..951914a41c6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -7602,6 +7602,18 @@ final: prev: meta.homepage = "https://github.com/ledger/vim-ledger/"; }; + vim-lfe = buildVimPluginFrom2Nix { + pname = "vim-lfe"; + version = "2018-04-30"; + src = fetchFromGitHub { + owner = "lfe-support"; + repo = "vim-lfe"; + rev = "290e7085fbd53d0c2b98b5d5a442d697c08b7d76"; + sha256 = "1wf4lyrnz957ya5zvgkdk1k1jw9yk0bkzz7230m9ry9vl55ss64y"; + }; + meta.homepage = "https://github.com/lfe-support/vim-lfe/"; + }; + vim-lightline-coc = buildVimPluginFrom2Nix { pname = "vim-lightline-coc"; version = "2021-03-03"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e9dc945f433..405f663584c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -341,6 +341,7 @@ ledger/vim-ledger lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim@main +lfe-support/vim-lfe lfilho/cosco.vim lifepillar/vim-gruvbox8 lifepillar/vim-mucomplete From c65c395b177829d772b9f2be455a88d91706c16b Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:05:09 -0500 Subject: [PATCH 1343/1522] emacsPackages.matrix-client: Fix build Build was broken by https://github.com/NixOS/nixpkgs/pull/129458. --- .../editors/emacs/elisp-packages/manual-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index b2a66c92aea..f6e8db8d7cd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -134,14 +134,19 @@ }; }; - matrix-client = melpaBuild { + matrix-client = let + rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; + in melpaBuild + { pname = "matrix-client"; version = "0.3.0"; + commit = rev; + src = pkgs.fetchFromGitHub { owner = "alphapapa"; repo = "matrix-client.el"; - rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; + inherit rev; sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"; }; From dcde308964f0b46576bc7fa7c56869c4993173d3 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:16:20 -0500 Subject: [PATCH 1344/1522] emacs.pkgs.elisp-ffi: Fix build --- .../emacs/elisp-packages/manual-packages.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index f6e8db8d7cd..17a80353761 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -1,25 +1,33 @@ { lib, pkgs }: self: with self; with lib.licenses; { - elisp-ffi = melpaBuild rec { + elisp-ffi = let + rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; + in melpaBuild { pname = "elisp-ffi"; - version = "1.0.0"; + version = "20170518.0"; + + commit = rev; src = pkgs.fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; - rev = version; - sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; + inherit rev; + sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; }; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.libffi ]; - preBuild = "make"; + preBuild = '' + mv ffi.el elisp-ffi.el + make + ''; recipe = pkgs.writeText "recipe" '' (elisp-ffi :repo "skeeto/elisp-ffi" - :fetcher github - :files ("ffi-glue" "ffi.el")) + :fetcher github) ''; meta = { From 66ca43e78381ad63d0b5aa4d28234f74704ce8a4 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:24:24 -0500 Subject: [PATCH 1345/1522] emacs.pkgs.haskell-unicode-input-method: Fix build --- .../editors/emacs/elisp-packages/manual-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 17a80353761..41bb506a74c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -102,19 +102,23 @@ git-undo = callPackage ./git-undo { }; - haskell-unicode-input-method = melpaBuild { - pname = "emacs-haskell-unicode-input-method"; + haskell-unicode-input-method = let + rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; + in melpaBuild { + pname = "haskell-unicode-input-method"; version = "20110905.2307"; + commit = rev; + src = pkgs.fetchFromGitHub { owner = "roelvandijk"; repo = "emacs-haskell-unicode-input-method"; - rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; + inherit rev; sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; recipe = pkgs.writeText "recipe" '' - (emacs-haskell-unicode-input-method + (haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; From b7cc72a05af1d749ddde464f2bfadef4aad49d62 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:34:35 -0500 Subject: [PATCH 1346/1522] emacs.pkgs.telega: Fix build --- .../editors/emacs/elisp-packages/melpa-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 051759cb8c7..3488d611d87 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -325,14 +325,6 @@ let buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; nativeBuildInputs = [ pkgs.pkg-config ]; - patches = [ - (pkgs.fetchpatch { - name = "telega-server-bin-store-prefer.patch"; - url = "https://github.com/zevlg/telega.el/commit/72550f984ca869309d197203ef7de99182d71729.patch"; - sha256 = "18xvz53bygksak6h5f8cz79y83p2va15i8qz7n4s3g9gsklmkj2p"; - }) - ]; - postPatch = '' substituteInPlace telega-customize.el \ --replace 'defcustom telega-server-command "telega-server"' \ From 590b6cd4018d1bc2302a07571cf4e1cb6dd13ecd Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:42:23 -0500 Subject: [PATCH 1347/1522] emacs.pkgs.manualPackages: Remove legacy aliases from deprecated infra These aliases have been deprecated for years and there isn't a good reason to keep them around. --- .../emacs/elisp-packages/manual-packages.nix | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index b2a66c92aea..462ff485dc2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -250,38 +250,4 @@ rectMark = rect-mark; sunriseCommander = sunrise-commander; - # Legacy aliases, these try to mostly map to melpa stable because it's - # closer to the old outdated package infra. - # - # Ideally this should be dropped some time during/after 20.03 - - autoComplete = self.melpaStablePackages.auto-complete; - bbdb3 = self.melpaStablePackages.bbdb; - colorTheme = self.color-theme; - cryptol = self.melpaStablePackages.cryptol-mode; - d = self.melpaStablePackages.d-mode; - emacsw3m = self.w3m; - erlangMode = self.melpaStablePackages.erlang; - flymakeCursor = self.melpaStablePackages.flymake-cursor; - graphvizDot = self.melpaStablePackages.graphviz-dot-mode; - haskellMode = self.melpaStablePackages.haskell-mode; - hsc3Mode = self.hsc3-mode; - idris = self.melpaStablePackages.idris-mode; - jade = self.jade-mode; - js2 = self.melpaStablePackages.js2-mode; - loremIpsum = self.lorem-ipsum; - markdownMode = self.melpaStablePackages.markdown-mode; - maudeMode = self.maude-mode; - phpMode = self.melpaStablePackages.php-mode; - prologMode = self.prolog-mode; - proofgeneral = self.melpaStablePackages.proof-general; - proofgeneral_HEAD = self.proof-general; - rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; - sbtMode = self.melpaStablePackages.sbt-mode; - scalaMode1 = self.melpaStablePackages.scala-mode; - # scalaMode2 = null; # No clear mapping as of now - structuredHaskellMode = self.melpaStablePackages.shm; - tuaregMode = self.melpaStablePackages.tuareg; - writeGood = self.melpaStablePackages.writegood-mode; - xmlRpc = self.melpaStablePackages.xml-rpc; } From 04855119e9a334cdae57e9c7708d566cf4f0f6b9 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:44:11 -0500 Subject: [PATCH 1348/1522] emacs.pkgs.manualPackages: Remove legacy aliases These aliases have been deprecated for years and there isn't a good reason to keep them around. --- .../emacs/elisp-packages/melpa-packages.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 051759cb8c7..4854f060157 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -517,24 +517,7 @@ let }); }; - # Deprecated legacy aliases for backwards compat - aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { - "auto-complete-clang-async" = "emacsClangCompleteAsync"; - "vterm" = "emacs-libvterm"; - "0xc" = "_0xc"; - "2048-game" = "_2048-game"; - "4clojure" = "_4clojure"; - "@" = "at"; - "term+" = "term-plus"; - "term+key-intercept" = "term-plus-key-intercept"; - "term+mux" = "term-plus-mux"; - "xml+" = "xml-plus"; - }))); - - melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super; - - in - melpaPackages // aliases); + in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); in generateMelpa { } From 6b5ca7a2c71b656c00c6af1498860fa121baa527 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:52:17 -0500 Subject: [PATCH 1349/1522] release-notes: Add notice regarding dropped Emacs aliases --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 2874039e3f0..15b4e2b4d04 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -624,6 +624,14 @@ move all files to the new directory. </para> </listitem> + <listitem> + <para> + Deprecated package aliases in <literal>emacs.pkgs.*</literal> + have been removed. These aliases were remnants of the old + Emacs package infrastructure. We now use exact upstream names + wherever possible. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index fe7a7326a40..c0b0cb5973b 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -157,6 +157,8 @@ pt-services.clipcat.enable). - `services.uptimed` now uses `/var/lib/uptimed` as its stateDirectory instead of `/var/spool/uptimed`. Make sure to move all files to the new directory. +- Deprecated package aliases in `emacs.pkgs.*` have been removed. These aliases were remnants of the old Emacs package infrastructure. We now use exact upstream names wherever possible. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. From 1666ffebb1266d7af3e6f1225637c908104b6301 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 13:54:42 +0200 Subject: [PATCH 1350/1522] ocamlPackages.checkseum: 0.3.1 -> 0.3.2 https://github.com/mirage/checkseum/releases/tag/v0.3.2 --- pkgs/development/ocaml-modules/checkseum/default.nix | 8 ++------ .../ocaml-modules/checkseum/makefile-no-opam.patch | 12 ------------ 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 527afec33eb..3483af1dd41 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -6,7 +6,7 @@ }: buildDunePackage rec { - version = "0.3.1"; + version = "0.3.2"; pname = "checkseum"; useDune2 = true; @@ -15,13 +15,9 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz"; - sha256 = "b9e4d054e17618b1faed8c0eb15afe0614b2f093e58b59a180bda4500a5d2da1"; + sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5"; }; - patches = [ - ./makefile-no-opam.patch - ]; - nativeBuildInputs = [ dune-configurator pkg-config diff --git a/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch b/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch deleted file mode 100644 index 49fb41b2e00..00000000000 --- a/pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/freestanding/Makefile b/freestanding/Makefile -index d535050..bb286bd 100644 ---- a/freestanding/Makefile -+++ b/freestanding/Makefile -@@ -1,4 +1,6 @@ --PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig -+ifneq (, $(shell command -v opam)) -+PKG_CONFIG_PATH ?= $(shell opam var prefix)/lib/pkgconfig -+endif - - EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) - From b6d8e46a571d94c408bd67d08be90facff8e0852 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 14:15:46 +0200 Subject: [PATCH 1351/1522] ocamlPackages.decompress: 1.4.1 -> 1.4.2 https://github.com/mirage/decompress/releases/tag/v1.4.2 --- pkgs/development/ocaml-modules/decompress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 4681e5a1879..7629349c1d1 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -4,7 +4,7 @@ }: buildDunePackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "decompress"; minimumOCamlVersion = "4.07"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "0130ea6acb61b0a25393fa23148e116d7a17c77558196f7abddaee9e05a1d7a8"; + sha256 = "822f125b46c87f4a902c334db8c86d4d5f33ebe978e93c40351a4d3269b95225"; }; buildInputs = [ cmdliner ]; From 03bb707cb20b4a40291c42538b9d005c2776d307 Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 12:59:01 -0500 Subject: [PATCH 1352/1522] emacs.pkgs.font-lock-plus: Fix build --- .../editors/emacs/elisp-packages/font-lock-plus/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix index fdb28f44719..3cea9ae4ef0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, lib, melpaBuild, writeText }: +{ fetchurl, lib, trivialBuild, writeText }: -melpaBuild { +trivialBuild { pname = "font-lock+"; version = "20180101.25"; @@ -10,8 +10,6 @@ melpaBuild { name = "font-lock+.el"; }; - recipe = writeText "recipe" "(font-lock+ :fetcher github :repo \"\")"; - meta = { homepage = "https://melpa.org/#/font-lock+"; license = lib.licenses.gpl2Plus; From d4e9b89eca9bfef3ace458f745f38dc558f9cdce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Tue, 3 Aug 2021 20:07:42 +0200 Subject: [PATCH 1353/1522] act: 0.2.23 -> 0.2.24 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 38520b4b3e5..88f75d70fcc 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "act"; - version = "0.2.23"; + version = "0.2.24"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PBhlBWycAYuczfP0D+Gf1pDvrfI9gz3JyGe5FBq782Y="; + sha256 = "sha256-BWSw1yELxLDMUg2LxXuy+N0IRxLQYtVdzny1FGYVXEY="; }; vendorSha256 = "sha256-dLIsVWN/PjcH0CUYRmn4YaF8Pczf/gaWhD3lulqGiuA="; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Run your GitHub Actions locally"; From f9792e57aaa1b67a4d90ecabc7537e816b4ff836 Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Tue, 3 Aug 2021 19:14:25 +0100 Subject: [PATCH 1354/1522] starboard: 0.10.3 -> 0.11.0 --- pkgs/applications/networking/cluster/starboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 121611fd197..d92518c0b4c 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SJogepww3IJt+NAkJ0G/lLgZ3rMWDTC+jHIrzzkzJGA="; + sha256 = "sha256-NV37K5JUfGPK8TwCi/4XY7MQUvp76vzdxsHUNPlYpYk="; }; - vendorSha256 = "sha256-vNsYGlcVIj/cDijCFz8fG5Ht/s7koM62GV8zkOyA/fA="; + vendorSha256 = "sha256-4CmAf1s+tK7cKxwetgv0YewLLROsZ5g1Zd30FCep5k8="; # Don't build and check the integration tests excludedPackages = "itest"; From 800ba0d58b65f1ba0fd412f6d0ba2febe9be3eb0 Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Tue, 3 Aug 2021 20:23:29 +0200 Subject: [PATCH 1355/1522] emscripten: generate libembind*.a Previously building applications/libraries with "--bind" would not be covered by the cache. --- pkgs/development/compilers/emscripten/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 47ae2f76b75..84520ca52e0 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -92,9 +92,11 @@ stdenv.mkDerivation rec { # wasm2c doesn't work with PIC $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c - for MT in "" "-s USE_PTHREADS"; do - for RELOCATABLE in "" "-s RELOCATABLE"; do - $out/bin/emcc $RELOCATABLE $MT $LTO test.c + for BIND in "" "--bind"; do + for MT in "" "-s USE_PTHREADS"; do + for RELOCATABLE in "" "-s RELOCATABLE"; do + $out/bin/emcc $RELOCATABLE $BIND $MT $LTO test.c + done done done done From 92e201e9387529f96fb72346bc843bc683105e03 Mon Sep 17 00:00:00 2001 From: Lucas Ransan <lucas@ransan.tk> Date: Tue, 3 Aug 2021 14:02:38 +0200 Subject: [PATCH 1356/1522] dictu: init at 0.19.0 --- .../dictu/0001-force-sqlite-to-be-found.patch | 46 ++++++++++ pkgs/development/compilers/dictu/default.nix | 84 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 132 insertions(+) create mode 100644 pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch create mode 100644 pkgs/development/compilers/dictu/default.nix diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch new file mode 100644 index 00000000000..8de4c9f57f6 --- /dev/null +++ b/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch @@ -0,0 +1,46 @@ +From bb4767f8fc413ca4cb42879a9a226fd26f10e094 Mon Sep 17 00:00:00 2001 +From: Lucas Ransan <lucas@ransan.tk> +Date: Tue, 3 Aug 2021 20:39:11 +0200 +Subject: [PATCH] force sqlite to be found + +--- + src/CMakeLists.txt | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a0f3fee..58b4d0b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -9,7 +9,7 @@ set(INCLUDE_DIR include/) + list(FILTER sources EXCLUDE REGEX "(main|linenoise|utf8).c") + list(FILTER headers EXCLUDE REGEX "(linenoise|utf8).h") + +-find_library(SQLITE_LIB SQLite3) ++find_package(SQLite3 REQUIRED) + set(THREADS) + + if(DISABLE_HTTP) +@@ -20,16 +20,10 @@ else() + list(APPEND libraries curl) + endif() + +-if(NOT SQLITE_LIB) +- set(THREADS_PREFER_PTHREAD_FLAG ON) +- find_package(Threads REQUIRED) +- set(THREADS Threads::Threads) +-else() +- list(FILTER sources EXCLUDE REGEX "sqlite3.c") +- list(FILTER headers EXCLUDE REGEX "sqlite3.h") +- list(APPEND libraries ${SQLITE_LIB}) +- add_compile_definitions(INCLUDE_SQLITE_LIB) +-endif() ++list(FILTER sources EXCLUDE REGEX "sqlite3.c") ++list(FILTER headers EXCLUDE REGEX "sqlite3.h") ++list(APPEND libraries ${SQLite3_LIBRARIES}) ++add_compile_definitions(SQLite3_INCLUDE_DIR) + + if(WIN32) + # ws2_32 is required for winsock2.h to work correctly +-- +2.32.0 + diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix new file mode 100644 index 00000000000..c67afee81db --- /dev/null +++ b/pkgs/development/compilers/dictu/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, sqlite +, httpSupport ? true, curl +, cliSupport ? true +, linenoiseSupport ? cliSupport, linenoise +, enableLTO ? stdenv.cc.isGNU +}: + +assert enableLTO -> stdenv.cc.isGNU; + +stdenv.mkDerivation rec { + pname = "dictu"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "dictu-lang"; + repo = pname; + rev = "v${version}"; + sha256 = "5Sfmzz4I0dhcbz14LmXx5cHELRFENunLbZmU93uSEJo="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + sqlite + ] ++ lib.optional httpSupport curl + ++ lib.optional linenoiseSupport linenoise; + + patches = [ + ./0001-force-sqlite-to-be-found.patch + ]; + + postPatch = lib.optionalString (!enableLTO) '' + sed -i src/CMakeLists.txt \ + -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/' + ''; + + cmakeFlags = [ + "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}" + "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}" + "-DDISABLE_LINENOISE=${if linenoiseSupport then "OFF" else "ON"}" + ] ++ lib.optionals enableLTO [ # TODO: LTO with LLVM + "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" + "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + ]; + + doCheck = cliSupport; + + preCheck = '' + cd .. + sed -i tests/runTests.du \ + -e '/http/d' + sed -i tests/path/realpath.du \ + -e 's/usr/build/g' + sed -i tests/path/isDir.du \ + -e 's,/usr/bin,/build/source,' \ + -e '/home/d' + ''; + + checkPhase = '' + runHook preCheck + ./dictu tests/runTests.du + ''; + + installPhase = '' + mkdir -p $out + cp -r /build/source/src/include $out/include + mkdir -p $out/lib + cp /build/source/build/src/libdictu_api* $out/lib + '' + lib.optionalString cliSupport '' + install -Dm755 /build/source/dictu $out/bin/dictu + ''; + + meta = with lib; { + description = "High-level dynamically typed, multi-paradigm, interpreted programming language"; + homepage = "https://dictu-lang.com"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ef3ab8e60e..8ac4f22ca18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10848,6 +10848,8 @@ in devpi-server = callPackage ../development/tools/devpi-server {}; + dictu = callPackage ../development/compilers/dictu { }; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; ecl = callPackage ../development/compilers/ecl { }; From c69f341a0590f8d0e00a45672bb0cb1c7ea98b56 Mon Sep 17 00:00:00 2001 From: Serg Nesterov <i.am.cust0dian@gmail.com> Date: Tue, 3 Aug 2021 21:44:33 +0300 Subject: [PATCH 1357/1522] restic: 0.12.0 -> 0.12.1 --- pkgs/tools/backup/restic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 65ff53bf677..0cf25941e90 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "07gxf56g45gj2arvdnrr9656i9ykhy1y6k6zdlni1sa3aa2x2bbf"; + sha256 = "19lzccipbpxdkay60zdqfq8dgah0sbxzjcfcx285c28js2zpp85m"; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorSha256 = "14z22lmdd681rn61alpqbn3i9fn0kcc74321vjvhz2ix2mch3c1z"; + vendorSha256 = "0sdswihiy4r3lw9a87xj2qm3nf28cw56yfm56mva6b8lr3vk93l6"; subPackages = [ "cmd/restic" ]; From bceb34c9a525e7c21f84ae9b8bbc4d7cf2b20ba4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 18:47:30 +0000 Subject: [PATCH 1358/1522] jetbrains-mono: 2.241 -> 2.242 --- pkgs/data/fonts/jetbrains-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 65ffe491a78..7bc6e5aad39 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.241"; + version = "2.242"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1gwhbmq8zw026i66g96i75zn2zff7cr83ns8aaslrzsrkk247lah"; + sha256 = "sha256-flaUqpHmgebUzwPq0d+I3p9yqPmsV0kap04eApOQxdI="; postFetch = '' mkdir -p $out/share/fonts From 4c01bb2832d7695d13c402c384d46bb0ac3f7ae1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 12:08:53 +0200 Subject: [PATCH 1359/1522] python3Packages.sqlmap: 1.5.7 -> 1.5.8 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 762df0ab7e3..e66cdd8967d 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.7"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HTayAlXehm3Azmbi+ar/Vav5bPYmGu9gflzZCwWZihw="; + sha256 = "01wyhmvg9yh5q86z7kahbvj2xnkjyvi1h2qj7clgz5yd76sh8ygn"; }; postPatch = '' From 8a27cd1a514a8a52c29d34ab08b21e93ed859235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:28:15 +0200 Subject: [PATCH 1360/1522] python3Packages.archinfo: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 4f33bbb6101..d5d25b2c02e 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9297"; + version = "9.0.9355"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0hlwf98ijb8c9gc51pjy4kq4zal2cmqrr34dgk31f03dnp65yiz7"; + sha256 = "1mjs3aba204dqr6k0kgs6h3qyqjq80vinc7awql14rmyad2xndmb"; }; checkInputs = [ From 494cb1cdabd0ccfe16f6cd83f0af3ba140ed33c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:28:34 +0200 Subject: [PATCH 1361/1522] python3Packages.ailment: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 12cca132ab1..6c1ab2e8b2d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9297"; + version = "9.0.9355"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "01lj0abg93icvf4nz1ngshl04avm48lh0naqjcaaxa6ak1gxf97d"; + sha256 = "102pixc5yy48ydmr3khvpfwm9bl33w07y8mpgjfrhp75qr5q4lrl"; }; propagatedBuildInputs = [ pyvex ]; From 61e446e78d4468b7184760fb81a849363774e4c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:28:51 +0200 Subject: [PATCH 1362/1522] python3Packages.pyvex: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ee61f4fcca0..9f681e22be4 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9297"; + version = "9.0.9355"; src = fetchPypi { inherit pname version; - sha256 = "1dfg7kacmwln0sazs5hakmsmfbm8m55qq1ydxi4g2ix3bfxkc1c4"; + sha256 = "0qnfi5z905lrzj8rf88prk5fz9cj0q2yag3xykv3gkmhs9fw3w0x"; }; postPatch = lib.optionalString stdenv.isDarwin '' From e9a8b040814258de7fa29745ece8095f316f7e4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:29:07 +0200 Subject: [PATCH 1363/1522] python3Packages.claripy: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index b39034f3093..c2b1fd903b9 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9297"; + version = "9.0.9355"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1lacpdzaifn050msh4rf75qphbh56dc2kdk7m426q4ki3g7026n7"; + sha256 = "1hmxkrzyhrc75z5d2ndf0z8icddrsd278lg640ihdjv1wabsa76w"; }; # Use upstream z3 implementation From c40fdeda3ae2122df6dbb4b262c9a93be1e2583e Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:29:29 +0200 Subject: [PATCH 1364/1522] python3Packages.cle: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index f3c2f9977b0..e65843c81ab 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9297"; + version = "9.0.9355"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1n5ybbxmsm7mc7z40b9imbgzjzmbjq58sh6zvzjyqqnl9k657khc"; + sha256 = "0jqbqp82arrxyiisj96n9laxhwjlrd0vj4a9wa8lgxafi6zv4lc6"; }; propagatedBuildInputs = [ From 97b277f711e544b8559fd329c0e5072409388b02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:29:41 +0200 Subject: [PATCH 1365/1522] python3Packages.angrop: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index ed84b56f0f8..1824a0d0e92 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9297"; + version = "9.0.9355"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "10ky13j66ysag9wmx8hsmr4pn16h24rp34zqi3qn7hk1v2jrkkx6"; + sha256 = "1fs31yd8hhkrrx4gsq13fb5fqi86688pazpmsnsga7hznv60s2ks"; }; propagatedBuildInputs = [ From de42ea90dedb31a1d1f75eabd5b58cebd36640d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:29:50 +0200 Subject: [PATCH 1366/1522] python3Packages.angr: 9.0.9297 -> 9.0.9355 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 53098646db2..4deb383f0aa 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9297"; + version = "9.0.9355"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1n0qklh0cwp75mr7zgv7a9qm58gxpfbwialhnyg8w9y00mqh6flj"; + sha256 = "0myk3xlvdw4szypivv6a90jw8cqdf1njjqxgqz5lqbx7fajqhrmy"; }; propagatedBuildInputs = [ From e2ddb60aaf5d45db97c0f501ff7c887b310cd87a Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 21:45:44 +0200 Subject: [PATCH 1367/1522] python3Packages.aiorecollect: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 983ff771690..f803a8d5548 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0vm19rcy14fdsfddjskxh0nlph10jrj3qh6xqwv73wgcmbdpr91i"; + sha256 = "1s96zfrw8kdpmyxkiskz1ys8h23dx3b46psmlg1z6d4pkb611ijz"; }; nativeBuildInputs = [ From aad7b2f61e60ca21c9190bbfe35fd11e3afa16af Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Tue, 3 Aug 2021 20:56:38 +0100 Subject: [PATCH 1368/1522] octant: 0.22.0 -> 0.23.0 --- .../applications/networking/cluster/octant/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index dbbf6524871..fabdc7d5ab5 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.22.0"; + version = "0.23.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA="; - aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ="; - x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU="; - aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk="; + x86_64-linux = "sha256-wnm4Zprlao+zbWVJNY4BsAT1fFMft7luyDaW2HfNotg="; + aarch64-linux = "sha256-eYvfLUelSrmdY9dbgAlPm7en88hsdCnejJGq2Gz4DN0="; + x86_64-darwin = "sha256-NXMQ4mbYfIK+arGWZVhQk5iAw6AZM9PAGJ9CEC/rmgA="; + aarch64-darwin = "sha256-WqlbiDV2CuBYr6IXQ8vaESxKNZGp9vBj683igazcmwM="; }; dontConfigure = true; From e0ecbb90c0458bf2546d237f92108f70c017b98a Mon Sep 17 00:00:00 2001 From: 06kellyjac <dev@j-k.io> Date: Tue, 3 Aug 2021 20:58:01 +0100 Subject: [PATCH 1369/1522] octant-desktop: 0.22.0 -> 0.23.0 --- pkgs/applications/networking/cluster/octant/desktop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index e793df71a58..1a86a66fa29 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.22.0"; + version = "0.23.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0="; - x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0="; + x86_64-linux = "sha256-K4z6SVCiuqy3xkWMWpm8KM7iYVXyKcnERljMG3NEFMw="; + x86_64-darwin = "sha256-WYra0yw/aPW/wUGrlIn5ud3kjFTkekYEi2LWZcYO5Nw="; }.${system}; }; From 148d73fc746a52c3ec0a71eea989021d160fab89 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 20:25:51 +0200 Subject: [PATCH 1370/1522] pkgsLLVM.stdenv: use lld again PR #122778 allowed the linker being chosen independently from useLLVM which also affected pkgsLLVM where we were relying on this behavior. For platform sets assembled from scratch useLLVM still implies linker == "lld", however in the case of pkgsLLVM we update the current platform via the set update operator which means that `linker` won't be re-evaluated. Using ld.bfd with pkgsLLVM is okay to a certain extent, but with C++ things begin to break. We fix this by setting linker explicitly. --- pkgs/top-level/stage.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index a7905d0db29..b2e717fda67 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -169,6 +169,7 @@ let # so we don't need to check hostPlatform != buildPlatform. crossSystem = stdenv.hostPlatform // { useLLVM = true; + linker = "lld"; }; }; From 23b7966ea8568d70650c2f61ece3fbbf9447451a Mon Sep 17 00:00:00 2001 From: Tad Fisher <tadfisher@gmail.com> Date: Tue, 3 Aug 2021 13:57:51 -0700 Subject: [PATCH 1371/1522] python39Packages.notmuch: Fix build --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 8bb16acd59e..7b2b29033fd 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { dontGzipMan = true; # already compressed passthru = { - pythonSourceRoot = "${src.name}/bindings/python"; + pythonSourceRoot = "notmuch-${version}/bindings/python"; inherit version; }; From 73a54fec429f655eb2f3817d6c75dd77afbd012b Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Tue, 3 Aug 2021 18:19:45 +0300 Subject: [PATCH 1372/1522] perlPackages.GooCanvas2CairoTypes: init at 0.001 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83e3092373c..2afbea10ec7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9008,6 +9008,20 @@ let }; }; + GooCanvas2CairoTypes = buildPerlPackage rec { + pname = "GooCanvas2-CairoTypes"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-${version}.tar.gz"; + sha256 = "sha256-uoBnNuvMnePYFBp2Omgr3quxy4cCveKZrf1XSs6HUFI="; + }; + propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; + meta = { + description = "Bridge between GooCanvas2 and Cairo types"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GoogleProtocolBuffers = buildPerlPackage { pname = "Google-ProtocolBuffers"; version = "0.12"; From ac72256745ee5d483dc166af7a6a6d4fd18eb2be Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Tue, 3 Aug 2021 19:03:31 +0300 Subject: [PATCH 1373/1522] shutter: 0.94.3 -> 0.97 --- .../applications/graphics/shutter/default.nix | 116 ++++++++++++++---- 1 file changed, 90 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index bbcfcf03900..a561b6f0d7c 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,39 +1,103 @@ -{ lib, stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg -, hicolor-icon-theme, procps +{ lib +, stdenv +, fetchFromGitHub +, perlPackages +, wrapGAppsHook +, imagemagick +, gdk-pixbuf +, librsvg +, hicolor-icon-theme +, procps +, libwnck +, libappindicator-gtk3 }: let - perlModules = with perlPackages; - [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView - Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig - XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext - ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON - ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS - commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo - EncodeLocale TryTiny TypesSerialiser LWPMediaTypes + perlModules = with perlPackages; [ + # Not sure if these are needed + # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique + ImageMagick + Cairo + FileBaseDir + FileWhich + FileCopyRecursive + XMLSimple + XMLTwig + XMLParser + SortNaturally + LocaleGettext + ProcProcessTable + X11Protocol + ProcSimple + ImageExifTool + JSON + JSONMaybeXS + NetOAuth + PathClass + LWP + LWPProtocolHttps + NetDBus + TryTiny + WWWMechanize + HTTPMessage + HTTPDate + HTMLForm + HTMLParser + HTMLTagset + HTTPCookies + EncodeLocale + URI + CarpAlways + GlibObjectIntrospection + NumberBytesHuman + CairoGObject + Readonly + Gtk3ImageView + Gtk3 + Glib + Pango + GooCanvas2 + GooCanvas2CairoTypes + commonsense + TypesSerialiser ]; in -stdenv.mkDerivation { - name = "shutter-0.94.3"; +stdenv.mkDerivation rec { + pname = "shutter"; + version = "0.97"; - src = fetchurl { - url = "https://launchpad.net/shutter/0.9x/0.94.3/+download/shutter-0.94.3.tar.gz"; - sha256 = "01wv5k6zqfqa2rss461lpdpjxpfk4awzfdc6j2qk6bh4g4zgmgl5"; + src = fetchFromGitHub { + owner = "shutter-project"; + repo = "shutter"; + rev = "v${version}"; + sha256 = "sha256-/2eQLJJZP0ArQUrxcFdogv/4wy+O021hODkJYLQmLY8="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + perlPackages.perl + procps + gdk-pixbuf + librsvg + libwnck + libappindicator-gtk3 + ] ++ perlModules; - installPhase = '' - mkdir -p "$out" - cp -a . "$out" - (cd "$out" && mv CHANGES README COPYING "$out/share/doc/shutter") + makeFlags = [ + "prefix=${placeholder "out"}" + ]; - wrapProgram $out/bin/shutter \ - --set PERL5LIB "${perlPackages.makePerlPath perlModules}" \ - --prefix PATH : "${imagemagick.out}/bin" \ - --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + postPatch = '' + patchShebangs po2mo.sh + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set PERL5LIB ${perlPackages.makePerlPath perlModules} \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ] } \ + --suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ + --set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE + ) ''; meta = with lib; { From ccc855d475739d37b8ef443acb566d36be33d8a8 Mon Sep 17 00:00:00 2001 From: Malte Brandy <malte.brandy@maralorn.de> Date: Tue, 3 Aug 2021 23:02:05 +0200 Subject: [PATCH 1374/1522] haskellPackages.hls-ormolue-plugin: dontCheck on darwin --- pkgs/development/haskell-modules/configuration-darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 492af32edb1..48484dec9b3 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -174,6 +174,7 @@ self: super: { hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; hls-splice-plugin = dontCheck super.hls-splice-plugin; + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; From e78c51a0e918cda218ff95b39ddeb7ddff5a5fde Mon Sep 17 00:00:00 2001 From: Thomas Gerbet <thomas@gerbet.me> Date: Tue, 3 Aug 2021 23:05:12 +0200 Subject: [PATCH 1375/1522] putty: 0.75 -> 0.76 Fixes CVE-2021-36367. --- pkgs/applications/networking/remote/putty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index aab30c24e20..6249cce973e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.75"; + version = "0.76"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"; + sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l"; }; # glib-2.62 deprecations From ab543fd569892bb05d95f89e0952a782870f2c77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 3 Aug 2021 23:16:11 +0200 Subject: [PATCH 1376/1522] python3Packages.fritzconnection: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/fritzconnection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index ad157fbda4c..97396595608 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.5.0"; + version = "1.6.0"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo="; + sha256 = "16sbv6ql6jd13lim88z8vl5205xppza10340bmq5m5f3lvzb7mpc"; }; disabled = pythonOlder "3.6"; From bb15a691f24ba6a3e8378b1bbe5e3dc72f93fa5a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Thu, 22 Jul 2021 09:28:51 -0700 Subject: [PATCH 1377/1522] hqplayerd: fix web output dir --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 594085d422e..80363e8e76b 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd # misc service support files - mkdir -p $out/var/lib/hqplayerd - cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer + mkdir -p $out/var/lib/hqplayer + cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer/web runHook postInstall ''; From 0af1298ac95bef92b62aef696b67283eb9ffae3b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 13:14:04 -0700 Subject: [PATCH 1378/1522] hqplayerd: 4.24.2-63 -> 4.25.0-64 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 80363e8e76b..76f8bde3e4e 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.24.2-63"; + version = "4.25.0-64"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg="; + sha256 = "sha256-KLP7g1SQzVKu9Hnptb6s0FwmLSjhlAINJoJskja+bDM="; }; unpackPhase = '' From 2ae5f1a6b85dbc632ad3a800b2639e633dc6d89e Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Tue, 3 Aug 2021 23:22:55 +0200 Subject: [PATCH 1379/1522] chromium: remove phases --- pkgs/applications/networking/browsers/chromium/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 33619f27350..c7be4663bbe 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -76,8 +76,6 @@ let src = chromeSrc; - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - unpackCmd = let widevineCdmPath = if (channel == "stable" || channel == "ungoogled-chromium") then From d6e187b88f3fea5909aa444ef026f7f0723d0e22 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 3 Aug 2021 23:23:19 +0200 Subject: [PATCH 1380/1522] python3Packages.ufonormalizer: 0.5.4 -> 0.6.0 https://github.com/unified-font-object/ufoNormalizer/releases/tag/0.6.0 --- pkgs/development/python-modules/ufonormalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 357c09ab4e8..5d0af719a39 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.5.4"; + version = "0.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "11l8475p3nq7azim35l5lck8vrgjgd01plnji6gg1hf9ckswr2pb"; + sha256 = "0w44qlvg4xks7jb0lf3lhsbylagq956x0wkcal9ix34bz3p7vdxd"; extension = "zip"; }; From cf8e219b7e3c8933d6301175f2611990c5281ae9 Mon Sep 17 00:00:00 2001 From: David Arnold <dgx.arnold@gmail.com> Date: Fri, 23 Jul 2021 14:10:31 -0500 Subject: [PATCH 1381/1522] lib: fix functionArgs for functors `functionArgs` should give valid results on functions that have been identified with `lib.isFunction` instead of erroring out. --- lib/tests/misc.nix | 10 ++++++++++ lib/trivial.nix | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 0d249968402..4b2e5afc1d6 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -132,6 +132,16 @@ runTests { expected = [ 1 1 0 ]; }; + testFunctionArgsFunctor = { + expr = functionArgs { __functor = self: { a, b }: null; }; + expected = { a = false; b = false; }; + }; + + testFunctionArgsSetFunctionArgs = { + expr = functionArgs (setFunctionArgs (args: args.x) { x = false; }); + expected = { x = false; }; + }; + # STRINGS testConcatMapStrings = { diff --git a/lib/trivial.nix b/lib/trivial.nix index c8ef5599ccd..7956ba4bde6 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -334,7 +334,10 @@ rec { has the same return type and semantics as builtins.functionArgs. setFunctionArgs : (a → b) → Map String Bool. */ - functionArgs = f: f.__functionArgs or (builtins.functionArgs f); + functionArgs = f: + if f ? __functor + then f.__functionArgs or (lib.functionArgs (f.__functor f)) + else builtins.functionArgs f; /* Check whether something is a function or something annotated with function args. From 9a623367ad77a9a8b5195aef003234b32e00db81 Mon Sep 17 00:00:00 2001 From: Harrison Houghton <hora.rhino@gmail.com> Date: Tue, 3 Aug 2021 14:45:21 -0400 Subject: [PATCH 1382/1522] manim: fix Turns out that O and 0 are different characters, even though they look the same in many monospace fonts (including mine). Unfortunately, they look very different to grep -F... --- pkgs/applications/video/manim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 0f224a5b105..5da81eff50e 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { python3 manim.py example_scenes.py $scene -l tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ - | tee | grep -F "ISO Media, MP4 Base Media v1 [IS0 14496-12:2003]" + | tee | grep -F "ISO Media, MP4 Base Media v1 [ISO 14496-12:2003]" done ''; From 1ab9b0e31da0a6de40867d457b0244c2c895b1dc Mon Sep 17 00:00:00 2001 From: Robert Helgesson <robert@rycee.net> Date: Tue, 3 Aug 2021 22:56:29 +0200 Subject: [PATCH 1383/1522] svtplay-dl: 4.1 -> 4.2 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5514fd4e30f..157b0fe6376 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0b0q4k5aacw2nna5higr6sk5lsdn62lw2l9lccfy5s3m530banni"; + sha256 = "1bsinf2r07g8c03mcw4gprl92wmysyaa81s8wyck0c6wdq3hcsnp"; }; pythonPaths = [ cryptography pyyaml requests ]; From fa1b0b5b51b8539540c3c11884f8e8c7fde715e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Tue, 3 Aug 2021 21:45:41 +0000 Subject: [PATCH 1384/1522] groonga: 11.0.4 -> 11.0.5 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8ef89031c18..b405a4c2f09 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.4"; + version = "11.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc="; + sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; }; buildInputs = with lib; From b5365c3b2c7b07163285cefd2d74db687b3df8da Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Tue, 3 Aug 2021 17:05:15 -0500 Subject: [PATCH 1385/1522] emacs.pkgs.emacspeak: 51.0 -> 54.0 --- .../editors/emacs/elisp-packages/emacspeak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix index f2ae3712cac..577f5136326 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "emacspeak"; - version = "51.0"; + version = "54.0"; src = fetchurl { url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "09a0ywxlqa8jmc0wmvhaf7bdydnkyhy9nqfsdqcpbsgdzj6qpg90"; + sha256 = "sha256-wsIqiW4UtgdAhqPqgCKgF37+hAtmAelAEnme1W9PKes="; }; nativeBuildInputs = [ makeWrapper emacs ]; From 55682979d29a956c05a17b29fa330fba59b76ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev> Date: Wed, 4 Aug 2021 00:08:53 +0200 Subject: [PATCH 1386/1522] element-desktop: build native modules --- .../element/element-desktop.nix | 7 + .../element/keytar/default.nix | 41 + .../element/keytar/update.sh | 19 + .../element/keytar/yarn.lock | 2531 +++++++++ .../element/keytar/yarn.nix | 2869 +++++++++++ .../element/seshat/default.nix | 44 + .../element/seshat/update.sh | 16 + .../element/seshat/yarn.nix | 4557 +++++++++++++++++ 8 files changed, 10084 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/element/keytar/default.nix create mode 100755 pkgs/applications/networking/instant-messengers/element/keytar/update.sh create mode 100644 pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock create mode 100644 pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix create mode 100644 pkgs/applications/networking/instant-messengers/element/seshat/default.nix create mode 100755 pkgs/applications/networking/instant-messengers/element/seshat/update.sh create mode 100644 pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 0d35372ecc4..60c6f332847 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web +, callPackage }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -24,6 +25,9 @@ in mkYarnPackage rec { nativeBuildInputs = [ makeWrapper ]; + seshat = callPackage ./seshat {}; + keytar = callPackage ./keytar {}; + buildPhase = '' runHook preBuild export HOME=$(mktemp -d) @@ -32,6 +36,9 @@ in mkYarnPackage rec { yarn run i18n node ./scripts/copy-res.js popd + rm -rf node_modules/matrix-seshat node_modules/keytar + ln -s $keytar node_modules/keytar + ln -s $seshat node_modules/matrix-seshat runHook postBuild ''; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix new file mode 100644 index 00000000000..87ef174271d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, fixup_yarn_lock, yarn, pkg-config, libsecret }: + +stdenv.mkDerivation rec { + pname = "keytar"; + version = "7.7.0"; + + src = fetchFromGitHub { + owner = "atom"; + repo = "node-keytar"; + rev = "v${version}"; + sha256 = "0ajvr4kjbyw2shb1y14c0dsghdlnq30f19hk2sbzj6n9y3xa3pmi"; + }; + + nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config]; + buildInputs = [ libsecret ]; + + npm_config_nodedir = nodejs-14_x; + + yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache; + + buildPhase = '' + cp ${./yarn.lock} ./yarn.lock + chmod u+w . ./yarn.lock + export HOME=/tmp + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + node_modules/.bin/node-gyp rebuild + ''; + + doCheck = false; + + installPhase = '' + shopt -s extglob + rm -rf node_modules + mkdir -p $out + cp -r ./!(build) $out + install -D -t $out/build/Release build/Release/keytar.node + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh new file mode 100755 index 00000000000..11d986f4fda --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix yarn + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the Yarn dependency lock files." + echo "Usage: $0 <git release tag>" + exit 1 +fi + +SRC="https://raw.githubusercontent.com/atom/node-keytar/$1" + +wget "$SRC/package-lock.json" +wget "$SRC/package.json" +rm -f yarn.lock +yarn import +yarn2nix > yarn.nix +rm -rf node_modules package.json package-lock.json diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock new file mode 100644 index 00000000000..5a3abec6ded --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock @@ -0,0 +1,2531 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + +abbrev@1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" + integrity sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8= + +after@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + +ajv@^6.12.3: + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.1.2" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" + integrity sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw== + +are-we-there-yet@~1.0.0: + version "1.0.6" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" + integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.0 || ^1.1.13" + +are-we-there-yet@~1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-index@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" + integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= + dependencies: + debug "^2.2.0" + es6-symbol "^3.0.2" + +asn1@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assertion-error@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" + integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" + integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== + +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-core@^6.26.0, babel-core@^6.26.3: + version "6.26.3" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" + integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== + dependencies: + babel-code-frame "^6.26.0" + babel-generator "^6.26.0" + babel-helpers "^6.24.1" + babel-messages "^6.23.0" + babel-register "^6.26.0" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + convert-source-map "^1.5.1" + debug "^2.6.9" + json5 "^0.5.1" + lodash "^4.17.4" + minimatch "^3.0.4" + path-is-absolute "^1.0.1" + private "^0.1.8" + slash "^1.0.0" + source-map "^0.5.7" + +babel-generator@^6.26.0: + version "6.26.1" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" + integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== + dependencies: + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + detect-indent "^4.0.0" + jsesc "^1.3.0" + lodash "^4.17.4" + source-map "^0.5.7" + trim-right "^1.0.1" + +babel-helper-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" + integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= + dependencies: + babel-helper-get-function-arity "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-get-function-arity@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" + integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-remap-async-to-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" + integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helpers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" + integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= + dependencies: + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-syntax-async-functions@^6.8.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" + integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= + +babel-plugin-transform-async-to-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" + integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= + dependencies: + babel-helper-remap-async-to-generator "^6.24.1" + babel-plugin-syntax-async-functions "^6.8.0" + babel-runtime "^6.22.0" + +babel-register@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" + integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= + dependencies: + babel-core "^6.26.0" + babel-runtime "^6.26.0" + core-js "^2.5.0" + home-or-tmp "^2.0.0" + lodash "^4.17.4" + mkdirp "^0.5.1" + source-map-support "^0.4.15" + +babel-runtime@^6.22.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" + integrity sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.10.0" + +babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.24.1, babel-template@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.24.1, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.24.1: + version "6.25.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" + integrity sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4= + dependencies: + babel-runtime "^6.22.0" + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^1.0.1" + +babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +big-integer@^1.6.17: + version "1.6.48" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" + integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +binary@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" + integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + dependencies: + buffers "~0.1.1" + chainsaw "~0.1.0" + +bl@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bl@~3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" + integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== + dependencies: + readable-stream "^3.0.1" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + dependencies: + inherits "~2.0.0" + +bluebird@^3: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +bluebird@~3.4.1: + version "3.4.7" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= + +brace-expansion@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +buffer-from@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" + integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== + +buffer-indexof-polyfill@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" + integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== + +buffer-shims@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" + integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +buffers@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" + integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + +camelcase@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chai@^4.2.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" + integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA== + dependencies: + assertion-error "^1.1.0" + check-error "^1.0.2" + deep-eql "^3.0.1" + get-func-name "^2.0.0" + pathval "^1.1.1" + type-detect "^4.0.5" + +chainsaw@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" + integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + dependencies: + traverse ">=0.3.0 <0.4" + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +check-error@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" + integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= + +chokidar@3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +cliui@^3.0.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +cmake-js@~5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" + integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== + dependencies: + bluebird "^3" + debug "^4" + fs-extra "^5.0.0" + is-iojs "^1.0.1" + lodash "^4" + memory-stream "0" + npmlog "^1.2.0" + rc "^1.2.7" + request "^2.54.0" + semver "^5.0.3" + splitargs "0" + tar "^4" + traceur "0.0.x" + unzipper "^0.8.13" + url-join "0" + which "^1.0.9" + yargs "^3.6.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colors@~0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" + integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@2.9.x, commander@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df" + integrity sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8= + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +convert-source-map@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" + integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU= + +core-js@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" + integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= + +core-js@^2.5.0: + version "2.5.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" + integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw== + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +d@1, d@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" + integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== + dependencies: + es5-ext "^0.10.50" + type "^1.0.1" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +debug@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + +decamelize@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + +deep-eql@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" + integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== + dependencies: + type-detect "^4.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" + integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + dependencies: + repeating "^2.0.0" + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +duplexer2@~0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= + dependencies: + readable-stream "~1.1.9" + +duplexer2@~0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + +each-series-async@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" + integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== + +ecc-jsbn@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= + dependencies: + jsbn "~0.1.0" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + +es5-ext@^0.10.35, es5-ext@^0.10.50: + version "0.10.53" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" + integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.3" + next-tick "~1.0.0" + +es6-iterator@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" + integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== + dependencies: + d "^1.0.1" + ext "^1.1.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +esutils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + +execspawn@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" + integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= + dependencies: + util-extend "^1.0.1" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +ext@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" + integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + dependencies: + type "^2.0.0" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extsprintf@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" + integrity sha1-4QgOBljjALBilJkMxw4VAiNf1VA= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +gauge@~1.2.0, gauge@~1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" + integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= + dependencies: + ansi "^0.3.0" + has-unicode "^2.0.0" + lodash.pad "^4.1.0" + lodash.padend "^4.1.0" + lodash.padstart "^4.1.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-func-name@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" + integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +ghreleases@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" + integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== + dependencies: + after "~0.8.1" + ghrepos "~2.1.0" + ghutils "~3.2.0" + lodash.uniq "^4.5.0" + simple-mime "~0.1.0" + url-template "~2.0.6" + +ghrepos@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" + integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== + dependencies: + ghutils "~3.2.0" + +ghutils@~3.2.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" + integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== + dependencies: + jsonist "~2.1.0" + xtend "~4.0.1" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + +glob-parent@~5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +"glob@3 || 4 || 5 || 6 || 7", glob@7.1.6, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@5.0.x: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +home-or-tmp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" + integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.1" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +hyperquest@~2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" + integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== + dependencies: + buffer-from "^0.1.1" + duplexer2 "~0.0.2" + through2 "~0.6.3" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + +invariant@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" + integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A= + dependencies: + loose-envify "^1.0.0" + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-finite@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" + integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-iojs@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" + integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +js-tokens@^3.0.0, js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsesc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonist@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" + integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== + dependencies: + bl "~3.0.0" + hyperquest "~2.1.3" + json-stringify-safe "~5.0.1" + xtend "~4.0.1" + +jsprim@^1.2.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" + integrity sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg= + dependencies: + assert-plus "1.0.0" + extsprintf "1.0.2" + json-schema "0.2.3" + verror "1.3.6" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + dependencies: + invert-kv "^1.0.0" + +listenercount@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" + integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.pad@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" + integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= + +lodash.padend@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" + integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= + +lodash.padstart@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" + integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4, lodash@^4.17.4, lodash@^4.2.0: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + +log-symbols@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + dependencies: + chalk "^4.0.0" + +loose-envify@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" + integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg= + dependencies: + js-tokens "^3.0.0" + +memory-stream@0: + version "0.0.3" + resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" + integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= + dependencies: + readable-stream "~1.0.26-2" + +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + dependencies: + mime-db "1.44.0" + +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + +"minimatch@2 || 3", minimatch@3, minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minipass@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" + integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + dependencies: + yallist "^4.0.0" + +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +mocha@^8.0.1: + version "8.3.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" + integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.1" + debug "4.3.1" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.1.6" + growl "1.10.5" + he "1.2.0" + js-yaml "4.0.0" + log-symbols "4.0.0" + minimatch "3.0.4" + ms "2.1.3" + nanoid "3.1.20" + serialize-javascript "5.0.1" + strip-json-comments "3.1.1" + supports-color "8.1.1" + which "2.0.2" + wide-align "1.1.3" + workerpool "6.1.0" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +nanoid@3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +next-tick@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" + integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= + +node-abi@^2.2.0, node-abi@^2.21.0: + version "2.21.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" + integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== + dependencies: + semver "^5.4.1" + +node-addon-api@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239" + integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw== + +node-cpplint@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-cpplint/-/node-cpplint-0.4.0.tgz#35827fe7b95ccceff0cd7f46ede4cba44b8ef88c" + integrity sha1-NYJ/57lczO/wzX9G7eTLpEuO+Iw= + dependencies: + colors "~0.6.2" + commander "~2.2.0" + +node-gyp@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" + integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.1.2" + request "^2.88.0" + rimraf "^2.6.3" + semver "^5.7.1" + tar "^4.4.12" + which "^1.3.1" + +node-gyp@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" + integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.3" + nopt "^5.0.0" + npmlog "^4.1.2" + request "^2.88.2" + rimraf "^3.0.2" + semver "^7.3.2" + tar "^6.0.2" + which "^2.0.2" + +node-ninja@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" + integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= + dependencies: + fstream "^1.0.0" + glob "3 || 4 || 5 || 6 || 7" + graceful-fs "^4.1.2" + minimatch "3" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2" + osenv "0" + path-array "^1.0.0" + request "2" + rimraf "2" + semver "2.x || 3.x || 4 || 5" + tar "^2.0.0" + which "1" + +noop-logger@^0.1.0, noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-path@^2.0.2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" + integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== + dependencies: + which "^1.2.10" + +npm-which@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" + integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= + dependencies: + commander "^2.9.0" + npm-path "^2.0.2" + which "^1.2.10" + +"npmlog@0 || 1 || 2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= + dependencies: + ansi "~0.3.1" + are-we-there-yet "~1.1.2" + gauge "~1.2.5" + +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +npmlog@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" + integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= + dependencies: + ansi "~0.3.0" + are-we-there-yet "~1.0.0" + gauge "~1.2.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +nw-gyp@^3.6.3: + version "3.6.5" + resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.5.tgz#ccce42182229e44e7689da70675b4b8dd0ab0ab3" + integrity sha512-vYrOIYJEKpq9CfaHuiqEjV1rBYgr6uaUrPhPRiznb91LujkAUqGhQ5QqDC1bLdd+zo9jf2H0Zkl2M5zQB7+CuQ== + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + dependencies: + lcid "^1.0.0" + +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +osenv@0, osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +path-array@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" + integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= + dependencies: + array-index "^1.0.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pathval@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.0.4, picomatch@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +prebuild-install@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz#6754fa6c0d55eced7f9e14408ff9e4cba6f097b4" + integrity sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prebuild@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz#9d46a00f42b60ad1718479cc5e3d1ef4882b7f33" + integrity sha512-x0CkKDmHFwX49rTGEYJwB9jBQwJWxRzwUtP5PA9dP8khFGMm3oSFgYortxdlp0PkxB29EhWGp/KQE5g+adehYg== + dependencies: + cmake-js "~5.2.0" + detect-libc "^1.0.3" + each-series-async "^1.0.1" + execspawn "^1.0.1" + ghreleases "^3.0.2" + github-from-package "0.0.0" + glob "^7.1.6" + minimist "^1.1.2" + mkdirp "^0.5.1" + napi-build-utils "^1.0.1" + node-abi "^2.2.0" + node-gyp "^6.0.1" + node-ninja "^1.0.1" + noop-logger "^0.1.0" + npm-which "^3.0.1" + npmlog "^4.0.1" + nw-gyp "^3.6.3" + rc "^1.0.3" + run-waterfall "^1.1.6" + tar-stream "^2.1.0" + +private@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + +psl@^1.1.28: + version "1.1.29" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" + integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +rc@^1.0.3, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6: + version "2.3.3" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + safe-buffer "~5.1.1" + string_decoder "~1.0.3" + util-deprecate "~1.0.1" + +readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@~2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" + integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= + dependencies: + buffer-shims "^1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + +regenerator-runtime@^0.10.0: + version "0.10.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + +request@2, request@^2.54.0, request@^2.88.0, request@^2.88.2: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +rimraf@2, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rsvp@^3.0.13: + version "3.6.2" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" + integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== + +run-waterfall@^1.1.6: + version "1.1.7" + resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" + integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== + +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== + +safe-buffer@^5.1.2, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safer-buffer@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +"semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^4.3.3: + version "4.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= + +semver@^7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= + +serialize-javascript@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +setimmediate@~1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +signal-exit@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-mime@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" + integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + +source-map-support@^0.4.15: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== + dependencies: + source-map "^0.5.6" + +source-map-support@~0.2.8: + version "0.2.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" + integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= + dependencies: + source-map "0.1.32" + +source-map@0.1.32: + version "0.1.32" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" + integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.6, source-map@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +splitargs@0: + version "0.0.7" + resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" + integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= + +sshpk@^1.7.0: + version "1.14.2" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" + integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg= + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + dashdash "^1.12.0" + getpass "^0.1.1" + safer-buffer "^2.0.2" + optionalDependencies: + bcrypt-pbkdf "^1.0.0" + ecc-jsbn "~0.1.1" + jsbn "~0.1.0" + tweetnacl "~0.14.0" + +string-width@^1.0.1, string-width@^1.0.2, "string-width@^1.0.2 || 2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-json-comments@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.0, tar-stream@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" + integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tar@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== + dependencies: + block-stream "*" + fstream "^1.0.12" + inherits "2" + +tar@^4, tar@^4.4.12: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + +tar@^6.0.2: + version "6.0.5" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" + integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +through2@~0.6.3: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + dependencies: + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" + +to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +traceur@0.0.x: + version "0.0.111" + resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" + integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= + dependencies: + commander "2.9.x" + glob "5.0.x" + rsvp "^3.0.13" + semver "^4.3.3" + source-map-support "~0.2.8" + +"traverse@>=0.3.0 <0.4": + version "0.3.9" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" + integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-detect@^4.0.0, type-detect@^4.0.5: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" + integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== + +type@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" + integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unzipper@^0.8.13: + version "0.8.14" + resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" + integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== + dependencies: + big-integer "^1.6.17" + binary "~0.3.0" + bluebird "~3.4.1" + buffer-indexof-polyfill "~1.0.0" + duplexer2 "~0.1.4" + fstream "~1.0.10" + listenercount "~1.0.1" + readable-stream "~2.1.5" + setimmediate "~1.0.4" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +url-join@0: + version "0.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" + integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= + +url-template@~2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" + integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util-extend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" + integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +verror@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" + integrity sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw= + dependencies: + extsprintf "1.0.2" + +which@1, which@^1.0.9, which@^1.2.10, which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@2.0.2, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +wide-align@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== + dependencies: + string-width "^1.0.2" + +window-size@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + +workerpool@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" + integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== + +y18n@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" + integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + +yallist@^3.0.0, yallist@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@20.2.4, yargs-parser@^20.2.2: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@^3.6.0: + version "3.32.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + dependencies: + camelcase "^2.0.1" + cliui "^3.0.3" + decamelize "^1.1.1" + os-locale "^1.4.0" + string-width "^1.0.1" + window-size "^0.1.4" + y18n "^3.2.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix new file mode 100644 index 00000000000..d9c163c4e36 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix @@ -0,0 +1,2869 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + path = fetchurl { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha1 = "aa58042711d6e3275dd37dc597e5d31e8c290a44"; + }; + } + { + name = "abbrev___abbrev_1.1.0.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz"; + sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; + }; + } + { + name = "after___after_0.8.2.tgz"; + path = fetchurl { + name = "after___after_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; + }; + } + { + name = "ajv___ajv_6.12.4.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.4.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz"; + sha1 = "0614facc4522127fa713445c6bfd3ebd376e2234"; + }; + } + { + name = "amdefine___amdefine_1.0.1.tgz"; + path = fetchurl { + name = "amdefine___amdefine_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "ansi___ansi_0.3.1.tgz"; + path = fetchurl { + name = "ansi___ansi_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + } + { + name = "anymatch___anymatch_3.1.1.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + }; + } + { + name = "aproba___aproba_1.1.2.tgz"; + path = fetchurl { + name = "aproba___aproba_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz"; + sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.0.6.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz"; + sha1 = "a2d28c93102aa6cc96245a26cb954de06ec53f0c"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.4.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; + sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } + { + name = "array_index___array_index_1.0.0.tgz"; + path = fetchurl { + name = "array_index___array_index_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz"; + sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; + }; + } + { + name = "asn1___asn1_0.2.3.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assertion_error___assertion_error_1.1.0.tgz"; + path = fetchurl { + name = "assertion_error___assertion_error_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz"; + sha1 = "e60b6b0e8f301bd97e5375215bda406c85118c0b"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.10.1.tgz"; + path = fetchurl { + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; + }; + } + { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + path = fetchurl { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + } + { + name = "babel_core___babel_core_6.26.3.tgz"; + path = fetchurl { + name = "babel_core___babel_core_6.26.3.tgz"; + url = "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz"; + sha1 = "b2e2f09e342d0f0c88e2f02e067794125e75c207"; + }; + } + { + name = "babel_generator___babel_generator_6.26.1.tgz"; + path = fetchurl { + name = "babel_generator___babel_generator_6.26.1.tgz"; + url = "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz"; + sha1 = "1844408d3b8f0d35a404ea7ac180f087a601bd90"; + }; + } + { + name = "babel_helper_function_name___babel_helper_function_name_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_function_name___babel_helper_function_name_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz"; + sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9"; + }; + } + { + name = "babel_helper_get_function_arity___babel_helper_get_function_arity_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_get_function_arity___babel_helper_get_function_arity_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz"; + sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d"; + }; + } + { + name = "babel_helper_remap_async_to_generator___babel_helper_remap_async_to_generator_6.24.1.tgz"; + path = fetchurl { + name = "babel_helper_remap_async_to_generator___babel_helper_remap_async_to_generator_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz"; + sha1 = "5ec581827ad723fecdd381f1c928390676e4551b"; + }; + } + { + name = "babel_helpers___babel_helpers_6.24.1.tgz"; + path = fetchurl { + name = "babel_helpers___babel_helpers_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + } + { + name = "babel_messages___babel_messages_6.23.0.tgz"; + path = fetchurl { + name = "babel_messages___babel_messages_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + } + { + name = "babel_plugin_syntax_async_functions___babel_plugin_syntax_async_functions_6.13.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_async_functions___babel_plugin_syntax_async_functions_6.13.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz"; + sha1 = "cad9cad1191b5ad634bf30ae0872391e0647be95"; + }; + } + { + name = "babel_plugin_transform_async_to_generator___babel_plugin_transform_async_to_generator_6.24.1.tgz"; + path = fetchurl { + name = "babel_plugin_transform_async_to_generator___babel_plugin_transform_async_to_generator_6.24.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz"; + sha1 = "6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"; + }; + } + { + name = "babel_register___babel_register_6.26.0.tgz"; + path = fetchurl { + name = "babel_register___babel_register_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + } + { + name = "babel_runtime___babel_runtime_6.23.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz"; + sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "babel_template___babel_template_6.26.0.tgz"; + path = fetchurl { + name = "babel_template___babel_template_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + } + { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + path = fetchurl { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + } + { + name = "babel_types___babel_types_6.25.0.tgz"; + path = fetchurl { + name = "babel_types___babel_types_6.25.0.tgz"; + url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz"; + sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e"; + }; + } + { + name = "babel_types___babel_types_6.26.0.tgz"; + path = fetchurl { + name = "babel_types___babel_types_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + } + { + name = "babylon___babylon_6.18.0.tgz"; + path = fetchurl { + name = "babylon___babylon_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz"; + sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "big_integer___big_integer_1.6.48.tgz"; + path = fetchurl { + name = "big_integer___big_integer_1.6.48.tgz"; + url = "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz"; + sha1 = "8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { + name = "binary___binary_0.3.0.tgz"; + path = fetchurl { + name = "binary___binary_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + } + { + name = "bl___bl_4.0.3.tgz"; + path = fetchurl { + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; + }; + } + { + name = "bl___bl_3.0.1.tgz"; + path = fetchurl { + name = "bl___bl_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz"; + sha1 = "1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"; + }; + } + { + name = "block_stream___block_stream_0.0.9.tgz"; + path = fetchurl { + name = "block_stream___block_stream_0.0.9.tgz"; + url = "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "bluebird___bluebird_3.4.7.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.4.7.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.8.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + path = fetchurl { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha1 = "baa559ee14ced73452229bad7326467c61fabd60"; + }; + } + { + name = "buffer_from___buffer_from_0.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz"; + sha1 = "15f4b9bcef012044df31142c14333caf6e0260d0"; + }; + } + { + name = "buffer_indexof_polyfill___buffer_indexof_polyfill_1.0.2.tgz"; + path = fetchurl { + name = "buffer_indexof_polyfill___buffer_indexof_polyfill_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"; + sha1 = "d2732135c5999c64b277fcf9b1abe3498254729c"; + }; + } + { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + path = fetchurl { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "buffers___buffers_0.1.1.tgz"; + path = fetchurl { + name = "buffers___buffers_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + } + { + name = "camelcase___camelcase_2.1.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chai___chai_4.3.4.tgz"; + path = fetchurl { + name = "chai___chai_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz"; + sha1 = "b55e655b31e1eac7099be4c08c21964fce2e6c49"; + }; + } + { + name = "chainsaw___chainsaw_0.1.0.tgz"; + path = fetchurl { + name = "chainsaw___chainsaw_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } + { + name = "check_error___check_error_1.0.2.tgz"; + path = fetchurl { + name = "check_error___check_error_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz"; + sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { + name = "cmake_js___cmake_js_5.2.0.tgz"; + path = fetchurl { + name = "cmake_js___cmake_js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz"; + sha1 = "6d72014269a5d23a754a6d170cde9ed2d75eb411"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colors___colors_0.6.2.tgz"; + path = fetchurl { + name = "colors___colors_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.9.0.tgz"; + path = fetchurl { + name = "commander___commander_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + } + { + name = "commander___commander_2.2.0.tgz"; + path = fetchurl { + name = "commander___commander_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz"; + sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "convert_source_map___convert_source_map_1.5.1.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz"; + sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; + }; + } + { + name = "core_js___core_js_2.4.1.tgz"; + path = fetchurl { + name = "core_js___core_js_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz"; + sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; + }; + } + { + name = "core_js___core_js_2.5.7.tgz"; + path = fetchurl { + name = "core_js___core_js_2.5.7.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz"; + sha1 = "f972608ff0cead68b841a16a932d0b183791814e"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "d___d_1.0.1.tgz"; + path = fetchurl { + name = "d___d_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; + sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_4.2.0.tgz"; + path = fetchurl { + name = "debug___debug_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; + sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decamelize___decamelize_4.0.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz"; + sha1 = "aa472d7bf660eb15f3494efd531cab7f2a709837"; + }; + } + { + name = "decompress_response___decompress_response_4.2.1.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; + }; + } + { + name = "deep_eql___deep_eql_3.0.1.tgz"; + path = fetchurl { + name = "deep_eql___deep_eql_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz"; + sha1 = "dfc9404400ad1c8fe023e7da1df1c147c4b444df"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "detect_indent___detect_indent_4.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + } + { + name = "diff___diff_5.0.0.tgz"; + path = fetchurl { + name = "diff___diff_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz"; + sha1 = "7ed6ad76d859d030787ec35855f5b1daf31d852b"; + }; + } + { + name = "duplexer2___duplexer2_0.0.2.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }; + } + { + name = "duplexer2___duplexer2_0.1.4.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + } + { + name = "each_series_async___each_series_async_1.0.1.tgz"; + path = fetchurl { + name = "each_series_async___each_series_async_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz"; + sha1 = "7e3f8dfa5af934663960e5a17561362909b34328"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.1.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "env_paths___env_paths_2.2.0.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; + sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + }; + } + { + name = "es5_ext___es5_ext_0.10.53.tgz"; + path = fetchurl { + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + }; + } + { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + path = fetchurl { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "esutils___esutils_2.0.2.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + } + { + name = "execspawn___execspawn_1.0.1.tgz"; + path = fetchurl { + name = "execspawn___execspawn_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz"; + sha1 = "8286f9dde7cecde7905fbdc04e24f368f23f8da6"; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha1 = "6e14b3fcee0f3a6340ecb57d2e8918692052a47c"; + }; + } + { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extsprintf___extsprintf_1.0.2.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "find_up___find_up_5.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + }; + } + { + name = "flat___flat_5.0.2.tgz"; + path = fetchurl { + name = "flat___flat_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz"; + sha1 = "8ca6fe332069ffa9d324c327198c598259ceb241"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_5.0.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz"; + sha1 = "414d0110cdd06705734d055652c5411260c31abd"; + }; + } + { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { + name = "fstream___fstream_1.0.12.tgz"; + path = fetchurl { + name = "fstream___fstream_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz"; + sha1 = "4e8ba8ee2d48be4f7d0de505455548eae5932045"; + }; + } + { + name = "gauge___gauge_1.2.7.tgz"; + path = fetchurl { + name = "gauge___gauge_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_func_name___get_func_name_2.0.0.tgz"; + path = fetchurl { + name = "get_func_name___get_func_name_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz"; + sha1 = "ead774abee72e20409433a066366023dd6887a41"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "ghreleases___ghreleases_3.0.2.tgz"; + path = fetchurl { + name = "ghreleases___ghreleases_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz"; + sha1 = "1bdb6d31ec03a24a0d80f58f5e9a84a4db725818"; + }; + } + { + name = "ghrepos___ghrepos_2.1.0.tgz"; + path = fetchurl { + name = "ghrepos___ghrepos_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz"; + sha1 = "abaf558b690b722c70c7ad45076f6f9be8e495e1"; + }; + } + { + name = "ghutils___ghutils_3.2.6.tgz"; + path = fetchurl { + name = "ghutils___ghutils_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz"; + sha1 = "d43986e267da02787464d97a6489659e4609bb1f"; + }; + } + { + name = "github_from_package___github_from_package_0.0.0.tgz"; + path = fetchurl { + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "glob___glob_5.0.15.tgz"; + path = fetchurl { + name = "glob___glob_5.0.15.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + } + { + name = "globals___globals_9.18.0.tgz"; + path = fetchurl { + name = "globals___globals_9.18.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + }; + } + { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + path = fetchurl { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + } + { + name = "growl___growl_1.10.5.tgz"; + path = fetchurl { + name = "growl___growl_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz"; + sha1 = "f2735dc2283674fa67478b10181059355c369e5e"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "home_or_tmp___home_or_tmp_2.0.0.tgz"; + path = fetchurl { + name = "home_or_tmp___home_or_tmp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "hyperquest___hyperquest_2.1.3.tgz"; + path = fetchurl { + name = "hyperquest___hyperquest_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz"; + sha1 = "523127d7a343181b40bf324e231d2576edf52633"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_1.3.7.tgz"; + path = fetchurl { + name = "ini___ini_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz"; + sha1 = "a09363e1911972ea16d7a8851005d84cf09a9a84"; + }; + } + { + name = "invariant___invariant_2.2.2.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_finite___is_finite_1.0.2.tgz"; + path = fetchurl { + name = "is_finite___is_finite_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_iojs___is_iojs_1.1.0.tgz"; + path = fetchurl { + name = "is_iojs___is_iojs_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz"; + sha1 = "4c11033b5d5d94d6eab3775dedc9be7d008325f1"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "js_tokens___js_tokens_3.0.2.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + } + { + name = "js_yaml___js_yaml_4.0.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; + sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsesc___jsesc_1.3.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_0.5.1.tgz"; + path = fetchurl { + name = "json5___json5_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonist___jsonist_2.1.2.tgz"; + path = fetchurl { + name = "jsonist___jsonist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz"; + sha1 = "c1377311e8fc857abe7aa3df197116a911f95324"; + }; + } + { + name = "jsprim___jsprim_1.4.0.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + }; + } + { + name = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + } + { + name = "listenercount___listenercount_1.0.1.tgz"; + path = fetchurl { + name = "listenercount___listenercount_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz"; + sha1 = "84c8a72ab59c4725321480c975e6508342e70937"; + }; + } + { + name = "locate_path___locate_path_6.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha1 = "55321eb309febbc59c4801d931a72452a681d286"; + }; + } + { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + path = fetchurl { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + }; + } + { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + }; + } + { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash___lodash_4.17.19.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.19.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; + sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; + }; + } + { + name = "log_symbols___log_symbols_4.0.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz"; + sha1 = "69b3cc46d20f448eccdb75ea1fa733d9e821c920"; + }; + } + { + name = "loose_envify___loose_envify_1.3.1.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + }; + } + { + name = "memory_stream___memory_stream_0.0.3.tgz"; + path = fetchurl { + name = "memory_stream___memory_stream_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz"; + sha1 = "ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f"; + }; + } + { + name = "mime_db___mime_db_1.44.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + }; + } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha1 = "d13763d35f613d09ec37ebb30bac0469c0ee8f43"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minipass___minipass_2.9.0.tgz"; + path = fetchurl { + name = "minipass___minipass_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; + sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; + }; + } + { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { + name = "minizlib___minizlib_1.3.3.tgz"; + path = fetchurl { + name = "minizlib___minizlib_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; + sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + path = fetchurl { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "mocha___mocha_8.3.2.tgz"; + path = fetchurl { + name = "mocha___mocha_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz"; + sha1 = "53406f195fa86fbdebe71f8b1c6fb23221d69fcc"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "nanoid___nanoid_3.1.20.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.20.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz"; + sha1 = "badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"; + }; + } + { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + path = fetchurl { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha1 = "b1fddc0b2c46e380a0b7a76f984dd47c41a13806"; + }; + } + { + name = "next_tick___next_tick_1.0.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + } + { + name = "node_abi___node_abi_2.21.0.tgz"; + path = fetchurl { + name = "node_abi___node_abi_2.21.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz"; + sha1 = "c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48"; + }; + } + { + name = "node_addon_api___node_addon_api_3.1.0.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz"; + sha1 = "98b21931557466c6729e51cb77cd39c965f42239"; + }; + } + { + name = "node_cpplint___node_cpplint_0.4.0.tgz"; + path = fetchurl { + name = "node_cpplint___node_cpplint_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-cpplint/-/node-cpplint-0.4.0.tgz"; + sha1 = "35827fe7b95ccceff0cd7f46ede4cba44b8ef88c"; + }; + } + { + name = "node_gyp___node_gyp_6.1.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz"; + sha1 = "64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f"; + }; + } + { + name = "node_gyp___node_gyp_7.1.2.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz"; + sha1 = "21a810aebb187120251c3bcec979af1587b188ae"; + }; + } + { + name = "node_ninja___node_ninja_1.0.2.tgz"; + path = fetchurl { + name = "node_ninja___node_ninja_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz"; + sha1 = "20a09e57b92e2df591993d4bf098ac3e727062b6"; + }; + } + { + name = "noop_logger___noop_logger_0.1.1.tgz"; + path = fetchurl { + name = "noop_logger___noop_logger_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + }; + } + { + name = "nopt___nopt_3.0.6.tgz"; + path = fetchurl { + name = "nopt___nopt_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + } + { + name = "nopt___nopt_4.0.3.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } + { + name = "nopt___nopt_5.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha1 = "530942bb58a512fccafe53fe210f13a25355dc88"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "npm_path___npm_path_2.0.4.tgz"; + path = fetchurl { + name = "npm_path___npm_path_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz"; + sha1 = "c641347a5ff9d6a09e4d9bce5580c4f505278e64"; + }; + } + { + name = "npm_which___npm_which_3.0.1.tgz"; + path = fetchurl { + name = "npm_which___npm_which_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz"; + sha1 = "9225f26ec3a285c209cae67c3b11a6b4ab7140aa"; + }; + } + { + name = "npmlog___npmlog_2.0.4.tgz"; + path = fetchurl { + name = "npmlog___npmlog_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "npmlog___npmlog_1.2.1.tgz"; + path = fetchurl { + name = "npmlog___npmlog_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz"; + sha1 = "28e7be619609b53f7ad1dd300a10d64d716268b6"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "nw_gyp___nw_gyp_3.6.5.tgz"; + path = fetchurl { + name = "nw_gyp___nw_gyp_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.5.tgz"; + sha1 = "ccce42182229e44e7689da70675b4b8dd0ab0ab3"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_locale___os_locale_1.4.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + }; + } + { + name = "p_locate___p_locate_5.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; + }; + } + { + name = "path_array___path_array_1.0.1.tgz"; + path = fetchurl { + name = "path_array___path_array_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz"; + sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pathval___pathval_1.1.1.tgz"; + path = fetchurl { + name = "pathval___pathval_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz"; + sha1 = "8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.1.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz"; + sha1 = "6754fa6c0d55eced7f9e14408ff9e4cba6f097b4"; + }; + } + { + name = "prebuild___prebuild_10.0.1.tgz"; + path = fetchurl { + name = "prebuild___prebuild_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz"; + sha1 = "9d46a00f42b60ad1718479cc5e3d1ef4882b7f33"; + }; + } + { + name = "private___private_0.1.8.tgz"; + path = fetchurl { + name = "private___private_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; + sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; + }; + } + { + name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + } + { + name = "psl___psl_1.1.29.tgz"; + path = fetchurl { + name = "psl___psl_1.1.29.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz"; + sha1 = "60f580d360170bb722a797cc704411e6da850c67"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { + name = "readable_stream___readable_stream_1.0.34.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.0.34.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + } + { + name = "readable_stream___readable_stream_2.3.3.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "readable_stream___readable_stream_2.1.5.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "repeating___repeating_2.0.1.tgz"; + path = fetchurl { + name = "repeating___repeating_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "rsvp___rsvp_3.6.2.tgz"; + path = fetchurl { + name = "rsvp___rsvp_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz"; + sha1 = "2e96491599a96cde1b515d5674a8f7a91452926a"; + }; + } + { + name = "run_waterfall___run_waterfall_1.1.7.tgz"; + path = fetchurl { + name = "run_waterfall___run_waterfall_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz"; + sha1 = "ae368b549b2f5171f86c2924492cab3352a6e9c5"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_4.3.6.tgz"; + path = fetchurl { + name = "semver___semver_4.3.6.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + }; + } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } + { + name = "semver___semver_5.3.0.tgz"; + path = fetchurl { + name = "semver___semver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "signal_exit___signal_exit_3.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha1 = "f46976082ba35c2263f1c8ab5edfe26c41c9552f"; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha1 = "b45be062435e50d159540b576202ceec40b9c6b3"; + }; + } + { + name = "simple_mime___simple_mime_0.1.0.tgz"; + path = fetchurl { + name = "simple_mime___simple_mime_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz"; + sha1 = "95f517c4f466d7cff561a71fc9dab2596ea9ef2e"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "source_map_support___source_map_support_0.4.18.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.4.18.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz"; + sha1 = "0286a6de8be42641338594e97ccea75f0a2c585f"; + }; + } + { + name = "source_map_support___source_map_support_0.2.10.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.2.10.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz"; + sha1 = "ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc"; + }; + } + { + name = "source_map___source_map_0.1.32.tgz"; + path = fetchurl { + name = "source_map___source_map_0.1.32.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "splitargs___splitargs_0.0.7.tgz"; + path = fetchurl { + name = "splitargs___splitargs_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz"; + sha1 = "fe9f7ae657371b33b10cb80da143cf8249cf6b3b"; + }; + } + { + name = "sshpk___sshpk_1.14.2.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.0.3.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "supports_color___supports_color_8.1.1.tgz"; + path = fetchurl { + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "tar_fs___tar_fs_2.1.1.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; + sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + }; + } + { + name = "tar_stream___tar_stream_2.1.4.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; + sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; + }; + } + { + name = "tar___tar_2.2.2.tgz"; + path = fetchurl { + name = "tar___tar_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz"; + sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40"; + }; + } + { + name = "tar___tar_4.4.13.tgz"; + path = fetchurl { + name = "tar___tar_4.4.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; + sha1 = "43b364bc52888d555298637b10d60790254ab525"; + }; + } + { + name = "tar___tar_6.0.5.tgz"; + path = fetchurl { + name = "tar___tar_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; + sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + }; + } + { + name = "through2___through2_0.6.5.tgz"; + path = fetchurl { + name = "through2___through2_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz"; + sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + }; + } + { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "traceur___traceur_0.0.111.tgz"; + path = fetchurl { + name = "traceur___traceur_0.0.111.tgz"; + url = "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz"; + sha1 = "c04de74d14696c3373427de4fc08ecaf913fc3a1"; + }; + } + { + name = "traverse___traverse_0.3.9.tgz"; + path = fetchurl { + name = "traverse___traverse_0.3.9.tgz"; + url = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + } + { + name = "trim_right___trim_right_1.0.1.tgz"; + path = fetchurl { + name = "trim_right___trim_right_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_detect___type_detect_4.0.8.tgz"; + path = fetchurl { + name = "type_detect___type_detect_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; + sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + }; + } + { + name = "type___type_1.2.0.tgz"; + path = fetchurl { + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.1.0.tgz"; + path = fetchurl { + name = "type___type_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; + sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unzipper___unzipper_0.8.14.tgz"; + path = fetchurl { + name = "unzipper___unzipper_0.8.14.tgz"; + url = "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz"; + sha1 = "ade0524cd2fc14d11b8de258be22f9d247d3f79b"; + }; + } + { + name = "uri_js___uri_js_4.2.2.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + { + name = "url_join___url_join_0.0.1.tgz"; + path = fetchurl { + name = "url_join___url_join_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz"; + sha1 = "1db48ad422d3402469a87f7d97bdebfe4fb1e3c8"; + }; + } + { + name = "url_template___url_template_2.0.8.tgz"; + path = fetchurl { + name = "url_template___url_template_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util_extend___util_extend_1.0.3.tgz"; + path = fetchurl { + name = "util_extend___util_extend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "verror___verror_1.3.6.tgz"; + path = fetchurl { + name = "verror___verror_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "wide_align___wide_align_1.1.2.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz"; + sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710"; + }; + } + { + name = "window_size___window_size_0.1.4.tgz"; + path = fetchurl { + name = "window_size___window_size_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + } + { + name = "workerpool___workerpool_6.1.0.tgz"; + path = fetchurl { + name = "workerpool___workerpool_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz"; + sha1 = "a8e038b4c94569596852de7a8ea4228eefdeb37b"; + }; + } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_3.2.2.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz"; + sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696"; + }; + } + { + name = "y18n___y18n_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + }; + } + { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + path = fetchurl { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha1 = "f131f9226911ae5d9ad38c432fe809366c2325eb"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yargs___yargs_3.32.0.tgz"; + path = fetchurl { + name = "yargs___yargs_3.32.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + ]; +} diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix new file mode 100644 index 00000000000..6dbd15efe72 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -0,0 +1,44 @@ +{ rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock }: + +rustPlatform.buildRustPackage rec { + pname = "seshat-node"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "seshat"; + rev = version; + sha256 = "0zigrz59mhih9asmbbh38z2fg0sii2342q6q0500qil2a0rssai7"; + }; + + sourceRoot = "source/seshat-node/native"; + + nativeBuildInputs = [ nodejs-14_x python3 yarn ]; + buildInputs = [ sqlcipher ]; + + npm_config_nodedir = nodejs-14_x; + + yarnOfflineCache = (callPackage ./yarn.nix {}).offline_cache; + + buildPhase = '' + cd .. + chmod u+w . ./yarn.lock + export HOME=/tmp + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + node_modules/.bin/neon build --release + ''; + + doCheck = false; + + installPhase = '' + shopt -s extglob + rm -rf native/!(index.node) + rm -rf node_modules + cp -r . $out + ''; + + cargoSha256 = "0habjf85mzqxwf8k15msm4cavd7ldq4zpxddkwd4inl2lkvlffqj"; +} diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/pkgs/applications/networking/instant-messengers/element/seshat/update.sh new file mode 100755 index 00000000000..b201501e1c4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/seshat/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../ -i bash -p wget yarn2nix + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the Yarn dependency lock files." + echo "Usage: $0 <git release tag>" + exit 1 +fi + +SRC="https://raw.githubusercontent.com/matrix-org/seshat/$1" + +wget "$SRC/seshat-node/yarn.lock" +yarn2nix > yarn.nix +rm yarn.lock diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix b/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix new file mode 100644 index 00000000000..e9a6333cbb2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix @@ -0,0 +1,4557 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + }; + } + { + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha1 = "7b047d7a3a89a67d2258dc61f604f098f1bc7e08"; + }; + } + { + name = "_babel_core___core_7.14.8.tgz"; + path = fetchurl { + name = "_babel_core___core_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz"; + sha1 = "20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"; + }; + } + { + name = "_babel_generator___generator_7.14.8.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; + sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha1 = "7a99c5d0967911e972fe2c3411f7d5b498498ecf"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha1 = "97e56244beb94211fe277bd818e3a329c66f7970"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; + sha1 = "d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha1 = "0ecc0b03c41cd567b4024ea016134c28414abb94"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha1 = "82e1fec0644a7e775c74d305f212c39f8fe73924"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; + }; + } + { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; + }; + } + { + name = "_babel_helpers___helpers_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz"; + sha1 = "839f88f463025886cff7f85a35297007e2da1b77"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_babel_parser___parser_7.14.8.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; + sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_template___template_7.14.5.tgz"; + path = fetchurl { + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + }; + } + { + name = "_babel_traverse___traverse_7.14.8.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; + sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; + }; + } + { + name = "_babel_types___types_7.14.8.tgz"; + path = fetchurl { + name = "_babel_types___types_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; + sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; + }; + } + { + name = "_jest_console___console_24.9.0.tgz"; + path = fetchurl { + name = "_jest_console___console_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz"; + sha1 = "79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"; + }; + } + { + name = "_jest_core___core_24.9.0.tgz"; + path = fetchurl { + name = "_jest_core___core_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz"; + sha1 = "2ceccd0b93181f9c4850e74f2a9ad43d351369c4"; + }; + } + { + name = "_jest_environment___environment_24.9.0.tgz"; + path = fetchurl { + name = "_jest_environment___environment_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz"; + sha1 = "21e3afa2d65c0586cbd6cbefe208bafade44ab18"; + }; + } + { + name = "_jest_fake_timers___fake_timers_24.9.0.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz"; + sha1 = "ba3e6bf0eecd09a636049896434d306636540c93"; + }; + } + { + name = "_jest_reporters___reporters_24.9.0.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz"; + sha1 = "86660eff8e2b9661d042a8e98a028b8d631a5b43"; + }; + } + { + name = "_jest_source_map___source_map_24.9.0.tgz"; + path = fetchurl { + name = "_jest_source_map___source_map_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz"; + sha1 = "0e263a94430be4b41da683ccc1e6bffe2a191714"; + }; + } + { + name = "_jest_test_result___test_result_24.9.0.tgz"; + path = fetchurl { + name = "_jest_test_result___test_result_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz"; + sha1 = "11796e8aa9dbf88ea025757b3152595ad06ba0ca"; + }; + } + { + name = "_jest_test_sequencer___test_sequencer_24.9.0.tgz"; + path = fetchurl { + name = "_jest_test_sequencer___test_sequencer_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz"; + sha1 = "f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"; + }; + } + { + name = "_jest_transform___transform_24.9.0.tgz"; + path = fetchurl { + name = "_jest_transform___transform_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz"; + sha1 = "4ae2768b296553fadab09e9ec119543c90b16c56"; + }; + } + { + name = "_jest_types___types_24.9.0.tgz"; + path = fetchurl { + name = "_jest_types___types_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz"; + sha1 = "63cb26cb7500d069e5a389441a7c6ab5e909fc59"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.15.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.15.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz"; + sha1 = "2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"; + }; + } + { + name = "_types_babel__generator___babel__generator_7.6.3.tgz"; + path = fetchurl { + name = "_types_babel__generator___babel__generator_7.6.3.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz"; + sha1 = "f456b4b2ce79137f768aa130d2423d2f0ccfaba5"; + }; + } + { + name = "_types_babel__template___babel__template_7.4.1.tgz"; + path = fetchurl { + name = "_types_babel__template___babel__template_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz"; + sha1 = "3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; + sha1 = "ffcd470bbb3f8bf30481678fb5502278ca833a43"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + }; + } + { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; + }; + } + { + name = "_types_stack_utils___stack_utils_1.0.1.tgz"; + path = fetchurl { + name = "_types_stack_utils___stack_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz"; + sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"; + }; + } + { + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + }; + } + { + name = "_types_yargs___yargs_13.0.12.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_13.0.12.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz"; + sha1 = "d895a88c703b78af0465a9de88aa92c61430b092"; + }; + } + { + name = "abab___abab_2.0.5.tgz"; + path = fetchurl { + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + }; + } + { + name = "acorn_globals___acorn_globals_4.3.4.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha1 = "9fa1926addc11c97308c4e66d7add0d40c3272e7"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; + }; + } + { + name = "acorn_walk___acorn_walk_6.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz"; + sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"; + }; + } + { + name = "acorn___acorn_5.7.4.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; + }; + } + { + name = "acorn___acorn_6.4.2.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_2.0.0.tgz"; + path = fetchurl { + name = "anymatch___anymatch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; + sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_back___array_back_3.1.0.tgz"; + path = fetchurl { + name = "array_back___array_back_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz"; + sha1 = "b8859d7a508871c9a7b2cf42f99428f65e96bfb0"; + }; + } + { + name = "array_back___array_back_4.0.2.tgz"; + path = fetchurl { + name = "array_back___array_back_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz"; + sha1 = "8004e999a6274586beeb27342168652fdb89fa1e"; + }; + } + { + name = "array_equal___array_equal_1.0.0.tgz"; + path = fetchurl { + name = "array_equal___array_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.11.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; + }; + } + { + name = "babel_jest___babel_jest_24.9.0.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz"; + sha1 = "3fc327cb8467b89d14d7bc70e315104a783ccd54"; + }; + } + { + name = "babel_plugin_istanbul___babel_plugin_istanbul_5.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_istanbul___babel_plugin_istanbul_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz"; + sha1 = "df4ade83d897a92df069c4d9a25cf2671293c854"; + }; + } + { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.9.0.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz"; + sha1 = "4f837091eb407e01447c8843cbec546d0002d756"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_24.9.0.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz"; + sha1 = "192b521e2217fb1d1f67cf73f70c336650ad3cdc"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + }; + } + { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + path = fetchurl { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; + sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"; + }; + } + { + name = "browserslist___browserslist_4.16.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + }; + } + { + name = "bser___bser_2.1.1.tgz"; + path = fetchurl { + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "builtins___builtins_1.0.3.tgz"; + path = fetchurl { + name = "builtins___builtins_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001246.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001246.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; + sha1 = "fe17d9919f87124d6bb416ef7b325356d69dc76c"; + }; + } + { + name = "capture_exit___capture_exit_2.0.0.tgz"; + path = fetchurl { + name = "capture_exit___capture_exit_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; + sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "catharsis___catharsis_0.9.0.tgz"; + path = fetchurl { + name = "catharsis___catharsis_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz"; + sha1 = "40382a168be0e6da308c277d3a2b3eb40c7d2121"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + }; + } + { + name = "chardet___chardet_0.7.0.tgz"; + path = fetchurl { + name = "chardet___chardet_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; + sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + }; + } + { + name = "cli_width___cli_width_3.0.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; + sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "co___co_4.6.0.tgz"; + path = fetchurl { + name = "co___co_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "command_line_args___command_line_args_5.1.3.tgz"; + path = fetchurl { + name = "command_line_args___command_line_args_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.3.tgz"; + sha1 = "1e57d2816f28804073bb5e75cd24e02e2aa321e7"; + }; + } + { + name = "command_line_commands___command_line_commands_3.0.2.tgz"; + path = fetchurl { + name = "command_line_commands___command_line_commands_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-3.0.2.tgz"; + sha1 = "53872a1181db837f21906b1228e260a4eeb42ee4"; + }; + } + { + name = "command_line_usage___command_line_usage_6.1.1.tgz"; + path = fetchurl { + name = "command_line_usage___command_line_usage_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.1.tgz"; + sha1 = "c908e28686108917758a49f45efb4f02f76bc03f"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cssom___cssom_0.3.8.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssstyle___cssstyle_1.4.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz"; + sha1 = "9d31328229d3c565c61e586b02041a28fccdccf1"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "data_urls___data_urls_1.1.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz"; + sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "detect_newline___detect_newline_2.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + } + { + name = "diff_sequences___diff_sequences_24.9.0.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz"; + sha1 = "5715d6244e2aa65f48bba0bc972db0b0b11e95b5"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "domexception___domexception_1.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz"; + sha1 = "937442644ca6a31261ef36e3ec677fe805582c90"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.782.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.782.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; + sha1 = "522740fe6b4b5255ca754c68d9c406a17b0998e2"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "entities___entities_2.0.3.tgz"; + path = fetchurl { + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.18.3.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.3.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz"; + sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.13.0.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.13.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.13.0.tgz"; + sha1 = "e277d16d2cb25c1ffd3fd13fb0035ad7421382fe"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint___eslint_6.8.0.tgz"; + path = fetchurl { + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; + }; + } + { + name = "espree___espree_6.2.1.tgz"; + path = fetchurl { + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "exec_sh___exec_sh_0.3.6.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "exit___exit_0.1.2.tgz"; + path = fetchurl { + name = "exit___exit_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expect___expect_24.9.0.tgz"; + path = fetchurl { + name = "expect___expect_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz"; + sha1 = "b75165b4817074fa4a157794f46fe9f1ba15b6ca"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "external_editor___external_editor_3.1.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + }; + } + { + name = "figures___figures_3.2.0.tgz"; + path = fetchurl { + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "find_replace___find_replace_3.0.0.tgz"; + path = fetchurl { + name = "find_replace___find_replace_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz"; + sha1 = "3e7e23d3b05167a76f770c9fbd5258b0def68c38"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.2.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + }; + } + { + name = "for_each___for_each_0.3.3.tgz"; + path = fetchurl { + name = "for_each___for_each_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "git_config___git_config_0.0.7.tgz"; + path = fetchurl { + name = "git_config___git_config_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/git-config/-/git-config-0.0.7.tgz"; + sha1 = "a9c8a3ef07a776c3d72261356d8b727b62202b28"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + }; + } + { + name = "growly___growly_1.3.0.tgz"; + path = fetchurl { + name = "growly___growly_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + } + { + name = "handlebars___handlebars_4.7.7.tgz"; + path = fetchurl { + name = "handlebars___handlebars_4.7.7.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz"; + sha1 = "9ce33416aad02dbd6c8fafa8240d5d98004945a1"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; + }; + } + { + name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8"; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.tgz"; + path = fetchurl { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { + name = "import_local___import_local_2.0.0.tgz"; + path = fetchurl { + name = "import_local___import_local_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; + sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "iniparser___iniparser_1.0.5.tgz"; + path = fetchurl { + name = "iniparser___iniparser_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/iniparser/-/iniparser-1.0.5.tgz"; + sha1 = "836d6befe6dfbfcee0bccf1cf9f2acc7027f783d"; + }; + } + { + name = "inquirer___inquirer_7.3.3.tgz"; + path = fetchurl { + name = "inquirer___inquirer_7.3.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz"; + sha1 = "04d176b2af04afc157a83fd7c100e98ee0aad003"; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_bigint___is_bigint_1.0.2.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + }; + } + { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + path = fetchurl { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_callable___is_callable_1.2.3.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_core_module___is_core_module_2.5.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz"; + sha1 = "f754843617c70bfd29b7bd87327400cda5c18491"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.4.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; + sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + path = fetchurl { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; + sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + }; + } + { + name = "is_number_object___is_number_object_1.0.5.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_regex___is_regex_1.1.3.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_string___is_string_1.0.6.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; + }; + } + { + name = "is_symbol___is_symbol_1.0.4.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "is_wsl___is_wsl_1.1.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; + sha1 = "675f0ab69503fad4b1d849f736baaca803344f49"; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; + sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; + sha1 = "5a8113cd746d43c4889eba36ab10e7d50c9b4f33"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; + sha1 = "284997c48211752ec486253da97e3879defba8c8"; + }; + } + { + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; + }; + } + { + name = "jest_changed_files___jest_changed_files_24.9.0.tgz"; + path = fetchurl { + name = "jest_changed_files___jest_changed_files_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz"; + sha1 = "08d8c15eb79a7fa3fc98269bc14b451ee82f8039"; + }; + } + { + name = "jest_cli___jest_cli_24.9.0.tgz"; + path = fetchurl { + name = "jest_cli___jest_cli_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz"; + sha1 = "ad2de62d07472d419c6abc301fc432b98b10d2af"; + }; + } + { + name = "jest_config___jest_config_24.9.0.tgz"; + path = fetchurl { + name = "jest_config___jest_config_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz"; + sha1 = "fb1bbc60c73a46af03590719efa4825e6e4dd1b5"; + }; + } + { + name = "jest_diff___jest_diff_24.9.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz"; + sha1 = "931b7d0d5778a1baf7452cb816e325e3724055da"; + }; + } + { + name = "jest_docblock___jest_docblock_24.9.0.tgz"; + path = fetchurl { + name = "jest_docblock___jest_docblock_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz"; + sha1 = "7970201802ba560e1c4092cc25cbedf5af5a8ce2"; + }; + } + { + name = "jest_each___jest_each_24.9.0.tgz"; + path = fetchurl { + name = "jest_each___jest_each_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz"; + sha1 = "eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"; + }; + } + { + name = "jest_environment_jsdom___jest_environment_jsdom_24.9.0.tgz"; + path = fetchurl { + name = "jest_environment_jsdom___jest_environment_jsdom_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz"; + sha1 = "4b0806c7fc94f95edb369a69cc2778eec2b7375b"; + }; + } + { + name = "jest_environment_node___jest_environment_node_24.9.0.tgz"; + path = fetchurl { + name = "jest_environment_node___jest_environment_node_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz"; + sha1 = "333d2d2796f9687f2aeebf0742b519f33c1cbfd3"; + }; + } + { + name = "jest_get_type___jest_get_type_24.9.0.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz"; + sha1 = "1684a0c8a50f2e4901b6644ae861f579eed2ef0e"; + }; + } + { + name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz"; + sha1 = "b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"; + }; + } + { + name = "jest_jasmine2___jest_jasmine2_24.9.0.tgz"; + path = fetchurl { + name = "jest_jasmine2___jest_jasmine2_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz"; + sha1 = "1f7b1bd3242c1774e62acabb3646d96afc3be6a0"; + }; + } + { + name = "jest_leak_detector___jest_leak_detector_24.9.0.tgz"; + path = fetchurl { + name = "jest_leak_detector___jest_leak_detector_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz"; + sha1 = "b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"; + }; + } + { + name = "jest_matcher_utils___jest_matcher_utils_24.9.0.tgz"; + path = fetchurl { + name = "jest_matcher_utils___jest_matcher_utils_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz"; + sha1 = "f5b3661d5e628dffe6dd65251dfdae0e87c3a073"; + }; + } + { + name = "jest_message_util___jest_message_util_24.9.0.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz"; + sha1 = "527f54a1e380f5e202a8d1149b0ec872f43119e3"; + }; + } + { + name = "jest_mock___jest_mock_24.9.0.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz"; + sha1 = "c22835541ee379b908673ad51087a2185c13f1c6"; + }; + } + { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + path = fetchurl { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + }; + } + { + name = "jest_regex_util___jest_regex_util_24.9.0.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz"; + sha1 = "c13fb3380bde22bf6575432c493ea8fe37965636"; + }; + } + { + name = "jest_resolve_dependencies___jest_resolve_dependencies_24.9.0.tgz"; + path = fetchurl { + name = "jest_resolve_dependencies___jest_resolve_dependencies_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz"; + sha1 = "ad055198959c4cfba8a4f066c673a3f0786507ab"; + }; + } + { + name = "jest_resolve___jest_resolve_24.9.0.tgz"; + path = fetchurl { + name = "jest_resolve___jest_resolve_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz"; + sha1 = "dff04c7687af34c4dd7e524892d9cf77e5d17321"; + }; + } + { + name = "jest_runner___jest_runner_24.9.0.tgz"; + path = fetchurl { + name = "jest_runner___jest_runner_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz"; + sha1 = "574fafdbd54455c2b34b4bdf4365a23857fcdf42"; + }; + } + { + name = "jest_runtime___jest_runtime_24.9.0.tgz"; + path = fetchurl { + name = "jest_runtime___jest_runtime_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz"; + sha1 = "9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"; + }; + } + { + name = "jest_serializer___jest_serializer_24.9.0.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz"; + sha1 = "e6d7d7ef96d31e8b9079a714754c5d5c58288e73"; + }; + } + { + name = "jest_snapshot___jest_snapshot_24.9.0.tgz"; + path = fetchurl { + name = "jest_snapshot___jest_snapshot_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz"; + sha1 = "ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"; + }; + } + { + name = "jest_util___jest_util_24.9.0.tgz"; + path = fetchurl { + name = "jest_util___jest_util_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz"; + sha1 = "7396814e48536d2e85a37de3e4c431d7cb140162"; + }; + } + { + name = "jest_validate___jest_validate_24.9.0.tgz"; + path = fetchurl { + name = "jest_validate___jest_validate_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz"; + sha1 = "0775c55360d173cd854e40180756d4ff52def8ab"; + }; + } + { + name = "jest_watcher___jest_watcher_24.9.0.tgz"; + path = fetchurl { + name = "jest_watcher___jest_watcher_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz"; + sha1 = "4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"; + }; + } + { + name = "jest_worker___jest_worker_24.9.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz"; + sha1 = "5dbfdb5b2d322e98567898238a9697bcce67b3e5"; + }; + } + { + name = "jest___jest_24.9.0.tgz"; + path = fetchurl { + name = "jest___jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz"; + sha1 = "987d290c05a08b52c56188c1002e368edb007171"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "js2xmlparser___js2xmlparser_4.0.1.tgz"; + path = fetchurl { + name = "js2xmlparser___js2xmlparser_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.1.tgz"; + sha1 = "670ef71bc5661f089cc90481b99a05a1227ae3bd"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsdoc___jsdoc_3.6.7.tgz"; + path = fetchurl { + name = "jsdoc___jsdoc_3.6.7.tgz"; + url = "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.7.tgz"; + sha1 = "00431e376bed7f9de4716c6f15caa80e64492b89"; + }; + } + { + name = "jsdom___jsdom_11.12.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz"; + sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "klaw___klaw_3.0.0.tgz"; + path = fetchurl { + name = "klaw___klaw_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz"; + sha1 = "b11bec9cf2492f06756d6e809ab73a2910259146"; + }; + } + { + name = "kleur___kleur_3.0.3.tgz"; + path = fetchurl { + name = "kleur___kleur_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; + sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + }; + } + { + name = "left_pad___left_pad_1.3.0.tgz"; + path = fetchurl { + name = "left_pad___left_pad_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz"; + sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e"; + }; + } + { + name = "leven___leven_3.1.0.tgz"; + path = fetchurl { + name = "leven___leven_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; + sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "linkify_it___linkify_it_2.2.0.tgz"; + path = fetchurl { + name = "linkify_it___linkify_it_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz"; + sha1 = "e3b54697e78bf915c70a38acd78fd09e0058b1cf"; + }; + } + { + name = "load_json_file___load_json_file_4.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + path = fetchurl { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + } + { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_promises_safe___make_promises_safe_5.1.0.tgz"; + path = fetchurl { + name = "make_promises_safe___make_promises_safe_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-promises-safe/-/make-promises-safe-5.1.0.tgz"; + sha1 = "dd9d311f555bcaa144f12e225b3d37785f0aa8f2"; + }; + } + { + name = "makeerror___makeerror_1.0.11.tgz"; + path = fetchurl { + name = "makeerror___makeerror_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "markdown_it_anchor___markdown_it_anchor_5.3.0.tgz"; + path = fetchurl { + name = "markdown_it_anchor___markdown_it_anchor_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz"; + sha1 = "d549acd64856a8ecd1bea58365ef385effbac744"; + }; + } + { + name = "markdown_it___markdown_it_10.0.0.tgz"; + path = fetchurl { + name = "markdown_it___markdown_it_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz"; + sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc"; + }; + } + { + name = "marked___marked_2.1.3.tgz"; + path = fetchurl { + name = "marked___marked_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz"; + sha1 = "bd017cef6431724fd4b27e0657f5ceb14bff3753"; + }; + } + { + name = "mdurl___mdurl_1.0.1.tgz"; + path = fetchurl { + name = "mdurl___mdurl_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "mime_db___mime_db_1.48.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.48.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; + sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; + }; + } + { + name = "mime_types___mime_types_2.1.31.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.31.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; + sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "mute_stream___mute_stream_0.0.8.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; + }; + } + { + name = "nan___nan_2.14.2.tgz"; + path = fetchurl { + name = "nan___nan_2.14.2.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; + sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "neon_cli___neon_cli_0.8.3.tgz"; + path = fetchurl { + name = "neon_cli___neon_cli_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.8.3.tgz"; + sha1 = "dea3a00021a07b9ef05e73464e45c94a2bf0fd3a"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_int64___node_int64_0.4.0.tgz"; + path = fetchurl { + name = "node_int64___node_int64_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + } + { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + path = fetchurl { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + } + { + name = "node_notifier___node_notifier_5.4.5.tgz"; + path = fetchurl { + name = "node_notifier___node_notifier_5.4.5.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.5.tgz"; + sha1 = "0cbc1a2b0f658493b4025775a13ad938e96091ef"; + }; + } + { + name = "node_releases___node_releases_1.1.73.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.73.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz"; + sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "nwsapi___nwsapi_2.2.0.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_inspect___object_inspect_1.11.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; + sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha1 = "1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "p_each_series___p_each_series_1.0.0.tgz"; + path = fetchurl { + name = "p_each_series___p_each_series_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz"; + sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_reduce___p_reduce_1.0.0.tgz"; + path = fetchurl { + name = "p_reduce___p_reduce_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse5___parse5_4.0.0.tgz"; + path = fetchurl { + name = "parse5___parse5_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz"; + sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_type___path_type_3.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pirates___pirates_4.0.1.tgz"; + path = fetchurl { + name = "pirates___pirates_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; + sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pn___pn_1.1.0.tgz"; + path = fetchurl { + name = "pn___pn_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz"; + sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "pretty_format___pretty_format_24.9.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz"; + sha1 = "12fac31b37019a4eea3c11aa9a959eb7628aa7c9"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "prompts___prompts_2.4.1.tgz"; + path = fetchurl { + name = "prompts___prompts_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; + sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } + { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; + }; + } + { + name = "read_pkg___read_pkg_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + } + { + name = "realpath_native___realpath_native_1.1.0.tgz"; + path = fetchurl { + name = "realpath_native___realpath_native_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz"; + sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c"; + }; + } + { + name = "reduce_flatten___reduce_flatten_2.0.0.tgz"; + path = fetchurl { + name = "reduce_flatten___reduce_flatten_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; + sha1 = "734fd84e65f375d7ca4465c69798c25c9d10ae27"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexpp___regexpp_2.0.1.tgz"; + path = fetchurl { + name = "regexpp___regexpp_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; + sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.4.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + path = fetchurl { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; + }; + } + { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + path = fetchurl { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "requizzle___requizzle_0.2.3.tgz"; + path = fetchurl { + name = "requizzle___requizzle_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.3.tgz"; + sha1 = "4675c90aacafb2c036bd39ba2daa4a1cb777fded"; + }; + } + { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.1.7.tgz"; + path = fetchurl { + name = "resolve___resolve_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "rsvp___rsvp_4.8.5.tgz"; + path = fetchurl { + name = "rsvp___rsvp_4.8.5.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; + sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + }; + } + { + name = "rxjs___rxjs_6.6.7.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sane___sane_4.1.0.tgz"; + path = fetchurl { + name = "sane___sane_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; + sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shellwords___shellwords_0.1.1.tgz"; + path = fetchurl { + name = "shellwords___shellwords_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; + sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "sisteransi___sisteransi_1.0.5.tgz"; + path = fetchurl { + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + }; + } + { + name = "slash___slash_2.0.0.tgz"; + path = fetchurl { + name = "slash___slash_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz"; + sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44"; + }; + } + { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_url___source_map_url_0.4.1.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "stack_utils___stack_utils_1.0.5.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz"; + sha1 = "a19b0b01947e0029c8e451d5d61a498f5bb1471b"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + path = fetchurl { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + } + { + name = "string_length___string_length_2.0.0.tgz"; + path = fetchurl { + name = "string_length___string_length_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz"; + sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + path = fetchurl { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + }; + } + { + name = "table_layout___table_layout_1.0.2.tgz"; + path = fetchurl { + name = "table_layout___table_layout_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz"; + sha1 = "c4038a1853b0136d63365a734b6931cf4fad4a04"; + }; + } + { + name = "table___table_5.4.6.tgz"; + path = fetchurl { + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + }; + } + { + name = "taffydb___taffydb_2.6.2.tgz"; + path = fetchurl { + name = "taffydb___taffydb_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz"; + sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + }; + } + { + name = "test_exclude___test_exclude_5.2.3.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz"; + sha1 = "c3d3e1e311eb7ee405e092dac10aefd09091eac0"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "throat___throat_4.1.0.tgz"; + path = fetchurl { + name = "throat___throat_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz"; + sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "tmpl___tmpl_1.0.4.tgz"; + path = fetchurl { + name = "tmpl___tmpl_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toml___toml_3.0.0.tgz"; + path = fetchurl { + name = "toml___toml_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz"; + sha1 = "342160f1af1904ec9d204d03a5d61222d762c5ee"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tr46___tr46_1.0.1.tgz"; + path = fetchurl { + name = "tr46___tr46_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + } + { + name = "ts_typed_json___ts_typed_json_0.3.2.tgz"; + path = fetchurl { + name = "ts_typed_json___ts_typed_json_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/ts-typed-json/-/ts-typed-json-0.3.2.tgz"; + sha1 = "f4f20f45950bae0a383857f7b0a94187eca1b56a"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_fest___type_fest_0.21.3.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "typical___typical_4.0.0.tgz"; + path = fetchurl { + name = "typical___typical_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz"; + sha1 = "cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"; + }; + } + { + name = "typical___typical_5.2.0.tgz"; + path = fetchurl { + name = "typical___typical_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz"; + sha1 = "4daaac4f2b5315460804f0acf6cb69c52bb93066"; + }; + } + { + name = "uc.micro___uc.micro_1.0.6.tgz"; + path = fetchurl { + name = "uc.micro___uc.micro_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz"; + sha1 = "9c411a802a409a91fc6cf74081baba34b24499ac"; + }; + } + { + name = "uglify_js___uglify_js_3.13.10.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.13.10.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.10.tgz"; + sha1 = "a6bd0d28d38f592c3adb6b180ea6e07e1e540a8d"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + }; + } + { + name = "underscore___underscore_1.13.1.tgz"; + path = fetchurl { + name = "underscore___underscore_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz"; + sha1 = "0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "util.promisify___util.promisify_1.1.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz"; + sha1 = "77832f57ced2c9478174149cae9b96e9918cd54b"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + path = fetchurl { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + }; + } + { + name = "walker___walker_1.0.7.tgz"; + path = fetchurl { + name = "walker___walker_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + } + { + name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + }; + } + { + name = "whatwg_url___whatwg_url_6.5.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8"; + }; + } + { + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wordwrap___wordwrap_1.0.0.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + } + { + name = "wordwrapjs___wordwrapjs_4.0.1.tgz"; + path = fetchurl { + name = "wordwrapjs___wordwrapjs_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz"; + sha1 = "d9790bccfb110a0fc7836b5ebce0937b37a8b98f"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_2.4.1.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz"; + sha1 = "d0b05463c188ae804396fd5ab2a370062af87529"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "ws___ws_5.2.3.tgz"; + path = fetchurl { + name = "ws___ws_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz"; + sha1 = "05541053414921bc29c63bee14b8b0dd50b07b3d"; + }; + } + { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + }; + } + { + name = "xmlcreate___xmlcreate_2.0.3.tgz"; + path = fetchurl { + name = "xmlcreate___xmlcreate_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.3.tgz"; + sha1 = "df9ecd518fd3890ab3548e1b811d040614993497"; + }; + } + { + name = "y18n___y18n_4.0.3.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + ]; +} From 171310205991acc7240eb01a07010dfc59edb047 Mon Sep 17 00:00:00 2001 From: Eric Dallo <ericdallo06@hotmail.com> Date: Tue, 3 Aug 2021 19:11:13 -0300 Subject: [PATCH 1387/1522] babashka: 0.4.5 -> 0.5.1 --- pkgs/development/interpreters/clojure/babashka.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 58ed4c689b1..1b6edcd1dd4 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.5"; + version = "0.5.1"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "sha256-TVFdGFXclJE9GpolKzTGSmeianBdb2Yp3kbNUWlddPw="; + sha256 = "1mx89rrkxyn7s8nfif0564gjrpc299wzl0wfq9qx8blc6a1438a9"; }; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-SnKs30c6VTp1yzW2Glooi6ghSUIZgF6nsob1hDljTA8="; + sha256 = "0rp6lam3psnk12j69z8qp1ixyp7zvvjahn18mvkmc38naml0p514"; }; dontUnpack = true; From e143dc53b23a56621a2da13cf8698bea7521f94a Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Mon, 2 Aug 2021 11:37:36 +0200 Subject: [PATCH 1388/1522] chromium: update.py: Implement automatic committing of the updates This functionality saves some unnecessary work. --- .../networking/browsers/chromium/update.py | 61 +++++++++++++------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index d6788fa4192..4f9f53bd02a 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -3,6 +3,7 @@ """This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium via upstream-info.json.""" +# Usage: ./update.py [--commit] import csv import json @@ -22,6 +23,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' def load_json(path): @@ -117,6 +119,21 @@ def channel_name_to_attr_name(channel_name): sys.exit(1) +def get_channel_key(item): + """Orders Chromium channels by their name.""" + channel_name = item[0] + if channel_name == 'stable': + return 0 + if channel_name == 'beta': + return 1 + if channel_name == 'dev': + return 2 + if channel_name == 'ungoogled-chromium': + return 3 + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + + def print_updates(channels_old, channels_new): """Print a summary of the updates.""" print('Updates:') @@ -192,21 +209,31 @@ with urlopen(HISTORY_URL) as resp: channels[channel_name] = channel -with open(JSON_PATH, 'w') as out: - def get_channel_key(item): - """Orders Chromium channels by their name.""" - channel_name = item[0] - if channel_name == 'stable': - return 0 - if channel_name == 'beta': - return 1 - if channel_name == 'dev': - return 2 - if channel_name == 'ungoogled-chromium': - return 3 - print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) - sys.exit(1) - sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) - json.dump(sorted_channels, out, indent=2) - out.write('\n') +sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) +if len(sys.argv) == 2 and sys.argv[1] == '--commit': + for channel_name in sorted_channels.keys(): + version_old = last_channels[channel_name]['version'] + version_new = sorted_channels[channel_name]['version'] + if LooseVersion(version_old) < LooseVersion(version_new): + last_channels[channel_name] = sorted_channels[channel_name] + with open(JSON_PATH, 'w') as out: + json.dump(last_channels, out, indent=2) + out.write('\n') + attr_name = channel_name_to_attr_name(channel_name) + commit_message = f'{attr_name}: {version_old} -> {version_new}' + if channel_name == 'stable': + body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT]).decode('utf-8') + prefix = f'chromium: TODO -> {version_new}' + if not body.startswith(prefix): + print("Error: Couldn't fetch the the release notes for the following update:") + print(commit_message) + sys.exit(1) + body = body.removeprefix(prefix) + commit_message += body + subprocess.run(['git', 'add', JSON_PATH], check=True) + subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) +else: + with open(JSON_PATH, 'w') as out: + json.dump(sorted_channels, out, indent=2) + out.write('\n') print_updates(last_channels, sorted_channels) From f9eb20c0a96c01f60a8162d228eede544f7e230e Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 00:23:25 +0200 Subject: [PATCH 1389/1522] chromiumDev: 93.0.4577.18 -> 94.0.4595.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a0a8fd23e6b..1066d322bad 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4577.18", - "sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x", - "sha256bin64": "14cw0k4gsilybg7gbbbmck62i0prq5rm6hwqalmmmiqcldrw05mq", + "version": "94.0.4595.0", + "sha256": "0ksd7vqpbiplbg2xpm566z7p7qp57r27a3pk6ss1qz8v18490092", + "sha256bin64": "1kibyhgwcgby3hnhjdg2vrgbj4dvvbicqlcj4id9761zw1jhz8r4", "deps": { "gn": { - "version": "2021-07-08", + "version": "2021-07-31", "url": "https://gn.googlesource.com/gn", - "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", - "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" + "rev": "eea3906f0e2a8d3622080127d2005ff214d51383", + "sha256": "1wc969jrivb502c45wdcbgh0c5888nqxla05is9bimkrk9rqppw3" } } }, From 7d3b20253faa119966e66c644ec900bd4aacd86a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski <markus.kowalewski@fysik.su.se> Date: Tue, 3 Aug 2021 15:46:24 +0200 Subject: [PATCH 1390/1522] ergoscf: init at 3.8 --- .../science/chemistry/ergoscf/default.nix | 40 +++++++++++++++++++ .../chemistry/ergoscf/math-constants.patch | 19 +++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/applications/science/chemistry/ergoscf/default.nix create mode 100644 pkgs/applications/science/chemistry/ergoscf/math-constants.patch diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/applications/science/chemistry/ergoscf/default.nix new file mode 100644 index 00000000000..b7d61848134 --- /dev/null +++ b/pkgs/applications/science/chemistry/ergoscf/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, blas, lapack } : + +stdenv.mkDerivation rec { + pname = "ergoscf"; + version = "3.8"; + + src = fetchurl { + url = "http://www.ergoscf.org/source/tarfiles/ergo-${version}.tar.gz"; + sha256 = "1s50k2gfs3y6r5kddifn4p0wmj0yk85wm5vf9v3swm1c0h43riix"; + }; + + buildInputs = [ blas lapack ]; + + patches = [ ./math-constants.patch ]; + + postPatch = '' + patchShebangs ./test + ''; + + configureFlags = [ + "--enable-linalgebra-templates" + "--enable-performance" + ] ++ lib.optional stdenv.isx86_64 "--enable-sse-intrinsics"; + + LDFLAGS = "-lblas -llapack"; + + enableParallelBuilding = true; + + OMP_NUM_THREADS = 2; # required for check phase + + doCheck = true; + + meta = with lib; { + description = "Quantum chemistry program for large-scale self-consistent field calculations"; + homepage = "http://www.ergoscf.org"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/chemistry/ergoscf/math-constants.patch b/pkgs/applications/science/chemistry/ergoscf/math-constants.patch new file mode 100644 index 00000000000..62209f1a3d8 --- /dev/null +++ b/pkgs/applications/science/chemistry/ergoscf/math-constants.patch @@ -0,0 +1,19 @@ +diff --git a/source/dft/functionals.h b/source/dft/functionals.h +index fde49ba..f7a61fc 100644 +--- a/source/dft/functionals.h ++++ b/source/dft/functionals.h +@@ -59,6 +59,14 @@ + #define EXTERN_C + #endif + ++#ifndef M_PI ++#define M_PI 3.14159265358979323846 ++#endif ++ ++#ifndef M_SQRT2 ++#define M_SQRT2 1.41421356237309504880 ++#endif ++ + typedef ergo_real real; + + #if defined(FUNC_PRECISION) && FUNC_PRECISION == 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b48b32f58e..a5f3b505cef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30026,6 +30026,8 @@ in d-seams = callPackage ../applications/science/chemistry/d-seams {}; + ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; jmol = callPackage ../applications/science/chemistry/jmol { From cb3d4bc196beea3fc5093839df11c2aa51754c20 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 4 Aug 2021 00:33:57 +0200 Subject: [PATCH 1391/1522] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../transitive-broken.yaml | 3 +++ .../haskell-modules/hackage-packages.nix | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a6329c8f9e3..624002162f3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -925,6 +925,7 @@ broken-packages: - data-nat - data-object - datapacker + - data-pdf-fieldreader - data-pprint - data-quotientref - data-reify-cse @@ -2485,6 +2486,7 @@ broken-packages: - interpolatedstring-qq2 - interruptible - interval + - interval-algebra - IntFormats - int-multimap - intricacy @@ -2522,6 +2524,7 @@ broken-packages: - itcli - itemfield - iteratee + - iterative-forward-search - iterIO - it-has - ivory @@ -2821,6 +2824,7 @@ broken-packages: - loch - log2json - log4hs + - log-base - logentries - logger - logging-effect-extra-file @@ -3673,6 +3677,7 @@ broken-packages: - postgres-embedded - postgresql-lo-stream - postgresql-named + - postgresql-resilient - postgresql-simple-bind - postgresql-simple-named - postgresql-simple-sop diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index dbc93b59045..fa5e7e5d8c5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1972,10 +1972,12 @@ dont-distribute-packages: - llvm-tf - llvm-tools - lmonad-yesod + - lnd-client - local-search - localize - locked-poll - log + - log-elasticsearch - log-postgres - log-utils - logging-effect-extra @@ -3145,6 +3147,7 @@ dont-distribute-packages: - wai-dispatch - wai-handler-snap - wai-hastache + - wai-log - wai-middleware-brotli - wai-middleware-cache - wai-middleware-cache-redis diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7e4322496e..e3baf23a06f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -70207,6 +70207,8 @@ self: { ]; description = "Read PDF form fields"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-pprint" = callPackage @@ -149517,6 +149519,8 @@ self: { ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interval-functor" = callPackage @@ -151413,6 +151417,8 @@ self: { ]; description = "An IFS constraint solver"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "iterio-server" = callPackage @@ -166761,6 +166767,7 @@ self: { ]; description = "Lightning Network Daemon (LND) client library for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "load-balancing" = callPackage @@ -167104,6 +167111,8 @@ self: { ]; description = "Structured logging solution (base package)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "log-domain" = callPackage @@ -167178,6 +167187,7 @@ self: { ]; description = "Structured logging solution (Elasticsearch back end)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -208061,6 +208071,8 @@ self: { libraryHaskellDepends = [ base exceptions postgresql-simple ]; description = "Automatic re-connection support for PostgreSQL"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-schema" = callPackage @@ -279657,6 +279669,7 @@ self: { ]; description = "A logging middleware for WAI applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-logger" = callPackage From 05cba47810d350efb9c5a704a6e6b4fabd677d7b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Sun, 13 Jun 2021 15:59:13 -0700 Subject: [PATCH 1392/1522] nixos/hqplayerd: init --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 3 +- nixos/modules/services/audio/hqplayerd.nix | 166 +++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/audio/hqplayerd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 858c7ee53db..0ae6b95ba4f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -347,6 +347,7 @@ in #mailman = 316; # removed 2019-08-30 zigbee2mqtt = 317; # shadow = 318; # unused + hqplayer = 319; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -649,6 +650,7 @@ in #mailman = 316; # removed 2019-08-30 zigbee2mqtt = 317; shadow = 318; + hqplayer = 319; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c9aa18e1edf..30871de95f6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -243,8 +243,9 @@ ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix ./services/audio/botamusique.nix - ./services/audio/jack.nix + ./services/audio/hqplayerd.nix ./services/audio/icecast.nix + ./services/audio/jack.nix ./services/audio/jmusicbot.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix new file mode 100644 index 00000000000..3a703c97c0f --- /dev/null +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -0,0 +1,166 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.hqplayerd; + pkg = pkgs.hqplayerd; + # XXX: This is hard-coded in the distributed binary, don't try to change it. + stateDir = "/var/lib/hqplayer"; + configDir = "/etc/hqplayer"; +in +{ + options = { + services.hqplayerd = { + enable = mkEnableOption "HQPlayer Embedded"; + + licenseFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the HQPlayer license key file. + + Without this, the service will run in trial mode and restart every 30 + minutes. + ''; + }; + + auth = { + username = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Username used for HQPlayer's WebUI. + + Without this you will need to manually create the credentials after + first start by going to http://your.ip/8088/auth + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password used for HQPlayer's WebUI. + + Without this you will need to manually create the credentials after + first start by going to http://your.ip/8088/auth + ''; + }; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open TCP port 8088 in the firewall for the server. + ''; + }; + + user = mkOption { + type = types.str; + default = "hqplayer"; + description = '' + User account under which hqplayerd runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "hqplayer"; + description = '' + Group account under which hqplayerd runs. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.auth.username != null -> cfg.auth.password != null) + && (cfg.auth.password != null -> cfg.auth.username != null); + message = "You must set either both services.hqplayer.auth.username and password, or neither."; + } + ]; + + environment = { + etc = { + "hqplayer/hqplayerd4-key.xml" = mkIf (cfg.licenseFile != null) { source = cfg.licenseFile; }; + "modules-load.d/taudio2.conf".source = "${pkg}/etc/modules-load.d/taudio2.conf"; + }; + systemPackages = [ pkg ]; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 8088 ]; + }; + + services.udev.packages = [ pkg ]; + + systemd = { + tmpfiles.rules = [ + "d ${configDir} 0755 ${cfg.user} ${cfg.group} - -" + "d ${stateDir} 0755 ${cfg.user} ${cfg.group} - -" + ]; + + services.hqplayerd = { + description = "HQPlayer daemon"; + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" "sound.target" "systemd-udev-settle.service" ]; + after = [ "network-online.target" "sound.target" "systemd-udev-settle.service" "local-fs.target" "remote-fs.target" "systemd-tmpfiles-setup.service" ]; + + unitConfig.ConditionPathExists = [ configDir stateDir ]; + + preStart = + let + blankCfg = pkgs.writeText "hqplayerd.xml" '' + <?xml version="1.0" encoding="utf-8"?> + <xml> + </xml> + ''; + in + '' + cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" + chmod -R u+wX "${stateDir}/web" + + if [ ! -f "${configDir}/hqplayerd.xml" ]; then + echo "creating blank config file" + install -m 0644 "${blankCfg}" "${configDir}/hqplayerd.xml" + fi + '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' + ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} + ''; + + serviceConfig = { + ExecStart = "${pkg}/bin/hqplayerd"; + + User = cfg.user; + Group = cfg.group; + + Restart = "on-failure"; + RestartSec = 5; + + Nice = -10; + IOSchedulingClass = "realtime"; + LimitMEMLOCK = "1G"; + LimitNICE = -10; + LimitRTPRIO = 98; + }; + }; + }; + + users.groups = mkIf (cfg.group == "hqplayer") { + hqplayer.gid = config.ids.gids.hqplayer; + }; + + users.users = mkIf (cfg.user == "hqplayer") { + hqplayer = { + description = "hqplayer daemon user"; + extraGroups = [ "audio" ]; + group = cfg.group; + uid = config.ids.uids.hqplayer; + }; + }; + }; +} From 3e3e445d8df77d39c22370ad89106e2db104f7e2 Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Wed, 4 Aug 2021 01:10:25 +0200 Subject: [PATCH 1393/1522] sqlcipher: fix static build --- pkgs/development/libraries/sqlcipher/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 44da759409e..1874e3d8255 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw="; }; - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ readline ncurses openssl tcl ]; + nativeBuildInputs = [ installShellFiles tcl ]; + buildInputs = [ readline ncurses openssl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ]; LDFLAGS = lib.optional (readline != null) "-lncurses"; + BUILD_CC = "$(CC_FOR_BUILD)"; doCheck = false; # fails. requires tcl? From 905cd7ce87f21a22641d06e64dfb4e5eaaccfd9d Mon Sep 17 00:00:00 2001 From: figsoda <figsoda@pm.me> Date: Tue, 3 Aug 2021 19:48:10 -0400 Subject: [PATCH 1394/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 62 ++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 951914a41c6..b7fe64feed7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -786,12 +786,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-07-23"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "8dedf17ad815ce78122c22d25e93777e3f2d8cfe"; - sha256 = "0061x13jznqqvpci1f6x9r0qrn2bakvvp2ai1nbrb1ynvbgkh3mf"; + rev = "998603d240b13e32e3c9571bcb805357ea323fa9"; + sha256 = "1fd7d3nfb8qi0zk2jskkmym3yb8qzys7li88cjfxdqrl9kcqa723"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1510,12 +1510,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-08-02"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "37fc982d56f8bfe1cce8209414752e046effc65c"; - sha256 = "1qzkvbdgr4h7bmql33na5h93jrjcf2m96j5y9vi79rvsl8wwjqww"; + rev = "066d2347baa8dc180c18f889d0b37a826f23973b"; + sha256 = "0m04jn8701hl4fqjsfc6dalikqvgrql3fwqrc8z81swcjyf6rsaw"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-02"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "459179fd7711fcec5c4926903e0785a8f464b21d"; - sha256 = "1fvx3513pbsasar4bh06jaxaj8vaq1y65id2pppkgxp7jsknrf4i"; + rev = "8e12f8aee2c78e97cb1e99a3c409da1d8c0a13b6"; + sha256 = "0rv03vyndfh4ic0y9d9x3ckxlcf0rvxxa2ahzgqaz17wn4wzl7a9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1875,8 +1875,8 @@ final: prev: src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "97ff7471a88e35dd1e73be1f8d70d274f44dcb26"; - sha256 = "0m880kdyyarjj8gyqlq2vfhf6bxmax04p0a8k8yc8sz6lvl78avj"; + rev = "f8786ea3bfe69fccadec6ef7fa64d4188f788729"; + sha256 = "028l9x94yi5ffjp44vsjyyalxnax0691aiiy22c143pcd5wv5w3q"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3588,12 +3588,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-27"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "7bf463cf7c61faa9f24222bba9412230d4cc1dc7"; - sha256 = "12x4lnhxv2sij47drrdxxk814hsmghfz7sv8fc2c5wbbdg9ygg5a"; + rev = "3fb698aef5f48b660dacf8abd1bcdff6588dd2b8"; + sha256 = "15zzjyzz53w79j8jn8bsbxgdgs6qfpxm9pp5xvkkah53g34wfqwd"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3660,12 +3660,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-07-31"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "a47408920f8dd5ffb1db821ce72dd6ef21730c63"; - sha256 = "1g9nlkdcvhzs6ds7493fcrgi5gizn4h517h65ynr31cfnajxm8wb"; + rev = "90a4025a4da7ac7a261026c50439bbd1bdfc8563"; + sha256 = "0apl84djyxy8ldcxv2xs0irgy7rjxcisqnl3wxcfi3fhvfsb0fz3"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3700,8 +3700,8 @@ final: prev: src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "f95263e2d0d9177143d3203bb32adc8b24d34c0c"; - sha256 = "1r5nlsbrs8sigs7ny23hiywr475dg1n15aqashzan4m1sgn37nab"; + rev = "f6eb9e06c4575945e7a20d87ac8968f84d18d608"; + sha256 = "1kz7fm2aqg2jqmjw2dyjc506j6hgkv7vgqrl7fdxdabsss581cs5"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6738,12 +6738,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-05-12"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "07b0256b08e0da6d31200663cbe6d6f8c995a287"; - sha256 = "0zp3ghiqyg1qf8rxx5a1hqxyz4sqqw1afbh9qzsjlw18g0va86kj"; + rev = "c9a155b88d629221628937eadb64a3e87f8d82d9"; + sha256 = "1h0y4k3xypbn4lyyksjddvcdnz8nqy73qnjxm21ahsz73xk6bpwk"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -7724,12 +7724,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-08-02"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "d520f12ef8e93f457f5b78ff84d464f83f778484"; - sha256 = "07hm7sz6wazb3shjf5iggkgmif7ahyjzln855808dggglsxn765j"; + rev = "92b8483abb3b128b2a64782c60c2a236b2484a99"; + sha256 = "1prx8hhjdh4bs1c25jxjis151d1kg3vxdy5f9scwgas9a79ii3lw"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -9298,12 +9298,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-06-19"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "a40b618746bb60ddf3a664e65f82ffa4750d450a"; - sha256 = "1pxnsxixdjpmndqi1cl0lp54mh4zidx40lshpdvmk3fjpjdjd130"; + rev = "a22d2e53ec38c11fde58e4cf9aab47d89d6600f6"; + sha256 = "0axdgfvkamywypylpssmlfj0hh0bf5szcp8xri1g8lqks3f5bkv5"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -9778,12 +9778,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-08-02"; + version = "2021-08-03"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "27eb464b8ec3df416cf72803a787edbf2e60440e"; - sha256 = "1swgz7yjlkx6fqgf03kypywqhpqsb0pkjk3a9qvhj1wv6z5f9g0q"; + rev = "57ce0992803fcf22c0557550fff45e3fe869f707"; + sha256 = "0136i5yisg6ndvg7rcsr9qqrslgzafbl006csx7s51khd5qmfgmb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; From d612a2ff7ff098ce90a02513af72181666e07227 Mon Sep 17 00:00:00 2001 From: figsoda <figsoda@pm.me> Date: Tue, 3 Aug 2021 19:48:31 -0400 Subject: [PATCH 1395/1522] vimPlugins.neoscroll-nvim: init at 2021-07-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b7fe64feed7..1c93b714f28 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3250,6 +3250,18 @@ final: prev: meta.homepage = "https://github.com/vhyrro/neorg/"; }; + neoscroll-nvim = buildVimPluginFrom2Nix { + pname = "neoscroll-nvim"; + version = "2021-07-23"; + src = fetchFromGitHub { + owner = "karb94"; + repo = "neoscroll.nvim"; + rev = "bc1dc90b6697931fca5e19fdc4c2fa43d944269f"; + sha256 = "1ji348kp4w77dhw7byfqrdyv1z7xwn7dx54y1nvclpbbj36ya9wk"; + }; + meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; + }; + neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; version = "2021-05-05"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 405f663584c..d2079702db3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -299,6 +299,7 @@ kana/vim-operator-user kana/vim-tabpagecd kana/vim-textobj-function kana/vim-textobj-user +karb94/neoscroll.nvim kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script From 578b8e4bc374b4e68301a876dffa7d61888bc20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com> Date: Wed, 4 Aug 2021 03:17:06 +0200 Subject: [PATCH 1396/1522] megasync: 4.4.0.0 -> 4.5.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář <mic.liamg@gmail.com> --- pkgs/applications/misc/megasync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 07dc364fe0b..438a468afa1 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,7 @@ , curl , doxygen , fetchFromGitHub - #, ffmpeg +#, ffmpeg , libmediainfo , libraw , libsodium @@ -27,13 +27,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.4.0.0"; + version = "4.5.3.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1xggca7283943070mmpsfhh7c9avy809h0kgmf7497f4ca5zkg2y"; + sha256 = "1lwjmdbqyxx5wd8nx4mc830fna37jad4h93viwfh5x7sxn104js7"; fetchSubmodules = true; }; From 845aa1a760c2d5c521b4a71239e62fccb17afc07 Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Wed, 4 Aug 2021 01:31:53 +0000 Subject: [PATCH 1397/1522] xorg.xf86videoamdgpu: 19.1.0 -> 21.0.0 https://lists.x.org/archives/amd-gfx/2021-July/067146.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9a75403cec6..39c601f00f3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2052,11 +2052,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-amdgpu"; - version = "19.1.0"; + version = "21.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; - sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2"; + sha256 = "125dq85n46yqmnmr2hknxwcqicwlvz2b2phf0m963fpg9l1j6y30"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 42cb2da3a0d..0339d583292 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -86,7 +86,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 From ef5d272e9eb62d124ec8503bf35c824e04f972a5 Mon Sep 17 00:00:00 2001 From: happysalada <raphael@megzari.com> Date: Wed, 28 Jul 2021 13:34:58 +0900 Subject: [PATCH 1398/1522] elixir: 1.12.1 -> 1.12.2 --- pkgs/development/interpreters/elixir/1.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix index cd5246d989d..4b631098fe1 100644 --- a/pkgs/development/interpreters/elixir/1.12.nix +++ b/pkgs/development/interpreters/elixir/1.12.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.12.1"; - sha256 = "sha256-gRgGXb4btMriQwT/pRIYOJt+NM7rtYBd+A3SKfowC7k="; + version = "1.12.2"; + sha256 = "sha256-PQkvBaQQljATt+LA3hWJOFyQessqqR1t6o1J2LHllec="; minimumOTPVersion = "22"; } From fc2518d7d2a62d1a786342cd71fdb9eb14067f3a Mon Sep 17 00:00:00 2001 From: happysalada <raphael@megzari.com> Date: Wed, 28 Jul 2021 14:44:45 +0900 Subject: [PATCH 1399/1522] mix-release: add ERL_LIBS paths to _build dir --- pkgs/development/beam-modules/mix-release.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 80e8721302e..d9eea7c3b6f 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -58,6 +58,20 @@ stdenv.mkDerivation (overridable // { configurePhase = attrs.configurePhase or '' runHook preConfigure + mkdir -p _build/$MIX_ENV/lib + while read -d ':' lib; do + for dir in $lib/*; do + # Strip version number for directory name if it exists, so naming of + # all libs matches what mix's expectation. + dest=$(basename $dir | cut -d '-' -f1) + echo "Linking $dir to _build/$MIX_ENV/lib/$dest" + # Symlink libs to _build so that mix can find them when compiling. + # This is what allows mix to compile the package without searching + # for dependencies over the network. + ln -s $dir _build/$MIX_ENV/lib/$dest + done + done <<< "$ERL_LIBS:" + # this is needed for projects that have a specific compile step # the dependency needs to be compiled in order for the task # to be available From b1b78ac65d9d91e3cb39a1996cc585721be1ec78 Mon Sep 17 00:00:00 2001 From: happysalada <raphael@megzari.com> Date: Tue, 3 Aug 2021 23:51:39 +0900 Subject: [PATCH 1400/1522] mix: add build mix and mix-release configure-hook --- pkgs/development/beam-modules/build-mix.nix | 9 +++++++++ .../beam-modules/mix-configure-hook.sh | 18 ++++++++++++++++++ pkgs/development/beam-modules/mix-release.nix | 15 +-------------- 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100755 pkgs/development/beam-modules/mix-configure-hook.sh diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 728d249c97d..6b6ef7ce350 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -42,6 +42,14 @@ let nativeBuildInputs = nativeBuildInputs ++ [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + ${./mix-configure-hook.sh} + + runHook postConfigure + ''; + buildPhase = attrs.buildPhase or '' runHook preBuild export HEX_HOME="$TEMPDIR/hex" @@ -83,3 +91,4 @@ let }); in fix pkg + diff --git a/pkgs/development/beam-modules/mix-configure-hook.sh b/pkgs/development/beam-modules/mix-configure-hook.sh new file mode 100755 index 00000000000..f8b4f3d159f --- /dev/null +++ b/pkgs/development/beam-modules/mix-configure-hook.sh @@ -0,0 +1,18 @@ +# shellcheck shell=bash +# this hook will symlink all dependencies found in ERL_LIBS +# since Elixir 1.12.2 elixir does not look into ERL_LIBS for +# elixir depencencies anymore, so those have to be symlinked to the _build directory +mkdir -p _build/"$MIX_ENV"/lib +while read -r -d ':' lib; do + for dir in "$lib"/*; do + # Strip version number for directory name if it exists, so naming of + # all libs matches what mix's expectation. + dest=$(basename "$dir" | cut -d '-' -f1) + build_dir="_build/$MIX_ENV/lib/$dest" + ((MIX_DEBUG == 1)) && echo "Linking $dir to $build_dir" + # Symlink libs to _build so that mix can find them when compiling. + # This is what allows mix to compile the package without searching + # for dependencies over the network. + ln -s "$dir" "$build_dir" + done +done <<< "$ERL_LIBS:" diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index d9eea7c3b6f..c65e497f4d7 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -58,20 +58,7 @@ stdenv.mkDerivation (overridable // { configurePhase = attrs.configurePhase or '' runHook preConfigure - mkdir -p _build/$MIX_ENV/lib - while read -d ':' lib; do - for dir in $lib/*; do - # Strip version number for directory name if it exists, so naming of - # all libs matches what mix's expectation. - dest=$(basename $dir | cut -d '-' -f1) - echo "Linking $dir to _build/$MIX_ENV/lib/$dest" - # Symlink libs to _build so that mix can find them when compiling. - # This is what allows mix to compile the package without searching - # for dependencies over the network. - ln -s $dir _build/$MIX_ENV/lib/$dest - done - done <<< "$ERL_LIBS:" - + ${./mix-configure-hook.sh} # this is needed for projects that have a specific compile step # the dependency needs to be compiled in order for the task # to be available From e5a3c395455190682c2cc1e48897594fdaa6b265 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 03:53:59 +0000 Subject: [PATCH 1401/1522] cpp-utilities: 5.10.5 -> 5.11.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index fdf4b469059..769f573f7af 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.5"; + version = "5.11.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1GAZKMfA2cB/7/TZfV+WOvjlu0sWq1loOauX4EfHogA="; + sha256 = "sha256-ibZ/cj+pDLxUugz5jTc3FcVlytwS+R1RTtISbXe1mq4="; }; nativeBuildInputs = [ cmake ]; From 21d70a8301b2ee5c063ca953aa6748d554301ef8 Mon Sep 17 00:00:00 2001 From: Drew Risinger <drewrisinger@users.noreply.github.com> Date: Tue, 3 Aug 2021 23:37:44 -0400 Subject: [PATCH 1402/1522] python3Packages.pbr: add setuptools dependency pbr doesn't list any explicit requirements, but it actually requires setuptools (for pkg_resources). Ref: * https://bugs.launchpad.net/pbr/+bug/1868899 * https://opendev.org/openstack/pbr/src/tag/5.6.0/pbr/version.py#L439 --- pkgs/development/python-modules/pbr/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9ce3d72a20d..9c69e2fea54 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "pbr"; @@ -9,8 +9,11 @@ buildPythonPackage rec { sha256 = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"; }; + propagatedBuildInputs = [ setuptools ]; + # circular dependencies with fixtures doCheck = false; + pythonImportsCheck = [ "pbr" ]; meta = with lib; { homepage = "http://docs.openstack.org/developer/pbr/"; From 9bda04939e74610cadee2c53b2cf448e28e4b45b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer <jonringer@users.noreply.github.com> Date: Tue, 3 Aug 2021 21:55:42 -0700 Subject: [PATCH 1403/1522] Revert "python3Packages.pbr: add setuptools dependency" This reverts commit 21d70a8301b2ee5c063ca953aa6748d554301ef8. --- pkgs/development/python-modules/pbr/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9c69e2fea54..9ce3d72a20d 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbr"; @@ -9,11 +9,8 @@ buildPythonPackage rec { sha256 = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"; }; - propagatedBuildInputs = [ setuptools ]; - # circular dependencies with fixtures doCheck = false; - pythonImportsCheck = [ "pbr" ]; meta = with lib; { homepage = "http://docs.openstack.org/developer/pbr/"; From 1f7a1cd9955a4ab738329c61fb8372e85ce67e0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 04:59:34 +0000 Subject: [PATCH 1404/1522] exoscale-cli: 1.38.0 -> 1.39.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 950bc6e53d2..7ad30451969 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-o4jol44ayA13VDChQfOY1eoFOGUCvzfqjbQCqpXairY="; + sha256 = "sha256-tCvncpD89OYTWW83pScSZqpoxoactARAZDRfEoPaqsc="; }; goPackagePath = "github.com/exoscale/cli"; From 7b8141a42c35b08f6392ba72e4c395679e47574c Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Sun, 1 Aug 2021 17:07:34 +0200 Subject: [PATCH 1405/1522] =?UTF-8?q?qarte:=204.6.0=20=E2=86=92=204.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/qarte/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 26b3153019f..9b80ddedcf3 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); in mkDerivation { - name = "qarte-4.6.0"; + name = "qarte-4.12.0"; src = fetchbzr { url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; - rev = "22"; - sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; + rev = "56"; + sha256 = "0cq9dg04grl45xw43gi9wsb0vm8c4bcvh813h5lm4ry8b94lfx2i"; }; buildInputs = [ pythonEnv ]; From f949ce7449cfa2bd42992e7791a94a7249ec4976 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Tue, 3 Aug 2021 23:29:31 -0700 Subject: [PATCH 1406/1522] nixos/hqplayerd: set HOME to path in state directory The service likes to write files uploaded by the user to the service user's $HOME. In our case the hqplayerd user has no home directory, since it's a system user, and regardless we'd like to keep the service's state contained. With this change the unit forces HOME to point to /var/lib/hqplayer/home, which works around the issue. --- nixos/modules/services/audio/hqplayerd.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 3a703c97c0f..b4d8468a237 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -100,8 +100,9 @@ in systemd = { tmpfiles.rules = [ - "d ${configDir} 0755 ${cfg.user} ${cfg.group} - -" - "d ${stateDir} 0755 ${cfg.user} ${cfg.group} - -" + "d ${configDir} 0755 ${cfg.user} ${cfg.group} - -" + "d ${stateDir} 0755 ${cfg.user} ${cfg.group} - -" + "d ${stateDir}/home 0755 ${cfg.user} ${cfg.group} - -" ]; services.hqplayerd = { @@ -110,6 +111,8 @@ in requires = [ "network-online.target" "sound.target" "systemd-udev-settle.service" ]; after = [ "network-online.target" "sound.target" "systemd-udev-settle.service" "local-fs.target" "remote-fs.target" "systemd-tmpfiles-setup.service" ]; + environment.HOME = "${stateDir}/home"; + unitConfig.ConditionPathExists = [ configDir stateDir ]; preStart = From 50438c5874fa314170bd7d1ee90abb911126ca4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de> Date: Mon, 2 Aug 2021 10:59:43 +0200 Subject: [PATCH 1407/1522] kdeltachat: unstable-2021-07-17 -> unstable-2021-08-02 --- .../instant-messengers/kdeltachat/default.nix | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index ced0c77a96a..3266b36194f 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -1,25 +1,44 @@ { lib , mkDerivation +, fetchFromGitHub , fetchFromSourcehut , cmake , extra-cmake-modules , pkg-config , kirigami2 , libdeltachat +, qtbase , qtimageformats , qtmultimedia , qtwebengine +, rustPlatform }: -mkDerivation rec { +let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + inherit (old) pname; + version = "1.58.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "03xc0jlfmvmdcipmzavbzkq010qlxzf3mj1zi7wcix7kpl8gwmy7"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1zijxyc1xjlbyh1gh2lyw44xjcrhz1msykrlqgfkw5w1w0yh78hd"; + }; + }); +in mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-07-17"; + version = "unstable-2021-08-02"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158"; - sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9"; + rev = "950f4f22c01ab75f613479ef831bdf38f395d1dd"; + sha256 = "007gazqkzcc0w0rq2i8ysa9f50ldj7n9f5gp1mh8bi86bdvdkzsy"; }; nativeBuildInputs = [ @@ -30,12 +49,18 @@ mkDerivation rec { buildInputs = [ kirigami2 - libdeltachat + libdeltachat' qtimageformats qtmultimedia qtwebengine ]; + # needed for qmlplugindump to work + QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + QML2_IMPORT_PATH = lib.concatMapStringsSep ":" + (lib: "${lib}/${qtbase.qtQmlPrefix}") + [ kirigami2 qtmultimedia ]; + meta = with lib; { description = "Delta Chat client using Kirigami framework"; homepage = "https://git.sr.ht/~link2xt/kdeltachat"; From 0948110e249d58c7eaf4ef3885f47a5fa32e3c94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 07:05:40 +0000 Subject: [PATCH 1408/1522] hostctl: 1.1.0 -> 1.1.1 --- pkgs/tools/system/hostctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 54bc72144ea..3c366d56fca 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hostctl"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM="; + sha256 = "sha256-VjFjGvIoymGVVRiZUk/qoq/PTYoklp+Jz89zndX0e5A="; }; vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; From 307b1253a797f9ab9f5da38a470099945ea7ce04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo> Date: Tue, 3 Aug 2021 10:59:48 +0200 Subject: [PATCH 1409/1522] nixos/neovim: Fix neovim runtime path generation --- .../from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/programs/neovim.nix | 13 +------------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 15b4e2b4d04..e3b94d00552 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -632,6 +632,13 @@ wherever possible. </para> </listitem> + <listitem> + <para> + <literal>programs.neovim.runtime</literal> switched to a + <literal>linkFarm</literal> internally, making it impossible + to use wildcards in the <literal>source</literal> argument. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c0b0cb5973b..e34c3f4e0b9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -159,6 +159,8 @@ pt-services.clipcat.enable). - Deprecated package aliases in `emacs.pkgs.*` have been removed. These aliases were remnants of the old Emacs package infrastructure. We now use exact upstream names wherever possible. +- `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 0a1a2ac2b75..781c31d2b0c 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,18 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - # taken from the etc module - runtime = pkgs.stdenvNoCC.mkDerivation { - name = "runtime"; - - builder = ../system/etc/make-etc.sh; - - preferLocalBuild = true; - allowSubstitutes = false; - - sources = map (x: x.source) runtime'; - targets = map (x: x.target) runtime'; - }; + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); in { options.programs.neovim = { From 1b4503cfaa74f4aa28eda8808c531b4fac54721d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 07:45:14 +0000 Subject: [PATCH 1410/1522] icinga2: 2.12.5 -> 2.13.0 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 00f7b510346..44be5b97e67 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.5"; + version = "2.13.0"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-sEmxKX+q7hPXQWEqbywgsEG5/bSE5AkNKurL3UGQFLA="; + sha256 = "sha256-ibZruP9/8D3DJSTFkIi84ADPGjwWeyTCHv/tTEcy6ns="; }; patches = [ From 15af01b456cafbe9ce8cb4098f850daf02fc7b7e Mon Sep 17 00:00:00 2001 From: Finn Behrens <me@kloenk.de> Date: Wed, 4 Aug 2021 11:09:56 +0200 Subject: [PATCH 1411/1522] element-desktop: fix darwin build (#132635) Add Frameworks to native dependencies Signed-off-by: Finn Behrens <me@kloenk.dev> --- .../instant-messengers/element/element-desktop.nix | 7 +++++-- .../instant-messengers/element/keytar/default.nix | 13 +++++++++---- .../instant-messengers/element/seshat/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 60c6f332847..a873af6d2ef 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -2,6 +2,9 @@ , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web , callPackage +, Security +, AppKit +, CoreServices }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -25,8 +28,8 @@ in mkYarnPackage rec { nativeBuildInputs = [ makeWrapper ]; - seshat = callPackage ./seshat {}; - keytar = callPackage ./keytar {}; + seshat = callPackage ./seshat { inherit CoreServices; }; + keytar = callPackage ./keytar { inherit Security AppKit; }; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 87ef174271d..f848601874a 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, fixup_yarn_lock, yarn, pkg-config, libsecret }: +{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage +, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit }: stdenv.mkDerivation rec { pname = "keytar"; @@ -11,8 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0ajvr4kjbyw2shb1y14c0dsghdlnq30f19hk2sbzj6n9y3xa3pmi"; }; - nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config]; - buildInputs = [ libsecret ]; + nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ] + ++ lib.optional stdenv.isDarwin xcbuild; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; npm_config_nodedir = nodejs-14_x; @@ -21,7 +24,8 @@ stdenv.mkDerivation rec { buildPhase = '' cp ${./yarn.lock} ./yarn.lock chmod u+w . ./yarn.lock - export HOME=/tmp + export HOME=$PWD/tmp + mkdir -p $HOME yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive @@ -34,6 +38,7 @@ stdenv.mkDerivation rec { installPhase = '' shopt -s extglob rm -rf node_modules + rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 6dbd15efe72..ae9dd96228b 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices }: rustPlatform.buildRustPackage rec { pname = "seshat-node"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/seshat-node/native"; nativeBuildInputs = [ nodejs-14_x python3 yarn ]; - buildInputs = [ sqlcipher ]; + buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; npm_config_nodedir = nodejs-14_x; @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { buildPhase = '' cd .. chmod u+w . ./yarn.lock - export HOME=/tmp + export HOME=$PWD/tmp + mkdir -p $HOME yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive @@ -37,6 +38,7 @@ rustPlatform.buildRustPackage rec { shopt -s extglob rm -rf native/!(index.node) rm -rf node_modules + rm -rf $HOME cp -r . $out ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 412985e644a..89eb3115537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2632,7 +2632,9 @@ in element = callPackage ../applications/science/chemistry/element { }; - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { + inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; + }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { conf = config.element-web.conf or {}; From f734643f0078b104eb3af9611eb0530a6fb503f3 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 11:13:28 +0200 Subject: [PATCH 1412/1522] signal-desktop: 5.11.0 -> 5.12.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dbd2c7b3ec7..67ce817f11a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.11.0"; # Please backport all updates to the stable channel. + version = "5.12.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "17r7apmsz5bvcfnf81m6jjsj17a4h7bhgy1vllwyyvaa585nspmp"; + sha256 = "0cvh70ijx61rq7qjzrmn85lhkm8vkcbxvgjvkpls21v3yl5anrjb"; }; nativeBuildInputs = [ From f3f86d47220e2c2332d60f6bd0a89b76a628529d Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 11:23:05 +0200 Subject: [PATCH 1413/1522] llvmPackages_13: Copy from llvmPackages_git --- .../compilers/llvm/13/bintools/default.nix | 29 ++ .../compilers/llvm/13/clang/default.nix | 123 ++++++ .../llvm/13/clang/gnu-install-dirs.patch | 235 ++++++++++ .../compilers/llvm/13/clang/purity.patch | 28 ++ .../compiler-rt/X86-support-extension.patch | 23 + .../llvm/13/compiler-rt/armv7l.patch | 32 ++ .../llvm/13/compiler-rt/codesign.patch | 33 ++ .../compilers/llvm/13/compiler-rt/default.nix | 113 +++++ .../13/compiler-rt/gnu-install-dirs.patch | 129 ++++++ .../llvm/13/compiler-rt/normalize-var.patch | 16 + .../13/compiler-rt/sanitizers-nongnu.patch | 412 ++++++++++++++++++ .../development/compilers/llvm/13/default.nix | 268 ++++++++++++ .../compilers/llvm/13/libcxx/default.nix | 51 +++ .../llvm/13/libcxx/gnu-install-dirs.patch | 81 ++++ .../compilers/llvm/13/libcxxabi/default.nix | 76 ++++ .../llvm/13/libcxxabi/gnu-install-dirs.patch | 36 ++ .../compilers/llvm/13/libcxxabi/wasm.patch | 16 + .../compilers/llvm/13/libunwind/default.nix | 33 ++ .../llvm/13/libunwind/gnu-install-dirs.patch | 34 ++ .../compilers/llvm/13/lld/default.nix | 44 ++ .../llvm/13/lld/gnu-install-dirs.patch | 68 +++ .../compilers/llvm/13/lldb/default.nix | 131 ++++++ .../llvm/13/lldb/gnu-install-dirs.patch | 65 +++ .../compilers/llvm/13/lldb/procfs.patch | 31 ++ .../compilers/llvm/13/lldb/resource-dir.patch | 13 + .../compilers/llvm/13/llvm/default.nix | 217 +++++++++ .../llvm/13/llvm/gnu-install-dirs-polly.patch | 105 +++++ .../llvm/13/llvm/gnu-install-dirs.patch | 381 ++++++++++++++++ .../compilers/llvm/13/llvm/outputs.patch | 26 ++ .../compilers/llvm/13/openmp/default.nix | 39 ++ 30 files changed, 2888 insertions(+) create mode 100644 pkgs/development/compilers/llvm/13/bintools/default.nix create mode 100644 pkgs/development/compilers/llvm/13/clang/default.nix create mode 100644 pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/clang/purity.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/default.nix create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch create mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch create mode 100644 pkgs/development/compilers/llvm/13/default.nix create mode 100644 pkgs/development/compilers/llvm/13/libcxx/default.nix create mode 100644 pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/libcxxabi/default.nix create mode 100644 pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch create mode 100644 pkgs/development/compilers/llvm/13/libunwind/default.nix create mode 100644 pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/lld/default.nix create mode 100644 pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/lldb/default.nix create mode 100644 pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/lldb/procfs.patch create mode 100644 pkgs/development/compilers/llvm/13/lldb/resource-dir.patch create mode 100644 pkgs/development/compilers/llvm/13/llvm/default.nix create mode 100644 pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch create mode 100644 pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs.patch create mode 100644 pkgs/development/compilers/llvm/13/llvm/outputs.patch create mode 100644 pkgs/development/compilers/llvm/13/openmp/default.nix diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix new file mode 100644 index 00000000000..53f7941e336 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix new file mode 100644 index 00000000000..cfafe43c3a5 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -0,0 +1,123 @@ +{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation ({ + pname = "clang"; + inherit version; + + inherit src; + sourceRoot = "source/clang"; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + ]; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + # Clang expects to find LLVMgold in its own prefix + postInstall = '' + if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then + ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib + fi + + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin + ''; + + passthru = { + isClang = true; + inherit libllvm; + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch new file mode 100644 index 00000000000..b834d386b4e --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch @@ -0,0 +1,235 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e74014134a0..976e6a1757fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) + if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + project(Clang) + ++ include(GNUInstallDirs) ++ + set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS NO) +@@ -416,7 +418,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/clang include/clang-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "*.def" +@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT clang-headers + FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE +@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + install(PROGRAMS utils/bash-autocomplete.sh +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT bash-autocomplete) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-bash-autocomplete +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 704278a0e93b..d25c8d325c71 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -123,9 +123,9 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${lib} +@@ -170,7 +170,7 @@ macro(add_clang_tool name) + + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +@@ -185,7 +185,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index b2c0ce8dd4a0..19e5443d8c25 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt +index ceef4b08637c..8efad5520ca4 100644 +--- a/tools/c-index-test/CMakeLists.txt ++++ b/tools/c-index-test/CMakeLists.txt +@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION bin) ++ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS c-index-test +diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt +index 35ecdb11253c..d77d75de0094 100644 +--- a/tools/clang-format/CMakeLists.txt ++++ b/tools/clang-format/CMakeLists.txt +@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) + endif() + + install(PROGRAMS clang-format-bbedit.applescript +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-diff.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format-sublime.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS clang-format.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT clang-format) +diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt +index cda8e29ec5b1..0134d8ccd70b 100644 +--- a/tools/clang-rename/CMakeLists.txt ++++ b/tools/clang-rename/CMakeLists.txt +@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename + ) + + install(PROGRAMS clang-rename.py +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) + install(PROGRAMS clang-rename.el +- DESTINATION share/clang ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang + COMPONENT clang-rename) +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 51ff2e7e1565..1ed5f8a079a1 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -166,7 +166,7 @@ endif() + if(INTERNAL_INSTALL_PREFIX) + set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") + else() +- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) ++ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + install(DIRECTORY ../../include/clang-c +@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt +index ec0702d76f18..d25d982f51da 100644 +--- a/tools/scan-build/CMakeLists.txt ++++ b/tools/scan-build/CMakeLists.txt +@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-build) + endforeach() + +@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) + install(PROGRAMS libexec/${LibexecFile} +- DESTINATION libexec ++ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + COMPONENT scan-build) + endforeach() + +@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) + install(FILES share/scan-build/${ShareFile} +- DESTINATION share/scan-build ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build + COMPONENT scan-build) + endforeach() + +diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt +index dd3d33439299..fea19c12ce70 100644 +--- a/tools/scan-view/CMakeLists.txt ++++ b/tools/scan-view/CMakeLists.txt +@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT scan-view) + endforeach() + +@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) + install(FILES share/${ShareFile} +- DESTINATION share/scan-view ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view + COMPONENT scan-view) + endforeach() + +diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt +index 62f2de0cb15c..6aa66825b6ec 100644 +--- a/utils/hmaptool/CMakeLists.txt ++++ b/utils/hmaptool/CMakeLists.txt +@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) + install(PROGRAMS ${CLANG_HMAPTOOL} +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT hmaptool) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/pkgs/development/compilers/llvm/13/clang/purity.patch b/pkgs/development/compilers/llvm/13/clang/purity.patch new file mode 100644 index 00000000000..deb230a36c5 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch new file mode 100644 index 00000000000..f6f9336ad5a --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch @@ -0,0 +1,23 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -301,6 +301,10 @@ if (NOT MSVC) + i386/umoddi3.S + ) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch new file mode 100644 index 00000000000..120cfe6feb2 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch new file mode 100644 index 00000000000..3cc12b94b20 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch @@ -0,0 +1,33 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +2.14.1 + diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix new file mode 100644 index 00000000000..8aeaabb0cd3 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -0,0 +1,113 @@ +{ lib, stdenv, llvm_meta, version, src, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl; + +in + +stdenv.mkDerivation { + pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "source/compiler-rt"; + + nativeBuildInputs = [ cmake python3 llvm.dev ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 00000000000..5f025764de1 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,129 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b44ad2c2118e..d42f5664d448 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4) + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) ++ include(GNUInstallDirs) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index 361538a58e47..f0d8d9ab80f1 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. + install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} + COMPONENT ${component}) + add_dependencies(${component} ${target_name}) + +@@ -512,7 +512,7 @@ macro(add_compiler_rt_script name) + add_custom_target(${name} DEPENDS ${dst}) + install(FILES ${dst} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) + endmacro(add_compiler_rt_script src name) + + # Builds custom version of libc++ and installs it in <prefix>. +diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake +index 456a8dcda59f..7a09e74c7c79 100644 +--- a/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries) + set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) + set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) + + set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") + set(CFLAGS_i386 "-march=pentium") +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index f61d487e93a0..f1f46fb9599c 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -378,7 +378,7 @@ endfunction() + function(get_compiler_rt_install_dir arch install_dir) + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + get_compiler_rt_target(${arch} target) +- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) ++ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) + else() + set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) + endif() +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 1edab43e7c0d..1aac6b73ff82 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") +- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH +- "Path where built compiler-rt libraries should be installed.") ++ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH ++ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) + # Use a host compiler to compile/link tests. +@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) + set(COMPILER_RT_LIBRARY_OUTPUT_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) + set(COMPILER_RT_LIBRARY_INSTALL_DIR +- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) ++ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) + endif() + + if(APPLE) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index b00e8caa1ddd..0fe64e4862c9 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + install(FILES ${SANITIZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) + # Install fuzzer headers. + install(FILES ${FUZZER_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) + # Install xray headers. + install(FILES ${XRAY_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) + # Install profile headers. + install(FILES ${PROFILE_HEADERS} + COMPONENT compiler-rt-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt +index a29de8deff1b..d39ff01613d2 100644 +--- a/lib/dfsan/CMakeLists.txt ++++ b/lib/dfsan/CMakeLists.txt +@@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} + DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) + add_dependencies(dfsan dfsan_abilist) + install(FILES ${dfsan_abilist_filename} +- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) ++ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch new file mode 100644 index 00000000000..135cf625ef7 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch new file mode 100644 index 00000000000..1f2ac97818e --- /dev/null +++ b/pkgs/development/compilers/llvm/13/compiler-rt/sanitizers-nongnu.patch @@ -0,0 +1,412 @@ +From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Mon, 24 Sep 2018 11:17:25 -0500 +Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project. + +------ +Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + lib/sanitizer_common/sanitizer_allocator.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +- + .../sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux.cc | 8 +++- + .../sanitizer_linux_libcdep.cc | 10 ++--- + lib/sanitizer_common/sanitizer_platform.h | 6 +++ + .../sanitizer_platform_interceptors.h | 4 +- + .../sanitizer_platform_limits_posix.cc | 37 +++++++++++-------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 13 files changed, 51 insertions(+), 34 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 625f32d40..73cf77aca 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -46,7 +46,7 @@ + #include <link.h> + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + #include <ucontext.h> + extern "C" void* _DYNAMIC; + #elif SANITIZER_NETBSD +@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 26bfcd8f6..529b234f7 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + } + + // Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 942c25609..24a4d5080 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & WRAP(func)) + + // Android, Solaris and OpenBSD do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 385a650c4..6e30a8ce9 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD + + #include "msan.h" + #include "msan_report.h" +diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc +index 6bfd5e5ee..048f6154f 100644 +--- a/lib/sanitizer_common/sanitizer_allocator.cc ++++ b/lib/sanitizer_common/sanitizer_allocator.cc +@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator"; + + // ThreadSanitizer for Go uses libc malloc/free. + #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC) +-# if SANITIZER_LINUX && !SANITIZER_ANDROID ++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + extern "C" void *__libc_malloc(uptr size); + # if !SANITIZER_GO + extern "C" void *__libc_memalign(uptr alignment, uptr size); +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 2d633c173..b6eb23116 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -104,7 +104,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -365,7 +365,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc +index 96d6c1eff..9e2b7fb9d 100644 +--- a/lib/sanitizer_common/sanitizer_linux.cc ++++ b/lib/sanitizer_common/sanitizer_linux.cc +@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD ++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + extern "C" { + SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end; + } + #endif + +-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ ++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ + !SANITIZER_OPENBSD + static void ReadNullSepFileToArray(const char *path, char ***arr, + int arr_size) { +@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) { + #elif SANITIZER_NETBSD + *argv = __ps_strings->ps_argvstr; + *envp = __ps_strings->ps_envstr; ++#elif SANITIZER_NONGNU ++ static const int kMaxArgv = 2000, kMaxEnvp = 2000; ++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv); ++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp); + #else // SANITIZER_FREEBSD + #if !SANITIZER_GO + if (&__libc_stack_end) { +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 4962ff832..438f94dbe 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor, + } + + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \ +- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS ++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -261,7 +261,7 @@ void InitTlsSize() { } + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \ + defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \ + defined(__arm__)) && \ +- SANITIZER_LINUX && !SANITIZER_ANDROID ++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t thread_descriptor_size; + +@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) { + #elif SANITIZER_OPENBSD + *addr = 0; + *size = 0; +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #elif SANITIZER_SOLARIS +@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) { + #if !SANITIZER_GO + uptr GetTlsSize() { + #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \ +- SANITIZER_OPENBSD || SANITIZER_SOLARIS ++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d81e25580..e10680ac8 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -208,6 +208,12 @@ + # define SANITIZER_SOLARIS32 0 + #endif + ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + #if defined(__myriad2__) + # define SANITIZER_MYRIAD2 1 + #else +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index f95539a73..6c53b3415 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -39,7 +39,7 @@ + # include "sanitizer_platform_limits_solaris.h" + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +@@ -322,7 +322,7 @@ + #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_SHMCTL \ + (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \ +- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \ ++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \ + SANITIZER_WORDSIZE == 64)) // NOLINT + #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID + #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 54da635d7..2f6ff69c3 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include <glob.h> +-#include <obstack.h> ++# if !SANITIZER_NONGNU ++# include <obstack.h> ++# endif + #include <mqueue.h> +-#include <net/if_ppp.h> +-#include <netax25/ax25.h> +-#include <netipx/ipx.h> +-#include <netrom/netrom.h> ++#include <linux/if_ppp.h> ++#include <linux/ax25.h> ++#include <linux/ipx.h> ++#include <linux/netrom.h> + #if HAVE_RPC_XDR_H + # include <rpc/xdr.h> + #elif HAVE_TIRPC_RPC_XDR_H +@@ -251,7 +256,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 +@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index de989b780..51a97b554 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -294,7 +294,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.19.0 + diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix new file mode 100644 index 00000000000..8b1fca6c8b1 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -0,0 +1,268 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +}: + +let + release_version = "13.0.0"; + candidate = ""; # empty or "rcN" + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; + rev = "98033fdc50e61273b1d5c77ba5f0f75afe3965c1"; # When using a Git commit + rev-version = "unstable-2021-07-12"; # When using a Git commit + version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; + targetConfig = stdenv.targetPlatform.config; + + src = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + rev = if rev != "" then rev else "llvmorg-${version}"; + sha256 = "0m28wpkyymzgqflp8xwyab0vryn3jln565qk15qm839n0d0mq3hh"; + }; + + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; + + # disabled until recommonmark supports sphinx 3 + #Llvm-manpages = lowPrio (tools.libllvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # disabled until recommonmark supports sphinx 3 + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ./lldb { + inherit llvm_meta; + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools {}; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands0 cc; + }; + + clangNoCompilerRtWithLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + }; + + libcxxabi = callPackage ./libcxxabi { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta; + }; + }); + +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix new file mode 100644 index 00000000000..f511eba81dc --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxx"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + outputs = [ "out" "dev" ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + passthru = { + isLLVM = true; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch new file mode 100644 index 00000000000..f59d7f8dfaf --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch @@ -0,0 +1,81 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06ee1d74a03e..6c3c6f8f8d47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) + project(libcxx CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxx) + set(PACKAGE_VERSION 13.0.0git) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") + if(LIBCXX_LIBDIR_SUBDIR) +@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") + else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") + endif() +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 5a8a4a270a1a..c06bae0001aa 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 87b71f7ba334..d20a783079b7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) + install(TARGETS cxx_shared + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) + install(TARGETS cxx_static + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) + install(TARGETS cxx_experimental + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix new file mode 100644 index 00000000000..7fadc6d6dca --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +, libcxx +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./wasm.patch} + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + }; +} diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 00000000000..45641acb0c7 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e8b73aa38cc..6f7b2a25d205 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) + project(libcxxabi CXX C) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libcxxabi) + set(PACKAGE_VERSION 11.0.0git) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) + string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch b/pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch new file mode 100644 index 00000000000..4ebfe46aa81 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/pkgs/development/compilers/llvm/13/libunwind/default.nix b/pkgs/development/compilers/llvm/13/libunwind/default.nix new file mode 100644 index 00000000000..b6017e74172 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libunwind/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, llvm_meta, version, src, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch new file mode 100644 index 00000000000..56231cd31b2 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a2c03fd3f8aa..98de2f8ea7c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + project(libunwind LANGUAGES C CXX ASM) + ++ include(GNUInstallDirs) ++ + set(PACKAGE_NAME libunwind) + set(PACKAGE_VERSION 13.0.0git) + set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +@@ -116,17 +118,17 @@ set(CMAKE_MODULE_PATH + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/13/lld/default.nix b/pkgs/development/compilers/llvm/13/lld/default.nix new file mode 100644 index 00000000000..34ac265f4bf --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lld/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, src +, cmake +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = [ + "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch new file mode 100644 index 00000000000..61e2f0e4865 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4e561b50d8f..cfa5bdd79c2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(LLD_BUILT_STANDALONE TRUE) + ++ include(GNUInstallDirs) ++ + find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") + if(NOT LLVM_CONFIG_PATH) + message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") +@@ -179,7 +181,7 @@ include_directories(BEFORE + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index 23df41312403..d62372c88de7 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -20,9 +20,9 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- RUNTIME DESTINATION bin) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-${name} +@@ -54,7 +54,7 @@ macro(add_lld_tool name) + + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +@@ -69,5 +69,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() +diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt +index 5cff736ff57f..64e775c771b9 100644 +--- a/tools/lld/CMakeLists.txt ++++ b/tools/lld/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION bin) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix new file mode 100644 index 00000000000..f8c7e7b55e6 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -0,0 +1,131 @@ +{ lib, stdenv, llvm_meta +, runCommand +, src +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + libllvm + ] + ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ]; + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${libclang.dev}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = false; + + postInstall = '' + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; + description = "A next-generation high-performance debugger"; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch new file mode 100644 index 00000000000..98321f4479e --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e21c56a..f2f1035e9238 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 4ed5c647c5d2..89f96e710d55 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -107,13 +107,13 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() + # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS + install(TARGETS ${name} COMPONENT ${name} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${install_dest} + ARCHIVE DESTINATION ${install_dest} + FRAMEWORK DESTINATION ${install_dest}) +diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake +index 2fdf1502d055..37364341ff8b 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -225,7 +225,7 @@ include_directories(BEFORE + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".cmake" EXCLUDE +@@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + COMPONENT lldb-headers +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN ".cmake" EXCLUDE +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 734167e51bc5..f95761b5df58 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) + endif() + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/pkgs/development/compilers/llvm/13/lldb/procfs.patch b/pkgs/development/compilers/llvm/13/lldb/procfs.patch new file mode 100644 index 00000000000..b075dbaeee0 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lldb/procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif diff --git a/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch new file mode 100644 index 00000000000..e0db80afeb9 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/<version number>'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix new file mode 100644 index 00000000000..daf4cfe808b --- /dev/null +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -0,0 +1,217 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, src +, fetchpatch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, buildLlvmTools +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +}: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + checkInputs = [ which ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + optionalString (enableSharedLibraries) '' + substitute '${./outputs.patch}' ./outputs.patch --subst-var lib + patch -p1 < ./outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}" + ) + ]; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); + + checkTarget = "check-all"; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 00000000000..68f3c45396f --- /dev/null +++ b/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,105 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index ca7c04c565bb..6ed5db5dd4f8 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -2,7 +2,11 @@ + if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.13.4) ++endif() ++ ++include(GNUInstallDirs) + ++if (NOT DEFINED LLVM_MAIN_SRC_DIR) + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -122,13 +126,13 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 7cc129ba2e90..137be25e4b80 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") ++ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index 8991094d92c7..178d8ad606bb 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs.patch new file mode 100644 index 00000000000..18fa5fc6d89 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs.patch @@ -0,0 +1,381 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 135036f509d2..265c36f8211b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() + ++include(GNUInstallDirs) ++ + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + +-set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") ++set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING ++ "Path for binary subdirectory (defaults to 'bin')") + mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) + + set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING + "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") + mark_as_advanced(LLVM_UTILS_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +@@ -581,9 +587,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) + option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) + option (LLVM_ENABLE_BINDINGS "Build bindings." ON) + +-set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" ++set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +-set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" ++set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + + option (LLVM_BUILD_EXTERNAL_COMPILER_RT +@@ -1048,7 +1054,7 @@ endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + ) + + install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "*.def" +@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + + if (LLVM_INSTALL_MODULEMAPS) + install(DIRECTORY include/llvm include/llvm-c +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT llvm-headers + FILES_MATCHING + PATTERN "module.modulemap" + ) + install(FILES include/llvm/module.install.modulemap +- DESTINATION include/llvm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm + COMPONENT llvm-headers + RENAME "module.extern.modulemap" + ) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 9c2b85374307..5531ceeb2eeb 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -818,9 +818,9 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- RUNTIME DESTINATION bin COMPONENT ${name}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-${name} +@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1250,7 +1250,7 @@ macro(add_llvm_example name) + endif() + add_llvm_executable(${name} ${ARGN}) + if( LLVM_BUILD_EXAMPLES ) +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + endif() + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endmacro(add_llvm_example name) +@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type) + + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name) + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 554046b20edf..4d1ad980641e 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -144,9 +144,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake +index e80c3b5c1cac..482f6d715ef5 100644 +--- a/cmake/modules/AddSphinxTarget.cmake ++++ b/cmake/modules/AddSphinxTarget.cmake +@@ -90,7 +90,7 @@ function (add_sphinx_target builder project) + endif() + elseif (builder STREQUAL html) + string(TOUPPER "${project}" project_upper) +- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" ++ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" + CACHE STRING "HTML documentation install directory for ${project}") + + # '/.' indicates: copy the contents of the directory directly into +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index 51b6a4fdc284..4adc2acfc074 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,6 +1,6 @@ + include(LLVMDistributionSupport) + +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -109,13 +109,13 @@ foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") + endforeach(p) +-set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") ++set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") + set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") +-set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") ++set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") + set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") +-set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") ++set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + + # Generate a default location for lit + if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index 3e6a2c9a2648..52e14d955c60 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -4,7 +4,7 @@ + + function(install_symlink name target outdir) + set(DESTDIR $ENV{DESTDIR}) +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index f1ac2c7d4934..c6e1469b5e13 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + Rarely-used CMake variables + --------------------------- +@@ -551,8 +551,8 @@ LLVM-specific variables + + **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can +- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to +- `share/doc/llvm/doxygen-html`. ++ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to ++ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. + + **LLVM_LINK_LLVM_DYLIB**:BOOL + If enabled, tools will be linked with the libLLVM shared library. Defaults +@@ -792,9 +792,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where +- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where ++ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where + ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only +diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt +index bb96edb4b4bf..678c22fb43c8 100644 +--- a/examples/Bye/CMakeLists.txt ++++ b/examples/Bye/CMakeLists.txt +@@ -14,6 +14,6 @@ if (NOT WIN32) + BUILDTREE_ONLY + ) + +- install(TARGETS ${name} RUNTIME DESTINATION examples) ++ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) + set_target_properties(${name} PROPERTIES FOLDER "Examples") + endif() +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index ebe5b73a5c65..70c497be12f5 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" ++#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 1a2f04552d13..44fa7d3eec6b 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -357,12 +357,26 @@ int main(int argc, char **argv) { + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; +- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); +- sys::fs::make_absolute(ActivePrefix, path); +- ActiveBinDir = std::string(path.str()); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveIncludeDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveBinDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveLibDir = std::string(path.str()); ++ } ++ { ++ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); ++ sys::fs::make_absolute(ActivePrefix, path); ++ ActiveCMakeDir = std::string(path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt +index 0af29ad762c5..37b99b83e35c 100644 +--- a/tools/lto/CMakeLists.txt ++++ b/tools/lto/CMakeLists.txt +@@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN + ${SOURCES} DEPENDS intrinsics_gen) + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT LTO) + + if (APPLE) +diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt +index ead73ec13a8f..250362021f17 100644 +--- a/tools/opt-viewer/CMakeLists.txt ++++ b/tools/opt-viewer/CMakeLists.txt +@@ -8,7 +8,7 @@ set (files + + foreach (file ${files}) + install(PROGRAMS ${file} +- DESTINATION share/opt-viewer ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer + COMPONENT opt-viewer) + endforeach (file) + +diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt +index 865436247270..ce1daa62f6ab 100644 +--- a/tools/remarks-shlib/CMakeLists.txt ++++ b/tools/remarks-shlib/CMakeLists.txt +@@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC) + endif() + + install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION include/llvm-c ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c + COMPONENT Remarks) + + if (APPLE) diff --git a/pkgs/development/compilers/llvm/13/llvm/outputs.patch b/pkgs/development/compilers/llvm/13/llvm/outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/llvm/outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix new file mode 100644 index 00000000000..c5a33df9756 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, llvm_meta +, src +, cmake +, llvm +, perl +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + inherit src; + sourceRoot = "source/${pname}"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + cmakeFlags = [ + "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} From 7012fe15b1c51e1659a7f62cb88f30664b10a8c2 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru <applePrincess@applePrincess.io> Date: Wed, 4 Aug 2021 09:57:57 +0000 Subject: [PATCH 1414/1522] exploitdb: 2021-08-03 -> 2021-08-04 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e12e19a5570..974fabb3a27 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-cgd4J6d493uQRo079eq7CjjmhofPeuafS0mWAjVfOck="; + sha256 = "sha256-DJg/pBTK2abo3eemt8XI4ecy7sZ8iH/qrJgUqrDNjjQ="; }; installPhase = '' From 2ef304b0ab9a16ab06c349ffbe16a2fb12ed340a Mon Sep 17 00:00:00 2001 From: Finn Behrens <me@kloenk.de> Date: Wed, 4 Aug 2021 11:58:29 +0200 Subject: [PATCH 1415/1522] element-desktop: fix wrapper to start under darwin (#132638) Signed-off-by: Finn Behrens <me@kloenk.de> --- .../instant-messengers/element/element-desktop.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index a873af6d2ef..4a43bec09ac 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web , callPackage @@ -19,6 +19,7 @@ let rev = "v${version}"; sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; }; + electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -66,7 +67,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ --add-flags "$out/share/element/electron" ''; From 641bac80e56b919f8db660acd6eaa22ee5b341e0 Mon Sep 17 00:00:00 2001 From: Robert Hensing <roberth@users.noreply.github.com> Date: Wed, 4 Aug 2021 12:06:06 +0200 Subject: [PATCH 1416/1522] dockerTools.buildImage: Allow build on darwin (#132640) Indeed Docker can not run darwin exes, but darwin can build Docker images, as some users already do with buildLayeredImage. --- pkgs/build-support/docker/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4bda09670ab..1001f90023a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -549,8 +549,6 @@ rec { then tag else lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); - # Docker can't be made to run darwin binaries - meta.badPlatforms = lib.platforms.darwin; } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")" From 07491d571c6285f153f4c11f22a52344d40dc61c Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Thu, 22 Jul 2021 11:12:24 +0200 Subject: [PATCH 1417/1522] python3Packages.forecast-solar: 1.3.1 -> 2.0.0 Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de> --- .../development/python-modules/forecast-solar/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 91b9ce3da00..71c517c52b8 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , aiodns , aiohttp +, backports-zoneinfo }: buildPythonPackage rec { pname = "forecast-solar"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = version; - sha256 = "1kqzr1ypvdjw0zvac4spb6xdd2qpms9h8nr6vf0w9qx756ir0f95"; + sha256 = "12d9bb3q7gp0yy152x0rcbi727wrg3w9458asp2nhnqlb8nm6j4d"; }; propagatedBuildInputs = [ aiodns aiohttp + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; # no unit tests implemented From ff783132f0d9934fde046ed7067d2508e274df18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Jatu=C5=BEis?= <adomixaszvers@gmail.com> Date: Wed, 4 Aug 2021 13:47:30 +0300 Subject: [PATCH 1418/1522] rambox: 0.7.7 -> 0.7.8 --- .../networking/instant-messengers/rambox/default.nix | 9 +++------ .../networking/instant-messengers/rambox/rambox.nix | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 8782a4bc5be..418d490bbd5 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -4,16 +4,16 @@ let mkRambox = opts: callPackage (import ./rambox.nix opts) { }; in mkRambox rec { pname = "rambox"; - version = "0.7.7"; + version = "0.7.8"; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage"; - sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini"; + sha256 = "1y3c9xh8594ay95rj9vaqxxzibwpc38n7ixxi2wnsrdbrqrwlc63"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage"; - sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs"; + sha256 = "07sv384nd2i701fkjgsrlib8jfsa01bvj60gnqdwlnpphlknga3h"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -24,8 +24,5 @@ in mkRambox rec { maintainers = with maintainers; [ ]; platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; - knownVulnerabilities = [ - "Electron 7.2.4 is EOL and contains at least the following vulnerabilities: CVE-2020-6458, CVE-2020-6460 and more (https://www.electronjs.org/releases/stable?version=7). Consider using an alternative such as `ferdi'." - ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index 56930f561c7..df038611c3b 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -1,6 +1,6 @@ { pname, version, src, meta, desktopName ? "Rambox" }: -{ appimageTools, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }: let name = "${pname}-${version}"; @@ -19,6 +19,9 @@ let }; in appimageTools.wrapType2 rec { inherit name src meta; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps From 28b3dc9186f15792896b992f2899a306eccc7fd1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 10:54:24 +0000 Subject: [PATCH 1419/1522] apk-tools: 2.12.6 -> 2.12.7 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index b39c74dd57c..8d8645de2de 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.6"; + version = "2.12.7"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "0ki306k2ilwwg8ia302i62qa00f31g9g5q56xfbanyl7b620wd1f"; + sha256 = "sha256-sGAsC5HZV5jaaUXgaPDUf4+vDL4zSGldzhykpdZlFS4="; }; nativeBuildInputs = [ pkg-config scdoc ] From 7614ffb774c25674ddee5a7ffc5d4f7d7d047e4b Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com> Date: Wed, 4 Aug 2021 14:00:16 +0200 Subject: [PATCH 1420/1522] teleport: 6.2.7 -> 6.2.8 Patch tests to lower the number of active connections to fix: --- FAIL: TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched (0.28s) panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: socket: too many open files --- pkgs/servers/teleport/default.nix | 16 ++++++++++------ pkgs/servers/teleport/test.patch | 13 +++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/teleport/test.patch diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index ad96798133b..57866388b46 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -4,21 +4,21 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "8a30ee4e3570c7db0566028b6b562167aa40f646"; - sha256 = "sha256-noMVcB1cjiMcRke6/qJIzDaEh4uPIewsedLQRdPbzIQ="; + rev = "c63397375632f1a4323918dde78334472f3ffbb9"; + sha256 = "sha256-6YKk0G3s+35PRsUBkKgu/tNoSSwjJ5bTn8DACF4gYr4="; }; in buildGoModule rec { pname = "teleport"; - version = "6.2.7"; + version = "6.2.8"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; + sha256 = "sha256-TVjdz97CUXBKCQh9bYrvtcH4StblBMsXiQ9Gix/NIm4="; }; vendorSha256 = null; @@ -27,8 +27,12 @@ buildGoModule rec { nativeBuildInputs = [ zip makeWrapper ]; - # https://github.com/NixOS/nixpkgs/issues/120738 - patches = [ ./tsh.patch ]; + patches = [ + # https://github.com/NixOS/nixpkgs/issues/120738 + ./tsh.patch + # https://github.com/NixOS/nixpkgs/issues/132652 + ./test.patch + ]; postBuild = '' pushd . diff --git a/pkgs/servers/teleport/test.patch b/pkgs/servers/teleport/test.patch new file mode 100644 index 00000000000..49f5a17663e --- /dev/null +++ b/pkgs/servers/teleport/test.patch @@ -0,0 +1,13 @@ +diff --git a/tool/tsh/resolve_default_addr_test.go b/tool/tsh/resolve_default_addr_test.go +index d5976f156..aec5199aa 100644 +--- a/tool/tsh/resolve_default_addr_test.go ++++ b/tool/tsh/resolve_default_addr_test.go +@@ -237,7 +237,7 @@ func TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched(t *testing.T) { + + blockingHandler, doneCh := newWaitForeverHandler() + +- servers := make([]*httptest.Server, 1000) ++ servers := make([]*httptest.Server, 100) + for i := 0; i < len(servers); i++ { + servers[i] = makeTestServer(t, blockingHandler) + } From ae780c6e7d454e3d20b5ae34d15981eaf75cf062 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Wed, 4 Aug 2021 07:17:19 -0500 Subject: [PATCH 1421/1522] Revert "nodejs-16_x: 16.5.0 -> 16.6.0" Node.js 16.6.0 fails to build on Darwin This reverts commit f5de4158dd462c51741ec48be2e47a3f8015930d. --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index c89b48ae3dd..766df734a4a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.0"; - sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; + version = "16.5.0"; + sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; } From e1788dc3b9e737834e65de48c9d9c3a18feddd80 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <cpcloud@gmail.com> Date: Wed, 4 Aug 2021 08:29:24 -0400 Subject: [PATCH 1422/1522] tailscale: 1.12.1 -> 1.12.2 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b5e878b6966..2e1f68f6b12 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-lGUV3GsRz09HHooaBYSvM+D53R0FPkvPyZml66hxMww="; + sha256 = "sha256-wbww6pYq2ATRRmeUAzFDGKzLk6MNYyGp6QKf8ybeaTc="; }; nativeBuildInputs = [ makeWrapper ]; From 83067147ac73be983ee31d7387f9411ca86b0f43 Mon Sep 17 00:00:00 2001 From: Sandro <sandro.jaeckel@gmail.com> Date: Wed, 4 Aug 2021 15:15:18 +0200 Subject: [PATCH 1423/1522] i810switch: switch to pname + version --- pkgs/os-specific/linux/i810switch/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index ffca983a35e..f6bac5088a9 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pciutils }: stdenv.mkDerivation { - name = "i810switch-0.6.5"; + pname = "i810switch"; + version = "0.6.5"; phases = "unpackPhase installPhase"; @@ -17,10 +18,11 @@ stdenv.mkDerivation { sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3"; }; - meta = { + meta = with lib; { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 2ffbed072cd048116d2e0b33c2dc17aae0ccb6bb Mon Sep 17 00:00:00 2001 From: fortuneteller2k <lythe1107@gmail.com> Date: Thu, 5 Aug 2021 00:49:18 +0800 Subject: [PATCH 1424/1522] papirus-icon-theme: 20210701 -> 20210802 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index adc2c5fb197..0709441d41b 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210701"; + version = "20210802"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-eqSZBcypwnNX92SGG17MWlnsVzk0jOTdjtEaWMbQsMs="; + sha256 = "sha256-run7F1iGq1h7o06zS/RNpCMhK5WDH++knLN+MvMcSy8="; }; nativeBuildInputs = [ gtk3 ]; From c73d1006a216134713593a54686bca21976b443e Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Wed, 4 Aug 2021 08:22:00 -0500 Subject: [PATCH 1425/1522] nodejs-16_x: add patch for CVE-2021-22930 --- pkgs/development/web/nodejs/v16.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 766df734a4a..494edc1e997 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -10,4 +10,12 @@ in inherit enableNpm; version = "16.5.0"; sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; + patches = [ + # Fix CVE-2021-22930 https://github.com/nodejs/node/pull/39423. + # It should be fixed by Node.js 16.6.0, but currently it fails to build on Darwin + (fetchpatch { + url = "https://github.com/nodejs/node/commit/9d950a0956bf2c3dd87bacb56807f37e16a91db4.patch"; + sha256 = "1narhk5dqdkbndh9hg0dn5ghhgrd6gsamjqszpivmp33nl5hgsx3"; + }) + ]; } From 335632575cef3182d8beee6d96bf76d4cd059898 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Wed, 4 Aug 2021 00:39:37 +0300 Subject: [PATCH 1426/1522] linuxPackages.evdi: unstable-2021-06-11 -> unstable-2021-07-7 --- pkgs/os-specific/linux/evdi/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 5eb31e9422d..c1b624386c3 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,29 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, libdrm }: +{ lib, stdenv, fetchFromGitHub, kernel, libdrm }: stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2021-06-11"; + version = "unstable-2021-07-07"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "65e12fca334f2f42396f4e8d16592d53cab34dd6"; - sha256 = "sha256-81IfdYKadKT7vRdkmxzfGo4KHa4UJ8uJ0K6djQCr22U="; + rev = "b0b2c80eb63f9b858b71afa772135f434aea192a"; + sha256 = "sha256-io+CbZovGjEJjwtmARFH23Djt933ONoHMDoea+i6xFo="; }; - # Linux 5.13 support - # The patches break compilation for older kernels - patches = lib.optional (kernel.kernelAtLeast "5.13") [ - (fetchpatch { - url = "https://github.com/DisplayLink/evdi/commit/c5f5441d0a115d2cfc8125b8bafaa05b2edc7938.patch"; - sha256 = "sha256-tWYgBrRh3mXPebhUygOvJ07V87g9JU66hREriACfEVI="; - }) - (fetchpatch { - url = "https://github.com/DisplayLink/evdi/commit/5f04d2e2df4cfd21dc15d31f1152c6a66fa48a78.patch"; - sha256 = "sha256-690/eUiEVWvnT/YAVgKcLo86dgolF9giWRuPxXpL+eQ="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; From 5cdbd94cf945df5fd5a54526bdc3af209f1eb82f Mon Sep 17 00:00:00 2001 From: Eric Dallo <ericdallo06@hotmail.com> Date: Tue, 3 Aug 2021 22:15:06 -0300 Subject: [PATCH 1427/1522] graalvmce: 21.0.0 -> 21.2.0 --- .../compilers/graalvm/community-edition.nix | 288 ------------------ .../graalvm/community-edition/default.nix | 21 ++ .../graalvm/community-edition/repository.nix | 271 ++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +- 4 files changed, 298 insertions(+), 291 deletions(-) delete mode 100644 pkgs/development/compilers/graalvm/community-edition.nix create mode 100644 pkgs/development/compilers/graalvm/community-edition/default.nix create mode 100644 pkgs/development/compilers/graalvm/community-edition/repository.nix diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix deleted file mode 100644 index ef35ce9d0c4..00000000000 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ /dev/null @@ -1,288 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, setJavaClassPath -, makeWrapper -# minimum dependencies -, Foundation -, alsa-lib -, fontconfig -, freetype -, glibc -, openssl -, perl -, unzip -, xorg -, zlib -# runtime dependencies -, cups -# runtime dependencies for GTK+ Look and Feel -, gtkSupport ? true -, cairo -, glib -, gtk3 -}: - -let - platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; - runtimeDependencies = [ - cups - ] ++ lib.optionals gtkSupport [ - cairo glib gtk3 - ]; - runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; - common = javaVersion: - let - javaVersionPlatform = "${javaVersion}-${platform}"; - graalvmXXX-ce = stdenv.mkDerivation rec { - pname = "graalvm${javaVersion}-ce"; - version = "21.0.0"; - srcs = [ - (fetchurl { - sha256 = { "8-linux-amd64" = "18q1plrpclp02rlwn3vvv2fcyspvqv2gkzn14f0b59pnladmlv1j"; - "11-linux-amd64" = "1g1xjbr693rimdy2cy6jvz4vgnbnw76wa87xcmaszka206fmpnsc"; - "8-darwin-amd64" = "0giv8f7ybdykadzmxjy91i6njbdx6dclyx7g6vyhwk2l1cvxi4li"; - "11-darwin-amd64" = "1a8gjp6fp11ms05pd62h1x1ifkkr3wv0hrxic670v90bbps9lsqf"; - }.${javaVersionPlatform}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; - }) - (fetchurl { - sha256 = { "8-linux-amd64" = "0hpq2g9hc8b7j4d8a08kq1mnl6pl7a4kwaj0a3gka3d4m6r7cscg"; - "11-linux-amd64" = "0z3hb2bf0lqzw760civ3h1wvx22a75n7baxc0l2i9h5wxas002y7"; - "8-darwin-amd64" = "1izbgl4hjg5jyi422xnkx006qnw163r1i1djf76q1plms40y01ph"; - "11-darwin-amd64" = "1d9z75gil0if74ndla9yw3xx9i2bfbcs32qa0z6wi5if66cmknb8"; - }.${javaVersionPlatform}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; - }) - (fetchurl { - sha256 = { "8-linux-amd64" = "122p8psgmzhqnjb2fy1lwghg0kw5qa8xkzgyjp682lwg4j8brz43"; - "11-linux-amd64" = "1vdc90m6s013cbhmj58nb4vyxllbxirw0idlgv0iv9cyhx90hzgz"; - "8-darwin-amd64" = "04q0s9xsaskqn9kbhz0mgdk28j2qnxrzqfmw6jn2znr8s8jsc6yp"; - "11-darwin-amd64" = "1pw4xd8g5cc9bm52awmm1zxs96ijws43vws7y10wxa6a0nhv7z5f"; - }.${javaVersionPlatform}; - url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; - }) - (fetchurl { - sha256 = { "8-linux-amd64" = "19m7n4f5jrmsfvgv903sarkcjh55l0nlnw99lvjlcafw5hqzyb91"; - "11-linux-amd64" = "18ibb7l7b4hmbnvyr8j7mrs11mvlsf2j0c8rdd2s93x2114f26ba"; - "8-darwin-amd64" = "1zlzi00339kvg4ym2j75ypfkzn8zbwdpriqmkaz4fh28qjmc1dwq"; - "11-darwin-amd64" = "0x301i1fimakhi2x29ldr0fsqkb3qs0g9jsmjv27d62dpqx8kgc8"; - }.${javaVersionPlatform}; - url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; - }) - (fetchurl { - sha256 = { "8-linux-amd64" = "0dlgbg6kri89r9zbk6n0ch3g8356j1g35bwjng87c2y5y0vcw0b5"; - "11-linux-amd64" = "1yby65hww6zmd2g5pjwbq5pv3iv4gfv060b8fq75fjhwrisyj5gd"; - "8-darwin-amd64" = "1smdj491g23i3z7p5rybid18nnz8bphrqjkv0lg2ffyrpn8k6g93"; - "11-darwin-amd64" = "056zyn0lpd7741k1szzjwwacka0g7rn0j4ypfmav4h1245mjg8lx"; - }.${javaVersionPlatform}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; - }) - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - freetype - openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so - stdenv.cc.cc.lib # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - zlib - ]; - - # Workaround for libssl.so.10 wanted by TruffleRuby - # Resulting TruffleRuby cannot use `openssl` library. - autoPatchelfIgnoreMissingDeps = true; - - nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ]; - - unpackPhase = '' - unpack_jar() { - jar=$1 - unzip -q -o $jar -d $out - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - system "ln -s $2 $ENV{out}/$1"; - }' $out/META-INF/symlinks - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' $out/META-INF/permissions - rm -rf $out/META-INF - } - - mkdir -p $out - arr=($srcs) - - # The tarball on Linux has the following directory structure: - # - # graalvm-ce-java11-20.3.0/* - # - # while on Darwin it looks like this: - # - # graalvm-ce-java11-20.3.0/Contents/Home/* - # - # We therefor use --strip-components=1 vs 3 depending on the platform. - tar xf ''${arr[0]} -C $out --strip-components=${if stdenv.isLinux then "1" else "3"} - - # Sanity check - if [ ! -d $out/bin ]; then - echo "The `bin` is directory missing after extracting the graalvm" - echo "tarball, please compare the directory structure of the" - echo "tarball with what happens in the unpackPhase (in particular" - echo "with regards to the `--strip-components` flag)." - exit 1 - fi - - unpack_jar ''${arr[1]} - unpack_jar ''${arr[2]} - unpack_jar ''${arr[3]} - unpack_jar ''${arr[4]} - ''; - - installPhase = { - "8-linux-amd64" = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/jre/lib/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - - # provide libraries needed for static compilation - for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f) - done - - # allow using external truffle-api.jar and languages not included in the distrubution - rm $out/jre/lib/jvmci/parentClassLoader.classpath - ''; - "11-linux-amd64" = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/conf/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - - # provide libraries needed for static compilation - for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f) - done - ''; - "8-darwin-amd64" = '' - # allow using external truffle-api.jar and languages not included in the distrubution - rm $out/jre/lib/jvmci/parentClassLoader.classpath - ''; - "11-darwin-amd64" = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/conf/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - ''; - }.${javaVersionPlatform} + '' - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - ''; - - dontStrip = true; - - preFixup = '' - # We cannot use -exec since wrapProgram is a function but not a - # command. - # - # jspawnhelper is executed from JVM, so it doesn't need to wrap it, - # and it breaks building OpenJDK (#114495). - for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do - if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then - wrapProgram "$bin" \ - --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" - fi - done - - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - - find "$out" -name libfontmanager.so -exec \ - patchelf --add-needed libfontconfig.so {} \; - ''; - - # $out/bin/native-image needs zlib to build native executables. - propagatedBuildInputs = [ setJavaClassPath zlib ] ++ - # On Darwin native-image calls clang and it - # tries to include <Foundation/Foundation.h>, - # and Interactive Ruby (irb) requires OpenSSL - # headers. - lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; - - doInstallCheck = true; - installCheckPhase = '' - echo ${lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - ''} > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - - # Ahead-Of-Time compilation - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld - ./helloworld | fgrep 'Hello World' - - ${lib.optionalString stdenv.isLinux '' - # Ahead-Of-Time compilation with --static - # --static flag doesn't work for darwin - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - ''} - - echo "Testing interpreted languages" - $out/bin/graalpython -c 'print(1 + 1)' - $out/bin/ruby -e 'puts(1 + 1)' - $out/bin/node -e 'console.log(1 + 1)' - - echo '1 + 1' | $out/bin/graalpython - - ${lib.optionalString stdenv.isLinux '' - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - echo '1 + 1' | $out/bin/irb - ''} - - echo '1 + 1' | $out/bin/node -i - ${lib.optionalString (javaVersion == "11" && stdenv.isLinux) '' - # Doesn't work on MacOS, we have this error: "Launching JShell execution engine threw: Operation not permitted (Bind failed)" - echo '1 + 1' | $out/bin/jshell - ''}''; - - passthru.home = graalvmXXX-ce; - - meta = with lib; { - homepage = "https://www.graalvm.org/"; - description = "High-Performance Polyglot VM"; - license = with licenses; [ upl gpl2Classpath bsd3 ]; - maintainers = with maintainers; [ bandresen volth hlolli glittershark babariviere ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; - }; - in - graalvmXXX-ce; -in { - graalvm8-ce = common "8"; - graalvm11-ce = common "11"; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix new file mode 100644 index 00000000000..54cc917a5be --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -0,0 +1,21 @@ +{ callPackage, Foundation }: + +let + mkGraal = opts: callPackage (import ./repository.nix opts) { + inherit Foundation; + }; +in { + inherit mkGraal; + + graalvm8-ce = mkGraal rec { + version = "21.2.0"; + javaVersion = "8"; + platforms = ["x86_64-linux"]; + }; + + graalvm11-ce = mkGraal rec { + version = "21.2.0"; + javaVersion = "11"; + platforms = ["x86_64-linux" "x86_64-darwin"]; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/repository.nix b/pkgs/development/compilers/graalvm/community-edition/repository.nix new file mode 100644 index 00000000000..50a3b53c579 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/repository.nix @@ -0,0 +1,271 @@ +{ version, javaVersion, platforms }: + +{ stdenv, lib, fetchurl, autoPatchelfHook, setJavaClassPath, makeWrapper +# minimum dependencies +, Foundation, alsa-lib, fontconfig, freetype, glibc, openssl, perl, unzip, xorg +, zlib +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? true, cairo, glib, gtk3 }: + +let + platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; + runtimeDependencies = [ cups ] + ++ lib.optionals gtkSupport [ cairo glib gtk3 ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; + javaVersionPlatform = "${javaVersion}-${platform}"; + graalvmXXX-ce = stdenv.mkDerivation rec { + name = "graalvm${javaVersion}-ce"; + srcs = [ + (fetchurl { + sha256 = { + "8-linux-amd64" = "01gyxjmfp7wpcyn7x8b184fn0lp3xryfw619bqch120pzvr6z88f"; + "11-linux-amd64" = "0w7lhvxm4nggqdcl4xrhdd3y6dqw9jhyca9adjkp508n4lqf1lxv"; + "11-darwin-amd64" = "0dnahicdl0vhrbiml9z9nbb7k75hbsjj8rs246i1lwril12dqb7n"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; + }) + (fetchurl { + sha256 = { + "8-linux-amd64" = "1jlvrxdlbsmlk3ia43h9m29kmmdn83h6zdlnf8qb7bm38c84nhsc"; + "11-linux-amd64" = "1ybd7a6ii6582skr0nkxx7bccsa7gkg0yriql2h1lcz0rfzcdi3g"; + "11-darwin-amd64" = "1jdy845vanmz05zx5b9227gb1msh9wdrz2kf3fx9z54ssd9qgdhm"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; + }) + (fetchurl { + sha256 = { + "8-linux-amd64" = "18ip0ay06q1pryqs8ja988mvk9vw475c0nfjcznnsd1zp296p6jc"; + "11-linux-amd64" = "1jszz97mkqavxzyhx5jxhi43kqjxk9c36j5l5hy3kn8sdfmbplm4"; + "11-darwin-amd64" = "1767ryhv2cn5anlys63ysax1p8ag79bykac1xfrjfan8yv6d8ybl"; + }.${javaVersionPlatform}; + url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; + }) + (fetchurl { + sha256 = { + "8-linux-amd64" = "0il15438qnikqsxdsl7fcdg0c8zs3cbm4ry7pys7fxxr1ckd8szq"; + "11-linux-amd64" = "07759sr8nijvqm8aqn69x9vq7lyppns7a6l6xribv43jvfmwpfkl"; + "11-darwin-amd64" = "01l3as8dihc7xqy5sdkrpxmpzrqbcvvg84m2s6j1j8y2db1khf2s"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; + }) + (fetchurl { + sha256 = { + "8-linux-amd64" = "08s36rjy5irg25b7lqx0m4v2wpywin3cqyhdrywhvq14f7zshsd5"; + "11-linux-amd64" = "1ybjaknmbsdg8qzb986x39fq0h7fyiymdcigc7y86swk8dd916hv"; + "11-darwin-amd64" = "02dwlb62kqr4rjjmvkhn2xk9l1p47ahg9xyyfkw7im1jwlqmqnzf"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; + }) + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib + ]; + + # Workaround for libssl.so.10 wanted by TruffleRuby + # Resulting TruffleRuby cannot use `openssl` library. + autoPatchelfIgnoreMissingDeps = true; + + nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ]; + + unpackPhase = '' + unpack_jar() { + jar=$1 + unzip -q -o $jar -d $out + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + system "ln -s $2 $ENV{out}/$1"; + }' $out/META-INF/symlinks + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' $out/META-INF/permissions + rm -rf $out/META-INF + } + + mkdir -p $out + arr=($srcs) + + # The tarball on Linux has the following directory structure: + # + # graalvm-ce-java11-20.3.0/* + # + # while on Darwin it looks like this: + # + # graalvm-ce-java11-20.3.0/Contents/Home/* + # + # We therefor use --strip-components=1 vs 3 depending on the platform. + tar xf ''${arr[0]} -C $out --strip-components=${ + if stdenv.isLinux then "1" else "3" + } + + # Sanity check + if [ ! -d $out/bin ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi + + unpack_jar ''${arr[1]} + unpack_jar ''${arr[2]} + unpack_jar ''${arr[3]} + unpack_jar ''${arr[4]} + ''; + + installPhase = { + "8-linux-amd64" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f) + done + + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11-linux-amd64" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/conf/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f) + done + ''; + "11-darwin-amd64" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/conf/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + ''; + }.${javaVersionPlatform} + '' + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + ''; + + dontStrip = true; + + preFixup = '' + # We cannot use -exec since wrapProgram is a function but not a + # command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, + # and it breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do + if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then + wrapProgram "$bin" \ + --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done + + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; + + # $out/bin/native-image needs zlib to build native executables. + propagatedBuildInputs = [ setJavaClassPath zlib ] ++ + # On Darwin native-image calls clang and it + # tries to include <Foundation/Foundation.h>, + # and Interactive Ruby (irb) requires OpenSSL + # headers. + lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; + + doInstallCheck = true; + installCheckPhase = '' + echo ${ + lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + '' + } > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld + ./helloworld | fgrep 'Hello World' + + ${ + lib.optionalString stdenv.isLinux '' + # Ahead-Of-Time compilation with --static + # --static flag doesn't work for darwin + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + '' + } + + echo "Testing interpreted languages" + $out/bin/graalpython -c 'print(1 + 1)' + $out/bin/ruby -e 'puts(1 + 1)' + + echo '1 + 1' | $out/bin/graalpython + + ${ + lib.optionalString stdenv.isLinux '' + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + echo '1 + 1' | $out/bin/irb + '' + } + + ${lib.optionalString (javaVersion == "11" && stdenv.isLinux) '' + # Doesn't work on MacOS, we have this error: "Launching JShell execution engine threw: Operation not permitted (Bind failed)" + echo '1 + 1' | $out/bin/jshell + ''}''; + + passthru.home = graalvmXXX-ce; + + meta = with lib; { + homepage = "https://www.graalvm.org/"; + description = "High-Performance Polyglot VM"; + license = with licenses; [ upl gpl2Classpath bsd3 ]; + maintainers = with maintainers; [ + bandresen + volth + hlolli + glittershark + babariviere + ericdallo + ]; + platforms = platforms; + }; + }; +in graalvmXXX-ce diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05e18dd0b91..bae3aef0c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11635,9 +11635,12 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; - inherit (callPackages ../development/compilers/graalvm/community-edition.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }) graalvm8-ce graalvm11-ce; + graalvmCEPackages = + recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + graalvm8-ce = graalvmCEPackages.graalvm8-ce; + graalvm11-ce = graalvmCEPackages.graalvm11-ce; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee From a94c37cb33b71feb1ce18acaab3c834b2139b2f4 Mon Sep 17 00:00:00 2001 From: Eric Dallo <ericdallo06@hotmail.com> Date: Wed, 4 Aug 2021 10:43:06 -0300 Subject: [PATCH 1428/1522] babashka: Fix missing graalvm parameter --- pkgs/development/interpreters/clojure/babashka.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 1b6edcd1dd4..145391229ed 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { "--no-server" "--report-unsupported-elements-at-runtime" "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" + "--initialize-at-run-time=org.httpkit.client.ClientSslEngineFactory\$SSLHolder" "--native-image-info" "--verbose" "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader" From b274155579f3acf7093db819e266fea00368ff84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 4 Aug 2021 13:55:48 +0000 Subject: [PATCH 1429/1522] byacc: 20210619 -> 20210802 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index f71b28d7e12..1b1b31deaed 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210619"; + version = "20210802"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-rN1ggNz5NXMqCOyOjEwWHGZs1W2MSQc5xtu2JnpJjA4="; + sha256 = "sha256-KUnGftE71nkX8Mm8yFx22ZowkNIRBep2cqh6NQLjzPY="; }; configureFlags = [ From f6ccdfcd2ac4f2e259d20e378737dcbd0ca7debe Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 3 Aug 2021 08:01:27 +0200 Subject: [PATCH 1430/1522] =?UTF-8?q?ocamlPackages.sedlex=5F2:=202.3=20?= =?UTF-8?q?=E2=86=92=202.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Supports Unicode 13.0.0 --- pkgs/development/ocaml-modules/sedlex/2.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 6db40dd9c7e..9f4badbc7ca 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -13,25 +13,25 @@ then throw "sedlex is not available for OCaml ${ocaml.version}" else let - unicodeVersion = "12.1.0"; + unicodeVersion = "13.0.0"; baseUrl = "https://www.unicode.org/Public/${unicodeVersion}"; DerivedCoreProperties = fetchurl { url = "${baseUrl}/ucd/DerivedCoreProperties.txt"; - sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6"; + sha256 = "0j12x112cd8fpgazkc8izxnhhpia44p1m36ff8yapslxndcmzm55"; }; DerivedGeneralCategory = fetchurl { url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt"; - sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q"; + sha256 = "0w6mkz4w79k23bnmwgfxc4yqc2ypv8ilrjn6nk25hrafksbg00j5"; }; PropList = fetchurl { url = "${baseUrl}/ucd/PropList.txt"; - sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"; + sha256 = "1ks0585wimygbk2wqi9hqg8gyl25iffvdad5vya1zgsxs8z5lns8"; }; in buildDunePackage rec { pname = "sedlex"; - version = "2.3"; + version = "2.4"; useDune2 = true; @@ -39,7 +39,7 @@ buildDunePackage rec { owner = "ocaml-community"; repo = "sedlex"; rev = "v${version}"; - sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar"; + sha256 = "13g8az4zqg6hrnxmy3qrasslppzlag13dd1dsr8vlpg2vpfmfv6i"; }; propagatedBuildInputs = [ From 2540b66ba652d68d9f1ba487d516c22f8ae69bec Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 11:27:09 +0200 Subject: [PATCH 1431/1522] llvmPackages_13: init at 13.0.0-rc1 --- .../llvm/13/compiler-rt/codesign.patch | 10 +- .../compilers/llvm/13/compiler-rt/default.nix | 1 - .../13/compiler-rt/gnu-install-dirs.patch | 129 ------------------ .../development/compilers/llvm/13/default.nix | 19 ++- .../llvm/13/libcxx/gnu-install-dirs.patch | 43 +++--- .../llvm/13/libcxxabi/gnu-install-dirs.patch | 23 ++-- .../llvm/13/libunwind/gnu-install-dirs.patch | 22 +-- .../compilers/llvm/13/lldb/default.nix | 3 +- pkgs/top-level/all-packages.nix | 11 ++ 9 files changed, 72 insertions(+), 189 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch index 3cc12b94b20..065959d14d4 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch +++ b/pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch @@ -11,10 +11,10 @@ Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that 3 files changed, 107 deletions(-) diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 +index bc69ec95c419..9f100fdcec2f 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) +@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") endif() @@ -23,11 +23,11 @@ index bc5fb9ff7..b64eb4246 100644 - add_custom_command(TARGET ${libname} - POST_BUILD - COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} - ) - endif() endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} + + set(parent_target_arg) 2.14.1 diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 8aeaabb0cd3..8e258e349b9 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 5f025764de1..00000000000 --- a/pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b44ad2c2118e..d42f5664d448 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - endif() -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index 361538a58e47..f0d8d9ab80f1 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -512,7 +512,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index 456a8dcda59f..7a09e74c7c79 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index f61d487e93a0..f1f46fb9599c 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -378,7 +378,7 @@ endfunction() - function(get_compiler_rt_install_dir arch install_dir) - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - get_compiler_rt_target(${arch} target) -- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) -+ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) - else() - set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) - endif() -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 1edab43e7c0d..1aac6b73ff82 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) - set(COMPILER_RT_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - endif() - - if(APPLE) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index b00e8caa1ddd..0fe64e4862c9 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - install(FILES ${SANITIZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install fuzzer headers. - install(FILES ${FUZZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) - # Install profile headers. - install(FILES ${PROFILE_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. - add_custom_target(install-compiler-rt-headers -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index a29de8deff1b..d39ff01613d2 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 8b1fca6c8b1..4b73e78c13f 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -19,10 +19,10 @@ let release_version = "13.0.0"; - candidate = ""; # empty or "rcN" + candidate = "rc1"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "98033fdc50e61273b1d5c77ba5f0f75afe3965c1"; # When using a Git commit - rev-version = "unstable-2021-07-12"; # When using a Git commit + rev = ""; # When using a Git commit + rev-version = ""; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0m28wpkyymzgqflp8xwyab0vryn3jln565qk15qm839n0d0mq3hh"; + sha256 = "19x8yk9zkpdmn08r1jn3bk1l5ab7kgj9fi5v7lmkyahc19wxszy4"; }; llvm_meta = { @@ -77,18 +77,17 @@ let clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; - # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.libllvm.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - #}); + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - # disabled until recommonmark supports sphinx 3 + # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' # lldb-manpages = lowPrio (tools.lldb.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot diff --git a/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch index f59d7f8dfaf..744967a6ee0 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/libcxx/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06ee1d74a03e..6c3c6f8f8d47 100644 +index b1e25358d41a..7fe1f4d85401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") +@@ -26,6 +26,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) project(libcxx CXX C) @@ -11,32 +11,33 @@ index 06ee1d74a03e..6c3c6f8f8d47 100644 set(PACKAGE_NAME libcxx) set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -412,7 +414,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") - if(LIBCXX_LIBDIR_SUBDIR) -@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +@@ -426,7 +428,7 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") - else() +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +@@ -436,7 +438,7 @@ else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") - endif() +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake index 5a8a4a270a1a..c06bae0001aa 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake @@ -51,10 +52,10 @@ index 5a8a4a270a1a..c06bae0001aa 100644 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 87b71f7ba334..d20a783079b7 100644 +index 496429f3841e..1a0c9c0a3159 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) +@@ -376,21 +376,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) install(TARGETS cxx_shared ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch index 45641acb0c7..5d562dd59a9 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/libcxxabi/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e8b73aa38cc..6f7b2a25d205 100644 +index 9fb35860d483..5739d9e8af62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -11,26 +11,27 @@ index 1e8b73aa38cc..6f7b2a25d205 100644 set(PACKAGE_NAME libcxxabi) set(PACKAGE_VERSION 11.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH +@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) - string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") else() set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") endif() - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch index 56231cd31b2..8cd25c56f8c 100644 --- a/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/libunwind/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2c03fd3f8aa..98de2f8ea7c8 100644 +index 81eddbc24879..e2afb2002150 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -11,24 +11,26 @@ index a2c03fd3f8aa..98de2f8ea7c8 100644 set(PACKAGE_NAME libunwind) set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -116,17 +118,17 @@ set(CMAKE_MODULE_PATH +@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) - string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) +@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) endif() elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") else() set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") endif() - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index f8c7e7b55e6..2dd6c46eb82 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -53,8 +53,7 @@ stdenv.mkDerivation (rec { libedit libxml2 libllvm - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libobjc xpc Foundation diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89eb3115537..5e1bbe83ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11760,6 +11760,7 @@ in lld_10 = llvmPackages_10.lld; lld_11 = llvmPackages_11.lld; lld_12 = llvmPackages_12.lld; + lld_13 = llvmPackages_13.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -11770,11 +11771,13 @@ in lldb_10 = llvmPackages_10.lldb; lldb_11 = llvmPackages_11.lldb; lldb_12 = llvmPackages_12.lldb; + lldb_13 = llvmPackages_13.lldb; llvm = llvmPackages.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_13 = llvmPackages_13.llvm; llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; @@ -11855,6 +11858,14 @@ in stdenv = gcc7Stdenv; })); + llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_13.tools; + targetLlvmLibraries = targetPackages.llvmPackages_13.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); + llvmPackages_latest = llvmPackages_12; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); From c99611a8b308371bdff7ce19b53ae61252f35363 Mon Sep 17 00:00:00 2001 From: Sandro <sandro.jaeckel@gmail.com> Date: Wed, 4 Aug 2021 16:18:00 +0200 Subject: [PATCH 1432/1522] qarte: pname + version, format --- pkgs/applications/video/qarte/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 9b80ddedcf3..116cf39e3fb 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,7 +3,9 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); in mkDerivation { - name = "qarte-4.12.0"; + pname = "qarte"; + version = "4.12.0"; + src = fetchbzr { url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; rev = "56"; @@ -14,6 +16,7 @@ in mkDerivation { installPhase = '' runHook preInstall + mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ @@ -24,6 +27,7 @@ in mkDerivation { mkdir -p $out/share/qarte mv * $out/share/qarte/ + runHook postInstall ''; @@ -32,11 +36,11 @@ in mkDerivation { --prefix PATH : ${rtmpdump}/bin ''; - meta = { + meta = with lib; { homepage = "https://launchpad.net/qarte"; description = "A recorder for Arte TV Guide and Arte Concert"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ vbgl ]; - platforms = lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ vbgl ]; + platforms = platforms.linux; }; } From 9bd54f586e162749c4c12a454b101987cb16de5c Mon Sep 17 00:00:00 2001 From: adisbladis <adisbladis@gmail.com> Date: Wed, 4 Aug 2021 09:13:46 -0500 Subject: [PATCH 1433/1522] emacs.pkgs: Propagate overriden scope to emacs package in set This is the true fix for https://github.com/NixOS/nixpkgs/issues/130020. --- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/emacs-packages.nix | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05e18dd0b91..f5912a2e700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23951,8 +23951,8 @@ in }; emacsPackagesFor = emacs: import ./emacs-packages.nix { - inherit (lib) makeScope makeOverridable; - inherit emacs; + inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; + emacs' = emacs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3fa2d2ea5dc..9b4d700a355 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -21,7 +21,12 @@ (package-initialize) */ -{ pkgs', makeScope, makeOverridable, emacs }: +{ pkgs' +, emacs' +, makeScope +, makeOverridable +, dontRecurseIntoAttrs +}: let @@ -71,7 +76,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ // manualPackages // { inherit manualPackages; } // { - inherit emacs; + # Propagate overriden scope + emacs = emacs'.overrideAttrs(old: { + passthru = old.passthru // { + pkgs = dontRecurseIntoAttrs self; + }; + }); trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { inherit (self) emacs; @@ -84,7 +94,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ emacsWithPackages = emacsWithPackages { inherit pkgs lib; } self; withPackages = emacsWithPackages { inherit pkgs lib; } self; - }// { + } // { # Package specific priority overrides goes here From 58fc18c56538a6464ffd63a0059a527549d71ab2 Mon Sep 17 00:00:00 2001 From: zimbatm <zimbatm@zimbatm.com> Date: Wed, 4 Aug 2021 16:50:36 +0200 Subject: [PATCH 1434/1522] treefmt: 0.2.2 -> 0.2.3 --- pkgs/development/tools/treefmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 961b9625ede..590fae64082 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "13z7n0xg150815c77ysz4iqpk8rbgj4vmqy1y2262ryb88dwaw5n"; + sha256 = "1j505bjdgd6lsq197frlyw26fl1621aw6z339bdp7zc3sa54z0d6"; }; - cargoSha256 = "1jfrmafj1b28k6xjpj0qq1jpccll0adqxhjypphxhyfsfnra8g6f"; + cargoSha256 = "0aky94rq1gs506yhpinj759lpvlnw3q2k97gvq34svgq0n38drvk"; meta = { description = "one CLI to format the code tree"; From 18fa487795aaeabce5843d3a3fdcad12d3131903 Mon Sep 17 00:00:00 2001 From: Sandro <sandro.jaeckel@gmail.com> Date: Wed, 4 Aug 2021 17:02:31 +0200 Subject: [PATCH 1435/1522] bibletime: format --- pkgs/applications/misc/bibletime/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 30088f52436..3a0cc8ce44f 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -3,14 +3,11 @@ , docbook_xsl_ns }: mkDerivation rec { - + pname = "bibletime"; version = "3.0.1"; - pname = "bibletime"; - src = fetchurl { - url = - "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; + url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; }; @@ -37,11 +34,11 @@ mkDerivation rec { "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" ]; - meta = { + meta = with lib; { description = "A Qt4 Bible study tool"; homepage = "http://www.bibletime.info/"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.piotr ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.piotr ]; }; } From a6dc8b346942590f9b7d53091ecefee5279674bc Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 17:22:22 +0200 Subject: [PATCH 1436/1522] llvmPackages_git: 2021-07-12 -> 2021-07-16 This includes the changes for 13.0.0-rc1 from 2540b66ba652d68d9f1ba487d516c22f8ae69bec. --- .../llvm/git/compiler-rt/codesign.patch | 10 +- .../llvm/git/compiler-rt/default.nix | 1 - .../git/compiler-rt/gnu-install-dirs.patch | 129 ------------------ .../compilers/llvm/git/default.nix | 17 ++- .../llvm/git/libcxx/gnu-install-dirs.patch | 43 +++--- .../llvm/git/libcxxabi/gnu-install-dirs.patch | 23 ++-- .../llvm/git/libunwind/gnu-install-dirs.patch | 22 +-- .../compilers/llvm/git/lldb/default.nix | 3 +- 8 files changed, 60 insertions(+), 188 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch index 3cc12b94b20..065959d14d4 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch +++ b/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch @@ -11,10 +11,10 @@ Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that 3 files changed, 107 deletions(-) diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 +index bc69ec95c419..9f100fdcec2f 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) +@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") endif() @@ -23,11 +23,11 @@ index bc5fb9ff7..b64eb4246 100644 - add_custom_command(TARGET ${libname} - POST_BUILD - COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} - ) - endif() endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} + + set(parent_target_arg) 2.14.1 diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 8aeaabb0cd3..8e258e349b9 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 5f025764de1..00000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b44ad2c2118e..d42f5664d448 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - endif() -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index 361538a58e47..f0d8d9ab80f1 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -512,7 +512,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index 456a8dcda59f..7a09e74c7c79 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index f61d487e93a0..f1f46fb9599c 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -378,7 +378,7 @@ endfunction() - function(get_compiler_rt_install_dir arch install_dir) - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - get_compiler_rt_target(${arch} target) -- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE) -+ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE) - else() - set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) - endif() -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 1edab43e7c0d..1aac6b73ff82 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) - set(COMPILER_RT_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - endif() - - if(APPLE) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index b00e8caa1ddd..0fe64e4862c9 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - install(FILES ${SANITIZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install fuzzer headers. - install(FILES ${FUZZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) - # Install profile headers. - install(FILES ${PROFILE_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. - add_custom_target(install-compiler-rt-headers -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index a29de8deff1b..d39ff01613d2 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 8b1fca6c8b1..35be7eb03c9 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -21,8 +21,8 @@ let release_version = "13.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "98033fdc50e61273b1d5c77ba5f0f75afe3965c1"; # When using a Git commit - rev-version = "unstable-2021-07-12"; # When using a Git commit + rev = "f98ed74f6910f8b09e77497aeb30c860c433610d"; # When using a Git commit + rev-version = "unstable-2021-07-16"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0m28wpkyymzgqflp8xwyab0vryn3jln565qk15qm839n0d0mq3hh"; + sha256 = "1dp0n3rpg60xr321mvn2gi268pfcs6ii4nnwgsi2lix0di4h3ccb"; }; llvm_meta = { @@ -77,18 +77,17 @@ let clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; - # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.libllvm.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - #}); + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); clang-manpages = lowPrio (tools.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot }); - # disabled until recommonmark supports sphinx 3 + # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' # lldb-manpages = lowPrio (tools.lldb.override { # enableManpages = true; # python3 = pkgs.python3; # don't use python-boot diff --git a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index f59d7f8dfaf..744967a6ee0 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06ee1d74a03e..6c3c6f8f8d47 100644 +index b1e25358d41a..7fe1f4d85401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") +@@ -26,6 +26,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) project(libcxx CXX C) @@ -11,32 +11,33 @@ index 06ee1d74a03e..6c3c6f8f8d47 100644 set(PACKAGE_NAME libcxx) set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -412,7 +414,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") - if(LIBCXX_LIBDIR_SUBDIR) -@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +@@ -426,7 +428,7 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") - else() +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +@@ -436,7 +438,7 @@ else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") - endif() +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake index 5a8a4a270a1a..c06bae0001aa 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake @@ -51,10 +52,10 @@ index 5a8a4a270a1a..c06bae0001aa 100644 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 87b71f7ba334..d20a783079b7 100644 +index 496429f3841e..1a0c9c0a3159 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) +@@ -376,21 +376,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) install(TARGETS cxx_shared ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index 45641acb0c7..5d562dd59a9 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e8b73aa38cc..6f7b2a25d205 100644 +index 9fb35860d483..5739d9e8af62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -11,26 +11,27 @@ index 1e8b73aa38cc..6f7b2a25d205 100644 set(PACKAGE_NAME libcxxabi) set(PACKAGE_VERSION 11.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH +@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) - string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") else() set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") endif() - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch index 56231cd31b2..8cd25c56f8c 100644 --- a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2c03fd3f8aa..98de2f8ea7c8 100644 +index 81eddbc24879..e2afb2002150 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -11,24 +11,26 @@ index a2c03fd3f8aa..98de2f8ea7c8 100644 set(PACKAGE_NAME libunwind) set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -116,17 +118,17 @@ set(CMAKE_MODULE_PATH +@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) - string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) +@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) endif() elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") else() set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") endif() - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/llvm/git/lldb/default.nix b/pkgs/development/compilers/llvm/git/lldb/default.nix index f8c7e7b55e6..2dd6c46eb82 100644 --- a/pkgs/development/compilers/llvm/git/lldb/default.nix +++ b/pkgs/development/compilers/llvm/git/lldb/default.nix @@ -53,8 +53,7 @@ stdenv.mkDerivation (rec { libedit libxml2 libllvm - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libobjc xpc Foundation From 9bc2d82b55549f0786f729fdc080335d8aa4a8a8 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Tue, 3 Aug 2021 13:20:15 +0200 Subject: [PATCH 1437/1522] chromium: get-commit-message.py: Support specifying a version This makes the usage from update.py more robust. It also adds a workaround for [0] which currently lacks a title. [0]: https://chromereleases.googleblog.com/2021/08/the-stable-channel-has-been-updated-to.html --- .../browsers/chromium/get-commit-message.py | 25 +++++++++++++++---- .../networking/browsers/chromium/update.py | 10 ++------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 7a91b74c83d..b0fbe20db8e 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -2,8 +2,10 @@ #!nix-shell -i python3 -p python3Packages.feedparser python3Packages.requests # This script prints the Git commit message for stable channel updates. +# Usage: ./get-commit-message.py [version] import re +import sys import textwrap from collections import OrderedDict @@ -13,19 +15,29 @@ import requests feed = feedparser.parse('https://chromereleases.googleblog.com/feeds/posts/default') html_tags = re.compile(r'<[^>]+>') +target_version = sys.argv[1] if len(sys.argv) == 2 else None for entry in feed.entries: - if entry.title != 'Stable Channel Update for Desktop': - continue url = requests.get(entry.link).url.split('?')[0] + if entry.title != 'Stable Channel Update for Desktop': + if target_version and entry.title == '': + # Workaround for a special case (Chrome Releases bug?): + if not 'the-stable-channel-has-been-updated-to' in url: + continue + else: + continue content = entry.content[0].value content = html_tags.sub('', content) # Remove any HTML tags if re.search(r'Linux', content) is None: continue #print(url) # For debugging purposes version = re.search(r'\d+(\.\d+){3}', content).group(0) - print('chromium: TODO -> ' + version) - print('\n' + url) + if target_version: + if version != target_version: + continue + else: + print('chromium: TODO -> ' + version + '\n') + print(url) if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) if zero_days: @@ -35,4 +47,7 @@ for entry in feed.entries: cve_list = list(OrderedDict.fromkeys(cve_list)) # Remove duplicates but preserve the order cve_string = ' '.join(cve_list) print("\nCVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72))) - break # We only care about the most recent stable channel update + sys.exit(0) # We only care about the most recent stable channel update + +print("Error: No match.") +sys.exit(1) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 4f9f53bd02a..72d6df055b3 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -222,14 +222,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': attr_name = channel_name_to_attr_name(channel_name) commit_message = f'{attr_name}: {version_old} -> {version_new}' if channel_name == 'stable': - body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT]).decode('utf-8') - prefix = f'chromium: TODO -> {version_new}' - if not body.startswith(prefix): - print("Error: Couldn't fetch the the release notes for the following update:") - print(commit_message) - sys.exit(1) - body = body.removeprefix(prefix) - commit_message += body + body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8') + commit_message += '\n\n' + body subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: From 1e372f40047912013568d731208655bd9dab526c Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 11:14:45 +0200 Subject: [PATCH 1438/1522] chromiumDev: Fix the build Note: I've only tested this with llvmPackages_git but it should work with llvmPackages_13 as well. fieldtrial_testing_like_official_build was renamed to disable_fieldtrial_testing_config: https://github.com/chromium/chromium/commit/486e9d58c0980be0d50054064e0b7d79446de071 --- .../networking/browsers/chromium/common.nix | 5 ++++- .../networking/browsers/chromium/default.nix | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 777e5148e40..ee506b3faad 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -267,7 +267,6 @@ let clang_use_chrome_plugins = false; blink_symbol_level = 0; symbol_level = 0; - fieldtrial_testing_like_official_build = true; # Google API key, see: https://www.chromium.org/developers/how-tos/api-keys # Note: The API key is for NixOS/nixpkgs use ONLY. @@ -288,6 +287,10 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; + } // optionalAttrs (!chromiumVersionAtLeast "94") { + fieldtrial_testing_like_official_build = true; + } // optionalAttrs (chromiumVersionAtLeast "94") { + disable_fieldtrial_testing_config = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c7be4663bbe..c157b64de64 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_11; + llvmPackages = llvmPackages_12; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -38,9 +38,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") { - llvmPackages = llvmPackages_12; - stdenv = llvmPackages_12.stdenv; + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec { + llvmPackages = llvmPackages_13; + stdenv = llvmPackages.stdenv; }); browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; From 8c0d0fcf86c71e5b997225bc8638e5359b787de1 Mon Sep 17 00:00:00 2001 From: zimbatm <zimbatm@zimbatm.com> Date: Wed, 4 Aug 2021 18:04:43 +0200 Subject: [PATCH 1439/1522] gradle: fmt --- .../tools/build-managers/gradle/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3afe88043de..c96ca7f0e02 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -9,8 +9,9 @@ let url = "https://services.gradle.org/distributions/${name}-bin.zip"; }; }; -in rec { - gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { +in +rec { + gradleGen = { name, src, nativeVersion }: stdenv.mkDerivation { inherit name src nativeVersion; dontBuild = true; @@ -27,20 +28,21 @@ in rec { ''; fixupPhase = if (!stdenv.isLinux) then ":" else - let arch = if stdenv.is64bit then "amd64" else "i386"; in '' - mkdir patching - pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-${nativeVersion}.jar . - mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ - popd + let arch = if stdenv.is64bit then "amd64" else "i386"; in + '' + mkdir patching + pushd patching + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so + jar cf native-platform-linux-${arch}-${nativeVersion}.jar . + mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ + popd - # The scanner doesn't pick up the runtime dependency in the jar. - # Manually add a reference where it will be found. - mkdir $out/nix-support - echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies - ''; + # The scanner doesn't pick up the runtime dependency in the jar. + # Manually add a reference where it will be found. + mkdir $out/nix-support + echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies + ''; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ java ]; From 59091b7787cc474aed494171e46085cd8b529d4a Mon Sep 17 00:00:00 2001 From: zimbatm <zimbatm@zimbatm.com> Date: Wed, 4 Aug 2021 18:05:08 +0200 Subject: [PATCH 1440/1522] gradle_7: 7.1 -> 7.1.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c96ca7f0e02..cdcae79dde1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -66,9 +66,9 @@ rec { gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.1"; + version = "7.1.1"; nativeVersion = "0.22-milestone-16"; - sha256 = "0yyqksq3zza7r9ls389ha81l3s768j7dfdqiwk3846qy4wcyxsrd"; + sha256 = "0p9nss2xywwhjbpdcyma3d0ijvkav9hzmldpkcp447ch92cqd2xz"; }); gradle_6_8 = gradleGen (gradleSpec { From 8d67153deb7d3a9d45f4735b1ca276de3a9499d6 Mon Sep 17 00:00:00 2001 From: Kerstin Humm <kerstin@erictapen.name> Date: Wed, 4 Aug 2021 15:03:40 +0200 Subject: [PATCH 1441/1522] glimpse: add graphviz as runtime dependency Fixes https://github.com/NixOS/nixpkgs/issues/132405 See also: https://gitlab.gnome.org/GNOME/gegl/-/issues/279 https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04 --- pkgs/applications/graphics/glimpse/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix index de85fb9bf17..01271f53b57 100644 --- a/pkgs/applications/graphics/glimpse/default.nix +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -51,6 +51,7 @@ , makeWrapper , autoreconfHook , gtk-doc +, graphviz }: let python = python2.withPackages (pp: [ pp.pygtk ]); @@ -154,7 +155,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] } ''; passthru = rec { From d53aafd7f2d03c48fe2b7cf284a506a22b0cb4d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Wed, 4 Aug 2021 18:10:33 +0200 Subject: [PATCH 1442/1522] esphome: 1.20.3 -> 1.20.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index e38f0d48b9b..feeb7ad7583 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1sx2ky7860d8rjfxpbwb176n33icz6q82w4wgd5qr3ldrfjn58vn"; + sha256 = "sha256-Z2/7J8F9o+ZY+7Q9bpAT79yHqUFyJu9usu4XI4PhpCI="; }; patches = [ From f20800263cbdfb1abafde6e031830646b845d3fc Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Wed, 4 Aug 2021 16:37:33 +0000 Subject: [PATCH 1443/1522] factorio-experimental: 1.1.36 -> 1.1.37 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 500181ff70e..d8174417cb3 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.36.tar.xz", + "name": "factorio_alpha_x64-1.1.37.tar.xz", "needsAuth": true, - "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", + "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", + "version": "1.1.37" }, "stable": { "name": "factorio_alpha_x64-1.1.36.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.36.tar.xz", + "name": "factorio_headless_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", + "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/headless/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/headless/linux64", + "version": "1.1.37" }, "stable": { "name": "factorio_headless_x64-1.1.36.tar.xz", From 04b8bee53bc289d11c41b2259885ce54ca18ba2f Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Wed, 4 Aug 2021 14:19:18 +0000 Subject: [PATCH 1444/1522] cloud-hypervisor: 15.0 -> 17.0 Fixes: https://github.com/NixOS/nixpkgs/pull/126879 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index d04c0230c97..3bcb27898cc 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "15.0"; + version = "17.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "14s80vs7j5fxzl2a6k44fjlbk8i13lln28i37xaa6yk1q3d9jwic"; + sha256 = "1m4v12sjifd5mf1wzjwkndvxg53n7kwd35k6ql45hdpiz3f5ipig"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "02q4k7j1hyibsiwsbqa5bd4vr3fs1vngnnhqa4kzvih73bkagvk7"; + cargoSha256 = "11qspv061y75cyln60727x15gdn9rndi697zr9fmihnwn3dx4hvh"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; From 22b442710a79c1818adfb0e8fa82561b64e7067d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Wed, 4 Aug 2021 20:54:48 +0200 Subject: [PATCH 1445/1522] qemu: format --- .../virtualization/qemu/default.nix | 120 +++++++++--------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4df14e030ae..f3aecf30080 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -31,20 +31,19 @@ , nixosTestRunner ? false }: -with lib; let - audio = optionalString alsaSupport "alsa," - + optionalString pulseSupport "pa," - + optionalString sdlSupport "sdl,"; + audio = lib.optionalString alsaSupport "alsa," + + lib.optionalString pulseSupport "pa," + + lib.optionalString sdlSupport "sdl,"; in stdenv.mkDerivation rec { - version = "6.0.0"; pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; + version = "6.0.0"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; @@ -52,32 +51,32 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ] - ++ optionals gtkSupport [ wrapGAppsHook ] - ++ optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = - [ zlib glib perl pixman - vde2 texinfo makeWrapper lzo snappy - gnutls nettle curl - ] - ++ optionals ncursesSupport [ ncurses ] - ++ optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] - ++ optionals seccompSupport [ libseccomp ] - ++ optionals numaSupport [ numactl ] - ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL2 SDL2_image ] - ++ optionals gtkSupport [ gtk3 gettext vte ] - ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals smartcardSupport [ libcacard ] - ++ optionals spiceSupport [ spice-protocol spice ] - ++ optionals usbredirSupport [ usbredir ] - ++ optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] - ++ optionals xenSupport [ xen ] - ++ optionals cephSupport [ ceph ] - ++ optionals glusterfsSupport [ glusterfs libuuid ] - ++ optionals openGLSupport [ mesa epoxy libdrm ] - ++ optionals virglSupport [ virglrenderer ] - ++ optionals libiscsiSupport [ libiscsi ] - ++ optionals smbdSupport [ samba ]; + ++ lib.optionals gtkSupport [ wrapGAppsHook ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = [ zlib glib perl pixman + vde2 texinfo makeWrapper lzo snappy + gnutls nettle curl + ] + ++ lib.optionals ncursesSupport [ ncurses ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] + ++ lib.optionals seccompSupport [ libseccomp ] + ++ lib.optionals numaSupport [ numactl ] + ++ lib.optionals pulseSupport [ libpulseaudio ] + ++ lib.optionals sdlSupport [ SDL2 SDL2_image ] + ++ lib.optionals gtkSupport [ gtk3 gettext vte ] + ++ lib.optionals vncSupport [ libjpeg libpng ] + ++ lib.optionals smartcardSupport [ libcacard ] + ++ lib.optionals spiceSupport [ spice-protocol spice ] + ++ lib.optionals usbredirSupport [ usbredir ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] + ++ lib.optionals xenSupport [ xen ] + ++ lib.optionals cephSupport [ ceph ] + ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] + ++ lib.optionals openGLSupport [ mesa epoxy libdrm ] + ++ lib.optionals virglSupport [ virglrenderer ] + ++ lib.optionals libiscsiSupport [ libiscsi ] + ++ lib.optionals smbdSupport [ samba ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -96,8 +95,8 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch"; sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n"; }) - ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optionals stdenv.hostPlatform.isMusl [ + ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch + ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch"; sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; @@ -149,36 +148,35 @@ stdenv.mkDerivation rec { --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ --replace "'VERSION'" "'QEMU_VERSION'" - '' + optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; - configureFlags = - [ "--audio-drv-list=${audio}" - "--enable-docs" - "--enable-tools" - "--enable-guest-agent" - "--localstatedir=/var" - "--sysconfdir=/etc" - ] - ++ optional numaSupport "--enable-numa" - ++ optional seccompSupport "--enable-seccomp" - ++ optional smartcardSupport "--enable-smartcard" - ++ optional spiceSupport "--enable-spice" - ++ optional usbredirSupport "--enable-usb-redir" - ++ optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" - ++ optional stdenv.isDarwin "--enable-cocoa" - ++ optional stdenv.isDarwin "--enable-hvf" - ++ optional stdenv.isLinux "--enable-linux-aio" - ++ optional gtkSupport "--enable-gtk" - ++ optional xenSupport "--enable-xen" - ++ optional cephSupport "--enable-rbd" - ++ optional glusterfsSupport "--enable-glusterfs" - ++ optional openGLSupport "--enable-opengl" - ++ optional virglSupport "--enable-virglrenderer" - ++ optional tpmSupport "--enable-tpm" - ++ optional libiscsiSupport "--enable-libiscsi" - ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; + configureFlags = [ + "--audio-drv-list=${audio}" + "--enable-docs" + "--enable-tools" + "--enable-guest-agent" + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ lib.optional numaSupport "--enable-numa" + ++ lib.optional seccompSupport "--enable-seccomp" + ++ lib.optional smartcardSupport "--enable-smartcard" + ++ lib.optional spiceSupport "--enable-spice" + ++ lib.optional usbredirSupport "--enable-usb-redir" + ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" + ++ lib.optional stdenv.isDarwin "--enable-cocoa" + ++ lib.optional stdenv.isDarwin "--enable-hvf" + ++ lib.optional stdenv.isLinux "--enable-linux-aio" + ++ lib.optional gtkSupport "--enable-gtk" + ++ lib.optional xenSupport "--enable-xen" + ++ lib.optional cephSupport "--enable-rbd" + ++ lib.optional glusterfsSupport "--enable-glusterfs" + ++ lib.optional openGLSupport "--enable-opengl" + ++ lib.optional virglSupport "--enable-virglrenderer" + ++ lib.optional tpmSupport "--enable-tpm" + ++ lib.optional libiscsiSupport "--enable-libiscsi" + ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev dontWrapGApps = true; @@ -190,7 +188,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ - '' + optionalString gtkSupport '' + '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do wrapGApp $f From d96f1bc3211f55fd1d67624a0d8a8a646ab2c676 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Tue, 20 Jul 2021 19:21:02 -0700 Subject: [PATCH 1446/1522] python3Packages.streaming-form-data: init at 1.8.1 --- .../streaming-form-data/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/streaming-form-data/default.nix diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix new file mode 100644 index 00000000000..2f52d4aeb30 --- /dev/null +++ b/pkgs/development/python-modules/streaming-form-data/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, +cython, numpy, pytest, requests-toolbelt }: + +buildPythonPackage rec { + pname = "streaming-form-data"; + version = "1.8.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "siddhantgoel"; + repo = "streaming-form-data"; + rev = "v${version}"; + sha256 = "1wnak8gwkc42ihgf0g9r7r858hxbqav2xdgqa8azid8v2ff6iq4d"; + }; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ requests-toolbelt ]; + + checkInputs = [ numpy pytest ]; + + checkPhase = '' + make test + ''; + + pythonImportsCheck = [ "streaming_form_data" ]; + + meta = with lib; { + description = "Streaming parser for multipart/form-data"; + homepage = "https://github.com/siddhantgoel/streaming-form-data"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff292debd20..ebbf5b5e76e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8402,6 +8402,8 @@ in { stravalib = callPackage ../development/python-modules/stravalib { }; + streaming-form-data = callPackage ../development/python-modules/streaming-form-data { }; + streamz = callPackage ../development/python-modules/streamz { }; strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; From 9050f3a37e0a6a5871adc364e3b601e9512ff518 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Tue, 20 Jul 2021 19:21:02 -0700 Subject: [PATCH 1447/1522] moonraker: init at unstable-2021-07-18 --- pkgs/servers/moonraker/default.nix | 44 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/servers/moonraker/default.nix diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix new file mode 100644 index 00000000000..2ca35beeff1 --- /dev/null +++ b/pkgs/servers/moonraker/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater }: + +let + pythonEnv = python3.withPackages (packages: with packages; [ + tornado + pyserial + pillow + lmdb + streaming-form-data + distro + inotify-simple + libnacl + paho-mqtt + ]); +in stdenvNoCC.mkDerivation rec { + pname = "moonraker"; + version = "unstable-2021-07-18"; + + src = fetchFromGitHub { + owner = "Arksine"; + repo = "moonraker"; + rev = "42f61ceafa90fcfea8bffbe968e26a6fd8b61af6"; + sha256 = "1w6l9pgs4n4nnk3h40y346bf6j3v4j4h1qnhj5dwlbwdxiqpd9gs"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out $out/bin $out/lib + cp -r moonraker $out/lib + + makeWrapper ${pythonEnv}/bin/python $out/bin/moonraker \ + --add-flags "$out/lib/moonraker/moonraker.py" + ''; + + passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + + meta = with lib; { + description = "API web server for Klipper"; + homepage = "https://github.com/Arksine/moonraker"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1d3b4c745..4a87c3f9095 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3100,6 +3100,8 @@ in moodle-dl = callPackage ../tools/networking/moodle-dl { }; + moonraker = callPackage ../servers/moonraker { }; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; From fd435bdab73c93c94912a7a8acfdbdf3fbe754d2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Tue, 20 Jul 2021 19:21:03 -0700 Subject: [PATCH 1448/1522] nixos/klipper: Add default value for apiSocket --- nixos/modules/services/misc/klipper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 909408225e0..e6b9dd234a9 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -30,8 +30,7 @@ in apiSocket = mkOption { type = types.nullOr types.path; - default = null; - example = "/run/klipper/api"; + default = "/run/klipper/api"; description = "Path of the API socket to create."; }; From a6899457c31d021d9caa27231a0a61f1b9199c0c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Wed, 4 Aug 2021 10:18:24 -0700 Subject: [PATCH 1449/1522] hqplayerd: install main configuration file While packaging I had missed this in the file listing, and ended up having to add a hack to the NixOS module to create an empty configuration file. Turns out that wasn't needed at all, as long as we distribute the real configuration file with the package, which this change does. --- pkgs/servers/hqplayerd/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 76f8bde3e4e..8315f17dec0 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -53,25 +53,29 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ./usr/bin/hqplayerd $out/bin + # main configuration + mkdir -p $out/etc/hqplayer + cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/ + # udev rules mkdir -p $out/etc/udev/rules.d - cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d + cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/ # kernel module cfgs mkdir -p $out/etc/modules-load.d - cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d + cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/ # systemd service file mkdir -p $out/lib/systemd/system - cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system + cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/ # documentation mkdir -p $out/share/doc/hqplayerd - cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd + cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/ # misc service support files mkdir -p $out/var/lib/hqplayer - cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer/web + cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer runHook postInstall ''; From ade8623d559efc68b0fe399d4b3211aa4d71a7ab Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Wed, 4 Aug 2021 11:27:02 -0700 Subject: [PATCH 1450/1522] hqplayerd: patch out NetworkManager unit requirement --- pkgs/servers/hqplayerd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 8315f17dec0..14fe83ea5cb 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -82,7 +82,8 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/systemd/system/hqplayerd.service \ - --replace /usr/bin/hqplayerd $out/bin/hqplayerd + --replace /usr/bin/hqplayerd $out/bin/hqplayerd \ + --replace "NetworkManager-wait-online.service" "" ''; postFixup = '' From 3ccb633f85a6d1e7931e47206a85773ed9a67383 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Wed, 4 Aug 2021 10:20:36 -0700 Subject: [PATCH 1451/1522] nixos/hqplayerd: use package-provided config file instead of blank --- nixos/modules/services/audio/hqplayerd.nix | 28 ++++++++-------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index b4d8468a237..7d221e5b6de 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -115,25 +115,17 @@ in unitConfig.ConditionPathExists = [ configDir stateDir ]; - preStart = - let - blankCfg = pkgs.writeText "hqplayerd.xml" '' - <?xml version="1.0" encoding="utf-8"?> - <xml> - </xml> - ''; - in - '' - cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" - chmod -R u+wX "${stateDir}/web" + preStart = '' + cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" + chmod -R u+wX "${stateDir}/web" - if [ ! -f "${configDir}/hqplayerd.xml" ]; then - echo "creating blank config file" - install -m 0644 "${blankCfg}" "${configDir}/hqplayerd.xml" - fi - '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' - ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} - ''; + if [ ! -f "${configDir}/hqplayerd.xml" ]; then + echo "creating initial config file" + install -m 0644 "${pkg}/etc/hqplayer/hqplayerd.xml" "${configDir}/hqplayerd.xml" + fi + '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' + ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} + ''; serviceConfig = { ExecStart = "${pkg}/bin/hqplayerd"; From e2426336691d27cc926f30e1b8f9114ebe4e911b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Wed, 4 Aug 2021 10:55:12 -0700 Subject: [PATCH 1452/1522] nixos/hqplayerd: remove configurable user/group The service is adamant that it must run under the right user, so let's just enforce it. --- nixos/modules/services/audio/hqplayerd.nix | 32 ++++++---------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 7d221e5b6de..be1d4849485 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -56,22 +56,6 @@ in Open TCP port 8088 in the firewall for the server. ''; }; - - user = mkOption { - type = types.str; - default = "hqplayer"; - description = '' - User account under which hqplayerd runs. - ''; - }; - - group = mkOption { - type = types.str; - default = "hqplayer"; - description = '' - Group account under which hqplayerd runs. - ''; - }; }; }; @@ -100,9 +84,9 @@ in systemd = { tmpfiles.rules = [ - "d ${configDir} 0755 ${cfg.user} ${cfg.group} - -" - "d ${stateDir} 0755 ${cfg.user} ${cfg.group} - -" - "d ${stateDir}/home 0755 ${cfg.user} ${cfg.group} - -" + "d ${configDir} 0755 hqplayer hqplayer - -" + "d ${stateDir} 0755 hqplayer hqplayer - -" + "d ${stateDir}/home 0755 hqplayer hqplayer - -" ]; services.hqplayerd = { @@ -130,8 +114,8 @@ in serviceConfig = { ExecStart = "${pkg}/bin/hqplayerd"; - User = cfg.user; - Group = cfg.group; + User = "hqplayer"; + Group = "hqplayer"; Restart = "on-failure"; RestartSec = 5; @@ -145,15 +129,15 @@ in }; }; - users.groups = mkIf (cfg.group == "hqplayer") { + users.groups = { hqplayer.gid = config.ids.gids.hqplayer; }; - users.users = mkIf (cfg.user == "hqplayer") { + users.users = { hqplayer = { description = "hqplayer daemon user"; extraGroups = [ "audio" ]; - group = cfg.group; + group = "hqplayer"; uid = config.ids.uids.hqplayer; }; }; From 1df5e3cdf383dbfa9868b00f4b157dc6253efa22 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Wed, 4 Aug 2021 10:56:11 -0700 Subject: [PATCH 1453/1522] nixos/hqplayerd: use upstream unit as much as possible --- nixos/modules/services/audio/hqplayerd.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index be1d4849485..6eeaffce1b1 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -89,11 +89,11 @@ in "d ${stateDir}/home 0755 hqplayer hqplayer - -" ]; + packages = [ pkg ]; + services.hqplayerd = { - description = "HQPlayer daemon"; wantedBy = [ "multi-user.target" ]; - requires = [ "network-online.target" "sound.target" "systemd-udev-settle.service" ]; - after = [ "network-online.target" "sound.target" "systemd-udev-settle.service" "local-fs.target" "remote-fs.target" "systemd-tmpfiles-setup.service" ]; + after = [ "systemd-tmpfiles-setup.service" ]; environment.HOME = "${stateDir}/home"; @@ -110,22 +110,6 @@ in '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} ''; - - serviceConfig = { - ExecStart = "${pkg}/bin/hqplayerd"; - - User = "hqplayer"; - Group = "hqplayer"; - - Restart = "on-failure"; - RestartSec = 5; - - Nice = -10; - IOSchedulingClass = "realtime"; - LimitMEMLOCK = "1G"; - LimitNICE = -10; - LimitRTPRIO = 98; - }; }; }; From 4a06e559e14cacc33a457753ea1530cb7907e3cf Mon Sep 17 00:00:00 2001 From: Tom Repetti <trepetti@cs.columbia.edu> Date: Tue, 3 Aug 2021 16:29:12 -0400 Subject: [PATCH 1454/1522] python3Packages.pyverilog: init at 1.3.0 --- .../python-modules/pyverilog/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pyverilog/default.nix diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix new file mode 100644 index 00000000000..8e41d26921f --- /dev/null +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jinja2 +, ply +, verilog +, pytest-pythonpath +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyverilog"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a74k8r21swmfwvgv4c014y6nbcyl229fspxw89ygsgb0j83xnar"; + }; + + disabled = pythonOlder "3.7"; + + patchPhase = '' + # The path to Icarus can still be overridden via an environment variable at runtime. + substituteInPlace pyverilog/vparser/preprocessor.py \ + --replace "iverilog = 'iverilog'" "iverilog = '${verilog}/bin/iverilog'" + ''; + + propagatedBuildInputs = [ + jinja2 + ply + verilog + ]; + + checkInputs = [ + pytest-pythonpath + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/PyHDI/Pyverilog"; + description = "Python-based Hardware Design Processing Toolkit for Verilog HDL"; + license = licenses.asl20; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2d85d8ca67..cc8c0fbb768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7307,6 +7307,8 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyverilog = callPackage ../development/python-modules/pyverilog { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; pyvex = callPackage ../development/python-modules/pyvex { }; From 15321909cddd7df084d13e796563329236f33abe Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 4 Aug 2021 21:47:07 +0200 Subject: [PATCH 1455/1522] tfsec: 0.55.0 -> 0.55.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 45ba1223e84..57fe4125658 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.55.0"; + version = "0.55.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1l71r9il45svdwydvi08hnyh310j0gha11qhyqvdz14d8czf8ahn"; + sha256 = "0s18hfy1gnnvhppvapj8n066pb0fc7w3sm0zm0mzjd58h11x0bbr"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From e3074263be547fdd0a6472794bb3a5b6a579745a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer <jonringer117@gmail.com> Date: Tue, 15 Jun 2021 11:53:38 -0700 Subject: [PATCH 1456/1522] zfs: add latestCompatibleLinuxPackages option --- pkgs/os-specific/linux/zfs/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7784aa8e03f..517e6036e78 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -14,6 +14,9 @@ # Kernel dependencies , kernel ? null , enablePython ? true + +# for determining the latest compatible linuxPackages +, linuxPackages_5_13 }: with lib; @@ -28,6 +31,7 @@ let , extraPatches ? [] , rev ? "zfs-${version}" , isUnstable ? false + , latestCompatibleLinuxPackages , kernelCompatible ? null }: stdenv.mkDerivation { @@ -161,7 +165,7 @@ let outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; passthru = { - inherit enableMail; + inherit enableMail latestCompatibleLinuxPackages; tests = if isUnstable then [ @@ -196,6 +200,7 @@ in { zfsStable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; + latestCompatibleLinuxPackages = linuxPackages_5_13; # this package should point to the latest release. version = "2.1.0"; @@ -206,6 +211,7 @@ in { zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; + latestCompatibleLinuxPackages = linuxPackages_5_13; # this package should point to a version / git revision compatible with the latest kernel release version = "2.1.0"; From f1de8c02e27d8b997f2b2652aa4e6cc4ff668c90 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer <jonringer117@gmail.com> Date: Mon, 5 Jul 2021 18:41:35 -0700 Subject: [PATCH 1457/1522] nixos/rl-notes: Add mention of zfs.latestCompatibleLinuxPackges --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 11 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index e3b94d00552..690cd0bd1bb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -799,6 +799,15 @@ this up. </para> </listitem> + <listitem> + <para> + Zfs: <literal>latestCompatibleLinuxPackages</literal> is now + exported on the zfs package. One can use + <literal>boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;</literal> + to always track the latest compatible kernel with a given + version of zfs. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index e34c3f4e0b9..898f2d64f15 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -204,3 +204,5 @@ pt-services.clipcat.enable). - The [networking.wireless.iwd](options.html#opt-networking.wireless.iwd.enable) module has a new [networking.wireless.iwd.settings](options.html#opt-networking.wireless.iwd.settings) option. - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. + +- Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. From 45c32f59a58b69ca6db8c8c5fdbe0ea9eee02376 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Wed, 4 Aug 2021 21:48:57 +0200 Subject: [PATCH 1458/1522] ungoogled-chromium: 91.0.4472.164 -> 92.0.4515.131 --- .../networking/browsers/chromium/common.nix | 4 +--- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ee506b3faad..a62999d2843 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -136,11 +136,9 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages perl nodejs + python2WithPackages python3WithPackages perl nodejs gnutar which llvmPackages.bintools - ] ++ lib.optionals (chromiumVersionAtLeast "92") [ - python3WithPackages ]; buildInputs = defaultDependencies ++ [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1066d322bad..d1188d04e9b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "91.0.4472.164", - "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", - "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", + "version": "92.0.4515.131", + "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", + "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", "deps": { "gn": { - "version": "2021-04-06", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", - "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" }, "ungoogled-patches": { - "rev": "91.0.4472.164-1", - "sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910" + "rev": "92.0.4515.131-1", + "sha256": "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd" } } } From 4a37ec77c74be481385999f30589e0f0feae9743 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 4 Aug 2021 21:58:46 +0200 Subject: [PATCH 1459/1522] python3Packages.pyvicare: 1.1 -> 2.4 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 4c06728a419..b9b983666a8 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "1.1"; + version = "2.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "1mkbz1gl8bv4j7q82cbc9d3dzx80brzdwrcp8z3kma1b91ig99bk"; + sha256 = "1lih5hdyc3y0ickvfxd0gdgqv19zmqsfrnlxfwg8aqr73hl3ca8z"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1ac7416afbd65ddc2dd76cfd1667acb37f52ea9a Mon Sep 17 00:00:00 2001 From: kolaente <k@knt.li> Date: Wed, 4 Aug 2021 22:10:19 +0200 Subject: [PATCH 1460/1522] cypress: 8.1.0 -> 8.2.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 0e1715a4c12..e58a7d9295a 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.1.0"; + version = "8.2.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "17cq88qrq3dshgfaycb77xbkzr9drw7fvw0xqijlxivvmnbvwi6i"; + sha256 = "0j5acj7ghqf2pywpf4vzzvmcn4ypc4gv0pjyjd8hgzrrl3kff4dm"; }; # don't remove runtime deps From b2e9932ed8f7c68d62ddb251553f12cdcd1fda4b Mon Sep 17 00:00:00 2001 From: Felix Buehler <account@buehler.rocks> Date: Sun, 1 Aug 2021 20:11:18 +0200 Subject: [PATCH 1461/1522] tools/networking: replace name with pname&version --- pkgs/tools/networking/noip/default.nix | 3 ++- pkgs/tools/networking/ntopng/default.nix | 7 ++++--- pkgs/tools/networking/nylon/default.nix | 7 ++++--- pkgs/tools/networking/pcapfix/default.nix | 5 +++-- pkgs/tools/networking/pdnsd/default.nix | 7 ++++--- pkgs/tools/networking/pdsh/default.nix | 5 +++-- pkgs/tools/networking/polygraph/default.nix | 5 +++-- pkgs/tools/networking/srelay/default.nix | 7 ++++--- pkgs/tools/networking/surfraw/default.nix | 7 ++++--- pkgs/tools/networking/swec/default.nix | 11 ++++++----- pkgs/tools/networking/trickle/default.nix | 5 +++-- pkgs/tools/networking/ucspi-tcp/default.nix | 5 +++-- pkgs/tools/networking/udptunnel/default.nix | 7 ++++--- pkgs/tools/networking/uwimap/default.nix | 9 +++++---- pkgs/tools/networking/vde2/default.nix | 5 +++-- pkgs/tools/networking/vlan/default.nix | 7 ++++--- pkgs/tools/networking/vpnc/default.nix | 3 ++- pkgs/tools/networking/vtun/default.nix | 5 +++-- pkgs/tools/networking/wakelan/default.nix | 5 +++-- pkgs/tools/networking/webalizer/default.nix | 7 ++++--- pkgs/tools/networking/x11-ssh-askpass/default.nix | 7 ++++--- pkgs/tools/networking/xnbd/default.nix | 7 ++++--- 22 files changed, 79 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 3425d1e3a82..4b57ef7731e 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation { - name = "noip-2.1.9-1"; + pname = "noip"; + version = "2.1.9-1"; src = fetchurl { url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz"; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 2ba373a2c61..46dd586c0fa 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -7,12 +7,13 @@ # directory, but we use luajit, zeromq, and rrdtool from nixpkgs stdenv.mkDerivation rec { - name = "ntopng-2.0"; + pname = "ntopng"; + version = "2.0"; src = fetchurl { urls = [ - "mirror://sourceforge/project/ntop/ntopng/old/${name}.tar.gz" - "mirror://sourceforge/project/ntop/ntopng/${name}.tar.gz" + "mirror://sourceforge/project/ntop/ntopng/old/ntopng-${version}.tar.gz" + "mirror://sourceforge/project/ntop/ntopng/ntopng-${version}.tar.gz" ]; sha256 = "0l82ivh05cmmqcvs26r6y69z849d28njipphqzvnakf43ggddgrw"; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 840b714fc9f..b519db4b55b 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -6,10 +6,11 @@ let paths = [ libevent.dev libevent.out ]; }; in -stdenv.mkDerivation { - name = "nylon-1.21"; +stdenv.mkDerivation rec { + pname = "nylon"; + version = "1.21"; src = fetchurl { - url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz"; + url = "https://monkey.org/~marius/nylon/nylon-${version}.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index ee5212b9750..bdce32f0813 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.4"; + pname = "pcapfix"; + version = "1.1.4"; src = fetchurl { - url = "https://f00l.de/pcapfix/${name}.tar.gz"; + url = "https://f00l.de/pcapfix/pcapfix-${version}.tar.gz"; sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; }; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index a08182394b1..d797833618c 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pdnsd-1.2.9a-par"; +stdenv.mkDerivation rec { + pname = "pdnsd"; + version = "1.2.9a-par"; src = fetchurl { - url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz"; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-${version}.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 87601b0ddf3..d7ac9ad54e6 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { - name = "pdsh-2.34"; + pname = "pdsh"; + version = "2.34"; src = fetchurl { - url = "https://github.com/chaos/pdsh/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/chaos/pdsh/releases/download/pdsh-${version}/pdsh-${version}.tar.gz"; sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl"; }; diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index 74347ff8395..f4742e660d8 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "polygraph-4.13.0"; + pname = "polygraph"; + version = "4.13.0"; src = fetchurl { - url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz"; + url = "http://www.web-polygraph.org/downloads/srcs/polygraph-${version}-src.tgz"; sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a"; }; diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 9ff25d6a17c..da09395fc7a 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "srelay-0.4.8"; +stdenv.mkDerivation rec { + pname = "srelay"; + version = "0.4.8"; src = fetchurl { - url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8.tar.gz"; + url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-${version}/srelay-${version}.tar.gz"; sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl"; }; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 70bb5453518..44e8877eb5d 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "surfraw-2.3.0"; +stdenv.mkDerivation rec { + pname = "surfraw"; + version = "2.3.0"; src = fetchurl { - url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-2.3.0.tar.gz"; + url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-${version}.tar.gz"; sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"; }; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index c98a3417d1c..6751b1cf5eb 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "swec-0.4"; + pname = "swec"; + version = "0.4"; src = fetchurl { - url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/swec-${version}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; @@ -24,9 +25,9 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + mkdir -p "$out/share/swec-${version}" + cp -v default.sdf "$out/share/swec-${version}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/swec-${version}/swec'|g" wrapProgram "$out/bin/swec" \ --prefix PERL5LIB : ${with perlPackages; makePerlPath [ LWP URI HTMLParser ]} diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 8a5143d1e3b..f07bf5bdca3 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libevent, libtirpc }: stdenv.mkDerivation rec { - name = "trickle-1.07"; + pname = "trickle"; + version = "1.07"; src = fetchurl { - url = "https://monkey.org/~marius/trickle/${name}.tar.gz"; + url = "https://monkey.org/~marius/trickle/trickle-${version}.tar.gz"; sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 0d6e0a2f8d9..4b307079266 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ucspi-tcp-0.88"; + pname = "ucspi-tcp"; + version = "0.88"; src = fetchurl { - url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/ucspi-tcp-${version}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 6063cb38b56..362f6fbbc2c 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "udptunnel-19"; +stdenv.mkDerivation rec { + pname = "udptunnel"; + version = "19"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r${version}.tar.gz"; sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index e675268163a..78480bbc3df 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pam, openssl }: -stdenv.mkDerivation ({ - name = "uw-imap-2007f"; +stdenv.mkDerivation rec { + pname = "uw-imap"; + version = "2007f"; src = fetchurl { - url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz"; + url = "ftp://ftp.cac.washington.edu/imap/imap-${version}.tar.gz"; sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; @@ -59,4 +60,4 @@ stdenv.mkDerivation ({ echo "Cross-compilation, injecting make flags" makeFlagsArray+=("ARRC=${stdenv.hostPlatform.config}-ar rc") ''; -}) +} diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 58fae3f9f15..694a2bc0205 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: stdenv.mkDerivation rec { - name = "vde2-2.3.2"; + pname = "vde2"; + version = "2.3.2"; src = fetchurl { - url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz"; + url = "mirror://sourceforge/vde/vde2/${version}/vde2-${version}.tar.gz"; sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 2d329cb29b0..8ddbb834634 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "vlan-1.9"; +stdenv.mkDerivation rec { + pname = "vlan"; + version = "1.9"; src = fetchurl { - url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz"; + url = "mirror://gentoo/distfiles/vlan.${version}.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index edb50559fc0..6928bacd6ce 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation { - name = "vpnc-0.5.3-post-r550"; + pname = "vpnc"; + version = "0.5.3-post-r550"; src = fetchsvn { url = "https://svn.unix-ag.uni-kl.de/vpnc"; rev = "550"; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 4d79fdc9bc5..61c18af1656 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }: stdenv.mkDerivation rec { - name = "vtun-3.0.4"; + pname = "vtun"; + version = "3.0.4"; src = fetchurl { - url = "mirror://sourceforge/vtun/${name}.tar.gz"; + url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz"; sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; }; diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 96e01141c18..5365e696fad 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wakelan-1.1"; + pname = "wakelan"; + version = "1.1"; src = fetchurl { - url = "mirror://metalab/system/network/misc/${name}.tar.gz"; + url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz"; sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"; }; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 332d1cf2867..200202f9ae2 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, libpng, gd, geoip, db }: -stdenv.mkDerivation { - name = "webalizer-2.23-05"; +stdenv.mkDerivation rec { + pname = "webalizer"; + version = "2.23-05"; src = fetchurl { - url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2"; + url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-${version}-src.tar.bz2"; sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index d33dd3df12e..87bd5c77c33 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: -stdenv.mkDerivation { - name = "x11-ssh-askpass-1.2.4.1"; +stdenv.mkDerivation rec { + pname = "x11-ssh-askpass"; + version = "1.2.4.1"; outputs = [ "out" "man" ]; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-${version}.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-${version}.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 0488fb9fa18..348d557da76 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { - name = "xnbd-0.4.0"; + pname = "xnbd"; + version = "0.4.0"; src = fetchurl { - url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz"; + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/xnbd-${version}.tgz"; sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913"; }; - sourceRoot = "${name}/trunk"; + sourceRoot = "xnbd-${version}/trunk"; patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; From 080ecc6419525e23c2b0057663e2090a91ebefd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 4 Aug 2021 22:52:57 +0200 Subject: [PATCH 1462/1522] python3Packages.pypykatz: 0.5.0 -> 0.5.2 --- pkgs/development/python-modules/pypykatz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index f4eafdcb4fc..2e2bd7def65 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.5.0"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1p8v4Qi0MNqMUpcErWnxveYu4d4N5BUBCDBsw1xX96I="; + sha256 = "1lyvypi1g4l9fq1f9q05bdn6vq8y5y9ghmb6ziqdycr0lxn7lfdd"; }; propagatedBuildInputs = [ From df6d1ee32ac2e0eaf6d0b0d712e9d95e9e95e78f Mon Sep 17 00:00:00 2001 From: Tom <twitchyliquid64@ciphersink.net> Date: Wed, 4 Aug 2021 13:27:15 -0700 Subject: [PATCH 1463/1522] maker-panel: init at 0.12.4 --- pkgs/tools/misc/maker-panel/default.nix | 37 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/maker-panel/default.nix diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/tools/misc/maker-panel/default.nix new file mode 100644 index 00000000000..96c4d6ad61c --- /dev/null +++ b/pkgs/tools/misc/maker-panel/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, go-md2man +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "maker-panel"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "twitchyliquid64"; + repo = "maker-panel"; + rev = version; + sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; + }; + + cargoSha256 = "1ar62dn0khlbm47chakrsrxd1y76gpq0sql4g9j7dqqrvkavgd7w"; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postBuild = '' + go-md2man --in docs/spec-reference.md --out maker-panel.5 + ''; + + postInstall = '' + installManPage maker-panel.5 + ''; + + meta = with lib; { + description = "Make mechanical PCBs by combining shapes together."; + homepage = "https://github.com/twitchyliquid64/maker-panel"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ twitchyliquid64 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e95dbade22..c13509a2a35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19819,6 +19819,8 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + maker-panel = callPackage ../tools/misc/maker-panel { }; + mastodon = callPackage ../servers/mastodon { }; materialize = callPackage ../servers/sql/materialize { From 4393d15463f76d437ce64e914e4e403898538c76 Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Tue, 20 Jul 2021 03:57:43 +0300 Subject: [PATCH 1464/1522] gollum: add additional dependencies --- pkgs/applications/misc/gollum/Gemfile | 6 ++ pkgs/applications/misc/gollum/Gemfile.lock | 22 +++++- pkgs/applications/misc/gollum/default.nix | 4 +- pkgs/applications/misc/gollum/gemset.nix | 92 ++++++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile index 525f54838b7..a15179970b3 100644 --- a/pkgs/applications/misc/gollum/Gemfile +++ b/pkgs/applications/misc/gollum/Gemfile @@ -1,2 +1,8 @@ source 'https://rubygems.org' gem 'gollum' + +gem 'asciidoctor' +gem 'creole' +gem 'wikicloth' +gem 'org-ruby' +gem 'RedCloth' diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 73bc5d068d7..4d0d9adf772 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,9 +1,14 @@ GEM remote: https://rubygems.org/ specs: + RedCloth (4.3.2) + asciidoctor (2.0.15) + builder (3.2.4) concurrent-ruby (1.1.8) crass (1.0.6) + creole (0.5.0) execjs (2.7.0) + expression_parser (0.9.0) ffi (1.14.2) gemojione (4.3.3) json @@ -36,6 +41,7 @@ GEM gollum-rugged_adapter (1.0) mime-types (>= 1.15) rugged (~> 0.99) + htmlentities (4.3.4) json (2.5.1) kramdown (2.3.0) rexml @@ -59,6 +65,8 @@ GEM racc (~> 1.4) octicons (12.1.0) nokogiri (>= 1.6.3.1) + org-ruby (0.9.12) + rubypants (~> 0.2) racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) @@ -71,6 +79,7 @@ GEM rss (0.2.9) rexml ruby2_keywords (0.0.4) + rubypants (0.7.1) rugged (0.99.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -105,12 +114,23 @@ GEM unf_ext unf_ext (0.0.7.7) useragent (0.16.10) + wikicloth (0.8.3) + builder + expression_parser + htmlentities + nokogiri + twitter-text PLATFORMS ruby DEPENDENCIES + RedCloth + asciidoctor + creole gollum + org-ruby + wikicloth BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 4a365b5a17e..59bb05f85ce 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript -, git }: +, git, docutils, perl }: stdenv.mkDerivation rec { pname = "gollum"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ - --prefix PATH ":" ${lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git docutils perl]} makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ --prefix PATH ":" ${lib.makeBinPath [ git ]} ''; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 690eba645dc..8b0822d9a53 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,4 +1,24 @@ { + asciidoctor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; + type = "gem"; + }; + version = "2.0.15"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -19,6 +39,16 @@ }; version = "1.0.6"; }; + creole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; + type = "gem"; + }; + version = "0.5.0"; + }; execjs = { groups = ["default"]; platforms = []; @@ -29,6 +59,16 @@ }; version = "2.7.0"; }; + expression_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; + type = "gem"; + }; + version = "0.9.0"; + }; ffi = { groups = ["default"]; platforms = []; @@ -93,6 +133,16 @@ }; version = "1.0"; }; + htmlentities = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; json = { groups = ["default"]; platforms = []; @@ -231,6 +281,17 @@ }; version = "12.1.0"; }; + org-ruby = { + dependencies = ["rubypants"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; + type = "gem"; + }; + version = "0.9.12"; + }; racc = { groups = ["default"]; platforms = []; @@ -283,6 +344,16 @@ }; version = "0.10.1"; }; + RedCloth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; + type = "gem"; + }; + version = "4.3.2"; + }; rexml = { groups = ["default"]; platforms = []; @@ -324,6 +395,16 @@ }; version = "0.0.4"; }; + rubypants = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kv2way45d2dz3h5b7wxyw36clvlwrz7ydf6699d0za5vm56gsrh"; + type = "gem"; + }; + version = "0.7.1"; + }; rugged = { groups = ["default"]; platforms = []; @@ -484,4 +565,15 @@ }; version = "0.16.10"; }; + wikicloth = { + dependencies = ["builder" "expression_parser" "htmlentities" "nokogiri" "twitter-text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c78r1rg93mb5rcrfxl01b162ma9sh46dhjksc4c9dngg62nhbjh"; + type = "gem"; + }; + version = "0.8.3"; + }; } From 5e825f82889f9db243b17e482a91da283ec25159 Mon Sep 17 00:00:00 2001 From: lunik1 <ch.gpg@themaw.xyz> Date: Wed, 4 Aug 2021 23:08:11 +0100 Subject: [PATCH 1465/1522] nodePackages.beancount-langserver: init at 1.0.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1605 ++++++++++------- 2 files changed, 981 insertions(+), 625 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0737706d404..fb704357ff0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,6 +17,7 @@ , "aws-azure-login" , "balanceofsatoshis" , "bash-language-server" +, "beancount-langserver" , "bower" , "bower2nix" , "browserify" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2d2202569df..7f97e32d4a9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -220,13 +220,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.1" = { + "@apollo/client-3.4.4" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.1.tgz"; - sha512 = "CT7ZBSHQD4UG1PDvMS9qOz5ACRIR0b4mBkqjCXEVjteOxA4wpFqUX3dg2bNl+Ok3LwPxFT4b3FwC3+LVcWFa6w=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.4.tgz"; + sha512 = "XuFudJUA/YDBeEbxxkUK80FEhpABaphvOuKu8VPwgvu9681Rrqju9e6tGpsoCBIBtcBjFMrFkEafAai7H+dVNw=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -355,6 +355,15 @@ let sha512 = "p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw=="; }; }; + "@babel/compat-data-7.15.0" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; + }; + }; "@babel/core-7.10.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -418,6 +427,15 @@ let sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; + "@babel/helper-compilation-targets-7.15.0" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz"; + sha512 = "h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A=="; + }; + }; "@babel/helper-create-class-features-plugin-7.14.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; @@ -643,6 +661,15 @@ let sha512 = "RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ=="; }; }; + "@babel/parser-7.15.0" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz"; + sha512 = "0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ=="; + }; + }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; @@ -1534,6 +1561,15 @@ let sha512 = "u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow=="; }; }; + "@babel/types-7.15.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz"; + sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="; + }; + }; "@braintree/sanitize-url-3.1.0" = { name = "_at_braintree_slash_sanitize-url"; packageName = "@braintree/sanitize-url"; @@ -1642,13 +1678,13 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; - "@corestore/networker-1.1.0" = { + "@corestore/networker-1.2.0" = { name = "_at_corestore_slash_networker"; packageName = "@corestore/networker"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.1.0.tgz"; - sha512 = "Pj5Cfyfck1OJfVd4diO4UVo8qabW9O/wgDz5HeY6Okuan98KjMxrAJZG8MPk7I+mjRoYDFgFPVgssx9zv420Ag=="; + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.0.tgz"; + sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; }; }; "@cronvel/get-pixels-3.4.0" = { @@ -2254,13 +2290,13 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/date-time-utilities-8.2.1" = { + "@fluentui/date-time-utilities-8.2.2" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.1.tgz"; - sha512 = "0AYXaXFQ3bPsOtiOi3bJSihzf+w3L44iQK38EiQgp3uAXei/i36VtDCToHZehYV+eS4s1qb/QGksoL0F4G6WCQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz"; + sha512 = "djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ=="; }; }; "@fluentui/dom-utilities-1.1.2" = { @@ -2272,31 +2308,31 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/dom-utilities-2.1.3" = { + "@fluentui/dom-utilities-2.1.4" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.3.tgz"; - sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz"; + sha512 = "+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg=="; }; }; - "@fluentui/font-icons-mdl2-8.1.7" = { + "@fluentui/font-icons-mdl2-8.1.8" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.7"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.7.tgz"; - sha512 = "piTdL/rKTx3cNBaMBc+u7YtluLfKYt9NY7Z341h3gZyYfgzeO8djU4RD7KpSozocPPGjooMjCjfPWDVh3DZqkw=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.8.tgz"; + sha512 = "kZkCHM/mP8WWLLExz3x3wK5yQHPP4tAcvlHVqe69TbG8+3fxRGJSMOxzZO/04CFQp2A7/wOskSRtqeIBtaXJfw=="; }; }; - "@fluentui/foundation-legacy-8.1.7" = { + "@fluentui/foundation-legacy-8.1.8" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.7"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.7.tgz"; - sha512 = "hzzgbtMFp0gPi5qG9+Wa2ImYrfEuld3880g3xsxfrjRgVQ5zcRIkNFNc5//YfiLRqi0y9wNUuDrEI08ZMvxSBA=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.8.tgz"; + sha512 = "m0zbRbZaJbzBjv8Ziv3zpwoGFjuzzPIAmhsn58g66MZvQBd9vN92hFJBNG2bO2+ivlprns4WnLEAiPK8CjoAsA=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2308,22 +2344,22 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/keyboard-key-0.3.3" = { + "@fluentui/keyboard-key-0.3.4" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.3.tgz"; - sha512 = "3qX1WNCgJlKq7uGH76rLC4cdESgwdLhMH9WjcQUkQNJKtBpL4vs5O99M1keEhd3pfooW7zasr6AcYcWq4BRB4g=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz"; + sha512 = "pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w=="; }; }; - "@fluentui/merge-styles-8.1.3" = { + "@fluentui/merge-styles-8.1.4" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.3.tgz"; - sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.4.tgz"; + sha512 = "zCAEjZyALk0CGW1H9YNJU+e/MW0P5sFJfrDvac27K4S/dIQvKnOwMUNOWRkNz3yUEt0R9vo0NtiO3cW04cZq3A=="; }; }; "@fluentui/react-7.174.0" = { @@ -2353,22 +2389,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.9" = { + "@fluentui/react-focus-8.1.10" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.9"; + version = "8.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.9.tgz"; - sha512 = "vYnenLKUj2Uxj5sjuv6AJJ1kYCqq/stM4ZMCQmJWq2qiMm2TpqW3vMpRspuxwD9BqOVbIFNoj9pEWpxAaTCEqw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.10.tgz"; + sha512 = "sojXA6epu2QJbFf+XqP1AHOrrWssoQJWJNuzp0MCzQOWCUlLLqRpRUHtUKZzCnrbD9G5MOW8/192m/rSPyM7eA=="; }; }; - "@fluentui/react-hooks-8.2.5" = { + "@fluentui/react-hooks-8.2.6" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.5"; + version = "8.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.5.tgz"; - sha512 = "8x0sK59kM2naaps88vG++uY5DmYOJX7okGRSHtda8vtgE/03edpGkIgwBGloYJnk3b/EJvcLBjyVlkd1LcbvbQ=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.6.tgz"; + sha512 = "nz0iycSUmGX6eBKsmW23ocmKn/HdV7c8HnMHx5fcGIQbOqOH8Hv4wq8t3RozsZBapIi/nDjpZs2UvB4zDFsg1g=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2380,31 +2416,31 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/react-window-provider-2.1.3" = { + "@fluentui/react-window-provider-2.1.4" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.3.tgz"; - sha512 = "3NWL3Kkqp3elD/aTrUaEufRUrN7K7hYsXEsOY2bDCDjPadLGtZlTGWNYFbUYNsaL/v79gZHhH+voCECP85HqRg=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz"; + sha512 = "RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg=="; }; }; - "@fluentui/set-version-8.1.3" = { + "@fluentui/set-version-8.1.4" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.3.tgz"; - sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.4.tgz"; + sha512 = "2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA=="; }; }; - "@fluentui/style-utilities-8.2.1" = { + "@fluentui/style-utilities-8.2.2" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.1.tgz"; - sha512 = "+ZSl7Hz/C9DX1dYTZBnmP/57fHPK2qrLr0oTLJTq4uLjmG5Hxyo6gZ9/YCrEnW0h1d3tZlNa4LH5X8rux+D8kg=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.2.tgz"; + sha512 = "PKixlYfY93XOZRPNi+I8Qw9SkcBZsnG/qg2+3IxLGXpCVYKOmP52oR7N5j/nmspQZXdEoHehYa2z/lsKC2xw1w=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2416,22 +2452,22 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.2.0" = { + "@fluentui/theme-2.2.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.0.tgz"; - sha512 = "LKM2ML05WU22It39iw523wGrpLG5qcvmQkSV7HV5NERSeZkI79TYntmXecaKaKWZjdUFTsZDijuhCOkWypNG5Q=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.1.tgz"; + sha512 = "1G92TftVulrGXklL5upaN/WrrSzY/va39RM1eo0XO/Q3+kAhAajclQAXb7XanqOsVFcAqK1DbVvWayrY9DG2Qg=="; }; }; - "@fluentui/utilities-8.2.1" = { + "@fluentui/utilities-8.2.2" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.1.tgz"; - sha512 = "ezRkBUDhHQjrqAWA6H1TwWU3STauW/EjthDAe/upJbmXeP3ynn7tTpx1gpNi/vHjJlRkO1JjNoiSc6P4MZWkYw=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.2.tgz"; + sha512 = "aM2/CgoTIssMDs7MoTla+q/VXN5Gkk4s12S8GZNp87cmEzDy008tKkiRpHj6PXZuvJL5bctZco9YQgusO0jZEg=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2560,22 +2596,22 @@ let sha512 = "JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA=="; }; }; - "@graphql-tools/merge-6.2.16" = { + "@graphql-tools/merge-6.2.17" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.16"; + version = "6.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.16.tgz"; - sha512 = "KjZ1pppzKcr2Uspgb53p8uw5yhWVuGIL+sEroar7vLsClSsuiGib8OKVICAGWjC9wrCxGaL9SjJGavfXpJMQIg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz"; + sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/mock-8.1.6" = { + "@graphql-tools/mock-8.1.7" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.1.6"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.6.tgz"; - sha512 = "ciEFfzAz+Ny/wMq+VRlBAzCVtLcIJiRYbnO7nWE+qFtiUUjmAh9Ahz6UVB1+5Fy6uqaGU6zCMgoDNVFQFtzhJg=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.7.tgz"; + sha512 = "6fMxYQGSJrR4XrhncFdmOicXjUhbrVnil4dy15ky9amcwOiAdSIyn+OZHWi99hJjfdyQSamALjUKRFZjRmOXrA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2587,13 +2623,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.0.1" = { + "@graphql-tools/schema-8.0.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.1.tgz"; - sha512 = "QG2HGLJjmsNc1wcj+rwZTEArgfMp7rsrb8iVq4P8ce1mDYAt6kRV6bLyPVb9q/j8Ik2zBc/B/Y1jPsnAVUHwdA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.2.tgz"; + sha512 = "LRO9R4Yi7uBVthdxoBgBTZxRCainfKeTlaBUy8MD/W+u8uUKUmdknrnqeWD4tvNwQjDFcEssm1cKwhvge7OqMA=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -2623,13 +2659,13 @@ let sha512 = "d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w=="; }; }; - "@graphql-tools/utils-8.0.1" = { + "@graphql-tools/utils-8.0.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.1.tgz"; - sha512 = "gjQk6sht4b0/hcG+QEVxfMyO8bn5tuU1nIOVhQ4whgFaUmrnb3hx2mwzz1EJzfIOAuHKE8tY0lu6jt3bGTD4yg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz"; + sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3055,13 +3091,13 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jcubic/lily-0.1.0" = { + "@jcubic/lily-0.2.0" = { name = "_at_jcubic_slash_lily"; packageName = "@jcubic/lily"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.1.0.tgz"; - sha512 = "kIsp4dmIUHn3YHIqFhEylY+mgI988KcYI8f19og7LqmLzkouPZNBip/oL8iemElie0gqx5CeQ5HxZv/SuNkOaA=="; + url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.2.0.tgz"; + sha512 = "KV+CBO6epprxj0AHBDOUI5vfcJZPfhuK5Bdf+AqoJFIVBapSJjuHlZsMGLGLTHCQW48oYvwv8wCC/olzRC/Ndw=="; }; }; "@jest/transform-25.5.1" = { @@ -3928,13 +3964,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.4.1" = { + "@netlify/build-17.9.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.4.1"; + version = "17.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.4.1.tgz"; - sha512 = "g3DdM6AGpqLmJOUKhemkwySybsKS1lvjchRz1PXWZOUFa5npXDuQ4YL9E2fiQrbKB3vc4FhMKonR+iL9CUcphw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.0.tgz"; + sha512 = "RaDv21H391dkVciAMATG2PkSpcG0qcnAVlwsBSx7Yb1rHrUhynxkY9jTWmn1P4ufWfPoykIDPRG7n/BRVA/Iqg=="; }; }; "@netlify/cache-utils-2.0.0" = { @@ -3946,13 +3982,13 @@ let sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; }; }; - "@netlify/config-14.1.0" = { + "@netlify/config-14.4.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "14.1.0"; + version = "14.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-14.1.0.tgz"; - sha512 = "XgBIaKA+itg5uOAYOTt3uZmfyIFtC4t0vKPgf/CoEzWQ323g83fpwxbdqtGkqhw0bYgt0iWPKsoibnLdyoG1vQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.1.tgz"; + sha512 = "30H92pQajmBo6dU+LOXDpa0dC7EKVDmncED6itzMME46bn6hySKswrY524fP6ArAF/g+LJD6Uhf4AlWNDnz3Fw=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -3964,13 +4000,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.7.2" = { + "@netlify/framework-info-5.8.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.7.2"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.2.tgz"; - sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.8.0.tgz"; + sha512 = "gc8K0BT6CSHnYFirLmUWLoKah+AjStWBsGmwa7gbRmeAaRThJhkRcRVE03EhSnrMQkAMO3IIIMklbE8i/9UpEg=="; }; }; "@netlify/functions-utils-2.0.2" = { @@ -4126,13 +4162,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-2.21.0" = { + "@netlify/plugins-list-3.2.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.21.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.21.0.tgz"; - sha512 = "uo1yeph8fJdldX+7qPIcflw7bEIXdU5repRVcxTfTgGgRrMJ75JDTVoXwujKYNlGNZN9hKj94uDSZ0B5FQq8Tw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.2.1.tgz"; + sha512 = "bmJGfMfXs3byjVUUOoNU78TMiIGx3yD0yl/2B5IKyXpkQw4a4UNgvIx53zmBCDwIub2HC2tTCFUZz9ESpfc3SQ=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -4153,13 +4189,13 @@ let sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; }; }; - "@netlify/zip-it-and-ship-it-4.15.1" = { + "@netlify/zip-it-and-ship-it-4.16.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.15.1"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.15.1.tgz"; - sha512 = "YgPzJEGY60zZxSSbaDe3mMO+jYB7pbsWyAVvv4tASod8Sys2x/MuOGJ64KmOTZ+bUqZYvJLOcfVL6fiFRSU9wg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.16.0.tgz"; + sha512 = "DkQemRkLTpAMvwwENRCQ9h5qJDaLrjEa+PpfEh0I64om4hTXVHcTd5+YMHW0wPr4OWABA7JAWlsFOVsZADFxfQ=="; }; }; "@node-red/editor-api-2.0.5" = { @@ -4513,13 +4549,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.2.0" = { + "@octokit/openapi-types-9.4.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.2.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.2.0.tgz"; - sha512 = "c4A1Xm0At+ypvBfEETREu519wLncJYQXvY+dBGg/V5YA51eg5EwdDsPPfcOMG0cuXscqRvsIgIySTmTJUdcTNA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.4.0.tgz"; + sha512 = "rKRkXikOJgDNImPl49IJuECLVXjj+t4qOXHhl8SBjMQCGGp1w4m5Ud/0kfdUx+zCpTvBN8vaOUDF4nnboZoOtQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4531,13 +4567,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.14.0" = { + "@octokit/plugin-paginate-rest-2.15.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.14.0.tgz"; - sha512 = "S2uEu2uHeI7Vf+Lvj8tv3O5/5TCAa8GHS0dUQN7gdM7vKA6ZHAbR6HkAVm5yMb1mbedLEbxOuQ+Fa0SQ7tCDLA=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; + sha512 = "/vjcb0w6ggVRtsb8OJBcRR9oEm+fpdo8RJk45khaWw/W0c8rlB2TLCLyZt/knmC17NkX7T9XdyQeEY7OHLSV1g=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4549,13 +4585,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.5.2" = { + "@octokit/plugin-rest-endpoint-methods-5.7.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.5.2"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.2.tgz"; - sha512 = "1ArooY7AYQdUd2zyqWLFHQ6gver9PvZSiuM+EPAsDplv1Y6u8zHl6yZ7yGIgaf7xvWupwUkJS2WttGYyb1P0DQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz"; + sha512 = "G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw=="; }; }; "@octokit/request-5.6.0" = { @@ -4576,22 +4612,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.7.2" = { + "@octokit/rest-18.9.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.7.2"; + version = "18.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.2.tgz"; - sha512 = "TAedgLqNRS+rdGqS9v00sqBeS6IgyLSoqqCDu6pmoadAB7xSjFHShxzaXUAbxxJjyHtb7mencRGzgH4W/V6Myg=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.0.tgz"; + sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA=="; }; }; - "@octokit/types-6.22.0" = { + "@octokit/types-6.24.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.22.0"; + version = "6.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.22.0.tgz"; - sha512 = "Y8GR0BJHQDpO09qw/ZQpN+DXrFzCWaE0pvK4frDm3zJ+h99AktsFfBoDazbCtHxiL8d0jD8xRH4BeynlKLeChg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.24.0.tgz"; + sha512 = "MfEimJeQ8AV1T2nI5kOfHqsqPHaAnG0Dw3MVoHSEsEq6iLKx2N91o+k2uAgXhPYeSE76LVBqjgTShnFFgNwe0A=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5629,13 +5665,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.9.3" = { + "@snyk/cloud-config-parser-1.10.1" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.9.3"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz"; - sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.1.tgz"; + sha512 = "boqO3H4zkGo+Q2C7qyG2l/sQX80ZRSOlPCiRtgN9Xa7u9fM+qFGOaFOgNWfZZtU0wLBy2yDs5ipzdfqvp0ZEjg=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5647,13 +5683,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.9.0" = { + "@snyk/code-client-4.0.0" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.9.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.9.0.tgz"; - sha512 = "sscrpiODOlQI87B4OFIClnoZmHEHzJ7vULYhikS/R/2KavG4vGPw7Qe2to5rximxR3VFdWQ0wNVFB0RkU2mjPQ=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.0.0.tgz"; + sha512 = "x6ZsL6jBz6rDSg1cFVnaqg4fVvQEerRaATem7aeq7l+HiPb8VnorJbq/61MlTgO7gWnA1WijzmzfJK5kAUpO1A=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -6043,6 +6079,15 @@ let sha512 = "xAJ4U/fOL7FoX4bYeYRCsSIeTxFqzKd944AsVxAYrz2ZfKH0TtBSNDDtN22uBEXOrSCCR12Z7QuMcp+URyYWlw=="; }; }; + "@textlint/markdown-to-ast-6.1.7" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "6.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz"; + sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; + }; + }; "@textlint/module-interop-12.0.2" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; @@ -6466,13 +6511,13 @@ let sha512 = "DIOOg+POSrYl+OlNRHQuIEqCd8DCtynG57H862UCce16nXJX7J8eWxNGgOcf8Eyge8zXeSs27mz1UcFu8L/L7g=="; }; }; - "@types/engine.io-3.1.6" = { + "@types/engine.io-3.1.7" = { name = "_at_types_slash_engine.io"; packageName = "@types/engine.io"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.6.tgz"; - sha512 = "uFIEJESFKNNiuKt93ri5PnvRntAHCm/Aw9tTO2L25xXJSLzC/ARGmpDSJkuTCit7sUW5xUxr91Ta+UOiYaO3+A=="; + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; + sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; }; }; "@types/eslint-7.28.0" = { @@ -6799,13 +6844,13 @@ let sha512 = "MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw=="; }; }; - "@types/json-schema-7.0.8" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; "@types/keygrip-1.0.2" = { @@ -6853,13 +6898,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.171" = { + "@types/lodash-4.14.172" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.171"; + version = "4.14.172"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz"; - sha512 = "7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz"; + sha512 = "/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="; }; }; "@types/lodash.chunk-4.2.6" = { @@ -6880,6 +6925,15 @@ let sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ=="; }; }; + "@types/lodash.pick-4.4.6" = { + name = "_at_types_slash_lodash.pick"; + packageName = "@types/lodash.pick"; + version = "4.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.6.tgz"; + sha512 = "u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g=="; + }; + }; "@types/lodash.union-4.6.6" = { name = "_at_types_slash_lodash.union"; packageName = "@types/lodash.union"; @@ -7051,13 +7105,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.7" = { + "@types/node-14.17.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.7"; + version = "14.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.7.tgz"; - sha512 = "SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz"; + sha512 = "CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g=="; }; }; "@types/node-15.12.5" = { @@ -7069,13 +7123,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.5" = { + "@types/node-15.14.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.5"; + version = "15.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.5.tgz"; - sha512 = "6ewfMNmkumZieB/EeJ4cdP1bbJyOlOt5MTwbKMr7WKxyCt2j09H8YWRK6zOd/Jh35Vu/gls39ZUmeu4vHu1WKQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.7.tgz"; + sha512 = "FA45p37/mLhpebgbPWWCKfOisTjxGK9lwcHlJ6XVLfu3NgfcazOJHdYUZCWPMK8QX4LhNZdmfo6iMz9FqpUbaw=="; }; }; "@types/node-15.6.1" = { @@ -7105,13 +7159,13 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.10" = { + "@types/node-16.4.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.10"; + version = "16.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.10.tgz"; - sha512 = "TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz"; + sha512 = "zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA=="; }; }; "@types/node-6.14.13" = { @@ -7645,13 +7699,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.5" = { + "@typescript-eslint/eslint-plugin-4.29.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz"; - sha512 = "m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz"; + sha512 = "eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7663,13 +7717,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.5" = { + "@typescript-eslint/experimental-utils-4.29.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz"; - sha512 = "bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz"; + sha512 = "FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7681,22 +7735,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.5" = { + "@typescript-eslint/parser-4.29.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz"; - sha512 = "NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz"; + sha512 = "+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA=="; }; }; - "@typescript-eslint/scope-manager-4.28.5" = { + "@typescript-eslint/scope-manager-4.29.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz"; - sha512 = "PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz"; + sha512 = "HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7708,13 +7762,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.5" = { + "@typescript-eslint/types-4.29.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz"; - sha512 = "MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz"; + sha512 = "2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7726,13 +7780,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.5" = { + "@typescript-eslint/typescript-estree-4.29.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz"; - sha512 = "FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz"; + sha512 = "8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7744,13 +7798,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.5" = { + "@typescript-eslint/visitor-keys-4.29.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.5"; + version = "4.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz"; - sha512 = "dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz"; + sha512 = "LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8851,6 +8905,15 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; + "acorn-import-assertions-1.7.6" = { + name = "acorn-import-assertions"; + packageName = "acorn-import-assertions"; + version = "1.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha512 = "FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA=="; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -9328,6 +9391,15 @@ let sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA=="; }; }; + "anchor-markdown-header-0.5.7" = { + name = "anchor-markdown-header"; + packageName = "anchor-markdown-header"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; + sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; + }; + }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -9841,13 +9913,13 @@ let sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; - "apollo-server-core-3.1.1" = { + "apollo-server-core-3.1.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.1.tgz"; - sha512 = "MLN6AD8pumdf3c4qYDqXeLkgtJONfvtx0okhvhrbN1DC1YX9W2d1mcTGQa88jTBtgDAXZQS1N5DncS9ctUekDw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.2.tgz"; + sha512 = "bFmzPDGBT97vMzdhhjlycL9Ey4YDa0eCVaHjI5TcYQM8Vphzvndd033DvvQFVRPWoZr8uwupeUyVa82Ne/iM6A=="; }; }; "apollo-server-env-3.1.0" = { @@ -9895,13 +9967,13 @@ let sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; - "apollo-server-express-3.1.1" = { + "apollo-server-express-3.1.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.1.tgz"; - sha512 = "W6VDth39mv1SCaJjnTwc0OmXIWzpELAJ3+/Id4cw+99HXdeRMJXDN5lbMENYEu+1a+pUK8iOoctwlJbikwBPGA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.2.tgz"; + sha512 = "GeeQlFjFqugiGfLApBNmgLtyDXGVqacLdGhBccn7GQaxzpJ9YSsREUsoN+Fze6RVQ4/Igaq3QoNgBhrahXwBBQ=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -11272,13 +11344,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.958.0" = { + "aws-sdk-2.961.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.958.0"; + version = "2.961.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.958.0.tgz"; - sha512 = "D5/2mW+hl5+CYvAniB209VUN3lFo7ZypCdO0RxyKG49DjoB+h3wvNxJo/BKL3A0sSiMOlrT61vDWsmkeE34S/g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.961.0.tgz"; + sha512 = "71ELXHWd0roRT0FW8CnqGLYGKLksHARa7Yn8LPN3mF70FJt2LuvVAyK49IChoUczTjlzS78p+Y5197Tkky4N8g=="; }; }; "aws-sign2-0.6.0" = { @@ -13684,13 +13756,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.6" = { + "browserslist-4.16.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.6"; + version = "4.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; - sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz"; + sha512 = "7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA=="; }; }; "brq-0.1.8" = { @@ -17392,13 +17464,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.111" = { + "constructs-3.3.113" = { name = "constructs"; packageName = "constructs"; - version = "3.3.111"; + version = "3.3.113"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.111.tgz"; - sha512 = "RcpVo5LPMcjzZuDSmHUNnQruXkFqmKqdgPQKrP372Cd+PcdxKrQQEwvgXhswrgLX4IFT07fS5RHyQhJhAq/C2w=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.113.tgz"; + sha512 = "dy8Nhvihh+rmCr9+Z6omfaaknVwFUIUOkC5zKLc/CyNoVXNc8yvQC6395fQ/t25u42cFGTXedxBkTUx1dwf4uQ=="; }; }; "consume-http-header-1.0.0" = { @@ -18167,13 +18239,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.10.0" = { + "create-gatsby-1.11.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; - sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.11.0.tgz"; + sha512 = "3FM3YJI5OExHIUUiJSASBibwzo7oBKtQYxHB0YeLC/7U7rkSJWjSbJ+cJllC+NeCGoDIzZ21QTkhczzzz7j1FQ=="; }; }; "create-graphback-1.0.1" = { @@ -20867,13 +20939,13 @@ let sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; }; }; - "devtools-protocol-0.0.883894" = { + "devtools-protocol-0.0.901419" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.883894"; + version = "0.0.901419"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; - sha512 = "33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; + sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; "dezalgo-1.0.3" = { @@ -21344,6 +21416,15 @@ let sha512 = "WfJEuXWdVdiarhxJgRlZ9bkMO/9un6dZDz+u3z6AYEXfsH2XRwYqdIvyOqFzaDDP0Hc6pR5rb9FJRSKyo+NuxA=="; }; }; + "doctoc-2.0.1" = { + name = "doctoc"; + packageName = "doctoc"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/doctoc/-/doctoc-2.0.1.tgz"; + sha512 = "JsxnSVZtLCThKehjFPBDhP1+ZLmdfXQynZH/0ABAwrnd1Zf3AV6LigC9oWJyaZ+c6RXCDnlGUNJ7I+1v8VaaRg=="; + }; + }; "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; @@ -22091,13 +22172,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.792" = { + "electron-to-chromium-1.3.795" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.792"; + version = "1.3.795"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.792.tgz"; - sha512 = "RM2O2xrNarM7Cs+XF/OE2qX/aBROyOZqqgP+8FXMXSuWuUqCfUUzg7NytQrzZU3aSqk1Qq6zqnVkJsbfMkIatg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz"; + sha512 = "4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22219,6 +22300,15 @@ let sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; + "emoji-regex-6.1.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; + sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; + }; + }; "emoji-regex-6.5.1" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -23164,13 +23254,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.15.0" = { + "eslint-plugin-vue-7.15.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.15.0"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.0.tgz"; - sha512 = "br58VTAT8JB4Qe7XJVN7fNBqQgclE+hcsievoyQyGtCZsYprFMQYu+c9yHX9XkP55cMnSVZpW5fRgy3n/wZskA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.1.tgz"; + sha512 = "4/r+n/i+ovyeW2gVRRH92kpy4lkpFbyPR4BMxGBTLtGnwqOKKzjSo6EMSaT0RhWPvEjK9uifcY8e7z5n8BIEgw=="; }; }; "eslint-scope-3.7.3" = { @@ -25009,13 +25099,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.2" = { + "file-type-16.5.3" = { name = "file-type"; packageName = "file-type"; - version = "16.5.2"; + version = "16.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; - sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz"; + sha512 = "uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A=="; }; }; "file-type-3.9.0" = { @@ -26602,31 +26692,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.10.0" = { + "gatsby-core-utils-2.11.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; - sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.11.0.tgz"; + sha512 = "t5PL1/MvTPSG6IeJn+Yd3Fxp0L3HfLI1vvVsmxXvxEiwDp5MJjjtZbrSnWpST1oylMSKI/UECUEKQUax9UJW+A=="; }; }; - "gatsby-recipes-0.21.0" = { + "gatsby-recipes-0.22.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; - sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.22.0.tgz"; + sha512 = "FQrM59qd64Pwe6UVJmuTAwyZx4IVkj0huwZ1y37IWn49Xuq0Ihhmsrb1BgP99euXZz34c+PWhsFnWvW26skgtw=="; }; }; - "gatsby-telemetry-2.10.0" = { + "gatsby-telemetry-2.11.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; - sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.11.0.tgz"; + sha512 = "6GEcZpsY5N/+K+SGGdDHuOknjer6vsYLJsUuUWkz32t8OK9lE1cLvXIdO2eTHdS4rtWFM324a/yFMlizp59SbA=="; }; }; "gauge-1.2.7" = { @@ -27764,13 +27854,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.20.0" = { + "google-gax-2.21.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.20.0"; + version = "2.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.20.0.tgz"; - sha512 = "V5aaN8cvnE77atybA7CaQTa0tGV6ZqncRGvpObEGpadSps2NIzTPXCtngxgPz7cGz1KhABl1VmSLUlRXGgjX+g=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.21.1.tgz"; + sha512 = "hyfau8+yXt75UuYVP3E3n0pKUwsEyiVQXfozfqQn/ZOL36UoZtS/cIzqIm6SYaSLlK5MWWz3JT/o/1ol09gEbA=="; }; }; "google-p12-pem-3.1.1" = { @@ -29898,13 +29988,13 @@ let sha512 = "OcN2zq9DEoArC84q9VCSrf9Hx1QUkR6ineCOwyOwhE4v/8aUTOx87mAk1nyjMOf76DQmF+tl2vnS2FssLx5N+Q=="; }; }; - "hyperdrive-10.20.0" = { + "hyperdrive-10.21.0" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "10.20.0"; + version = "10.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.20.0.tgz"; - sha512 = "ejikKQc9L8qUzmmkGe2dk/FGzisY0RTtE1Jw4WfWWXGTun9t/yZ/sV4JfamNBJRd3C0BWV6ZQYeI+1xQDuK3WQ=="; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.21.0.tgz"; + sha512 = "kvq7aGODR8mcV+c1vTGrqVLhdJKl604/aNYXiOEg6pH6qb3t9AGTm/DKvQrbR+DA5Qq8X9TbQZWeZw4wgJRlXw=="; }; }; "hyperdrive-9.16.0" = { @@ -33165,13 +33255,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.27.1" = { + "jquery.terminal-2.28.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.27.1.tgz"; - sha512 = "EixPlbZdM0tgtjC/KosdSjhRS2QZqG7qKLZ202og4hBTNLgNgZ4Ke6DP1mhC6IKciMHD6IWNYQgSnzQRbIQjIQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.28.1.tgz"; + sha512 = "2y/MFSTMbEbvUsd8Fq0GLDaI/bsGv5QVs3h+vgQ2BqBQMmIDlnuNTDJbtOFiTLksghlWG0P9iXjovrjMLwcOhQ=="; }; }; "js-base64-2.6.4" = { @@ -33498,13 +33588,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.313" = { + "jsii-srcmak-0.1.315" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.313"; + version = "0.1.315"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.313.tgz"; - sha512 = "7050z22Kp6mg58MVBva0OuO6qPa5IK/6i3wDDY+heUQuOCqNeSPsKngYVffYmEFintXsnRIVHpJ6q8rFSHRnIg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.315.tgz"; + sha512 = "omRLKVIrhg4yfUPRNJqFM2DDeyHm+ikZ8I3A5zS0PNJHf7LXCpRxVPwoGTLzFDYcd/EnCQPFHPLsH5Jt8p/Egg=="; }; }; "json-bigint-0.2.3" = { @@ -33813,13 +33903,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.283" = { + "json2jsii-0.1.285" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.283"; + version = "0.1.285"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.283.tgz"; - sha512 = "Jzekj3NokX/pSBUxTn4WhIlvmU7lTEIS+WzIEyEl9WrC9MtUt1TCbG5+kkDTMOFB0jzAS+qlt/72J/aM+RciKA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.285.tgz"; + sha512 = "VzZUg/mZqPPdIPdOwJ58P8CupA4QgHvBAUSFdk4rKW2PVj3jITCQVr8M9STZ/xHuEGtSk5r1wOxBmqMnx5nC5w=="; }; }; "json3-3.2.6" = { @@ -36685,6 +36775,15 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -37783,13 +37882,13 @@ let sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; }; }; - "markdown-it-12.1.0" = { + "markdown-it-12.2.0" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.1.0"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz"; - sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz"; + sha512 = "Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg=="; }; }; "markdown-it-8.4.2" = { @@ -38836,13 +38935,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.2" = { + "mermaid-8.11.3" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.2"; + version = "8.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.2.tgz"; - sha512 = "a5aj6hmDfdPGmhB8so4VtwYZjhwGV0OvyQcRTrI3IrlWk5ZxYtEcS1GsIDJVwCX4bJMZbXYh9zbL+lArptCoSg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.3.tgz"; + sha512 = "XhfSF+crAX+BhxyKUL28Pf0Of12bby+jK2VQ05xSLZ/pYE6kVfiTuO1mTA5chnqDdz9xpD9A77pTWHv27IbWsg=="; }; }; "meros-1.1.4" = { @@ -40600,6 +40699,15 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; + "nan-2.15.0" = { + name = "nan"; + packageName = "nan"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + }; + }; "nan-2.3.5" = { name = "nan"; packageName = "nan"; @@ -44590,13 +44698,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.3" = { + "parse-headers-2.0.4" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz"; - sha512 = "QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA=="; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz"; + sha512 = "psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="; }; }; "parse-help-1.0.0" = { @@ -45337,15 +45445,6 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-3.1.4" = { - name = "peek-readable"; - packageName = "peek-readable"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; - sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; - }; - }; "peek-readable-4.0.1" = { name = "peek-readable"; packageName = "peek-readable"; @@ -48677,13 +48776,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.1.0" = { + "puppeteer-10.2.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz"; - sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz"; + sha512 = "OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw=="; }; }; "puppeteer-9.1.1" = { @@ -50234,13 +50333,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "redux-4.1.0" = { + "redux-4.1.1" = { name = "redux"; packageName = "redux"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz"; - sha512 = "uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; + sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; }; }; "reflect-metadata-0.1.13" = { @@ -50585,6 +50684,15 @@ let sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg=="; }; }; + "remark-frontmatter-1.3.3" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz"; + sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; + }; + }; "remark-frontmatter-2.0.0" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; @@ -50657,6 +50765,15 @@ let sha512 = "XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw=="; }; }; + "remark-parse-5.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz"; + sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; + }; + }; "remark-parse-6.0.3" = { name = "remark-parse"; packageName = "remark-parse"; @@ -52151,13 +52268,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.37.0" = { + "sass-1.37.5" = { name = "sass"; packageName = "sass"; - version = "1.37.0"; + version = "1.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz"; - sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; + sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; }; }; "sax-0.5.8" = { @@ -55265,13 +55382,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.34" = { + "sscaff-1.2.36" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.34"; + version = "1.2.36"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.34.tgz"; - sha512 = "J3tgewePIaRry/KOsdo9N+vl/RmMzrgiPT33B/a+fnqKYFtdcxfyq985e+dlYUXNorB0e4j0OV/hV9pGGwpZ1Q=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.36.tgz"; + sha512 = "OP8XE492gbcsTFXH/PQy2DNxnqWGWVRC1P8uqjmWInZdfX3lYA+q9jSS7e7lkqkNYsJYMcnCrjnmLCk5jLI6NA=="; }; }; "ssh-config-1.1.6" = { @@ -55922,13 +56039,13 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; - "streamx-2.10.3" = { + "streamx-2.11.0" = { name = "streamx"; packageName = "streamx"; - version = "2.10.3"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.10.3.tgz"; - sha512 = "Ss4rEDWlTAUrIqaQsX6tNBNANHxSmbyrA5PlCji0a6xdJtVzfkEMLLrkVW5OSyr4TshiSb1WA2TqMGMUpGnouQ=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.11.0.tgz"; + sha512 = "Cv8hFlHwVRKg35EXAxCSmRRzCR8Nyphx3v58hkx8nqfRe3GM8kAPfDY16GvpU2V4m/U8Ri9Fdoi+K5X3z8VpMA=="; }; }; "strftime-0.10.0" = { @@ -56147,6 +56264,15 @@ let sha512 = "004ulKKANDuQilQsNxy2lisrpMG0qUJxBU+2YCEF7KziRyNR0Nredm2qk0f1V82nva59H3y9GWeHXE63HzGRFw=="; }; }; + "string2compact-1.3.2" = { + name = "string2compact"; + packageName = "string2compact"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.2.tgz"; + sha512 = "3XUxUgwhj7Eqh2djae35QHZZT4mN3fsO7kagZhSGmhhlrQagVvWSFuuFIWnpxFS0CdTB2PlQcaL16RDi14I8uw=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -56543,15 +56669,6 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.1.3" = { - name = "strtok3"; - packageName = "strtok3"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; - sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; - }; - }; "strtok3-6.2.4" = { name = "strtok3"; packageName = "strtok3"; @@ -56966,13 +57083,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte2tsx-0.4.3" = { + "svelte2tsx-0.4.4" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.3.tgz"; - sha512 = "bbX1jrqz9Hih7GyeNrMex6HvSNguX+oorW3PPlNZk3hEgz7xXSO6f9Wuu+1dDacKt7GCEJdLjnq0wc1ZhyLqoQ=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.4.tgz"; + sha512 = "BvARagYreupBS9rMSCa7aTH1m6qoU6OXtjouDrZggunW9hpyn9UpU0f1uw8loiCYbdE1LCNAK74Y6B2sIjevug=="; }; }; "sver-compat-1.5.0" = { @@ -57263,13 +57380,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.14" = { + "systeminformation-5.8.0" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.14"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.14.tgz"; - sha512 = "T928Nvxy5uA/NQR00gGCm4wnNGPcXYyPXDnZsMR1wG5rk25CwaVcshsSGvl91s0DPUyC87tUfQOWVg4EvNwsOA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.0.tgz"; + sha512 = "l4drbK2PtNynGKblaShY9hDLW/gg1zxUq2+Yk4gTyd6a2JUvFyTGP8PhHV9iOh+MzS25PQa8W1t0kvcIvr9n7Q=="; }; }; "table-3.8.3" = { @@ -57498,6 +57615,15 @@ let sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; }; }; + "tar-6.1.6" = { + name = "tar"; + packageName = "tar"; + version = "6.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz"; + sha512 = "oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g=="; + }; + }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -58686,13 +58812,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-3.1.0" = { + "token-types-4.1.1" = { name = "token-types"; packageName = "token-types"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; - sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; + sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; }; }; "toml-2.3.6" = { @@ -58974,6 +59100,24 @@ let sha512 = "MAqFo2oJJ39zmxq3xETx0nMAgZw2z6pnJPjIAehEcrDaeePDhBBTshAlyhCDtezMDTIu1Av+vGE501xN3Sh8VA=="; }; }; + "tree-sitter-0.17.2" = { + name = "tree-sitter"; + packageName = "tree-sitter"; + version = "0.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.17.2.tgz"; + sha512 = "bxFEolb9xMxBdbwh4wqT730J8fu10J15EL8lM+iGr8LcKbhuQ7KHA0pPsmNPIpZlr6vyDKFojJnD45JtIBIV0w=="; + }; + }; + "tree-sitter-beancount-1.0.0" = { + name = "tree-sitter-beancount"; + packageName = "tree-sitter-beancount"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-sitter-beancount/-/tree-sitter-beancount-1.0.0.tgz"; + sha512 = "I+QbnbfSA7+ePEhIHRwq+X2ZrTQS5VoZ47kPTsn5FEiAGGo87mhLK4O3vCaFUHQ8Ibm8eXESEKf1dl0QmA9CHQ=="; + }; + }; "treeify-1.1.0" = { name = "treeify"; packageName = "treeify"; @@ -59136,13 +59280,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-invariant-0.9.0" = { + "ts-invariant-0.9.1" = { name = "ts-invariant"; packageName = "ts-invariant"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.0.tgz"; - sha512 = "+JqhKqywk+ue5JjAC6eTWe57mOIxYXypMUkBDStkAzvnlfkDJ1KGyeMuNRMwOt6GXzHSC1UT9JecowpZDmgXqA=="; + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.1.tgz"; + sha512 = "hSeYibh29ULlHkuEfukcoiyTct+s2RzczMLTv4x3NWC/YrBy7x7ps5eYq/b4Y3Sb9/uAlf54+/5CAEMVxPhuQw=="; }; }; "ts-loader-8.0.4" = { @@ -59325,6 +59469,15 @@ let sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; + "tsyringe-4.6.0" = { + name = "tsyringe"; + packageName = "tsyringe"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.6.0.tgz"; + sha512 = "BMQAZamSfEmIQzH8WJeRu1yZGQbPSDuI9g+yEiKZFIcO46GPZuMOC2d0b52cVBdw1d++06JnDSIIZvEnogMdAw=="; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -60099,6 +60252,15 @@ let sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; + "underscore-1.12.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; + sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; + }; + }; "underscore-1.13.1" = { name = "underscore"; packageName = "underscore"; @@ -60954,6 +61116,15 @@ let sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; }; + "update-section-0.3.3" = { + name = "update-section"; + packageName = "update-section"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; + sha1 = "458f17820d37820dc60e20b86d94391b00123158"; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -63286,6 +63457,15 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; + "web-tree-sitter-0.17.1" = { + name = "web-tree-sitter"; + packageName = "web-tree-sitter"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz"; + sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; + }; + }; "web3-utils-1.5.0" = { name = "web3-utils"; packageName = "web3-utils"; @@ -63385,13 +63565,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.47.1" = { + "webpack-5.48.0" = { name = "webpack"; packageName = "webpack"; - version = "5.47.1"; + version = "5.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz"; - sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz"; + sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -65981,7 +66161,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -66528,7 +66708,7 @@ in sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw=="; }; dependencies = [ - sources."@corestore/networker-1.1.0" + sources."@corestore/networker-1.2.0" sources."@hyperspace/client-1.18.0" sources."@hyperspace/migration-tool-1.2.1" sources."@hyperspace/rpc-1.15.1" @@ -66537,7 +66717,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66707,7 +66887,7 @@ in ]; }) sources."hypercore-streams-1.0.1" - sources."hyperdrive-10.20.0" + sources."hyperdrive-10.21.0" sources."hyperdrive-schemas-2.0.0" sources."hyperspace-3.19.0" (sources."hyperspace-mirroring-service-1.0.7" // { @@ -66924,7 +67104,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.10.3" + sources."streamx-2.11.0" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -67068,8 +67248,8 @@ in sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.10" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.12" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67104,7 +67284,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" @@ -67135,7 +67315,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67544,7 +67724,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67667,7 +67847,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -67815,7 +67995,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68826,7 +69006,7 @@ in sources."async-3.2.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001248" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -68838,7 +69018,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68932,7 +69112,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -68966,10 +69146,10 @@ in sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A=="; }; dependencies = [ - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001248" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -68996,14 +69176,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.958.0" // { + (sources."aws-sdk-2.961.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69043,7 +69223,7 @@ in sources."defaults-1.0.3" sources."degenerator-2.2.0" sources."depd-1.1.2" - sources."devtools-protocol-0.0.883894" + sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" @@ -69132,7 +69312,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.1.0" // { + (sources."puppeteer-10.2.0" // { dependencies = [ sources."debug-4.3.1" ]; @@ -69223,7 +69403,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69699,7 +69879,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.6" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."negotiator-0.6.2" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.1" @@ -69766,7 +69946,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" ]; }) sources."proxy-addr-2.0.7" @@ -70093,6 +70273,169 @@ in bypassCache = true; reconstructLock = true; }; + beancount-langserver = nodeEnv.buildNodePackage { + name = "beancount-langserver"; + packageName = "beancount-langserver"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/beancount-langserver/-/beancount-langserver-1.0.0.tgz"; + sha512 = "cwi9b6H7pMWDFcUNsAt2DDStOmd9DCgWUQ5olAe+PHe+dwxqeRJVaCQLMiDwJBOHEPuRhaXh8V/7JEtgQPgoPQ=="; + }; + dependencies = [ + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/markdown-to-ast-6.1.7" + sources."anchor-markdown-header-0.5.7" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."bail-1.0.5" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."boundary-1.0.1" + sources."buffer-5.7.1" + sources."character-entities-1.2.4" + sources."character-entities-legacy-1.1.4" + sources."character-reference-invalid-1.1.4" + sources."chownr-1.1.4" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.6" + sources."commander-6.2.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-4.3.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."doctoc-2.0.1" + (sources."dom-serializer-1.3.2" // { + dependencies = [ + sources."domhandler-4.2.0" + ]; + }) + sources."domelementtype-2.2.0" + sources."domhandler-3.3.0" + (sources."domutils-2.7.0" // { + dependencies = [ + sources."domhandler-4.2.0" + ]; + }) + sources."emoji-regex-6.1.3" + sources."end-of-stream-1.4.4" + sources."entities-2.2.0" + sources."expand-template-2.0.3" + sources."extend-3.0.2" + sources."fault-1.0.4" + sources."format-0.2.2" + sources."fs-constants-1.0.0" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."has-unicode-2.0.1" + sources."htmlparser2-4.1.0" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-alphabetical-1.0.4" + sources."is-alphanumerical-1.0.4" + sources."is-buffer-1.1.6" + sources."is-decimal-1.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."is-hexadecimal-1.0.4" + sources."is-plain-obj-1.1.0" + sources."is-whitespace-character-1.0.4" + sources."is-word-character-1.0.4" + sources."isarray-1.0.0" + sources."markdown-escapes-1.0.4" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."nan-2.15.0" + sources."napi-build-utils-1.0.2" + sources."node-abi-2.30.0" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."parse-entities-1.2.2" + sources."prebuild-install-5.3.6" + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."reflect-metadata-0.1.13" + sources."remark-frontmatter-1.3.3" + sources."remark-parse-5.0.0" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."state-toggle-1.0.3" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."structured-source-3.0.2" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."traverse-0.6.6" + sources."tree-sitter-0.17.2" + sources."tree-sitter-beancount-1.0.0" + sources."trim-0.0.1" + sources."trim-trailing-lines-1.1.4" + sources."trough-1.0.5" + sources."tslib-1.14.1" + sources."tsyringe-4.6.0" + sources."tunnel-agent-0.6.0" + sources."underscore-1.12.1" + sources."unherit-1.1.3" + sources."unified-6.2.0" + sources."unist-util-is-3.0.0" + sources."unist-util-remove-position-1.1.4" + sources."unist-util-stringify-position-1.1.2" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + sources."update-section-0.3.3" + sources."util-deprecate-1.0.2" + sources."vfile-2.3.0" + sources."vfile-location-2.0.6" + sources."vfile-message-1.1.1" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-uri-2.1.2" + sources."web-tree-sitter-0.17.1" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."x-is-string-0.1.0" + sources."xtend-4.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Language Server Protocol (LSP) for beancount files"; + homepage = "https://github.com/bryall/beancount-language-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -70720,7 +71063,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.1.0" // { + (sources."markdown-it-12.2.0" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -70755,7 +71098,7 @@ in }) sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-0.6.2" sources."normalize-package-data-3.0.2" @@ -70948,7 +71291,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71354,10 +71697,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.34"; + version = "1.0.0-beta.35"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.34.tgz"; - sha512 = "a46brzT/snqVY0abj4qv+HLY7poqpc9VFlE/E7wHQzSR1BLAr+ysudLfn33YJt6fNvHRlfhIIqh1zXL0JelvPA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.35.tgz"; + sha512 = "gmIhIZyAJyEi/2GV6wmLF/HGswJK+pxWijH1jS/WPgcJHRaeaIMysrdsCWpucVA6Zz/OwgrmG1Fp09gZAKdskw=="; }; dependencies = [ sources."@jsii/spec-1.32.0" @@ -71382,7 +71725,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.111" + sources."constructs-3.3.113" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71456,13 +71799,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.313" // { + (sources."jsii-srcmak-0.1.315" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.283" + sources."json2jsii-0.1.285" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71498,7 +71841,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.34" + sources."sscaff-1.2.36" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71553,7 +71896,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.1" + sources."@apollo/client-3.4.4" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -71594,19 +71937,19 @@ in sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/merge-6.2.16" // { + (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ - sources."@graphql-tools/utils-8.0.1" + sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.1.6" // { + (sources."@graphql-tools/mock-8.1.7" // { dependencies = [ - sources."@graphql-tools/utils-8.0.1" + sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/schema-8.0.1" // { + (sources."@graphql-tools/schema-8.0.2" // { dependencies = [ - sources."@graphql-tools/utils-8.0.1" + sources."@graphql-tools/utils-8.0.2" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -71640,7 +71983,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -71669,16 +72012,14 @@ in sources."apollo-graphql-0.9.3" sources."apollo-reporting-protobuf-3.0.0" sources."apollo-server-caching-3.0.1" - (sources."apollo-server-core-3.1.1" // { + (sources."apollo-server-core-3.1.2" // { dependencies = [ - sources."@graphql-tools/schema-7.1.5" - sources."tslib-2.2.0" - sources."value-or-promise-1.0.6" + sources."@graphql-tools/utils-8.0.2" ]; }) sources."apollo-server-env-4.0.3" sources."apollo-server-errors-3.0.1" - sources."apollo-server-express-3.1.1" + sources."apollo-server-express-3.1.2" sources."apollo-server-plugin-base-3.1.1" sources."apollo-server-types-3.1.1" sources."archiver-5.3.0" @@ -71761,7 +72102,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.111" + sources."constructs-3.3.113" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -71960,7 +72301,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.313" // { + (sources."jsii-srcmak-0.1.315" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -72118,7 +72459,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.34" + sources."sscaff-1.2.36" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -72157,7 +72498,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."ts-invariant-0.9.0" + sources."ts-invariant-0.9.1" sources."tslib-2.3.0" sources."type-fest-0.15.1" sources."type-is-1.6.18" @@ -72460,10 +72801,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.11"; + version = "0.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz"; - sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.12.tgz"; + sha512 = "zVTZb+SUwBt6ZljFG+u+vBMj+DLr4IEDqjpBsgnZ+tOldKSbPUtsvbeXOR/PxkLN4unxKxaZBkG1BaP34YrYpw=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -72913,7 +73254,7 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."traverse-0.3.9" sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" @@ -72985,7 +73326,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -73149,7 +73490,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -74156,7 +74497,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -74198,7 +74539,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74644,7 +74985,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.0" // { + (sources."eslint-plugin-vue-7.15.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75574,7 +75915,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -75665,7 +76006,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -76036,7 +76377,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76696,7 +77037,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.3.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoassert-1.1.0" sources."nanobus-4.5.0" sources."nanoguard-1.3.0" @@ -76734,7 +77075,7 @@ in sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-headers-2.0.3" + sources."parse-headers-2.0.4" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -77155,7 +77496,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -77354,7 +77695,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77852,7 +78193,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.2" // { + (sources."tar-6.1.6" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -78007,7 +78348,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -78026,7 +78367,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -78079,7 +78420,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -78363,14 +78704,14 @@ in sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.6" + sources."@types/engine.io-3.1.7" sources."@types/express-4.17.8" sources."@types/express-serve-static-core-4.17.24" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.4" sources."@types/hls.js-0.13.1" sources."@types/js-yaml-3.12.5" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" sources."@types/mime-1.3.2" @@ -78589,7 +78930,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.2" + sources."tar-6.1.6" ]; }) sources."cache-base-1.0.1" @@ -79297,7 +79638,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" (sources."needle-2.8.0" // { dependencies = [ @@ -79601,7 +79942,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.37.0" // { + (sources."sass-1.37.5" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -80343,10 +80684,10 @@ in esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; - version = "0.6.10"; + version = "0.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/esy/-/esy-0.6.10.tgz"; - sha512 = "O+mWNPB9NJqDr3CA1PUbWUO1ZSy53ksZWivGrvbquATR5INlp3CYguwkq4BzZACg1s1bVYyhr7byjB/l1nuGRA=="; + url = "https://registry.npmjs.org/esy/-/esy-0.6.11.tgz"; + sha512 = "LyrQWS/c7FYwjmgSlmYcj7w7as40iVuF6aCSHKMAZq1xgmdpjorQ7OEqg35ZUf8+xpUgKnDx4HrA3scdnfRTnA=="; }; buildInputs = globalBuildInputs; meta = { @@ -80380,7 +80721,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."semver-6.3.0" ]; }) @@ -80672,7 +81013,7 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" sources."@types/node-9.6.61" @@ -81029,7 +81370,7 @@ in sources."core-js-2.6.12" (sources."core-js-compat-3.16.0" // { dependencies = [ - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."semver-7.0.0" ]; }) @@ -81161,7 +81502,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81726,7 +82067,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."ncp-2.0.0" (sources."needle-2.8.0" // { @@ -82440,7 +82781,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.2" // { + (sources."tar-6.1.6" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -82883,7 +83224,7 @@ in sources."@babel/traverse-7.14.9" sources."@babel/types-7.14.9" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82902,7 +83243,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -82935,7 +83276,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -83786,10 +84127,10 @@ in sources."@types/archiver-5.3.0" sources."@types/duplexify-3.6.0" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83879,7 +84220,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.2" + sources."tar-6.1.6" ]; }) (sources."cacheable-request-6.1.0" // { @@ -84138,7 +84479,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.20.0" // { + (sources."google-gax-2.21.1" // { dependencies = [ sources."google-auth-library-7.4.1" ]; @@ -84331,7 +84672,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nash-3.0.0" // { dependencies = [ sources."async-1.5.2" @@ -84348,7 +84689,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."which-2.0.2" ]; }) @@ -84895,7 +85236,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85019,7 +85360,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-headers-2.0.3" + sources."parse-headers-2.0.4" sources."path-exists-4.0.0" sources."performance-now-2.1.0" sources."process-0.11.10" @@ -85324,7 +85665,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" (sources."nconf-0.6.9" // { dependencies = [ @@ -85579,10 +85920,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; - sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.11.0.tgz"; + sha512 = "jrC1VqQHCR4N++if2bZm+iVUpdCazfZgVK0FPnmTb6Uq3xqEqS5agZR9HeE/FV8ebQ1h6/4MfFt9XsSG4Z6TFw=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85669,7 +86010,7 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.1" @@ -85677,7 +86018,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85732,7 +86073,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -85805,7 +86146,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.10.0" + sources."create-gatsby-1.11.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85840,7 +86181,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85892,7 +86233,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.2" + sources."file-type-16.5.3" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85911,13 +86252,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.10.0" - (sources."gatsby-recipes-0.21.0" // { + sources."gatsby-core-utils-2.11.0" + (sources."gatsby-recipes-0.22.0" // { dependencies = [ sources."strip-ansi-6.0.0" ]; }) - sources."gatsby-telemetry-2.10.0" + sources."gatsby-telemetry-2.11.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -86111,7 +86452,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.1" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -86146,7 +86487,7 @@ in sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" - sources."redux-4.1.0" + sources."redux-4.1.1" sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -86241,7 +86582,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.4" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -86251,7 +86592,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-3.1.0" + sources."token-types-4.1.1" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86599,10 +86940,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.2.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.2.0.tgz"; - sha512 = "tpmDCrNmPrb1z5hauKtxXxYdHaV4+K4AjZqkzyQzDcV6tpUSBwYMGu66pFpw7g0Ux4QnE0pYSsdh3efDfYv1Pg=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.4.1.tgz"; + sha512 = "+T6OUPejA5b1c+fuZ0yjdVVBhj0Js6rAieAtgi3ZLtJ0QpNzVI2rvNOiSaDyip3GpiLMTuNmH83G5mcOzrU+8w=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -87027,15 +87368,15 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.16" // { + (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ - sources."@graphql-tools/utils-8.0.1" + sources."@graphql-tools/utils-8.0.2" sources."tslib-2.3.0" ]; }) - (sources."@graphql-tools/schema-8.0.1" // { + (sources."@graphql-tools/schema-8.0.2" // { dependencies = [ - sources."@graphql-tools/utils-8.0.1" + sources."@graphql-tools/utils-8.0.2" sources."tslib-2.3.0" ]; }) @@ -87066,7 +87407,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -87812,7 +88153,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.14" + sources."systeminformation-5.8.0" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -88099,7 +88440,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -89303,7 +89644,7 @@ in }) sources."moment-2.29.1" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -89368,7 +89709,7 @@ in sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; }; dependencies = [ - sources."@jcubic/lily-0.1.0" + sources."@jcubic/lily-0.2.0" sources."@types/jquery-3.5.6" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" @@ -89397,7 +89738,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.27.1" + sources."jquery.terminal-2.28.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -90268,7 +90609,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.958.0" // { + (sources."aws-sdk-2.961.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -90298,7 +90639,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" @@ -90465,7 +90806,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -90822,7 +91163,7 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."mermaid-8.11.2" + sources."mermaid-8.11.3" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -92106,7 +92447,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -92688,7 +93029,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -93834,19 +94175,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.2.0" + sources."@octokit/openapi-types-9.4.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.14.0" + sources."@octokit/plugin-paginate-rest-2.15.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.2" + sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.2" - sources."@octokit/types-6.22.0" + sources."@octokit/rest-18.9.0" + sources."@octokit/types-6.24.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -94386,7 +94727,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -94710,7 +95051,7 @@ in sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -95111,7 +95452,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -95502,8 +95843,8 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.10" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -95660,7 +96001,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -95800,7 +96141,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96083,7 +96424,7 @@ in ]; }) sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" @@ -97146,7 +97487,7 @@ in sources."@percy/config-1.0.0-beta.62" sources."@percy/logger-1.0.0-beta.62" sources."@percy/migrate-0.10.0" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -97178,7 +97519,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -97272,10 +97613,10 @@ in sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."devtools-protocol-0.0.883894" + sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -97442,7 +97783,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" - sources."mermaid-8.11.2" + sources."mermaid-8.11.3" sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -97503,7 +97844,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."puppeteer-10.1.0" + sources."puppeteer-10.2.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.0" (sources."recast-0.20.5" // { @@ -97671,20 +98012,20 @@ in sha512 = "seHSVEn7JJbOEuYD8T8UmqZcYT1iLCFp2mMA/+UyhcpRICLzClF9uQX3beAuHCZUymO3FBwdEjN4Ky5qd2kbHw=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-8.2.1" - sources."@fluentui/dom-utilities-2.1.3" - sources."@fluentui/font-icons-mdl2-8.1.7" - sources."@fluentui/foundation-legacy-8.1.7" - sources."@fluentui/keyboard-key-0.3.3" - sources."@fluentui/merge-styles-8.1.3" + sources."@fluentui/date-time-utilities-8.2.2" + sources."@fluentui/dom-utilities-2.1.4" + sources."@fluentui/font-icons-mdl2-8.1.8" + sources."@fluentui/foundation-legacy-8.1.8" + sources."@fluentui/keyboard-key-0.3.4" + sources."@fluentui/merge-styles-8.1.4" sources."@fluentui/react-8.23.8" - sources."@fluentui/react-focus-8.1.9" - sources."@fluentui/react-hooks-8.2.5" - sources."@fluentui/react-window-provider-2.1.3" - sources."@fluentui/set-version-8.1.3" - sources."@fluentui/style-utilities-8.2.1" - sources."@fluentui/theme-2.2.0" - sources."@fluentui/utilities-8.2.1" + sources."@fluentui/react-focus-8.1.10" + sources."@fluentui/react-hooks-8.2.6" + sources."@fluentui/react-window-provider-2.1.4" + sources."@fluentui/set-version-8.1.4" + sources."@fluentui/style-utilities-8.2.2" + sources."@fluentui/theme-2.2.1" + sources."@fluentui/utilities-8.2.2" sources."@microsoft/load-themed-styles-1.10.197" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -98273,10 +98614,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.4.1"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.4.1.tgz"; - sha512 = "Eoc/5wAH6D1sAWOhfdbim3H0IQNDcQDmXzxWqKkaa3TuOIvImysEbQz0Qr5njQUKwTvVoQ4zSnmdim8uK0SkJg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.3.tgz"; + sha512 = "cm07sqQpSYmHjk1j//geep75fc3NRX0KO7Jr0S8H43OZyFrdY4G8VfAfukMBwVXie/aEfFw1CcgA8yiFMq+7pw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -98410,18 +98751,25 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.4.1" // { + (sources."@netlify/build-17.9.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."boxen-4.2.0" - sources."chalk-3.0.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" sources."type-fest-0.8.1" - sources."update-notifier-4.1.3" + (sources."update-notifier-4.1.3" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) ]; }) (sources."@netlify/cache-utils-2.0.0" // { @@ -98432,10 +98780,8 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-14.1.0" // { + (sources."@netlify/config-14.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" sources."dot-prop-5.3.0" sources."execa-3.4.0" sources."find-up-4.1.0" @@ -98444,7 +98790,7 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.7.2" // { + (sources."@netlify/framework-info-5.8.0" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -98477,17 +98823,17 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" ]; }) - sources."@netlify/plugins-list-2.21.0" + sources."@netlify/plugins-list-3.2.1" sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-2.0.0" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.15.1" // { + (sources."@netlify/zip-it-and-ship-it-4.16.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -98614,18 +98960,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.2.0" - sources."@octokit/plugin-paginate-rest-2.14.0" + sources."@octokit/openapi-types-9.4.0" + sources."@octokit/plugin-paginate-rest-2.15.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.5.2" + sources."@octokit/plugin-rest-endpoint-methods-5.7.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.7.2" - sources."@octokit/types-6.22.0" + sources."@octokit/rest-18.9.0" + sources."@octokit/types-6.24.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -98662,7 +99008,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -98670,8 +99016,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.5" - (sources."@typescript-eslint/typescript-estree-4.28.5" // { + sources."@typescript-eslint/types-4.29.0" + (sources."@typescript-eslint/typescript-estree-4.29.0" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -98688,7 +99034,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.5" + sources."@typescript-eslint/visitor-keys-4.29.0" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -98791,7 +99137,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -99086,7 +99432,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -100361,7 +100707,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -100544,7 +100890,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -100815,7 +101161,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -101344,7 +101690,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.2" // { + (sources."tar-6.1.6" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -101575,7 +101921,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -102400,7 +102746,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -102923,7 +103269,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -103078,7 +103424,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103324,7 +103670,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -103869,7 +104215,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.1" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" @@ -105126,7 +105472,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.14" + sources."systeminformation-5.8.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -106318,9 +106664,9 @@ in sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -106474,7 +106820,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -106737,7 +107083,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107162,7 +107508,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mutation-observer-1.0.3" sources."mute-stream-0.0.7" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."neo-async-2.6.2" @@ -108128,12 +108474,12 @@ in sources."@redocly/ajv-8.6.2" (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" - sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.5" + sources."@types/json-schema-7.0.9" + sources."@types/node-15.14.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -108661,20 +109007,20 @@ in sources."@tootallnate/once-1.1.2" sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" sources."@types/vscode-1.58.1" - sources."@typescript-eslint/eslint-plugin-4.28.5" - sources."@typescript-eslint/experimental-utils-4.28.5" - sources."@typescript-eslint/parser-4.28.5" - sources."@typescript-eslint/scope-manager-4.28.5" - sources."@typescript-eslint/types-4.28.5" - sources."@typescript-eslint/typescript-estree-4.28.5" - sources."@typescript-eslint/visitor-keys-4.28.5" + sources."@typescript-eslint/eslint-plugin-4.29.0" + sources."@typescript-eslint/experimental-utils-4.29.0" + sources."@typescript-eslint/parser-4.29.0" + sources."@typescript-eslint/scope-manager-4.29.0" + sources."@typescript-eslint/types-4.29.0" + sources."@typescript-eslint/typescript-estree-4.29.0" + sources."@typescript-eslint/visitor-keys-4.29.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -109143,10 +109489,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.37.0"; + version = "1.37.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz"; - sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w=="; + url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; + sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -109316,10 +109662,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.52.1"; + version = "2.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.52.1.tgz"; - sha512 = "aDMJiSyCxqbJCt7011L0rMsxkd1lHSz8HotUiQWE8dFFqm3txZ1MpEy01bOLx4n35Qnyj1F8g+jmT9x+WnI2ZQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.53.0.tgz"; + sha512 = "2srJa55dQY4kx+aNGkevvZbJ/8j/C1TLD3AvZdpqgrRPNG41yfl1B3V/pXMmq5sfdpx09Fr8JOeNRgUgJUq7Aw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -109404,14 +109750,14 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" - sources."@tokenizer/token-0.1.1" + sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/lodash-4.14.171" + sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -109472,7 +109818,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.958.0" // { + (sources."aws-sdk-2.961.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -109701,7 +110047,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.2" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -109899,7 +110245,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoid-2.1.11" sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" @@ -109947,7 +110293,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.1" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -110058,7 +110404,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.4" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -110090,7 +110436,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.2" // { + (sources."tar-6.1.6" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -110119,7 +110465,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-3.1.0" + sources."token-types-4.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -110730,7 +111076,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -110827,10 +111173,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.673.0"; + version = "1.675.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.673.0.tgz"; - sha512 = "qu6UpvUaC+NbHCvdA6COYHzb/S5fPiJrPDMQP7q1lEVAi0JnXASJrYuUVheAz+Uh8G4SPiQCAu5EimuPUf8fkg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.675.0.tgz"; + sha512 = "J5ZvEiaAIRdyFrIjS1OnfQs5vKLG0SNPJmeg/GuTA9z8L/gqtTXUsnCrnmpQ8Y2y7L3LRyjh9VXx7G0QC9rlWA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -110843,9 +111189,14 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.9.3" + sources."@snyk/cloud-config-parser-1.10.1" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - sources."@snyk/code-client-3.9.0" + (sources."@snyk/code-client-4.0.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."needle-2.8.0" + ]; + }) sources."@snyk/composer-lockfile-parser-1.4.1" (sources."@snyk/dep-graph-1.28.1" // { dependencies = [ @@ -110863,11 +111214,13 @@ in (sources."@snyk/fix-pipenv-pipfile-0.5.4" // { dependencies = [ sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) (sources."@snyk/fix-poetry-0.7.2" // { dependencies = [ sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) sources."@snyk/gemfile-1.2.0" @@ -110917,9 +111270,10 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/js-yaml-3.12.7" sources."@types/keyv-3.1.2" - sources."@types/lodash-4.14.171" + sources."@types/lodash-4.14.172" sources."@types/lodash.chunk-4.2.6" sources."@types/lodash.omit-4.5.6" + sources."@types/lodash.pick-4.4.6" sources."@types/lodash.union-4.6.6" sources."@types/minimatch-3.0.5" sources."@types/ms-0.7.31" @@ -110982,7 +111336,6 @@ in sources."asap-2.0.6" sources."asn1-0.2.4" sources."async-3.2.0" - sources."axios-0.21.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -111046,7 +111399,11 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."debug-4.3.2" + (sources."debug-4.3.2" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -111100,7 +111457,6 @@ in sources."fastq-1.11.1" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.1" sources."fs-constants-1.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -111212,6 +111568,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.orderby-4.6.0" + sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.set-4.3.2" sources."lodash.size-4.2.0" @@ -111246,7 +111603,7 @@ in sources."minipass-3.1.3" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" (sources."needle-2.6.0" // { @@ -111483,7 +111840,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { @@ -111572,7 +111929,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -112192,7 +112549,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.2" + sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -112773,7 +113130,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.958.0" // { + (sources."aws-sdk-2.961.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112900,7 +113257,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.2" + sources."nan-2.15.0" ]; }) sources."ecc-jsbn-0.1.2" @@ -113556,10 +113913,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.9" + sources."@babel/compat-data-7.15.0" sources."@babel/core-7.14.8" sources."@babel/generator-7.14.9" - sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-compilation-targets-7.15.0" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" @@ -113578,10 +113935,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.9" + sources."@babel/parser-7.15.0" sources."@babel/template-7.14.5" sources."@babel/traverse-7.14.9" - sources."@babel/types-7.14.9" + sources."@babel/types-7.15.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -113607,7 +113964,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -113649,7 +114006,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -113882,16 +114239,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.4.tgz"; - sha512 = "ldw4/YQR/gpI29Sgv+u/zkHTIMKn2ohpSvfORmDm2H85fNa/Dw8fUoqK080GbVol32sYO8ThzNKkheBjUT0mCw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.5.tgz"; + sha512 = "oHbbJx5x25ztVm+EIyXwWB2rCb+fgfNV7izSb/hjlI6jHXpmcHcu6pIXGxx9JI3PWj18nLyzvKfTE/Nr6p8mpw=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -113934,7 +114291,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.3" + sources."svelte2tsx-0.4.4" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."typescript-4.3.5" @@ -113967,13 +114324,13 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz"; - sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz"; + sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -114428,7 +114785,7 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mute-stream-0.0.5" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.2" @@ -116121,7 +116478,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -116560,10 +116917,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.131.1"; + version = "0.131.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.131.1.tgz"; - sha512 = "1vojiLBfH7e2GZDEzFBfmzU0b/5uraxdg630PcVCRdzgGOttGe6HmG+n71lLCZZnPOxU9f7UVPiSkKPMsyiB/A=="; + url = "https://registry.npmjs.org/three/-/three-0.131.3.tgz"; + sha512 = "VkZAv8ZTJqiE/fyEmoWLxcNHImpVcjqW7RO0GzMu3tRpwO0KUvK9pjTmJzJcAbc51BOeB2G38zh80yjHTbP8gQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -116795,7 +117152,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -117136,7 +117493,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.7" + sources."@types/node-14.17.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -117496,7 +117853,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."npmlog-4.1.2" @@ -117521,7 +117878,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.2" + sources."tar-6.1.6" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -117705,7 +118062,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.15.0" // { + (sources."eslint-plugin-vue-7.15.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -118014,7 +118371,7 @@ in sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" sources."@types/vscode-1.58.1" @@ -118041,6 +118398,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" + sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -118056,7 +118414,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" @@ -118101,7 +118459,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -118310,7 +118668,7 @@ in sources."vscode-debugadapter-testsupport-1.48.0" sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.47.1" + sources."webpack-5.48.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -118667,7 +119025,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -119709,7 +120067,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."npmlog-4.1.2" @@ -119749,7 +120107,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.2" + sources."tar-6.1.6" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -119839,7 +120197,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -120180,7 +120538,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanoid-3.1.23" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -120392,17 +120750,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.47.1"; + version = "5.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz"; - sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz"; + sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.8" - sources."@types/node-16.4.10" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.4.12" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -120421,15 +120779,16 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" + sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.6" + sources."browserslist-4.16.7" sources."buffer-from-1.1.2" sources."caniuse-lite-1.0.30001248" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.792" + sources."electron-to-chromium-1.3.795" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -120566,7 +120925,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -120857,7 +121216,7 @@ in sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.2" + sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -121148,7 +121507,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" @@ -121220,7 +121579,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -121472,13 +121831,9 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.10.3" + sources."streamx-2.11.0" sources."string-width-4.2.2" - (sources."string2compact-1.3.0" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) + sources."string2compact-1.3.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -121698,7 +122053,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.5" + sources."@types/node-15.14.7" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -122404,7 +122759,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.2" // { + (sources."tar-6.1.6" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -122587,7 +122942,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.10" + sources."@types/node-16.4.12" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From 3e97a1f670cb0326969ba54f8a7866286c2224c9 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey <maxeaubrey@gmail.com> Date: Wed, 28 Jul 2021 20:57:52 +0200 Subject: [PATCH 1466/1522] vault-bin: 1.7.3 -> 1.8.0 --- pkgs/tools/security/vault/default.nix | 17 ++++++++--------- pkgs/tools/security/vault/vault-bin.nix | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index d502cc779c2..e5b8b370ff3 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -21,15 +21,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-tags=vault" - "-ldflags=\ - -s -w \ - -X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev} \ - -X github.com/hashicorp/vault/sdk/version.Version=${version} \ - -X github.com/hashicorp/vault/sdk/version.VersionPrerelease=") - ''; + buildFlagsArray = [ "-tags=vault" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}" + "-X github.com/hashicorp/vault/sdk/version.Version=${version}" + "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease=" + ]; postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 68df6e557f6..89ee2f2f279 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.7.3"; + version = "1.8.0"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-hFMTKpO3VcCondSy8amb1K8G+BZ7gZF/EXCAg5Ax4D8="; + sha256 = "sha256-H+kPDE8xuu2lgENf4t+vCb+Tni+ChkB8K5ZEgIY3Jyo="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "02wbbzffb2m7y3476l5qa5dhi0v30f3sfif0svqhhzh927kg4s5w"; + sha256 = "19c7d7yr5nm1xgrkh46pcgwwxa6iic6is06n343qaxcj0dfg43kn"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0sw56dhjbasdnlwg668swhyxrn5gy7h9gysdg96za4dhq3iimkrn"; + sha256 = "0zql0r6gmq0yqb1cbpjgwsg6cky9y43n5gsvijp6snhnp86bicdr"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0c2w0684adaqildwviajp6pi8vp76g4zwwgc1k2bb5mwv1h2y293"; + sha256 = "1ajkgkanq8ijcxbb5zbn9z25r0v7qcq13ivjqr0x7ql5bxm3xfmc"; }; }; From ea78c0ca73b91e5bf389d1afa4dc76c02a7bfdd7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 5 Aug 2021 07:44:25 +1000 Subject: [PATCH 1467/1522] gh: 1.13.1 -> 1.14.0 https://github.com/cli/cli/releases/tag/v1.14.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index a7ca5c4eaa6..5086657a56e 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-6ur1ZIJRghkZk5tLMJUmKn+XfjVGFE0MRSQ/Uz+Eans="; + sha256 = "sha256-JCuJliBr1IPdwGG9T0Bx5DhtHw8tJ45mteRLxRbkyio="; }; - vendorSha256 = "sha256-JJNyzMYAQT/pS1+eGYQsUpxDiwa6DP7JWhIBuTtnOiE="; + vendorSha256 = "sha256-6H56jf4QV+DdsiCetyhpXp6NHc86Hzo+CuqF06dL26A="; nativeBuildInputs = [ installShellFiles ]; From bcc7a902d58555306065f62032be9fb991f906e3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson <robert@rycee.net> Date: Tue, 3 Aug 2021 23:04:48 +0200 Subject: [PATCH 1468/1522] nixos postgresql-backup: add `compression` option This option allows basic configuration of the compression technique used in the backup script. Specifically it adds `none` and `zstd` as new alternatives, keeping `gzip` as the default. --- .../services/backup/postgresql-backup.nix | 45 +++++++++++++++---- nixos/tests/postgresql.nix | 36 ++++++++++++--- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index f658eb756f7..bcc135005e1 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -7,28 +7,49 @@ let cfg = config.services.postgresqlBackup; postgresqlBackupService = db: dumpCmd: - { + let + compressSuffixes = { + "none" = ""; + "gzip" = ".gz"; + "zstd" = ".zstd"; + }; + compressSuffix = getAttr cfg.compression compressSuffixes; + + compressCmd = getAttr cfg.compression { + "none" = "cat"; + "gzip" = "${pkgs.gzip}/bin/gzip -c"; + "zstd" = "${pkgs.zstd}/bin/zstd -c"; + }; + + mkSqlPath = prefix: suffix: "${cfg.location}/${db}${prefix}.sql${suffix}"; + curFile = mkSqlPath "" compressSuffix; + prevFile = mkSqlPath ".prev" compressSuffix; + prevFiles = map (mkSqlPath ".prev") (attrValues compressSuffixes); + inProgressFile = mkSqlPath ".in-progress" compressSuffix; + in { enable = true; description = "Backup of ${db} database(s)"; requires = [ "postgresql.service" ]; - path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ]; + path = [ pkgs.coreutils config.services.postgresql.package ]; script = '' set -e -o pipefail umask 0077 # ensure backup is only readable by postgres user - if [ -e ${cfg.location}/${db}.sql.gz ]; then - mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz + if [ -e ${curFile} ]; then + rm -f ${toString prevFiles} + mv ${curFile} ${prevFile} fi - ${dumpCmd} | \ - gzip -c > ${cfg.location}/${db}.in-progress.sql.gz + ${dumpCmd} \ + | ${compressCmd} \ + > ${inProgressFile} - mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz + mv ${inProgressFile} ${curFile} ''; serviceConfig = { @@ -87,7 +108,7 @@ in { default = "/var/backup/postgresql"; type = types.path; description = '' - Location to put the gzipped PostgreSQL database dumps. + Path of directory where the PostgreSQL database dumps will be placed. ''; }; @@ -101,6 +122,14 @@ in { when no databases where specified. ''; }; + + compression = mkOption { + type = types.enum ["none" "gzip" "zstd"]; + default = "gzip"; + description = '' + The type of compression to use on the generated database dump. + ''; + }; }; }; diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 0369a070719..4e5f9216967 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -43,6 +43,7 @@ let testScript = let backupName = if backup-all then "all" else "postgres"; backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres"; + backupFileBase = "/var/backup/postgresql/${backupName}"; in '' def check_count(statement, lines): return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( @@ -72,9 +73,32 @@ let with subtest("Backup service works"): machine.succeed( "systemctl start ${backupService}.service", - "zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'", + "zcat ${backupFileBase}.sql.gz | grep '<test>ok</test>'", "ls -hal /var/backup/postgresql/ >/dev/console", - "stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600", + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + ) + with subtest("Backup service removes prev files"): + machine.succeed( + # Create dummy prev files. + "touch ${backupFileBase}.prev.sql{,.gz,.zstd}", + "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}", + + # Run backup. + "systemctl start ${backupService}.service", + "ls -hal /var/backup/postgresql/ >/dev/console", + + # Since nothing has changed in the database, the cur and prev files + # should match. + "zcat ${backupFileBase}.sql.gz | grep '<test>ok</test>'", + "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz", + + # The prev files with unused suffix should be removed. + "[ ! -f '${backupFileBase}.prev.sql' ]", + "[ ! -f '${backupFileBase}.prev.sql.zstd' ]", + + # Both cur and prev file should only be accessible by the postgres user. + "stat -c '%a' ${backupFileBase}.sql.gz | grep 600", + "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600", ) with subtest("Backup service fails gracefully"): # Sabotage the backup process @@ -84,8 +108,8 @@ let ) machine.succeed( "ls -hal /var/backup/postgresql/ >/dev/console", - "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'", - "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", + "zcat ${backupFileBase}.prev.sql.gz | grep '<test>ok</test>'", + "stat ${backupFileBase}.in-progress.sql.gz", ) # In a previous version, the second run would overwrite prev.sql.gz, # so we test a second run as well. @@ -93,8 +117,8 @@ let "systemctl start ${backupService}.service", ) machine.succeed( - "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", - "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'", + "stat ${backupFileBase}.in-progress.sql.gz", + "zcat ${backupFileBase}.prev.sql.gz | grep '<test>ok</test>'", ) From 02b32550db7521eb1616175e8bb0c82968c412bb Mon Sep 17 00:00:00 2001 From: Atkins Chang <atkinschang@gmail.com> Date: Thu, 5 Aug 2021 06:33:21 +0800 Subject: [PATCH 1469/1522] cargo-tarpaulin: support darwin Signed-off-by: Atkins Chang <atkinschang@gmail.com> --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index ebbfa619fed..338c711e527 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, curl, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ curl Security ]; cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; #checkFlags = [ "--test-threads" "1" ]; @@ -25,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xd009642/tarpaulin"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ hugoreeves ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7766eb1f26..3785ffbc08c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12151,7 +12151,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; - cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-update = callPackage ../tools/package-management/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; }; From d256a84feca5bd75be3b7b2027e720c5e3e5a452 Mon Sep 17 00:00:00 2001 From: "maxine [they]" <35892750+maxeaubrey@users.noreply.github.com> Date: Thu, 5 Aug 2021 00:54:03 +0200 Subject: [PATCH 1470/1522] terraform_1_0: 1.0.3 -> 1.0.4 (#132711) --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8d13fab793c..9bc10753a85 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.3"; - sha256 = "0m7r66nw0nppra90sjhbq5d0f4q525c73q6ncmy6w37j2nixz35z"; + version = "1.0.4"; + sha256 = "09g0ln247scv8mj40gxhkij0li62v0rjm2bsgmvl953aj7g3dlh1"; vendorSha256 = "07pzqvf9lwgc1fadmyam5hn7arlvzrjsplls445738jpn61854gg"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; From 5dde5ea73e532d8dcfb134abc8d98d0f47813cde Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 4 Aug 2021 09:52:49 +1000 Subject: [PATCH 1471/1522] tarsum: init - move from dockerTools.tarsum - remove go from runtime closure --- pkgs/build-support/docker/default.nix | 21 ++------------ pkgs/build-support/docker/tarsum.nix | 42 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 pkgs/build-support/docker/tarsum.nix diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4bda09670ab..86422a760bf 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -5,7 +5,6 @@ callPackage, closureInfo, coreutils, - docker, e2fsprogs, fakeroot, findutils, @@ -17,6 +16,7 @@ moreutils, nix, pigz, + pkgs, rsync, runCommand, runtimeShell, @@ -123,24 +123,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions etc. - tarsum = runCommand "tarsum" { - nativeBuildInputs = [ go ]; - } '' - mkdir tarsum - cd tarsum - - cp ${./tarsum.go} tarsum.go - export GOPATH=$(pwd) - export GOCACHE="$TMPDIR/go-cache" - export GO111MODULE=off - mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum - go build - - mkdir -p $out/bin - - cp tarsum $out/bin/ - ''; + tarsum = pkgs.tarsum; # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM mergeDrvs = { diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/build-support/docker/tarsum.nix new file mode 100644 index 00000000000..734c6b3d5ae --- /dev/null +++ b/pkgs/build-support/docker/tarsum.nix @@ -0,0 +1,42 @@ +{ stdenv, go, docker, nixosTests }: + +stdenv.mkDerivation { + name = "tarsum"; + + nativeBuildInputs = [ go ]; + disallowedReferences = [ go ]; + + dontUnpack = true; + + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + GO111MODULE = "off"; + + buildPhase = '' + runHook preBuild + mkdir tarsum + cd tarsum + cp ${./tarsum.go} tarsum.go + export GOPATH=$(pwd) + export GOCACHE="$TMPDIR/go-cache" + mkdir -p src/github.com/docker/docker/pkg + ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + go build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp tarsum $out/bin/ + runHook postInstall + ''; + + passthru = { + tests = { + dockerTools = nixosTests.docker-tools; + }; + }; + + meta.platforms = go.meta.platforms; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 412985e644a..31e7e1cf117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -369,6 +369,7 @@ in dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; }; + tarsum = callPackage ../build-support/docker/tarsum.nix { }; snapTools = callPackage ../build-support/snap { }; From 202b9e653658a7b77ebd41c7858cd57b8e8655dc Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Wed, 4 Aug 2021 23:42:13 +0000 Subject: [PATCH 1472/1522] linux: 4.4.277 -> 4.4.278 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9f0f566494d..e74cd257d28 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.277"; + version = "4.4.278"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5"; + sha256 = "1r2sbxn8finzcg72ds5dyh4578vv2s5zwylq3b3xyw3hzr4swn4f"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From aea5caaeab20f2991593c4ccde0bf5d540e8394b Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Wed, 4 Aug 2021 23:42:21 +0000 Subject: [PATCH 1473/1522] linux: 4.9.277 -> 4.9.278 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5d3a556da3d..d88479ee18c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.277"; + version = "4.9.278"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6"; + sha256 = "04byav6cbga3jqkppygm5zj73d9v44xyvx6hbrhwr22lsk282dz7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From ba2b85dbbb72f34dcdce87f1a1d8fe376d5a5e2b Mon Sep 17 00:00:00 2001 From: TredwellGit <tredwell@tutanota.com> Date: Wed, 4 Aug 2021 23:42:35 +0000 Subject: [PATCH 1474/1522] linux: 5.13.7 -> 5.13.8 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 2f2dc1516b2..efa1329153c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.7"; + version = "5.13.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr"; + sha256 = "0a54r71mcyqvq7c8kff817vh6zfj0bdzmp6ql4az84wq9nwc526h"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 5fbdf2ef1f06658c753cf6d69c640c2dac5d1102 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Tue, 20 Jul 2021 19:21:03 -0700 Subject: [PATCH 1475/1522] nixos/moonraker: init --- .../from_md/release-notes/rl-2111.section.xml | 7 + .../manual/release-notes/rl-2111.section.md | 3 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/moonraker.nix | 135 ++++++++++++++++++ 5 files changed, 148 insertions(+) create mode 100644 nixos/modules/services/misc/moonraker.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index e3b94d00552..28ffda321d8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -149,6 +149,13 @@ <link linkend="opt-services.meshcentral.enable">services.meshcentral.enable</link> </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/Arksine/moonraker">moonraker</link>, + an API web server for Klipper. Available as + <link linkend="opt-services.moonraker.enable">moonraker</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index e34c3f4e0b9..c7e6c3dc201 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -45,6 +45,9 @@ pt-services.clipcat.enable). - [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable) +- [moonraker](https://github.com/Arksine/moonraker), an API web server for Klipper. + Available as [moonraker](#opt-services.moonraker.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a6839e02c4f..c2e588bf00d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -349,6 +349,7 @@ in zigbee2mqtt = 317; # shadow = 318; # unused hqplayer = 319; + moonraker = 320; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -652,6 +653,7 @@ in zigbee2mqtt = 317; shadow = 318; hqplayer = 319; + moonraker = 320; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 64b0c83bbae..d3217add69d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -533,6 +533,7 @@ ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/metabase.nix + ./services/misc/moonraker.nix ./services/misc/mwlib.nix ./services/misc/mx-puppet-discord.nix ./services/misc/n8n.nix diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix new file mode 100644 index 00000000000..de8668a0c06 --- /dev/null +++ b/nixos/modules/services/misc/moonraker.nix @@ -0,0 +1,135 @@ +{ config, lib, pkgs, ... }: +with lib; +let + pkg = pkgs.moonraker; + cfg = config.services.moonraker; + format = pkgs.formats.ini { + # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 + listToValue = l: + if builtins.length l == 1 then generators.mkValueStringDefault {} (head l) + else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; + mkKeyValue = generators.mkKeyValueDefault {} ":"; + }; +in { + options = { + services.moonraker = { + enable = mkEnableOption "Moonraker, an API web server for Klipper"; + + klipperSocket = mkOption { + type = types.path; + default = config.services.klipper.apiSocket; + description = "Path to Klipper's API socket."; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/moonraker"; + description = "The directory containing the Moonraker databases."; + }; + + configDir = mkOption { + type = types.path; + default = cfg.stateDir + "/config"; + description = '' + The directory containing client-writable configuration files. + + Clients will be able to edit files in this directory via the API. This directory must be writable. + ''; + }; + + user = mkOption { + type = types.str; + default = "moonraker"; + description = "User account under which Moonraker runs."; + }; + + group = mkOption { + type = types.str; + default = "moonraker"; + description = "Group account under which Moonraker runs."; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "The IP or host to listen on."; + }; + + port = mkOption { + type = types.ints.unsigned; + default = 7125; + description = "The port to listen on."; + }; + + settings = mkOption { + type = format.type; + default = { }; + example = { + authorization = { + trusted_clients = [ "10.0.0.0/24" ]; + cors_domains = [ "https://app.fluidd.xyz" ]; + }; + }; + description = '' + Configuration for Moonraker. See the <link xlink:href="https://moonraker.readthedocs.io/en/latest/configuration/">documentation</link> + for supported values. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = optional (cfg.settings ? update_manager) + ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''; + + users.users = optionalAttrs (cfg.user == "moonraker") { + moonraker = { + group = cfg.group; + uid = config.ids.uids.moonraker; + }; + }; + + users.groups = optionalAttrs (cfg.group == "moonraker") { + moonraker.gid = config.ids.gids.moonraker; + }; + + environment.etc."moonraker.cfg".source = let + forcedConfig = { + server = { + host = cfg.address; + port = cfg.port; + klippy_uds_address = cfg.klipperSocket; + config_path = cfg.configDir; + database_path = "${cfg.stateDir}/database"; + }; + }; + fullConfig = recursiveUpdate cfg.settings forcedConfig; + in format.generate "moonraker.cfg" fullConfig; + + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -" + ]; + + systemd.services.moonraker = { + description = "Moonraker, an API web server for Klipper"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] + ++ optional config.services.klipper.enable "klipper.service"; + + # Moonraker really wants its own config to be writable... + script = '' + cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg + chmod u+w ${cfg.configDir}/moonraker-temp.cfg + exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg + ''; + + serviceConfig = { + WorkingDirectory = cfg.stateDir; + Group = cfg.group; + User = cfg.user; + }; + }; + }; +} From ae863924e2ce5eaf6b7f2e3c2e799f63befa1bd6 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li <hello@zhaofeng.li> Date: Tue, 20 Jul 2021 19:21:03 -0700 Subject: [PATCH 1476/1522] fluidd: init at 1.16.2 --- pkgs/applications/misc/fluidd/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/fluidd/default.nix diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix new file mode 100644 index 00000000000..eee466650e3 --- /dev/null +++ b/pkgs/applications/misc/fluidd/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenvNoCC, fetchurl, unzip }: + +stdenvNoCC.mkDerivation rec { + pname = "fluidd"; + version = "1.16.2"; + + src = fetchurl { + name = "fluidd-v${version}.zip"; + url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; + sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i"; + }; + + nativeBuildInputs = [ unzip ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = '' + mkdir fluidd + unzip $src -d fluidd + ''; + + installPhase = '' + mkdir -p $out/share/fluidd + cp -r fluidd $out/share/fluidd/htdocs + ''; + + meta = with lib; { + description = "Klipper web interface"; + homepage = "https://docs.fluidd.xyz"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a87c3f9095..f2980d15b7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10893,6 +10893,8 @@ in flyctl = callPackage ../development/web/flyctl { }; + fluidd = callPackage ../applications/misc/fluidd { }; + flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; From 9b48ee703d0f15f06029fc77c89f89a5765ee7e0 Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Wed, 4 Aug 2021 22:00:11 -0500 Subject: [PATCH 1477/1522] pg_tileserv: 1.0.7 -> 1.0.8 https://github.com/CrunchyData/pg_tileserv/releases/tag/v1.0.8 --- pkgs/servers/pg_tileserv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index d9ba4e8e6fa..b7f1fa0c1c9 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PHF8n0rjxvajyC/y2sFcdvxQdDFXkxcDZOkYT10UsE4="; + sha256 = "07xj807cbggnh8k7d2i7h326p4wjb8sz5ng0hbdnznvyc4sb2cdw"; }; vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; From edcf3c7179dd71e7501e7758bdedffd910622528 Mon Sep 17 00:00:00 2001 From: figsoda <figsoda@pm.me> Date: Wed, 4 Aug 2021 21:56:29 -0400 Subject: [PATCH 1478/1522] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 144 ++++++++++++++-------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1c93b714f28..d55ef35eb04 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fa032b1b7fde1cb00bfa3e16a0d3ebd37a7d8be4"; - sha256 = "0gdascxqbydpf60rnk9zqrvjjhplc6qgy16k4m5k2x6q1zh7g64a"; + rev = "9eb39348e928e6a89938784e67ba4168c5a295c0"; + sha256 = "18j5zpkkir9yxcvmyggglh76fzny1i9z6pkj2bdszvz8rxw8z88y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-03"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2dfc18f269ea74502cfbb8fed0e6ef5408fc5aea"; - sha256 = "1sf65kgjd8glx2y7jm4ysmk5yn1hrcmprd6ybc2n5gyi9b2ikrzq"; + rev = "681950778d7b4e18cb28d5cc7ba54bc480aad232"; + sha256 = "11g7a86sprfdch68xwabkfr5gv9jpmji587cw1h5cabbzxslrvcg"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1340,12 +1340,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-07-07"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "570577ba3f47baebd9e9019916971bee60e2c2e4"; - sha256 = "05y3dd2w518jcpgbmj83hv8knm92xnagzbv9hknhbs99bgghmp0h"; + rev = "40fc9b306d45921a6b5bd649566d218a41cb04da"; + sha256 = "08bbb1syhdfspdh5303gkf524jr90vkfcx759wv9khz1k9cz975c"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "8e12f8aee2c78e97cb1e99a3c409da1d8c0a13b6"; - sha256 = "0rv03vyndfh4ic0y9d9x3ckxlcf0rvxxa2ahzgqaz17wn4wzl7a9"; + rev = "97942a726bf7e4851d8d1812e910e8f9d489f909"; + sha256 = "1mqgy6jps6g69x1jj3x60hcr3szpfnwvvyjyafqbd3wpc313pnwq"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2231,12 +2231,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "0bac1e1a73c4f7e1ab9cca5f9f5ca557eb65c246"; - sha256 = "0gxmn5kiwgxbkh3hghiqsq6jg5bkbcn8lk6yz6fjrs9ndb917hvc"; + rev = "f452ba25ecae318c591b4e6983aa5bd9ac6fd8e6"; + sha256 = "13aqr4gigpjjz0g25y8q48hb0sfa6xxgp0lr8hk1ykv8w0nwlgra"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2388,12 +2388,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-07-01"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "6ff9e9938badea96f64154f2991e165e8d340cf2"; - sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb"; + rev = "9d7d6af330f9cbd7d4d536b5952b71a64790621d"; + sha256 = "1vzwa0nrwvfpiqvaad4jykpx1h5blsl3l125xzhx7vxgksmmrxbs"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2628,12 +2628,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "8668745f3209a79204056d076d23a69d540b9156"; - sha256 = "09fy66ifj5nxg57vs4mdz3nyyl447a0qc8idvbd64xi4h2kavcf8"; + rev = "9a9a28e58cb00935486acf49fba8683e8b2de22a"; + sha256 = "0m1y6lwr7gqwshmrr3yzvbbsbrva3h276cj2fnczgchqbix9jzvi"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2712,12 +2712,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "fbec3fe2b885ef365431146296bcce29de9478a8"; - sha256 = "1d6mp96gx03n5087zwsydm33zyll8daw03wx3lsg0wpvp5ph43cd"; + rev = "444f5e0a27ca58040c33715be8c3b6051db17230"; + sha256 = "0rijkdsnxdkyrrpib0qlszjkkx33cm3nb9spcmjrcqi6674kyq88"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2c9690964b91e34b421326dc4839b322a7b1a6cd"; - sha256 = "0cany30kzcf2qy0lfhalxcinnyz7ff3ss3cxx2x9fmh74b9jhgrk"; + rev = "bbaf11b0104f921348a1e8f8a9f211c86e6867e1"; + sha256 = "15vkqy1nf0yi6y94npzlqncblh2h4mlhji4wwsdlbk86c493j4wj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3708,24 +3708,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "f6eb9e06c4575945e7a20d87ac8968f84d18d608"; - sha256 = "1kz7fm2aqg2jqmjw2dyjc506j6hgkv7vgqrl7fdxdabsss581cs5"; + rev = "9465c24cb8f4293569f6a4e937a3a38a4416a072"; + sha256 = "0l484w17bb0kdk1k7dhxj5322a8xsh374ma6yci92jh7sv3dp60f"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "ada900452b2f7100c5e6bafafb87ec2979f1b423"; - sha256 = "1qiisd6r1571b9f2agc7xphrh2a7g24yz9a2xaajissxddf3330g"; + rev = "52d60a93013fa2dbbefce6e8b000f08ea0ca8a36"; + sha256 = "0pib5gmryixn6j0cshkl94syzd5jribj6spdjdj85s6z0r55qck8"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3936,12 +3936,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-07-27"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "80ec3ba1aa3fd4005c4679b7b03da37435bc1654"; - sha256 = "1pmg2qp6sdk2ijcav4s1la1zax05cwd9vvbrr3s283lqsqwzflax"; + rev = "64389d5956df699c9c671e00818cc4039edb7dd9"; + sha256 = "0q72jsyldpk9x3whjh8pggiscrir614zl9d65cbzrlklmmpif6d6"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4477,12 +4477,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2021-07-22"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "6bd1b891ecf6c5c054442c6934965714d5ffe834"; - sha256 = "1a5dw5y359jbvd3yr9sjxjbjwqrgvmwdv9y1jifqk7s5p0y0b4jg"; + rev = "75eb226fe32ef18add0fc70715cbcc7550ecb698"; + sha256 = "12skmq1zlpkk8y05503p01rxfdkqdl3mdhf8bbgq3f2ky7d7iarj"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5068,12 +5068,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-08-02"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "23ea1961b97b6d33bb7226d7415d9c3338defa13"; - sha256 = "11zvsclgfrc05q4k0sj14h596hv5gfh00dx3h987w2hawn0qbsk8"; + rev = "cd74f18d10d3d89d6088ec6d6d8400f9f1845c08"; + sha256 = "0s89lsc6hi110d7wj3gaflra3wsqs87pb5pa1vrqg5wvmsn77jzx"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5140,12 +5140,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-07-14"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "5173a42d4a306567a90c41fb90ee660a3274d34f"; - sha256 = "0baphixbfwq3fd3wcxf1fjgb7qwr7l0p6c8rpqf80msb0d7ikv77"; + rev = "31e8158d54ce945dc416b1f53df827aa3c096c55"; + sha256 = "1q2bf21gymjjx603159x59sg1ahwgsqais6q5laz4cpcwmxmwq7f"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5213,12 +5213,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-03"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f8caad1d6bd19dbd79945850342b49df41928525"; - sha256 = "1liwcrb5w5s9bgniz6byw1c68x42z6162lsshhl1cm8s5ywh4sn5"; + rev = "e7362e999683b4a0d18ec51656de93a9a9d98091"; + sha256 = "1hqsscl6xl6qf4vczn9sczz4ymzijmw7n66bfdipc5ikn9aydxcn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5790,12 +5790,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-07-18"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b861f9d2483a8b066f7b5b4dbae8990ff21455c5"; - sha256 = "0rz7p95ks4ymdwz7aqahc782msdz70qx25807cwvqh1gc9x887vq"; + rev = "0cfd829c92a6fd208bfdcbdd2881105462224636"; + sha256 = "1jl6j7pq5klcr5rf2vmwrqvzx1y7paywhfw96dfk6397rxsga058"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7038,12 +7038,12 @@ final: prev: vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-06-13"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "73bd562267d3dea92b6e8dd1f0e3caca024927ad"; - sha256 = "01x0y5ma7wz2yjcq12zzlmkn8x4yz4gcmxmkyrcy127pnhjn8a23"; + rev = "1e205910e67003ff9efb77e7730f1e49d8aae29c"; + sha256 = "1z7vx4x4flx6853a70vk2bcnv52ra3z275g1i30pjzc5blsbw6hw"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -8469,12 +8469,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-07-26"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "f92bf8c0b343870faec2be09243ca0d778524049"; - sha256 = "06s46pl9gz6802nfcdfa3bgvzfhlc3bhi5qxnl185jn5mv6vz50i"; + rev = "980147f64d708652aad1e67d8b39c17b2dd07702"; + sha256 = "0851b22an00p6i2xbc18zx3z5ik5k8nfr6is2fcbsqhlks0g7cgf"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -8901,12 +8901,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-07-16"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "f1b72d866d6564075a8b0da1f179c0b7de723131"; - sha256 = "1vfpf0mjwk519gdly44f0ixc5y4609j33fsjsfzwgcmp3xgmf081"; + rev = "95c6f94bd5849e533542c2e375e3347c7faa1c58"; + sha256 = "023p5x6h8jwsxv724r6dgy0hh0bi0j0jfq68klm0shl68q4g5awq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9442,12 +9442,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-08-02"; + version = "2021-08-05"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "015c02c0246150d87f66e88f226e73e37a296191"; - sha256 = "01m20bng31bs8r99bayw6qrkg5p1pqnwpc9k6cljpn7a52gbapwk"; + rev = "daab513799f88bcc88e6d7ba361826d21dfdfa61"; + sha256 = "0ccrf88abc1ibswzvb1l5qdm6xsxip0gk4yds9128s205n1bl32v"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9598,12 +9598,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-07-19"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "e1be98dc050b8c5196e324cb4236e8c4b44483e6"; - sha256 = "12gr0v2r91q75v1wfrskp330zlyibshngs11if9nlxpnhgz8f6dn"; + rev = "dd1a4d7e05c79a48ef4f22400af2aff1b2e09ddd"; + sha256 = "18sfwc36m7c901lfdk3f5mlx4bhk0vdg4qb54j4fr487hg89vnfc"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9803,12 +9803,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-02"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b704fd3dc9979ca6b9ddf2894177af950a01f0be"; - sha256 = "17rwbfq1vxd9ar6dwwq380qq1vkqwz6nq3x22bkbhj4jdaqp069x"; + rev = "078292ed7efb95a5ff6c4cf21f4273ae599af2bd"; + sha256 = "0hk4wx89blvimw5vgkxri2ci4k2dhflwkj5mshc0k8v7bidli8m4"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9827,12 +9827,12 @@ final: prev: vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { pname = "vimway-lsp-diag-nvim"; - version = "2021-07-23"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "onsails"; repo = "vimway-lsp-diag.nvim"; - rev = "28c23ed9dc499410b4bd0ac040e48c76560b18b7"; - sha256 = "1fdmg6xhhqdhk4hykhhxw55d11gcb932b2iz2sk7f4bps8c2lgg9"; + rev = "4de4ba1b545203660be3ab935c4ed3063aebde78"; + sha256 = "12fmm80xw72k4dmcxal1ypyjgd5qvkwgsmmj7jzn5b4z2iddn302"; }; meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; }; From 48ad5bae56916e64c6b6284633cb77f2738a3f5c Mon Sep 17 00:00:00 2001 From: figsoda <figsoda@pm.me> Date: Wed, 4 Aug 2021 21:56:51 -0400 Subject: [PATCH 1479/1522] vimPlugins.nvim-notify: init at 2021-08-04 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d55ef35eb04..0a1cd947e6b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3802,6 +3802,18 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; + nvim-notify = buildVimPluginFrom2Nix { + pname = "nvim-notify"; + version = "2021-08-04"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "nvim-notify"; + rev = "bc18fb4552f051639eade5318f1d538ffe0302f5"; + sha256 = "1l5fi8c59zqyjgkikbrxas4klfa11j17bl72qxg3kj8isnfalspj"; + }; + meta.homepage = "https://github.com/rcarriga/nvim-notify/"; + }; + nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; version = "2021-07-05"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d2079702db3..d74ebb3601d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -565,6 +565,7 @@ ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog rcarriga/nvim-dap-ui +rcarriga/nvim-notify rcarriga/vim-ultest rhysd/committia.vim rhysd/conflict-marker.vim From 725ef07e543a6f60b534036c684d44e57bb8d5de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Thu, 5 Aug 2021 04:14:34 +0000 Subject: [PATCH 1480/1522] chamber: 2.10.1 -> 2.10.2 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 4a26603a134..524970925dd 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y="; + sha256 = "sha256-JPc57s5FIoZJNKNpd5OO4vZ3j7bPTQSBcJUeNhGvOgk="; }; CGO_ENABLED = 0; From 868501bc9b3372a8cd0ec268f69c13964ad1595a Mon Sep 17 00:00:00 2001 From: Jonas Heinrich <onny@project-insanity.org> Date: Mon, 2 Aug 2021 20:39:07 +0200 Subject: [PATCH 1481/1522] pdfmixtool: init at 1.0.2 --- .../office/pdfmixtool/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/office/pdfmixtool/default.nix diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix new file mode 100644 index 00000000000..7d874015dc2 --- /dev/null +++ b/pkgs/applications/office/pdfmixtool/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, pkg-config +, qtbase +, qttools +, qpdf +, podofo +}: + +mkDerivation rec { + pname = "pdfmixtool"; + version = "1.0.2"; + + src = fetchFromGitLab { + owner = "scarpetta"; + repo = pname; + rev = "v${version}"; + sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + qtbase + qttools + qpdf + podofo + ]; + + meta = with lib; { + description = "An application to split, merge, rotate and mix PDF files"; + homepage = "https://gitlab.com/scarpetta/pdfmixtool"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db6277f18b..51baeb5e30d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26159,6 +26159,8 @@ in pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; + pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { }; From c7b2a9d1ba191af593754169fa098b8d4cfd12f0 Mon Sep 17 00:00:00 2001 From: polynomialspace <45617594+polynomialspace@users.noreply.github.com> Date: Wed, 4 Aug 2021 23:33:54 -0600 Subject: [PATCH 1482/1522] google-cloud-sdk: bump 351.0.0, add i686- and aarch64-linux systems i dident test thsi : ) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 924c6c745ce..7e4316bf52e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,23 +21,33 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk"; + sha256 = "1a17bbvimdqq4k25lprqk9cq3lpfchd65hzjf23ha4imndpbjgqr"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla"; + sha256 = "184k1kv10g4zzzxgmwpakvg5ffxhz01dd01kb5h32mf1j5fid1zh"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6"; + sha256 = "0hhaq5hf5nvaah06h6v8q2hpn8hc815ihsi74dpwg6pmg9h266pr"; + }; + + i686-linux = { + url = "${baseUrl}/${name}-linux-x86.tar.gz"; + sha256 = "14z1nzwc0j3qhbw2ldrskd8zjsslwgsw7pxxq3v0ypc1rjibsql5"; + }; + + aarch64-linux = { + url = "${baseUrl}/${name}-linux-arm.tar.gz"; + sha256 = "0f6xrij2wbx57s4897bi12l9fz3flj1wyibbk7jjg0l5332h4yhr"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "350.0.0"; + version = "351.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); @@ -114,6 +124,6 @@ in stdenv.mkDerivation rec { license = licenses.free; homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; } From a1de1fc28b27da87a84a0b4c9128972ac4a48193 Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski <mikolaj.galkowski@gmail.com> Date: Thu, 5 Aug 2021 08:17:58 +0200 Subject: [PATCH 1483/1522] unityhub: add missing dependency (cacert) --- pkgs/development/tools/unityhub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 27453ed5988..e60e0b77331 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio libxml2 icu clang + libselinux pciutils libpulseaudio libxml2 icu clang cacert ]); profile = '' From 6dc0549183672acd39d735a465098ca9deeff6ad Mon Sep 17 00:00:00 2001 From: Mario Rodas <marsam@users.noreply.github.com> Date: Wed, 4 Aug 2021 19:42:47 -0500 Subject: [PATCH 1484/1522] syncthing: 1.18.0 -> 1.18.1 https://github.com/syncthing/syncthing/releases/tag/v1.18.1 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9db0abd0cb0..a0ab6304e34 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,13 +4,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0hrdlc1dxbxvqxylk0i2f110c6bfp9azsnzqzmjj2b29xxbrmwca"; + sha256 = "1sm4d0pjgk0spz9pddqb3i8hli10pibd5xs18mhcwrhnxj2xky1y"; }; vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6"; From 9ec1f8f88f7818aacce7df23ad3d775e8d9f8ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Thu, 5 Aug 2021 07:24:13 +0200 Subject: [PATCH 1485/1522] Partial revert "Convert phases that contain ":" to dont* = true" This reverts commit dc48d23a0f578d069f10d13671abe552d85a2050. This deactivated custom build phases in many vim plugins overrides. Also we could change our overrides it may break out-of-tree usage. --- pkgs/misc/vim-plugins/build-vim-plugin.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index c490f943d43..3c623f08a16 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -54,7 +54,8 @@ rec { })); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ - dontBuild = true; - dontConfigure = true; + # vim plugins may override this + buildPhase = ":"; + configurePhase =":"; } // attrs); } From e5cb1134cddea2eb30acbb4bc46cf084a1075f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Thu, 5 Aug 2021 08:58:50 +0200 Subject: [PATCH 1486/1522] vim-plugins: remove workaround --- pkgs/misc/vim-plugins/overrides.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 086877dd5a1..af0c6d4c806 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -501,10 +501,7 @@ self: super: { telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; - - dontBuild = false; buildPhase = "make"; - meta.platforms = lib.platforms.all; }); From 59538cea8265f3df929388098c2204754776ab6a Mon Sep 17 00:00:00 2001 From: oxalica <oxalicc@pm.me> Date: Thu, 5 Aug 2021 15:04:33 +0800 Subject: [PATCH 1487/1522] osu-lazer: remove temper detection bypass patch See #132610 --- .../osu-lazer/bypass-tamper-detection.patch | 23 ------------------- pkgs/games/osu-lazer/default.nix | 3 --- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/games/osu-lazer/bypass-tamper-detection.patch diff --git a/pkgs/games/osu-lazer/bypass-tamper-detection.patch b/pkgs/games/osu-lazer/bypass-tamper-detection.patch deleted file mode 100644 index 576f83a96c5..00000000000 --- a/pkgs/games/osu-lazer/bypass-tamper-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs -index 98f60d52d..a27ce47ca 100644 ---- a/osu.Game/OsuGameBase.cs -+++ b/osu.Game/OsuGameBase.cs -@@ -135,17 +135,7 @@ public OsuGameBase() - [BackgroundDependencyLoader] - private void load() - { -- try -- { -- using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location)) -- VersionHash = str.ComputeMD5Hash(); -- } -- catch -- { -- // special case for android builds, which can't read DLLs from a packed apk. -- // should eventually be handled in a better way. -- VersionHash = $"{Version}-{RuntimeInfo.OS}".ComputeMD5Hash(); -- } -+ VersionHash = "253aa3a3a356a71295bf5b018cd4fda1"; - - Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly)); - diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 55f9bfb75c3..99f188c7476 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -25,9 +25,6 @@ in stdenv.mkDerivation rec { sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0="; }; - patches = [ ./bypass-tamper-detection.patch ]; - patchFlags = [ "--binary" "-p1" ]; - nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper # FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49 From 44651f96f3d723f8e1270f157b48ee42289e0c1f Mon Sep 17 00:00:00 2001 From: Bobby Rong <rjl931189261@126.com> Date: Thu, 5 Aug 2021 15:20:31 +0800 Subject: [PATCH 1488/1522] olifant: drop package --- pkgs/applications/misc/olifant/default.nix | 69 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/applications/misc/olifant/default.nix diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix deleted file mode 100644 index 48fe90423a9..00000000000 --- a/pkgs/applications/misc/olifant/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, fetchpatch -, vala -, meson -, ninja -, pkg-config -, python3 -, libgee -, gsettings-desktop-schemas -, gnome -, pantheon -, wrapGAppsHook -, gtk3 -, json-glib -, glib -, glib-networking -}: - -stdenv.mkDerivation rec { - pname = "olifant"; - version = "0.2.1-beta6"; - - src = fetchFromGitHub { - owner = "cleac"; - repo = pname; - rev = version; - sha256 = "sha256-3hnEa4Q1dH0R8Jp+Ew0+dH1PEm3F+56jYwqhJ+vll4M="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - glib - glib-networking - gnome.libsoup - gsettings-desktop-schemas - gtk3 - json-glib - libgee - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; - homepage = "https://github.com/cleac/olifant"; - license = licenses.gpl3; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3f977123d29..704320f9362 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -538,6 +538,7 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 ofp = throw "ofp is not compatible with odp-dpdk"; + olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 openexr_ctl = ctl; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db6277f18b..bc0e34823d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27891,8 +27891,6 @@ in neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - olifant = callPackage ../applications/misc/olifant { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { gtk = pkgs.gtk3; }; From 380b350fb3b1dc3c0751a8aab88706d8366b4796 Mon Sep 17 00:00:00 2001 From: Arnout Engelen <arnout@bzzt.net> Date: Thu, 5 Aug 2021 09:20:41 +0200 Subject: [PATCH 1489/1522] jre-minimal: remove unnecessary test file Looks like we meant to move this file to `tests/test_jre_minimal.nix` but somehow we accidentally duplicated it. --- .../compilers/openjdk/jre_minimal_test1.nix | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pkgs/development/compilers/openjdk/jre_minimal_test1.nix diff --git a/pkgs/development/compilers/openjdk/jre_minimal_test1.nix b/pkgs/development/compilers/openjdk/jre_minimal_test1.nix deleted file mode 100644 index eebd11fb2fd..00000000000 --- a/pkgs/development/compilers/openjdk/jre_minimal_test1.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ runCommand -, callPackage -, jdk -, jre_minimal -}: - -let - hello = callPackage tests/hello.nix { - jdk = jdk; - jre = jre_minimal; - }; -in - runCommand "test" {} '' - ${hello}/bin/hello | grep "Hello, world!" - touch $out - '' From 39e7ea6b4751458cc9ba957502332fd95e867a44 Mon Sep 17 00:00:00 2001 From: Guillaume Girol <symphorien@users.noreply.github.com> Date: Thu, 5 Aug 2021 07:26:28 +0000 Subject: [PATCH 1490/1522] qtkeychain: 0.9.1 -> 0.12.0 (#132457) --- .../0001-Fixes-build-with-Qt4.patch | 25 ------------------- .../libraries/qtkeychain/default.nix | 23 +++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/qt5-packages.nix | 2 +- 5 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch deleted file mode 100644 index 4cd7214e61e..00000000000 --- a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001 -From: Samuel Dionne-Riel <samuel@dionne-riel.com> -Date: Tue, 4 Sep 2018 23:19:29 -0400 -Subject: [PATCH] Fixes build with Qt4. - ---- - keychain_unix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keychain_unix.cpp b/keychain_unix.cpp -index 30b26c3..b27ebef 100644 ---- a/keychain_unix.cpp -+++ b/keychain_unix.cpp -@@ -91,7 +91,7 @@ static bool isKwallet5Available() - // a wallet can be opened. - - iface.setTimeout(500); -- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); -+ QDBusMessage reply = iface.call("networkWallet"); - return reply.type() == QDBusMessage::ReplyMessage; - } - --- -2.16.4 - diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 3da0587210d..0d3528e92f8 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,27 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null -, withQt5 ? false, qtbase ? null, qttools ? null -, darwin ? null +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools +, CoreFoundation, Security , libsecret }: -assert withQt5 -> qtbase != null; -assert withQt5 -> qttools != null; -assert stdenv.isDarwin -> darwin != null; - stdenv.mkDerivation rec { - name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` + pname = "qtkeychain"; + version = "0.12.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 + sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1 }; dontWrapQtApps = true; - patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); + patches = [ ./0002-Fix-install-name-Darwin.patch ]; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; @@ -30,10 +25,10 @@ stdenv.mkDerivation rec { ; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ [ qtbase qttools ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security - ]) + ] ; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3f977123d29..bf8154233b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -686,6 +686,7 @@ mapAliases ({ qvim = throw "qvim has been removed."; # added 2020-08-31 qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 qwt6 = libsForQt5.qwt; # added 2015-12-19 + qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04 qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ca7c456ad1..b294ad778e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18278,8 +18278,6 @@ in qtEnv = qt5.env; qt5Full = qt5.full; - qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 4c3518436de..b98cbd08306 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -183,7 +183,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - withQt5 = true; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; From 6af58863a951101aa6e4b12184264061d6bdb98a Mon Sep 17 00:00:00 2001 From: Bobby Rong <rjl931189261@126.com> Date: Thu, 5 Aug 2021 15:51:06 +0800 Subject: [PATCH 1491/1522] aesop: drop package --- pkgs/applications/office/aesop/default.nix | 53 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/applications/office/aesop/default.nix diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix deleted file mode 100644 index 0e151f3adbe..00000000000 --- a/pkgs/applications/office/aesop/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, gtk3 -, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "aesop"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "lainsce"; - repo = pname; - rev = version; - sha256 = "1zxyyxl959rqhyz871dyyccqga2ydybkfcpyjq4vmvdn2g9mvmb0"; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - pantheon.elementary-icon-theme - libgee - pantheon.granite - gtk3 - json-glib - libsoup - poppler - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "The simplest PDF viewer around"; - homepage = "https://github.com/lainsce/aesop"; - license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3f977123d29..1c9b4561eec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; # added 2013-11-04 adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 + aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db6277f18b..9f4f84358fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23321,8 +23321,6 @@ in autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - aesop = callPackage ../applications/office/aesop { }; - AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; From 3198bfe23b2535ad7cd3d8078dc72d03f724560a Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:28:49 +0300 Subject: [PATCH 1492/1522] kde-frameworks: 5.81 -> 5.83 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 55c1e02a955..06b49105653 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.81/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.83/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3d5ad663dd3..a679fefa6da 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/attica-5.81.0.tar.xz"; - sha256 = "0x1ga3y0kmr2ybgvsmns7imd0agfd5bfc2lf0010ks5s1v50whqr"; - name = "attica-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/attica-5.83.0.tar.xz"; + sha256 = "1vmb0ril1z5f5zfazm2py9mjj7g95m98km9h7xl1cp4zkmllgj26"; + name = "attica-5.83.0.tar.xz"; }; }; baloo = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/baloo-5.81.0.tar.xz"; - sha256 = "0mnm282mc1yph9x08fkrycb22gsah4km8r7yk3kz20vnrs0wgljy"; - name = "baloo-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/baloo-5.83.0.tar.xz"; + sha256 = "0ahhs07s2q64c1ybqyy2l539awjj36v4rhkr2jxlj4j3m89smbss"; + name = "baloo-5.83.0.tar.xz"; }; }; bluez-qt = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/bluez-qt-5.81.0.tar.xz"; - sha256 = "13wy3nzbq26616s7pa0sx0jrq81v3bvf6a6dlmp1zzycvbk06jp3"; - name = "bluez-qt-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/bluez-qt-5.83.0.tar.xz"; + sha256 = "0fvdac35niy96sn2rbprn8g7can452q9q9n5cf4kma7wznndmf8v"; + name = "bluez-qt-5.83.0.tar.xz"; }; }; breeze-icons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/breeze-icons-5.81.0.tar.xz"; - sha256 = "1844jyair0kjflfq98cakis7xfgbdn7an383f02hp4072kjg127g"; - name = "breeze-icons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz"; + sha256 = "1r3g03mam24g490r87qg5dpxzrf9vlg9bvqg38513nfg1i21k0dj"; + name = "breeze-icons-5.83.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/extra-cmake-modules-5.81.0.tar.xz"; - sha256 = "10svwghxf5vhbfwz7lza7xid2n1mj6r1n1amv6c616q68fwf8msz"; - name = "extra-cmake-modules-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/extra-cmake-modules-5.83.0.tar.xz"; + sha256 = "07pqw3c86qzrlja0ykwjr9d82r9szaq0410gy7zhhckzj6rz7dvj"; + name = "extra-cmake-modules-5.83.0.tar.xz"; }; }; frameworkintegration = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/frameworkintegration-5.81.0.tar.xz"; - sha256 = "0vcbm0364zwkyp33nvcl42px6i9hgnp4wl3lg913qvxv1f7pd61v"; - name = "frameworkintegration-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/frameworkintegration-5.83.0.tar.xz"; + sha256 = "1axkysrycxw0y3a152n8r4mbnv9vsafdqfdalndqrmpn5szp2ynj"; + name = "frameworkintegration-5.83.0.tar.xz"; }; }; kactivities = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kactivities-5.81.0.tar.xz"; - sha256 = "0sskfpc8yfic2s8hvzf7cjk92pxd0idd0xl0azrjnn28ci5kvzvq"; - name = "kactivities-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kactivities-5.83.0.tar.xz"; + sha256 = "0yqp75v05dyv5p3zs9qn3cvqhqxq781m8pfip0syhc97x8pckins"; + name = "kactivities-5.83.0.tar.xz"; }; }; kactivities-stats = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kactivities-stats-5.81.0.tar.xz"; - sha256 = "0839g6y101qr5mr98ynfm74f554lxx7srnwm3anh7nj6zrlyxrq2"; - name = "kactivities-stats-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kactivities-stats-5.83.0.tar.xz"; + sha256 = "1l9gnl3zwlk0z3g5wc6h50nlplxw3kmc4zd18rczm48330v1zgr2"; + name = "kactivities-stats-5.83.0.tar.xz"; }; }; kapidox = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kapidox-5.81.0.tar.xz"; - sha256 = "1wq4py1djmcnqf51l52cij43qw44n5fafz00qslxjb0rdakrvzs2"; - name = "kapidox-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kapidox-5.83.0.tar.xz"; + sha256 = "0ixgnm2akays9wiv25snr87358wc0ygnfydhlq0cflqqbyzplqs6"; + name = "kapidox-5.83.0.tar.xz"; }; }; karchive = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/karchive-5.81.0.tar.xz"; - sha256 = "1flnylyglc2jdb9lfk3dl56wzxdliaaqpg2rzrlclzj14lz3l9hy"; - name = "karchive-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/karchive-5.83.0.tar.xz"; + sha256 = "0yg3larnhmfjng7cxbxbmyf3l40ypj5wpyjcq1czfy57a4wrbaaw"; + name = "karchive-5.83.0.tar.xz"; }; }; kauth = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kauth-5.81.0.tar.xz"; - sha256 = "1gf93wk95x1fmi4w3ybkj7acwrv7rlz9nw7f1n4nd1w3w7pn403y"; - name = "kauth-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kauth-5.83.0.tar.xz"; + sha256 = "1z46695aj7mh4sy6sd1gixwr1xgs3xhbqlxcl63i036n37s7sqfb"; + name = "kauth-5.83.0.tar.xz"; }; }; kbookmarks = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kbookmarks-5.81.0.tar.xz"; - sha256 = "0bqgl3vhr5lngajxz7v4l325kcyylj3d1qznaa946dcbsn2wrgzm"; - name = "kbookmarks-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kbookmarks-5.83.0.tar.xz"; + sha256 = "0cp733hpxrhmdjng949215p86kjz64fm30sv386j223iys32h3am"; + name = "kbookmarks-5.83.0.tar.xz"; }; }; kcalendarcore = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcalendarcore-5.81.0.tar.xz"; - sha256 = "0a8m8l94cni1fv38sa9wa1mx1m7bnd7qb66wrjrhdd57cfrjij5s"; - name = "kcalendarcore-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcalendarcore-5.83.0.tar.xz"; + sha256 = "07xgjb4l5nsswkjlw352yaqzdfxfj0qyasb6zqlx09sws88fkjzb"; + name = "kcalendarcore-5.83.0.tar.xz"; }; }; kcmutils = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcmutils-5.81.0.tar.xz"; - sha256 = "15q2wvnz8s1g508jbssszzfcgssamdsp7s1vply1677ga8pcspmj"; - name = "kcmutils-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcmutils-5.83.0.tar.xz"; + sha256 = "0r86g01mx9mjmqflvdsw93d1dzzg4rixi5nkxxswqa5dlm4ybqaf"; + name = "kcmutils-5.83.0.tar.xz"; }; }; kcodecs = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcodecs-5.81.0.tar.xz"; - sha256 = "0r757k1rbz1bjk7mc0b2m0ybixai4qfidrs5wvbci971lfsaz4j3"; - name = "kcodecs-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcodecs-5.83.0.tar.xz"; + sha256 = "0nc3a4z5wfvkfp5czjq5fz8zg2i0pvc5l7dk8g4ch0kasymjqd82"; + name = "kcodecs-5.83.0.tar.xz"; }; }; kcompletion = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcompletion-5.81.0.tar.xz"; - sha256 = "15bw6g4ag1s0s3x6390r05i299kl279jrfajna9fxgq3fbjigb7p"; - name = "kcompletion-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcompletion-5.83.0.tar.xz"; + sha256 = "0jlysdbkmkny7m82hhyx4im2hm3dlj385w99cb7wzcx7wxzrmfwg"; + name = "kcompletion-5.83.0.tar.xz"; }; }; kconfig = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kconfig-5.81.0.tar.xz"; - sha256 = "13xfy3mhi73na4mv0a8l75ba5c8ddnkkdssmsnxp5kj084w9xpqx"; - name = "kconfig-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kconfig-5.83.0.tar.xz"; + sha256 = "1s7fhi7yhw5i4igfimbl0ls095nkl1rnxi2z33bjnam215ba113w"; + name = "kconfig-5.83.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kconfigwidgets-5.81.0.tar.xz"; - sha256 = "1v7xxn6cd17z71cpdyw2qzfqw4vkzy96wwr1zn9dylnvl8mh4xg0"; - name = "kconfigwidgets-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kconfigwidgets-5.83.0.tar.xz"; + sha256 = "1hs0zpggfp08dnra1fdzh652ilgas6c69bck31mglwg0bdrn0cnp"; + name = "kconfigwidgets-5.83.0.tar.xz"; }; }; kcontacts = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcontacts-5.81.0.tar.xz"; - sha256 = "15wkspgxqj6zh2pr3f7xqcahihbhf45qnqay1v56ry3vl42gncg4"; - name = "kcontacts-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcontacts-5.83.0.tar.xz"; + sha256 = "0qy04j860944s7hx0x35wjwbj55l2gr8h0p5yvsw2df9rcwl5b94"; + name = "kcontacts-5.83.0.tar.xz"; }; }; kcoreaddons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcoreaddons-5.81.0.tar.xz"; - sha256 = "1nzyijd8753p9n9fqfb14q30jid2k1j7cvwjqv99l5fxhwbcn35c"; - name = "kcoreaddons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcoreaddons-5.83.0.tar.xz"; + sha256 = "0mwakqbnf97d45xgys9jzalm9p5gp2xaqmjaxxq6r7qm7jv9jg3j"; + name = "kcoreaddons-5.83.0.tar.xz"; }; }; kcrash = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kcrash-5.81.0.tar.xz"; - sha256 = "1irw9blm1xsn26mcyaimd8xnygkdpaqh9m8gpf5gpn2s19iz4f81"; - name = "kcrash-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kcrash-5.83.0.tar.xz"; + sha256 = "1ix4rzg72l32rs78scv3jicymapwf59gwginp5dvwhymxdrh5vr9"; + name = "kcrash-5.83.0.tar.xz"; }; }; kdav = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdav-5.81.0.tar.xz"; - sha256 = "0cxiif5pb8frz0dpqx0f9j7g29iaspx13alwzvzavbmi0bwzs00b"; - name = "kdav-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdav-5.83.0.tar.xz"; + sha256 = "0fd07yiyzq1xzz911sh8nz39hfwai84mykf0zwjafrxsff4165q0"; + name = "kdav-5.83.0.tar.xz"; }; }; kdbusaddons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdbusaddons-5.81.0.tar.xz"; - sha256 = "0gbrmgpd8x16zapbqbyh2ipbvysz3z07qk1fc0cmx5x84x1j7xa9"; - name = "kdbusaddons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdbusaddons-5.83.0.tar.xz"; + sha256 = "01a9jw8xm23f97a54hjqbpq77bb71pc2gsmd6fzcdqq4l71h83qa"; + name = "kdbusaddons-5.83.0.tar.xz"; }; }; kdeclarative = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdeclarative-5.81.0.tar.xz"; - sha256 = "0s6kal2ppw0vskv7baxvbqfip4hzh8s3399c1j7rahdw67nf9k3x"; - name = "kdeclarative-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdeclarative-5.83.0.tar.xz"; + sha256 = "0h6amiq6hpsi0iyfca7q3m6fm0bf1grn236ypj4r2bs1mjxprals"; + name = "kdeclarative-5.83.0.tar.xz"; }; }; kded = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kded-5.81.0.tar.xz"; - sha256 = "1100jrccadj50blq5wmr83wdc3ry46rn86y28dfy4h97cvn1nfsi"; - name = "kded-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kded-5.83.0.tar.xz"; + sha256 = "0fwvl08mkci10y1z57chamiq22krhhs97j3gwjg0ihc7qmmrwcb9"; + name = "kded-5.83.0.tar.xz"; }; }; kdelibs4support = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kdelibs4support-5.81.0.tar.xz"; - sha256 = "1ck3i46k8sjkqgnaygy5pjqbw1np35sc6nhgxxcm7q84q3cdj536"; - name = "kdelibs4support-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kdelibs4support-5.83.0.tar.xz"; + sha256 = "0cp4a37sb0mgshvnvhsxv5s925ksy95z86wv9ng65vkgwd87w6pa"; + name = "kdelibs4support-5.83.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kdesignerplugin-5.81.0.tar.xz"; - sha256 = "1rgnj6bns9dnn0g53xk374knc69ajpprjhyb50ffr0dn7cfcs1s3"; - name = "kdesignerplugin-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kdesignerplugin-5.83.0.tar.xz"; + sha256 = "138c9834xiqa20c6w1ad15lznn6if278wsa2sjc681vwkncg2gr0"; + name = "kdesignerplugin-5.83.0.tar.xz"; }; }; kdesu = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdesu-5.81.0.tar.xz"; - sha256 = "176531kcvpmb4sklrqpvx4msna1radd2ki410700yvk0l2v4l2yy"; - name = "kdesu-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdesu-5.83.0.tar.xz"; + sha256 = "1qqznk92054hivk68l3yx81jnivmz34s9pjafxcazwkpknzxkvwy"; + name = "kdesu-5.83.0.tar.xz"; }; }; kdewebkit = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kdewebkit-5.81.0.tar.xz"; - sha256 = "022dpmw8r5wkb3pr87fycrybv9j5k2wy8d39rilhjvkqk8s65277"; - name = "kdewebkit-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kdewebkit-5.83.0.tar.xz"; + sha256 = "13i5l5q7xz362jvvdbb3zdg70qaz2n3dw95yzzk03yyv6phz4079"; + name = "kdewebkit-5.83.0.tar.xz"; }; }; kdnssd = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdnssd-5.81.0.tar.xz"; - sha256 = "1hl49w55r57abnnwdf4hvyjk7566zbqa24bai3zsq24a4nnm6vii"; - name = "kdnssd-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdnssd-5.83.0.tar.xz"; + sha256 = "1192a0gijzpdmbwwai1iyij24bnbrzxnvxy6dgjdhxvxv7j51xbg"; + name = "kdnssd-5.83.0.tar.xz"; }; }; kdoctools = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kdoctools-5.81.0.tar.xz"; - sha256 = "11qayqx47h4h1y2yqzbm8bysdd7xwb2qjmkk59jxpih7xbmpg1ir"; - name = "kdoctools-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kdoctools-5.83.0.tar.xz"; + sha256 = "0nrrksl5ckmpsk4rl2zhq2b05c1ygm5a2nxa53rgyj03bh6ym96k"; + name = "kdoctools-5.83.0.tar.xz"; }; }; kemoticons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kemoticons-5.81.0.tar.xz"; - sha256 = "17zv96cfmqg9fxrgm91pn8xwp4f03644g2203c3s7iq3bh8ig3gc"; - name = "kemoticons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kemoticons-5.83.0.tar.xz"; + sha256 = "1h74x9khac7ppj8dpzg1wipva7c2kafvym4vllbaphpbiakg0hww"; + name = "kemoticons-5.83.0.tar.xz"; }; }; kfilemetadata = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kfilemetadata-5.81.0.tar.xz"; - sha256 = "0cba7lsjk563ql0hw2rcjxn2khadx1rz7hx4agjb40145f7x931i"; - name = "kfilemetadata-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kfilemetadata-5.83.0.tar.xz"; + sha256 = "13h9jiayh8d3g2jjwvq41jj3kjsr6f79znp6phiyidvyvq7gypfn"; + name = "kfilemetadata-5.83.0.tar.xz"; }; }; kglobalaccel = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kglobalaccel-5.81.0.tar.xz"; - sha256 = "0adqlfmpfsbbfjiljvbyi4f4blx77qp18anx7npkwh5gjn32hczz"; - name = "kglobalaccel-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kglobalaccel-5.83.0.tar.xz"; + sha256 = "1zmg60hjzmvkacdndn5dfc2rgr68q2c9k4hqrx0rf5hnxsxyc1dl"; + name = "kglobalaccel-5.83.0.tar.xz"; }; }; kguiaddons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kguiaddons-5.81.0.tar.xz"; - sha256 = "1q9yrbbsjh98xl3k4yss5h39fd8nz8y5v9sd7vqjmy49mqsyxxz3"; - name = "kguiaddons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kguiaddons-5.83.0.tar.xz"; + sha256 = "1fga0ri62ib6prm7pfx32103zwl4jg87ikxq2b7m6kq87xcjxxij"; + name = "kguiaddons-5.83.0.tar.xz"; }; }; kholidays = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kholidays-5.81.0.tar.xz"; - sha256 = "1pcqzwpmyl6jp9w4xvlgj81iyzbazz2kd07g82cjybz0z3jcxs2c"; - name = "kholidays-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kholidays-5.83.0.tar.xz"; + sha256 = "1i4qvbfn1rlg0x09fv4pviibjlrq8515056wr71mb6vqxyjirhr2"; + name = "kholidays-5.83.0.tar.xz"; }; }; khtml = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/khtml-5.81.0.tar.xz"; - sha256 = "0ag23xwl2f9hiwxnwxvwiz3xr07dxpin49li3q98vqq1qzaj1ngp"; - name = "khtml-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/khtml-5.83.0.tar.xz"; + sha256 = "04zjjgaq7m6wxbi5p1fijvx8sz7imr6x0bjc5cm4i30xgdwa108y"; + name = "khtml-5.83.0.tar.xz"; }; }; ki18n = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/ki18n-5.81.0.tar.xz"; - sha256 = "12m7ddyzw80y9y5gqyr7jgdyc5a0fmxa8zzsd41l7418i2sdajrc"; - name = "ki18n-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/ki18n-5.83.0.tar.xz"; + sha256 = "0ppg9gxcpgbizg7fchb006ii8fb9r5j164rlvxi38394cdky9gfi"; + name = "ki18n-5.83.0.tar.xz"; }; }; kiconthemes = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kiconthemes-5.81.0.tar.xz"; - sha256 = "053a7zdig796zc3rnwdlkscylg6wldn1dk0dxqzn14cb8vkbwizw"; - name = "kiconthemes-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kiconthemes-5.83.0.tar.xz"; + sha256 = "08dys6g9jyw46kba7jqk4bchyg33r84nd0mll2v6v5a9lhk16zws"; + name = "kiconthemes-5.83.0.tar.xz"; }; }; kidletime = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kidletime-5.81.0.tar.xz"; - sha256 = "12zrd9k27hx8ncywd9ahhbcv5xrn7rrw82pcvdkjmyniz0nazrqv"; - name = "kidletime-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kidletime-5.83.0.tar.xz"; + sha256 = "13n9hqzkkk5pspv97f478a4541aqhgddh7g07d78jqsgj8krc3ik"; + name = "kidletime-5.83.0.tar.xz"; }; }; kimageformats = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kimageformats-5.81.0.tar.xz"; - sha256 = "0kl68dy1v4p403f52y7igv2w3wq6q2pb7n0r7fbnwz2113bs0cm3"; - name = "kimageformats-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kimageformats-5.83.0.tar.xz"; + sha256 = "05w9iprmij05sif3jygwsmxa4ih9bf13vsmsifvl4alzpzpnaffw"; + name = "kimageformats-5.83.0.tar.xz"; }; }; kinit = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kinit-5.81.0.tar.xz"; - sha256 = "1wv8qyv4mayi80vczf47mdxxa6km4v7r2kz2j483w53nck5hjz4j"; - name = "kinit-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kinit-5.83.0.tar.xz"; + sha256 = "12lck3646llymcsbkhc6130qhq024lkc9rzm6kv6kc2hcggyhr61"; + name = "kinit-5.83.0.tar.xz"; }; }; kio = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kio-5.81.0.tar.xz"; - sha256 = "0zn0xh07hajcj3h1v5246a167ffm113k8j36p2xn7lbq368sway6"; - name = "kio-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kio-5.83.0.tar.xz"; + sha256 = "1hai5w3k77wnaw576gnhv6db90vng8k4npq2ljbp3jycw0csb9gs"; + name = "kio-5.83.0.tar.xz"; }; }; kirigami2 = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kirigami2-5.81.0.tar.xz"; - sha256 = "1bcc2mfb2s4w67q9q35k04mc9154dx1x03vqzclh9ipzdvyjqmyn"; - name = "kirigami2-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kirigami2-5.83.0.tar.xz"; + sha256 = "0cpwnqg44j3qb8yqlypkrgjf7fj2nmm90bs0dvmc0jg395z6d3jv"; + name = "kirigami2-5.83.0.tar.xz"; }; }; kitemmodels = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kitemmodels-5.81.0.tar.xz"; - sha256 = "0vs75q08x9yi1953rihk3y234wcsjawdxb3g5xb597f961y634w0"; - name = "kitemmodels-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kitemmodels-5.83.0.tar.xz"; + sha256 = "1kyjnqg53s8yn9jglwyx0jqqys5y5m3a49iw1v2ck67wi3vyl3b5"; + name = "kitemmodels-5.83.0.tar.xz"; }; }; kitemviews = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kitemviews-5.81.0.tar.xz"; - sha256 = "0nmhc675bmilqah9fwwzy4p8rksib90cv8iihxd5c9d9snykk01n"; - name = "kitemviews-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kitemviews-5.83.0.tar.xz"; + sha256 = "10p6gpp7mh9cpr1ahg2gh0zq8scd7n856bw899hykdxzajcm06xw"; + name = "kitemviews-5.83.0.tar.xz"; }; }; kjobwidgets = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kjobwidgets-5.81.0.tar.xz"; - sha256 = "1gl8ia858jbmj2i9wp4x0mw27p42xm6mg84nj1a8yvvvbazs3hpa"; - name = "kjobwidgets-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kjobwidgets-5.83.0.tar.xz"; + sha256 = "1rxmjpxps50wdyvihj5k0sn8flap51ljx3w0x9h5l97ffwd3gfgk"; + name = "kjobwidgets-5.83.0.tar.xz"; }; }; kjs = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kjs-5.81.0.tar.xz"; - sha256 = "049aplmp1nlxshwaw0lfhfr09aazxh4vazvb78429gs84j8ir9xr"; - name = "kjs-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kjs-5.83.0.tar.xz"; + sha256 = "1fncc9kaqinm7j60hm0nprxl8wcrj31xqzyiasf5wjcx7sykgg58"; + name = "kjs-5.83.0.tar.xz"; }; }; kjsembed = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kjsembed-5.81.0.tar.xz"; - sha256 = "0zkazfcrmd0gklzda0hbb4mc493ihsd3dafnmyj6cmgk4lz2w3q9"; - name = "kjsembed-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kjsembed-5.83.0.tar.xz"; + sha256 = "0adcihgpgyps5816z4g3hbjaci2z1rkpyzbqz1133cvbcfc41brs"; + name = "kjsembed-5.83.0.tar.xz"; }; }; kmediaplayer = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kmediaplayer-5.81.0.tar.xz"; - sha256 = "0z1ji717kwq84i6b2ay9wjhgc4vdkgn1jvwpzgpc1hqs9zly278b"; - name = "kmediaplayer-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kmediaplayer-5.83.0.tar.xz"; + sha256 = "02qz56201xz0jns91hfsv6aggl201vja1v136qnp96v8dib8wl1m"; + name = "kmediaplayer-5.83.0.tar.xz"; }; }; knewstuff = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/knewstuff-5.81.0.tar.xz"; - sha256 = "0wmf86nndnxs1850bjzbwaag6kjdabz0si7b0p1r6hnwm2km9bnk"; - name = "knewstuff-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/knewstuff-5.83.0.tar.xz"; + sha256 = "11z65hvc5r3522zk2a3fdx2wpf78lbq2dbi4lnxcxbgcbss5qfqc"; + name = "knewstuff-5.83.0.tar.xz"; }; }; knotifications = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/knotifications-5.81.0.tar.xz"; - sha256 = "04yfrhd098asr45swslnfkzxkb9892izvyam5rf0h93pw78ggmqs"; - name = "knotifications-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/knotifications-5.83.0.tar.xz"; + sha256 = "01cdf99cz6v04icqwc5h69j7nzlmm46xkp370zkkhg3k0fzskhic"; + name = "knotifications-5.83.0.tar.xz"; }; }; knotifyconfig = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/knotifyconfig-5.81.0.tar.xz"; - sha256 = "0xrd9771g1x0s796pw6wkhl9jj9607pffmlxrj171c8n8hdfyjbs"; - name = "knotifyconfig-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/knotifyconfig-5.83.0.tar.xz"; + sha256 = "18z42q7bkzi6izfqkh8wygpz04l7cily35rl225jpnlx3zibhrpx"; + name = "knotifyconfig-5.83.0.tar.xz"; }; }; kpackage = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kpackage-5.81.0.tar.xz"; - sha256 = "1r1yv5y2swll38l88w559d8q0n4xizwgjp4qd8bh0vvsn24l65ka"; - name = "kpackage-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kpackage-5.83.0.tar.xz"; + sha256 = "07l0nyyxqx4dq82xq7a2m492p8hh2a8xv608gig9whk6pa1h15dc"; + name = "kpackage-5.83.0.tar.xz"; }; }; kparts = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kparts-5.81.0.tar.xz"; - sha256 = "1gjqmwg5pjj41vwfsdffvr1gfbkbm12f77rlyfn9gg4z6bjdx47b"; - name = "kparts-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kparts-5.83.0.tar.xz"; + sha256 = "1bhs69g4ywss2wvfvhb58rnw1hcbn0xs5ws0677xld87pazpn25y"; + name = "kparts-5.83.0.tar.xz"; }; }; kpeople = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kpeople-5.81.0.tar.xz"; - sha256 = "1a63s8c946wrivqs8n680jpmcys8iafyy9j3isl4z5n88df2nnih"; - name = "kpeople-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kpeople-5.83.0.tar.xz"; + sha256 = "127079gmdg8gn3jizynnr3avd87zys71mkra47p8sg4ji3is2jrp"; + name = "kpeople-5.83.0.tar.xz"; }; }; kplotting = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kplotting-5.81.0.tar.xz"; - sha256 = "1s368amqfqjmr99bz4xc0xfm2sf29s99z3zpwbx2lbjvqh3p5yyb"; - name = "kplotting-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kplotting-5.83.0.tar.xz"; + sha256 = "0hcnf4cr9w98sswk1n8qn4fbwnk8b7xcq4w53979zcccls52fj8j"; + name = "kplotting-5.83.0.tar.xz"; }; }; kpty = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kpty-5.81.0.tar.xz"; - sha256 = "0la3jpkki1hskxg12nf3r59fw7r9q8n3sc7wcdik9r9c9rhlyjpk"; - name = "kpty-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kpty-5.83.0.tar.xz"; + sha256 = "10da18l2w5wx62j79cyd20ph9ayp968c6d6n9g9f9y54afkivzm5"; + name = "kpty-5.83.0.tar.xz"; }; }; kquickcharts = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kquickcharts-5.81.0.tar.xz"; - sha256 = "00w2m0pwilldip873w97l9hvgm6gfy1aj6blyzcxn7x1688lv1jz"; - name = "kquickcharts-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kquickcharts-5.83.0.tar.xz"; + sha256 = "0mm3kxdp69zi6y8abakgb637313hwadyna9h4qpfmb41lyqa2ak6"; + name = "kquickcharts-5.83.0.tar.xz"; }; }; kross = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kross-5.81.0.tar.xz"; - sha256 = "02jsyarn7ihv547b3vv5xwjm1bs58x5lhdnb74v02cwsgb82wlm3"; - name = "kross-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kross-5.83.0.tar.xz"; + sha256 = "1n0d730zvhdg94f8ibjqcscg67m22lm8lvlqfzfbibc355hdf4db"; + name = "kross-5.83.0.tar.xz"; }; }; krunner = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/krunner-5.81.0.tar.xz"; - sha256 = "1yf04qw82hmz8g9hddyalh73b2dxk492n8g856d5m6ccq89c7ga5"; - name = "krunner-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/krunner-5.83.0.tar.xz"; + sha256 = "02nvnjlxma0z9dvn9vrqv1q85723i7in4jqxb1v8m9yxmi04di52"; + name = "krunner-5.83.0.tar.xz"; }; }; kservice = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kservice-5.81.0.tar.xz"; - sha256 = "1kb6wz8d879b57hpfi4ybpc9d3r67b205xdjmp3bhz21894haszc"; - name = "kservice-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kservice-5.83.0.tar.xz"; + sha256 = "18i9awfkrbx750qfnr3vlpp9w2wrqxrdk9cf6nldmbl0iahr1myc"; + name = "kservice-5.83.0.tar.xz"; }; }; ktexteditor = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/ktexteditor-5.81.0.tar.xz"; - sha256 = "1pbxkkqzk4l8n9am5r6w2s1smqwwcc2wagy9in0k80gbyszp9rvm"; - name = "ktexteditor-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/ktexteditor-5.83.0.tar.xz"; + sha256 = "17h36aj0m38igr4bfabjzkd66cwj0mxf0s1j7nylmdmpf5g9jck2"; + name = "ktexteditor-5.83.0.tar.xz"; }; }; ktextwidgets = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/ktextwidgets-5.81.0.tar.xz"; - sha256 = "04mn22xmhkxqb138b9wf6jxz39dfp8rigdg3pzr5llx6gmrln9y8"; - name = "ktextwidgets-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/ktextwidgets-5.83.0.tar.xz"; + sha256 = "16bknjpn574b0xnc8fr8yxg6gc8mnl4f3rh808j4hbs5127xg00a"; + name = "ktextwidgets-5.83.0.tar.xz"; }; }; kunitconversion = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kunitconversion-5.81.0.tar.xz"; - sha256 = "1g9i253f3qjpcmfiy12zmbi41gld9fxy89d742b44xc88fhj3z1y"; - name = "kunitconversion-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kunitconversion-5.83.0.tar.xz"; + sha256 = "01bic73a5l3avqrq7dyfkn2y8xwkq4l6zscj91ddmjan881g10kf"; + name = "kunitconversion-5.83.0.tar.xz"; }; }; kwallet = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kwallet-5.81.0.tar.xz"; - sha256 = "1i05j20847bb9b7348f85fln6spqnkp3c9ysr7yvnm8wfyzrd1gz"; - name = "kwallet-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kwallet-5.83.0.tar.xz"; + sha256 = "1sczaykjh15pq7ra4vx4y0vhc71zzjdqr3ab12d1p3ni34smfbzw"; + name = "kwallet-5.83.0.tar.xz"; }; }; kwayland = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kwayland-5.81.0.tar.xz"; - sha256 = "1a23zcf6aax1fyq4d6y88flyap8wwkbwnq4vkbybpbnxnkbwl8ny"; - name = "kwayland-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kwayland-5.83.0.tar.xz"; + sha256 = "1fgs7m2nimqi5y6yd7jy12klb7vf18qhfzdzikm0ff7rcgrp3k4c"; + name = "kwayland-5.83.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kwidgetsaddons-5.81.0.tar.xz"; - sha256 = "0hmnlda1hgk6zwx6wnjzqc0b2awv835736sjyczrxcfaxlkfj99g"; - name = "kwidgetsaddons-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kwidgetsaddons-5.83.0.tar.xz"; + sha256 = "07a1yk35ss7vayi52hrm0mqkar0yd8w33v5jijga8r69rmmd68s5"; + name = "kwidgetsaddons-5.83.0.tar.xz"; }; }; kwindowsystem = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kwindowsystem-5.81.0.tar.xz"; - sha256 = "11ma5vhq8z570danzq9vdwwcq5n6drsm9m3rpvc1vd3kn2mslls7"; - name = "kwindowsystem-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kwindowsystem-5.83.0.tar.xz"; + sha256 = "0qfd9js8dy68h5drl62sm61m453vssgfgyzdq33drx1jp16k3bv9"; + name = "kwindowsystem-5.83.0.tar.xz"; }; }; kxmlgui = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/kxmlgui-5.81.0.tar.xz"; - sha256 = "1l3a9qzc1x1ai2g1g551w05n2jxshxr03rcy0n8m8lbf518288yv"; - name = "kxmlgui-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/kxmlgui-5.83.0.tar.xz"; + sha256 = "1mn3ywmmbggbjf09gpbkrbchmppfixkyq2a4lra3g85dv5yhpr8v"; + name = "kxmlgui-5.83.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/portingAids/kxmlrpcclient-5.81.0.tar.xz"; - sha256 = "15q3w6wdn5ynhyv5244irq51qbm66bl7799zfs964c0y6dmmm3hg"; - name = "kxmlrpcclient-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/portingAids/kxmlrpcclient-5.83.0.tar.xz"; + sha256 = "1pf4sl42f1jhwv42bimvs718bdw1vsbhrs50av4hvrsl7cj8qvwi"; + name = "kxmlrpcclient-5.83.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/modemmanager-qt-5.81.0.tar.xz"; - sha256 = "01rr4j09xqsja7h699yk58xif7qrlbszd0mim4cncy7pkgwn43h6"; - name = "modemmanager-qt-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/modemmanager-qt-5.83.0.tar.xz"; + sha256 = "0gbppx9pda881mizx4nddhsakpx2cg0rry1lyv51z3wgrxxy4rjy"; + name = "modemmanager-qt-5.83.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/networkmanager-qt-5.81.0.tar.xz"; - sha256 = "1j26ja4r6ry7134yh8i6rkf6dy6kapnrjap9476mr78ig0d6r2if"; - name = "networkmanager-qt-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/networkmanager-qt-5.83.0.tar.xz"; + sha256 = "0vb88fs33szlpg74zf0pa3v08dl5j33lcfvs515y9p1qhkkdg3v1"; + name = "networkmanager-qt-5.83.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/oxygen-icons5-5.81.0.tar.xz"; - sha256 = "1s0gvicrfw6dl164cccj05rfhp627mqa9ml0j4dvgvknnrgip6hz"; - name = "oxygen-icons5-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/oxygen-icons5-5.83.0.tar.xz"; + sha256 = "04768vbwmaajniqpy3vgp6rdkmanv78pvhn8w92hf40k089sv28p"; + name = "oxygen-icons5-5.83.0.tar.xz"; }; }; plasma-framework = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/plasma-framework-5.81.0.tar.xz"; - sha256 = "0g36a632kafsvhamk33w46cafg1gyir3kkx12fkhyqll2vlpn0v7"; - name = "plasma-framework-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/plasma-framework-5.83.0.tar.xz"; + sha256 = "0p8lizkb09rpjin9rzxjah8y5gzn874jk8z74rba9xpcsxvmzpvs"; + name = "plasma-framework-5.83.0.tar.xz"; }; }; prison = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/prison-5.81.0.tar.xz"; - sha256 = "1mrrwhg98br4r9g7lj6gn3w1z2gfh9kr7ycispssjalyp6bdf4yg"; - name = "prison-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/prison-5.83.0.tar.xz"; + sha256 = "1j72c7asbzb3n34wgp3w628lyc65d4dx0vd9dfhmb807dgcfryba"; + name = "prison-5.83.0.tar.xz"; }; }; purpose = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/purpose-5.81.0.tar.xz"; - sha256 = "0188wxxy6rg6sm722db02nzhmlv3c540zs2qh6h9fbbf1k4h82jf"; - name = "purpose-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/purpose-5.83.0.tar.xz"; + sha256 = "0s830i3vqkyraa1ck8ml2c95fp2c31198jm535czxfsfd8w1ml02"; + name = "purpose-5.83.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/qqc2-desktop-style-5.81.0.tar.xz"; - sha256 = "1ac4jc6yi6fwndyivc11brlaz3sncxyxzwrfdak8gg579z67zjx5"; - name = "qqc2-desktop-style-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/qqc2-desktop-style-5.83.0.tar.xz"; + sha256 = "18gkr34bkqi9z1njm35kz3gsnlll7f7n9f4fink1pvy93plvs361"; + name = "qqc2-desktop-style-5.83.0.tar.xz"; }; }; solid = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/solid-5.81.0.tar.xz"; - sha256 = "0w144jdhspjgqpv0xyxr6l6bnh2bazn9jfbw5iim8fj4q5dyr6c1"; - name = "solid-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/solid-5.83.0.tar.xz"; + sha256 = "1ijqligf2xxaw833gk0mlywkzsa6n9b9x38ifk4g48i1259sddbk"; + name = "solid-5.83.0.tar.xz"; }; }; sonnet = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/sonnet-5.81.0.tar.xz"; - sha256 = "0kin6xngk4bxxn7y06q1pm0vk5s66gh6riv58l051px27m6lwz2a"; - name = "sonnet-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/sonnet-5.83.0.tar.xz"; + sha256 = "0bshjqgcb2kl3bfl0zy0f656x47carfg6a25ccdcp6jczby49n5a"; + name = "sonnet-5.83.0.tar.xz"; }; }; syndication = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/syndication-5.81.0.tar.xz"; - sha256 = "1fxdhnd8kl0q13434vbkmjan9dakhn9bdrad9d4vd3x11c77ggkn"; - name = "syndication-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/syndication-5.83.0.tar.xz"; + sha256 = "0pz2886zsyfs0y4qbrhr58qrxh75qa0b051h3b1vgi23vlcsipsz"; + name = "syndication-5.83.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/syntax-highlighting-5.81.0.tar.xz"; - sha256 = "0paazw8y8kdvwg2waa45az5qgyxi2w5nkfbjg84v1is7yhb065yb"; - name = "syntax-highlighting-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/syntax-highlighting-5.83.0.tar.xz"; + sha256 = "0plybipbmxx5f3w7kb1446wiazfzawwa69aplzrdpjhns7n88c2m"; + name = "syntax-highlighting-5.83.0.tar.xz"; }; }; threadweaver = { - version = "5.81.0"; + version = "5.83.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.81/threadweaver-5.81.0.tar.xz"; - sha256 = "03mz4zibvmriaa9qxvqsnp3ahjnhylzjj80w5c6nc4jjywmi89af"; - name = "threadweaver-5.81.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.83/threadweaver-5.83.0.tar.xz"; + sha256 = "12h9nahhgws5f9ng11nc0cxp3phhlsi68r57vlgyq78glkgcw3jl"; + name = "threadweaver-5.83.0.tar.xz"; }; }; } From ad874fdff11b38a9898e299b52dbce45a0587d3e Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:29:13 +0300 Subject: [PATCH 1493/1522] baloo: fix outputs Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/development/libraries/kde-frameworks/baloo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 8497ec73a3a..7b092653a32 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -12,5 +12,6 @@ mkDerivation { kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative solid ]; + outputs = [ "dev" "out" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; } From 80a81926499ab966d5e15b8de1263540bf619149 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:29:51 +0300 Subject: [PATCH 1494/1522] kwindowsystem: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../kwindowsystem/0001-platform-plugins-path.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch index 609376e33e4..0093eb556bf 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch @@ -16,7 +16,7 @@ index a255d83..9699b08 100644 QStringList ret; const auto paths = QCoreApplication::libraryPaths(); - for (const QString &path : paths) { -- static const QStringList searchFolders { +- static const QStringList searchFolders{ - QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), - QStringLiteral("/kf5/kwindowsystem"), - }; From 19a4317dd043adcc08445919134884ff46968c79 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:30:07 +0300 Subject: [PATCH 1495/1522] kpackage: upgrade patches Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../0002-QDirIterator-follow-symlinks.patch | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch index 5967bdaccf5..1edf2a1c63c 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch @@ -12,28 +12,15 @@ diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp index f03d882..d5aee56 100644 --- a/src/kpackage/packageloader.cpp +++ b/src/kpackage/packageloader.cpp -@@ -234,7 +234,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, - } else { - qCDebug(KPACKAGE_LOG) << "kpluginindex: Not cached" << plugindir; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")}; - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index 3eed307..dd6ca6e 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -108,7 +108,7 @@ bool indexDirectory(const QString &dir, const QString &dest) - - QJsonArray plugins; - -- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); +@@ -210,7 +210,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, + } + + for (auto const &plugindir : qAsConst(paths)) { +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")}; + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -- 2.30.1 From 0173e48ae46c9426fd8a0db6891de4537684f7cf Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:30:29 +0300 Subject: [PATCH 1496/1522] plasma-wayland-protocols: 1.2.1 -> 1.3.0 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/plasma-wayland-protocols/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index ea02eb428db..fff25d5bb44 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-v${version}.tar.xz"; - sha256 = "sha256-KHuQkD+afzlMdedcsYdCaGLq9kqS8b5+LvaOmf2Muqo="; + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-DaojYvLg0V954OAG6NfxkI6I43tcUgi0DJyw1NbcqbU="; }; nativeBuildInputs = [ extra-cmake-modules ]; From a5cf968a5f7f0c93dcb375aefd4e8f90fec4b215 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:31:05 +0300 Subject: [PATCH 1497/1522] plasma5: 5.21.5 -> 5.22.0 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 426 ++++++++++++++++---------------- 2 files changed, 218 insertions(+), 210 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index f281e11544d..8877cceddbc 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 90d70bb8a70..1fd19d10334 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,419 +4,427 @@ { bluedevil = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/bluedevil-5.21.5.tar.xz"; - sha256 = "12b23xr919lb9hjy0rd9hbcz0x0im2i879affdyjxz4px53kgc16"; - name = "bluedevil-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/bluedevil-5.22.0.tar.xz"; + sha256 = "0fnza3scslhr4y7fi6bmhqjvmqblds9svcm4x9p9d4n2ncy5lxyc"; + name = "bluedevil-5.22.0.tar.xz"; }; }; breeze = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/breeze-5.21.5.tar.xz"; - sha256 = "034qfnqfhmvszjd4rc41av61qfk60bh5hlzq2r8w8lbxvaawcx4p"; - name = "breeze-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/breeze-5.22.0.tar.xz"; + sha256 = "1vwn5w7syi69f6v5nhvc1kh54yj4i76hj22ldzxprzmspw02sg8v"; + name = "breeze-5.22.0.tar.xz"; }; }; breeze-grub = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/breeze-grub-5.21.5.tar.xz"; - sha256 = "1vqdq2kxzyrdy31c2xjp200b40892mvgzmlp7ndc9yp3zj6cj9z7"; - name = "breeze-grub-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/breeze-grub-5.22.0.tar.xz"; + sha256 = "1hzdhn3ylsp2gn9z7dlf6prsxrzwf3fqirm8cwr2vq82siwa4402"; + name = "breeze-grub-5.22.0.tar.xz"; }; }; breeze-gtk = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/breeze-gtk-5.21.5.tar.xz"; - sha256 = "06f7y19xrn9lr7ra5fszhs69dkpdna7sn0apwl6xyivl4cphbaqg"; - name = "breeze-gtk-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/breeze-gtk-5.22.0.tar.xz"; + sha256 = "03v159m7wz7dmcwdwxfbwyqg24kl3zy39synk95nz15kghnzkq9c"; + name = "breeze-gtk-5.22.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/breeze-plymouth-5.21.5.tar.xz"; - sha256 = "0rjbbvmngy4m073z9dyy59cdcvkjbxlqg55n19k8m0f6k0r2ibgk"; - name = "breeze-plymouth-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/breeze-plymouth-5.22.0.tar.xz"; + sha256 = "18cx829hpnpyb03j7a82jigh78pxjky7zz1rf71p85lz8cn3pvpi"; + name = "breeze-plymouth-5.22.0.tar.xz"; }; }; discover = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/discover-5.21.5.tar.xz"; - sha256 = "112g5xigfpazkh5m8pvd8dhiq44g1vnx7md4789pp6axl88dbf19"; - name = "discover-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/discover-5.22.0.tar.xz"; + sha256 = "04m8hrqz40cijqjhlqdk00n32a48gjzm8rm3m56n0p7ksbwx61d6"; + name = "discover-5.22.0.tar.xz"; }; }; drkonqi = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/drkonqi-5.21.5.tar.xz"; - sha256 = "1bn69i964467k3967934wkkypkzchdmnkxk5nqxs6md835sfb5a0"; - name = "drkonqi-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/drkonqi-5.22.0.tar.xz"; + sha256 = "10r805k7lzd8hds3fls8x3qcic3gfjqmwmz2s2l7l2p5gk1fb8mk"; + name = "drkonqi-5.22.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kactivitymanagerd-5.21.5.tar.xz"; - sha256 = "1j7hkqlbhiq3hc2yb250x7zdidi4wndpnbm0x9aqrmi7mr63kdbp"; - name = "kactivitymanagerd-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kactivitymanagerd-5.22.0.tar.xz"; + sha256 = "0l19zhnwc63kk499h4c4mykhh3jcvxxl2c0i39z4psc641wjp25q"; + name = "kactivitymanagerd-5.22.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kde-cli-tools-5.21.5.tar.xz"; - sha256 = "0j8yv814qbyl5d5iyzcw5q6w08gkwhsvbdc19nmlbk9zldvy37rn"; - name = "kde-cli-tools-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kde-cli-tools-5.22.0.tar.xz"; + sha256 = "1r27p8bslbsfb3i71xaz6nmz2ka5l3aryadp8p0818caimcwpgi8"; + name = "kde-cli-tools-5.22.0.tar.xz"; }; }; kdecoration = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kdecoration-5.21.5.tar.xz"; - sha256 = "0k6mhwkv4r5q57bm7jc9wf51gdk8h8zwafmkfqp7ddg5zmxhnmdw"; - name = "kdecoration-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kdecoration-5.22.0.tar.xz"; + sha256 = "1d6mar9kxasdrlq6wqdmjb6m3p2i6r4x6yvgc11fg6fq49mk49sy"; + name = "kdecoration-5.22.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kde-gtk-config-5.21.5.tar.xz"; - sha256 = "07gc8rydqnvsyrjvgy99ggl5imklzzrmhc36q7kdkp5zkjm7i4gk"; - name = "kde-gtk-config-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kde-gtk-config-5.22.0.tar.xz"; + sha256 = "0zmigwj2rsa40pxmvk6yq90w8b7pbkqhmz21laic0ps2sfyvll0z"; + name = "kde-gtk-config-5.22.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kdeplasma-addons-5.21.5.tar.xz"; - sha256 = "0zbxc58z4v3hl2m9p8gc035k4bmimwv1k0y6gsdviclvdhkdfv9w"; - name = "kdeplasma-addons-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kdeplasma-addons-5.22.0.tar.xz"; + sha256 = "1v436mrnf5hbqy6fyaljkcv4k2ihx0n5881fmbqrx5sg5cs9kqs2"; + name = "kdeplasma-addons-5.22.0.tar.xz"; }; }; kgamma5 = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kgamma5-5.21.5.tar.xz"; - sha256 = "1qaqcns4xnlxw6pjn7h3gdmwly8w94p9l03bnar7gb75ir342jz6"; - name = "kgamma5-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kgamma5-5.22.0.tar.xz"; + sha256 = "0b4k2k4fabpcs80xxai7s2byckfdnq48hpix8pxp6x2bj587cvir"; + name = "kgamma5-5.22.0.tar.xz"; }; }; khotkeys = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/khotkeys-5.21.5.tar.xz"; - sha256 = "04wwz6ji4pna4jd8ps14i9r1s86fdmm7dh8qfy3qz4jzf2gjjn1d"; - name = "khotkeys-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/khotkeys-5.22.0.tar.xz"; + sha256 = "169nvlqyk02jwk7pfl3bzvgb69bw4ylsrfshyrdmjg7kbmh9m6k8"; + name = "khotkeys-5.22.0.tar.xz"; }; }; kinfocenter = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kinfocenter-5.21.5.tar.xz"; - sha256 = "177llrwhk54s91f69ny5v17w1kvqizap55h40kc1a5bndlgqfnki"; - name = "kinfocenter-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kinfocenter-5.22.0.tar.xz"; + sha256 = "08lsaps5654d1gc2am4z5hr31j31m0hj77yhc7lv9d6s9a33r18z"; + name = "kinfocenter-5.22.0.tar.xz"; }; }; kmenuedit = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kmenuedit-5.21.5.tar.xz"; - sha256 = "0yzdx80jgjiaw7nk897m151pg67q11qyww2j8r8rx22bz06rfi70"; - name = "kmenuedit-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kmenuedit-5.22.0.tar.xz"; + sha256 = "0gwz5p3qk2n5a0d4a28ixl5jjnyc3hjpij0za8gwci8vcqszq3l1"; + name = "kmenuedit-5.22.0.tar.xz"; }; }; kscreen = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kscreen-5.21.5.tar.xz"; - sha256 = "1nl43888jib16z0djzy3mck6h9rahdwwdwk76y1hp3nhbbaqnsa6"; - name = "kscreen-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kscreen-5.22.0.tar.xz"; + sha256 = "17si6l1rimxlyczkkmqgxg9kn5wvkkj85xfjm7vw37r67f6mx02z"; + name = "kscreen-5.22.0.tar.xz"; }; }; kscreenlocker = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kscreenlocker-5.21.5.tar.xz"; - sha256 = "0drnj3xdza9cbw8124ja2bic8y37k8q1p7mwfxvhgqciqyvpdb8x"; - name = "kscreenlocker-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kscreenlocker-5.22.0.tar.xz"; + sha256 = "0xfw1yrv3razj7yin5jk5i7pa9rrfafk63mvwqwx0jxn8yjczslz"; + name = "kscreenlocker-5.22.0.tar.xz"; }; }; ksshaskpass = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/ksshaskpass-5.21.5.tar.xz"; - sha256 = "06gi254yq4cr8f5rl83aprsvvham9h5q4jk6cfd67ghwk6ln7yd2"; - name = "ksshaskpass-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/ksshaskpass-5.22.0.tar.xz"; + sha256 = "15zldgdkfqyciw2r94rnj8iq6vyfnrfrxcaz52rpzprk71hmdy31"; + name = "ksshaskpass-5.22.0.tar.xz"; }; }; - ksysguard = { - version = "5.21.5"; + ksystemstats = { + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/ksysguard-5.21.5.tar.xz"; - sha256 = "1c0vr85j3b1pshyd4w12w9i57bg21gkpvdh1rgqimsnj7yw38fqh"; - name = "ksysguard-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/ksystemstats-5.22.0.tar.xz"; + sha256 = "01whxn1jckc20m9mpkazlx2ncd5swh28hbqlbyvyd0s98qd2ywp0"; + name = "ksystemstats-5.22.0.tar.xz"; }; }; kwallet-pam = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kwallet-pam-5.21.5.tar.xz"; - sha256 = "0svf0iabgfm0sizgar1cbxn2577r04nxh91fznq7jp5zj3lk0gxz"; - name = "kwallet-pam-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kwallet-pam-5.22.0.tar.xz"; + sha256 = "0mfn2ib3vx0d7aflyl80xbgci252fyvfk64nhci44lqx5yxh2726"; + name = "kwallet-pam-5.22.0.tar.xz"; }; }; kwayland-integration = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kwayland-integration-5.21.5.tar.xz"; - sha256 = "1wh44hy1mmrn4kg8jppqvxk9zzfrbiyqzc2i6lfnzic4llz7275x"; - name = "kwayland-integration-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kwayland-integration-5.22.0.tar.xz"; + sha256 = "0jb9a6nn9yykp2i8hw59jvwrlcrkbzrhgvbi9l4qxcqaa8z56j13"; + name = "kwayland-integration-5.22.0.tar.xz"; }; }; kwayland-server = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kwayland-server-5.21.5.tar.xz"; - sha256 = "1j91iqzrip5ady4cz5ipiirs0dhvib05wwa8h7dqa7ysidpc3krg"; - name = "kwayland-server-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kwayland-server-5.22.0.tar.xz"; + sha256 = "150nxf6y4xz0pr9847rgpg84zlfszhmsha178rh50zkzqiqphqc4"; + name = "kwayland-server-5.22.0.tar.xz"; }; }; kwin = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kwin-5.21.5.tar.xz"; - sha256 = "0cc3h1n6g902ff50aj3w631cmg6gjaqfvqsfa5jkbxrvl7xfv1m2"; - name = "kwin-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kwin-5.22.0.tar.xz"; + sha256 = "008frh2kkhn4686pmmzjw8wvlqycx22c8nhccph1wns47piczrjn"; + name = "kwin-5.22.0.tar.xz"; }; }; kwrited = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/kwrited-5.21.5.tar.xz"; - sha256 = "0ki9j44ccgrnm7nh8ddwwkv0144yn2ygfijf0yjyyzb5p5391rz1"; - name = "kwrited-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/kwrited-5.22.0.tar.xz"; + sha256 = "0683k1361jkg12fg1hvnn27rl29906c4vy94hm5kz8n8v1syp7h6"; + name = "kwrited-5.22.0.tar.xz"; + }; + }; + layer-shell-qt = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.22.0/layer-shell-qt-5.22.0.tar.xz"; + sha256 = "1xyamll4r3mfh2b8m4mj0x5yxy8y8hlzn6rg7wxa8nl82sbz623y"; + name = "layer-shell-qt-5.22.0.tar.xz"; }; }; libkscreen = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/libkscreen-5.21.5.tar.xz"; - sha256 = "1fkw3rykpj4vvc1iw19kcjhvdbbll6bag91icaxznpir3bvry18k"; - name = "libkscreen-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/libkscreen-5.22.0.tar.xz"; + sha256 = "1sws54375yfzjp8dx40q5118dzc2rgr3z32h9nkppz0xzwfwlc06"; + name = "libkscreen-5.22.0.tar.xz"; }; }; libksysguard = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/libksysguard-5.21.5.tar.xz"; - sha256 = "1s7b336ljvnyjsqfn6f6jqbr7k9l4afh2b5rqj7d4ifjm63wdy2z"; - name = "libksysguard-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/libksysguard-5.22.0.tar.xz"; + sha256 = "1a874rbdvy14i15xyldqqskfkm1x3343winxnqf4lp3xmwx9glx2"; + name = "libksysguard-5.22.0.tar.xz"; }; }; milou = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/milou-5.21.5.tar.xz"; - sha256 = "061vd1slk1h0m4l22sxzkzliag4f8bmrv6cbfhdhhk5a90xxph1i"; - name = "milou-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/milou-5.22.0.tar.xz"; + sha256 = "1zag6nbvg2ylf4k4k4b4v3094k6891ay2828hy890p8fyrz4cf7f"; + name = "milou-5.22.0.tar.xz"; }; }; oxygen = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/oxygen-5.21.5.tar.xz"; - sha256 = "0j9nv00fxy7l62w7486410ivn8hyfnv736740dqqpl1q4jvd62mc"; - name = "oxygen-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/oxygen-5.22.0.tar.xz"; + sha256 = "0id7smj7i4m84zzn7mcig8m2239sp56nly1c5056sphfsxnh37hs"; + name = "oxygen-5.22.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-browser-integration-5.21.5.tar.xz"; - sha256 = "16v43m5nd48if8j2rbrkklk3w1rg6icggx9hdcw6765q0h1251ab"; - name = "plasma-browser-integration-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-browser-integration-5.22.0.tar.xz"; + sha256 = "1lkg76l5y1dd34r9wkkvi39adhhldgwhdgs8dcw9n9vasfh31i88"; + name = "plasma-browser-integration-5.22.0.tar.xz"; }; }; plasma-desktop = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-desktop-5.21.5.tar.xz"; - sha256 = "09qsnc7dck4j54aj19g94jrd2ifgs7gbxql1ccidj8c0bhq7wl6y"; - name = "plasma-desktop-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-desktop-5.22.0.tar.xz"; + sha256 = "1afqq30vlbdiy4fiqhgf11a4ap6lpf4g309ilnmq8zhm6q09iy7l"; + name = "plasma-desktop-5.22.0.tar.xz"; }; }; plasma-disks = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-disks-5.21.5.tar.xz"; - sha256 = "1850ms6nmff4mlfshdbbjlf77siv9h6isldhxk36n555mrrq4791"; - name = "plasma-disks-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-disks-5.22.0.tar.xz"; + sha256 = "0q7b7y9llk9mbnpnwyac73bddg6s85ha9frd94r2aqkzal61yncb"; + name = "plasma-disks-5.22.0.tar.xz"; }; }; plasma-firewall = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-firewall-5.21.5.tar.xz"; - sha256 = "1wal8izrwhm20jkjiqf55y6pk2l3ljk16racb8isr73m568ii6ak"; - name = "plasma-firewall-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-firewall-5.22.0.tar.xz"; + sha256 = "05fnncdnl9qgikj4bscc9k68mmwqgcl4li5wyc4k23hh98cb0byb"; + name = "plasma-firewall-5.22.0.tar.xz"; }; }; plasma-integration = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-integration-5.21.5.tar.xz"; - sha256 = "0x8chc6r3ibv4xxmgi27c0mkr5ym9imw8zzxl596llm4r5q5ax0y"; - name = "plasma-integration-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-integration-5.22.0.tar.xz"; + sha256 = "13ih5riybd1vw4zz1x22dw5hj70sp8cs35v27nlvnb48dcz8gxs8"; + name = "plasma-integration-5.22.0.tar.xz"; }; }; plasma-nano = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-nano-5.21.5.tar.xz"; - sha256 = "04irqa41y6j4582035inkgwy1q27w0fq7fckfj7pbbjz4p9wqx26"; - name = "plasma-nano-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-nano-5.22.0.tar.xz"; + sha256 = "0srg6fw8rhqg379qdnc63xz4q1v8496snc2bpyca4i7y561hkwir"; + name = "plasma-nano-5.22.0.tar.xz"; }; }; plasma-nm = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-nm-5.21.5.tar.xz"; - sha256 = "18qbf2n08qcdw6pshhipnpr7sab8nmhj7bfr3qb23s4ildhfd64h"; - name = "plasma-nm-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-nm-5.22.0.tar.xz"; + sha256 = "0xd96z37a03x5lxijghngydvs066rkgy3nwvjx1s5jlmsnlz010v"; + name = "plasma-nm-5.22.0.tar.xz"; }; }; plasma-pa = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-pa-5.21.5.tar.xz"; - sha256 = "00lhr8j5aj1xhyfsdzvm67d1bhqihrp3ki4zl0bqgvy89fi1xvzn"; - name = "plasma-pa-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-pa-5.22.0.tar.xz"; + sha256 = "0ha7kpny7iwdszai1azm00d6a880w54cdhy8l87n8vrw62i3nvvd"; + name = "plasma-pa-5.22.0.tar.xz"; }; }; plasma-phone-components = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-phone-components-5.21.5.tar.xz"; - sha256 = "0sg78n5fr38n629h0mf66d61hh43hq2r1ag69krb5g0cdycdj6w1"; - name = "plasma-phone-components-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-phone-components-5.22.0.tar.xz"; + sha256 = "1bz1pgvn72y704wcb993jblgzghrnjkx80pn7dsyhix6l5jw29li"; + name = "plasma-phone-components-5.22.0.tar.xz"; }; }; plasma-sdk = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-sdk-5.21.5.tar.xz"; - sha256 = "15ay8jiyyg2h25w4lnvxjnl606bqjk5j3asgnzjkz3n9ny9c1ah1"; - name = "plasma-sdk-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-sdk-5.22.0.tar.xz"; + sha256 = "0lkmnzm7zm2vs8a0z955p1sf50zzqqf6z1gkk609rqch00clqdlh"; + name = "plasma-sdk-5.22.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-systemmonitor-5.21.5.tar.xz"; - sha256 = "1kwfk3b0y2ssj90qwv3diazl5bpf75aigxy7wvp6izbjsjn7yk9w"; - name = "plasma-systemmonitor-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-systemmonitor-5.22.0.tar.xz"; + sha256 = "1jkmwg7h64nh9aggmn9lvfc7a89mbs6kjhvxmgjprxal0wpw583g"; + name = "plasma-systemmonitor-5.22.0.tar.xz"; }; }; plasma-tests = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-tests-5.21.5.tar.xz"; - sha256 = "107a0rq220mjhd2g77xaxgs9k29iyzfg5s64rbxrqs8kjzb0h90k"; - name = "plasma-tests-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-tests-5.22.0.tar.xz"; + sha256 = "09mc7zlxypwx6igamjgd3jzn5zxscxqqk3yyrgiv25qji33dklf5"; + name = "plasma-tests-5.22.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-thunderbolt-5.21.5.tar.xz"; - sha256 = "161c94haajs7vnbb0lk94h4mb9kd0by7jai1f8lj0zksk6g5vf51"; - name = "plasma-thunderbolt-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-thunderbolt-5.22.0.tar.xz"; + sha256 = "1y1dp591qpqk4m3agka4qyyjdk8vi3h9pwnkg2cpdlkbcsklg47s"; + name = "plasma-thunderbolt-5.22.0.tar.xz"; }; }; plasma-vault = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-vault-5.21.5.tar.xz"; - sha256 = "16wpv37jvcbl0p3s3jh15rsjf81bblpc4vxn508mg7z543dba6bm"; - name = "plasma-vault-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-vault-5.22.0.tar.xz"; + sha256 = "1awn5rhvlvg95bn2kyanyzxclq0ki07h55384y2qxf19bsyblfqz"; + name = "plasma-vault-5.22.0.tar.xz"; }; }; plasma-workspace = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-workspace-5.21.5.tar.xz"; - sha256 = "02p931b0iz7gak8i7bhig3j9p7xs6fam7k6hhb5f1bd9pks6xccw"; - name = "plasma-workspace-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-5.22.0.tar.xz"; + sha256 = "0z5ppf5sq7hp6zslwqgaazdga25k9vl0xyilcxcgg1wd40q1mm0y"; + name = "plasma-workspace-5.22.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plasma-workspace-wallpapers-5.21.5.tar.xz"; - sha256 = "0jj0092mhnf45qk84zbisqbndvwg0c160dnra73p5qp1dldwv6km"; - name = "plasma-workspace-wallpapers-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-wallpapers-5.22.0.tar.xz"; + sha256 = "056g8924sqqp3zk99xlc00n5gd1fvdg7pqyg5sgzagi9vqw7s18x"; + name = "plasma-workspace-wallpapers-5.22.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/plymouth-kcm-5.21.5.tar.xz"; - sha256 = "1janrgz8934pzz83npk02p63vxasbmr3dy39x36qr4qmk9b8qzv0"; - name = "plymouth-kcm-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/plymouth-kcm-5.22.0.tar.xz"; + sha256 = "03nxl6k2s3w4k50dvda09f7wm7ybar7qx0ayhdhfx9f96j2dg1mr"; + name = "plymouth-kcm-5.22.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.21.5"; + version = "1-5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/polkit-kde-agent-1-5.21.5.tar.xz"; - sha256 = "1bc9sqg77xywly7yllzrr81agny96hj5as7gi8n0ji4i9l4av2z6"; - name = "polkit-kde-agent-1-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/polkit-kde-agent-1-5.22.0.tar.xz"; + sha256 = "0h6jyc6yrbf7jc7vr2a4ly7wa63fyrak8lix2r9bmsz260sg5jl3"; + name = "polkit-kde-agent-1-5.22.0.tar.xz"; }; }; powerdevil = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/powerdevil-5.21.5.tar.xz"; - sha256 = "18yxs115qk9mgq0mi2ycaqs43c2m9rha7wz245yz2ib3axdk1c7x"; - name = "powerdevil-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/powerdevil-5.22.0.tar.xz"; + sha256 = "1h9vfs0adgharcmb66kr54myshzikp7ahbhdqv05rv6jrahc3and"; + name = "powerdevil-5.22.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/qqc2-breeze-style-5.21.5.tar.xz"; - sha256 = "01z91xr2m9j2ch2d3g10vqy60lflvzp8x9wa7p0nsjm5h3fd9jiy"; - name = "qqc2-breeze-style-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/qqc2-breeze-style-5.22.0.tar.xz"; + sha256 = "0vq2n0nd3ppmg3z8f0s3xyrlcav5bfahjazjd301v19fakxj74p6"; + name = "qqc2-breeze-style-5.22.0.tar.xz"; }; }; sddm-kcm = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/sddm-kcm-5.21.5.tar.xz"; - sha256 = "0v9drq9dlgrv5lkxj3sr2a7ky2h2cqghkq2csh43h8v7a7kwi02j"; - name = "sddm-kcm-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/sddm-kcm-5.22.0.tar.xz"; + sha256 = "0kcd717byx4791z17sirp88vwzfx4lbar1i2696q6nciv49w3zn1"; + name = "sddm-kcm-5.22.0.tar.xz"; }; }; systemsettings = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/systemsettings-5.21.5.tar.xz"; - sha256 = "1kbsk37fmin0afw5wrn70504bn0cd5pm7i0bppmpi5y81mplwy4m"; - name = "systemsettings-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/systemsettings-5.22.0.tar.xz"; + sha256 = "1vyrp6pln3j9vwd4q0wd77d6qsc1rhrl4v3r7qywhzazrkp6k3k6"; + name = "systemsettings-5.22.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.21.5"; + version = "5.22.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.21.5/xdg-desktop-portal-kde-5.21.5.tar.xz"; - sha256 = "11c2ndmb432j4gwnvmyliycmd0fqyxj76ywki9hi66cv1lifm9xh"; - name = "xdg-desktop-portal-kde-5.21.5.tar.xz"; + url = "${mirror}/stable/plasma/5.22.0/xdg-desktop-portal-kde-5.22.0.tar.xz"; + sha256 = "1j6s8jg7viqlmclz6c7wg428qrwiy0c19h38drrrrbalxxl0z4sv"; + name = "xdg-desktop-portal-kde-5.22.0.tar.xz"; }; }; } From 85dcd8d3ed9826d09aacc68b2212b366c266e882 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:32:56 +0300 Subject: [PATCH 1498/1522] ksysguard: replace with throw alias It was deprecated in favour of system-monitor Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../services/x11/desktop-managers/plasma5.nix | 1 - pkgs/desktops/plasma-5/default.nix | 3 ++- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 4 ++-- pkgs/desktops/plasma-5/ksysguard.nix | 17 ----------------- .../plasma-5/plasma-desktop/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 +- 6 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/ksysguard.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b6be524aea6..e02e3e6f71c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -271,7 +271,6 @@ in kmenuedit kscreen kscreenlocker - ksysguard kwayland kwin kwrited diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 9252aa7b39b..5530d188df0 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -123,12 +123,13 @@ let kscreen = callPackage ./kscreen.nix {}; kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = callPackage ./ksysguard.nix {}; + ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; kwayland-server = callPackage ./kwayland-server {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; + layer-shell-qt = callPackage ./layer-shell-qt.nix {}; libkscreen = callPackage ./libkscreen {}; libksysguard = callPackage ./libksysguard {}; milou = callPackage ./milou.nix {}; diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 94cf73084bf..77e3cad8d48 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays, - kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard, + kio, knewstuff, kpurpose, kross, krunner, kservice, kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, qtwebengine, qtx11extras }: @@ -12,7 +12,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio - knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus + knewstuff kpurpose kross krunner kservice kunitconversion ibus plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix deleted file mode 100644 index 2c376b53750..00000000000 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - libcap, libpcap, lm_sensors, - kconfig, kcoreaddons, ki18n, kiconthemes, kinit, kitemviews, - knewstuff, libksysguard, qtbase, - networkmanager-qt, libnl -}: - -mkDerivation { - name = "ksysguard"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kconfig kcoreaddons kitemviews kinit kiconthemes knewstuff libksysguard - ki18n libcap libpcap lm_sensors networkmanager-qt libnl - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index e6b161a0723..aea3c468d7c 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -12,7 +12,7 @@ attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, - kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon, + kpeople, krunner, kscreenlocker, kwallet, kwin, phonon, plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput }: @@ -28,7 +28,7 @@ mkDerivation { attica baloo kaccounts-integration kactivities kactivities-stats kauth kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig - kpeople krunner kscreenlocker ksysguard kwallet kwin plasma-framework + kpeople krunner kscreenlocker kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bf8154233b8..913878c9178 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1120,7 +1120,7 @@ mapAliases ({ kgamma5 kinfocenter kmenuedit - kscreen kscreenlocker ksshaskpass ksysguard + kscreen kscreenlocker ksshaskpass kwallet-pam kwayland-integration kwin kwrited milou oxygen From 473525a9f25c15ea51f00a7d9e526642fa063372 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:33:28 +0300 Subject: [PATCH 1499/1522] kwin: upgrade patches Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- ...NixOS-Unwrap-executable-name-for-.desktop-search.patch | 8 ++++---- pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch | 8 ++++---- pkgs/desktops/plasma-5/kwin/0002-xwayland.patch | 8 ++++---- .../kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch index 7216f54b6c8..d273e262226 100644 --- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch +++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -9,13 +9,13 @@ file in-use according to the kernel! Wrappers cannot affect the `/proc/.../exe` symlink! --- - service_utils.h | 28 +++++++++++++++++++++++++++- + src/service_utils.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) -diff --git a/service_utils.h b/service_utils.h +diff --git a/src/service_utils.h b/src/service_utils.h index 8a70c1fad..6674f553b 100644 ---- a/service_utils.h -+++ b/service_utils.h +--- a/src/service_utils.h ++++ b/src/service_utils.h @@ -26,8 +26,34 @@ namespace KWin const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch index 06b3653acee..efde4f4dcf0 100644 --- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch @@ -4,13 +4,13 @@ Date: Mon, 27 Jan 2020 05:31:13 -0600 Subject: [PATCH 1/3] follow symlinks --- - plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- + src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp +diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp index 5242cb7..2e4ddae 100644 ---- a/plugins/kdecorations/aurorae/src/aurorae.cpp -+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp +--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp ++++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp @@ -201,7 +201,7 @@ void Helper::init() // so let's try to locate our plugin: QString pluginPath; diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch index 312daa09384..9e37d51c499 100644 --- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch @@ -4,13 +4,13 @@ Date: Mon, 27 Jan 2020 05:31:23 -0600 Subject: [PATCH 2/3] xwayland --- - xwl/xwayland.cpp | 2 +- + src/xwl/xwayland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp +diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp index 57efdde..a211a58 100644 ---- a/xwl/xwayland.cpp -+++ b/xwl/xwayland.cpp +--- a/src/xwl/xwayland.cpp ++++ b/src/xwl/xwayland.cpp @@ -124,7 +124,7 @@ void Xwayland::start() m_xwaylandProcess = new Process(this); diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch index eaffaf59187..50c7cef3f8c 100644 --- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -5,13 +5,13 @@ Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- - plugins/qpa/main.cpp | 2 +- + src/plugins/qpa/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp +diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp index efd236b..a69c046 100644 ---- a/plugins/qpa/main.cpp -+++ b/plugins/qpa/main.cpp +--- a/src/plugins/qpa/main.cpp ++++ b/src/plugins/qpa/main.cpp @@ -23,7 +23,7 @@ public: QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { From 96e567cbfebf9f9cb863fd83f155d604586e0186 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:33:45 +0300 Subject: [PATCH 1500/1522] layer-shell-qt: init Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/layer-shell-qt.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 pkgs/desktops/plasma-5/layer-shell-qt.nix diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix new file mode 100644 index 00000000000..9e18bbb4bff --- /dev/null +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -0,0 +1,10 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols +}: + +mkDerivation { + name = "layer-shell-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ]; +} From b0fb5a4d99a953c9900f018405a4e08bf4d0dad7 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:34:08 +0300 Subject: [PATCH 1501/1522] kscreenlocker: add layer-shell-qt dependency Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/kscreenlocker.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index f9b8bb5cfc1..e6c70f8e8cc 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime, kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, - wayland, + wayland, layer-shell-qt, }: mkDerivation { @@ -12,6 +12,7 @@ mkDerivation { buildInputs = [ kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland libXcursor pam plasma-framework qtdeclarative qtx11extras wayland + layer-shell-qt ]; outputs = [ "out" "dev" ]; } From f24259a5e4e5dc47df6d29e93cab32fcb5bd8b09 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:34:28 +0300 Subject: [PATCH 1502/1522] libksysguard: add libnl dependency Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/libksysguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index e291bc5c4c4..ee9237a318c 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, - qtbase, qtscript, qtwebengine, qtx11extras + qtbase, qtscript, qtwebengine, qtx11extras, libnl }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine knewstuff + qtwebengine knewstuff libnl ]; outputs = [ "bin" "dev" "out" ]; } From f8394adae9d13ef63f565459b646bb2c53a73728 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Fri, 18 Jun 2021 21:34:54 +0300 Subject: [PATCH 1503/1522] plasma-desktop: fix synaptics include Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index aea3c468d7c..d8ca0ddfdec 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -41,11 +41,11 @@ mkDerivation { ''; CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" + "-I${lib.getDev xf86inputsynaptics}/include/xorg" ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" - "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg" "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" ]; postInstall = '' From 27b3921a864bad94540bbb8b0e802e0447c6d410 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Sat, 19 Jun 2021 05:58:21 +0300 Subject: [PATCH 1504/1522] kde-frameworks: mark as broken for qt < 5.15 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/development/libraries/kde-frameworks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 94d403b9e34..a5b0bfdae8d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -28,7 +28,7 @@ existing packages here and modify it as necessary. let - minQtVersion = "5.14"; + minQtVersion = "5.15"; broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ From ebdbf67c0ce13cb69ddb14993379beb849528a00 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Sat, 19 Jun 2021 06:03:58 +0300 Subject: [PATCH 1505/1522] plasma-vault: upgrade patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../plasma-5/plasma-vault/encfs-path.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch index e1c325e1693..14f593ea60a 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -2,21 +2,18 @@ diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/ index 628af7b..6edd38e 100644 --- a/kded/engine/backends/encfs/encfsbackend.cpp +++ b/kded/engine/backends/encfs/encfsbackend.cpp -@@ -137,7 +137,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const +@@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); KConfigGroup backendConfig(config, "EncfsBackend"); - -- return process("encfs", -+ return process(NIXPKGS_ENCFS, - arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), - {}); + +- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); ++ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); } -@@ -146,7 +146,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const - + QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const { - return process("encfsctl", arguments, {}); + return process(NIXPKGS_ENCFSCTL, arguments, {}); } - - + + } // namespace PlasmaVault From f3ea3444fcc1eea84de9d7945d79b0801cf8efe2 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Sat, 19 Jun 2021 06:32:37 +0300 Subject: [PATCH 1506/1522] calligra: fix missing fontconfig dependency Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/applications/office/calligra/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index e54a3cbad4c..2ecc334c3d2 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -8,7 +8,7 @@ , kcontacts, akonadi, akonadi-calendar, akonadi-contacts , eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen , librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon -, poppler, pstoedit, qca-qt5, vc +, poppler, pstoedit, qca-qt5, vc, fontconfig # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: @@ -32,6 +32,7 @@ mkDerivation rec { kcontacts akonadi akonadi-calendar akonadi-contacts eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc + fontconfig ]; propagatedUserEnvPkgs = [ kproperty ]; From b0f1caf52230dd792655e11f72d6710c85227335 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Thu, 24 Jun 2021 09:14:41 +0300 Subject: [PATCH 1507/1522] ksystemstats: init at 5.22.0 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../modules/services/x11/desktop-managers/plasma5.nix | 1 + pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/ksystemstats.nix | 11 +++++++++++ 3 files changed, 13 insertions(+) create mode 100644 pkgs/desktops/plasma-5/ksystemstats.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index e02e3e6f71c..81a6bd65265 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -271,6 +271,7 @@ in kmenuedit kscreen kscreenlocker + ksystemstats kwayland kwin kwrited diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 5530d188df0..7e1bb2b1092 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -124,6 +124,7 @@ let kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; + ksystemstats = callPackage ./ksystemstats.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; kwayland-server = callPackage ./kwayland-server {}; diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix new file mode 100644 index 00000000000..e41f56c764e --- /dev/null +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +, libksysguard, libnl, lm_sensors, networkmanager-qt +}: + +mkDerivation { + name = "ksystemstats"; + NIX_CFLAGS_COMPILE = [ "-I${libksysguard.bin}/share" ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; +} From b7e79637baadf7fccdd06003afc3f58ac3962b9d Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Thu, 24 Jun 2021 09:15:40 +0300 Subject: [PATCH 1508/1522] plasma5: install plasma-systemmonitor by default As ksysguard was replaced, and it was installed by default Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 81a6bd65265..aac905fea43 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -278,6 +278,7 @@ in libkscreen libksysguard milou + plasma-systemmonitor plasma-browser-integration plasma-integration polkit-kde-agent From fce55cfb60740366fc509b9cc91fd7aa812e3aed Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Thu, 24 Jun 2021 09:27:52 +0300 Subject: [PATCH 1509/1522] plasma5: 5.22.0 -> 5.22.2 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++---------------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 8877cceddbc..559700ee86a 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 1fd19d10334..aa369f8d9d3 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/bluedevil-5.22.0.tar.xz"; - sha256 = "0fnza3scslhr4y7fi6bmhqjvmqblds9svcm4x9p9d4n2ncy5lxyc"; - name = "bluedevil-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/bluedevil-5.22.2.1.tar.xz"; + sha256 = "1ipv6afc40a4q6gifzi8hp723p0p81a41f7mxz5xwzqcxxrdr90l"; + name = "bluedevil-5.22.2.1.tar.xz"; }; }; breeze = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/breeze-5.22.0.tar.xz"; - sha256 = "1vwn5w7syi69f6v5nhvc1kh54yj4i76hj22ldzxprzmspw02sg8v"; - name = "breeze-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/breeze-5.22.2.1.tar.xz"; + sha256 = "02hi5jx366imbwcmql82da73jrsf64pmlfgh9c8bz3kqrlw5kqnl"; + name = "breeze-5.22.2.1.tar.xz"; }; }; breeze-grub = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/breeze-grub-5.22.0.tar.xz"; - sha256 = "1hzdhn3ylsp2gn9z7dlf6prsxrzwf3fqirm8cwr2vq82siwa4402"; - name = "breeze-grub-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/breeze-grub-5.22.2.1.tar.xz"; + sha256 = "0vial16xp9s1s9vsaa4pyxnj5n94cym7ylcxnkhmqzl7z9mrykd3"; + name = "breeze-grub-5.22.2.1.tar.xz"; }; }; breeze-gtk = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/breeze-gtk-5.22.0.tar.xz"; - sha256 = "03v159m7wz7dmcwdwxfbwyqg24kl3zy39synk95nz15kghnzkq9c"; - name = "breeze-gtk-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/breeze-gtk-5.22.2.1.tar.xz"; + sha256 = "1vc8lxbkaax12d4dx4wnyjnd4pfs484p04w7fpx884k84r06ldl2"; + name = "breeze-gtk-5.22.2.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/breeze-plymouth-5.22.0.tar.xz"; - sha256 = "18cx829hpnpyb03j7a82jigh78pxjky7zz1rf71p85lz8cn3pvpi"; - name = "breeze-plymouth-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/breeze-plymouth-5.22.2.1.tar.xz"; + sha256 = "1k0xpjr7gg13gxxmla6s7rnlyajps6y6wiwyiddfqj3rl98x3ib4"; + name = "breeze-plymouth-5.22.2.1.tar.xz"; }; }; discover = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/discover-5.22.0.tar.xz"; - sha256 = "04m8hrqz40cijqjhlqdk00n32a48gjzm8rm3m56n0p7ksbwx61d6"; - name = "discover-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/discover-5.22.2.1.tar.xz"; + sha256 = "15vwhg37656vhjvl58fxy0gl9yc6f8wlrryplvpxm1yb9pz3b81k"; + name = "discover-5.22.2.1.tar.xz"; }; }; drkonqi = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/drkonqi-5.22.0.tar.xz"; - sha256 = "10r805k7lzd8hds3fls8x3qcic3gfjqmwmz2s2l7l2p5gk1fb8mk"; - name = "drkonqi-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/drkonqi-5.22.2.1.tar.xz"; + sha256 = "03fk2m6m0w33xgxzcppjrrpg0mrgg1xyjj2674ad0dnmjyp82c3d"; + name = "drkonqi-5.22.2.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kactivitymanagerd-5.22.0.tar.xz"; - sha256 = "0l19zhnwc63kk499h4c4mykhh3jcvxxl2c0i39z4psc641wjp25q"; - name = "kactivitymanagerd-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kactivitymanagerd-5.22.2.1.tar.xz"; + sha256 = "1sd09xy8sxprmfnkh9n2xzzm4ny4qmsiw8sycn52fjwpnj69b2cr"; + name = "kactivitymanagerd-5.22.2.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kde-cli-tools-5.22.0.tar.xz"; - sha256 = "1r27p8bslbsfb3i71xaz6nmz2ka5l3aryadp8p0818caimcwpgi8"; - name = "kde-cli-tools-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kde-cli-tools-5.22.2.1.tar.xz"; + sha256 = "1hlhrj0a5hf9z86m6flj1qzsvl3wbdpb7zmvagrkpjj67xysczgk"; + name = "kde-cli-tools-5.22.2.1.tar.xz"; }; }; kdecoration = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kdecoration-5.22.0.tar.xz"; - sha256 = "1d6mar9kxasdrlq6wqdmjb6m3p2i6r4x6yvgc11fg6fq49mk49sy"; - name = "kdecoration-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kdecoration-5.22.2.1.tar.xz"; + sha256 = "1avdz2rvrdfdb5hk82vmgh2grbnyz5av63a1lcinjklrpafn1nj6"; + name = "kdecoration-5.22.2.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kde-gtk-config-5.22.0.tar.xz"; - sha256 = "0zmigwj2rsa40pxmvk6yq90w8b7pbkqhmz21laic0ps2sfyvll0z"; - name = "kde-gtk-config-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kde-gtk-config-5.22.2.1.tar.xz"; + sha256 = "0absshw3p105yr1m38sd79gmzdz54q711ydqbcqglyh7r6h1jhx8"; + name = "kde-gtk-config-5.22.2.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kdeplasma-addons-5.22.0.tar.xz"; - sha256 = "1v436mrnf5hbqy6fyaljkcv4k2ihx0n5881fmbqrx5sg5cs9kqs2"; - name = "kdeplasma-addons-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kdeplasma-addons-5.22.2.1.tar.xz"; + sha256 = "08q0l9p2bgyv3w5022g0g7nlkbhy3nm9nf8rl9mzjmzxrmdnm1yv"; + name = "kdeplasma-addons-5.22.2.1.tar.xz"; }; }; kgamma5 = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kgamma5-5.22.0.tar.xz"; - sha256 = "0b4k2k4fabpcs80xxai7s2byckfdnq48hpix8pxp6x2bj587cvir"; - name = "kgamma5-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kgamma5-5.22.2.1.tar.xz"; + sha256 = "1h7mrfv17wcgyl7qxm90n8ad1wahrkribrdfk24q4x1hls4qv6bi"; + name = "kgamma5-5.22.2.1.tar.xz"; }; }; khotkeys = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/khotkeys-5.22.0.tar.xz"; - sha256 = "169nvlqyk02jwk7pfl3bzvgb69bw4ylsrfshyrdmjg7kbmh9m6k8"; - name = "khotkeys-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/khotkeys-5.22.2.1.tar.xz"; + sha256 = "1wdhxljyw7ax461ih7qrscsf9i034wyc0fswybnrbmnr9pwckf5z"; + name = "khotkeys-5.22.2.1.tar.xz"; }; }; kinfocenter = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kinfocenter-5.22.0.tar.xz"; - sha256 = "08lsaps5654d1gc2am4z5hr31j31m0hj77yhc7lv9d6s9a33r18z"; - name = "kinfocenter-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kinfocenter-5.22.2.1.tar.xz"; + sha256 = "0l0smj8jbz8nmjb6hh8r4zqamns7vqv3pxxxgk3wa037175k1iil"; + name = "kinfocenter-5.22.2.1.tar.xz"; }; }; kmenuedit = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kmenuedit-5.22.0.tar.xz"; - sha256 = "0gwz5p3qk2n5a0d4a28ixl5jjnyc3hjpij0za8gwci8vcqszq3l1"; - name = "kmenuedit-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kmenuedit-5.22.2.1.tar.xz"; + sha256 = "0q7zpmy50adsl6swmr3ynnds00gg5bc4c5w7ajph86vy87paa5jn"; + name = "kmenuedit-5.22.2.1.tar.xz"; }; }; kscreen = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kscreen-5.22.0.tar.xz"; - sha256 = "17si6l1rimxlyczkkmqgxg9kn5wvkkj85xfjm7vw37r67f6mx02z"; - name = "kscreen-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kscreen-5.22.2.1.tar.xz"; + sha256 = "1nrabgml1wyk9kp5dnn6i4kq55fhm5k62a7n4xky3xj8009fb59k"; + name = "kscreen-5.22.2.1.tar.xz"; }; }; kscreenlocker = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kscreenlocker-5.22.0.tar.xz"; - sha256 = "0xfw1yrv3razj7yin5jk5i7pa9rrfafk63mvwqwx0jxn8yjczslz"; - name = "kscreenlocker-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kscreenlocker-5.22.2.1.tar.xz"; + sha256 = "0il32gs3688xvy27y816p3g0i773s5zgi0lwc43s7j5a64bcjg2f"; + name = "kscreenlocker-5.22.2.1.tar.xz"; }; }; ksshaskpass = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/ksshaskpass-5.22.0.tar.xz"; - sha256 = "15zldgdkfqyciw2r94rnj8iq6vyfnrfrxcaz52rpzprk71hmdy31"; - name = "ksshaskpass-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/ksshaskpass-5.22.2.1.tar.xz"; + sha256 = "1qymxy84mg956sjlcxl3ql4nk1xvn0pjci8vs83h4spiysj3ilrl"; + name = "ksshaskpass-5.22.2.1.tar.xz"; }; }; ksystemstats = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/ksystemstats-5.22.0.tar.xz"; - sha256 = "01whxn1jckc20m9mpkazlx2ncd5swh28hbqlbyvyd0s98qd2ywp0"; - name = "ksystemstats-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/ksystemstats-5.22.2.1.tar.xz"; + sha256 = "15zjiiczxp7pv9q4jql5k8mbd8fpsvhjfg84z878l62562i9dwxw"; + name = "ksystemstats-5.22.2.1.tar.xz"; }; }; kwallet-pam = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kwallet-pam-5.22.0.tar.xz"; - sha256 = "0mfn2ib3vx0d7aflyl80xbgci252fyvfk64nhci44lqx5yxh2726"; - name = "kwallet-pam-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kwallet-pam-5.22.2.1.tar.xz"; + sha256 = "0dsgmifbd6jvydpmlhhf58gwajwbp5sw7ih7hinrxd96i70nj20n"; + name = "kwallet-pam-5.22.2.1.tar.xz"; }; }; kwayland-integration = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kwayland-integration-5.22.0.tar.xz"; - sha256 = "0jb9a6nn9yykp2i8hw59jvwrlcrkbzrhgvbi9l4qxcqaa8z56j13"; - name = "kwayland-integration-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kwayland-integration-5.22.2.1.tar.xz"; + sha256 = "1s4i87axlfxvgpwdfjx5cklqvwc2nbbak343gw3bjijv2s5awikk"; + name = "kwayland-integration-5.22.2.1.tar.xz"; }; }; kwayland-server = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kwayland-server-5.22.0.tar.xz"; - sha256 = "150nxf6y4xz0pr9847rgpg84zlfszhmsha178rh50zkzqiqphqc4"; - name = "kwayland-server-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kwayland-server-5.22.2.1.tar.xz"; + sha256 = "1ri5fc8znn2wissyxx6jrkk7d4bryidp7xkn7m5pz2bjjm9bywcd"; + name = "kwayland-server-5.22.2.1.tar.xz"; }; }; kwin = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kwin-5.22.0.tar.xz"; - sha256 = "008frh2kkhn4686pmmzjw8wvlqycx22c8nhccph1wns47piczrjn"; - name = "kwin-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kwin-5.22.2.1.tar.xz"; + sha256 = "0rh1ys4mjjam1gprp54w5acj2hwrm7737mrqxm1kkj0lygn70x68"; + name = "kwin-5.22.2.1.tar.xz"; }; }; kwrited = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/kwrited-5.22.0.tar.xz"; - sha256 = "0683k1361jkg12fg1hvnn27rl29906c4vy94hm5kz8n8v1syp7h6"; - name = "kwrited-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/kwrited-5.22.2.1.tar.xz"; + sha256 = "07lyi83x2slwgqhgn1llyq49wn4xlcm2wbglr0bsd3nj5n0qsx2j"; + name = "kwrited-5.22.2.1.tar.xz"; }; }; layer-shell-qt = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/layer-shell-qt-5.22.0.tar.xz"; - sha256 = "1xyamll4r3mfh2b8m4mj0x5yxy8y8hlzn6rg7wxa8nl82sbz623y"; - name = "layer-shell-qt-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/layer-shell-qt-5.22.2.1.tar.xz"; + sha256 = "053f4kssp67f9mh87klkq73f3x7khc0vml6wphvbiv02rviac8cm"; + name = "layer-shell-qt-5.22.2.1.tar.xz"; }; }; libkscreen = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/libkscreen-5.22.0.tar.xz"; - sha256 = "1sws54375yfzjp8dx40q5118dzc2rgr3z32h9nkppz0xzwfwlc06"; - name = "libkscreen-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/libkscreen-5.22.2.1.tar.xz"; + sha256 = "195s6slxnq91dyvhci22hchqdb4clmzq938hmviz2vfyzcdssarq"; + name = "libkscreen-5.22.2.1.tar.xz"; }; }; libksysguard = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/libksysguard-5.22.0.tar.xz"; - sha256 = "1a874rbdvy14i15xyldqqskfkm1x3343winxnqf4lp3xmwx9glx2"; - name = "libksysguard-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/libksysguard-5.22.2.1.tar.xz"; + sha256 = "11s95p99jdg0shy3kzzazl1nhss18hvrdagd3pqzdx5cjimcs2gr"; + name = "libksysguard-5.22.2.1.tar.xz"; }; }; milou = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/milou-5.22.0.tar.xz"; - sha256 = "1zag6nbvg2ylf4k4k4b4v3094k6891ay2828hy890p8fyrz4cf7f"; - name = "milou-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/milou-5.22.2.1.tar.xz"; + sha256 = "13qgalqv0dkjwzgh7i909v9dkzpwgzilzh2p5a537sykdyb2sn2d"; + name = "milou-5.22.2.1.tar.xz"; }; }; oxygen = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/oxygen-5.22.0.tar.xz"; - sha256 = "0id7smj7i4m84zzn7mcig8m2239sp56nly1c5056sphfsxnh37hs"; - name = "oxygen-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/oxygen-5.22.2.1.tar.xz"; + sha256 = "08sc04sxm8hjv2z7dji5k67p70j9cbw6khznx5s3ivkjwvr7rawx"; + name = "oxygen-5.22.2.1.tar.xz"; }; }; plasma-browser-integration = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-browser-integration-5.22.0.tar.xz"; - sha256 = "1lkg76l5y1dd34r9wkkvi39adhhldgwhdgs8dcw9n9vasfh31i88"; - name = "plasma-browser-integration-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-browser-integration-5.22.2.1.tar.xz"; + sha256 = "0gkw0mcxmc5vghg63n5jppci1dkm2z27cq8knbvjn33rilswg2yj"; + name = "plasma-browser-integration-5.22.2.1.tar.xz"; }; }; plasma-desktop = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-desktop-5.22.0.tar.xz"; - sha256 = "1afqq30vlbdiy4fiqhgf11a4ap6lpf4g309ilnmq8zhm6q09iy7l"; - name = "plasma-desktop-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-desktop-5.22.2.1.tar.xz"; + sha256 = "0j2jkx2alcl4z3kj3hhfwzd0p8pls9xl5slvcwmhwsgdfzbcqmab"; + name = "plasma-desktop-5.22.2.1.tar.xz"; }; }; plasma-disks = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-disks-5.22.0.tar.xz"; - sha256 = "0q7b7y9llk9mbnpnwyac73bddg6s85ha9frd94r2aqkzal61yncb"; - name = "plasma-disks-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-disks-5.22.2.1.tar.xz"; + sha256 = "0i5wadi6s4l5afprgpxb5wv9x5v1cafi2mqx14l4l7k3sa5vxdd0"; + name = "plasma-disks-5.22.2.1.tar.xz"; }; }; plasma-firewall = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-firewall-5.22.0.tar.xz"; - sha256 = "05fnncdnl9qgikj4bscc9k68mmwqgcl4li5wyc4k23hh98cb0byb"; - name = "plasma-firewall-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-firewall-5.22.2.1.tar.xz"; + sha256 = "1svr6q36wcjx0ccihh44akzwm5cvy7294hys28xv5yjdg6x2n8wy"; + name = "plasma-firewall-5.22.2.1.tar.xz"; }; }; plasma-integration = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-integration-5.22.0.tar.xz"; - sha256 = "13ih5riybd1vw4zz1x22dw5hj70sp8cs35v27nlvnb48dcz8gxs8"; - name = "plasma-integration-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-integration-5.22.2.1.tar.xz"; + sha256 = "01hv0qkmn6w0v40maxjglql6w2k4kclm99j4k9bapl9knsg0281z"; + name = "plasma-integration-5.22.2.1.tar.xz"; }; }; plasma-nano = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-nano-5.22.0.tar.xz"; - sha256 = "0srg6fw8rhqg379qdnc63xz4q1v8496snc2bpyca4i7y561hkwir"; - name = "plasma-nano-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-nano-5.22.2.1.tar.xz"; + sha256 = "05cizgh98x13h3z29cvkq4qvy4mq9q0g0rj9asspjki3qm1hibpf"; + name = "plasma-nano-5.22.2.1.tar.xz"; }; }; plasma-nm = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-nm-5.22.0.tar.xz"; - sha256 = "0xd96z37a03x5lxijghngydvs066rkgy3nwvjx1s5jlmsnlz010v"; - name = "plasma-nm-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-nm-5.22.2.1.tar.xz"; + sha256 = "1wsdgzjw5a5h73877xxvj0pk39j62291csj50gjkg39figcj2ixg"; + name = "plasma-nm-5.22.2.1.tar.xz"; }; }; plasma-pa = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-pa-5.22.0.tar.xz"; - sha256 = "0ha7kpny7iwdszai1azm00d6a880w54cdhy8l87n8vrw62i3nvvd"; - name = "plasma-pa-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-pa-5.22.2.1.tar.xz"; + sha256 = "0r6i493633ymkwh09n6gx7avwm5gqlq5qf4zhdavswfcg4h0izhz"; + name = "plasma-pa-5.22.2.1.tar.xz"; }; }; plasma-phone-components = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-phone-components-5.22.0.tar.xz"; - sha256 = "1bz1pgvn72y704wcb993jblgzghrnjkx80pn7dsyhix6l5jw29li"; - name = "plasma-phone-components-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-phone-components-5.22.2.1.tar.xz"; + sha256 = "0qg3h07mzf7lkfrwbxrv4r91971sfbp9w16r8282vza2ynpf325q"; + name = "plasma-phone-components-5.22.2.1.tar.xz"; }; }; plasma-sdk = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-sdk-5.22.0.tar.xz"; - sha256 = "0lkmnzm7zm2vs8a0z955p1sf50zzqqf6z1gkk609rqch00clqdlh"; - name = "plasma-sdk-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-sdk-5.22.2.1.tar.xz"; + sha256 = "0mvfbss9l26l0kim1x4w4zlvzk48hm2fbnwpbr7cqw0iq4jfxhkp"; + name = "plasma-sdk-5.22.2.1.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-systemmonitor-5.22.0.tar.xz"; - sha256 = "1jkmwg7h64nh9aggmn9lvfc7a89mbs6kjhvxmgjprxal0wpw583g"; - name = "plasma-systemmonitor-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-systemmonitor-5.22.2.1.tar.xz"; + sha256 = "0ndp94605j2mgzib8557ankn63vybh9ilnqh8zsv5k3mzili3vfd"; + name = "plasma-systemmonitor-5.22.2.1.tar.xz"; }; }; plasma-tests = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-tests-5.22.0.tar.xz"; - sha256 = "09mc7zlxypwx6igamjgd3jzn5zxscxqqk3yyrgiv25qji33dklf5"; - name = "plasma-tests-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-tests-5.22.2.1.tar.xz"; + sha256 = "13sjnf1msk5v71a6rnvfib9hplqcw35122kj8pyzl5ihwnl7ln26"; + name = "plasma-tests-5.22.2.1.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-thunderbolt-5.22.0.tar.xz"; - sha256 = "1y1dp591qpqk4m3agka4qyyjdk8vi3h9pwnkg2cpdlkbcsklg47s"; - name = "plasma-thunderbolt-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-thunderbolt-5.22.2.1.tar.xz"; + sha256 = "1cidp2mrsqawdb0vhj1v0d2r9biwdagccdyln5csgkbmdvcq6iir"; + name = "plasma-thunderbolt-5.22.2.1.tar.xz"; }; }; plasma-vault = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-vault-5.22.0.tar.xz"; - sha256 = "1awn5rhvlvg95bn2kyanyzxclq0ki07h55384y2qxf19bsyblfqz"; - name = "plasma-vault-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-vault-5.22.2.1.tar.xz"; + sha256 = "1f6z38kj3qq3wyv27lj7q6l5hd12h2mwi2i2z9bj6snjgabbxayq"; + name = "plasma-vault-5.22.2.1.tar.xz"; }; }; plasma-workspace = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-5.22.0.tar.xz"; - sha256 = "0z5ppf5sq7hp6zslwqgaazdga25k9vl0xyilcxcgg1wd40q1mm0y"; - name = "plasma-workspace-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-5.22.2.1.tar.xz"; + sha256 = "0q23xsh67mym5zmrifvnk5aw677fngjsqidr92rq0d73rc32v01w"; + name = "plasma-workspace-5.22.2.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-wallpapers-5.22.0.tar.xz"; - sha256 = "056g8924sqqp3zk99xlc00n5gd1fvdg7pqyg5sgzagi9vqw7s18x"; - name = "plasma-workspace-wallpapers-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-wallpapers-5.22.2.1.tar.xz"; + sha256 = "15h40xhb7s2kr07jggn9gnggsrwnq29gjm45ywz2z01cayg9frcm"; + name = "plasma-workspace-wallpapers-5.22.2.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/plymouth-kcm-5.22.0.tar.xz"; - sha256 = "03nxl6k2s3w4k50dvda09f7wm7ybar7qx0ayhdhfx9f96j2dg1mr"; - name = "plymouth-kcm-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/plymouth-kcm-5.22.2.1.tar.xz"; + sha256 = "04y21bp1fcr3sb5p0k7hsrimdy04j118g7p11sddad7dv16a4krd"; + name = "plymouth-kcm-5.22.2.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.22.0"; + version = "1-5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/polkit-kde-agent-1-5.22.0.tar.xz"; - sha256 = "0h6jyc6yrbf7jc7vr2a4ly7wa63fyrak8lix2r9bmsz260sg5jl3"; - name = "polkit-kde-agent-1-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/polkit-kde-agent-1-5.22.2.1.tar.xz"; + sha256 = "0jpp0xkvh3zv5p4axrpr38laikn2c29afrkglly9xdan7hdw4nfb"; + name = "polkit-kde-agent-1-5.22.2.1.tar.xz"; }; }; powerdevil = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/powerdevil-5.22.0.tar.xz"; - sha256 = "1h9vfs0adgharcmb66kr54myshzikp7ahbhdqv05rv6jrahc3and"; - name = "powerdevil-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/powerdevil-5.22.2.1.tar.xz"; + sha256 = "15mp2bwn485jazs95iwsd2bcji4ipfn1axm0n9x0l4pmsqzbavwm"; + name = "powerdevil-5.22.2.1.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/qqc2-breeze-style-5.22.0.tar.xz"; - sha256 = "0vq2n0nd3ppmg3z8f0s3xyrlcav5bfahjazjd301v19fakxj74p6"; - name = "qqc2-breeze-style-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/qqc2-breeze-style-5.22.2.1.tar.xz"; + sha256 = "10grjvm9gnw4a5c9p104fzzxgrz0n6hx34harnwxvk7a9921ry81"; + name = "qqc2-breeze-style-5.22.2.1.tar.xz"; }; }; sddm-kcm = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/sddm-kcm-5.22.0.tar.xz"; - sha256 = "0kcd717byx4791z17sirp88vwzfx4lbar1i2696q6nciv49w3zn1"; - name = "sddm-kcm-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/sddm-kcm-5.22.2.1.tar.xz"; + sha256 = "10c96ryzzq5d9crgnawa4pji3w2cfylikr0kx9335xsl6pi16bfz"; + name = "sddm-kcm-5.22.2.1.tar.xz"; }; }; systemsettings = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/systemsettings-5.22.0.tar.xz"; - sha256 = "1vyrp6pln3j9vwd4q0wd77d6qsc1rhrl4v3r7qywhzazrkp6k3k6"; - name = "systemsettings-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/systemsettings-5.22.2.1.tar.xz"; + sha256 = "1i1jrgbfrc0x16j3jkfmiwp07ap7sy4g83ijij8s3maxc6mbyxj4"; + name = "systemsettings-5.22.2.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.22.0"; + version = "5.22.2.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.0/xdg-desktop-portal-kde-5.22.0.tar.xz"; - sha256 = "1j6s8jg7viqlmclz6c7wg428qrwiy0c19h38drrrrbalxxl0z4sv"; - name = "xdg-desktop-portal-kde-5.22.0.tar.xz"; + url = "${mirror}/stable/plasma/5.22.2/xdg-desktop-portal-kde-5.22.2.1.tar.xz"; + sha256 = "065jg40p3xj802bscvhrcv49f849mf1lqp24jip5cicf2jmai5c7"; + name = "xdg-desktop-portal-kde-5.22.2.1.tar.xz"; }; }; } From 0cd4fab86489eb61cedab8a33040a7fd25c8801e Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Tue, 6 Jul 2021 19:05:02 +0300 Subject: [PATCH 1510/1522] plasma5: 5.22.2 -> 5.22.3 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++---------------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 559700ee86a..d03f3e86fdd 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index aa369f8d9d3..675cb51e09b 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/bluedevil-5.22.2.1.tar.xz"; - sha256 = "1ipv6afc40a4q6gifzi8hp723p0p81a41f7mxz5xwzqcxxrdr90l"; - name = "bluedevil-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz"; + sha256 = "1qgq4c3c1jmhssq9yllx69df58a884w39ng9z2ddl3kvph6c1f4m"; + name = "bluedevil-5.22.3.tar.xz"; }; }; breeze = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/breeze-5.22.2.1.tar.xz"; - sha256 = "02hi5jx366imbwcmql82da73jrsf64pmlfgh9c8bz3kqrlw5kqnl"; - name = "breeze-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/breeze-5.22.3.tar.xz"; + sha256 = "1r10y41l6l2xhmwvy2q03icp6b4163pav98bdrwysrx7pvlj131b"; + name = "breeze-5.22.3.tar.xz"; }; }; breeze-grub = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/breeze-grub-5.22.2.1.tar.xz"; - sha256 = "0vial16xp9s1s9vsaa4pyxnj5n94cym7ylcxnkhmqzl7z9mrykd3"; - name = "breeze-grub-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz"; + sha256 = "06i0k2s7arfwjzcr972c1zs2kpkxvl57ih9nz5idd0lshamc36gy"; + name = "breeze-grub-5.22.3.tar.xz"; }; }; breeze-gtk = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/breeze-gtk-5.22.2.1.tar.xz"; - sha256 = "1vc8lxbkaax12d4dx4wnyjnd4pfs484p04w7fpx884k84r06ldl2"; - name = "breeze-gtk-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz"; + sha256 = "1gvx1ip8jkc7pj6bciy3514bkmlazliz60sxdab8b6m00lb0rwng"; + name = "breeze-gtk-5.22.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/breeze-plymouth-5.22.2.1.tar.xz"; - sha256 = "1k0xpjr7gg13gxxmla6s7rnlyajps6y6wiwyiddfqj3rl98x3ib4"; - name = "breeze-plymouth-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz"; + sha256 = "03px2jk50plalpnzj6xsbkpqxmj5vkxl7r6y60g7dxf6d4hv15dr"; + name = "breeze-plymouth-5.22.3.tar.xz"; }; }; discover = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/discover-5.22.2.1.tar.xz"; - sha256 = "15vwhg37656vhjvl58fxy0gl9yc6f8wlrryplvpxm1yb9pz3b81k"; - name = "discover-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/discover-5.22.3.tar.xz"; + sha256 = "1893wwq4m40z6k64n97vqgxkhwcgbhw4q5m5cs0dpczx1803sa8y"; + name = "discover-5.22.3.tar.xz"; }; }; drkonqi = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/drkonqi-5.22.2.1.tar.xz"; - sha256 = "03fk2m6m0w33xgxzcppjrrpg0mrgg1xyjj2674ad0dnmjyp82c3d"; - name = "drkonqi-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz"; + sha256 = "09jf0rdpb1k2fbbqg3p5ypk7jhp2nls19x1zc8rphnsr1hwxxsb3"; + name = "drkonqi-5.22.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kactivitymanagerd-5.22.2.1.tar.xz"; - sha256 = "1sd09xy8sxprmfnkh9n2xzzm4ny4qmsiw8sycn52fjwpnj69b2cr"; - name = "kactivitymanagerd-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz"; + sha256 = "1i2hs9204vi41d3jb6hr050g9v0jm5in07nqyxy1wxw2bmpncisx"; + name = "kactivitymanagerd-5.22.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kde-cli-tools-5.22.2.1.tar.xz"; - sha256 = "1hlhrj0a5hf9z86m6flj1qzsvl3wbdpb7zmvagrkpjj67xysczgk"; - name = "kde-cli-tools-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz"; + sha256 = "1w5c65fd0p2xz185prkrr6ys0cy3wasfkbfv1q4qiniwxjipa3q4"; + name = "kde-cli-tools-5.22.3.tar.xz"; }; }; kdecoration = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kdecoration-5.22.2.1.tar.xz"; - sha256 = "1avdz2rvrdfdb5hk82vmgh2grbnyz5av63a1lcinjklrpafn1nj6"; - name = "kdecoration-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz"; + sha256 = "1bgygqi37yc34nhlf5w32zgz0qvrga9kh7ickxc2gydslvjwaq5p"; + name = "kdecoration-5.22.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kde-gtk-config-5.22.2.1.tar.xz"; - sha256 = "0absshw3p105yr1m38sd79gmzdz54q711ydqbcqglyh7r6h1jhx8"; - name = "kde-gtk-config-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz"; + sha256 = "1mq10qbp3jm4mdbkday1afwa0nj9zx8clvaw51qxprcphg4csjy8"; + name = "kde-gtk-config-5.22.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kdeplasma-addons-5.22.2.1.tar.xz"; - sha256 = "08q0l9p2bgyv3w5022g0g7nlkbhy3nm9nf8rl9mzjmzxrmdnm1yv"; - name = "kdeplasma-addons-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz"; + sha256 = "1hd3lv9sjlhab91lsxbg6rkgjcp50zy7n3sj51hdcbsdi8fjr9nh"; + name = "kdeplasma-addons-5.22.3.tar.xz"; }; }; kgamma5 = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kgamma5-5.22.2.1.tar.xz"; - sha256 = "1h7mrfv17wcgyl7qxm90n8ad1wahrkribrdfk24q4x1hls4qv6bi"; - name = "kgamma5-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz"; + sha256 = "1v7jak4bpj5vhzqzq07v9v6b24xqp52k00dx43w2dhsh0vaas9sc"; + name = "kgamma5-5.22.3.tar.xz"; }; }; khotkeys = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/khotkeys-5.22.2.1.tar.xz"; - sha256 = "1wdhxljyw7ax461ih7qrscsf9i034wyc0fswybnrbmnr9pwckf5z"; - name = "khotkeys-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz"; + sha256 = "0070nk02nwsbnikvf7qjw0wdxkpfv6nvyv1sw68whnm0xjgxnkl5"; + name = "khotkeys-5.22.3.tar.xz"; }; }; kinfocenter = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kinfocenter-5.22.2.1.tar.xz"; - sha256 = "0l0smj8jbz8nmjb6hh8r4zqamns7vqv3pxxxgk3wa037175k1iil"; - name = "kinfocenter-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz"; + sha256 = "1qkbhic99ddd55z3wvnhx1ykiy2ydanw32gs7gww8i0adwh0jc3b"; + name = "kinfocenter-5.22.3.tar.xz"; }; }; kmenuedit = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kmenuedit-5.22.2.1.tar.xz"; - sha256 = "0q7zpmy50adsl6swmr3ynnds00gg5bc4c5w7ajph86vy87paa5jn"; - name = "kmenuedit-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz"; + sha256 = "1ldvx0mvzx3ym7aqz9hk044nn33b97n5bh757v8kwi8fy6yk10xx"; + name = "kmenuedit-5.22.3.tar.xz"; }; }; kscreen = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kscreen-5.22.2.1.tar.xz"; - sha256 = "1nrabgml1wyk9kp5dnn6i4kq55fhm5k62a7n4xky3xj8009fb59k"; - name = "kscreen-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz"; + sha256 = "09ai5l3rnhsq3fy1faqg8q3hrikmsjq7gvh1rsw542v9ii37bgjn"; + name = "kscreen-5.22.3.tar.xz"; }; }; kscreenlocker = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kscreenlocker-5.22.2.1.tar.xz"; - sha256 = "0il32gs3688xvy27y816p3g0i773s5zgi0lwc43s7j5a64bcjg2f"; - name = "kscreenlocker-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz"; + sha256 = "119jbpvni7id6d1kidi8n4nsxscisyc8ifd5a4q7y73sspdr46fp"; + name = "kscreenlocker-5.22.3.tar.xz"; }; }; ksshaskpass = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/ksshaskpass-5.22.2.1.tar.xz"; - sha256 = "1qymxy84mg956sjlcxl3ql4nk1xvn0pjci8vs83h4spiysj3ilrl"; - name = "ksshaskpass-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz"; + sha256 = "1vgnz3j83yypymwqzi9r314zwgvaqp82akyfwzzfw60csb6vqdfr"; + name = "ksshaskpass-5.22.3.tar.xz"; }; }; ksystemstats = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/ksystemstats-5.22.2.1.tar.xz"; - sha256 = "15zjiiczxp7pv9q4jql5k8mbd8fpsvhjfg84z878l62562i9dwxw"; - name = "ksystemstats-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz"; + sha256 = "0p19lcn8rmpxnnwa6crn9id6pwxixmh68yx6j3cy7z2l3ngfrnka"; + name = "ksystemstats-5.22.3.tar.xz"; }; }; kwallet-pam = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kwallet-pam-5.22.2.1.tar.xz"; - sha256 = "0dsgmifbd6jvydpmlhhf58gwajwbp5sw7ih7hinrxd96i70nj20n"; - name = "kwallet-pam-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz"; + sha256 = "0x2dw5rgqr0hysdbd4d7nqx4wkxh511xhwfikrgbc3m13vs7l8dg"; + name = "kwallet-pam-5.22.3.tar.xz"; }; }; kwayland-integration = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kwayland-integration-5.22.2.1.tar.xz"; - sha256 = "1s4i87axlfxvgpwdfjx5cklqvwc2nbbak343gw3bjijv2s5awikk"; - name = "kwayland-integration-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz"; + sha256 = "096a8b4pjc1l57jq08x7x181biichrjp5i3s9kyp2kkd09lk0niz"; + name = "kwayland-integration-5.22.3.tar.xz"; }; }; kwayland-server = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kwayland-server-5.22.2.1.tar.xz"; - sha256 = "1ri5fc8znn2wissyxx6jrkk7d4bryidp7xkn7m5pz2bjjm9bywcd"; - name = "kwayland-server-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz"; + sha256 = "0c5xcnj29d5j9zqj4qnqgs5732aqi6xqpxqwid20v551lf24kc6n"; + name = "kwayland-server-5.22.3.tar.xz"; }; }; kwin = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kwin-5.22.2.1.tar.xz"; - sha256 = "0rh1ys4mjjam1gprp54w5acj2hwrm7737mrqxm1kkj0lygn70x68"; - name = "kwin-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kwin-5.22.3.tar.xz"; + sha256 = "03kd07p1hm6s8vkfjr1rlbjj9bpc48k5ynfb364dkypbfin5p6dw"; + name = "kwin-5.22.3.tar.xz"; }; }; kwrited = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/kwrited-5.22.2.1.tar.xz"; - sha256 = "07lyi83x2slwgqhgn1llyq49wn4xlcm2wbglr0bsd3nj5n0qsx2j"; - name = "kwrited-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz"; + sha256 = "063hmj24i3hvaw6wzjqs56ln6p9jjfz08f9r04wgzgg01zzyznjn"; + name = "kwrited-5.22.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/layer-shell-qt-5.22.2.1.tar.xz"; - sha256 = "053f4kssp67f9mh87klkq73f3x7khc0vml6wphvbiv02rviac8cm"; - name = "layer-shell-qt-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz"; + sha256 = "0jnfhq86419f9y0vs6l7z3n2f63xy7mwz1s0992zx44ambvwfpnq"; + name = "layer-shell-qt-5.22.3.tar.xz"; }; }; libkscreen = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/libkscreen-5.22.2.1.tar.xz"; - sha256 = "195s6slxnq91dyvhci22hchqdb4clmzq938hmviz2vfyzcdssarq"; - name = "libkscreen-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz"; + sha256 = "1whhxzbl8sh63490c222y2dn6qcx9rp8wxsmx8mpx9i7p0x3rl01"; + name = "libkscreen-5.22.3.tar.xz"; }; }; libksysguard = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/libksysguard-5.22.2.1.tar.xz"; - sha256 = "11s95p99jdg0shy3kzzazl1nhss18hvrdagd3pqzdx5cjimcs2gr"; - name = "libksysguard-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz"; + sha256 = "0sjrm3g4wxscv0p9vkw0p6vr1hdysmngc1l57a26cg1z920zidjh"; + name = "libksysguard-5.22.3.tar.xz"; }; }; milou = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/milou-5.22.2.1.tar.xz"; - sha256 = "13qgalqv0dkjwzgh7i909v9dkzpwgzilzh2p5a537sykdyb2sn2d"; - name = "milou-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/milou-5.22.3.tar.xz"; + sha256 = "0qcy7snn3r16x0vyz57xv60fnjl565pfq9rd265n3w6543ivc09r"; + name = "milou-5.22.3.tar.xz"; }; }; oxygen = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/oxygen-5.22.2.1.tar.xz"; - sha256 = "08sc04sxm8hjv2z7dji5k67p70j9cbw6khznx5s3ivkjwvr7rawx"; - name = "oxygen-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz"; + sha256 = "1fp425ifzk5fxapkwdc4q8xfyajs2skqg83sf1gqh9qsyniw47m5"; + name = "oxygen-5.22.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-browser-integration-5.22.2.1.tar.xz"; - sha256 = "0gkw0mcxmc5vghg63n5jppci1dkm2z27cq8knbvjn33rilswg2yj"; - name = "plasma-browser-integration-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz"; + sha256 = "16mpzycxpag946l6fivr5gv5ns5wlmxq7q8mwmhmffa0byg87wxs"; + name = "plasma-browser-integration-5.22.3.tar.xz"; }; }; plasma-desktop = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-desktop-5.22.2.1.tar.xz"; - sha256 = "0j2jkx2alcl4z3kj3hhfwzd0p8pls9xl5slvcwmhwsgdfzbcqmab"; - name = "plasma-desktop-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz"; + sha256 = "046n6wxbdmjxhv1xvvdkb2vy76cpb7nkj7x5zpkmjy2ifa2q6nxx"; + name = "plasma-desktop-5.22.3.tar.xz"; }; }; plasma-disks = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-disks-5.22.2.1.tar.xz"; - sha256 = "0i5wadi6s4l5afprgpxb5wv9x5v1cafi2mqx14l4l7k3sa5vxdd0"; - name = "plasma-disks-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz"; + sha256 = "1a36mgd32743jmnib2gc9x5yg8ipv7zpjwjq087b39k7sr16c40l"; + name = "plasma-disks-5.22.3.tar.xz"; }; }; plasma-firewall = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-firewall-5.22.2.1.tar.xz"; - sha256 = "1svr6q36wcjx0ccihh44akzwm5cvy7294hys28xv5yjdg6x2n8wy"; - name = "plasma-firewall-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz"; + sha256 = "09300mbq6g193k3bk51g0a21idw5lfvibciiw6dqpn4dxynb8i0d"; + name = "plasma-firewall-5.22.3.tar.xz"; }; }; plasma-integration = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-integration-5.22.2.1.tar.xz"; - sha256 = "01hv0qkmn6w0v40maxjglql6w2k4kclm99j4k9bapl9knsg0281z"; - name = "plasma-integration-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz"; + sha256 = "02xsw10zn3p17zb6nqgbjlsmy6ayxyyr6krnmqdg5xz03p6m9whq"; + name = "plasma-integration-5.22.3.tar.xz"; }; }; plasma-nano = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-nano-5.22.2.1.tar.xz"; - sha256 = "05cizgh98x13h3z29cvkq4qvy4mq9q0g0rj9asspjki3qm1hibpf"; - name = "plasma-nano-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-nano-5.22.3.tar.xz"; + sha256 = "100ljwavpm02dvf0msp2al2hrjb2ki1zpm57bwkfaqj40knir6p6"; + name = "plasma-nano-5.22.3.tar.xz"; }; }; plasma-nm = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-nm-5.22.2.1.tar.xz"; - sha256 = "1wsdgzjw5a5h73877xxvj0pk39j62291csj50gjkg39figcj2ixg"; - name = "plasma-nm-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz"; + sha256 = "1imq4j5a62idqjp0bqwbz2rqc9ln1dwxxarxkq68jiw7bvyy0rix"; + name = "plasma-nm-5.22.3.tar.xz"; }; }; plasma-pa = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-pa-5.22.2.1.tar.xz"; - sha256 = "0r6i493633ymkwh09n6gx7avwm5gqlq5qf4zhdavswfcg4h0izhz"; - name = "plasma-pa-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz"; + sha256 = "184a89qfn58ylakqjh524p3n4knvch85klz534jzxdxzb8kjmn0a"; + name = "plasma-pa-5.22.3.tar.xz"; }; }; plasma-phone-components = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-phone-components-5.22.2.1.tar.xz"; - sha256 = "0qg3h07mzf7lkfrwbxrv4r91971sfbp9w16r8282vza2ynpf325q"; - name = "plasma-phone-components-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-phone-components-5.22.3.tar.xz"; + sha256 = "1plp49acy83a1ls7i9aafckb62grwhsqv1i7l3hrzdd1ci7gsmxl"; + name = "plasma-phone-components-5.22.3.tar.xz"; }; }; plasma-sdk = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-sdk-5.22.2.1.tar.xz"; - sha256 = "0mvfbss9l26l0kim1x4w4zlvzk48hm2fbnwpbr7cqw0iq4jfxhkp"; - name = "plasma-sdk-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz"; + sha256 = "0hn7im5wb2jka2q1g5gyp9hr8n000raxpk1rfcr09i8yrc6xhsnj"; + name = "plasma-sdk-5.22.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-systemmonitor-5.22.2.1.tar.xz"; - sha256 = "0ndp94605j2mgzib8557ankn63vybh9ilnqh8zsv5k3mzili3vfd"; - name = "plasma-systemmonitor-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz"; + sha256 = "1lz4j5cv405jfbx4bl522wica0xylc33hgsf8v5915d3i074z669"; + name = "plasma-systemmonitor-5.22.3.tar.xz"; }; }; plasma-tests = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-tests-5.22.2.1.tar.xz"; - sha256 = "13sjnf1msk5v71a6rnvfib9hplqcw35122kj8pyzl5ihwnl7ln26"; - name = "plasma-tests-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-tests-5.22.3.tar.xz"; + sha256 = "0qvgmk4idxr4ajj33frrsa2xpdgr53am4cvzs70g6fk3wfjm0b9z"; + name = "plasma-tests-5.22.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-thunderbolt-5.22.2.1.tar.xz"; - sha256 = "1cidp2mrsqawdb0vhj1v0d2r9biwdagccdyln5csgkbmdvcq6iir"; - name = "plasma-thunderbolt-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz"; + sha256 = "1f5vnf4zacgzvg9rbga90mcgjzfhrqq1qbbf16syi0xkbg031prz"; + name = "plasma-thunderbolt-5.22.3.tar.xz"; }; }; plasma-vault = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-vault-5.22.2.1.tar.xz"; - sha256 = "1f6z38kj3qq3wyv27lj7q6l5hd12h2mwi2i2z9bj6snjgabbxayq"; - name = "plasma-vault-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz"; + sha256 = "13vdbmbsz6bfjdsbhwv29rm515h7bk11lqc6hk2178yh9p4xn6nk"; + name = "plasma-vault-5.22.3.tar.xz"; }; }; plasma-workspace = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-5.22.2.1.tar.xz"; - sha256 = "0q23xsh67mym5zmrifvnk5aw677fngjsqidr92rq0d73rc32v01w"; - name = "plasma-workspace-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz"; + sha256 = "1mm4lpx094v62h05qlg0rbgk10g8aisnnr82ynyal4m1awahlp6r"; + name = "plasma-workspace-5.22.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-wallpapers-5.22.2.1.tar.xz"; - sha256 = "15h40xhb7s2kr07jggn9gnggsrwnq29gjm45ywz2z01cayg9frcm"; - name = "plasma-workspace-wallpapers-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz"; + sha256 = "0xay6zfrvz535n5cl3w40x63b5mvqmzmmha4csbwhingqrxyxqp3"; + name = "plasma-workspace-wallpapers-5.22.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/plymouth-kcm-5.22.2.1.tar.xz"; - sha256 = "04y21bp1fcr3sb5p0k7hsrimdy04j118g7p11sddad7dv16a4krd"; - name = "plymouth-kcm-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz"; + sha256 = "0xwn827xi0fwvwsrb69q6k8xgbgdjjhb50v4d9icy1n7dfjlbw19"; + name = "plymouth-kcm-5.22.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.22.2.1"; + version = "1-5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/polkit-kde-agent-1-5.22.2.1.tar.xz"; - sha256 = "0jpp0xkvh3zv5p4axrpr38laikn2c29afrkglly9xdan7hdw4nfb"; - name = "polkit-kde-agent-1-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz"; + sha256 = "16jdrqgibm9iv1j7vl9n8k7q4sqjqmvzcndq67wyva2lvy2xhjcw"; + name = "polkit-kde-agent-1-5.22.3.tar.xz"; }; }; powerdevil = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/powerdevil-5.22.2.1.tar.xz"; - sha256 = "15mp2bwn485jazs95iwsd2bcji4ipfn1axm0n9x0l4pmsqzbavwm"; - name = "powerdevil-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz"; + sha256 = "1i7zx8ykp73g8mav1k8jiizfz4f3lzjvsjf0ky74hklc610hgvb4"; + name = "powerdevil-5.22.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/qqc2-breeze-style-5.22.2.1.tar.xz"; - sha256 = "10grjvm9gnw4a5c9p104fzzxgrz0n6hx34harnwxvk7a9921ry81"; - name = "qqc2-breeze-style-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/qqc2-breeze-style-5.22.3.tar.xz"; + sha256 = "1pfpmqs4469sfk753915jjg78a61jjswzq2ckg1mrvpvjm6c3m3n"; + name = "qqc2-breeze-style-5.22.3.tar.xz"; }; }; sddm-kcm = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/sddm-kcm-5.22.2.1.tar.xz"; - sha256 = "10c96ryzzq5d9crgnawa4pji3w2cfylikr0kx9335xsl6pi16bfz"; - name = "sddm-kcm-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz"; + sha256 = "1cp421qk5plp0l3h0z3v6kkfm2qc3j1xk1q7xgfw7s6scrxkj1gp"; + name = "sddm-kcm-5.22.3.tar.xz"; }; }; systemsettings = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/systemsettings-5.22.2.1.tar.xz"; - sha256 = "1i1jrgbfrc0x16j3jkfmiwp07ap7sy4g83ijij8s3maxc6mbyxj4"; - name = "systemsettings-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz"; + sha256 = "0hg999vk4nw8hpyl0wmy1h0bcgd9jc7xd1y073bd28bjjpywn5vq"; + name = "systemsettings-5.22.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.22.2.1"; + version = "5.22.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.2/xdg-desktop-portal-kde-5.22.2.1.tar.xz"; - sha256 = "065jg40p3xj802bscvhrcv49f849mf1lqp24jip5cicf2jmai5c7"; - name = "xdg-desktop-portal-kde-5.22.2.1.tar.xz"; + url = "${mirror}/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz"; + sha256 = "1ggcnwvpp32912jgi2ly1541456kwk18q7a7z7l913vhfyrmsa5q"; + name = "xdg-desktop-portal-kde-5.22.3.tar.xz"; }; }; } From c4c5c49fa64b7f4a19d1f2141cdac88cd15063da Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Tue, 6 Jul 2021 19:10:14 +0300 Subject: [PATCH 1511/1522] kde-frameworks: remove outdated patch Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/kde-frameworks/kimageformats.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 00a9ef015f2..97b413e805c 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, extra-cmake-modules, ilmbase, karchive, openexr, libavif, qtbase }: @@ -9,19 +9,6 @@ let inherit (lib) getDev; in mkDerivation { name = "kimageformats"; - patches = [ - (fetchpatch { # included in kimageformats >= 5.83 - name = "avif-0.9.2.diff"; - url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff"; - sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig"; - }) - (fetchpatch { # included in kimageformats >= 5.82 - name = "CVE-2021-36083.patch"; - url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff"; - sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr libavif qtbase ]; outputs = [ "out" ]; # plugins only From 08f219f22e6ab01cf9600383666b55666e2ff724 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin <iam@lach.pw> Date: Sat, 10 Jul 2021 16:27:53 +0300 Subject: [PATCH 1512/1522] kde-frameworks: 5.83 -> 5.84 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 06b49105653..93d7cbef74c 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.83/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.84/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index a679fefa6da..34792d254e7 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/attica-5.83.0.tar.xz"; - sha256 = "1vmb0ril1z5f5zfazm2py9mjj7g95m98km9h7xl1cp4zkmllgj26"; - name = "attica-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/attica-5.84.0.tar.xz"; + sha256 = "1q5imda1p26rw3lzz7p6wlg63d2kjl6yx93pxryy129xwyxszf5d"; + name = "attica-5.84.0.tar.xz"; }; }; baloo = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/baloo-5.83.0.tar.xz"; - sha256 = "0ahhs07s2q64c1ybqyy2l539awjj36v4rhkr2jxlj4j3m89smbss"; - name = "baloo-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/baloo-5.84.0.tar.xz"; + sha256 = "15ldfq9qryw2xna6kr316fqldrfd2r09qj9ig8i2x391x18dzhg4"; + name = "baloo-5.84.0.tar.xz"; }; }; bluez-qt = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/bluez-qt-5.83.0.tar.xz"; - sha256 = "0fvdac35niy96sn2rbprn8g7can452q9q9n5cf4kma7wznndmf8v"; - name = "bluez-qt-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/bluez-qt-5.84.0.tar.xz"; + sha256 = "0pg6zj0b7j9v339g1q5a9dm1l0a7n1c388n26x6k2s1q785vk6lh"; + name = "bluez-qt-5.84.0.tar.xz"; }; }; breeze-icons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz"; - sha256 = "1r3g03mam24g490r87qg5dpxzrf9vlg9bvqg38513nfg1i21k0dj"; - name = "breeze-icons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/breeze-icons-5.84.0.tar.xz"; + sha256 = "1320c84pr39541lb4zk33brxx593dbvvnij5x8as4rp99mcjd6h4"; + name = "breeze-icons-5.84.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/extra-cmake-modules-5.83.0.tar.xz"; - sha256 = "07pqw3c86qzrlja0ykwjr9d82r9szaq0410gy7zhhckzj6rz7dvj"; - name = "extra-cmake-modules-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/extra-cmake-modules-5.84.0.tar.xz"; + sha256 = "0h8w5ahjpbb524qgabzbgd4x2j8qnfv1d1cq8vzq5hbpw7r5w25v"; + name = "extra-cmake-modules-5.84.0.tar.xz"; }; }; frameworkintegration = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/frameworkintegration-5.83.0.tar.xz"; - sha256 = "1axkysrycxw0y3a152n8r4mbnv9vsafdqfdalndqrmpn5szp2ynj"; - name = "frameworkintegration-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/frameworkintegration-5.84.0.tar.xz"; + sha256 = "0jzrsw5fkbgk8xpdjfjprqm1vpa61x32zikyj370shcg3qsaiyir"; + name = "frameworkintegration-5.84.0.tar.xz"; }; }; kactivities = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kactivities-5.83.0.tar.xz"; - sha256 = "0yqp75v05dyv5p3zs9qn3cvqhqxq781m8pfip0syhc97x8pckins"; - name = "kactivities-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kactivities-5.84.0.tar.xz"; + sha256 = "0lihxr9jvmg2h7k36djdfvsz5slxzzgxpxmv9745ynvc92fr1c46"; + name = "kactivities-5.84.0.tar.xz"; }; }; kactivities-stats = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kactivities-stats-5.83.0.tar.xz"; - sha256 = "1l9gnl3zwlk0z3g5wc6h50nlplxw3kmc4zd18rczm48330v1zgr2"; - name = "kactivities-stats-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kactivities-stats-5.84.0.tar.xz"; + sha256 = "1mb80jzccvha6rnd9q0xych1k4p0nfdyh7s9ryafv9fqqhzr5fh4"; + name = "kactivities-stats-5.84.0.tar.xz"; }; }; kapidox = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kapidox-5.83.0.tar.xz"; - sha256 = "0ixgnm2akays9wiv25snr87358wc0ygnfydhlq0cflqqbyzplqs6"; - name = "kapidox-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kapidox-5.84.0.tar.xz"; + sha256 = "0h8isigbgc02df3kb875p7yzy04i41lss2r5awlh5b1np89l5g51"; + name = "kapidox-5.84.0.tar.xz"; }; }; karchive = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/karchive-5.83.0.tar.xz"; - sha256 = "0yg3larnhmfjng7cxbxbmyf3l40ypj5wpyjcq1czfy57a4wrbaaw"; - name = "karchive-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/karchive-5.84.0.tar.xz"; + sha256 = "1xjykx94xn0p1926my4f82dn9bsv2b2mv1l4pjpzzfwyn26df34s"; + name = "karchive-5.84.0.tar.xz"; }; }; kauth = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kauth-5.83.0.tar.xz"; - sha256 = "1z46695aj7mh4sy6sd1gixwr1xgs3xhbqlxcl63i036n37s7sqfb"; - name = "kauth-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kauth-5.84.0.tar.xz"; + sha256 = "1jwynarchwbgdnfzpp3r8ggr8mz2gwgwiv9j2kxmh0m607sqzj04"; + name = "kauth-5.84.0.tar.xz"; }; }; kbookmarks = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kbookmarks-5.83.0.tar.xz"; - sha256 = "0cp733hpxrhmdjng949215p86kjz64fm30sv386j223iys32h3am"; - name = "kbookmarks-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kbookmarks-5.84.0.tar.xz"; + sha256 = "1k3mamhd55j3hvkw7h0gfizy5hg37d57h26xz9hbxrw1lb1p9gyc"; + name = "kbookmarks-5.84.0.tar.xz"; }; }; kcalendarcore = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcalendarcore-5.83.0.tar.xz"; - sha256 = "07xgjb4l5nsswkjlw352yaqzdfxfj0qyasb6zqlx09sws88fkjzb"; - name = "kcalendarcore-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcalendarcore-5.84.0.tar.xz"; + sha256 = "06asygdsk4bnn29cc8khpzy68fiyrqwajl55fixmja7kvzsnq4cb"; + name = "kcalendarcore-5.84.0.tar.xz"; }; }; kcmutils = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcmutils-5.83.0.tar.xz"; - sha256 = "0r86g01mx9mjmqflvdsw93d1dzzg4rixi5nkxxswqa5dlm4ybqaf"; - name = "kcmutils-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcmutils-5.84.0.tar.xz"; + sha256 = "1ackicsg2xnjl8gid9v4a72vvqhn7536s0w1g50hss142hp0b9zf"; + name = "kcmutils-5.84.0.tar.xz"; }; }; kcodecs = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcodecs-5.83.0.tar.xz"; - sha256 = "0nc3a4z5wfvkfp5czjq5fz8zg2i0pvc5l7dk8g4ch0kasymjqd82"; - name = "kcodecs-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcodecs-5.84.0.tar.xz"; + sha256 = "0fjjz40kchw38p74zvgrcfsgclg54w6b8bl6ly72qmj5n0ip2gr3"; + name = "kcodecs-5.84.0.tar.xz"; }; }; kcompletion = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcompletion-5.83.0.tar.xz"; - sha256 = "0jlysdbkmkny7m82hhyx4im2hm3dlj385w99cb7wzcx7wxzrmfwg"; - name = "kcompletion-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcompletion-5.84.0.tar.xz"; + sha256 = "1kbj1f3c3qpfxn4jyldhzlmgxfxn0af5rbs0irzwd9wqgk9i94vs"; + name = "kcompletion-5.84.0.tar.xz"; }; }; kconfig = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kconfig-5.83.0.tar.xz"; - sha256 = "1s7fhi7yhw5i4igfimbl0ls095nkl1rnxi2z33bjnam215ba113w"; - name = "kconfig-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kconfig-5.84.0.tar.xz"; + sha256 = "0wshg4hx4d6m1r17mc7l9ivhx6mw0h1qx8fd46hmydmbjp030jma"; + name = "kconfig-5.84.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kconfigwidgets-5.83.0.tar.xz"; - sha256 = "1hs0zpggfp08dnra1fdzh652ilgas6c69bck31mglwg0bdrn0cnp"; - name = "kconfigwidgets-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kconfigwidgets-5.84.0.tar.xz"; + sha256 = "17hyf495wlm5jqc0qxxymy1kcjybbihg8093kf59hvvpcci5xsin"; + name = "kconfigwidgets-5.84.0.tar.xz"; }; }; kcontacts = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcontacts-5.83.0.tar.xz"; - sha256 = "0qy04j860944s7hx0x35wjwbj55l2gr8h0p5yvsw2df9rcwl5b94"; - name = "kcontacts-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcontacts-5.84.0.tar.xz"; + sha256 = "0gvskvfwfmrs884fkfl0gvmnic4hhymffs7jhq6yaixbsjl2mznl"; + name = "kcontacts-5.84.0.tar.xz"; }; }; kcoreaddons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcoreaddons-5.83.0.tar.xz"; - sha256 = "0mwakqbnf97d45xgys9jzalm9p5gp2xaqmjaxxq6r7qm7jv9jg3j"; - name = "kcoreaddons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcoreaddons-5.84.0.tar.xz"; + sha256 = "1c0z2cn02jqanisq5rr6iry1hx9p5ffm59353mknyyg5xyk3qkbm"; + name = "kcoreaddons-5.84.0.tar.xz"; }; }; kcrash = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kcrash-5.83.0.tar.xz"; - sha256 = "1ix4rzg72l32rs78scv3jicymapwf59gwginp5dvwhymxdrh5vr9"; - name = "kcrash-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kcrash-5.84.0.tar.xz"; + sha256 = "0asr7llkdbr6wzq31vnmga7haxddz1b6xqp3smw7hvgzs0f8vrv5"; + name = "kcrash-5.84.0.tar.xz"; }; }; kdav = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdav-5.83.0.tar.xz"; - sha256 = "0fd07yiyzq1xzz911sh8nz39hfwai84mykf0zwjafrxsff4165q0"; - name = "kdav-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdav-5.84.0.tar.xz"; + sha256 = "09wly717cp86b3gahj79nfplx71f78zyb5mhpw9xm0dkdf1qf56q"; + name = "kdav-5.84.0.tar.xz"; }; }; kdbusaddons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdbusaddons-5.83.0.tar.xz"; - sha256 = "01a9jw8xm23f97a54hjqbpq77bb71pc2gsmd6fzcdqq4l71h83qa"; - name = "kdbusaddons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdbusaddons-5.84.0.tar.xz"; + sha256 = "0a4v2g86lss1wq359mssg142dp1qccn17yrdhbgy55qi6id6pvl5"; + name = "kdbusaddons-5.84.0.tar.xz"; }; }; kdeclarative = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdeclarative-5.83.0.tar.xz"; - sha256 = "0h6amiq6hpsi0iyfca7q3m6fm0bf1grn236ypj4r2bs1mjxprals"; - name = "kdeclarative-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdeclarative-5.84.0.tar.xz"; + sha256 = "0ygp3jwz0fjixiq7bkjchsxzvg6fn50qw7si9nil5hkkg6lwxir6"; + name = "kdeclarative-5.84.0.tar.xz"; }; }; kded = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kded-5.83.0.tar.xz"; - sha256 = "0fwvl08mkci10y1z57chamiq22krhhs97j3gwjg0ihc7qmmrwcb9"; - name = "kded-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kded-5.84.0.tar.xz"; + sha256 = "0c6klrchbxy57f7hjvsk640bg6s8gp1ilrzvzg7f8m825yg1b5jc"; + name = "kded-5.84.0.tar.xz"; }; }; kdelibs4support = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kdelibs4support-5.83.0.tar.xz"; - sha256 = "0cp4a37sb0mgshvnvhsxv5s925ksy95z86wv9ng65vkgwd87w6pa"; - name = "kdelibs4support-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kdelibs4support-5.84.0.tar.xz"; + sha256 = "1qkiqv0fq8q6i18mi7gm58qhnqra8xkslzjprap6zjq49g9lcgrp"; + name = "kdelibs4support-5.84.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kdesignerplugin-5.83.0.tar.xz"; - sha256 = "138c9834xiqa20c6w1ad15lznn6if278wsa2sjc681vwkncg2gr0"; - name = "kdesignerplugin-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kdesignerplugin-5.84.0.tar.xz"; + sha256 = "0k51pjkh4dfc8bkw0pbsa260fifvcm0wrbpckvd1xd32b0r1n2ax"; + name = "kdesignerplugin-5.84.0.tar.xz"; }; }; kdesu = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdesu-5.83.0.tar.xz"; - sha256 = "1qqznk92054hivk68l3yx81jnivmz34s9pjafxcazwkpknzxkvwy"; - name = "kdesu-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdesu-5.84.0.tar.xz"; + sha256 = "0b3ljqj86crccyqzlqg0fkjryi654pi5q84c11zywmws72bjjx9d"; + name = "kdesu-5.84.0.tar.xz"; }; }; kdewebkit = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kdewebkit-5.83.0.tar.xz"; - sha256 = "13i5l5q7xz362jvvdbb3zdg70qaz2n3dw95yzzk03yyv6phz4079"; - name = "kdewebkit-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kdewebkit-5.84.0.tar.xz"; + sha256 = "0rhjdqr5g4gphszz70nhvv9wgr0g048pnc36w4w2jpzyy75nwjq2"; + name = "kdewebkit-5.84.0.tar.xz"; }; }; kdnssd = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdnssd-5.83.0.tar.xz"; - sha256 = "1192a0gijzpdmbwwai1iyij24bnbrzxnvxy6dgjdhxvxv7j51xbg"; - name = "kdnssd-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdnssd-5.84.0.tar.xz"; + sha256 = "1ayscd05m20i4nldidxdx83xsa66ybsyrf3f8sm3h99hgwb1yxm9"; + name = "kdnssd-5.84.0.tar.xz"; }; }; kdoctools = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kdoctools-5.83.0.tar.xz"; - sha256 = "0nrrksl5ckmpsk4rl2zhq2b05c1ygm5a2nxa53rgyj03bh6ym96k"; - name = "kdoctools-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kdoctools-5.84.0.tar.xz"; + sha256 = "1x0dimayl1pj6r4cjwsvzvyc5j79308bcdi27bn0lq1769wm7rlp"; + name = "kdoctools-5.84.0.tar.xz"; }; }; kemoticons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kemoticons-5.83.0.tar.xz"; - sha256 = "1h74x9khac7ppj8dpzg1wipva7c2kafvym4vllbaphpbiakg0hww"; - name = "kemoticons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kemoticons-5.84.0.tar.xz"; + sha256 = "0h8ilgwd5y8mbmvr89qkq81km216gs2lx7ln4rijamv2380gwcq7"; + name = "kemoticons-5.84.0.tar.xz"; }; }; kfilemetadata = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kfilemetadata-5.83.0.tar.xz"; - sha256 = "13h9jiayh8d3g2jjwvq41jj3kjsr6f79znp6phiyidvyvq7gypfn"; - name = "kfilemetadata-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz"; + sha256 = "19a6lsnh7vxjgvy780bgispgxycj2838gyak6ivd9lxzn6d9jw6i"; + name = "kfilemetadata-5.84.0.tar.xz"; }; }; kglobalaccel = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kglobalaccel-5.83.0.tar.xz"; - sha256 = "1zmg60hjzmvkacdndn5dfc2rgr68q2c9k4hqrx0rf5hnxsxyc1dl"; - name = "kglobalaccel-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kglobalaccel-5.84.0.tar.xz"; + sha256 = "0v3j4zx6p45lwd7jpbc9y43l5fh247dm6g21w5r56cq6asapx3k5"; + name = "kglobalaccel-5.84.0.tar.xz"; }; }; kguiaddons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kguiaddons-5.83.0.tar.xz"; - sha256 = "1fga0ri62ib6prm7pfx32103zwl4jg87ikxq2b7m6kq87xcjxxij"; - name = "kguiaddons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kguiaddons-5.84.0.tar.xz"; + sha256 = "0p98xzml58fv2cv8x382bmcrbk39q89mrxy52hkqy759g4ffj919"; + name = "kguiaddons-5.84.0.tar.xz"; }; }; kholidays = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kholidays-5.83.0.tar.xz"; - sha256 = "1i4qvbfn1rlg0x09fv4pviibjlrq8515056wr71mb6vqxyjirhr2"; - name = "kholidays-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kholidays-5.84.0.tar.xz"; + sha256 = "0fzcdlvai0p3l58wbs8ia7vmd9ll2akzzab12ask8kkaz7iwaqqs"; + name = "kholidays-5.84.0.tar.xz"; }; }; khtml = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/khtml-5.83.0.tar.xz"; - sha256 = "04zjjgaq7m6wxbi5p1fijvx8sz7imr6x0bjc5cm4i30xgdwa108y"; - name = "khtml-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/khtml-5.84.0.tar.xz"; + sha256 = "13j2plfgx4zx99i3s70424v8b7qj2xf6gndp7hhmdka0vjhm5bv9"; + name = "khtml-5.84.0.tar.xz"; }; }; ki18n = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/ki18n-5.83.0.tar.xz"; - sha256 = "0ppg9gxcpgbizg7fchb006ii8fb9r5j164rlvxi38394cdky9gfi"; - name = "ki18n-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/ki18n-5.84.0.tar.xz"; + sha256 = "1530jxpbfky3mhr1dv3pr7lrvi96q4ai8fn85h5gnjp7s7h1wgv0"; + name = "ki18n-5.84.0.tar.xz"; }; }; kiconthemes = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kiconthemes-5.83.0.tar.xz"; - sha256 = "08dys6g9jyw46kba7jqk4bchyg33r84nd0mll2v6v5a9lhk16zws"; - name = "kiconthemes-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kiconthemes-5.84.0.tar.xz"; + sha256 = "0r90cdxs6x9bnqb6qb7p2szavqw2lfk9khhxhzgp2z9121smxpgn"; + name = "kiconthemes-5.84.0.tar.xz"; }; }; kidletime = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kidletime-5.83.0.tar.xz"; - sha256 = "13n9hqzkkk5pspv97f478a4541aqhgddh7g07d78jqsgj8krc3ik"; - name = "kidletime-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kidletime-5.84.0.tar.xz"; + sha256 = "0akkzj05399f72klr8qf5q0w9v8x1jw2961m3h4hcg1zfsmb6pv4"; + name = "kidletime-5.84.0.tar.xz"; }; }; kimageformats = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kimageformats-5.83.0.tar.xz"; - sha256 = "05w9iprmij05sif3jygwsmxa4ih9bf13vsmsifvl4alzpzpnaffw"; - name = "kimageformats-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kimageformats-5.84.0.tar.xz"; + sha256 = "1xzddqc6wj188dhwcw1haa2a28r2d8c4aqhmgymwdwhs7k4ibpds"; + name = "kimageformats-5.84.0.tar.xz"; }; }; kinit = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kinit-5.83.0.tar.xz"; - sha256 = "12lck3646llymcsbkhc6130qhq024lkc9rzm6kv6kc2hcggyhr61"; - name = "kinit-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kinit-5.84.0.tar.xz"; + sha256 = "0a5i2rvamw95y9bqscdg6fk1fjsib7rcis9fbk504qk4n7jdp9gw"; + name = "kinit-5.84.0.tar.xz"; }; }; kio = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kio-5.83.0.tar.xz"; - sha256 = "1hai5w3k77wnaw576gnhv6db90vng8k4npq2ljbp3jycw0csb9gs"; - name = "kio-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kio-5.84.0.tar.xz"; + sha256 = "1lz07745w3549n7lc174p4rz5w12mm4q08y5xn2a95xg5xrjpgln"; + name = "kio-5.84.0.tar.xz"; }; }; kirigami2 = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kirigami2-5.83.0.tar.xz"; - sha256 = "0cpwnqg44j3qb8yqlypkrgjf7fj2nmm90bs0dvmc0jg395z6d3jv"; - name = "kirigami2-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kirigami2-5.84.0.tar.xz"; + sha256 = "05hpw2ba7g5kzg6z0slngrfz45kih8w1zmahbjhss9i7blj9x32r"; + name = "kirigami2-5.84.0.tar.xz"; }; }; kitemmodels = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kitemmodels-5.83.0.tar.xz"; - sha256 = "1kyjnqg53s8yn9jglwyx0jqqys5y5m3a49iw1v2ck67wi3vyl3b5"; - name = "kitemmodels-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kitemmodels-5.84.0.tar.xz"; + sha256 = "1v19vc155jh421z8djhrigc83ajz9qvb6qz9cpscdzrcimhaarns"; + name = "kitemmodels-5.84.0.tar.xz"; }; }; kitemviews = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kitemviews-5.83.0.tar.xz"; - sha256 = "10p6gpp7mh9cpr1ahg2gh0zq8scd7n856bw899hykdxzajcm06xw"; - name = "kitemviews-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kitemviews-5.84.0.tar.xz"; + sha256 = "14rammhm5zp8h37a794z3pmgkpnb606izqy1zlk8lwvnw6aj0kwb"; + name = "kitemviews-5.84.0.tar.xz"; }; }; kjobwidgets = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kjobwidgets-5.83.0.tar.xz"; - sha256 = "1rxmjpxps50wdyvihj5k0sn8flap51ljx3w0x9h5l97ffwd3gfgk"; - name = "kjobwidgets-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kjobwidgets-5.84.0.tar.xz"; + sha256 = "0gcdd07ma7wg6rqygfhmq2nc3cq78zcxbd7mx0fgirdns5fbp8p5"; + name = "kjobwidgets-5.84.0.tar.xz"; }; }; kjs = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kjs-5.83.0.tar.xz"; - sha256 = "1fncc9kaqinm7j60hm0nprxl8wcrj31xqzyiasf5wjcx7sykgg58"; - name = "kjs-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kjs-5.84.0.tar.xz"; + sha256 = "0qi1xk6pq7nyzkh6jlp4l1v1b5gq9hryq2a81hgfl7q9xgrx00qy"; + name = "kjs-5.84.0.tar.xz"; }; }; kjsembed = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kjsembed-5.83.0.tar.xz"; - sha256 = "0adcihgpgyps5816z4g3hbjaci2z1rkpyzbqz1133cvbcfc41brs"; - name = "kjsembed-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kjsembed-5.84.0.tar.xz"; + sha256 = "1av326byza162ds5vn54nmpd9ndr7yb0cpl8hxmwzfbym1favhvb"; + name = "kjsembed-5.84.0.tar.xz"; }; }; kmediaplayer = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kmediaplayer-5.83.0.tar.xz"; - sha256 = "02qz56201xz0jns91hfsv6aggl201vja1v136qnp96v8dib8wl1m"; - name = "kmediaplayer-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kmediaplayer-5.84.0.tar.xz"; + sha256 = "1zzx7d9wcc1qh9zg83c2ihid0c2f5p23gpc475ql056ny71fdvv3"; + name = "kmediaplayer-5.84.0.tar.xz"; }; }; knewstuff = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/knewstuff-5.83.0.tar.xz"; - sha256 = "11z65hvc5r3522zk2a3fdx2wpf78lbq2dbi4lnxcxbgcbss5qfqc"; - name = "knewstuff-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/knewstuff-5.84.0.tar.xz"; + sha256 = "1y1b7704xlf7kmw7c41b3ngsmi5304mvdgphcqsinav6bq48ka5f"; + name = "knewstuff-5.84.0.tar.xz"; }; }; knotifications = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/knotifications-5.83.0.tar.xz"; - sha256 = "01cdf99cz6v04icqwc5h69j7nzlmm46xkp370zkkhg3k0fzskhic"; - name = "knotifications-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/knotifications-5.84.0.tar.xz"; + sha256 = "02az98aqk8alq1cqrxym5idnlzvl6i4jvgnv34q6g4x7j5h4v75h"; + name = "knotifications-5.84.0.tar.xz"; }; }; knotifyconfig = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/knotifyconfig-5.83.0.tar.xz"; - sha256 = "18z42q7bkzi6izfqkh8wygpz04l7cily35rl225jpnlx3zibhrpx"; - name = "knotifyconfig-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/knotifyconfig-5.84.0.tar.xz"; + sha256 = "1x7jp2c2a1bawl3nl46zfnp8d5al1z19za58g76wn40jy9ksnpy2"; + name = "knotifyconfig-5.84.0.tar.xz"; }; }; kpackage = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kpackage-5.83.0.tar.xz"; - sha256 = "07l0nyyxqx4dq82xq7a2m492p8hh2a8xv608gig9whk6pa1h15dc"; - name = "kpackage-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kpackage-5.84.0.tar.xz"; + sha256 = "166cc85y49xqk4r8k6003rlwphxxx2rmik24d7yhmq8p1qig4qb7"; + name = "kpackage-5.84.0.tar.xz"; }; }; kparts = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kparts-5.83.0.tar.xz"; - sha256 = "1bhs69g4ywss2wvfvhb58rnw1hcbn0xs5ws0677xld87pazpn25y"; - name = "kparts-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kparts-5.84.0.tar.xz"; + sha256 = "1fbmywx1fvv9hnznpiy8cp27dfn2ysskymyppqi1hsw01gqs7vfy"; + name = "kparts-5.84.0.tar.xz"; }; }; kpeople = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kpeople-5.83.0.tar.xz"; - sha256 = "127079gmdg8gn3jizynnr3avd87zys71mkra47p8sg4ji3is2jrp"; - name = "kpeople-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kpeople-5.84.0.tar.xz"; + sha256 = "0llggx56xb3y10j0avm4vdmjfl4pwqbvpb5w7kk1gb43nxpz7h3p"; + name = "kpeople-5.84.0.tar.xz"; }; }; kplotting = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kplotting-5.83.0.tar.xz"; - sha256 = "0hcnf4cr9w98sswk1n8qn4fbwnk8b7xcq4w53979zcccls52fj8j"; - name = "kplotting-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kplotting-5.84.0.tar.xz"; + sha256 = "007cvy57ck2frnr5dvs80k3n7lv1q2xw1zadmw13wwdqqsl0kzag"; + name = "kplotting-5.84.0.tar.xz"; }; }; kpty = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kpty-5.83.0.tar.xz"; - sha256 = "10da18l2w5wx62j79cyd20ph9ayp968c6d6n9g9f9y54afkivzm5"; - name = "kpty-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kpty-5.84.0.tar.xz"; + sha256 = "04q6qz62vwywzaxxmsq0g28k036ljrcyvn5hywdns58zi5d7nab2"; + name = "kpty-5.84.0.tar.xz"; }; }; kquickcharts = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kquickcharts-5.83.0.tar.xz"; - sha256 = "0mm3kxdp69zi6y8abakgb637313hwadyna9h4qpfmb41lyqa2ak6"; - name = "kquickcharts-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kquickcharts-5.84.0.tar.xz"; + sha256 = "01q1ncvk8dc9jkm9x6q7wkcnj1z1377824gj7m83pzgy3g51vcdg"; + name = "kquickcharts-5.84.0.tar.xz"; }; }; kross = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kross-5.83.0.tar.xz"; - sha256 = "1n0d730zvhdg94f8ibjqcscg67m22lm8lvlqfzfbibc355hdf4db"; - name = "kross-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kross-5.84.0.tar.xz"; + sha256 = "0fz4q2m16f4zy6pajcrmhm5a9fjrfjfqyns1lm6aimdsrvkwpc93"; + name = "kross-5.84.0.tar.xz"; }; }; krunner = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/krunner-5.83.0.tar.xz"; - sha256 = "02nvnjlxma0z9dvn9vrqv1q85723i7in4jqxb1v8m9yxmi04di52"; - name = "krunner-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/krunner-5.84.0.tar.xz"; + sha256 = "15ai1x9v5hm5vj7qhh7c4ajiiaf56h3yy3qnb4kamkv146g09a1p"; + name = "krunner-5.84.0.tar.xz"; }; }; kservice = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kservice-5.83.0.tar.xz"; - sha256 = "18i9awfkrbx750qfnr3vlpp9w2wrqxrdk9cf6nldmbl0iahr1myc"; - name = "kservice-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kservice-5.84.0.tar.xz"; + sha256 = "1lbx51wpsc7qdp480yl08wsp6lb1lww5ix5hpxxmv0x7galcgsf2"; + name = "kservice-5.84.0.tar.xz"; }; }; ktexteditor = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/ktexteditor-5.83.0.tar.xz"; - sha256 = "17h36aj0m38igr4bfabjzkd66cwj0mxf0s1j7nylmdmpf5g9jck2"; - name = "ktexteditor-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/ktexteditor-5.84.0.tar.xz"; + sha256 = "0znpls5ap33yjcjw1ayl6zja8qnqx5glk2bvig5aajriqbpw8irk"; + name = "ktexteditor-5.84.0.tar.xz"; }; }; ktextwidgets = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/ktextwidgets-5.83.0.tar.xz"; - sha256 = "16bknjpn574b0xnc8fr8yxg6gc8mnl4f3rh808j4hbs5127xg00a"; - name = "ktextwidgets-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/ktextwidgets-5.84.0.tar.xz"; + sha256 = "069qk1frsfa9iqgchpvkq4sgh973fc2fy1hjymc2zv3mahz23qfl"; + name = "ktextwidgets-5.84.0.tar.xz"; }; }; kunitconversion = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kunitconversion-5.83.0.tar.xz"; - sha256 = "01bic73a5l3avqrq7dyfkn2y8xwkq4l6zscj91ddmjan881g10kf"; - name = "kunitconversion-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kunitconversion-5.84.0.tar.xz"; + sha256 = "0a8jc3vw4ydsfff1qis9323vcd7nhigwyjxqa57qzvswrk7wmlxf"; + name = "kunitconversion-5.84.0.tar.xz"; }; }; kwallet = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kwallet-5.83.0.tar.xz"; - sha256 = "1sczaykjh15pq7ra4vx4y0vhc71zzjdqr3ab12d1p3ni34smfbzw"; - name = "kwallet-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kwallet-5.84.0.tar.xz"; + sha256 = "1m08q820zl9wrc04i0inb7n0r35p0lzcv3hiwvzxmgdcm9zm2n3c"; + name = "kwallet-5.84.0.tar.xz"; }; }; kwayland = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kwayland-5.83.0.tar.xz"; - sha256 = "1fgs7m2nimqi5y6yd7jy12klb7vf18qhfzdzikm0ff7rcgrp3k4c"; - name = "kwayland-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kwayland-5.84.0.tar.xz"; + sha256 = "1lpmbqkfbjq3445lj42zqc90wk437kzyjlpzji0wh4p9nqa4a27s"; + name = "kwayland-5.84.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kwidgetsaddons-5.83.0.tar.xz"; - sha256 = "07a1yk35ss7vayi52hrm0mqkar0yd8w33v5jijga8r69rmmd68s5"; - name = "kwidgetsaddons-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kwidgetsaddons-5.84.0.tar.xz"; + sha256 = "1xffbmi3a3qp781aay964b30l9y170imxaa05r3xpj77saq673kp"; + name = "kwidgetsaddons-5.84.0.tar.xz"; }; }; kwindowsystem = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kwindowsystem-5.83.0.tar.xz"; - sha256 = "0qfd9js8dy68h5drl62sm61m453vssgfgyzdq33drx1jp16k3bv9"; - name = "kwindowsystem-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kwindowsystem-5.84.0.tar.xz"; + sha256 = "19fa8j4paq245rwvnmnz2mnwgh8y6c26wbw25v8kgd7a33ryg0fg"; + name = "kwindowsystem-5.84.0.tar.xz"; }; }; kxmlgui = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/kxmlgui-5.83.0.tar.xz"; - sha256 = "1mn3ywmmbggbjf09gpbkrbchmppfixkyq2a4lra3g85dv5yhpr8v"; - name = "kxmlgui-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/kxmlgui-5.84.0.tar.xz"; + sha256 = "1ddfvjwww2270zx4f86w0xmd45pyir95llhc4x2ixicx94jvsg1c"; + name = "kxmlgui-5.84.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/portingAids/kxmlrpcclient-5.83.0.tar.xz"; - sha256 = "1pf4sl42f1jhwv42bimvs718bdw1vsbhrs50av4hvrsl7cj8qvwi"; - name = "kxmlrpcclient-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/portingAids/kxmlrpcclient-5.84.0.tar.xz"; + sha256 = "10jddyak99wd4x3vm9d6xzh45pl1lhhfw9isrdkgzcixip2s4p6i"; + name = "kxmlrpcclient-5.84.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/modemmanager-qt-5.83.0.tar.xz"; - sha256 = "0gbppx9pda881mizx4nddhsakpx2cg0rry1lyv51z3wgrxxy4rjy"; - name = "modemmanager-qt-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/modemmanager-qt-5.84.0.tar.xz"; + sha256 = "1k0dbgq3zbg1rhy775vbxwqssbdin4wm7rw4fkcdra4z9hf39xin"; + name = "modemmanager-qt-5.84.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/networkmanager-qt-5.83.0.tar.xz"; - sha256 = "0vb88fs33szlpg74zf0pa3v08dl5j33lcfvs515y9p1qhkkdg3v1"; - name = "networkmanager-qt-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/networkmanager-qt-5.84.0.tar.xz"; + sha256 = "1qd58p2hj1rnzjvd6sskmry7gq7gp9fvp115ihc8dkaq8xvwah77"; + name = "networkmanager-qt-5.84.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/oxygen-icons5-5.83.0.tar.xz"; - sha256 = "04768vbwmaajniqpy3vgp6rdkmanv78pvhn8w92hf40k089sv28p"; - name = "oxygen-icons5-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/oxygen-icons5-5.84.0.tar.xz"; + sha256 = "06h1c2lvvs41lcibgv5iz31g7j1x7fdyi7lnh21hkgd7747vk42l"; + name = "oxygen-icons5-5.84.0.tar.xz"; }; }; plasma-framework = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/plasma-framework-5.83.0.tar.xz"; - sha256 = "0p8lizkb09rpjin9rzxjah8y5gzn874jk8z74rba9xpcsxvmzpvs"; - name = "plasma-framework-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/plasma-framework-5.84.0.tar.xz"; + sha256 = "0chmmb04m1bq4d1w67bw3ppc2iycw7wzsdpams6c4y9f59iwrd8r"; + name = "plasma-framework-5.84.0.tar.xz"; }; }; prison = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/prison-5.83.0.tar.xz"; - sha256 = "1j72c7asbzb3n34wgp3w628lyc65d4dx0vd9dfhmb807dgcfryba"; - name = "prison-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/prison-5.84.0.tar.xz"; + sha256 = "17bd40fqp88j5dwxixrhf1d4xwri574l4593rdhzg8qgi9jm2ypj"; + name = "prison-5.84.0.tar.xz"; }; }; purpose = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/purpose-5.83.0.tar.xz"; - sha256 = "0s830i3vqkyraa1ck8ml2c95fp2c31198jm535czxfsfd8w1ml02"; - name = "purpose-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/purpose-5.84.0.tar.xz"; + sha256 = "01rh85fc4c4gl0lxw2rbcrh001akggnz7aahkc2spsgd64m7vfv7"; + name = "purpose-5.84.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/qqc2-desktop-style-5.83.0.tar.xz"; - sha256 = "18gkr34bkqi9z1njm35kz3gsnlll7f7n9f4fink1pvy93plvs361"; - name = "qqc2-desktop-style-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/qqc2-desktop-style-5.84.0.tar.xz"; + sha256 = "0vz68nh6iy92whjlkgf1jmmlhr5261rgsy1r7k3bfd91a41qh2qw"; + name = "qqc2-desktop-style-5.84.0.tar.xz"; }; }; solid = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/solid-5.83.0.tar.xz"; - sha256 = "1ijqligf2xxaw833gk0mlywkzsa6n9b9x38ifk4g48i1259sddbk"; - name = "solid-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/solid-5.84.0.tar.xz"; + sha256 = "0lrims7zfr5xr5y25v63d08m6cm27z6mxbdg9j06xsrqf93vyz4s"; + name = "solid-5.84.0.tar.xz"; }; }; sonnet = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/sonnet-5.83.0.tar.xz"; - sha256 = "0bshjqgcb2kl3bfl0zy0f656x47carfg6a25ccdcp6jczby49n5a"; - name = "sonnet-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/sonnet-5.84.0.tar.xz"; + sha256 = "0xnbi1rbb2awl5bvyjxjvzq5a8n9xpmiqvlzcgprmqgmsygzlnnq"; + name = "sonnet-5.84.0.tar.xz"; }; }; syndication = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/syndication-5.83.0.tar.xz"; - sha256 = "0pz2886zsyfs0y4qbrhr58qrxh75qa0b051h3b1vgi23vlcsipsz"; - name = "syndication-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/syndication-5.84.0.tar.xz"; + sha256 = "0m245vp5dkw88rz9kgym4ka729p688wspm8mv6zzsfffggvfkwrc"; + name = "syndication-5.84.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/syntax-highlighting-5.83.0.tar.xz"; - sha256 = "0plybipbmxx5f3w7kb1446wiazfzawwa69aplzrdpjhns7n88c2m"; - name = "syntax-highlighting-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/syntax-highlighting-5.84.0.tar.xz"; + sha256 = "1mb4di9k2rxf6f7n53z94q5awmwzfd516kv757ifd323w9xkmyxa"; + name = "syntax-highlighting-5.84.0.tar.xz"; }; }; threadweaver = { - version = "5.83.0"; + version = "5.84.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.83/threadweaver-5.83.0.tar.xz"; - sha256 = "12h9nahhgws5f9ng11nc0cxp3phhlsi68r57vlgyq78glkgcw3jl"; - name = "threadweaver-5.83.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.84/threadweaver-5.84.0.tar.xz"; + sha256 = "0hmxkqwxjvk6m3h3l12bw01xgwqxzja5cismqrwcc3yxf8fyd572"; + name = "threadweaver-5.84.0.tar.xz"; }; }; } From 7781962deb3ac15e44ade3ee5b87a9ba5464dab3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Wed, 28 Jul 2021 09:47:17 -0500 Subject: [PATCH 1513/1522] ksystemstats: Use getBin instead of hardcoding ouput name --- pkgs/desktops/plasma-5/ksystemstats.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index e41f56c764e..f117872ce5c 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -5,7 +5,7 @@ mkDerivation { name = "ksystemstats"; - NIX_CFLAGS_COMPILE = [ "-I${libksysguard.bin}/share" ]; + NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; } From cf7212d79d0628eaa3b9f8651814c6603b41cef9 Mon Sep 17 00:00:00 2001 From: Artturi <Artturin@artturin.com> Date: Thu, 5 Aug 2021 11:25:02 +0300 Subject: [PATCH 1514/1522] ccextractor: enable ocr and hardsub support (#131849) Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- .../video/ccextractor/default.nix | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index d18ca43cbf7..6e47f96253e 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -1,7 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake -, glew, glfw3, leptonica, libiconv, tesseract3, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, libiconv +, zlib +, enableOcr ? true +, makeWrapper +, tesseract4 +, leptonica +, ffmpeg +}: -with lib; stdenv.mkDerivation rec { pname = "ccextractor"; version = "0.91"; @@ -15,11 +25,20 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config cmake makeWrapper ]; - buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ zlib ] + ++ lib.optional (!stdenv.isLinux) libiconv + ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; - meta = { + cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; + + postInstall = lib.optionalString enableOcr '' + wrapProgram "$out/bin/ccextractor" \ + --set TESSDATA_PREFIX "${tesseract4}/share/" + ''; + + meta = with lib; { homepage = "https://www.ccextractor.org"; description = "Tool that produces subtitles from closed caption data in videos"; longDescription = '' @@ -28,7 +47,13 @@ stdenv.mkDerivation rec { It works on Linux, Windows, and OSX. ''; platforms = platforms.unix; - license = licenses.gpl2; + # undefined reference to `png_do_expand_palette_rgba8_neon' + # undefined reference to `png_riffle_palette_neon' + # undefined reference to `png_do_expand_palette_rgb8_neon' + # undefined reference to `png_init_filter_functions_neon' + # during Linking C executable ccextractor + broken = stdenv.isAarch64; + license = licenses.gpl2Only; maintainers = with maintainers; [ titanous ]; }; } From 23b31e6ef1cd547c97861d331f9905df2966ebf7 Mon Sep 17 00:00:00 2001 From: Vo Anh Duy <vo@anhduy.io> Date: Thu, 5 Aug 2021 16:21:32 +0800 Subject: [PATCH 1515/1522] lima: 0.5.0 -> 0.6.0 --- pkgs/applications/virtualization/lima/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 198e3b694ce..bf4e14a6bab 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { - owner = "AkihiroSuda"; + owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1952xGSfVFI2Fs5HLJKCyB6ZxKFf5uPKXIlctM/T+8o="; + sha256 = "sha256-UwsAeU7Me2UN9pUWvqGgQ7XSNcrClXYOA+9F6yO2aqA="; }; - vendorSha256 = "sha256-rPL/jxMHMkKffoYLSI3FFtFRYGtARKmrODmL9w+rN0E="; + vendorSha256 = "sha256-vdqLdSXQ2ywZoG7ROQP9PLWUqhoOO7N5li+xjc2HtzM="; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -44,7 +44,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/AkihiroSuda/lima"; + homepage = "https://github.com/lima-vm/lima"; description = "Linux virtual machines (on macOS, in most cases)"; license = licenses.asl20; maintainers = with maintainers; [ anhduy ]; From 586172f0fe8f6ecc31998d3b7e7db7959bfa8a1b Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Thu, 5 Aug 2021 11:20:42 +0200 Subject: [PATCH 1516/1522] terraform-providers.kubernetes: 2.1.0 -> 2.4.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7569f572b60..e1e183f3d30 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -558,10 +558,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.1.0", - "sha256": "02ygydgi3fa8z6qd04hgcilbbwns8f21agaqxly2pf9j23fzi37g", + "rev": "v2.4.1", + "sha256": "0mk0f12yy58gjkki7xpf9bjfw9h9zdgby2b4bddqp5csq11payhd", "vendorSha256": null, - "version": "2.1.0" + "version": "2.4.1" }, "kubernetes-alpha": { "owner": "hashicorp", From f11652f0a6ec62eb3b8f0e93db2211a14662c322 Mon Sep 17 00:00:00 2001 From: Michael Weiss <dev.primeos@gmail.com> Date: Thu, 5 Aug 2021 11:20:58 +0200 Subject: [PATCH 1517/1522] signal-desktop: 5.12.0 -> 5.12.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 67ce817f11a..fe97581b68c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.12.0"; # Please backport all updates to the stable channel. + version = "5.12.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0cvh70ijx61rq7qjzrmn85lhkm8vkcbxvgjvkpls21v3yl5anrjb"; + sha256 = "099p0bmaa60dfij5wq9pyfxnhy77cdnfqx4dj4377rzyfmfgnhzx"; }; nativeBuildInputs = [ From d752fb3b44f26a1c791d83a76f63a4100670a077 Mon Sep 17 00:00:00 2001 From: zimbatm <zimbatm@zimbatm.com> Date: Thu, 5 Aug 2021 11:48:48 +0200 Subject: [PATCH 1518/1522] terraform-providers.ovh: 0.8.0 -> 0.15.0 The provider had moved location, which prevented the auto-updated from working. https://github.com/hashicorp/terraform-provider-ovh -> https://github.com/ovh/terraform-provider-ovh --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ca2ce013b61..17aef961cc0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -799,11 +799,13 @@ "version": "1.5.3" }, "ovh": { - "owner": "terraform-providers", + "owner": "ovh", + "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.8.0", - "sha256": "1ww4ng8w5hm50rbxd83xzbkq8qsn04dqwpdjhs587v9d0x2vwrf1", - "version": "0.8.0" + "rev": "v0.15.0", + "sha256": "1cmcfg9vq8cl98d5xambm5hr516b9pblm06y1py9v7msmfh3g09i", + "vendorSha256": null, + "version": "0.15.0" }, "packet": { "owner": "packethost", From 2ec3c8ec194d0942b582a97e548bec1729535ed2 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Thu, 5 Aug 2021 11:21:10 +0200 Subject: [PATCH 1519/1522] terraform-providers.kubernetes-alpha: remove This has graduated to beta, and the kubernetes_manifest resource has moved into terraform-provider-kubernetes. To use it, you must be enabled in the provider block: ```hcl provider "kubernetes" { experiments { manifest_resource = true } config_path = "~/.kube/config" } ``` --- .../networking/cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d88602d75ba..d47b9fd4b89 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -57,6 +57,7 @@ let cloudfoundry = callPackage ./cloudfoundry {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; + kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e1e183f3d30..8ecf51580f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -563,15 +563,6 @@ "vendorSha256": null, "version": "2.4.1" }, - "kubernetes-alpha": { - "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha", - "repo": "terraform-provider-kubernetes-alpha", - "rev": "v0.5.0", - "sha256": "0yqm3wlya69w9g9kzgvm28mbbwp6wik51syjnbnj8dis5kspx8gd", - "vendorSha256": null, - "version": "0.5.0" - }, "launchdarkly": { "owner": "terraform-providers", "repo": "terraform-provider-launchdarkly", From d1dfdf7b3b860ea0beec5271c47c1276f0790c17 Mon Sep 17 00:00:00 2001 From: Ricardo Guevara <fuzztkd@gmail.com> Date: Thu, 5 Aug 2021 03:00:54 -0700 Subject: [PATCH 1520/1522] terraform-providers.datadog: 2.7.0 -> 3.2.0 (#104310) --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ca2ce013b61..97aac84b107 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -245,11 +245,13 @@ "version": "0.8.0" }, "datadog": { - "owner": "terraform-providers", + "owner": "DataDog", + "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v2.7.0", - "sha256": "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd", - "version": "2.7.0" + "rev": "v3.2.0", + "sha256": "1qrk40w81qzcmm52gr3ysrh077417cxyh4xy7igwdjfzl85z22mx", + "vendorSha256": "0iphsz6y9gajwmw5rj4yq65azx02ki093agqbqw49rnzdhc6jahr", + "version": "3.2.0" }, "digitalocean": { "owner": "digitalocean", From ec6fca686da6bb11789d2f237a4d3e2c3c4089b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Thu, 5 Aug 2021 12:30:04 +0200 Subject: [PATCH 1521/1522] pixie: format --- pkgs/development/interpreters/pixie/dust.nix | 24 +++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index e6818cb03ed..bbe9ae3dcc4 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -1,35 +1,43 @@ { lib, stdenv, pixie, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dust-0-91"; + pname = "dust"; + version = "0-91"; + src = fetchFromGitHub { owner = "pixie-lang"; repo = "dust"; rev = "efe469661e749a71e86858fd006f61464810575a"; sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc"; }; + buildInputs = [ pixie ]; + patches = [ ./make-paths-configurable.patch ]; + configurePhase = '' pixiePath="${pixie}/bin/pixie-vm" \ basePath="$out/share/dust" \ substituteAll dust.in dust chmod +x dust ''; -# FIXME: AOT for dust -# buildPhase = '' -# find . -name "*.pxi" -exec pixie-vm -c {} \; -# ''; + + # FIXME: AOT for dust + # buildPhase = '' + # find . -name "*.pxi" -exec pixie-vm -c {} \; + # ''; + installPhase = '' mkdir -p $out/bin $out/share/dust cp -a src/ run.pxi $out/share/dust mv dust $out/bin/dust ''; - meta = { + meta = with lib; { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; - license = lib.licenses.lgpl3; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with maintainers; [ ]; + license = licenses.lgpl3; + platforms = platforms.unix; }; } From 45c4b6b9e4ca221fd3d16008ae9cf1133725f824 Mon Sep 17 00:00:00 2001 From: Benjamin Smith <polynomial@users.noreply.github.com> Date: Thu, 5 Aug 2021 04:01:59 -0700 Subject: [PATCH 1522/1522] Apache Kafka: add 2.7.1 and 2.8.0 (#128043) --- nixos/tests/kafka.nix | 5 ++--- pkgs/servers/apache-kafka/default.nix | 24 +++++++++--------------- pkgs/top-level/aliases.nix | 9 --------- pkgs/top-level/all-packages.nix | 7 +++---- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 034601c815b..95711808a2c 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -75,7 +75,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; - kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; - kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6; + kafka_2_7 = makeKafkaTest "kafka_2_7" apacheKafka_2_7; + kafka_2_8 = makeKafkaTest "kafka_2_8" apacheKafka_2_8; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 935db27044f..4fec4390e34 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -5,22 +5,16 @@ let jre8 = jdk8_headless; jre11 = jdk11_headless; versionMap = { - "2.4" = { - kafkaVersion = "2.4.1"; - scalaVersion = "2.12"; - sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; - jre = jre8; - }; - "2.5" = { - kafkaVersion = "2.5.1"; - scalaVersion = "2.12"; - sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv"; - jre = jre8; - }; - "2.6" = { - kafkaVersion = "2.6.1"; + "2.7" = { + kafkaVersion = "2.7.1"; scalaVersion = "2.13"; - sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y"; + sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa"; + jre = jre11; + }; + "2.8" = { + kafkaVersion = "2.8.0"; + scalaVersion = "2.13"; + sha256 = "1iljfjlp29m4s6gkja9fxkzj8a8p0qc0sfy8x4g1318kbnp818rz"; jre = jre11; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1bdadffbc60..06f0ff4d558 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -53,15 +53,6 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 - apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3cca0379df..b75524099d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13128,10 +13128,9 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_6; - apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; - apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; - apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; }; + apacheKafka = apacheKafka_2_8; + apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; }; + apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; kt = callPackage ../tools/misc/kt {};