From 737447c23b95722e9e96fd5ba9e01162d873edb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 12:10:02 +0200 Subject: [PATCH 01/39] python3Packages.requests-cache: 0.6.4 -> 0.7.0 --- .../python-modules/requests-cache/default.nix | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 35cf74ca8426..e2ed5367df5e 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,52 +1,57 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , attrs +, buildPythonPackage +, cattrs +, fetchFromGitHub , itsdangerous -, requests -, url-normalize +, poetry-core , pytestCheckHook +, pythonOlder +, pyyaml +, requests , requests-mock +, rich , timeout-decorator +, ujson +, url-normalize }: buildPythonPackage rec { pname = "requests-cache"; - version = "0.6.4"; - + version = "0.7.0"; disabled = pythonOlder "3.6"; - format = "pyproject"; src = fetchFromGitHub { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "10rvs611j16kakqx38kpqpc1v0dfb9rmbz2whpskswb1lsksv3j9"; + sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ attrs + cattrs itsdangerous + pyyaml requests + ujson url-normalize ]; checkInputs = [ pytestCheckHook requests-mock + rich timeout-decorator ]; - disabledTestPaths = [ - # connect to database on localhost - "tests/integration/test_cache.py" - "tests/integration/test_dynamodb.py" - "tests/integration/test_gridfs.py" - "tests/integration/test_mongodb.py" - "tests/integration/test_redis.py" - ]; + # Integration tests require local DBs + pytestFlagsArray = [ "tests/unit" ]; pythonImportsCheck = [ "requests_cache" ]; @@ -54,5 +59,6 @@ buildPythonPackage rec { description = "Persistent cache for requests library"; homepage = "https://github.com/reclosedev/requests-cache"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } From 8692bf927ca6a992a3b272fd916f1f610c34e59a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 13:07:30 +0200 Subject: [PATCH 02/39] python3Packages.tvdb_api: mark as broken --- pkgs/development/python-modules/tvdb_api/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 2af25abf3ed7..1264f07c1829 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; + # https://github.com/dbr/tvdb_api/issues/94 + broken = true; }; - } From 80abfd0989bd2c09bc77faf296a14b5bcf58beff Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Thu, 8 Jul 2021 15:30:16 +0200 Subject: [PATCH 03/39] telegraf: 1.18.1 -> 1.19.1 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 37a4b3e87da8..0a60ebc77c5c 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.18.1"; + version = "1.19.1"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-iFigbnqUXWQrhDovwQYZsr8llkB9553c5LgcKJ78yZ4="; + sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU="; }; - vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c="; + vendorSha256 = "sha256-jP6P2NShzlFCptCQ04XY4cIrONNArwthiEONEo32Btw="; preBuild = '' buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") From 94f18492d6592ab518c72842d47b0c1e76462f6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 19:59:23 +0000 Subject: [PATCH 04/39] insomnia: 2021.4.0 -> 2021.4.1 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 8fcf4696d0e1..31ec970b4251 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.4.0"; + version = "2021.4.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; + sha256 = "sha256-74du6UQB1LfsnYF9tmx41KJNmlEVVL5H2W+YQR720FY="; }; nativeBuildInputs = From 6a06ead8a36e823e4de37c4f56f88acf58130479 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 22:56:31 +0200 Subject: [PATCH 05/39] python3Packages.tinydb: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/tinydb/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index db162ecc2ac9..ccbe26317027 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , poetry-core -, fetchpatch , pytestCheckHook , pycodestyle , pyyaml @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.4.0"; + version = "4.5.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -19,22 +18,13 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3FbsnLU7G4VVhI5NYRqCEQgo51zDeAkEhH69H52zr/w="; + sha256 = "sha256-rJVJfsPhGTQpE6p0kzN6GDR0r9M71ADa67Oi5jLgeWY="; }; nativeBuildInputs = [ poetry-core ]; - patches = [ - # Switch to poetry-core, https://github.com/msiemens/tinydb/pull/391 - (fetchpatch { - name = "switch-to-peotry-core.patch"; - url = "https://github.com/msiemens/tinydb/commit/5b547c18e7ce9f5925d5943dfa47d408435a0da5.patch"; - sha256 = "19ma9ib020b82sn1mcr7sfysqbj8h6nbb365bih1x1wn3ym8xlbc"; - }) - ]; - postPatch = '' substituteInPlace pytest.ini \ --replace "--cov-append --cov-report term --cov tinydb" "" From 02d3a3328bd74d39570f829559d1e0bebc01363e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 23:33:13 +0200 Subject: [PATCH 06/39] python3Packages.nexia: 0.9.7 -> 0.9.8 --- 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 14b888428aac..5a2b5f7284a1 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.7"; + version = "0.9.8"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU="; + sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8="; }; propagatedBuildInputs = [ From b50102b7196f1748e01cd180fca6fadb4b4155ec Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 8 Jul 2021 23:41:30 +0200 Subject: [PATCH 07/39] nginxMainline: 1.21.0 -> 1.21.1 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5b87b499964e..80e56d1bf0f0 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.21.0"; - sha256 = "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy"; + version = "1.21.1"; + sha256 = "0q2m2pd9x287py54kp49ys5pwnn0j17x7jjl0cx1c5916h8h7fk8"; } From 68a240b46a9c839382ed797d2164c80571bc8442 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 8 Jul 2021 23:43:58 +0200 Subject: [PATCH 08/39] nixosTests.nginx-variants: also test nginxQuic --- nixos/tests/nginx-variants.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix index a535030663bd..96a9a2c3b8c1 100644 --- a/nixos/tests/nginx-variants.nix +++ b/nixos/tests/nginx-variants.nix @@ -29,5 +29,5 @@ builtins.listToAttrs ( }; } ) - [ "nginxStable" "nginxMainline" "nginxShibboleth" "openresty" "tengine" ] + [ "nginxStable" "nginxMainline" "nginxQuic" "nginxShibboleth" "openresty" "tengine" ] ) From 95805c32408ca8e0540cb90a3ecc5666d44b2f4b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 8 Jul 2021 23:44:14 +0200 Subject: [PATCH 09/39] nginxQuic: 1fec68e322d0 -> 5b0c229ba5fe --- pkgs/servers/http/nginx/quic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index a8864864721e..8bb383d59964 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "1fec68e322d0"; # branch=quic - sha256 = "0nr1mjic215yc6liyv1kfwhfdija3q2sw3qdwibds5vkg330vmw8"; + rev = "5b0c229ba5fe"; # branch=quic + sha256 = "1bb6n6b4nkc1cfllj75lwr4gjijl8883bkcvq8ncg7r4s5xs7r90"; }; preConfigure = '' From 9462b074a8f2f34f3a4dd6b56ff22f760a8301f0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:07:58 +0000 Subject: [PATCH 10/39] linux: 5.10.47 -> 5.10.48 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index deec1b3a475f..fd29ff465f8e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.47"; + version = "5.10.48"; # 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 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; + sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From e0f9f09c1740d0d80ead4002016bd3df0fc1b197 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:03 +0000 Subject: [PATCH 11/39] linux: 5.12.14 -> 5.12.15 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 93e7499c8dd0..3a482d92a447 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.14"; + version = "5.12.15"; # 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 = "1b3xnb62n53vm6larkvv2vzd9w7cjnqh8zh6jzq9lpcg12c3pjlh"; + sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From ea4cb239528062ac52fc1d4aa2bbf115df9105dc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:10 +0000 Subject: [PATCH 12/39] linux: 5.13 -> 5.13.1 --- 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 eb01fb6289c9..c13b37a74aac 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"; + version = "5.13.1"; # 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 = "sha256-P2uql/N1GEOfUd8uTz1lqCLKX/AWqo5g0sxTuVpsidk="; + sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 32235d48681bf913b9d5435c518494b77d63f933 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:16 +0000 Subject: [PATCH 13/39] linux: 5.4.129 -> 5.4.130 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c5b4e390582a..0c8355d101e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.129"; + version = "5.4.130"; # 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 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; + sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 25b73ac6a2422711dda132bf88ad510a37df95f2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:08:56 +0000 Subject: [PATCH 14/39] linux-rt_5_10: 5.10.41-rt42 -> 5.10.47-rt45 --- 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 78e45a7bd91c..efe499d024ca 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.41-rt42"; # updated by ./update-rt.sh + version = "5.10.47-rt45"; # 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 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; + sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883"; + sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay"; }; }; in [ rt-patch ] ++ kernelPatches; From b36d829bb1af3c8fdd38d2f217d31450b02b8526 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:29 +0000 Subject: [PATCH 15/39] linux/hardened/patches/5.10: 5.10.47-hardened1 -> 5.10.48-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bd1a5397f605..c0ad3d334fb1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.47-hardened1.patch", - "sha256": "0qkwz3d83p2l5p7lhj3imfx8cr17smciw76xhj00zv171vc3q7xm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.47-hardened1/linux-hardened-5.10.47-hardened1.patch" + "name": "linux-hardened-5.10.48-hardened1.patch", + "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch" }, "5.12": { "extra": "-hardened1", From 9af983cd004bb51a80c05945eddf922c56359ccd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:30 +0000 Subject: [PATCH 16/39] linux/hardened/patches/5.12: 5.12.14-hardened1 -> 5.12.15-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c0ad3d334fb1..9f7e64a3a735 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.14-hardened1.patch", - "sha256": "0c5zi03j5bjhr706wad1qf5kr4nv0s2bzkx4z5mr6wqgra5dg22v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.14-hardened1/linux-hardened-5.12.14-hardened1.patch" + "name": "linux-hardened-5.12.15-hardened1.patch", + "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 43fba78fec7c1f00ca8766e27894537fdd3eeb47 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:09:31 +0000 Subject: [PATCH 17/39] linux/hardened/patches/5.4: 5.4.129-hardened1 -> 5.4.130-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9f7e64a3a735..e97d9151dbd9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.129-hardened1.patch", - "sha256": "0b16w4jm22mlhwfvbzbg8bw9z7hp13r1bl5g5rk42vmz07ahknga", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.129-hardened1/linux-hardened-5.4.129-hardened1.patch" + "name": "linux-hardened-5.4.130-hardened1.patch", + "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch" } } From 680a52bf76d397aedf4e22513346b6e840ab269c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jul 2021 18:20:10 -0400 Subject: [PATCH 18/39] fcp: init at 0.2.0 --- pkgs/tools/misc/fcp/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/fcp/default.nix diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix new file mode 100644 index 000000000000..db4330e5b0f1 --- /dev/null +++ b/pkgs/tools/misc/fcp/default.nix @@ -0,0 +1,33 @@ +{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }: + +rustPlatform.buildRustPackage rec { + pname = "fcp"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "svetlitski"; + repo = pname; + rev = "v${version}"; + sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d"; + }; + + cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4"; + + nativeBuildInputs = [ expect ]; + + # character_device fails with "File name too long" on darwin + doCheck = !stdenv.isDarwin; + + postPatch = '' + patchShebangs tests/*.exp + ''; + + meta = with lib; { + description = "A significantly faster alternative to the classic Unix cp(1) command"; + homepage = "https://github.com/svetlitski/fcp"; + changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786dd4e0dc21..8f464efb85a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24050,6 +24050,8 @@ in fbida = callPackage ../applications/graphics/fbida { }; + fcp = callPackage ../tools/misc/fcp { }; + fdupes = callPackage ../tools/misc/fdupes { }; feh = callPackage ../applications/graphics/feh { }; From 50c0eff0d8699e8bcfbc55f6d8e3d42e562539bd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:43:11 +0000 Subject: [PATCH 19/39] electron_13: 13.1.4 -> 13.1.6 https://github.com/electron/electron/releases/tag/v13.1.5 https://github.com/electron/electron/releases/tag/v13.1.6 --- 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 ebcfcf1c55d9..1ab9166eea04 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1qis2k8yc7g1klvhiysjrgl5gclx4idxdz60kh8ldrji5a0lgha1"; }; - electron_13 = mkElectron "13.1.4" { - x86_64-linux = "096909396be9fac888ca35093d16bdb50a965e3200823f2384574c359f15cd4f"; - x86_64-darwin = "3d9980f8062766be3cfcfd54b9fd9f469993df06d538a2324c4879eae1284c84"; - i686-linux = "73c8b1fc01a89a5f9b12de38ed70bd01686e50a55d817f0cdf5914e953bdc868"; - armv7l-linux = "db2fe2f499865ea697cacef992fc0042ac0f75da4c016d64e5c41deae7f5eb72"; - aarch64-linux = "4acdd4eae499e1ed42871ed8b744fdef9f608f5613742090cc20e4f6b5314ae8"; - aarch64-darwin = "e961b7d361c378e4adab7903211ac7200684cb91044c3b300acde04ca24d0468"; - headers = "1h1sr5nk37asbj1fadgjzksgr876wxdmq3b017bb9k5kcgajcmqr"; + 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"; }; } From b413babf725bb89f931c37fc1109fd1366604fb1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:44:27 +0000 Subject: [PATCH 20/39] electron_12: 12.0.12 -> 12.0.14 https://github.com/electron/electron/releases/tag/v12.0.13 https://github.com/electron/electron/releases/tag/v12.0.14 --- 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 1ab9166eea04..6bb4c6d43ff6 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1wfhc22g680pvv85rq8d8lw4vphpr700fmzs3nwxixxnzhp1sb79"; }; - electron_12 = mkElectron "12.0.12" { - x86_64-linux = "98e7cc5dd3f161c37cbbd9aef90d55c51531a4bad8221a9d1f92e78014758054"; - x86_64-darwin = "3a39933c1c83406e4ddbce2af193e9a6b7b77f418c4f1d5e7b8f9edc348acd15"; - i686-linux = "2a06936fa13929342ebb7521d2e3e8b4a7a08ac1d757c0521a047b4cf0a979fc"; - armv7l-linux = "c0a2c13d99a1152aa6252fd8237207a6f395b70d0890eba5b7209a03beb9a6ec"; - aarch64-linux = "a92e2eaebab75b93eda0bc523ba9262a32db95c7546c095fee93d39a304521a0"; - aarch64-darwin = "810a1f36574a2db8d7d4022a042a65cceec3443644487868c5609b16b5dfe29f"; - headers = "1qis2k8yc7g1klvhiysjrgl5gclx4idxdz60kh8ldrji5a0lgha1"; + 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_13 = mkElectron "13.1.6" { From 7cb4e3bb01a14ae7a595a0043c3225c529ad02d0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 8 Jul 2021 23:46:19 +0000 Subject: [PATCH 21/39] electron_11: 11.4.9 -> 11.4.10 https://github.com/electron/electron/releases/tag/v11.4.10 --- 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 6bb4c6d43ff6..07a094dd0e83 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,14 +95,14 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.4.9" { - x86_64-linux = "c18ed2e16e60ca1eddd01ab2e4fff2bbfd9f197ab17b7577155f05687297d7be"; - x86_64-darwin = "ec34759ae768e55449c23244283c8af3dc5d5ab533d64cea0231be0a0878ebdd"; - i686-linux = "ef9125268e03f2f1d13c2b2505ba2529af88a8397cad640bd35116caae7ab296"; - armv7l-linux = "b43c00f4a0b4cf8affa09cedff93066d23d57a6148af383a8fc9f6d25b63d449"; - aarch64-linux = "3df038538056fc4a918afe07138052b1f53648c411add47c3a18abe8a30e6f71"; - aarch64-darwin = "acf880cfaea9ca382831df165fa7ef7e0b442c663d5a586cdfe0baa1aea4e17c"; - headers = "1wfhc22g680pvv85rq8d8lw4vphpr700fmzs3nwxixxnzhp1sb79"; + electron_11 = mkElectron "11.4.10" { + x86_64-linux = "bad6af91183bcb27428a258fba3fab24ef3e8435402d6cb2d500fe215b8c920c"; + x86_64-darwin = "aaa11e61697ec2eec99950082a68eef32bc1231e51ac77cde6d96a12837f5b73"; + i686-linux = "8e956bad6a6c5f85fe5a53304ffe878191c670ffbc13176fbe01911ba7d6da0f"; + armv7l-linux = "c9e3873316416426151fbff9a190526e40a3e311d0f348ee6965a8c7948cb9c1"; + aarch64-linux = "4ee0dab2af08f0d8f0d141a165744c949b068a8a6537ef5ff7973b63266c2abf"; + aarch64-darwin = "53f96ba6099617c219ca75bde1682abb9e961927e5a3645b38dee11b95517659"; + headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33"; }; electron_12 = mkElectron "12.0.14" { From 6d0661472fb44e8c7acaf57f72790b43100c4b6b Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Wed, 7 Jul 2021 22:43:35 -0400 Subject: [PATCH 22/39] vimPlugins.vim-dadbod-ui: init at 2021-05-12 --- 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 c23ffaceee00..d82dc8013c21 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6172,6 +6172,18 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; + vim-dadbod-ui = buildVimPluginFrom2Nix { + pname = "vim-dadbod-ui"; + version = "2021-05-12"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-dadbod-ui"; + rev = "09fb2f51dcd022a6be20b48a730df493f4b3ca2d"; + sha256 = "1bsy8illa9xsawx6lfs67y2xri38fpxdb4xz25ajy43snls41say"; + }; + meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; + }; + vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; version = "2020-07-11"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 03d1a1ad0b47..54648236a61e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -312,6 +312,7 @@ kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor kristijanhusak/vim-carbon-now-sh kristijanhusak/vim-dadbod-completion +kristijanhusak/vim-dadbod-ui kristijanhusak/vim-dirvish-git kristijanhusak/vim-hybrid-material kshenoy/vim-signature From a967c845c54de472283d47410679fcad9648ce7b Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Fri, 9 Jul 2021 02:00:07 +0200 Subject: [PATCH 23/39] amidst: move to pkgs/tools/games/minecraft --- pkgs/tools/games/{ => minecraft}/amidst/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/games/{ => minecraft}/amidst/default.nix (100%) diff --git a/pkgs/tools/games/amidst/default.nix b/pkgs/tools/games/minecraft/amidst/default.nix similarity index 100% rename from pkgs/tools/games/amidst/default.nix rename to pkgs/tools/games/minecraft/amidst/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5afb6fa3f613..a5ed2e12b32d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -863,7 +863,7 @@ in auditwheel = callPackage ../tools/package-management/auditwheel { }; - amidst = callPackage ../tools/games/amidst { }; + amidst = callPackage ../tools/games/minecraft/amidst { }; gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; From 4d9ab19f8eded8ab879283d4778e4cd39d81d61c Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Fri, 9 Jul 2021 01:40:37 +0200 Subject: [PATCH 24/39] fabric-installer: init at 0.7.4 --- .../minecraft/fabric-installer/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/games/minecraft/fabric-installer/default.nix diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix new file mode 100644 index 000000000000..ef978875049e --- /dev/null +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre }: + +stdenv.mkDerivation rec { + pname = "fabric-installer"; + version = "0.7.4"; + + src = fetchurl { + url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; + sha256 = "0s3nmwpq1qg90c27qh4anvvsg4yzsgcp6kwsb35fsiaaakxn0b8r"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ jre makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,lib/fabric} + + cp $src $out/lib/fabric/fabric-installer.jar + makeWrapper ${jre}/bin/java $out/bin/fabric-installer \ + --add-flags "-jar $out/lib/fabric/fabric-installer.jar" + ''; + + meta = with lib; { + homepage = "https://fabricmc.net/"; + description = "A lightweight, experimental modding toolchain for Minecraft"; + license = licenses.asl20; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ed2e12b32d..7589341ebd16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4788,6 +4788,8 @@ in lp_solve = callPackage ../applications/science/math/lp_solve { }; + fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; + fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize {}; From 558d864f6417b57d706857f0d24b6e3ab0d22fca Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Fri, 9 Jul 2021 01:55:53 +0200 Subject: [PATCH 25/39] optifine: init at 1.16.5_HD_U_G8 --- .../games/minecraft/optifine/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/games/minecraft/optifine/default.nix diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix new file mode 100644 index 000000000000..06425e6b67ef --- /dev/null +++ b/pkgs/tools/games/minecraft/optifine/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre }: + +stdenv.mkDerivation rec { + pname = "optifine"; + version = "1.16.5_HD_U_G8"; + + src = fetchurl { + url = "https://optifine.net/download?f=OptiFine_${version}.jar"; + sha256 = "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ jre makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,lib/optifine} + cp $src $out/lib/optifine/optifine.jar + + makeWrapper ${jre}/bin/java $out/bin/optifine \ + --add-flags "-jar $out/lib/optifine/optifine.jar" + ''; + + meta = with lib; { + homepage = "https://optifine.net/"; + description = "A Minecraft optimization mod"; + longDescription = '' + OptiFine is a Minecraft optimization mod. + It allows Minecraft to run faster and look better with full support for HD textures and many configuration options. + ''; + license = licenses.unfree; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7589341ebd16..9a204df94699 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7636,6 +7636,8 @@ in openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + optifine = callPackage ../tools/games/minecraft/optifine { }; + optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; }; From 07e185c5a8de73df62fa87f6210683e31c51c448 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:50:44 +0200 Subject: [PATCH 26/39] ocamlPackages.mirage-block-ramdisk: fix tests with alcotest 1.4.0 --- .../ocaml-modules/mirage-block-ramdisk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix index 1dcc769abb67..7e8ebba73eb5 100644 --- a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix @@ -13,6 +13,11 @@ buildDunePackage rec { sha256 = "cc0e814fd54efe7a5b7a8c5eb1c04e2dece751b7d8dee2d95908a0768896e8af"; }; + # Make tests compatible with alcotest 1.4.0 + postPatch = '' + substituteInPlace test/tests.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' + ''; + minimumOCamlVersion = "4.06"; propagatedBuildInputs = [ io-page mirage-block ]; From 9b064d75d0eae614d0f5bbf087e40e918296c8cf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:50:50 +0200 Subject: [PATCH 27/39] ocamlPackages.mirage-channel: fix tests with alcotest 1.4.0 --- pkgs/development/ocaml-modules/mirage-channel/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix index 5b639e6fdd6e..227e821e1924 100644 --- a/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -14,6 +14,11 @@ buildDunePackage rec { sha256 = "0wmb2zhiyp8n78xgcspcsyd19bhcml3kyli2caw3778wc1gyvfpc"; }; + # Make tests compatible with alcotest 1.4.0 + postPatch = '' + substituteInPlace test/test_channel.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' + ''; + propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; doCheck = true; From 11c24ba9b3885c1f0c91ed3a8777664a4bc4f8b0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:50:53 +0200 Subject: [PATCH 28/39] ocamlPackages.mirage-flow-unix: fix tests with alcotest 1.4.0 --- pkgs/development/ocaml-modules/mirage-flow/unix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 3bd676b45fa0..0bd3e42ad37a 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -6,6 +6,11 @@ buildDunePackage { inherit (mirage-flow) version useDune2 src; + # Make tests compatible with alcotest 1.4.0 + postPatch = '' + substituteInPlace test/test.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' + ''; + propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; doCheck = true; From 2d1f4d4dabe4fa20a7705809dc88a1e4bd9dd4ff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:50:57 +0200 Subject: [PATCH 29/39] ocamlPackages.fiat-p256: fix tests with alcotest 1.4.0 --- pkgs/development/ocaml-modules/fiat-p256/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix index 3ebe98ab775d..c979fe682d3e 100644 --- a/pkgs/development/ocaml-modules/fiat-p256/default.nix +++ b/pkgs/development/ocaml-modules/fiat-p256/default.nix @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9"; }; + # Make tests compatible with alcotest 1.4.0 + postPatch = '' + substituteInPlace test/wycheproof/test.ml --replace \ + 'Printf.ksprintf Alcotest.fail' 'Printf.ksprintf (fun s -> Alcotest.fail s)' + ''; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ]; checkInputs = [ alcotest asn1-combinators benchmark From 14a2f48bf233ba86ca02a3d7e7b4c63e0eb7b754 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:51:00 +0200 Subject: [PATCH 30/39] ocamlPackages.tcpip: fix tests with alcotest 1.4.0 --- pkgs/development/ocaml-modules/tcpip/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 4d9f97480ef2..53656f00572a 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -26,6 +26,14 @@ buildDunePackage rec { ./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 From 3d6adb6f7d62be1257808d055696a07dd3ec68f6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Jul 2021 21:51:03 +0200 Subject: [PATCH 31/39] =?UTF-8?q?ocamlPackages.alcotest:=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/ocaml-modules/alcotest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index abef3ef7ef46..bb1b18e3ec19 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.3.0"; + version = "1.4.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; + sha256 = "sha256:1h9yp44snb6sgm5g1x3wg4gwjscic7i56jf0j8jr07355pxwrami"; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; From fc68e762415a33e50463acef6ffdf9faee7e4456 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 8 Jul 2021 18:00:04 +0200 Subject: [PATCH 32/39] nodePackages.terser: init at 5.7.1 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 680 ++++++++++-------- 2 files changed, 370 insertions(+), 311 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8d7c8be1d0df..95f2527711bb 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -227,6 +227,7 @@ , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} , "teck-programmer" , "tern" +, "terser" , "textlint" , "textlint-plugin-latex" , "textlint-rule-abbr-within-parentheses" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c319927e92fb..ac6f8d7d90f0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2317,13 +2317,13 @@ let sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; }; }; - "@fluentui/react-7.172.3" = { + "@fluentui/react-7.172.4" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.172.3"; + version = "7.172.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.3.tgz"; - sha512 = "+hB9iPA5csIHfdm71k+MhQnh3kenHDJx4/VI26Iibjq4wMStzNHDU3rwLmiKM3SYCD5vHWJ0VS3xBMV7mOGJ4w=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.4.tgz"; + sha512 = "eFmw1npSTj/6JeP99KltrRIThqilU2HpOmddwmMA77wwt9GjgxUZm1igfTyyfd3RbuqfLgHGK9OhFqAH5Eo9wg=="; }; }; "@fluentui/react-8.22.0" = { @@ -3964,13 +3964,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.191" = { + "@microsoft/load-themed-styles-1.10.192" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.191"; + version = "1.10.192"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.191.tgz"; - sha512 = "VcYiuAMC2Wib2Mm2URjmKmLYXGRC4DTjJeVFQVjEzsbM8cJSL/kVSjYIjjGujKZiEqGIyEh50zuzevqmtsUSeg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.192.tgz"; + sha512 = "JeNt/3Wf/GzU731Zfrw64t5Nc4u2Weh2ANnKNXk0S6Eln1zrqSTMJhoXErwCTTBs4XW+I6d8W+k5XTtQh3f0aA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4045,13 +4045,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.2.2" = { + "@netlify/build-15.11.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.2.2"; + version = "15.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.2.2.tgz"; - sha512 = "oKb/7icsKP2awfz71gLR2rshLV9WwBzW5aOf20Y23DNROew/vgM7t53za2i88ftHPiV7da01ziN2VchS9y3IFA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.0.tgz"; + sha512 = "Sw4AGRGJUPzBJMNsvJUWjmr60rlWB1GYiynmTlI/qhUnjB2LgnP7bZLMFDTiHbfgigiK7WEV3NObqNEbE1r8CA=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4063,13 +4063,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-12.1.1" = { + "@netlify/config-12.6.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "12.1.1"; + version = "12.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-12.1.1.tgz"; - sha512 = "FzN665kC7rAwa6CPvTT7+n5K4qe+klVOQBz38zdplW8kLrB0+7Id4r51wkPY3/ak796vA5KzVoqxct01x92rJA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz"; + sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4126,13 +4126,13 @@ let sha512 = "i9hGh29dAU5uFJ51v3Aah9wJC88P/uE2LVSg8JRcK+ZPTnu82kdMkq9qrVSYXfqLBGm8w54bRT0LFUv5IDXjVg=="; }; }; - "@netlify/plugins-list-2.19.0" = { + "@netlify/plugins-list-2.19.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.0.tgz"; - sha512 = "I68SX5QX4VKvcNOdtC0Bo6scmgYTfLJ8AX5bBrIEOa4bhDpH4o4VgG8wS+joZ7NLbZI3xIRjKasdqZboipWZqQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.1.tgz"; + sha512 = "7en2ywbQUbAX1j8AKMqoWOij1hcTSRPIdaK7FXbQvaMYfl8INDN9QwvzvQy9D9CsZ/eWF13RHYx/4y592XXz3Q=="; }; }; "@netlify/routing-local-proxy-0.30.2" = { @@ -4153,15 +4153,6 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.11.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.11.0.tgz"; - sha512 = "QTiBzxqP44W0FrSuiRUni+ryi/YzLrkXaIRO5Al6QESEe+Ut8LVxuTClzmU86+hsSUnT0X0kDly19EdC/KwoCQ=="; - }; - }; "@netlify/zip-it-and-ship-it-4.12.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; @@ -4252,13 +4243,13 @@ let sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.7" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; - sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@npmcli/arborist-2.6.4" = { @@ -6214,13 +6205,13 @@ let sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; }; - "@types/babel__traverse-7.14.1" = { + "@types/babel__traverse-7.14.2" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.14.1"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.1.tgz"; - sha512 = "DomsDK/nX3XXHs6jlQ8/YYE6jZAuhmoGAFfcYi1h1jbBNGS7Efdx74FKLTO3HCCyLqQyLlNbql87xqa7C3M/FQ=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; + sha512 = "K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="; }; }; "@types/babylon-6.16.6" = { @@ -6529,13 +6520,13 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-serve-static-core-4.17.23" = { + "@types/express-serve-static-core-4.17.24" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.23"; + version = "4.17.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.23.tgz"; - sha512 = "WYqTtTPTJn9kXMdnAH5HPPb7ctXvBpP4PfuOb8MV4OHPQWHhDZixGlhgR159lJPpKm23WOdoCkt2//cCEaOJkw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -7069,6 +7060,15 @@ let sha512 = "hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug=="; }; }; + "@types/node-16.3.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.3.0.tgz"; + sha512 = "OydMCocGMGqw/1BnWbhtK+AtwyWTOigtrQlRe57OQmTNcI3HKlVI5FGlh+c4mSqInMPLynFrTlYjfajPu9O/eQ=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7465,13 +7465,13 @@ let sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; }; }; - "@types/vscode-1.57.1" = { + "@types/vscode-1.58.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.57.1"; + version = "1.58.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.57.1.tgz"; - sha512 = "I+NlKdnDnUZZ5HYu3F99ye3ERORnoqdyPer6nXVC7ToU/4WEjrCQOlLosmLyVoi75+UbKCJMFqTgeZuID+8yoA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.0.tgz"; + sha512 = "enznxcBi4uYt20LWal09E0+VKEHZlq9PZawTu/mpWCVCFWWbiyR8HNI1ikBP1Ypqv8b3A/0md3DY1jcx+oQ8kQ=="; }; }; "@types/webpack-4.41.30" = { @@ -8761,13 +8761,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "acorn-jsx-5.3.1" = { + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "acorn-loose-6.1.0" = { @@ -11047,13 +11047,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.941.0" = { + "aws-sdk-2.942.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.941.0"; + version = "2.942.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.941.0.tgz"; - sha512 = "MzVYHaZNtWy7UgFnCBg8rXFfSd4svjUVkLpQnPb/XJb3Qq4082SN5ZjaDITFFAQs/xttV3jm5jtbbcc5dpICYg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.942.0.tgz"; + sha512 = "9Y+DWSTvolTJe0nl55sKnsPgtfBCV8WKDE8cAUhgn9MIb4tAGpwejS14AUmqeZ12J58AsgPT3PffdI7Hq9IEtQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11434,13 +11434,13 @@ let sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; - "babel-plugin-styled-components-1.13.1" = { + "babel-plugin-styled-components-1.13.2" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.1.tgz"; - sha512 = "iY11g5orsdBnvWtXKCFBzDyTxZ9jvmkcYCCs5ONlvASYltDRhieCVzeDC7Do0fSW7psAL0zfVoXB3FHz2CkUSg=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz"; + sha512 = "Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -12613,13 +12613,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.4.1" = { + "bittorrent-protocol-3.4.2" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.1.tgz"; - sha512 = "3qBW4ZZrUZKN7HzHbX4+kbiphrTNeraMp3i9n3wobicysjibAV8SBDY+sGiBN4SgXV6WvEW4kyRPIjoSqW+khw=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.4.2.tgz"; + sha512 = "a7ueJzmCImWIXfKrJ+dT6mgqi5+LFByAXoMXhV/cYt/y8kplaC8N9ZWfpiTidJY4H2o1GTsyMy73o62a/rZ0Ow=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -13846,15 +13846,6 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "buffer-xor-2.0.2" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz"; - sha512 = "eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ=="; - }; - }; "buffermaker-1.2.1" = { name = "buffermaker"; packageName = "buffermaker"; @@ -14620,6 +14611,15 @@ let sha512 = "0aaAPgW92lLmypb9iCd22k7tSD1FbF6dps8VQzmIBKY6ych2gO09b2vo/SbaLTmezJuB8Kh88Rvpl/Uq52mNZg=="; }; }; + "cbor-7.0.6" = { + name = "cbor"; + packageName = "cbor"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-7.0.6.tgz"; + sha512 = "rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -21740,13 +21740,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.770" = { + "electron-to-chromium-1.3.771" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.770"; + version = "1.3.771"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.770.tgz"; - sha512 = "Kyh8DGK1KfEZuYKIHvuOmrKotsKZQ+qBkDIWHciE3QoFkxXB1KzPP+tfLilSHAfxTON0yYMnFCWkQtUOR7g6KQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.771.tgz"; + sha512 = "zHMomTqkpnAD9W5rhXE1aiU3ogGFrqWzdvM4C6222SREiqsWQb2w0S7P2Ii44qCaGimmAP1z+OydllM438uJyA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24235,13 +24235,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.6" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.6.tgz"; - sha512 = "GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-parse-1.0.3" = { @@ -25270,13 +25270,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.154.0" = { + "flow-parser-0.155.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.154.0"; + version = "0.155.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.154.0.tgz"; - sha512 = "cH9xY/ljOgmqG1n7PU1jffiHhRggoloauwOrOlCWBEX4Y+ml6GA8g//tCVKU+6PO4BXoPF22TFHkS5E1bN3JOQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.155.0.tgz"; + sha512 = "DegBwxIjw8ZmgLO9Qae/uSDWlioenV7mbfMoPem97y1OZVxlTAXNVHt5JthwrGLwk4kpmHQ3VRcp1Jxj84NcWw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -34507,6 +34507,15 @@ let sha512 = "sb2ll58VifSr82EBzppKO7H6Vwix/xiAJNmzWEym/mRApe9D2/eW/Fy8anpjICefPFmMRV1lovPUFHw+wuxF2Q=="; }; }; + "lightning-3.3.15" = { + name = "lightning"; + packageName = "lightning"; + version = "3.3.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.15.tgz"; + sha512 = "blbivgD+cHlwUbwMQmY9CVDaRAPCxrk8AKl/zr4F+P7Qqky4iKgm/aHmJ/4eGKa3caGftU3fR1q9pJh/mbRO2g=="; + }; + }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -34687,6 +34696,15 @@ let sha512 = "r6beG0PFkK+yhbOQjvTAPf5XDNbzPZr8CE0W1k56T8Jg8mjmHrJCSOb0Tl646xgQgzFaIWe+MRdSButS5xvHAQ=="; }; }; + "ln-service-51.8.8" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.8.tgz"; + sha512 = "q3Aljr743seIqtaS5N7UUaFbHGhSQXsOs1zCuAWt6sFTq6A8BLJAjYbzHje9bwPEaiwIDOFeqKjCVp4IjE1Arw=="; + }; + }; "ln-sync-0.4.6" = { name = "ln-sync"; packageName = "ln-sync"; @@ -40394,13 +40412,13 @@ let sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; }; }; - "netlify-redirect-parser-8.0.0" = { + "netlify-redirect-parser-8.1.0" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.0.0.tgz"; - sha512 = "4E7YYZHVje+aofCiwznWVZJowf7ed6nrFexlL/ogQaE7745KI8KdHj7itVXAPggpiqiTPj9Iz/LMh/av6iT1Gg=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.1.0.tgz"; + sha512 = "y5uzRHSyHVDDIgcFwvRRIELliBc7SKFuvuyVgsIMZWaNDCKNO4Etk2CIeGlJG+++g7NFD/XlYJaqgw2jJkqe4A=="; }; }; "netlify-redirector-0.2.1" = { @@ -42196,13 +42214,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.172.3" = { + "office-ui-fabric-react-7.172.4" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.172.3"; + version = "7.172.4"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.3.tgz"; - sha512 = "bCFbvPPspXTbgpjCzhRNt8OlD3fzPWWsVgIggaQQSpx14IXnEvnGRJQeN8X29yNUIiK67O42cC6flhYPYro5xw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.4.tgz"; + sha512 = "qjZguhw4GyfRADa69JKT/4/PF9plaNDo0rM8/gtCSPj6/yETLrdrfjupUKcS32nD7juVdCRkzepAbTEMm9IgMQ=="; }; }; "omggif-1.0.10" = { @@ -50819,13 +50837,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.52.8" = { + "rollup-2.53.0" = { name = "rollup"; packageName = "rollup"; - version = "2.52.8"; + version = "2.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.8.tgz"; - sha512 = "IjAB0C6KK5/lvqzJWAzsvOik+jV5Bt907QdkQ/gDP4j+R9KYNI1tjqdxiPitGPVrWC21Mf/ucXgowUjN/VemaQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; + sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -62287,6 +62305,15 @@ let sha512 = "ex3nB9uxNI0azzb0r3xGwi+LS5Gw1RCRSKk0kg3kq9MYdIPmLS6UI3oEtG7esBaB51t9I+5H+vHmL3htaxqMSw=="; }; }; + "webpack-5.44.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.44.0.tgz"; + sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -62476,13 +62503,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.1.5" = { + "webtorrent-1.1.6" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.5.tgz"; - sha512 = "i3noJrqUdRR9cVW/kXBLtZgLAVoOhvDS/D+zNmLo5xucsW6xVLEKptqRASVol+SfzpPpoTkrfsD8ahB/NKpHtw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.6.tgz"; + sha512 = "snRFoYjosyhFUE5pa7wY3JJ1Gjn7ietAC0+rprJKTkS/Ca4J4rHuwDWtG6KTr/DSkdna+sxHvlFXfxCHt+xObw=="; }; }; "well-known-symbols-2.0.0" = { @@ -65401,7 +65428,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -65467,7 +65494,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65837,7 +65864,7 @@ in ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.7" + 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" @@ -65857,7 +65884,7 @@ in sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.23" + sources."@types/express-serve-static-core-4.17.24" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.4" sources."@types/http-assert-1.5.1" @@ -65876,7 +65903,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -66147,7 +66174,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.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66230,7 +66257,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.154.0" + sources."flow-parser-0.155.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -66860,7 +66887,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -67168,7 +67195,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.770" + sources."electron-to-chromium-1.3.771" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67262,7 +67289,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67297,14 +67324,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" 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.941.0" // { + (sources."aws-sdk-2.942.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67508,10 +67535,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.5.2"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.5.2.tgz"; - sha512 = "p93ula71oE5XCA3yvijHA4ibgN6ua30Q1DC7e7Fh4Df2FabcJT+XsOnyOqbRsFGZ6ZK1xp14egVSqD7yrneMVA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.0.tgz"; + sha512 = "scuMBaNgv3fzqqf9uqgkEytIFgjmHACAjmRwLaTi3LjR2ooTkr/74kx9GtWnoj2jZ8ZDY1ivhDrgG74xoTVQPw=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67524,7 +67551,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -67547,7 +67574,7 @@ in sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.12" - sources."@types/express-serve-static-core-4.17.23" + sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -67661,7 +67688,7 @@ in sources."camelcase-6.2.0" sources."caporal-1.4.0" sources."caseless-0.12.0" - sources."cbor-7.0.5" + sources."cbor-7.0.6" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ @@ -67773,6 +67800,7 @@ in dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; @@ -67873,6 +67901,7 @@ in sources."@types/node-15.6.1" sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."invoices-1.2.1" ]; }) @@ -67883,20 +67912,24 @@ in sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" sources."ws-7.5.0" ]; }) - (sources."ln-service-51.8.6" // { + (sources."ln-service-51.8.8" // { dependencies = [ sources."@grpc/grpc-js-1.3.4" sources."@grpc/proto-loader-0.6.4" - sources."@types/node-16.0.0" + sources."@types/express-4.17.13" + sources."@types/node-16.0.1" + sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" - sources."lightning-3.3.13" - sources."ws-7.5.1" + sources."form-data-2.5.1" + sources."lightning-3.3.15" + sources."ws-7.5.2" ]; }) (sources."ln-sync-0.4.6" // { @@ -67906,10 +67939,23 @@ in sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."lightning-3.3.12" ]; }) - sources."ln-telegram-3.2.8" + (sources."ln-telegram-3.2.8" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.4" + sources."@types/node-16.0.0" + sources."@types/ws-7.4.6" + sources."bn.js-5.2.0" + sources."cbor-7.0.5" + sources."lightning-3.3.13" + sources."ln-service-51.8.6" + sources."ws-7.5.1" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -68008,6 +68054,7 @@ in sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" sources."ws-7.5.0" @@ -68031,7 +68078,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" ]; }) sources."proxy-addr-2.0.7" @@ -69211,7 +69258,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -70378,10 +70425,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.5"; + version = "0.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.5.tgz"; - sha512 = "7JuDGXvv6OAbyGfBgb2CZyOC95XJirKq4bDIEk/ERxbuxrCaUnAdsfnkBPFw7nTeo3fhcDsx8VGuPcH8pmZAww=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.6.tgz"; + sha512 = "hch8jmuy563eW8glcDJ42yPpzRSSpd/8+8mJKgTDhJNsuv1lKvVP5/mIrPF+6aB5NKwu/+yjDv+l4Scar5CF6A=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -70912,7 +70959,7 @@ in sources."@typescript-eslint/typescript-estree-3.10.1" sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { @@ -71069,7 +71116,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -72053,7 +72100,7 @@ in sources."@babel/types-7.14.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.4" @@ -72118,7 +72165,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72128,7 +72175,7 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.1" sources."file-entry-cache-6.0.1" @@ -72531,7 +72578,7 @@ in sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -72970,7 +73017,7 @@ in sources."@netflix/nerror-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -73153,7 +73200,7 @@ in }) sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" @@ -73581,7 +73628,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73952,7 +73999,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74936,7 +74983,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."aggregate-error-3.1.0" sources."array-union-2.1.0" sources."balanced-match-1.0.2" @@ -74948,7 +74995,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastq-1.11.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -75267,7 +75314,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.0.1" + sources."@types/node-16.3.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -75899,7 +75946,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.0.1" + sources."@types/node-16.3.0" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75971,7 +76018,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76232,7 +76279,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.172.3" + sources."@fluentui/react-7.172.4" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -76246,10 +76293,10 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.191" + sources."@microsoft/load-themed-styles-1.10.192" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."rimraf-3.0.2" @@ -76264,7 +76311,7 @@ in sources."@types/connect-3.4.35" sources."@types/engine.io-3.1.6" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.23" + 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" @@ -76779,7 +76826,7 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" sources."fastq-1.11.1" @@ -77273,7 +77320,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.172.3" + sources."office-ui-fabric-react-7.172.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77934,7 +77981,7 @@ in sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -78097,7 +78144,7 @@ in sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -78524,7 +78571,7 @@ in 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.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/git-2.1.0" // { dependencies = [ sources."mkdirp-1.0.4" @@ -79075,7 +79122,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79177,7 +79224,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."faye-websocket-0.10.0" @@ -80977,7 +81024,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.2" @@ -81202,7 +81249,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.6" + 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" @@ -81566,10 +81613,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.14.0"; + version = "9.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.14.0.tgz"; - sha512 = "CHR1Xw5LJ+hDQ/SaRqvuNXJEmpbPsOEtNRj6oD44VFGRp9ZTjY3irilSj6uv7S2P1A1XLEGyO7jEpCH5mkc9RQ=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.0.tgz"; + sha512 = "H/zyDDrQuZKM6ZFyI8t2kDEC+/Ewhk771sM8NLZyEXIQnX5qKAwhi3sJUB+5yrXt+SJQYqUYksBLK6/gqxe9Eg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -81616,7 +81663,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.0.1" + sources."@types/node-16.3.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81624,11 +81671,7 @@ in sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - (sources."ajv-6.12.6" // { - dependencies = [ - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -81869,6 +81912,7 @@ in sources."events-listener-1.1.0" (sources."exegesis-2.5.7" // { dependencies = [ + sources."json-schema-traverse-1.0.0" sources."semver-7.3.5" ]; }) @@ -82063,7 +82107,7 @@ in sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-2.2.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-1.0.0" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonparse-1.3.1" @@ -82725,7 +82769,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -83511,7 +83555,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.0.1" + sources."@types/node-16.3.0" sources."@types/node-fetch-2.5.11" sources."@types/readable-stream-2.3.11" sources."@types/unist-2.0.5" @@ -83520,7 +83564,7 @@ in sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" sources."acorn-8.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -83675,7 +83719,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -84899,10 +84943,10 @@ in sources."@microsoft/fetch-event-source-2.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85015,7 +85059,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastq-1.11.1" @@ -88005,7 +88049,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.941.0" // { + (sources."aws-sdk-2.942.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -89194,7 +89238,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ @@ -89296,7 +89340,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" (sources."figures-3.2.0" // { @@ -89467,7 +89511,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.11" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -90595,7 +90639,7 @@ in }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" @@ -90770,7 +90814,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."figures-3.2.0" @@ -92272,14 +92316,14 @@ in sources."@types/babel__core-7.1.15" sources."@types/babel__generator-7.6.3" sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.1" + sources."@types/babel__traverse-7.14.2" sources."@types/estree-0.0.50" sources."@types/graceful-fs-4.1.5" 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.0.1" + sources."@types/node-16.3.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -92576,7 +92620,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93466,10 +93510,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.13.7-20210702140250"; + version = "1.13.7-20210708171758"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.7-20210702140250.tgz"; - sha512 = "LaGMdr07Qli87/9UfDePeyGNbatEJKoLOp0sF56squgxj8eIudqauYzQUg9hQdMAj2vqx/39d4F2auITfVNVAg=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.7-20210708171758.tgz"; + sha512 = "9jnKVFg0PERBhNgTDv8G86QPFkG7ZGCGCmxgPkj9yTfNu+2Kx+mSzo7hchbDuo6UN1ZLlWGq53TJHZ3kJ/kIQQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -93824,7 +93868,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93969,7 +94013,7 @@ in sources."@fluentui/style-utilities-8.1.4" sources."@fluentui/theme-2.1.3" sources."@fluentui/utilities-8.2.0" - sources."@microsoft/load-themed-styles-1.10.191" + sources."@microsoft/load-themed-styles-1.10.192" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/cors-2.8.11" @@ -94482,10 +94526,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.1.12"; + version = "4.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.12.tgz"; - sha512 = "xyQVNLtvMUTinV+ix0cc4RlugeCqITq7vC+oSgPStI1tKhl16kSWoQSo//8zZ8XjPmx2mgczCVLor4pwCJoO0w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.18.tgz"; + sha512 = "urJ/UEOwS5jL+bhNccADuBBFbaewgIj5LZxTsFgM56bCPxNIGEwVrwW4kaVGZqujNYLaZrUn1BlhKaXW6nIUnA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94619,21 +94663,11 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.2.2" // { + (sources."@netlify/build-15.11.0" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.12.0" // { - dependencies = [ - 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" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" @@ -94651,7 +94685,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-12.1.1" // { + (sources."@netlify/config-12.6.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94665,18 +94699,11 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.6.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - (sources."@netlify/functions-utils-1.4.4" // { - dependencies = [ - sources."@netlify/zip-it-and-ship-it-4.12.0" - 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-1.4.4" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94691,22 +94718,26 @@ in (sources."@netlify/plugin-edge-handlers-1.11.20" // { dependencies = [ sources."@types/node-14.17.5" - sources."typescript-4.3.5" ]; }) - sources."@netlify/plugins-list-2.19.0" + sources."@netlify/plugins-list-2.19.1" sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.11.0" // { + (sources."@netlify/zip-it-and-ship-it-4.12.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" // { @@ -94715,7 +94746,7 @@ in ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/color-0.1.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -94745,7 +94776,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -94759,8 +94790,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" @@ -94869,7 +94902,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.0.1" + sources."@types/node-16.3.0" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -94884,7 +94917,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -94987,8 +95020,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" @@ -95094,7 +95129,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" @@ -95227,7 +95262,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -95250,7 +95285,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" @@ -95288,7 +95327,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95477,7 +95516,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."ignore-5.1.8" @@ -95720,6 +95759,7 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -95839,7 +95879,7 @@ in sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-8.0.0" // { + (sources."netlify-redirect-parser-8.1.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -95954,12 +95994,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" // { @@ -96107,8 +96143,9 @@ in }) sources."ret-0.1.15" sources."reusify-1.0.4" + sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.52.8" + sources."rollup-2.53.0" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96335,7 +96372,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" @@ -96420,7 +96457,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" ]; @@ -96429,20 +96466,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.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -97673,10 +97705,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.9.tgz"; - sha512 = "6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.10.tgz"; + sha512 = "369KB2EC1fLzz7hIuKSRSIVhh9PXqFAwh1stxlNX8DMyat9y/maswuRxRMttyelnduLDa04r4wgVZ4fgRwZWuQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -97857,7 +97889,7 @@ in }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@samverschueren/stream-to-observable-0.3.1" // { dependencies = [ sources."any-observable-0.3.0" @@ -97869,7 +97901,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.0.1" + sources."@types/node-16.3.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -97964,7 +97996,7 @@ in sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."external-editor-3.1.0" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastq-1.11.1" (sources."figures-3.2.0" // { dependencies = [ @@ -98399,7 +98431,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -98496,7 +98528,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."figgy-pudding-3.5.2" @@ -99358,7 +99390,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.770" + sources."electron-to-chromium-1.3.771" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101028,7 +101060,7 @@ in sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."agent-base-6.0.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -101067,7 +101099,7 @@ in sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."expand-template-2.0.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-levenshtein-2.0.6" sources."fastq-1.11.1" sources."fill-range-7.0.1" @@ -101489,7 +101521,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -101507,7 +101539,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastq-1.11.1" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" @@ -102470,7 +102502,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.0.1" + sources."@types/node-16.3.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -102887,7 +102919,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -104296,7 +104328,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.13.1" + sources."babel-plugin-styled-components-1.13.2" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -104757,10 +104789,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.52.8"; + version = "2.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.8.tgz"; - sha512 = "IjAB0C6KK5/lvqzJWAzsvOik+jV5Bt907QdkQ/gDP4j+R9KYNI1tjqdxiPitGPVrWC21Mf/ucXgowUjN/VemaQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; + sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104798,7 +104830,7 @@ in sources."@humanwhocodes/object-schema-1.2.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@rollup/plugin-commonjs-17.1.0" sources."@rollup/plugin-node-resolve-11.2.1" (sources."@rollup/pluginutils-3.1.0" // { @@ -104815,7 +104847,7 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.11" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.57.1" + sources."@types/vscode-1.58.0" sources."@typescript-eslint/eslint-plugin-4.28.2" sources."@typescript-eslint/experimental-utils-4.28.2" sources."@typescript-eslint/parser-4.28.2" @@ -104825,7 +104857,7 @@ in sources."@typescript-eslint/visitor-keys-4.28.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" @@ -104937,7 +104969,7 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + 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" @@ -105086,7 +105118,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.8" + sources."rollup-2.53.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -105464,10 +105496,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.51.0"; + version = "2.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.51.0.tgz"; - sha512 = "Pi2GwZo1hLXUmVIgYFTjnc231Z4kbk240ZHN2bZw6twniX+QiuJIvmDNiVVUExZe0LzL9iaefuGd6AsqygE9Yw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.51.2.tgz"; + sha512 = "I2g7zrS9cGNfwMJFQiypUX0DlrxgbhRrmIWyhq784FFljgssEN/6dq5sYBp0nBaK5yPBlqSWILXzQ3jaeG7vIw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105480,7 +105512,7 @@ in sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + 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" @@ -105562,7 +105594,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/readable-stream-2.3.11" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" @@ -105624,7 +105656,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.941.0" // { + (sources."aws-sdk-2.942.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105844,7 +105876,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" @@ -106988,7 +107020,7 @@ in sources."@deepcode/dcignore-1.0.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@octetstream/promisify-2.0.2" sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-4.0.1" @@ -107242,7 +107274,7 @@ in }) sources."execa-1.0.0" sources."external-editor-3.1.0" - (sources."fast-glob-3.2.6" // { + (sources."fast-glob-3.2.7" // { dependencies = [ sources."micromatch-4.0.4" ]; @@ -107739,7 +107771,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.11" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -109005,7 +109037,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.941.0" // { + (sources."aws-sdk-2.942.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109816,7 +109848,7 @@ in sources."@babel/types-7.14.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.4" @@ -109881,7 +109913,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109890,7 +109922,7 @@ in sources."execall-2.0.0" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.1" sources."file-entry-cache-6.0.1" @@ -110123,7 +110155,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.0.1" + sources."@types/node-16.3.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -111136,6 +111168,34 @@ in bypassCache = true; reconstructLock = true; }; + terser = nodeEnv.buildNodePackage { + name = "terser"; + packageName = "terser"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz"; + sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; + }; + dependencies = [ + sources."buffer-from-1.1.1" + sources."commander-2.20.3" + sources."source-map-0.7.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript parser, mangler/compressor and beautifier toolkit for ES6+"; + homepage = "https://terser.org"; + license = "BSD-2-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; @@ -111448,7 +111508,7 @@ in sources."@types/parse5-5.0.3" sources."@types/unist-2.0.5" sources."acorn-8.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -112247,7 +112307,7 @@ in sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -113137,7 +113197,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."aggregate-error-3.1.0" sources."array-union-2.1.0" sources."balanced-match-1.0.2" @@ -113150,7 +113210,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fastq-1.11.1" sources."fill-range-7.0.1" sources."fs-extra-10.0.0" @@ -113796,7 +113856,7 @@ in sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -114137,11 +114197,11 @@ in sources."@discoveryjs/json-ext-0.5.3" sources."@types/eslint-7.2.14" 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/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.57.1" + sources."@types/vscode-1.58.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -114225,7 +114285,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.770" + sources."electron-to-chromium-1.3.771" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -114435,7 +114495,7 @@ in sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" sources."watchpack-2.2.0" - sources."webpack-5.43.0" + sources."webpack-5.44.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -114792,13 +114852,13 @@ 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.0.1" + sources."@types/node-16.3.0" sources."@types/unist-2.0.5" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.2" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { @@ -115964,10 +116024,10 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" (sources."addons-linter-3.8.0" // { dependencies = [ sources."yargs-17.0.1" @@ -116517,17 +116577,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.43.0"; + version = "5.44.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.44.0.tgz"; + sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; }; dependencies = [ sources."@types/eslint-7.2.14" 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.0.1" + sources."@types/node-16.3.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -116554,7 +116614,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.770" + sources."electron-to-chromium-1.3.771" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -116692,7 +116752,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117273,7 +117333,7 @@ in dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" sources."@types/json-schema-7.0.8" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -117281,7 +117341,7 @@ in sources."braces-3.0.2" sources."dir-glob-3.0.1" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.6" // { + (sources."fast-glob-3.2.7" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -117346,7 +117406,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117368,7 +117428,7 @@ in ]; }) sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.4.1" // { + (sources."bittorrent-protocol-3.4.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -117394,7 +117454,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."buffer-xor-2.0.2" sources."bufferutil-4.0.3" sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { @@ -117625,7 +117684,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.1.5" // { + (sources."webtorrent-1.1.6" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117699,10 +117758,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.20.0.tgz"; - sha512 = "JV5jqB/1p2g4WCW1Gi6Kd3RQQSepdvTQBIDLSSoVzi7Q7kH+6tFkFJlMCBs0qmxLPkaU062d3IxdTWDK/MvvEA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.0.tgz"; + sha512 = "lUp4qhxfBlTieoV+pkLJq09QnwL8daYM+3abAvfRLUUKDQaKTS4hM3NjWNVdtVHS/Oc7IFY44F2K2VZ/q5kMAw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -117716,13 +117775,12 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-4.1.0" - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ - sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" ]; @@ -117775,7 +117833,7 @@ in sources."@babel/runtime-7.14.6" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.7" + sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/arborist-2.6.4" // { dependencies = [ sources."semver-7.3.5" @@ -117988,7 +118046,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.6" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."figures-2.0.0" @@ -118707,7 +118765,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.0.1" + sources."@types/node-16.3.0" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From a571f3a94530f36ae1016cb74d2c861cb379ad5e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 9 Jul 2021 10:17:01 +0200 Subject: [PATCH 33/39] chromiumBeta: 92.0.4515.80 -> 92.0.4515.93 --- .../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 863510ded66c..33f31b15d036 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.80", - "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i", - "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp", + "version": "92.0.4515.93", + "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0", + "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800", "deps": { "gn": { "version": "2021-05-07", From 7737f568065fdd8bd00a26da6a29d73b77cc1580 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jul 2021 10:34:49 +0200 Subject: [PATCH 34/39] exploitdb: 2021-07-06 -> 2021-07-09 --- 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 2c096d100e27..11ef4e1550d9 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-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-tRdA3GwU+jko+N+LOCHOA6RqFp3rkhyARwSTXRXoDww="; + sha256 = "sha256-FjiQ+L3eW+od41Vz00t/LhagS3SUT+PA5GvtZ6lhoFU="; }; installPhase = '' From 43b68c4bca0711e3b5aaa2fac84bdf4b5d915a41 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 9 Jul 2021 00:39:01 +0200 Subject: [PATCH 35/39] dkh: init at 1.2 Apply suggestions from code review --- .../science/chemistry/dkh/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/chemistry/dkh/default.nix diff --git a/pkgs/applications/science/chemistry/dkh/default.nix b/pkgs/applications/science/chemistry/dkh/default.nix new file mode 100644 index 000000000000..a0bed24336a9 --- /dev/null +++ b/pkgs/applications/science/chemistry/dkh/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, gfortran, fetchFromGitHub, cmake } : + +stdenv.mkDerivation rec { + pname = "dkh"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "psi4"; + repo = pname; + rev = "v${version}"; + sha256= "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck"; + }; + + nativeBuildInputs = [ + gfortran + cmake + ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + hardeningDisable = [ + "format" + ]; + + meta = with lib; { + description = "Arbitrary-order scalar-relativistic Douglas-Kroll-Hess module"; + license = licenses.lgpl3Only; + homepage = "https://github.com/psi4/dkh"; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1113a5e02cb..18368f290c09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29639,6 +29639,8 @@ in gstreamerSupport = true; }); + dkh = callPackage ../applications/science/chemistry/dkh { }; + openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; pymol = callPackage ../applications/science/chemistry/pymol { }; From f9645002a2d8615fd608bfdef4f924481dca391e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 9 Jul 2021 11:24:16 +0200 Subject: [PATCH 36/39] nixos/tests/chromium: Fix the test for M92+ Unfortunately there are some regressions in the GPU code that cause Chromium and Google Chrome to crash, e.g.: machine # [0709/084047.890436:ERROR:process_memory_range.cc(75)] read out of range[ 30.153484] show_signal: 20 callbacks suppressed machine # [ 30.153490] traps: chrome[1036] trap invalid opcode ip:55af03357b29 sp:7ffeaa69ad10 error:0 in chrome[55aefe7a4000+81ec000] machine # machine # [0709/084047.955039:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2) machine # [0709/084047.955078:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2) machine # [ 30.126905] systemd[1]: Created slice system-systemd\x2dcoredump.slice. machine # [ 30.137012] systemd[1]: Started Process Core Dump (PID 1038/UID 0). machine # [ 30.571987] systemd-coredump[1039]: Process 1036 (chrome) of user 1000 dumped core. machine # [992:1021:0709/084048.501937:ERROR:gpu_process_host.cc(995)] GPU process exited unexpectedly: exit_code=132 machine # [ 30.594747] systemd[1]: systemd-coredump@0-1038-0.service: Succeeded. Hopefully this'll be fixed upstream before the final release (there are bug reports for it) but for the meantime we have to launch the beta and dev versions with "--use-gl=angle --use-angle=swiftshader". --- nixos/tests/chromium.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 60ecf986d6ee..c17d1953894c 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -63,17 +63,25 @@ mapAttrs (channel: chromiumPkg: makeTest rec { return "su - ${user} -c " + shlex.quote(cmd) - def get_browser_binary(): - """Returns the name of the browser binary.""" + def get_browser_call(): + """Returns the name of the browser binary as well as CLI options.""" + # Determine the name of the binary: pname = "${getName chromiumPkg.name}" if pname.find("chromium") != -1: - return "chromium" # Same name for all channels and ungoogled-chromium - if pname == "google-chrome": - return "google-chrome-stable" - if pname == "google-chrome-dev": - return "google-chrome-unstable" - # For google-chrome-beta and as fallback: - return pname + binary = "chromium" # Same name for all channels and ungoogled-chromium + elif pname == "google-chrome": + binary = "google-chrome-stable" + elif pname == "google-chrome-dev": + binary = "google-chrome-unstable" + else: # For google-chrome-beta and as fallback: + binary = pname + # Add optional CLI options: + options = "" + major_version = "${versions.major (getVersion chromiumPkg.name)}" + if major_version > "91": + # To avoid a GPU crash: + options += "--use-gl=angle --use-angle=swiftshader" + return f"{binary} {options}" def create_new_win(): @@ -135,9 +143,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.wait_for_x() url = "file://${startupHTML}" - machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown')) + machine.succeed(ru(f'ulimit -c unlimited; {get_browser_call()} "{url}" & disown')) - if get_browser_binary().startswith("google-chrome"): + if get_browser_call().startswith("google-chrome"): # Need to click away the first window: machine.wait_for_text("Make Google Chrome the default browser") machine.screenshot("google_chrome_default_browser_prompt") From fb93340613a4cd475ad2d8271c807174695ff4e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jul 2021 12:17:16 +0200 Subject: [PATCH 37/39] metasploit: 6.0.51 -> 6.0.52 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 32 +++++----- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 70 +++++++++++++-------- 4 files changed, 66 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 79f85f2b3750..4a30b94f42e5 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.51" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.52" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 8248f6e8181b..1d324982a47f 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: d9aeac3fea255c475f553be4c55f3ae7cefc8542 - ref: refs/tags/6.0.51 + revision: f376002331f03483d56ade1c19134dbf02ef2cff + ref: refs/tags/6.0.52 specs: - metasploit-framework (6.0.51) + metasploit-framework (6.0.52) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -119,23 +119,23 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (9.0.0) arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.473.0) - aws-sdk-core (3.115.0) + aws-partitions (1.475.0) + aws-sdk-core (3.116.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.246.0) + aws-sdk-ec2 (1.248.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.55.0) + aws-sdk-iam (1.56.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.44.0) @@ -145,7 +145,7 @@ GEM aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) @@ -173,19 +173,23 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.3) + faraday (1.5.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) + faraday-patron (1.0.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -195,7 +199,7 @@ GEM ed25519 (~> 1.2) http-cookie (1.0.4) domain_name (~> 0.5) - http_parser.rb (0.6.0) + http_parser.rb (0.7.0) i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) @@ -208,7 +212,7 @@ GEM loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - metasm (1.0.4) + metasm (1.0.5) metasploit-concern (3.0.2) activemodel (~> 5.2.2) activesupport (~> 5.2.2) @@ -293,7 +297,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.3) + rake (13.0.6) rb-readline (0.5.5) recog (2.3.20) nokogiri @@ -360,7 +364,7 @@ GEM rubyntlm windows_error rubyntlm (0.6.3) - rubyzip (2.3.0) + rubyzip (2.3.2) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index c48c5e1690ef..e2e1f6371f7c 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.51"; + version = "6.0.52"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; + sha256 = "sha256-JN+ulGd47xZFSR7AdxfvviR5mwCHdfBmFkaAJPdaLJ8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index b52bff8aa8bb..23eb207484a0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; afm = { groups = ["default"]; @@ -114,40 +114,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; + sha256 = "0x9d0awfm8s9y025iwn7d5an476f6xq9v99lnynj2vvj1kgya79s"; type = "gem"; }; - version = "1.473.0"; + version = "1.475.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; + sha256 = "0vjr1lzddm1pcs5vkpxns1gmrv0l0wb53kcxhh1xdznb7hm8h5km"; type = "gem"; }; - version = "3.115.0"; + version = "3.116.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; + sha256 = "1s0r1vk39sjxkc5km2ldvcm1l5ac2c4w5z9bvz18jgqis98j6zd5"; type = "gem"; }; - version = "1.246.0"; + version = "1.248.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m"; + sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph"; type = "gem"; }; - version = "1.55.0"; + version = "1.56.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; + sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; bcrypt = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; + sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; faraday-em_http = { groups = ["default"]; @@ -389,6 +389,16 @@ }; version = "1.1.0"; }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -409,6 +419,16 @@ }; version = "1.1.0"; }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; faye-websocket = { groups = ["default"]; platforms = []; @@ -464,10 +484,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "1xha614fi6l04wryqjj1xmpalzlmhb6lb9qmlh8mmliycdhvcshp"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; i18n = { groups = ["default"]; @@ -544,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mbmpc8vsi574s78f23bhiqk07sr6yrrrmk702lfv61ql4ah5l89"; + sha256 = "0dpjbkdvi4h6v0g01db7vlcsg15pfiyslkz3zd7wfk04yrc6g7wi"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; metasploit-concern = { groups = ["default"]; @@ -574,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; - sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; + rev = "f376002331f03483d56ade1c19134dbf02ef2cff"; + sha256 = "17rcbbvj90262rkg0xc702dpj95yxwbpgh0y952idvvqcyaaxpr4"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.51"; + version = "6.0.52"; }; metasploit-model = { groups = ["default"]; @@ -946,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; rb-readline = { groups = ["default"]; @@ -1246,10 +1266,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; sawyer = { groups = ["default"]; From 3e75e57eb4730b0b7bb3ec9c8e9b551ea554ace7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 04:33:57 -0700 Subject: [PATCH 38/39] elfkickers: 3.1a -> 3.2 (#124178) Co-authored-by: Will Dietz Co-authored-by: Sandro --- pkgs/development/tools/misc/elfkickers/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 775ad6937dc4..7220ca31443a 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "elfkickers"; - version = "3.1a"; + version = "3.2"; src = fetchurl { - url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; - sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; + url = "https://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; + sha256 = "sha256-m4HmxT4MlPwZjZiC63NxVvNtVlFS3DIRiJfHewaiaHw="; }; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix:=${placeholder "out"}" ]; enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; + homepage = "https://www.muppetlabs.com/~breadbox/software/elfkickers.html"; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.dtzWill ]; }; } From c85f77790b8a00d0a670a8b5264ef3b12f5428c9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 9 Jul 2021 11:12:17 +0000 Subject: [PATCH 39/39] squeekboard: 1.13.0 -> 1.14.0 --- pkgs/applications/accessibility/squeekboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 71a0823f78d3..cca36c38e771 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0xyd6ickbaqvrr8a7ak6j1ziqjk05jlnganjrdv43p74nnjyqr8y"; + sha256 = "1ayap40pgzcpmfydk5pbf3gwhh26m3cmbk6lyly4jihr9qw7dgb0"; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "096skk7vmr93axcf0qj7kyr8hm1faj0nkmd349g8mnzwd68a9npz"; + sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; }; nativeBuildInputs = [