From 037167ae17fefe6b5dc86dc05f0dd168031c3c68 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 7 Jul 2022 14:50:48 +0200 Subject: [PATCH 001/203] xf86videointel: Use the `crocus` and `iris` DRI drivers The i965 driver was removed in Mesa 22, but the xf86videointel driver hasn't been updated to reflect this. This leads to the following error when used with the affected hardware: (EE) AIGLX error: dlopen of /run/opengl-driver/lib/dri/i965_dri.so failed (/run/opengl-driver/lib/dri/i965_dri.so: cannot open shared object file: No such file or directory) (EE) AIGLX error: unable to load driver i965 To fix this, add a patch which makes the driver return the appropriate DRI driver name from Mesa 22, i.e. `crocus` for older GPUs and `iris` for newer. --- pkgs/servers/x11/xorg/overrides.nix | 1 + .../x11/xorg/use_crocus_and_iris.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/x11/xorg/use_crocus_and_iris.patch diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2cfd410a3389..e1503a1d05b7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -870,6 +870,7 @@ self: super: buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; + patches = [ ./use_crocus_and_iris.patch ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/servers/x11/xorg/use_crocus_and_iris.patch b/pkgs/servers/x11/xorg/use_crocus_and_iris.patch new file mode 100644 index 000000000000..54744f463bd9 --- /dev/null +++ b/pkgs/servers/x11/xorg/use_crocus_and_iris.patch @@ -0,0 +1,28 @@ +--- a/src/uxa/intel_dri.c ++++ b/src/uxa/intel_dri.c +@@ -1540,8 +1540,10 @@ + return has_i830_dri() ? "i830" : "i915"; + else if (INTEL_INFO(intel)->gen < 040) + return "i915"; ++ else if (INTEL_INFO(intel)->gen < 0100) ++ return "crocus"; + else +- return "i965"; ++ return "iris"; + } + + return s; +--- a/src/sna/sna_dri2.c ++++ b/src/sna/sna_dri2.c +@@ -3707,8 +3707,10 @@ + return has_i830_dri() ? "i830" : "i915"; + else if (sna->kgem.gen < 040) + return "i915"; ++ else if (sna->kgem.gen < 0100) ++ return "crocus"; + else +- return "i965"; ++ return "iris"; + } + + return s; From 012434d4815a7a3221c2f8b9568cb6285e810059 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 18 Dec 2022 10:28:29 +1100 Subject: [PATCH 002/203] feedbackd: 0.0.1 -> 0.0.3 depsBuildBuild pkg-config is for build time tool detection https://source.puri.sm/Librem5/feedbackd/-/releases/v0.0.2 https://source.puri.sm/Librem5/feedbackd/-/releases/v0.0.3 --- pkgs/applications/misc/feedbackd/default.nix | 35 ++++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index b2c5dfe2ccfe..b19cec6f7e5d 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -2,6 +2,8 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, docutils +, gi-docgen , gobject-introspection , gtk-doc , libxslt @@ -28,24 +30,27 @@ let in stdenv.mkDerivation rec { pname = "feedbackd"; - # Not an actual upstream project release, - # only a Debian package release that is tagged in the upstream repo - version = "0.0.1"; + version = "0.0.3"; - outputs = [ "out" "dev" ] - # remove if cross-compiling gobject-introspection works - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ="; + hash = "sha256-ehWLC9PDDcD+muUPruzp8UvNddJBdrmW6gFxKVouY3c="; + fetchSubmodules = true; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ docbook-xsl-nons + docutils # for rst2man + gi-docgen gobject-introspection gtk-doc libxslt @@ -64,11 +69,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dgtk_doc=true" "-Dman=true" - # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868 - # can be removed if cross-compiling gobject-introspection works. - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; checkInputs = [ @@ -83,6 +85,17 @@ stdenv.mkDerivation rec { cp ${themes}/data/* $out/share/feedbackd/themes/ ''; + postFixup = '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + if [[ -d "$out/share/doc" ]]; then + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + fi + ''; + meta = with lib; { description = "A daemon to provide haptic (and later more) feedback on events"; homepage = "https://source.puri.sm/Librem5/feedbackd"; From 0de0ab5f9d88b27de4b771040a09f1dc77a772e8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 8 Feb 2023 23:29:55 -0500 Subject: [PATCH 003/203] gitea-actions-runner: init at unstable --- .../gitea-actions-runner/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix new file mode 100644 index 000000000000..cb5338e210b0 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitea, buildGoModule }: + +buildGoModule rec { + pname = "gitea-actions-runner"; + version = "unstable-2023-02-08"; + + src = fetchFromGitea { + domain = "gitea.com"; + owner = "gitea"; + repo = "act_runner"; + rev = "990cf93c7136669408eb1832cd05df3ad4dd81b3"; + sha256 = "1ysp7g199dzh1zpxxhki88pn96qghln7a5g8zfjip9173q1rgiyb"; + }; + + vendorSha256 = "0a3q7rsk37dc6v3vnqaywkimaqvyjmkrwljhcjcnswsdfcgng62b"; + + meta = with lib; { + mainProgram = "act_runner"; + maintainers = with maintainers; [ techknowlogick ]; + license = licenses.mit; + homepage = "https://gitea.com/gitea/act_runner"; + description = "A runner for Gitea based on act"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ca442444ac9..cf53d5a0619b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7661,6 +7661,8 @@ with pkgs; gitea = callPackage ../applications/version-management/gitea { }; + gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; + forgejo = callPackage ../applications/version-management/forgejo {}; gokart = callPackage ../development/tools/gokart { }; From 7d0299eaf38e8e145fd6429d5f224bc9e64399d6 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Wed, 15 Feb 2023 17:01:46 +0100 Subject: [PATCH 004/203] dotnet-sdk_6: 6.0.405 -> 6.0.406 Release notes: https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.14/6.0.14.md Fixes: CVE-2023-21808 --- .../compilers/dotnet/versions/6.0.nix | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 97191e734617..840822d1e0d2 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -4,171 +4,171 @@ { aspnetcore_6_0 = buildAspNetCore { inherit icu; - version = "6.0.13"; + version = "6.0.14"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2234b85-9050-4f90-9fc1-695a428167ee/8d5c3cf8f557e14c7c43965b7cef9c41/aspnetcore-runtime-6.0.13-linux-x64.tar.gz"; - sha512 = "96239951972a04021b1953581c88a3e1e64553d05278fb92729c62827f38eeecd533845d6b0d3e9ba97e9d19701b9ee8e5c02d1ee54b8c14efe54c08c45c15a0"; + url = "https://download.visualstudio.microsoft.com/download/pr/092f7e69-2e23-40b3-8f36-628d25ac7109/4995e4e141b26ea049163af84592222c/aspnetcore-runtime-6.0.14-linux-x64.tar.gz"; + sha512 = "87f22bef951d00f6d55f30855e947f37f19a44b93e52bebe568d0aa0ace01462e9e6081140a0e771712ef9f032e7ab806d122ff99247a5725ae382828e8b394b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b675e6e9-652b-42a6-a9eb-2813b90b41e0/88ba0bd190041c1db8a681bef7376ab7/aspnetcore-runtime-6.0.13-linux-arm64.tar.gz"; - sha512 = "72bb5a366fda26eb820c181dc76e43d3fa040feedcc76dadc9064b924c98e2c31c4d4f53e6cac5c325bbd3640b71adde2c605c4cb488435515049ffe9221864c"; + url = "https://download.visualstudio.microsoft.com/download/pr/10762208-8896-423a-b7f3-5084c7548ce7/620af5c42e5a4087478890294dbe39fb/aspnetcore-runtime-6.0.14-linux-arm64.tar.gz"; + sha512 = "9f60b61c7ff41d4635181f8a361796ec390041a307b131e8b29a97776bf0539ca8991159123ff4bc80e0b88d65d245e0d311c320bca29285d5499d255ff4372f"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f9bcb00-fa3c-44d8-8f9a-e4a256f20e81/bb989e5cc189e4b51585b4b78024a060/aspnetcore-runtime-6.0.13-osx-x64.tar.gz"; - sha512 = "9e3608fcc6e8d9f6139d3ec186b253f13d9027eac322b9cbf8ad8f9e72439a95abd0bffc4d63f427b76186f4386c8ffe613a9bcc44cb2448e9ec9be31a2fdfaf"; + url = "https://download.visualstudio.microsoft.com/download/pr/80906b59-d713-4d5f-ae1b-32823ff1aa0b/6ac94e7a5652c33595f393d4941c57d1/aspnetcore-runtime-6.0.14-osx-x64.tar.gz"; + sha512 = "71d1d293e6e1812bfa0f95f0acfd17d1f9cc0545dda3b70e2188c8b2214e94f4b2af2976d71691bd1636bb4c614a55cc9ca1041a56c2902266a12b3285de8dcb"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e687d28e-8121-4099-b505-f52cd856f718/1089325f2ab576f007e246ceb174e276/aspnetcore-runtime-6.0.13-osx-arm64.tar.gz"; - sha512 = "869c2cbda288ff97f470e3c79bf63f33fac30c8ae2740f849254c0f14c7e694d4dd0e3cf283965d620fe86ab8742ea00e606da0455d683fee4dddaaa15d658d1"; + url = "https://download.visualstudio.microsoft.com/download/pr/e5afea43-c8ce-4876-8dad-efb09033baab/2b49d236aa076a9934381d9f7db88738/aspnetcore-runtime-6.0.14-osx-arm64.tar.gz"; + sha512 = "8801c5e80a94d19daea21e30d3365b39124d26e106582814a1d9c06a4d6b27e9e277416acabc28f135b1c95a88625e33521902039a1f56c88520578529842c5e"; }; }; }; runtime_6_0 = buildNetRuntime { inherit icu; - version = "6.0.13"; + version = "6.0.14"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2d8697ac-0b1f-4dc8-8c1a-3748763d5c54/c493efee79b0c36c4bc8d3c5039f27c7/dotnet-runtime-6.0.13-linux-x64.tar.gz"; - sha512 = "af52e1df5e48a1b7465f8137048e9ec292104526c65e415055e5f4630a13f1d4974ae831a143dd4f17e2a813502d90e2c0aef37c6b1eb7a23d01af7ffca5400a"; + url = "https://download.visualstudio.microsoft.com/download/pr/bdd6ca22-dd29-4b4d-a9bf-535a04151a39/cd4e2e686ea044729cfa8eab80ba12a9/dotnet-runtime-6.0.14-linux-x64.tar.gz"; + sha512 = "2eb1d0a35b21c1f03c0dacce94923d77e85c929a813fa9fcc885c7b045bcb6d6755511dee58f41e001aec294ba6e2163934b451c8c66065bb0bd1723c236e470"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/79baf344-68fd-4fdf-a279-8b32116514f2/3f91babc487289f63c6f423da0a397ad/dotnet-runtime-6.0.13-linux-arm64.tar.gz"; - sha512 = "f70c8e51c06f9563f33a9a1486fba1487c7ca8f2f77a2de02d382f82bb041b6c432b9cd3a399a4a4e0188b8aa96dc4cc78e9147fa0d0c4fca7fffaec55c38903"; + url = "https://download.visualstudio.microsoft.com/download/pr/52cef887-8713-4085-a8e1-57e18d9a8c2c/85f217a96356c6cb3553883585f44625/dotnet-runtime-6.0.14-linux-arm64.tar.gz"; + sha512 = "4f559d5da668c67ed61c3e342e5ca77f2059b45bfa84f8c35b5ab4d5acb56ce75daf05713ef7b3ce299c1084fc863d5e43a4c14b1e04ce86db084b1fdd465a1c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/398dc2ef-017b-4e97-8d05-cde933894da9/bce7bf77230301570a1af839a4ce09e7/dotnet-runtime-6.0.13-osx-x64.tar.gz"; - sha512 = "39ee6b678cd6cba46acba9a616df18814e1cb4bd94f276efc5e6e87644f48ec427b155a8e31e63383b3b9281b2f7f6fa73e3be682df65984b11338c5fb12fbd9"; + url = "https://download.visualstudio.microsoft.com/download/pr/c25fd07e-9ebe-4bef-b53e-8fab7e3cfe0d/87dcc85e499fe8ec272819734822412d/dotnet-runtime-6.0.14-osx-x64.tar.gz"; + sha512 = "dc6ebb5d005c9e524ce99cb2c189d963e4399bbe8845c3c517282c601a884d62b126581e6238bbd83c173ca3fa45aeff119d6a91900780f7c4b1394f28bff803"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/98cb1adf-c95b-4ac1-82b7-54c6ffd7c669/617b0dbf1ff662e78a6eb49b5423f304/dotnet-runtime-6.0.13-osx-arm64.tar.gz"; - sha512 = "73df25201ec16156ae57569308e1d620ccc1a28c86c2485c337a3a793e00e2ed2e2eb991ddbabf6e5db310c8e492eca5f0e8297144c4e10afb5b8c323bb75390"; + url = "https://download.visualstudio.microsoft.com/download/pr/d88d581c-66c4-494d-8bea-922886d27a95/9617e9b18e88e1b02fab40c566b480bd/dotnet-runtime-6.0.14-osx-arm64.tar.gz"; + sha512 = "7c1cdab62768c293e2ba0de73400de9f4cdc061cefefcdb22030c367147f979dea241797400768370a68449270222955753d6df099236836889863915d38de7c"; }; }; }; sdk_6_0 = buildNetSdk { inherit icu; - version = "6.0.405"; + version = "6.0.406"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7f21771-9b09-4c81-883b-90dff8760c1e/fe992d38a94cc6f301c0236db3920c0a/dotnet-sdk-6.0.405-linux-x64.tar.gz"; - sha512 = "44e719c67dd06c73a8736ab63423d735850bc607adf4b8a9f4123945b13014f8144b4fb2c4cfe790d323106b7ce604388cc5d617bc153fd7820878b9187a2cd4"; + url = "https://download.visualstudio.microsoft.com/download/pr/265a56e6-bb98-4b17-948b-bf9884ee3bb3/e2a2587b9a964d155763b706dffaeb8b/dotnet-sdk-6.0.406-linux-x64.tar.gz"; + sha512 = "4553aed8455501e506ee7498a07bff56e434249406266f9fd50eb653743e8fc9c032798f75e34c2a2a2c134ce87a8f05a0288fc8f53ddc1d7a91826c36899692"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c05dfb39-64d7-42cb-8caa-d669c0509c9b/d498099b33fd336d01e28c38515cb21d/dotnet-sdk-6.0.405-linux-arm64.tar.gz"; - sha512 = "6c31666a95817a7049bd47717c9cf9ab159e94e90987f46883e272dc6dee92fb0d890f4e590faca4458cd2b3943133fb2fa58c2fc175db98d4c6c531f6b2c3c3"; + url = "https://download.visualstudio.microsoft.com/download/pr/0a569135-1e0d-4273-ab56-f732a11f6199/6fb7eb4813c1cc1a7354cb665d2389c3/dotnet-sdk-6.0.406-linux-arm64.tar.gz"; + sha512 = "7653939414bfbd06b4a218fe17c0c8e0af20f7b5e6929949a0adc23ac515a76622fa863bd6c46bbcc0128238f4c1aba6b7ff5ace331fde43e89921737a20eeee"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3c785c12-6a6b-493c-929a-9a3f3dc568ad/6290551f01f9cc31039e70771d05aeec/dotnet-sdk-6.0.405-osx-x64.tar.gz"; - sha512 = "2a6050d72b3b453e8f9fbf73e40c1fc10b148c7cf6b5e6c30dbcd322567dec1450813b514361015629ec952718a61a5f3b8d67db9f0e7a32b149fbd874511c22"; + url = "https://download.visualstudio.microsoft.com/download/pr/61c6fa00-1ebb-4faf-aaf8-30d39ca5c38e/e3d1785f5805093bcb6d778448d3611d/dotnet-sdk-6.0.406-osx-x64.tar.gz"; + sha512 = "e0249710b8dcf380179b4f57559e2f6745b855d387d4bbda861c94605763bf1f4c09293edb31e33b6271395c0211aed9b2b83f9cf5cc1831ccb1bc34b45e58c0"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9ef6ade4-4d92-4243-9e26-748a7c75c490/ef308e5e0bad95bc604fff5c5defd42a/dotnet-sdk-6.0.405-osx-arm64.tar.gz"; - sha512 = "fb1a66189cf54b14d1176ca9178673bef55aebcf16ce7616ba6b2d988b3152be7ad6d230d8369fd3a503f46d1f22d9074da8a48837118648821f7160f1c5533f"; + url = "https://download.visualstudio.microsoft.com/download/pr/bd1b3132-b61a-47cf-bacc-130e31003021/002152a1050fbc9eb723bd741453c9d9/dotnet-sdk-6.0.406-osx-arm64.tar.gz"; + sha512 = "1eb56eaafaef3b81593169374e44aa19e16606ec14e24dc2225f9e79466f08f904be052f24a6d2ee231b2f89473922c4386e3f0525570356817b90f9990b7a87"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.13"; sha256 = "0pld39zgx7rwcr0vcfrr6nkhjqjy8nzy74ambxlfavhiz7jjlz0f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.13"; sha256 = "0sllmnnqzczvqzdwgld8s0jz49k9kzp6qh1a2g98dw8va9kkz8l3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.13"; sha256 = "1r9v95sjjslhwvgq9jg6szkqv13m5k15yk8d98njwxjz75y8hhq0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.13"; sha256 = "1zkbckl43qv97jrc2lpnab8xgxdw7i27r18l6ai544rfjbf7ympg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.13"; sha256 = "0jmhv6nsx5fxg665mjqynk5v3avrlnxmzpf2m17382y0sdg3vhdg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.13"; sha256 = "11hqmm9hf4h14vcx12iz5zclamlapsjamibdj4fmdgx9gj6lmmzr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.13"; sha256 = "0rfpd0052a4lkpd3fqpszq6cch13dwkmwgg0ljc4x7y0wq8ddqrf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.13"; sha256 = "18zm0sb9yipnkm00z1q0v3dfrgidj03jswxx132kvwfryy2dlll3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.13"; sha256 = "01zakffrqd75vkj590zmcr0c4bm8gz1d8g3czsw9pm706z2klsv7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.13"; sha256 = "0sq1np4y9k651cl47sp22nj1vc3qyx329jr89q4z3idvic5ivbcs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.13"; sha256 = "0q2irgcpyw5yh3zrlljv83j96h08ry26wswz5xaavhh16w0g2i1q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.13"; sha256 = "0cj9bxk9xzcbvy9rk3r6xwh9cywx80ln05px7hpdxs40qhjd1vy4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.13"; sha256 = "1gh7abjpsjq5067msbixgmck1c6hsdc7rzy0kkbg16j7yzs9219s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.13"; sha256 = "0k035b1cmw1bk4nmdcjkn5rv6s63l6jcsns016i6j8nxsdx5xan7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.13"; sha256 = "0qdyvzqajs4js03gs9d4r9amqz50lk99r3hz39h053506dzdm126"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.13"; sha256 = "0asqf9j5hdgs2k5yvvx3mla80l7vi68x55jzd8vyw9wcqxh07r5q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.13"; sha256 = "0kg8sxi7nvp1wmgidv2a951pjranc38hdwi51kn96grqwhnxqr79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.13"; sha256 = "0nfb559qalhr6k2d9bp0s2nj8rn09yvl1sf3lvdiallspawj5rmz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.13"; sha256 = "0rjv4mps6w4mkp4nrrj0jmgy6ykdgwrxrg2cp3zb2mahxz7m8f1z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.13"; sha256 = "0n78az6knnvrvbx3myp59vc25nmw34mzkhl9ayqaq25khwxicjl8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.13"; sha256 = "0i36nx014hn1945sn1s7l9kfbqn5qdy16qrhy36ixv8688yydmsm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.13"; sha256 = "1sq235gb213sal14g30x83hg4iryf4iid4412pwbmj9q0bygaf1f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.13"; sha256 = "09ngispg6j04sz5rlbhh28vyk90qyb8ix3zwpvqapn8clgpq29s5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.13"; sha256 = "02hfv113m7ig0iy1354y7h9hs8kqr0addsiplg31ibyifazwr1zg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.13"; sha256 = "1wcb1gik3njsrs77r575f893ik8mlp8q5ljg7bqyay7pi09rbkcb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.13"; sha256 = "0k543qhrf83r9bpanykp49lwkcwkmkz891c177g511vdygid7iyn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1pv1pqr5rqlzsc73l6gn7wk6gjcrnsig50wx18vxxz9zck9nc6jn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1r0nfv6f15xqbyjyz5b6j8lhg2645j6718d4q8jxv8f0h5yq0ya2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0c7s3y86d9h29bmhpb1y89sw3n9bc43vjh65bjn46kfqwrf22xw4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1rgig3239y7zzn1gjk8ngzwi140d1w7cwahlrn8zqq6dz8df7vad"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1lvnyhidw4qp0rv1p1l8lwvkjak7pv10agclq7pgybhf7jnsrlk3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0rzzpai1d3mvlq1mvpsc3qrwqd5n52jq4dbcmyp422i14q96ghwf"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1yq9faixq36d2qcnc3x79yvnjnrvdi51f6ah71515rcs83xgv79d"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1cjxlydhv836gfyh21sb3bn579pf7p4fzcgh3fhanqry0ap7b63r"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1kdlw21rna5lzvgqh47zcpgzprarjbf20f101inx8j51zxa06xqk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1cixlspmka8g94ahmhyqvnms77cmijc6hx71ifrlhki2704cx909"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1l1rff9hwxv8riz3n1amry5q4szgbkag7wj27l8p97773imy49sz"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "079ayh9kz89sjg691kvbaxq4kyrz2b0g87nw05s4453xi9ng6fb8"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1xd7cllg3q535fvlihcs3n4rwymg012p645m0fnr5n4ghs31jsab"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1l7ca5fg6033cikpxhdnmhchnzs94aklqis03403v8jz35llpk8z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "11rwb65dbn1n0m2m47vhp30fswram419lif2c8s6z3vzpiryvmrs"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "13fyyk2izl15x55dyivl70z80bmhg1nd1nyb99wl5vhws1xjpwvs"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1lzh157hhiwgikd6ji99by6y3hvmfjpim94xbsp6bk8p2gxkbk04"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1wgmy41ahxvg2jmvhg8pca77zr3lc814g9kp4d2krm5670r1lq6s"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "170hmj0m09rpklbknafmn52qxjbggk806c50910nhjib5zkmmkk1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "12dp927q5rwp18n2wpf87mmizfbxmsv3f8yf79qi4713yp3xz8b5"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0v1x8d238kzz6p1y8gci67i1jykvy5clzpvpzjr8xfyrk2fddm27"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1pyb2p895kdwjbwqn8krjj311x1sgzh10vr8dkk1yp3m1yndrxcj"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "02pba4c8s4bdd345ay1cdw0hmfy3zpgqm9xsa1a1ky9zbycf0r27"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0dw6k7ck92zc09kkvx3lp7ncnq9c32hzif56g0x33l6ylfwknnax"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1157vqmcixmspwfgkyg3xsv3jilv396j7rjg7irwny63h0pwagcz"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "03iciy6fdnx48fff176h12l5zb8i3akhm5aqahr48aqaxw1w4720"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1s0m2jxk6h9mmisiafjviq3bg029z6px1rrw42r5pmzzxxn3yidv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0hd7zycvdqmyi26lnvq01cgyl77r3nsn50xcmi1s5xxi27snzj63"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1qjkdwiycvf7v254719lrwb98wgbzvv6hf6983ysj4y34mxp66fb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1py77bivdbf58csarc5hh2yicpdpvmjl42gpi9hmm1dxfsp2fc5b"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1gx01w5hcw839m8dwzxag5v0c28zjcr59mg1lkza7qq1cxfg46kq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "04m52vyh1cwn2vyiymjw8ll04cmbgw4rnwii6qgvym2w7ylzk5qm"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "03xfdv15h21abpnccmqkcah514pi3aywml6pc7yks8ci8y9hsh1p"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0vf1b3i2rixxvlam47b86j204vnc9dlg046k3i79b2snhx2xcqxg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1nzah18j192sbss06rvnsvn5a29s0hwhx1h6d1rnsbdq9rj75lsz"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0pxflhnq5l4kpwbj5vsljz5sjsch80rrijl18740x3wbzxxpafnf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0xsd38czs1nyas79qdssgq5cmd5xiidpqrjx1rijp5c94yq55pxi"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0sqhxkba7qmyqqprwsa297fn5v012v8d35nvvc5qh5f1l498hi95"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0cw9yaq2l4nbz6pbnrh8bkpmgrzkrk3h9f4k506znwk54mjjfal2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1g35gplkxr1hlbflifc4fj4b3i192cqbfhv8xlwz23qdn67fqyra"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "091ycfgmlawiafaw915h716kmdrrprl12x87rcfvvsnps8r87p0z"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1nn0igy0a9l0zz1zdjfrqp41i1j43gx60swvycxccn68c0w0rx2h"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1cqddls75px9fnwjirrzpbpa5hgvsh81z3q6d6lpgm3ascw9v3sq"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1l9k4ksy19db950875qfwj884z2gqjc7wbq3wld58cyyrbw28g0p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.13"; sha256 = "0gclz5wf4ci3y5qqyibigngikvwwd1v4hmw8r2k8gjq9g0qxmrnp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.13"; sha256 = "09y0ly3akvm5jkkbn597pl958xmhsmx1fs81pmadis504jsny562"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.13"; sha256 = "0a3wnm499iy1jjsyxg51k1sg7b8zb6w7bdaw2j46lk5vcxcz7rlz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.13"; sha256 = "0914qs968m7xqp0wdj1icfqcnwh2zabmkiprw3z22vc7rmjm0v0n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.13"; sha256 = "1d52cacjdlf6dhwalj5bn2vqi8565xd40qpcj6fjxv83a1l80ys4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.13"; sha256 = "1klwr4lykmfcppk2hb2lvx520jxx37aq9xdn9561kaydwis4wj9f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.13"; sha256 = "0zfdj4cgzjadbmm7jxfhfkz8ccf21zg517lxzi13bjmmimz3lap9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.13"; sha256 = "1zpif71jwd2pr2xcwwywyzz3wfkbp3y71rkfjmgk7zhmm0vjk872"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.13"; sha256 = "0bi2xw5v85zbk5nh466af1ppbl3g3pa1z5g3fn25nmcbimk51ki9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.13"; sha256 = "0ipqwxavmpkmg339scydgh212wd0iik0p04zfv2i53qc3j9ap1ws"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.13"; sha256 = "1zchfdhgh13y90yrki5537ik82s7rvcrzyf2y0cfdfw03m7f2yf9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.13"; sha256 = "1ndhp84v7l5ysi66qpqr18qddzvcg119id9d8fdd66fnr2hg207q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.13"; sha256 = "1qx4r2wmryyz7l3r55rhqv4nbjasn74cj0gyh547y9g1fbgh0ib7"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0jwlkn81larvl41i2hdayy8fx2s1b6zz9ckhqi0y1ixs0xrfh3p4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "07mdpz2cnyfxcp24adnfx2bzwwxwf9xpx4d87c24lghg1lfbwwca"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "14vaay4mp1rml2jxm9z9qnfmmsiw1673bid7xpmx8xrpxkvbrmpz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1cmmzfxnlnz4py738lfz8kdqrcgvyx4cyhbahk60qrynhsfz87yl"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1p9hnilvkbc7a0mppdmgws00qrhnh76z53j86jps8gsl7d4fm24k"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1gqsfxbm87qp2dcws8xik18vg66bdjb3s16kp83c3yxa2csnah9w"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0ibdldj4xzfw845r1bix5nahpck547cp4yb4qazhq6a86944mi53"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0zzkkwjll40fchaqfg2sy7p40acw7r54539qqanzbl485q61vxiq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.14"; sha256 = "0la135plb47d1j2x4di3r1b01aysnlpmxbjdpfpab18yc04gqpa9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.14"; sha256 = "16qzgzgr4b0pl471mvdd9kzaw77hzgrsqmlj4ry7gq0vcn3vpx1p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.14"; sha256 = "0qr7xjy08ygz1zw5vn9bqn3ij5dlmf6hvbzm4jsjszfqpna63i9n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.14"; sha256 = "1dnqyhkx7i850as4nswjmahc2gv7xblqr57rzc019d14gs9ghaf4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.14"; sha256 = "0jq2sk2mmgwxm0c3f6yls2swksmpqdjrr9s3i65g0r001f475dds"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.14"; sha256 = "1xc28c1qh5dmkilfrw1q89ghi5awr505p6dc28qbi5nknkvimbb1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.14"; sha256 = "16ymdi679vj9inpz5lbsb2wiyw3dkflawhl3aj0lpfgb1d7kb5sf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.14"; sha256 = "089dlyq9fbaavicxd79iwq5h1xghn2a2x5jjaicy9zbapp5wng7f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.14"; sha256 = "0z2642jf4sq82mxxp0p9rf74l2qs3qqszq6f10khv1n72aafdaad"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.14"; sha256 = "16fqif9v4wifq5mqkd8vir2j6dsfp14rgv290z8msps6cqx63n5m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.14"; sha256 = "0q43lxc5wdw5vaypzc068yx8q1s85sj3yw1lcdjr0ps7nzzv4laa"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.14"; sha256 = "05dz56dv8vk07nbpnadarks2ms1sk8a463r7s5a1va8wm7a6rcir"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.14"; sha256 = "0sgxgh84hdkq56vylvkpbas8qbfzzqwg2np04m6fz6hqagmnqv0z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.14"; sha256 = "0ki9yrqk7763b6wxdxy91l8r56gyp63k5kxbjnfidlb1nj84i9d3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.14"; sha256 = "04pnpxxgisy1zqwc0yx6blsbn6v9dyx6hklpf97702xkvc3rnp8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.14"; sha256 = "1qkx9i8l177r82ywyyxg6nzzz9g8mpjgmis34ix8svr7swf9jl6k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.14"; sha256 = "16v30vgmn0frzm8xwn2inkiwa51jhyn5wlnpw5mplfzfrm5m1gmd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.14"; sha256 = "1mmmv3jlf99qkp2n79v2x20x0c6h7j8vp24qnh3shdcqxmj3b6w7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.14"; sha256 = "04yp0fijjz5l2fqcw7lnmvf8lmgnzwhv1353lnr170cxjn356fhx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.14"; sha256 = "0gg23k87ln59adbig8yi2i84cxshia61wwjpp9fk8i7fb80n8mgd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.14"; sha256 = "1dpd3kib06ih9j59vavz1f40wm2qb57zj1y0j24b5lilwpki9295"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.14"; sha256 = "083z3gf7ngchkp64gm9yjq94434gb8iz2m7pbimblfgp3gjpfnvg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.14"; sha256 = "0sb97sf4qg5j7c2g9vr1c0fffghfwqpbirxl2x7ynrrj451apl2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.14"; sha256 = "1jiji4076r8xd3g1wx3h4c8ghsdll9g9qxff717xv4wy7m0vnk4m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.14"; sha256 = "0z73vf33fj4qya582mzha24c98qhg69y6qkcvbg5zs03h7333zyz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.14"; sha256 = "0kmpsyggqr2m5m2cxb4sszr9jqd0wlvvdiz83270fss5v4l0hm5a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.14"; sha256 = "0dn23cddij0w83wa7rlgq56n4jxbjkd2svimix2lzj9znpdd1i49"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.14"; sha256 = "0jq6xa6pj6fa6sbims848a2gz827az8rks644ml59rj1iylhrr38"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.14"; sha256 = "04xlq5yhbm2i68zzjdgr7y64c91kwyg8hysn1wglijkmrq9w93hb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.14"; sha256 = "1arw27bfrhxpqaydcqa7mh5viqg2kkhyj92lspm6xgjhz5fncjnv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.14"; sha256 = "1ahs36dw4wz4rbl0sgmnpwiny19h31mb7n0rilfhn61xpyi90xai"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.14"; sha256 = "15flqfm1lmn0h527nh3vwwgmlan5if0y29a58lfk45ck3nsvjp9b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.14"; sha256 = "17j4r0qsm0s8kpj0i538s0w1zn6jlzmgkvdczbddik1cfzl0mgi8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "1hh6mbb25agxkbv0n843jnvxjppq4gp6a3av1gjak7a8k9105k32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "1q7ssasrzvdjw4sr41m8g9njm9z1r3y5vg65jzan6ahldx315x6g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "0wqjnzrz0mdpd90naxhbbqws104rlzb0wdg5zk0wpm20y895zqnr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "07qhxawl2rxks0b1iyzhyd201hf7iaf1vaw9k2h5zp9r1pyq743m"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0q92pv3x83i5h3wd8br8k8gbdcbsmdzdpys1xx5ms383x6197lkc"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "1q41lxiqpmyjb288lpjxa947d2yk03h07grn8w51560yx3h65wsh"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1dn6mikdwshn7vqvwqsi0p67pw0ssn487k6cxsqm9nsqm54cd5q4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "03iyj2nlc8a1iw0ablbmmj13vxc5al9r85isg4g014fywx3hysbk"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "1w6454q0q43l2r2qffacxr60m3cl913nxmzi7hwq91pnb7s0rv2f"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0aaj13rkxgi2544gwrm5h15wrpp1ik3kvpd2zb88mplcknyhhljg"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1sqsq4bmwg832g63k8k28c6nrvln4sparph7785k7hz0xw44nvb6"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "07dr8zxx05fvxljx5dn71nalq6nvkabf74bwsqy82ibirx5g4adv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "023c10649nvxlmzb4w4im1r33198dx0kk4rmr4psc1gw1wismz58"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "01872qqfkw2xvh3ngvn3nx80pjkdqdgyq623ippw0wm04kmpqb81"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1x0z471pjl65p3hrxmv5wbzssp35vki351ryy123z421yww9ackb"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "08p40wk03fzy8dg91psliymzrbl3ypj5d8fkz5rsvxap2dbihi3n"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0r2hsb16bwnj996hxs64rv2dpwcs20isk2gkzf69061sh76m80hp"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0a2kz1cm8l7f12n8dyjyd42kii6hg3yp1h41670lwfq8as5mixr4"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1l8cfpm6ypx75l0sm3v11wqq5mbpyji2hx2q4549m90319lpx19h"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "1srpr3yhjqa81zpimk12jsh0979zglxfhz4jm7jiqf6bmfy3s79i"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "15sjik3krwnypc8vlb3vyi10kgzhvkvrw9lhzl36hbvmzsz65ah8"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "1yxp23xb5md39xz6xh0d0jpy6nyrbwkijsh9ii6vnfdl0jl9wj9p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1m8mzcqxndich8z0b4zr3d5nx5n9pxpmi4bv36sv6cvnanikym84"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "0s4v3qnpwm17jp97bkx6qya28jb2vj6z86kg6scrb7r3szw49l00"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0rq210qyzdyjqn6kjpdw28wcidi4kb14f3wmjb21491p1sqkdx9r"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0zbsgh9qhn1asmqs3abaxkld2isj9wp3yzcrmx9sfi8sdfwjf8dz"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "0zhl1rxx4l1hwfd829ys231hxh6w5g2q1zi7rbpk980cbrvm8jmg"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "1g8s3v0md0wvqjsmlw9zbz028bm03l3xmqc21v9fys19gfdrsr5z"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0byix4d873k8v6c0xv3daxdb328g7bj0w9qfzmdwn5y0ps2xj9sd"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "1zv8mqd2kmzildakwcsqvvp1ry11xj9cy5fxrjn52sc7hvcvjzdp"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "0hmpnki3hsgfqmq3vg4jcasx48c3zbif2dm4w8hqh2r6jx83m1n1"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "0wjmq056d9lq89gcprj6bbm7ywdw6ssgnp3mjfm1mmp4r0jk7a2z"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "1884rz8gsa0ck5hrm9dqmir60kzcv1x47mamwl4dcv8ncrwdz61d"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "1nxcc3j2d0s19ys064nvbif07rsi56gfbrc1giiw2l7b2z19zmn4"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "0xx0c6s0v3fylpz9wphd72ay2a09lpnlgswbhjiyb8phymw7jgrv"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "0nn7qmwyh6w5fjhl9nqibvn6h8qjdf7pk1spnmrlll1y48s2wzjw"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0dp7cgqry8dqpzl2zwj63b7218p0hinhlqz9qaiqzh9c7c2wk121"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0r5hnv4zck79ml3gxxzn3hk0gpqyzw0f0aqw4wfhgjjbisa6ir4l"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "168jhx2dlj1j95d37d6b4blkwynddbafs4n26cf26x1ibjysr6g5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "0z8scys0rjba5wgmjq8024r380gcwqr0xcggzi6qm20vxhbfix3k"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "19s13k0v9mb17iyr35i0d75sscdrrgbvcv36rcpygpazy9ydmgsa"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "041kxxa495gn21nfichdi8vsyhyhfy64fm0jzcr9l5z87m4ywf66"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "100hrhb7mgffxm3wc8gcyzpgp6bsz7gjylagpiwazld14yb8c4mq"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "1vzk9pzhqsww427zgcax0bvs2banhs2wgaxc9yn18y6f2fq8whl8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.14"; sha256 = "1k7iss51zfxj17sbxkqfky7f4k63a931v0qzgrmbljwvjhk6xhfz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.14"; sha256 = "19aar4mxraih1vcshnl2sl6y536v4m9a3k7ymnwrl6yhnmmhn3sa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.14"; sha256 = "0rifg8ibxq2h8z98hrw9xlng7a7zvfzfr5fizgs89brr2ng7s898"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.14"; sha256 = "1hiaanggpc5xk08c29mh3nfdj3il38jd8wr0xiv0r73ld6nfbfxz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.14"; sha256 = "1lpngik3n1knv10lm7h3y7yac5pcbq1if8bim2vvvkjmiqxxybnw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.14"; sha256 = "1047xhl0dxc1b9rrzv7q353v3nb4q6r140ks93gdag24fi0m9qin"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.14"; sha256 = "0lnlmhwff480idav33yss0ii6vlgfjzmnz5h4kx264h48c6jr370"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.14"; sha256 = "1gp6ws83zh3nznrlfr9gh3xnjj9wj2m452y922vkfqhwx9h2w1fy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.14"; sha256 = "0xqmpz5hxdaqzvfbd5yicgsfsql7h84jjqnsdg47cplk2vrd91qf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.14"; sha256 = "0av7q4kbqdkzksh24dmjbfalah6w1mmmshqmpwn78q4xhkyldawi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.14"; sha256 = "0vqrsq8dan5m5jvsd666ri3v8pyxkl300b90jh3k6l0yn2rhwm42"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.14"; sha256 = "1m6lmadlsq878k6cbz4slv0hvng3h04wvj4c87fybywa2fvk0ykn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.14"; sha256 = "151hy2gharkdq6xvzknac55rgn7vd01v61r1by4w1yascw7ppckk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.14"; sha256 = "106nr57pkwp5k4sjv1313wci5fmgajcpkvn1q2sbpglf8bv2rm6p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "0sii3jvgkgc3w9s9xdn8gjylwdx1bqvi5v92svc7br1l4jrd8yg8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0imi5f11zhm548392j44gdw0i7b2yn1k5yqnrfnhgbrfd6mf4dcw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "0d70ndlwhc60dai1f731miz7s1408dbw8jv8mxdza0z9b8wkww92"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "1j2ydjxngbm8rdpvh34w7qsa54sa0dbqyq5rjxx5kgq85qg1ddv2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.14"; sha256 = "1bfgpzjpgl5v3av2wlqmxj78yap47gz92lv0zfwvmn3phghhcn5x"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.14"; sha256 = "0nyv8w6m383mw0bnqik9avn1n9f321sy9l6iy1ygv8f6mk85gsim"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.14"; sha256 = "1cf587x7prxbxadv9jl32dz45dp9g5dkrxanq382f7jj96zxwh0z"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.14"; sha256 = "1v8rdvgbh0bq495h4dfjgddls9aa4qa31xzcbx5pnsi0j9b3cf1j"; }) ]; }; } From 9b54e8abdef0ae7389c6fefa7ff2d27461950169 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Fri, 17 Feb 2023 06:52:01 +0100 Subject: [PATCH 005/203] python3Packages.debugpy: lldb support --- .../python-modules/debugpy/default.nix | 19 +++++++++++++------ .../debugpy/hardcode-lldb.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/debugpy/hardcode-lldb.patch diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index c45d6621398f..4035cc52328e 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -13,6 +13,7 @@ , pytest-xdist , pytestCheckHook , requests +, llvmPackages }: buildPythonPackage rec { @@ -30,12 +31,6 @@ buildPythonPackage rec { }; patches = [ - # Hard code GDB path (used to attach to process) - (substituteAll { - src = ./hardcode-gdb.patch; - inherit gdb; - }) - # Use nixpkgs version instead of versioneer (substituteAll { src = ./hardcode-version.patch; @@ -51,6 +46,18 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + ] ++ lib.optionals stdenv.isLinux [ + # Hard code GDB path (used to attach to process) + (substituteAll { + src = ./hardcode-gdb.patch; + inherit gdb; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Hard code LLDB path (used to attach to process) + (substituteAll { + src = ./hardcode-lldb.patch; + inherit (llvmPackages) lldb; + }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch new file mode 100644 index 000000000000..43ededa083cf --- /dev/null +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -0,0 +1,13 @@ +diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +index ed43e370..b28ab453 100644 +--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py ++++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d + is_debug = 0 + # Note that the space in the beginning of each line in the multi-line is important! + cmd = [ +- 'lldb', ++ '@lldb@/bin/lldb', + '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. + # '--attach-pid', + # str(pid), From 7a67b4c28ba8a303dc0ec20bddeaa077df6da165 Mon Sep 17 00:00:00 2001 From: Boey Maun Suang Date: Sun, 19 Feb 2023 14:37:11 +1100 Subject: [PATCH 006/203] fftwQuad: Fix build on Darwin by forcing gcc --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab1d60a1ad31..a1427aa3483a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19618,7 +19618,11 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; - fftwQuad = fftw.override { precision = "quad-precision"; }; + # Need gcc >= 4.6.0 to build with FFTW with quad precision, but Darwin defaults to Clang + fftwQuad = fftw.override { + precision = "quad-precision"; + stdenv = gccStdenv; + }; fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; From a4f63a6e772af8a4062800ea616d4c8b6148dc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 21 Feb 2023 21:06:45 +0100 Subject: [PATCH 007/203] nixos/no-x-libs: hide qt5's self --- nixos/modules/config/no-x-libs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index eb1e41a3d8dc..763c2038f6d4 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -61,9 +61,9 @@ with lib; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); - qt5 = super.qt5.overrideScope' (self': super': { + qt5 = super.qt5.overrideScope' (const (super': { qtbase = super'.qtbase.override { withGtk3 = false; }; - }); + })); stoken = super.stoken.override { withGTK3 = false; }; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 util-linux = super.util-linux.override { translateManpages = false; }; From e52a73d184eafbd7406e4b3540a766ad35751c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Feb 2023 21:05:58 +0100 Subject: [PATCH 008/203] obs-hyperion: 1.0.1 -> 1.0.2 https://github.com/hyperion-project/hyperion-obs-plugin/releases/tag/1.0.2 --- .../obs-studio/plugins/obs-hyperion/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index 8a3af27c9075..c92bdd9346c8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -3,35 +3,28 @@ stdenv.mkDerivation rec { pname = "obs-hyperion"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hyperion-project"; repo = "hyperion-obs-plugin"; rev = version; - sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4="; + sha256 = "sha256-UAfjafoZhhhHRSo+eUBLhHaCmn2GYFcYyRb9wHIp/9I="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ obs-studio libGL qtbase ]; + nativeBuildInputs = [ cmake flatbuffers pkg-config ]; + buildInputs = [ obs-studio flatbuffers libGL qtbase ]; dontWrapQtApps = true; cmakeFlags = [ "-DOBS_SOURCE=${obs-studio.src}" "-DGLOBAL_INSTALLATION=ON" + "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" ]; preConfigure = '' - # https://github.com/hyperion-project/hyperion-obs-plugin/issues/7 rm -rf external/flatbuffers - cp -r ${flatbuffers.src} external/flatbuffers - chmod -R a+w external - ''; - - postInstall = '' - # Remove flatbuffers install - rm -rf $out/bin $out/lib/{libflatbuffers.a,cmake,pkgconfig} $out/include ''; meta = with lib; { From 4e9350b673f59f47ad0eeffe5d4981a6e67e455b Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 25 Feb 2023 14:43:44 +0100 Subject: [PATCH 009/203] BeatSaberModManager: 0.0.4 -> 0.0.5 --- pkgs/games/BeatSaberModManager/default.nix | 4 +- pkgs/games/BeatSaberModManager/deps.nix | 102 +++++++++------------ 2 files changed, 46 insertions(+), 60 deletions(-) diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index 614733e549a8..a0a5a5accca2 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "BeatSaberModManager"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "affederaffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XeyOWg4Wa4hiorLPnbnBrLSjnxheAGGMPTqBleulDGw="; + sha256 = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; fetchSubmodules = true; # It vendors BSIPA-Linux }; diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index e36521e19149..74e4c7e77096 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -2,76 +2,63 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview4"; sha256 = "0s2ijp8fbny04c62gy8acg4n769hzj1pl9jml35bqrzk4m29jxs2"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview4"; sha256 = "0dbbigfg5qqqgi16fglsqphg63ihl3hhpfw9f85ypvb5dfjimnq0"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview4"; sha256 = "10c1w7slmlkn1sjyk2y8awzlkd9rr35zpvwnvsv0i235zbqc3a07"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview4"; sha256 = "1ccnfi429hah9qsl6qimkhlz6j29zjjpm77di14wnlr8x3nh19z0"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview4"; sha256 = "1x8d46p9wxwrfhn4xcgx64x5y9dw08a7v54w8ms9ba58zr01bm74"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview4"; sha256 = "1ivrh736xxn3j1b64ni0wy7ydp22sbl2yv5kdircxknhb7bhpigd"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.0-preview4"; sha256 = "16p0va19f83ccq493vxa8rvdgy71jsgijymb078bagk5nsm2alzs"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview4"; sha256 = "0ia7zx7chgchh4piqp400cdpj14jndh313yh2z9nspqxq30xll46"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-preview4"; sha256 = "0qrv6ff3lgsqa57q5nrsmfzfp3w2x6d536xi3hq18616zjv7k1x4"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview4"; sha256 = "1g8j7ll3q9k7v0j54j42dy1mkzkgs9rlyia0gjg3b7z5ilk0rbiz"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview4"; sha256 = "011flxwy9rnjlvwb1nvn9qlj0nfsr3f4gmvlzkg7abhwh7hzv3vi"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview4"; sha256 = "07lkj6z4fy41i6fbnrzkb22z63czspcnfp5lz25qkvys37vkmhdm"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview4"; sha256 = "02cn71h91fxvw9knni2dxlhpf9ihdkq3r0mylvr8z7r493saiqkm"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview4"; sha256 = "1fqj7jv22ki9pim55hav8qfr01vhjkzdp5rdi1p22xxmgrxws5ws"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview4"; sha256 = "0lmw94qp4y05xzxx6flzgsv4cw6mckcn8ig6mm8hdqpqqsiihc1n"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0bcc3h5hxy8mfkgxn07vnnq2rn8whn2gx3d67lmlpm01r16rndyc"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia/11.0.999-cibuild0030643-beta/avalonia.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.999-cibuild0030643-beta"; sha256 = "06n0c8dyh1q4a97nm31vyr8b6jzcq8nvvligwzp4xaxdwhkphg2x"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.colorpicker/11.0.999-cibuild0030643-beta/avalonia.controls.colorpicker.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1vfkbjy9fl24i6skn02wgr047579x4a1liiw79qwbkx7mgvw9pvn"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.datagrid/11.0.999-cibuild0030643-beta/avalonia.controls.datagrid.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0nh6hdw07hwq92n0m1sx7qxwp4ccqash5f8sivj3lflx786s9i5f"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.desktop/11.0.999-cibuild0030643-beta/avalonia.desktop.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0ddcq2w54cywpzcwb9av54zkblvpnp0g7xs4dsw6s39wrxyh8spw"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.diagnostics/11.0.999-cibuild0030643-beta/avalonia.diagnostics.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1wshqaikd1b2a91yixgsnvl8i1arhmlviavjywi67a2w1xv98das"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.freedesktop/11.0.999-cibuild0030643-beta/avalonia.freedesktop.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.999-cibuild0030643-beta"; sha256 = "10pp6lh5hlcfs3xrqg1rv7xkckkpnbvdvx0ndfqgpfqxyv99jdhd"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.native/11.0.999-cibuild0030643-beta/avalonia.native.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1pl35gkpc36hydd350ch6iilyfngbg8wxw3vkx5a971761lqrgbz"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.reactiveui/11.0.999-cibuild0030643-beta/avalonia.reactiveui.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.999-cibuild0030643-beta"; sha256 = "179l5w9j2hy683fhxi25q98sfgz03l48qj8mgg1asjjpqcbybgh2"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.remote.protocol/11.0.999-cibuild0030643-beta/avalonia.remote.protocol.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0fvc83phdjxhfg3pndr7j178i2km5wjbm1xiplh4bvg6pwa2xypz"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.skia/11.0.999-cibuild0030643-beta/avalonia.skia.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1ch7v19xpg4nkq2aqap82sd237735g5nrp06h1i0m83kks4xz6as"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.fluent/11.0.999-cibuild0030643-beta/avalonia.themes.fluent.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0aify5nh31bf347k4s4d5c36mhh6yc6q4l6araq3fxb05v4pb5c0"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.simple/11.0.999-cibuild0030643-beta/avalonia.themes.simple.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1b86hlr25w8i3hdxxxb9qrbaf91d56vmiwm5ikywglk28c9x8zyq"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.win32/11.0.999-cibuild0030643-beta/avalonia.win32.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.999-cibuild0030643-beta"; sha256 = "15pcbv0hw099080s2ndi7cqm3gnyzcvva3jgp8z33g4h8qaiiyvn"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.x11/11.0.999-cibuild0030643-beta/avalonia.x11.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Devlooped.SponsorLink"; version = "0.9.6"; sha256 = "0d6sdy4312fb9g7l3q9x78vmw4ngrzf2f961778h4zqga8nc23rm"; }) (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.1.46"; sha256 = "0w7b17xh88rqzjjsy66gg2kfaqmg7sdmx70sharkqb7qh3pih87m"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.1.46"; sha256 = "0lgx7776ivmz0gr0whyacxpnlp6w5b80mj012a28mm79r1qxpf60"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.53"; sha256 = "0y34dvc5z6ash2cpp69mclb3wr52fd8khsmm61sv7lkql0pg03ki"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.9.112"; sha256 = "1i10xr5zm9vapfzvimim9gn2pm9vgnsnb44sq3b0162r0k572rrp"; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.0.1"; sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.1-dev-00947"; sha256 = "153vi3xjy65ixfr8nfs59n0bmgj0jxfyydmhjs8h3apr9f29lbh4"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1"; sha256 = "0jpn0x1rfj3dzjfg972icml5swvzvr368nip269qq0a2z4xy0lhx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1"; sha256 = "19f8f0m3d6xds2dggazafdk4i3injaxpx7ahg73nq8zj03qbg7fp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1"; sha256 = "1img6chwxprz6bqjyi43walgb3xccnzgfxs29xwcvkkmc8w6pvdp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1"; sha256 = "0bvpwfdji8wb5f16hfzc62k265p21r172dqpibdx1gjd6w6phxrs"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1"; sha256 = "1x0ds2nnbqn44kfrfbvj055nihhmzlqm5fhdka3mgbj821fpy629"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) (fetchNuGet { pname = "StrongInject"; version = "1.4.5-ci-20220524-023137"; sha256 = "1ksiv5rs22j193sxwjvdc4vhblikka9z8hhs705f4mi1r4q0x1ha"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -82,17 +69,15 @@ (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) @@ -100,22 +85,23 @@ (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.0.10"; sha256 = "1hvq0c9d6zmn1q6lyvz4hcaiypf1d65akhx70mv2plysbgvrcm95"; }) - (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.0.10"; sha256 = "112grp0xxkzfkhyxb1hbh4qs2d9qrkasv42himdkqjk0i0fg1ag0"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) - (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) + (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.2.9"; sha256 = "1pilnin62fb2frmybl3n0xvxn1xpr8bymbzialspl6cbw2xvag97"; }) + (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.2.9"; sha256 = "0skk9sk8lc4dn9rmykz337n5apg76if9l327q7787fabisr9rbw7"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.13.0"; sha256 = "1r5lc8x3iq795l7vnyzs3shvpqz92fldkayvkqmrfjxnqmy0w3kg"; }) + (fetchNuGet { pname = "Tmds.DBus.SourceGenerator"; version = "0.0.2"; sha256 = "03q0fja30216npb3hd39iapr9psriz2k35lymaf4921195y40fiq"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; }) ] From b4ff692b80a031fb0c9715208a4aca4398430fd9 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 14 Jan 2023 19:24:41 +0200 Subject: [PATCH 010/203] orchis-theme: 2022-10-19 -> 2023-02-26 --- pkgs/data/themes/orchis-theme/default.nix | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 840072295aa7..bb196b26fb57 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -6,29 +6,33 @@ , gtk-engine-murrine , sassc , border-radius ? null # Suggested: 2 < value < 16 -, tweaks ? [ ] # can be "solid" "compact" "black" "primary" +, tweaks ? [ ] # can be "solid" "compact" "black" "primary" "macos" "submenu" "nord|dracula" , withWallpapers ? false }: let - validTweaks = [ "solid" "compact" "black" "primary" ]; - unknownTweaks = lib.subtractLists validTweaks tweaks; + pname = "orchis-theme"; + + validTweaks = [ "solid" "compact" "black" "primary" "macos" "submenu" "nord" "dracula" ]; + + nordXorDracula = with builtins; lib.assertMsg (!(elem "nord" tweaks) || !(elem "dracula" tweaks)) '' + ${pname}: dracula and nord cannot be mixed. Tweaks ${toString tweaks} + ''; in -assert lib.assertMsg (unknownTweaks == [ ]) '' - You entered wrong tweaks: ${toString unknownTweaks} - Valid tweaks are: ${toString validTweaks} -''; + +assert nordXorDracula; +lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { - pname = "orchis-theme"; - version = "2022-10-19"; + inherit pname; + version = "2023-02-26"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-1lJUrWkb8IoUyCMn8J4Lwvs/pWsibrY0pSXrepuQcug="; + sha256 = "sha256-Qk5MK8S8rIcwO7Kmze6eAl5qcwnrGsiWbn0WNIPjRnA="; }; nativeBuildInputs = [ gtk3 sassc ]; From ab0eeaaa3687263741fcd5307587bd4be1902e48 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Fri, 24 Feb 2023 09:15:16 +0100 Subject: [PATCH 011/203] github-runner: add update script Co-authored-by: Ivar --- .../github-runner/default.nix | 2 ++ .../github-runner/update.sh | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100755 pkgs/development/tools/continuous-integration/github-runner/update.sh diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b1ff6a76f541..f56248e9926a 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -353,6 +353,8 @@ stdenv.mkDerivation rec { ''; }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; diff --git a/pkgs/development/tools/continuous-integration/github-runner/update.sh b/pkgs/development/tools/continuous-integration/github-runner/update.sh new file mode 100755 index 000000000000..3ebbfa9f507c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/update.sh @@ -0,0 +1,19 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p coreutils common-updater-scripts jq curl + +set -euo pipefail + +currentVersion="$(nix --extra-experimental-features nix-command eval -f . github-runner.version --raw)" +latestVersion="$(curl -s -H "Accept: application/vnd.github.v3+json" \ + ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + "https://api.github.com/repos/actions/runner/releases/latest" | jq -r ".tag_name")" +latestVersion="${latestVersion#?}" # v2.296.2 -> 2.296.2 + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "github-runner is already up to date: $currentVersion" + exit +fi + +update-source-version github-runner "$latestVersion" +$(nix-build -A github-runner.fetch-deps --no-out-link) "$(dirname "$BASH_SOURCE")/deps.nix" + From b87b0dba523ce77b07ed0a2967c12d6ded3a1d5b Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Fri, 24 Feb 2023 09:18:20 +0100 Subject: [PATCH 012/203] github-runner: add `sourceProvenance` and `changelog` to `meta` Co-authored-by: Ivar --- .../tools/continuous-integration/github-runner/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index f56248e9926a..5bce42f5400b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -356,10 +356,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; meta = with lib; { + changelog = "https://github.com/actions/runner/releases/tag/v${version}"; description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; platforms = attrNames runtimeIds; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } From 2f813ae18b27bd926595be2b9e9e7f7e696af193 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 26 Feb 2023 11:39:53 +0100 Subject: [PATCH 013/203] github-runner: use `buildDotnetModule` --- .../github-runner/default.nix | 378 +++++++----------- .../github-runner/deps.nix | 3 + .../github-runner/patches/dir-proj.patch | 45 --- ...rvice.patch => dont-install-service.patch} | 19 +- 4 files changed, 157 insertions(+), 288 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch rename pkgs/development/tools/continuous-integration/github-runner/patches/{dont-install-systemd-service.patch => dont-install-service.patch} (55%) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 5bce42f5400b..979701ef2665 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -1,49 +1,18 @@ { autoPatchelfHook , autoSignDarwinBinariesHook -, coreutils -, curl +, buildDotnetModule , dotnetCorePackages -, dotnetPackages , fetchFromGitHub -, fetchurl +, fetchpatch , git , glibc -, icu -, libkrb5 +, glibcLocales , lib -, linkFarmFromDrvs -, lttng-ust -, makeWrapper , nodejs-16_x -, openssl , stdenv -, zlib -, writeShellApplication -, nuget-to-nix +, which }: -let - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}.${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - - nugetSource = linkFarmFromDrvs "nuget-packages" ( - import ./deps.nix { inherit fetchNuGet; } - ); - - dotnetSdk = dotnetCorePackages.sdk_6_0; - # Map Nix systems to .NET runtime ids - runtimeIds = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - }; - runtimeId = runtimeIds.${stdenv.system}; - fakeSha1 = "0000000000000000000000000000000000000000"; -in -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "github-runner"; version = "2.302.1"; @@ -51,92 +20,75 @@ stdenv.mkDerivation rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8="; + hash = "sha256-hPZzqTJGwcBxajLjU0TuIQ2KLnDl9E66seuutm9JWDo="; + # Required to obtain HEAD's Git commit hash + leaveDotGit = true; }; + + patches = [ + # Replace some paths that originally point to Nix's read-only store + ./patches/host-context-dirs.patch + # Use GetDirectory() to obtain "diag" dir + ./patches/use-get-directory-for-diag.patch + # Don't try to install service + ./patches/dont-install-service.patch + # Fix FHS path: https://github.com/actions/runner/pull/2464 + (fetchpatch { + name = "ln-fhs.patch"; + url = "https://github.com/actions/runner/commit/5ff0ce1.patch"; + hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas="; + }) + ]; + + postPatch = '' + # Ignore changes to src/Runner.Sdk/BuildConstants.cs + substituteInPlace src/dir.proj \ + --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ + 'true' + ''; + + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales; + LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive"; + + postConfigure = '' + # Generate src/Runner.Sdk/BuildConstants.cs + dotnet msbuild \ + -t:GenerateConstant \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:PackageRuntime="${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" \ + -p:RunnerVersion="${version}" \ + src/dir.proj + ''; + nativeBuildInputs = [ - dotnetSdk - dotnetPackages.Nuget - makeWrapper + git + which ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; - buildInputs = [ - curl # libcurl.so.4 - libkrb5 # libgssapi_krb5.so.2 - stdenv.cc.cc.lib # libstdc++.so.6 - zlib # libz.so.1 - icu - ] ++ lib.optionals stdenv.isLinux [ - lttng-ust # liblttng-ust.so.0 + buildInputs = [ stdenv.cc.cc.lib ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]; + + # As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41 + projectFile = [ + "src/Sdk/Sdk.csproj" + "src/Runner.Common/Runner.Common.csproj" + "src/Runner.Listener/Runner.Listener.csproj" + "src/Runner.Worker/Runner.Worker.csproj" + "src/Runner.PluginHost/Runner.PluginHost.csproj" + "src/Runner.Sdk/Runner.Sdk.csproj" + "src/Runner.Plugins/Runner.Plugins.csproj" ]; - - patches = [ - # Don't run Git, no restore on build/test - ./patches/dir-proj.patch - # Replace some paths that originally point to Nix's read-only store - ./patches/host-context-dirs.patch - # Use GetDirectory() to obtain "diag" dir - ./patches/use-get-directory-for-diag.patch - # Don't try to install systemd service - ./patches/dont-install-systemd-service.patch - ]; - - postPatch = '' - # Relax the version requirement - substituteInPlace src/global.json \ - --replace '6.0.300' '${dotnetSdk.version}' - - # Disable specific tests - substituteInPlace src/dir.proj \ - --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'" - - # We don't use a Git checkout - substituteInPlace src/dir.proj \ - --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ - 'echo Patched out.' - - # Fix FHS path - substituteInPlace src/Test/L0/Util/IOUtilL0.cs \ - --replace '/bin/ln' '${coreutils}/bin/ln' - ''; - - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = stdenv.isDarwin; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - - # Never use nuget.org - nuget sources Disable -Name "nuget.org" - - # Restore the dependencies - dotnet restore src/ActionsRunner.sln \ - --runtime "${runtimeId}" \ - --source "${dotnetSdk.packages}" \ - --source "${nugetSource}" - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - dotnet msbuild \ - -t:Build \ - -p:PackageRuntime="${runtimeId}" \ - -p:BUILDCONFIG="Release" \ - -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${fakeSha1}" \ - src/dir.proj - - runHook postBuild - ''; + nugetDeps = ./deps.nix; doCheck = true; @@ -162,30 +114,18 @@ stdenv.mkDerivation rec { "CompositeActionWithActionfile_MaxLimit" "CompositeActionWithActionfile_Node" "DownloadActionFromGraph" - "DownloadActionFromGraph_Legacy" "NotPullOrBuildImagesMultipleTimes" - "NotPullOrBuildImagesMultipleTimes_Legacy" "RepositoryActionWithActionYamlFile_DockerHubImage" - "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" "RepositoryActionWithActionfileAndDockerfile" - "RepositoryActionWithActionfileAndDockerfile_Legacy" "RepositoryActionWithActionfile_DockerHubImage" - "RepositoryActionWithActionfile_DockerHubImage_Legacy" "RepositoryActionWithActionfile_Dockerfile" - "RepositoryActionWithActionfile_Dockerfile_Legacy" "RepositoryActionWithActionfile_DockerfileRelativePath" - "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" "RepositoryActionWithActionfile_Node" - "RepositoryActionWithActionfile_Node_Legacy" "RepositoryActionWithDockerfile" - "RepositoryActionWithDockerfile_Legacy" "RepositoryActionWithDockerfileInRelativePath" - "RepositoryActionWithDockerfileInRelativePath_Legacy" "RepositoryActionWithDockerfilePrepareActions_Repository" "RepositoryActionWithInvalidWrapperActionfile_Node" - "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" "RepositoryActionWithWrapperActionfile_PreSteps" - "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" ] ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" @@ -208,150 +148,108 @@ stdenv.mkDerivation rec { "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; - nativeCheckInputs = [ git ]; - checkPhase = '' - runHook preCheck + testProjectFile = [ "src/Test/Test.csproj" ]; + preCheck = '' mkdir -p _layout/externals ln -s ${nodejs-16_x} _layout/externals/node16 - - printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' - - # BUILDCONFIG needs to be "Debug" - dotnet msbuild \ - -t:test \ - -p:PackageRuntime="${runtimeId}" \ - -p:BUILDCONFIG="Debug" \ - -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${fakeSha1}" \ - src/dir.proj - - runHook postCheck ''; - installPhase = '' - runHook preInstall - - # Copy the built binaries to lib/ instead of bin/ as they - # have to be wrapped in the fixup phase to work - mkdir -p $out/lib - cp -r _layout/bin/. $out/lib/ - - # Delete debugging files - find "$out/lib" -type f -name '*.pdb' -delete - - # Install the helper scripts to bin/ to resemble the upstream package + postInstall = '' mkdir -p $out/bin - install -m755 src/Misc/layoutbin/runsvc.sh $out/bin/ - install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/ - install -m755 src/Misc/layoutroot/run.sh $out/lib/ - install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/run-helper.sh - install -m755 src/Misc/layoutroot/config.sh $out/lib/ - install -m755 src/Misc/layoutroot/env.sh $out/lib/ - # Rewrite reference in helper scripts from bin/ to lib/ - substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' - substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ - --replace 'source ./env.sh' $out/bin/env.sh + install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner + install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/github-runner + install -m755 src/Misc/layoutroot/run.sh $out/lib/github-runner + install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/github-runner/run-helper.sh + install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner + install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner + + substituteInPlace $out/lib/github-runner/config.sh \ + --replace './bin/Runner.Listener' "$out/bin/Runner.Listener" '' + lib.optionalString stdenv.isLinux '' - # Make binary paths absolute - substituteInPlace $out/lib/config.sh \ - --replace 'ldd' '${glibc.bin}/bin/ldd' \ + substituteInPlace $out/lib/github-runner/config.sh \ + --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \ + --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \ --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig' '' + '' # Remove uneeded copy for run-helper template - substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' - substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' + substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' + substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' # Make paths absolute - substituteInPlace $out/bin/runsvc.sh \ - --replace './externals' "$out/externals" \ - --replace './bin' "$out/lib" + substituteInPlace $out/lib/github-runner/runsvc.sh \ + --replace './externals' "$out/lib/externals" \ + --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js" - # The upstream package includes Node {12,16} and expects it at the path - # externals/node{12,16}. As opposed to the official releases, we don't + # The upstream package includes Node 16 and expects it at the path + # externals/node16. As opposed to the official releases, we don't # link the Alpine Node flavors. - mkdir -p $out/externals - ln -s ${nodejs-16_x} $out/externals/node16 + mkdir -p $out/lib/externals + ln -s ${nodejs-16_x} $out/lib/externals/node16 # Install Nodejs scripts called from workflows - install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js - mkdir -p $out/lib/checkScripts - install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/ + install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js + mkdir -p $out/lib/github-runner/checkScripts + install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/ - runHook postInstall - ''; - - # Stripping breaks the binaries - dontStrip = true; - - preFixup = lib.optionalString stdenv.isLinux '' - patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so - ''; - - postFixup = '' - fix_rpath() { - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 - } - wrap() { - makeWrapper $out/lib/$1 $out/bin/$1 \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \ - "''${@:2}" - } + # Use $RUNNER_ROOT in env.sh, if set + substituteInPlace "$out/lib/github-runner/env.sh" \ + --replace '.env' ' ''${RUNNER_ROOT:-.}/.env' \ + --replace '.path' ' ''${RUNNER_ROOT:-.}/.path' + ln -s "$out/lib/github-runner/env.sh" "$out/bin/env.sh" '' + lib.optionalString stdenv.isLinux '' - fix_rpath Runner.Listener - fix_rpath Runner.PluginHost - fix_rpath Runner.Worker - '' + '' - wrap Runner.Listener - wrap Runner.PluginHost - wrap Runner.Worker - wrap run.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' - wrap env.sh --run 'cd $RUNNER_ROOT' + # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH + makeWrapperArgs=() - wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \ - --run 'mkdir -p $RUNNER_ROOT' \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ - --chdir $out + # We don't wrap with libicu + substituteInPlace $out/lib/github-runner/config.sh \ + --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu' + '' + '' + # XXX: Using the corresponding Nix argument does not work as expected: + # https://github.com/NixOS/nixpkgs/issues/218449 + # Common wrapper args for `executables` + makeWrapperArgs+=( + --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"' + --run 'mkdir -p "$RUNNER_ROOT"' + --chdir "$out" + ) ''; - # Script to create deps.nix file for dotnet dependencies. Run it with - # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file - # - # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument. - # - # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix - passthru.createDepsFile = writeShellApplication { - name = "create-deps-file"; - runtimeInputs = [ coreutils dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ]; - text = '' - # Disable telemetry data - export DOTNET_CLI_TELEMETRY_OPTOUT=1 + # List of files to wrap + executables = [ + "config.sh" + "Runner.Listener" + "Runner.PluginHost" + "Runner.Worker" + "run.sh" + "runsvc.sh" + ]; - deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")" + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck - printf "\n* Setup workdir\n" - workdir="$(mktemp -d /tmp/${pname}.XXX)" - HOME="$workdir"/.fake-home - cp -rT "${src}" "$workdir" - chmod -R +w "$workdir" - trap 'rm -rf "$workdir"' EXIT + export RUNNER_ROOT="$TMPDIR" - pushd "$workdir" + $out/bin/config.sh --help >/dev/null + $out/bin/Runner.Listener --help >/dev/null - mkdir nuget_pkgs + version=$($out/bin/Runner.Listener --version) + if [[ "$version" != "${version}" ]]; then + printf 'Unexpected version %s' "$version" + exit 1 + fi - ${lib.concatMapStrings (rid: '' - printf "\n* Restore ${pname} (${rid}) dotnet project\n" - dotnet restore src/ActionsRunner.sln --packages nuget_pkgs --no-cache --force --runtime "${rid}" - '') (lib.attrValues runtimeIds)} + commit=$($out/bin/Runner.Listener --commit) + if [[ "$commit" != "$(git rev-parse HEAD)" ]]; then + printf 'Unexpected commit %s' "$commit" + exit 1 + fi - printf "\n* Make %s file\n" "$(basename "$deps_file")" - nuget-to-nix "$workdir/nuget_pkgs" "${dotnetSdk.packages}" > "$deps_file" - printf "\n* Dependency file writen to %s" "$deps_file" - ''; - }; + runHook postInstallCheck + ''; passthru.updateScript = ./update.sh; @@ -361,7 +259,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/actions/runner"; license = licenses.mit; maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; - platforms = attrNames runtimeIds; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 8a6fb8de943c..caa00cad9af2 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch deleted file mode 100644 index a2599afe4471..000000000000 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5a850bb7946ce5c0620ac5f072d93a77cc064219 Mon Sep 17 00:00:00 2001 -From: Aaron Andersen -Date: Thu, 29 Sep 2022 10:12:28 -0400 -Subject: [PATCH] [PATCH] Patch dir.proj - -Don't execute Git for GitInfoCommitHash property -Don't restore for build target -Don't restore for test target ---- - src/dir.proj | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/dir.proj b/src/dir.proj -index 056a312..f029720 100644 ---- a/src/dir.proj -+++ b/src/dir.proj -@@ -2,9 +2,6 @@ - - -- -- -- - - - -@@ -41,14 +38,13 @@ - - - -- - - - - - -- -- -+ -+ - - - --- -2.36.2 diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch similarity index 55% rename from pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch rename to pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch index 6279a4ecb4b9..5590fa3df027 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch @@ -1,11 +1,21 @@ +From 369b3d98b44abbf061080ab1b17b22f99706ef69 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sun, 26 Feb 2023 12:55:38 +0100 +Subject: [PATCH] Don't generate service config on Linux and OSX + +--- + src/Runner.Listener/Configuration/ConfigurationManager.cs | 5 ----- + 1 file changed, 5 deletions(-) + diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs -index 8d08b06..bdfa3a2 100644 +index 392eb0e..4c75324 100644 --- a/src/Runner.Listener/Configuration/ConfigurationManager.cs +++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs -@@ -320,10 +320,6 @@ namespace GitHub.Runner.Listener.Configuration +@@ -367,11 +367,6 @@ namespace GitHub.Runner.Listener.Configuration + var serviceControlManager = HostContext.GetService(); serviceControlManager.ConfigureService(runnerSettings, command); } - +- -#elif OS_LINUX || OS_OSX - // generate service config script for OSX and Linux, GenerateScripts() will no-opt on windows. - var serviceControlManager = HostContext.GetService(); @@ -13,3 +23,6 @@ index 8d08b06..bdfa3a2 100644 #endif } +-- +2.38.1 + From b22b1f4874a1614307b4efa8d5309301832685e4 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 26 Feb 2023 12:58:42 +0100 Subject: [PATCH 014/203] github-runner: patch access to `.env` and `.path` --- .../github-runner/default.nix | 11 ++- .../patches/env-sh-use-runner-root.patch | 76 +++++++++++++++++++ 2 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 979701ef2665..91b593f72943 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -33,6 +33,8 @@ buildDotnetModule rec { ./patches/use-get-directory-for-diag.patch # Don't try to install service ./patches/dont-install-service.patch + # Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set + ./patches/env-sh-use-runner-root.patch # Fix FHS path: https://github.com/actions/runner/pull/2464 (fetchpatch { name = "ln-fhs.patch"; @@ -166,6 +168,9 @@ buildDotnetModule rec { install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner + # env.sh is patched to not require any wrapping + ln -sr "$out/lib/github-runner/env.sh" "$out/bin/" + substituteInPlace $out/lib/github-runner/config.sh \ --replace './bin/Runner.Listener' "$out/bin/Runner.Listener" '' + lib.optionalString stdenv.isLinux '' @@ -193,12 +198,6 @@ buildDotnetModule rec { install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js mkdir -p $out/lib/github-runner/checkScripts install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/ - - # Use $RUNNER_ROOT in env.sh, if set - substituteInPlace "$out/lib/github-runner/env.sh" \ - --replace '.env' ' ''${RUNNER_ROOT:-.}/.env' \ - --replace '.path' ' ''${RUNNER_ROOT:-.}/.path' - ln -s "$out/lib/github-runner/env.sh" "$out/bin/env.sh" '' + lib.optionalString stdenv.isLinux '' # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH makeWrapperArgs=() diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch new file mode 100644 index 000000000000..d87e00d0f349 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch @@ -0,0 +1,76 @@ +From 84b2fcdf042771ae8adc0f59f1a3ecd9788a808d Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sun, 26 Feb 2023 11:37:01 +0100 +Subject: [PATCH] Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set + +--- + src/Misc/layoutbin/runsvc.sh | 4 ++-- + src/Misc/layoutroot/env.sh | 10 +++++----- + src/Runner.Listener/Program.cs | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/Misc/layoutbin/runsvc.sh b/src/Misc/layoutbin/runsvc.sh +index c135645..bb0fbf6 100755 +--- a/src/Misc/layoutbin/runsvc.sh ++++ b/src/Misc/layoutbin/runsvc.sh +@@ -4,9 +4,9 @@ + # for more info on how to propagate SIGTERM to a child process see: http://veithen.github.io/2014/11/16/sigterm-propagation.html + trap 'kill -INT $PID' TERM INT + +-if [ -f ".path" ]; then ++if [ -f "${RUNNER_ROOT:-"."}/.path" ]; then + # configure +- export PATH=`cat .path` ++ export PATH=`cat "${RUNNER_ROOT:-"."}/.path"` + echo ".path=${PATH}" + fi + +diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh +index 641d244..85379bf 100755 +--- a/src/Misc/layoutroot/env.sh ++++ b/src/Misc/layoutroot/env.sh +@@ -16,10 +16,10 @@ varCheckList=( + + envContents="" + +-if [ -f ".env" ]; then +- envContents=`cat .env` ++if [ -f "${RUNNER_ROOT:-"."}/.env" ]; then ++ envContents=`cat "${RUNNER_ROOT:-"."}/.env"` + else +- touch .env ++ touch "${RUNNER_ROOT:-"."}/.env" + fi + + function writeVar() +@@ -29,12 +29,12 @@ function writeVar() + if test "${envContents#*$checkDelim}" = "$envContents" + then + if [ ! -z "${!checkVar}" ]; then +- echo "${checkVar}=${!checkVar}">>.env ++ echo "${checkVar}=${!checkVar}">>"${RUNNER_ROOT:-"."}/.env" + fi + fi + } + +-echo $PATH>.path ++echo $PATH>"${RUNNER_ROOT:-"."}/.path" + + for var_name in ${varCheckList[@]} + do +diff --git a/src/Runner.Listener/Program.cs b/src/Runner.Listener/Program.cs +index d4d5e43..beacc9d 100644 +--- a/src/Runner.Listener/Program.cs ++++ b/src/Runner.Listener/Program.cs +@@ -148,7 +148,7 @@ namespace GitHub.Runner.Listener + private static void LoadAndSetEnv() + { + var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); +- var rootDir = new DirectoryInfo(binDir).Parent.FullName; ++ var rootDir = Environment.GetEnvironmentVariable("RUNNER_ROOT") ?? new DirectoryInfo(binDir).Parent.FullName; + string envFile = Path.Combine(rootDir, ".env"); + if (File.Exists(envFile)) + { +-- +2.38.1 + From 137db83090cf371369a48111b3bd1c888288f19e Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 26 Feb 2023 13:13:10 +0100 Subject: [PATCH 015/203] nixos/github-runners: use `Runner.Listener` directly for registration Nothing the script `config.sh` does prior to the final call to `Runner.Listener configure` is relevant for the systemd service. Particularly, we don't need (nor want) any of the artifacts the `env.sh` script creates. --- .../services/continuous-integration/github-runner/service.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index 3d11728ebfdd..55df83362cb6 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -149,7 +149,7 @@ in else args+=(--token "$token") fi - ${cfg.package}/bin/config.sh "''${args[@]}" + ${cfg.package}/bin/Runner.Listener configure "''${args[@]}" # Move the automatically created _diag dir to the logs dir mkdir -p "$STATE_DIRECTORY/_diag" cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" From e8df83d417a65f84914ee27da98b870c0e7d143c Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 26 Feb 2023 13:50:49 +0100 Subject: [PATCH 016/203] nixos/tests/github-runner: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/github-runner.nix | 37 +++++++++++++++++++ .../github-runner/default.nix | 6 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/github-runner.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 785a5621f57e..81f5b0cf7fe4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -243,6 +243,7 @@ in { ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; + github-runner = handleTest ./github-runner.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; diff --git a/nixos/tests/github-runner.nix b/nixos/tests/github-runner.nix new file mode 100644 index 000000000000..033365d6925c --- /dev/null +++ b/nixos/tests/github-runner.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "github-runner"; + meta = with pkgs.lib.maintainers; { + maintainers = [ veehaitch ]; + }; + nodes.machine = { pkgs, ... }: { + services.github-runners.test = { + enable = true; + url = "https://github.com/yaxitech"; + tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; + }; + + systemd.services.dummy-github-com = { + wantedBy = [ "multi-user.target" ]; + before = [ "github-runner-test.service" ]; + script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect"; + }; + networking.hosts."127.0.0.1" = [ "api.github.com" ]; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("dummy-github-com") + + try: + machine.wait_for_unit("github-runner-test") + except Exception: + pass + + out = machine.succeed("journalctl -u github-runner-test") + assert "Self-hosted runner registration" in out, "did not read runner registration header" + + machine.wait_until_succeeds("test -f /tmp/registration-connect") + ''; +}) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 91b593f72943..e6b22a99bd17 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -8,6 +8,7 @@ , glibc , glibcLocales , lib +, nixosTests , nodejs-16_x , stdenv , which @@ -250,7 +251,10 @@ buildDotnetModule rec { runHook postInstallCheck ''; - passthru.updateScript = ./update.sh; + passthru = { + tests.smoke-test = nixosTests.github-runner; + updateScript = ./update.sh; + }; meta = with lib; { changelog = "https://github.com/actions/runner/releases/tag/v${version}"; From 5a65a419627fa1746fac2d8b1a7219a47908e781 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 26 Feb 2023 14:54:26 -0800 Subject: [PATCH 017/203] libre: use cmake for configurePhase Although libre is a cmake-based project, our expression for this library does not currently use cmake for the configurePhase. This commit causes it to do so. This is necessary to get downstream libre and baresip to cross-compile. --- pkgs/development/libraries/libre/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 7ed03f0af117..bc33f5d2e045 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, openssl +, cmake }: + stdenv.mkDerivation rec { version = "2.9.0"; pname = "libre"; @@ -9,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; }; buildInputs = [ zlib openssl ]; + nativeBuildInputs = [ cmake ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" From 67f93ae299730480bd4a7bfd77a1b10322b682c6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 26 Feb 2023 14:59:04 -0800 Subject: [PATCH 018/203] librem: use cmake for configurePhase Although librem is a cmake-based project, our expression for this library does not currently use cmake for the configurePhase. This commit causes it to do so. This is necessary to get downstream libre and baresip to cross-compile. --- pkgs/development/libraries/librem/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index f343c4383c4a..3d393997a32e 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: +{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre +, cmake }: + stdenv.mkDerivation rec { version = "2.10.0"; pname = "librem"; @@ -8,10 +10,13 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl libre ]; + cmakeFlags = [ + "-DRE_INCLUDE_DIR=${libre}/include/re" + ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" - "LIBRE_INC=${libre}/include/re" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" From 9a584068b438be375dc258adbe010bdbdf70eab1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 27 Feb 2023 05:20:31 +0000 Subject: [PATCH 019/203] wakatime: 1.61.0 -> 1.68.1 --- pkgs/tools/misc/wakatime/default.nix | 43 +++++++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index db52bae523f6..ed0a8cba8d2d 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,28 +1,49 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }: buildGoModule rec { pname = "wakatime"; - version = "1.61.0"; + version = "1.68.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI="; + hash = "sha256-Q9LmQEcw3oehGE4DXIzQERNEZgwRzb1o8/qGOC1JGZc="; }; - vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4="; + vendorHash = "sha256-KY4niegPSLOILZgC7H7TFK6r5v3mjN9sUA5c8AuaOys="; + + ldflags = [ + "-s" + "-w" + "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" + ]; + + preCheck = + let + skippedTests = [ + "TestFileExperts" + "TestSendHeartbeats" + "TestSendHeartbeats_ExtraHeartbeats" + "TestSendHeartbeats_IsUnsavedEntity" + "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" + ]; + in + '' + # Disable tests requiring network + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + + passthru.tests.version = testers.testVersion { + package = wakatime; + command = "HOME=$(mktemp -d) wakatime-cli --version"; + }; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; - longDescription = '' - Command line interface to WakaTime used by all WakaTime text editor - plugins. You shouldn't need to directly use this package unless you - are building your own plugin or your text editor's plugin asks you - to install the wakatime CLI interface manually. - ''; license = licenses.bsd3; + maintainers = with maintainers; [ aaronjheng ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 985ec28e99b1..4e79260adc87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13175,7 +13175,7 @@ with pkgs; wakapi = callPackage ../tools/misc/wakapi { }; - wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; + wakatime = callPackage ../tools/misc/wakatime { }; wambo = callPackage ../development/tools/wambo { }; From 067d00f76581ee21787c376e0d3b01bc9ccdf31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Feb 2023 14:34:12 -0800 Subject: [PATCH 020/203] bubblewrap: 0.7.0 -> 0.8.0 Diff: https://github.com/containers/bubblewrap/compare/v0.7.0...v0.8.0 Changelog: https://github.com/containers/bubblewrap/releases/tag/v0.8.0 --- pkgs/tools/admin/bubblewrap/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4192811b7d50..0e890270a52b 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-ddxEtBw6JcSsZCN5uKyuBMVkWwSoThfxrcvHZGZzFr4="; + hash = "sha256-UiZfp1bX/Eul5x31oBln5P9KMT2oFwawQqDs9udZUxY="; }; postPatch = '' @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/containers/bubblewrap/releases/tag/${src.rev}"; description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; From 476bb8830866751e07edf015c78e00c0c951978f Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Mon, 27 Feb 2023 19:49:19 +0000 Subject: [PATCH 021/203] nixos/atop: Don't choke if no existing atop logs --- nixos/modules/programs/atop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 2b14d7c73439..49d40ce7513a 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -142,6 +142,7 @@ in # convert remainings logs and start eventually atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" '' set -e -u + shopt -s nullglob for logfile in "$LOGPATH"/atop_* do ${atop}/bin/atopconvert "$logfile" "$logfile".new From f0a6216eebb3a6693b111e2927e10f520f6c479a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Thu, 8 Sep 2022 14:40:45 +0200 Subject: [PATCH 022/203] mpv: enable swift support --- pkgs/applications/video/mpv/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 28e0d1d469a0..59f7729b38a9 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -66,7 +66,7 @@ , sdl2Support ? true, SDL2 , sixelSupport ? false, libsixel , speexSupport ? true, speex -, swiftSupport ? false, swift +, swiftSupport ? stdenv.isDarwin, swift , theoraSupport ? true, libtheora , vaapiSupport ? stdenv.isLinux, libva , vapoursynthSupport ? false, vapoursynth @@ -78,7 +78,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + inherit (darwin.apple_sdk.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation (self: { pname = "mpv"; @@ -99,6 +99,11 @@ in stdenv.mkDerivation (self: { NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; + preConfigure = lib.optionalString swiftSupport '' + # Ensure we reference 'lib' (not 'out') of Swift. + export SWIFT_LIB_DYNAMIC=${lib.getLib swift.swift}/lib/swift/macosx + ''; + mesonFlags = [ (lib.mesonOption "default_library" "shared") (lib.mesonBool "libmpv" true) @@ -167,7 +172,8 @@ in stdenv.mkDerivation (self: { ++ lib.optionals zimgSupport [ zimg ] ++ lib.optionals stdenv.isLinux [ nv-codec-headers ] ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ] + ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; postBuild = lib.optionalString stdenv.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths From 5b8e896dbadd36fecc96dc77216517599c260ca7 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 7 Feb 2023 00:21:48 +0800 Subject: [PATCH 023/203] mpv: Switch to apple_sdk_11_0 for darwin --- pkgs/applications/video/mpv/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 59f7729b38a9..61680daf051e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -78,7 +78,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer; + inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation (self: { pname = "mpv"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3fd46c92d9d..64097e8fd150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31402,7 +31402,7 @@ with pkgs; libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - mpv-unwrapped = callPackage ../applications/video/mpv { + mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { inherit lua; }; From 8a28ae851dee5306de51352300fceb692bd9c389 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 28 Feb 2023 11:14:00 +0800 Subject: [PATCH 024/203] mpv: Only enable swift support on aarch64-darwin This commit should be reverted after [x86_64-darwin build failure][1] is fixed [1]: https://logs.nix.ci/?key=nixos/nixpkgs.214944&attempt_id=76802592-760c-47e1-9141-4465b7c78f4c --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 61680daf051e..0fa8486e15b0 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -66,7 +66,7 @@ , sdl2Support ? true, SDL2 , sixelSupport ? false, libsixel , speexSupport ? true, speex -, swiftSupport ? stdenv.isDarwin, swift +, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift , theoraSupport ? true, libtheora , vaapiSupport ? stdenv.isLinux, libva , vapoursynthSupport ? false, vapoursynth From ef5dc1f99490f24a6b367222fa590d8d91bca4c7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 28 Feb 2023 07:38:40 +0000 Subject: [PATCH 025/203] jid: Use buildGoModule --- pkgs/development/tools/jid/default.nix | 22 +++++-- pkgs/development/tools/jid/deps.nix | 75 ----------------------- pkgs/development/tools/jid/go-mod.patch | 79 +++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 81 deletions(-) delete mode 100644 pkgs/development/tools/jid/deps.nix create mode 100644 pkgs/development/tools/jid/go-mod.patch diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index b48de54dd22e..c4c891778114 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -1,19 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, jid }: -buildGoPackage rec { +buildGoModule rec { pname = "jid"; version = "0.7.6"; - goPackagePath = "github.com/simeji/jid"; - src = fetchFromGitHub { owner = "simeji"; repo = "jid"; rev = "v${version}"; - sha256 = "15fgi7cpq5bg2lnpr7rip359xwj2kvlj6j2qzi837c26adnw973x"; + hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-Lq8ouTjPsGhqDwrCMpqkSU7FEGszYwAkwl92vAEZ68w="; + + patches = [ + # Run go mod tidy + ./go-mod.patch + ]; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = jid; + version = "v${version}"; + }; meta = { description = "A command-line tool to incrementally drill down JSON"; diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix deleted file mode 100644 index 6e2d5514a838..000000000000 --- a/pkgs/development/tools/jid/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "v0.5.0"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed"; - sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; - }; - } - { - goPackagePath = "github.com/nwidger/jsoncolor"; - fetch = { - type = "git"; - url = "https://github.com/nwidger/jsoncolor"; - rev = "75a6de4340e5"; - sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] diff --git a/pkgs/development/tools/jid/go-mod.patch b/pkgs/development/tools/jid/go-mod.patch new file mode 100644 index 000000000000..beca79fff86a --- /dev/null +++ b/pkgs/development/tools/jid/go-mod.patch @@ -0,0 +1,79 @@ +diff --git a/go.mod b/go.mod +index d26c293..3276f36 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,12 +1,24 @@ + module github.com/simeji/jid + ++go 1.19 ++ + require ( + github.com/bitly/go-simplejson v0.5.0 +- github.com/fatih/color v1.7.0 // indirect +- github.com/mattn/go-colorable v0.0.9 // indirect +- github.com/mattn/go-isatty v0.0.4 // indirect + github.com/mattn/go-runewidth v0.0.4 + github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 + github.com/pkg/errors v0.8.0 ++ github.com/stretchr/testify v1.8.2 ++) ++ ++require ( ++ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/fatih/color v1.7.0 // indirect ++ github.com/kr/pretty v0.3.1 // indirect ++ github.com/mattn/go-colorable v0.0.9 // indirect ++ github.com/mattn/go-isatty v0.0.4 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ golang.org/x/sys v0.5.0 // indirect ++ gopkg.in/yaml.v3 v3.0.1 // indirect + ) +diff --git a/go.sum b/go.sum +index 2fb379f..07d786d 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,7 +1,17 @@ + github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= + github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= ++github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= + github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= ++github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= ++github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= ++github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= ++github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= + github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= + github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= + github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= +@@ -12,5 +22,24 @@ github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed h1:bAVGG6B+R5qpSylr + github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 h1:d+C3xJdxZT7wNlxqEwbXn3R355CwAhYBL9raVNfSnK0= + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5/go.mod h1:GYFm0zZgTNeoK1QxuIofRDasy2ibmaJZhZLzwsMXUF4= ++github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= + github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= ++github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= ++github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= ++github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= ++github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= ++github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= ++github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= ++golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= ++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= ++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= ++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 4e0525a8cdb370d31c1e1ba2641ad2a91fded57d Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Tue, 28 Feb 2023 17:10:51 +0100 Subject: [PATCH 026/203] configuration.nix: suggest a command line program adding two graphical programs makes a strong assmuption that users will use a graphical environment. add a command line program as an alternative suggestion that is easy to comment in as a first-steps measure. --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d1b16d042d86..c2cca03e433c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -180,7 +180,7 @@ in # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ # firefox - # thunderbird + # tree # ]; # }; From c1771c47417bb8f49b5ddce9da0f3d6e80776ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Feb 2023 17:44:18 +0100 Subject: [PATCH 027/203] intel-graphics-compiler: 1.0.12504.5 -> 1.0.12812.26 --- .../compilers/intel-graphics-compiler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 0570450b32bf..b5a5f0671ab8 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -19,8 +19,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.7.1"; - sha256 = "sha256-bpi4hLpov1CbFy4jr9Eytc5O4ismYw0J+KgXyZtQYks="; + rev = "v0.11.0"; + sha256 = "sha256-74JBW7qU8huSqwqgxNbvbGj1DlJJThgGhb3owBYmhvI="; }; llvmPkgs = llvmPackages_11 // { @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.12504.5"; + version = "1.0.12812.26"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "sha256-Ok+cXMTBABrHHM4Vc2yzlou48YHoQnaB3We8mGZhSwI="; + sha256 = "sha256-KpaDaDYVp40H7OscDGUpzEMgIOIk397ANi+8sDk4Wow="; }; nativeBuildInputs = [ cmake bison flex python3 ]; From bee04d31577f4878e2d3824e354d1bf3bf300309 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 28 Feb 2023 18:17:32 +0100 Subject: [PATCH 028/203] prisma-engines: 4.10.1 -> 4.11.0 --- pkgs/development/tools/database/prisma-engines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 591059676e1c..398679d44bbe 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,19 +14,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.10.1"; + version = "4.11.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-TFLwpKh+FsstcpvBfTw7CNcQOGGSNI9qf8WJ6v75uL8="; + sha256 = "sha256-VAVrXSz75rPdBOz9Jg75rpA3VBvw4WO+hFvk+A4f6Mc="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-EPym9MLwTMGBbJkVMKD/NEc6Vfm7nI4FaDkqy/0B14Q="; + cargoSha256 = "sha256-BB6MB5+H+L2GAYeVXPYBu/xgfZ0DwfoZfYBWc0IQb80="; nativeBuildInputs = [ pkg-config git ]; From d5d8baa676aac635110fd9668738ef441c65d98a Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 28 Feb 2023 18:17:46 +0100 Subject: [PATCH 029/203] nodePackages.prisma: 4.10.1 -> 4.11.0 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 3c22331fe5a2..2b48536e09b4 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -404,7 +404,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-0jDxgg+DruB1kHVNlcspXQB9au62IFfVg9drkhzXudszHNUAQn0lVuu+T8np0uC2z1nKD5S3qPeCyR8u5YFLnA=="; + sha512 = "sha512-4zZmBXssPUEiX+GeL0MUq/Yyie4ltiKmGu7jCJFnYMamNrrulTBc+D+QwAQSJ01tyzeGHlD13kOnqPwRipnlNw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From 014eba883e7d81771c9c8cb938618e5a3f35208d Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 28 Feb 2023 19:00:14 +0100 Subject: [PATCH 030/203] buildDotnetModule: point fetch-deps at module's deps file by default Previously, you had to provide the path to the deps.nix of the package inside your Nixpkgs checkout as an argument manually. Now it just does that by default when no argument is passed. --- .../dotnet/build-dotnet-module/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 514255f324ac..311eb2b293e5 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -168,6 +168,15 @@ stdenvNoCC.mkDerivation (args // { if runtimeId != null then [ runtimeId ] else map (system: dotnetCorePackages.systemToDotnetRid system) platforms; + defaultDepsFile = + # Wire in the nugetDeps file such that running the script with no args + # runs it agains the correct deps file by default. + # Note that toString is necessary here as it results in the path at + # eval time (i.e. to the file in your local Nixpkgs checkout) rather + # than the Nix store path of the path after it's been imported. + if lib.isPath nugetDeps && !lib.hasPrefix "/nix/store/" (toString nugetDeps) + then toString nugetDeps + else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; in writeShellScript "fetch-${pname}-deps" '' set -euo pipefail @@ -238,7 +247,8 @@ stdenvNoCC.mkDerivation (args // { export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 - depsFile=$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}") + depsFile=$(realpath "''${1:-${defaultDepsFile}}") + echo Will write lockfile to "$depsFile" mkdir -p "$tmp/nuget_pkgs" storeSrc="${srcOnly args}" From 3330e67e9718579df2d8e5ed933ec1e54651a3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Feb 2023 13:46:58 -0800 Subject: [PATCH 031/203] python310Packages.dtlssocket: 0.1.12 -> 0.1.14 --- pkgs/development/python-modules/dtlssocket/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 28eae55ef9a6..a819c4ab40d1 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -3,21 +3,25 @@ , fetchPypi , autoconf , cython +, setuptools }: buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.12"; + version = "0.1.14"; + + format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - sha256 = "909a8f52f1890ec9e92fd46ef609daa8875c2a1c262c0b61200e73c6c2dd5099"; + hash = "sha256-BLNfdKDKUvc+BJnhLqx7VzJg0opvrdaXhNLCigLH02k="; }; nativeBuildInputs = [ autoconf cython + setuptools ]; # no tests on PyPI, no tags on GitLab From 39bb5f56a10cdb4b222751c64e9ed583ae7e467b Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 20 Feb 2023 14:07:20 +0100 Subject: [PATCH 032/203] zola: 0.16.1 -> 0.17.0 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 9e28dbaa0b2d..ac1de5985d85 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "sha256-VkR7fM2WeI1itGq5kl54CVLnNW+NxIodkVKeGv8HoaU="; + sha256 = "sha256-eS2u9wfU3BZ/2LMNmvbfve41y4X/x1COS1xG2BXSKEs="; }; - cargoSha256 = "sha256-74QVFjDlT3ewx4sCK4/r5In0muqboBFEpMFBv2L5YaM="; + cargoSha256 = "sha256-Q7cDL6HP2ZujRoc1QCJPbXHHQlLeQq5J2XwJnNbTZxY="; nativeBuildInputs = [ cmake From 2eb86f590dd5590ce59e2be1456360e39d073a7b Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 28 Feb 2023 22:54:29 +0100 Subject: [PATCH 033/203] zola: fix completions --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index ac1de5985d85..f04eabeee3c5 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -43,9 +43,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd zola \ - --fish completions/zola.fish \ - --zsh completions/_zola \ - --bash completions/zola.bash + --bash <($out/bin/zola completion bash) \ + --fish <($out/bin/zola completion fish) \ + --zsh <($out/bin/zola completion zsh) ''; passthru.tests.version = testers.testVersion { package = zola; }; From 40575604eaaa1de4b90330bcd4c5dbf71a3d84dd Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 1 Mar 2023 00:41:18 +0100 Subject: [PATCH 034/203] zola: 0.17.0 -> 0.17.1 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index f04eabeee3c5..298d218560ec 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "sha256-eS2u9wfU3BZ/2LMNmvbfve41y4X/x1COS1xG2BXSKEs="; + hash = "sha256-+q6arKZjHVstnbPQhmuxdj/kCPTFf9L0jZYlPS+lksk="; }; - cargoSha256 = "sha256-Q7cDL6HP2ZujRoc1QCJPbXHHQlLeQq5J2XwJnNbTZxY="; + cargoHash = "sha256-mS+yQD7ggQJ/6TYgL54+lLsUbKQaZX9oxT2/GaFoWyI="; nativeBuildInputs = [ cmake From 162af4d0fdde5227d2b8b7412afdc96e1939c51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Feb 2023 17:44:35 +0100 Subject: [PATCH 035/203] intel-gmmlib: 22.3.3 -> 22.3.4 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 0fa807ebe799..d4aeaa8f2a73 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.3"; + version = "22.3.4"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-ghCB9wrjixAX06KUYZUEL1Tq6fKSH7pqe3Ti1y/+a2U="; + sha256 = "sha256-V8mimy4yB7BO5YdbUh8byN9K6ylQ3lOLynQbXxiOUok="; }; nativeBuildInputs = [ cmake ]; From a798ab89a54c709f13d697da992712d50ba1824a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Feb 2023 17:44:51 +0100 Subject: [PATCH 036/203] level-zero: use none marketing page as homepage --- pkgs/development/libraries/level-zero/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 89684080f9f0..d30dcb449275 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.oneapi.io/"; description = "oneAPI Level Zero Specification Headers and Loader"; + homepage = "https://github.com/oneapi-src/level-zero"; license = licenses.mit; maintainers = [ maintainers.ziguana ]; }; From 87dbe5e60fed9dfd00ca0e9ebd3011e109c3627a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Feb 2023 17:45:05 +0100 Subject: [PATCH 037/203] intel-compute-runtime: 22.43.24595.41 -> 22.49.25018.24 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5ff7529d239d..3380eeb88166 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24595.41"; + version = "22.49.25018.24"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; + sha256 = "sha256-/onHHIG5jWFObC8pSjpFMadjwaAN6vMNjAsj8/D3qNw="; }; patches = [ From fe6b447c430b23f508af608aff740e0c644297d7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Mar 2023 04:04:20 +0000 Subject: [PATCH 038/203] ocamlPackages.elina: fixup build by using older make --- pkgs/development/ocaml-modules/elina/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index ec4199cc06eb..c0a4cbc31e30 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: +{ stdenv, lib, fetchurl, gnumake42, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: stdenv.mkDerivation rec { version = "1.1"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - nativeBuildInputs = [ perl ocaml findlib camlidl ]; + # fails with make 4.4 + nativeBuildInputs = [ gnumake42 perl ocaml findlib camlidl ]; propagatedBuildInputs = [ apron gmp mpfr ]; From 7112c4e99b0ced03c98bd8dcd2534de9f3ad3e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Mar 2023 14:57:20 +0100 Subject: [PATCH 039/203] dnscontrol: 3.26.0 -> 3.27.1 Diff: https://github.com/StackExchange/dnscontrol/compare/v3.26.0...v3.27.1 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 3e66621b5719..e9c1d3dde5ff 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.26.0"; + version = "3.27.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wkPBMFsPLJFfilKuA3bGNn7NtC+wsnXZf+qkVpF2fWc="; + sha256 = "sha256-WXYmV4QE0OPv1reYX+YrmqGdnRUDHXBt60NIUDLTDLk="; }; - vendorHash = "sha256-U7RQPrvByTADC2/8O0cvcf0nmDgIeVkuyRGV0fpSCPk="; + vendorHash = "sha256-FxKmFDx5ckLm8uJB9ouYSwjX+Pu20In6ertGzhhlEwA="; ldflags = [ "-s" "-w" ]; From 00e614468d4828bafeb2942b9a9055d9a1bbb0fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Mar 2023 16:26:46 +0100 Subject: [PATCH 040/203] evcc: 0.113.0 -> 0.114.0 https://github.com/evcc-io/evcc/releases/tag/0.113.1 https://github.com/evcc-io/evcc/releases/tag/0.113.2 https://github.com/evcc-io/evcc/releases/tag/0.114.0 --- pkgs/servers/home-automation/evcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 094c29c6e306..faadfff26e56 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGo120Module rec { pname = "evcc"; - version = "0.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; + hash = "sha256-YPqt1UfXP2LGSopQuM4PXQJG3MmXg+5VjDpBKpV5axI="; }; - vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; + vendorHash = "sha256-CNBwOVykQW7RUuf6oFTxO2DU6sd5IJVqN+6FPytQh+U="; npmDeps = fetchNpmDeps { inherit src; From ea0e64eb3fdf0f0ad477393060b7cc6f171ce86f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 19:20:56 +0000 Subject: [PATCH 041/203] libvirt: 9.0.0 -> 9.1.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b3e349beab14..c74f70892c5f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -112,13 +112,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8="; + sha256 = "sha256-V39p0kg+zGdoIY9mJjtMLk2xzlTjHG0SPR2GjvHK9FI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 36d45c5ac664..13916a74ea44 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU="; + sha256 = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8="; }; nativeBuildInputs = [ pkg-config ]; From e7071b166934180cb2d9808568859b8595983423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 21:56:18 +0000 Subject: [PATCH 042/203] stellar-core: 19.7.0 -> 19.8.0 --- pkgs/applications/blockchains/stellar-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 9d984803d219..6c6a4fa29a42 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.7.0"; + version = "19.8.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw="; + sha256 = "sha256-OaJztBOl5rDiCq+s1sXwuX+Yh+LSJtcnGIQeuMANLdU="; fetchSubmodules = true; }; From d23e7b1be4e9c3a3135ca07045fb809278b5bf9d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Mar 2023 09:41:09 +0000 Subject: [PATCH 043/203] ocamlPackages.elina: more precise meta.platforms --- pkgs/development/ocaml-modules/elina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index c0a4cbc31e30..de000f8aaf83 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://elina.ethz.ch/"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + platforms = lib.intersectLists ocaml.meta.platforms lib.platforms.x86; }; } From 688c4961cf969df7a1ecc05dfd4f1932fda192dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Mar 2023 12:17:17 +0000 Subject: [PATCH 044/203] gnuplot: 5.4.5 -> 5.4.6 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index e73f039e3160..5f96eb9f8d22 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZvZ5EV3TBVnhEEmPyU2SaUnU03C0mZoELnJLjpEO5Hg="; + sha256 = "sha256-AvwnkYIA7WTY8MO4T+gblbWc1HrZnycJOa5JfBnydBk="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; From c3c40d562c254c260b959f513424db6fba3cb7e9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 2 Mar 2023 15:13:33 +0200 Subject: [PATCH 045/203] uhd: 4.1.0.5 -> 4.4.0.0 Diff: https://github.com/EttusResearch/uhd/compare/v4.1.0.5...4.4.0.0 --- pkgs/applications/radio/uhd/default.nix | 13 +++++++++---- .../radio/uhd/no-adapter-tests.patch | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/radio/uhd/no-adapter-tests.patch diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6fa8462ec10c..3eb5b9a679dc 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "4.1.0.5"; + version = "4.4.0.0"; outputs = [ "out" "dev" ]; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { owner = "EttusResearch"; repo = "uhd"; rev = "v${version}"; - sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA="; + sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A="; + sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; }; cmakeFlags = [ @@ -116,7 +116,12 @@ stdenv.mkDerivation rec { preConfigure = "cd host"; # TODO: Check if this still needed, perhaps relevant: # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm - patches = if stdenv.isAarch32 then ./neon.patch else null; + patches = [ + # Disable tests that fail in the sandbox + ./no-adapter-tests.patch + ] ++ lib.optionals stdenv.isAarch32 [ + ./neon.patch + ]; postPhases = [ "installFirmware" "removeInstalledTests" ] ++ optionals (enableUtils) [ "moveUdevRules" ] diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/applications/radio/uhd/no-adapter-tests.patch new file mode 100644 index 000000000000..38865f418101 --- /dev/null +++ b/pkgs/applications/radio/uhd/no-adapter-tests.patch @@ -0,0 +1,17 @@ +diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt +index f40c252ad..b8a07d341 100644 +--- i/host/tests/CMakeLists.txt ++++ w/host/tests/CMakeLists.txt +@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST( + ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp + ) + +-UHD_ADD_NONAPI_TEST( +- TARGET "xport_adapter_ctrl_test.cpp" +- EXTRA_SOURCES +- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp +-) +- + ######################################################################## + # demo of a loadable module + ######################################################################## From 22ee36406c6aebb2a4df228a932e48944e9eca72 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 2 Mar 2023 15:13:05 +0200 Subject: [PATCH 046/203] volk: 2.5.0 -> 3.0.0 Diff: https://github.com/gnuradio/volk/compare/v2.5.0...3.0.0 --- pkgs/development/libraries/volk/2.5.0.nix | 61 +++++++++++++++++++++ pkgs/development/libraries/volk/default.nix | 19 ++----- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/libraries/volk/2.5.0.nix diff --git a/pkgs/development/libraries/volk/2.5.0.nix b/pkgs/development/libraries/volk/2.5.0.nix new file mode 100644 index 000000000000..76dbf133be9a --- /dev/null +++ b/pkgs/development/libraries/volk/2.5.0.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, python3 +, enableModTool ? true +, removeReferencesTo +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: + # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "gnuradio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + + cmakeFlags = lib.optionals (!enableModTool) [ + "-DENABLE_MODTOOL=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 + # volk_32f_log2_32f: fail on arch neon + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + ]; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + ''; + + nativeBuildInputs = [ + cmake + python3 + python3.pkgs.Mako + ]; + + doCheck = true; + + meta = with lib; { + homepage = "http://libvolk.org/"; + description = "The Vector Optimized Library of Kernels"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 503615926433..f5cec86e1400 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -1,41 +1,34 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , python3 , enableModTool ? true , removeReferencesTo -, fetchpatch }: stdenv.mkDerivation rec { pname = "volk"; - # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: - # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = pname; rev = "v${version}"; - sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; + hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; fetchSubmodules = true; }; - patches = [ + # Remove a failing test (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; - extraPrefix = ""; + url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch"; + hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4="; }) ]; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef967f8e43ed..62bf709b93f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6967,7 +6967,11 @@ with pkgs; volctl = callPackage ../tools/audio/volctl { }; - volk = callPackage ../development/libraries/volk { }; + volk = if (stdenv.isDarwin && stdenv.isAarch64) then + (callPackage ../development/libraries/volk/2.5.0.nix { }) + else + (callPackage ../development/libraries/volk { }) + ; vorta = libsForQt5.callPackage ../applications/backup/vorta { }; From 35157ceba3d60f3338cdc6b4f0846444e037282d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Mar 2023 16:23:17 +0000 Subject: [PATCH 047/203] pritunl-client: 1.3.3430.77 -> 1.3.3457.61 --- pkgs/tools/networking/pritunl-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index a5ecaa79e905..d940da901e10 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3430.77"; + version = "1.3.3457.61"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-tB6BAtLIlsU7mQmJ/Ec94X2r0mmGJlefc2NkyDhQ2Ek="; + sha256 = "sha256-tX+AUm8X1bRvR1Lb93Bwlxx+gm9Xvyw8Fn2odmEqiJA="; }; modRoot = "cli"; - vendorHash = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; + vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client From 5917a053a75affb24979b3962411e704d15bf9c3 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Fri, 3 Mar 2023 00:37:56 +0200 Subject: [PATCH 048/203] regreet: init at unstable-2023-02-27 --- .../display-managers/greetd/regreet.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/display-managers/greetd/regreet.nix diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix new file mode 100644 index 000000000000..e989d9782b1a --- /dev/null +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, glib +, gtk4 +, pango +}: + +rustPlatform.buildRustPackage { + pname = "regreet"; + version = "unstable-2023-02-27"; + + src = fetchFromGitHub { + owner = "rharish101"; + repo = "ReGreet"; + rev = "2bbabe90f112b4feeb0aea516c265daaec8ccf2a"; + hash = "sha256-71ji4x/NUE4qmBuO5PkWTPE1a0uPXqJSwW1Ai1amPJE="; + }; + + cargoHash = "sha256-rz2eMMhoMtzBXCH6ZJOvGuYLeHSWga+Ebc4+ZO8Kk1g="; + + buildFeatures = [ "gtk4_8" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib gtk4 pango ]; + + meta = with lib; { + description = "Clean and customizable greeter for greetd"; + homepage = "https://github.com/rharish101/ReGreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fufexan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 698edfa6b86e..4f31369c6be6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29608,6 +29608,7 @@ with pkgs; dlm = callPackage ../applications/display-managers/greetd/dlm.nix { }; greetd = callPackage ../applications/display-managers/greetd { }; gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; + regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; }; From 1023ebd4a0c06d5dc3eaeb92f98412b444eb94f5 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 2 Mar 2023 08:54:59 -0700 Subject: [PATCH 049/203] obsidian: 1.1.15 -> 1.1.16 - While here, add myself as a maintainer. - Remove @opeik per #219110. Closes #219110 --- pkgs/applications/misc/obsidian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ba618219bc52..a7af7ff8d373 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.15"; + version = "1.1.16"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; + sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw="; }; icon = fetchurl { From 7705b76cc1936920bccdedc0405b8a7dab641c08 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Fri, 3 Mar 2023 15:11:13 +0000 Subject: [PATCH 050/203] xpra: 4.3.3 -> 4.4.3 --- pkgs/tools/X11/xpra/default.nix | 6 ++++-- pkgs/tools/X11/xpra/fix-122159.patch | 22 +++++++++++----------- pkgs/tools/X11/xpra/fix-paths.patch | 23 ----------------------- 3 files changed, 15 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 72cb79388cfc..e51d5f386b1e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -20,6 +20,7 @@ , librsvg , libvpx , libwebp +, lz4 , nv-codec-headers-10 , nvidia_x11 ? null , pam @@ -68,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.3"; + version = "4.4.3"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A="; + hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8="; }; patches = [ @@ -122,6 +123,7 @@ in buildPythonApplication rec { librsvg libvpx libwebp + lz4 pam pango x264 diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch index fecc7e8130d1..510b40422a2a 100644 --- a/pkgs/tools/X11/xpra/fix-122159.patch +++ b/pkgs/tools/X11/xpra/fix-122159.patch @@ -1,16 +1,16 @@ diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 6def9e0ad..031f8aba9 100755 +index 031a41f9e..6232ba830 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): - "shadow", - ) and not display_is_remote: - if use_systemd_run(options.systemd_run): -- #make sure we run via the same interpreter, -- #inject it into the command line if we have to: - argv = list(cmdline) -- if argv[0].find("python")<0: -- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) - return systemd_run_wrap(mode, argv, options.systemd_run_args) +@@ -377,11 +377,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): + "seamless", "desktop", "shadow", "expand", + "upgrade", "upgrade-seamless", "upgrade-desktop", + ) and not display_is_remote and use_systemd_run(options.systemd_run): +- #make sure we run via the same interpreter, +- #inject it into the command line if we have to: + argv = list(cmdline) +- if argv[0].find("python")<0: +- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) + return systemd_run_wrap(mode, argv, options.systemd_run_args) configure_env(options.env) configure_logging(options, mode) diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index aee47a6ad53b..be9438f2616d 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -1,26 +1,3 @@ -diff --git a/setup.py b/setup.py -index fc67abb50a..c29db3a6d2 100755 ---- a/setup.py -+++ b/setup.py -@@ -2348,17 +2348,7 @@ if v4l2_ENABLED: - break - constants_pxi = "xpra/codecs/v4l2/constants.pxi" - if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi): -- ENABLE_DEVICE_CAPS = 0 -- if os.path.exists(videodev2_h): -- try: -- with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h, -- shell=True) as proc: -- ENABLE_DEVICE_CAPS = proc.wait()==0 -- except OSError: -- with open(videodev2_h) as f: -- hdata = f.read() -- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0) -- print("failed to detect device caps, assuming off") -+ ENABLE_DEVICE_CAPS = 1 - with open(constants_pxi, "wb") as f: - f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS) - add_cython_ext("xpra.codecs.v4l2.pusher", diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py index d5c1c8bb10..88c77e8142 100755 --- a/xpra/x11/fakeXinerama.py From 94bbbb047180b59ef6f25f4d89e7a12b5fc6db63 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 25 Feb 2023 16:32:55 +0200 Subject: [PATCH 051/203] cudaPackages: point nvcc at a compatible -ccbin This is a hot-fix to un-break cuda-enabled packages (like tensorflow, jaxlib, faiss, opencv, ...) after the gcc11->gcc12 bump. We should probably build the whole downstream packages with a compatible stdenv (such as gcc11Stdenv for cudaPackages_11), but just pointing nvcc at the right compiler seems to do the trick We already used this hack for non-redist cudatoolkit. Now we use it more consistently. This commit also re-links cuda packages against libstdc++ from the same "compatible" gcc, rather than the current stdenv. We didn't test if this is necessary -> need to revise in further PRs. NOTE: long-term we should make it possible to override -ccbin and use e.g. clang --- .../compilers/cudatoolkit/common.nix | 40 +++++++++++++++---- .../redist/build-cuda-redist-package.nix | 14 ++++++- .../cudatoolkit/redist/overrides.nix | 39 +++++++++++++++++- .../libraries/science/math/nccl/default.nix | 31 ++++++++++---- 4 files changed, 106 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index e986ae2dc14d..a94f6fbdaf73 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -151,9 +151,31 @@ stdenv.mkDerivation rec { mkdir -p $out/nix-support echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook - # Set the host compiler to be used by nvcc for CMake-based projects: + # Set the host compiler to be used by nvcc. + # FIXME: redist cuda_nvcc copy-pastes this code + + # For CMake-based projects: # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + # For non-CMake projects: + # FIXME: results in "incompatible redefinition" warnings ...but we keep + # both this and cmake variables until we come up with a more general + # solution + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + + cat <> $out/nix-support/setup-hook + + cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin' + cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${gcc}/bin' + if [ -z "\''${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX=${gcc}/bin; + fi + + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${gcc}/bin' + EOF + # Move some libraries to the lib output so that programs that # depend on them don't pull in this entire monstrosity. @@ -167,10 +189,6 @@ stdenv.mkDerivation rec { mv $out/extras/CUPTI/lib64/libcupti* $out/lib ''} - # Set compiler for NVCC. - wrapProgram $out/bin/nvcc \ - --prefix PATH : ${gcc}/bin - # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set wrapProgram $out/bin/nvprof \ --prefix LD_LIBRARY_PATH : $out/lib @@ -191,7 +209,15 @@ stdenv.mkDerivation rec { preFixup = let rpath = lib.concatStringsSep ":" [ (lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ])) - "${stdenv.cc.cc.lib}/lib64" + + # The path to libstdc++ and such + # + # NB: + # 1. "gcc" (gcc-wrapper) here is what's exposed as cudaPackages.cudatoolkit.cc + # 2. "gcc.cc" is the unwrapped gcc + # 3. "gcc.cc.lib" is one of its outputs + "${gcc.cc.lib}/lib64" + "$out/jre/lib/amd64/jli" "$out/lib64" "$out/nvvm/lib64" diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 9bbd7ea1da11..3bf9184eefab 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -10,7 +10,8 @@ attrs: let arch = "linux-x86_64"; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname; inherit (attrs) version; @@ -29,7 +30,14 @@ in stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + # autoPatchelfHook will search for a libstdc++ and we're giving it a + # "compatible" libstdc++ from the same toolchain that NVCC uses. + # + # E.g. it might happen that stdenv=gcc12Stdenv, but we build against cuda11 + # that only "supports" gcc11. Linking against gcc12's libraries we might + # sometimes actually sometimes encounter dynamic linkage errors at runtime + # NB: We don't actually know if this is the right thing to do + cudatoolkit.cc.cc.lib ]; dontBuild = true; @@ -43,6 +51,8 @@ in stdenv.mkDerivation { runHook postInstall ''; + passthru.stdenv = stdenv; + meta = { description = attrs.name; license = lib.licenses.unfree; diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index bcf16db6e12e..663af1db7632 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -1,6 +1,8 @@ -final: prev: let +final: prev: +let inherit (prev) lib pkgs; -in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { +in +(lib.filterAttrs (attr: _: (prev ? "${attr}")) { ### Overrides to fix the components of cudatoolkit-redist # Attributes that don't exist in the previous set are removed. @@ -20,6 +22,39 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { prev.libcublas ]; + cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: + let + inherit (prev.cudatoolkit) cc; + in + { + # Point NVCC at a compatible compiler + # FIXME: non-redist cudatoolkit copy-pastes this code + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + postInstall = (oldAttrs.postInstall or "") + '' + mkdir -p $out/nix-support + cat <> $out/nix-support/setup-hook + cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' + cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' + cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' + if [ -z "\''${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX=${cc}/bin; + fi + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin' + EOF + ''; + }); + cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 99aed3a6a30e..df76cda96b1d 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }: -let - inherit (cudaPackages) cudatoolkit; -in +with cudaPackages; stdenv.mkDerivation rec { - name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; + name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; version = "2.16.5-1"; src = fetchFromGitHub { @@ -17,16 +15,35 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ which addOpenGLRunpath ]; + nativeBuildInputs = [ + which + addOpenGLRunpath + cuda_nvcc + ]; - buildInputs = [ cudatoolkit ]; + buildInputs = [ + cuda_cudart + ]; preConfigure = '' patchShebangs src/collectives/device/gen_rules.sh + '' + # We need NVCC to use a compatible backend compiler (we maintain a link to + # that in `cudatoolkit.cc`). We ship NVCC with a setup-hook that *prepends* + # the correct -ccbin to nvcc flags. NCCL's Makefile, however, appends another + # -ccbin, which points at the host platform's compiler, coming from the + # `stdenv`. Confer + # https://github.com/NVIDIA/nccl/blob/f3d51667838f7542df8ea32ea4e144d812b3ed7c/makefiles/common.mk#L65 + # Since NVCC will use the last -ccbin on the command-line, we append the correct path again. + # We hope it's a temporary solution + + '' + export NVCC_APPEND_FLAGS+=' --compiler-bindir=${cudatoolkit.cc}/bin' ''; makeFlags = [ - "CUDA_HOME=${cudatoolkit}" + "CUDA_HOME=${cuda_nvcc}" + "CUDA_LIB=${cuda_cudart}/lib64" + "CUDA_INC=${cuda_cudart}/include" "PREFIX=$(out)" ]; From cf7fb1d08f928f48725f15e595cbb84793278379 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 27 Feb 2023 14:54:09 +0200 Subject: [PATCH 052/203] python3Packages.tensorflow: add cudaCapabilities argument Rearrange tensorflow to allow overriding cudaCapabilities. This is needed when debugging the tensorflow derivation --- pkgs/development/compilers/cudatoolkit/flags.nix | 3 +-- pkgs/development/python-modules/tensorflow/default.nix | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 8e1e54723b2e..9d7b7f884ad2 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -1,6 +1,6 @@ { config , lib -, cudatoolkit +, cudaVersion }: # Type aliases @@ -13,7 +13,6 @@ let inherit (lib) attrsets lists strings trivial versions; - cudaVersion = cudatoolkit.version; # Flags are determined based on your CUDA toolkit by default. You may benefit # from improved performance, reduced file size, or greater hardware suppport by diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f7d920c37221..f18a924c31fa 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -17,7 +17,9 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false, cudaPackages ? {} +, cudaSupport ? false +, cudaPackages ? { } +, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken @@ -30,7 +32,7 @@ }: let - inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; + inherit (cudaPackages) cudatoolkit cudnn nccl; in assert cudaSupport -> cudatoolkit != null @@ -301,7 +303,7 @@ let TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches; + TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 From 79397957e876ef7fe6eccbcb58d23fb5c58f121c Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 27 Feb 2023 16:21:56 +0200 Subject: [PATCH 053/203] cudaPackages.nccl: respect cudaCapabilities --- .../libraries/science/math/nccl/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index df76cda96b1d..c047961c6c00 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }: +{ lib +, backendStdenv +, fetchFromGitHub +, which +, cudaPackages ? { } +, addOpenGLRunpath +}: with cudaPackages; -stdenv.mkDerivation rec { +let + # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" + gencode = lib.concatStringsSep " " cudaFlags.cudaGencode; +in +backendStdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; version = "2.16.5-1"; @@ -27,17 +37,9 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs src/collectives/device/gen_rules.sh - '' - # We need NVCC to use a compatible backend compiler (we maintain a link to - # that in `cudatoolkit.cc`). We ship NVCC with a setup-hook that *prepends* - # the correct -ccbin to nvcc flags. NCCL's Makefile, however, appends another - # -ccbin, which points at the host platform's compiler, coming from the - # `stdenv`. Confer - # https://github.com/NVIDIA/nccl/blob/f3d51667838f7542df8ea32ea4e144d812b3ed7c/makefiles/common.mk#L65 - # Since NVCC will use the last -ccbin on the command-line, we append the correct path again. - # We hope it's a temporary solution - + '' - export NVCC_APPEND_FLAGS+=' --compiler-bindir=${cudatoolkit.cc}/bin' + makeFlagsArray+=( + "NVCC_GENCODE=${gencode}" + ) ''; makeFlags = [ From e305011223c940a8dd661f64eb5cd5384c15ddbe Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 1 Mar 2023 16:39:04 +0200 Subject: [PATCH 054/203] cudaPackages_12.nccl: fix new missing inputs --- pkgs/development/libraries/science/math/nccl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c047961c6c00..4f82de8e8b6f 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -33,6 +33,8 @@ backendStdenv.mkDerivation rec { buildInputs = [ cuda_cudart + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [ + cuda_cccl ]; preConfigure = '' From d378cc6fb23d67f3d9f86c39051f810c563789ca Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 27 Feb 2023 14:58:14 +0200 Subject: [PATCH 055/203] opencv4: respect config.cudaCapabilities This is needed for faster builds when debugging the opencv derivation, and it's more consistent with other cuda-enabled packages -DCUDA_GENERATION seems to expect architecture names, so we refactor cudaFlags to facilitate easier extraction of the configured archnames --- .../science/math/mxnet/default.nix | 2 +- .../compilers/cudatoolkit/flags.nix | 134 +++++++++++------- pkgs/development/libraries/opencv/4.x.nix | 13 +- .../libraries/science/math/magma/generic.nix | 6 +- .../libraries/science/math/nccl/default.nix | 2 +- .../python-modules/jaxlib/default.nix | 2 +- 6 files changed, 99 insertions(+), 60 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index c1a329c60886..240a1759397f 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 9d7b7f884ad2..a43485a7dcfd 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -18,8 +18,15 @@ let # from improved performance, reduced file size, or greater hardware suppport by # passing a configuration based on your specific GPU environment. # - # config.cudaCapabilities: list of hardware generations to support (e.g., "8.0") - # config.cudaForwardCompat: bool for compatibility with future GPU generations + # config.cudaCapabilities :: List Capability + # List of hardware generations to build + # Last item is considered the optional forward-compatibility arch + # E.g. [ "8.0" ] + # + # config.cudaForwardCompat :: Bool + # Whether to include the forward compatibility gencode (+PTX) + # to support future GPU generations: + # E.g. true # # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 @@ -39,6 +46,9 @@ let # GPUs which are supported by the provided CUDA version. supportedGpus = builtins.filter isSupported gpus; + # supportedCapabilities :: List Capability + supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus; + # cudaArchNameToVersions :: AttrSet String (List String) # Maps the name of a GPU architecture to different versions of that architecture. # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. @@ -49,12 +59,6 @@ let (gpu: gpu.archName) supportedGpus; - # cudaArchNames :: List String - # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here; - # otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them - # from is already sorted, so we'll preserve that order here. - cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus); - # cudaComputeCapabilityToName :: AttrSet String String # Maps the version of a GPU architecture to the name of that architecture. # For example, "8.0" maps to "Ampere". @@ -67,23 +71,6 @@ let supportedGpus ); - # cudaComputeCapabilities :: List String - # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here; - # otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them - # from is already sorted, so we'll preserve that order here. - # Use the user-provided list of CUDA capabilities if it's provided. - cudaComputeCapabilities = config.cudaCapabilities - or (lists.map (gpu: gpu.computeCapability) supportedGpus); - - # cudaForwardComputeCapability :: String - cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX"; - - # cudaComputeCapabilitiesAndForward :: List String - # The list of supported CUDA architectures, including the forward compatibility architecture. - # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities. - cudaComputeCapabilitiesAndForward = cudaComputeCapabilities - ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability; - # dropDot :: String -> String dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; @@ -101,38 +88,79 @@ let "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" ); - # cudaRealArches :: List String - # The real architectures are physical architectures supported by the CUDA version. - # For example, "sm_80". - cudaRealArches = archMapper "sm" cudaComputeCapabilities; + formatCapabilities = { cudaCapabilities, enableForwardCompat ? true }: rec { + inherit cudaCapabilities enableForwardCompat; - # cudaVirtualArches :: List String - # The virtual architectures are typically used for forward compatibility, when trying to support - # an architecture newer than the CUDA version allows. - # For example, "compute_80". - cudaVirtualArches = archMapper "compute" cudaComputeCapabilities; + # forwardCapability :: String + # Forward "compute" capability, a.k.a PTX + # E.g. "8.6+PTX" + forwardCapability = (lists.last cudaCapabilities) + "+PTX"; - # cudaArches :: List String - # By default, build for all supported architectures and forward compatibility via a virtual - # architecture for the newest supported architecture. - cudaArches = cudaRealArches ++ - lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches); + # capabilitiesAndForward :: List String + # The list of supported CUDA architectures, including the forward compatibility architecture. + # If forward compatibility is disabled, this will be the same as cudaCapabilities. + # E.g. [ "7.5" "8.6" "8.6+PTX" ] + capabilitiesAndForward = cudaCapabilities ++ lists.optionals enableForwardCompat [ forwardCapability ]; - # cudaGencode :: List String - # A list of CUDA gencode arguments to pass to NVCC. - cudaGencode = - let - base = gencodeMapper "sm" cudaComputeCapabilities; - forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ]; - in - base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat; + # archNames :: List String + # E.g. [ "Turing" "Ampere" ] + archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities); + + # realArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # E.g. [ "sm_75" "sm_86" ] + realArches = archMapper "sm" cudaCapabilities; + + # virtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # E.g. [ "compute_75" "compute_86" ] + virtualArches = archMapper "compute" cudaCapabilities; + + # arches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + # E.g. [ "sm_75" "sm_86" "compute_86" ] + arches = realArches ++ + lists.optional enableForwardCompat (lists.last virtualArches); + + # gencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + # E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ] + gencode = + let + base = gencodeMapper "sm" cudaCapabilities; + forward = gencodeMapper "compute" [ (lists.last cudaCapabilities) ]; + in + base ++ lib.optionals enableForwardCompat forward; + }; in +# When changing names or formats: pause, validate, and update the assert +assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { + cudaCapabilities = [ "7.5" "8.6" ]; + enableForwardCompat = true; + + capabilitiesAndForward = [ "7.5" "8.6" "8.6+PTX" ]; + forwardCapability = "8.6+PTX"; + + archNames = [ "Turing" "Ampere" ]; + realArches = [ "sm_75" "sm_86" ]; + virtualArches = [ "compute_75" "compute_86" ]; + arches = [ "sm_75" "sm_86" "compute_86" ]; + + gencode = [ "-gencode=arch=compute_75,code=sm_75" "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_86,code=compute_86" ]; +}; { - inherit - cudaArchNames - cudaArchNameToVersions cudaComputeCapabilityToName - cudaRealArches cudaVirtualArches cudaArches - cudaGencode; - cudaCapabilities = cudaComputeCapabilitiesAndForward; + # formatCapabilities :: { cudaCapabilities: List Capability, cudaForwardCompat: Boolean } -> { ... } + inherit formatCapabilities; + + # cudaArchNameToVersions :: String => String + inherit cudaArchNameToVersions; + + # cudaComputeCapabilityToName :: String => String + inherit cudaComputeCapabilityToName; +} // formatCapabilities { + cudaCapabilities = config.cudaCapabilities or supportedCapabilities; + enableForwardCompat = config.cudaForwardCompat or true; } diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ac021c2b6108..a9f7b0304e84 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 -, cudatoolkit +, cudaPackages ? { } , nvidia-optical-flow-sdk , enableUnfree ? false @@ -79,6 +79,9 @@ }: let + inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages.cudaFlags) cudaCapabilities; + version = "4.7.0"; src = fetchFromGitHub { @@ -342,6 +345,14 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + + # OpenCV respects at least three variables: + # -DCUDA_GENERATION takes a single arch name, e.g. Volta + # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6" + # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6" + "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" + "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" + "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index ab0a2125ec00..e27107ca15d8 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -37,13 +37,13 @@ let # lists.subtractLists a b = b - a # For CUDA - supportedCudaSmArches = lists.intersectLists cudaFlags.cudaRealArches supportedGpuTargets; + supportedCudaSmArches = lists.intersectLists cudaFlags.realArches supportedGpuTargets; # Subtract the supported SM architectures from the real SM architectures to get the unsupported # SM architectures. - unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.cudaRealArches; + unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.realArches; # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.cudaRealArches. + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 4f82de8e8b6f..155e863bf21e 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -10,7 +10,7 @@ with cudaPackages; let # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" - gencode = lib.concatStringsSep " " cudaFlags.cudaGencode; + gencode = lib.concatStringsSep " " cudaFlags.gencode; in backendStdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 2c13defe4383..ad48af827ee5 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -164,7 +164,7 @@ let build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" '' + '' CFG ''; From 5f4bdbe6c387bf740025581d94bbfba9a887c76f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 27 Feb 2023 16:28:07 +0200 Subject: [PATCH 056/203] python3Packages.tensorflow: fix `GLIBCXX_3.4.30' not found Make tensorflow (and a bunch of ther things) use CUDA-compatible toolchain. Introduces cudaPackages.backendStdenv --- .../compilers/cudatoolkit/common.nix | 54 +++++++------------ .../compilers/cudatoolkit/extension.nix | 19 +++++-- .../redist/build-cuda-redist-package.nix | 11 ++-- .../cudatoolkit/redist/overrides.nix | 3 +- .../libraries/science/math/cudnn/generic.nix | 8 +-- .../science/math/tensorrt/generic.nix | 8 +-- .../python-modules/tensorflow/default.nix | 46 +++++++++++----- .../cuda/cuda-library-samples/generic.nix | 8 +-- 8 files changed, 88 insertions(+), 69 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index a94f6fbdaf73..e6d7cbc377cf 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -11,7 +11,7 @@ args@ , fetchurl , fontconfig , freetype -, gcc +, gcc # :: String , gdk-pixbuf , glib , glibc @@ -22,13 +22,13 @@ args@ , perl , python3 , requireFile -, stdenv +, backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC , xorg , zlib }: -stdenv.mkDerivation rec { +backendStdenv.mkDerivation rec { pname = "cudatoolkit"; inherit version runPatches; @@ -146,37 +146,24 @@ stdenv.mkDerivation rec { # Fix builds with newer glibc version sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" - - # Ensure that cmake can find CUDA. + '' + + # Point NVCC at a compatible compiler + # FIXME: redist cuda_nvcc copy-pastes this code + # Refer to comments in the overrides for cuda_nvcc for explanation + # CUDA_TOOLKIT_ROOT_DIR is legacy, + # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + '' mkdir -p $out/nix-support - echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook - - # Set the host compiler to be used by nvcc. - # FIXME: redist cuda_nvcc copy-pastes this code - - # For CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html - # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html - - # For non-CMake projects: - # FIXME: results in "incompatible redefinition" warnings ...but we keep - # both this and cmake variables until we come up with a more general - # solution - # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin - cat <> $out/nix-support/setup-hook - - cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${gcc}/bin' + cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' + cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin' + cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin' if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${gcc}/bin; + export CUDAHOSTCXX=${backendStdenv.cc}/bin; fi - - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${gcc}/bin' + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin' EOF - # Move some libraries to the lib output so that programs that # depend on them don't pull in this entire monstrosity. mkdir -p $lib/lib @@ -212,11 +199,10 @@ stdenv.mkDerivation rec { # The path to libstdc++ and such # - # NB: - # 1. "gcc" (gcc-wrapper) here is what's exposed as cudaPackages.cudatoolkit.cc - # 2. "gcc.cc" is the unwrapped gcc - # 3. "gcc.cc.lib" is one of its outputs - "${gcc.cc.lib}/lib64" + # `backendStdenv` is the cuda-compatible toolchain that we pick in + # extension.nix; we hand it to NVCC to use as a back-end, and we link + # cudatoolkit's binaries against its libstdc++ + "${backendStdenv.cc.cc.lib}/lib64" "$out/jre/lib/amd64/jli" "$out/lib64" @@ -286,7 +272,7 @@ stdenv.mkDerivation rec { popd ''; passthru = { - cc = gcc; + cc = backendStdenv.cc; majorMinorVersion = lib.versions.majorMinor version; majorVersion = lib.versions.majorMinor version; }; diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index c11f12b118a2..72cab97f8ffc 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -7,11 +7,24 @@ final: prev: let # Version info for the classic cudatoolkit packages that contain everything that is in redist. cudatoolkitVersions = final.lib.importTOML ./versions.toml; + finalVersion = cudatoolkitVersions.${final.cudaVersion}; + + # Exposed as cudaPackages.backendStdenv. + # We don't call it just "stdenv" to avoid confusion: e.g. this toolchain doesn't contain nvcc. + # Instead, it's the back-end toolchain for nvcc to use. + # We also use this to link a compatible libstdc++ (backendStdenv.cc.cc.lib) + # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context + backendStdenv = prev.pkgs."${finalVersion.gcc}Stdenv"; + ### Add classic cudatoolkit package - cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion}); + cudatoolkit = buildCudaToolkitPackage (finalVersion // { inherit backendStdenv; }); cudaFlags = final.callPackage ./flags.nix {}; -in { - inherit cudatoolkit cudaFlags; +in +{ + inherit + backendStdenv + cudatoolkit + cudaFlags; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 3bf9184eefab..1b216ee625a8 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, backendStdenv , fetchurl , autoPatchelfHook , autoAddOpenGLRunpathHook @@ -11,7 +11,7 @@ attrs: let arch = "linux-x86_64"; in -stdenv.mkDerivation { +backendStdenv.mkDerivation { inherit pname; inherit (attrs) version; @@ -33,11 +33,8 @@ stdenv.mkDerivation { # autoPatchelfHook will search for a libstdc++ and we're giving it a # "compatible" libstdc++ from the same toolchain that NVCC uses. # - # E.g. it might happen that stdenv=gcc12Stdenv, but we build against cuda11 - # that only "supports" gcc11. Linking against gcc12's libraries we might - # sometimes actually sometimes encounter dynamic linkage errors at runtime # NB: We don't actually know if this is the right thing to do - cudatoolkit.cc.cc.lib + backendStdenv.cc.cc.lib ]; dontBuild = true; @@ -51,7 +48,7 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.stdenv = stdenv; + passthru.stdenv = backendStdenv; meta = { description = attrs.name; diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 663af1db7632..96b782d8c990 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -24,7 +24,7 @@ in cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: let - inherit (prev.cudatoolkit) cc; + inherit (prev.backendStdenv) cc; in { # Point NVCC at a compatible compiler @@ -44,7 +44,6 @@ in postInstall = (oldAttrs.postInstall or "") + '' mkdir -p $out/nix-support cat <> $out/nix-support/setup-hook - cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' if [ -z "\''${CUDAHOSTCXX-}" ]; then diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index d4e1f641a956..b2844ae6b074 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,11 +1,11 @@ { - stdenv, + backendStdenv, lib, zlib, useCudatoolkitRunfile ? false, cudaVersion, cudaMajorVersion, - cudatoolkit, # if cuda>=11: only used for .cc + cudatoolkit, # For cuda < 11 libcublas ? null, # cuda <11 doesn't ship redist packages autoPatchelfHook, autoAddOpenGLRunpathHook, @@ -26,7 +26,7 @@ maxCudaVersion, }: assert useCudatoolkitRunfile || (libcublas != null); let - inherit (cudatoolkit) cc; + inherit (backendStdenv) cc; inherit (lib) lists strings trivial versions; # majorMinorPatch :: String -> String @@ -46,7 +46,7 @@ assert useCudatoolkitRunfile || (libcublas != null); let then cudatoolkit else libcublas; in - stdenv.mkDerivation { + backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; version = versionTriple; diff --git a/pkgs/development/libraries/science/math/tensorrt/generic.nix b/pkgs/development/libraries/science/math/tensorrt/generic.nix index 3447087051f1..31090f715c22 100644 --- a/pkgs/development/libraries/science/math/tensorrt/generic.nix +++ b/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, backendStdenv , requireFile , autoPatchelfHook , autoAddOpenGLRunpathHook @@ -18,7 +18,7 @@ assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; -stdenv.mkDerivation rec { +backendStdenv.mkDerivation rec { pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; version = fullVersion; src = requireFile rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Used by autoPatchelfHook buildInputs = [ - cudatoolkit.cc.cc.lib # libstdc++ + backendStdenv.cc.cc.lib # libstdc++ cudatoolkit cudnn ]; @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" ''; + passthru.stdenv = backendStdenv; + meta = with lib; { # Check that the cudatoolkit version satisfies our min/max constraints (both # inclusive). We mark the package as broken if it fails to satisfies the diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f18a924c31fa..adc7b1c1e0b3 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -32,6 +32,26 @@ }: let + originalStdenv = stdenv; +in +let + # Tensorflow looks at many toolchain-related variables which may diverge. + # + # Toolchain for cuda-enabled builds. + # We want to achieve two things: + # 1. NVCC should use a compatible back-end (e.g. gcc11 for cuda11) + # 2. Normal C++ files should be compiled with the same toolchain, + # to avoid potential weird dynamic linkage errors at runtime. + # This may not be necessary though + # + # Toolchain for Darwin: + # clang 7 fails to emit a symbol for + # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the + # translation units, so the build fails at link time + stdenv = + if cudaSupport then cudaPackages.backendStdenv + else if originalStdenv.isDarwin then llvmPackages_11.stdenv + else originalStdenv; inherit (cudaPackages) cudatoolkit cudnn nccl; in @@ -44,6 +64,7 @@ assert ! (stdenv.isDarwin && cudaSupport); let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; + # FIXME: migrate to redist cudaPackages cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; paths = [ @@ -56,10 +77,13 @@ let ]; }; + # Tensorflow expects bintools at hard-coded paths, e.g. /usr/bin/ar + # The only way to overcome that is to set GCC_HOST_COMPILER_PREFIX, + # but that path must contain cc as well, so we merge them cudatoolkit_cc_joined = symlinkJoin { - name = "${cudatoolkit.cc.name}-merged"; + name = "${stdenv.cc.name}-merged"; paths = [ - cudatoolkit.cc + stdenv.cc binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip ]; }; @@ -175,12 +199,7 @@ let ''; }) else _bazel-build; - _bazel-build = (buildBazelPackage.override (lib.optionalAttrs stdenv.isDarwin { - # clang 7 fails to emit a symbol for - # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the - # translation units, so the build fails at link time - stdenv = llvmPackages_11.stdenv; - })) { + _bazel-build = buildBazelPackage.override { inherit stdenv; } { name = "${pname}-${version}"; bazel = bazel_5; @@ -211,12 +230,13 @@ let flatbuffers-core giflib grpc - icu + # Necessary to fix the "`GLIBCXX_3.4.30' not found" error + (icu.override { inherit stdenv; }) jsoncpp libjpeg_turbo libpng lmdb-core - pybind11 + (pybind11.overridePythonAttrs (_: { inherit stdenv; })) snappy sqlite ] ++ lib.optionals cudaSupport [ @@ -301,10 +321,12 @@ let TF_NEED_CUDA = tfFeature cudaSupport; TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; - GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; - GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; + # Needed even when we override stdenv: e.g. for ar + GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc"; + postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index e01664bab319..e9a481c94a7a 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, backendStdenv, fetchFromGitHub , cmake, addOpenGLRunpath , cudatoolkit , cutensor @@ -35,13 +35,13 @@ let in { - cublas = stdenv.mkDerivation (commonAttrs // { + cublas = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cublas"; src = "${src}/cuBLASLt"; }); - cusolver = stdenv.mkDerivation (commonAttrs // { + cusolver = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cusolver"; src = "${src}/cuSOLVER"; @@ -49,7 +49,7 @@ in sourceRoot = "cuSOLVER/gesv"; }); - cutensor = stdenv.mkDerivation (commonAttrs // { + cutensor = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cutensor"; src = "${src}/cuTENSOR"; From 17248123b6ae01b89a25de730ea890276acd69b2 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 28 Feb 2023 18:07:45 +0200 Subject: [PATCH 057/203] cudaPackages_12: use gcc12 --- pkgs/development/compilers/cudatoolkit/versions.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 7e9fcae3271a..a201a4a263f5 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -76,8 +76,4 @@ gcc = "gcc11" version = "12.0.1" url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run" sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=" -# CUDA 12 is compatible with gcc12, but nixpkgs default gcc is still on gcc11 as -# of 2023-01-08. See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements. -# This should be upgraded to gcc12 once nixpkgs default gcc is upgraded. Other -# CUDA versions should likely have their gcc versions upgraded as well. -gcc = "gcc11" +gcc = "gcc12" From 2b69d618c28bdcbc822843a534c2cb74542ec972 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 1 Mar 2023 23:52:07 +0200 Subject: [PATCH 058/203] opencv3: respect config.cudaCapabilities --- pkgs/development/libraries/opencv/3.x.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e1a13c9fe573..75d8c712df1f 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,8 +15,8 @@ , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && - stdenv.hostPlatform.isx86_64, cudatoolkit - + stdenv.hostPlatform.isx86_64 +, cudaPackages ? { } , enableUnfree ? false , enableIpp ? false , enablePython ? false, pythonPackages ? null @@ -40,6 +40,9 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let + inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages.cudaFlags) cudaCapabilities; + version = "3.4.18"; src = fetchFromGitHub { @@ -242,6 +245,8 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" + "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" From c376c54f70b91c68f6f2ddc90838b57a82b12ecd Mon Sep 17 00:00:00 2001 From: Someone Date: Thu, 2 Mar 2023 17:47:47 +0000 Subject: [PATCH 059/203] cudaPackages.cudatoolkit: refactor inheriting passthru.cc Co-authored-by: Connor Baker --- pkgs/development/compilers/cudatoolkit/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index e6d7cbc377cf..1195f7be7de6 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -272,7 +272,7 @@ backendStdenv.mkDerivation rec { popd ''; passthru = { - cc = backendStdenv.cc; + inherit (backendStdenv) cc; majorMinorVersion = lib.versions.majorMinor version; majorVersion = lib.versions.majorMinor version; }; From 8bf5f5ac893ff07406a3a1979d944c2a86cfc887 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 3 Mar 2023 02:19:50 +0200 Subject: [PATCH 060/203] magma: use CMAKE_CUDA_ARCHITECTURES directly --- .../compilers/cudatoolkit/flags.nix | 3 ++ .../libraries/science/math/magma/generic.nix | 42 ++++++++++++------- .../libraries/science/math/magma/releases.nix | 31 +------------- 3 files changed, 30 insertions(+), 46 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index a43485a7dcfd..b65219369404 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -160,6 +160,9 @@ assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { # cudaComputeCapabilityToName :: String => String inherit cudaComputeCapabilityToName; + + # dropDot :: String -> String + inherit dropDot; } // formatCapabilities { cudaCapabilities = config.cudaCapabilities or supportedCapabilities; enableForwardCompat = config.cudaForwardCompat or true; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index e27107ca15d8..f61f1877019b 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -11,7 +11,8 @@ , cudaSupport ? true , fetchurl , gfortran -, gpuTargets ? [ ] +, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities +, gpuTargets ? [ ] # Non-CUDA targets, that is HIP , hip , hipblas , hipsparse @@ -36,12 +37,6 @@ let # of the first list *from* the second list. That means: # lists.subtractLists a b = b - a - # For CUDA - supportedCudaSmArches = lists.intersectLists cudaFlags.realArches supportedGpuTargets; - # Subtract the supported SM architectures from the real SM architectures to get the unsupported - # SM architectures. - unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.realArches; - # For ROCm # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must @@ -62,19 +57,32 @@ let ) supported; - # Create the gpuTargetString. gpuTargetString = strings.concatStringsSep "," ( if gpuTargets != [ ] then # If gpuTargets is specified, it always takes priority. gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets - else if cudaSupport then - gpuArchWarner supportedCudaSmArches unsupportedCudaSmArches else if rocmSupport then gpuArchWarner supportedRocmArches unsupportedRocmArches + else if cudaSupport then + [ ] # It's important we pass explicit -DGPU_TARGET to reset magma's defaults else throw "No GPU targets specified" ); + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities); + + cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures; + minArch = + let + minArch' = builtins.head (builtins.sort builtins.lessThan cudaArchitectures); + in + # If this fails some day, something must've changed and we should re-validate our assumptions + assert builtins.stringLength minArch' == 2; + # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 + "${minArch'}0"; + + cuda_joined = symlinkJoin { name = "cuda-redist-${cudaVersion}"; paths = with cudaPackages; [ @@ -87,6 +95,8 @@ let }; in +assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; + stdenv.mkDerivation { pname = "magma"; inherit version; @@ -116,7 +126,11 @@ stdenv.mkDerivation { openmp ]; - cmakeFlags = lists.optionals cudaSupport [ + cmakeFlags = [ + "-DGPU_TARGET=${gpuTargetString}" + ] ++ lists.optionals cudaSupport [ + "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" + "-DMIN_ARCH=${minArch}" # Disarms magma's asserts "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++" "-DMAGMA_ENABLE_CUDA=ON" @@ -126,14 +140,10 @@ stdenv.mkDerivation { "-DMAGMA_ENABLE_HIP=ON" ]; - # NOTE: We must set GPU_TARGET in preConfigure in this way because it may contain spaces. - preConfigure = '' - cmakeFlagsArray+=("-DGPU_TARGET=${gpuTargetString}") - '' # NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of # CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set # CUDAHOSTCXX. - + strings.optionalString cudaSupport '' + preConfigure = strings.optionalString cudaSupport '' export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++ ''; diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix index 3d08aa95d4d1..029f418edce3 100644 --- a/pkgs/development/libraries/science/math/magma/releases.nix +++ b/pkgs/development/libraries/science/math/magma/releases.nix @@ -1,27 +1,13 @@ # NOTE: Order matters! Put the oldest version first, and the newest version last. # NOTE: Make sure the supportedGpuTargets are in order of oldest to newest. # You can update the supportedGpuTargets by looking at the CMakeLists.txt file. -# CUDA starts here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-175 # HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386 +# CUDA works around magma's wrappers and uses FindCUDAToolkit directly [ { version = "2.6.2"; hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; supportedGpuTargets = [ - "sm_20" - "sm_30" - "sm_35" - "sm_37" - "sm_50" - "sm_52" - "sm_53" - "sm_60" - "sm_61" - "sm_62" - "sm_70" - "sm_71" - "sm_75" - "sm_80" "700" "701" "702" @@ -53,21 +39,6 @@ version = "2.7.1"; hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; supportedGpuTargets = [ - "sm_20" - "sm_30" - "sm_35" - "sm_37" - "sm_50" - "sm_52" - "sm_53" - "sm_60" - "sm_61" - "sm_62" - "sm_70" - "sm_71" - "sm_75" - "sm_80" - "sm_90" "700" "701" "702" From dd2b27692e8a32316d263b938bddfa515eb2775a Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 3 Mar 2023 03:23:40 +0200 Subject: [PATCH 061/203] magma: explain `cudaSupport ? true` --- pkgs/development/libraries/science/math/magma/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index f61f1877019b..c997fcc09013 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -8,6 +8,11 @@ { blas , cmake , cudaPackages + # FIXME: cuda being unfree means ofborg won't eval "magma". + # respecting config.cudaSupport -> false by default + # -> ofborg eval -> throws "no GPU targets specified". + # Probably should delete everything but "magma-cuda" and "magma-hip" + # from all-packages.nix , cudaSupport ? true , fetchurl , gfortran From 0c25f5aa7ffb4ed9d4015fc273f51d08ff2a279b Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 3 Mar 2023 03:42:58 +0200 Subject: [PATCH 062/203] cudaPackages.cudatoolkit: remove unused gcc argument --- pkgs/development/compilers/cudatoolkit/common.nix | 1 - pkgs/development/compilers/cudatoolkit/extension.nix | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 1195f7be7de6..fb3b50b98150 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -11,7 +11,6 @@ args@ , fetchurl , fontconfig , freetype -, gcc # :: String , gdk-pixbuf , glib , glibc diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index 72cab97f8ffc..dd6f7ff2abe7 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -17,7 +17,12 @@ final: prev: let backendStdenv = prev.pkgs."${finalVersion.gcc}Stdenv"; ### Add classic cudatoolkit package - cudatoolkit = buildCudaToolkitPackage (finalVersion // { inherit backendStdenv; }); + cudatoolkit = + let + attrs = builtins.removeAttrs finalVersion [ "gcc" ]; + attrs' = attrs // { inherit backendStdenv; }; + in + buildCudaToolkitPackage attrs'; cudaFlags = final.callPackage ./flags.nix {}; From ac64f07f9c8b9bcc4a4b6d285146cd50473d6b5d Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 3 Mar 2023 12:29:11 +0200 Subject: [PATCH 063/203] cudaPackages.cudaFlags: drop unused capabilitiesAndForward --- .../compilers/cudatoolkit/flags.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index b65219369404..989fdb06c5df 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -19,13 +19,14 @@ let # passing a configuration based on your specific GPU environment. # # config.cudaCapabilities :: List Capability - # List of hardware generations to build - # Last item is considered the optional forward-compatibility arch + # List of hardware generations to build. # E.g. [ "8.0" ] + # Currently, the last item is considered the optional forward-compatibility arch, + # but this may change in the future. # # config.cudaForwardCompat :: Bool # Whether to include the forward compatibility gencode (+PTX) - # to support future GPU generations: + # to support future GPU generations. # E.g. true # # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 @@ -91,17 +92,6 @@ let formatCapabilities = { cudaCapabilities, enableForwardCompat ? true }: rec { inherit cudaCapabilities enableForwardCompat; - # forwardCapability :: String - # Forward "compute" capability, a.k.a PTX - # E.g. "8.6+PTX" - forwardCapability = (lists.last cudaCapabilities) + "+PTX"; - - # capabilitiesAndForward :: List String - # The list of supported CUDA architectures, including the forward compatibility architecture. - # If forward compatibility is disabled, this will be the same as cudaCapabilities. - # E.g. [ "7.5" "8.6" "8.6+PTX" ] - capabilitiesAndForward = cudaCapabilities ++ lists.optionals enableForwardCompat [ forwardCapability ]; - # archNames :: List String # E.g. [ "Turing" "Ampere" ] archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities); @@ -141,9 +131,6 @@ assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { cudaCapabilities = [ "7.5" "8.6" ]; enableForwardCompat = true; - capabilitiesAndForward = [ "7.5" "8.6" "8.6+PTX" ]; - forwardCapability = "8.6+PTX"; - archNames = [ "Turing" "Ampere" ]; realArches = [ "sm_75" "sm_86" ]; virtualArches = [ "compute_75" "compute_86" ]; From 68648fa4c01e5b9f9b91cf0235652bbaec154926 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:34:01 +1100 Subject: [PATCH 064/203] darwin.apple_sdk_11_0.clang{12-15}Stdenv: init --- .../darwin/apple-sdk-11.0/default.nix | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 145c98496b49..df707e2b6e26 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -56,9 +56,32 @@ let ''; }; + mkStdenv = stdenv: + let + cc = stdenv.cc.override { + bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; + libc = packages.Libsystem; + }; + in + if stdenv.isAarch64 then stdenv + else + (overrideCC stdenv cc).override { + targetPlatform = stdenv.targetPlatform // { + darwinMinVersion = "10.12"; + darwinSdkVersion = "11.0"; + }; + }; + + stdenvs = { + stdenv = mkStdenv stdenv; + } // builtins.listToAttrs (map + (v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; }) + [ "12" "13" "14" "15" ] + ); + callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); - packages = { + packages = stdenvs // { inherit (callPackage ./apple_sdk.nix {}) frameworks libs; # TODO: this is nice to be private. is it worth the callPackage above? @@ -89,30 +112,14 @@ let inherit (pkgs) rustc cargo; }; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { - inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { + inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); xcbuild = xcodebuild; - }); - - stdenv = - let - clang = stdenv.cc.override { - bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; - libc = packages.Libsystem; - }; - in - if stdenv.isAarch64 then stdenv - else - (overrideCC stdenv clang).override { - targetPlatform = stdenv.targetPlatform // { - darwinMinVersion = "10.12"; - darwinSdkVersion = "11.0"; - }; - }; + })); }; in packages From 7a734f279523d08b5eec75a8a60d24438dbbe5cc Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:35:20 +1100 Subject: [PATCH 065/203] darwin.apple_sdk_11_0: code cleanup --- .../darwin/apple-sdk-11.0/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index df707e2b6e26..8c9e16a6ca9a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -82,25 +82,25 @@ let callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); packages = stdenvs // { - inherit (callPackage ./apple_sdk.nix {}) frameworks libs; + inherit (callPackage ./apple_sdk.nix { }) frameworks libs; # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. inherit MacOSX-SDK CLTools_Executables; - Libsystem = callPackage ./libSystem.nix {}; + Libsystem = callPackage ./libSystem.nix { }; LibsystemCross = pkgs.darwin.Libsystem; - libcharset = callPackage ./libcharset.nix {}; - libunwind = callPackage ./libunwind.nix {}; - libnetwork = callPackage ./libnetwork.nix {}; - libpm = callPackage ./libpm.nix {}; + libcharset = callPackage ./libcharset.nix { }; + libunwind = callPackage ./libunwind.nix { }; + libnetwork = callPackage ./libnetwork.nix { }; + libpm = callPackage ./libpm.nix { }; # Avoid introducing a new objc4 if stdenv already has one, to prevent # conflicting LLVM modules. - objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {}; + objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { }); # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; - IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; @@ -115,7 +115,16 @@ let callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { - inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + inherit (prev.darwin.apple_sdk_11_0) + IOKit + Libsystem + LibsystemCross + Security + configd + libcharset + libunwind + objc4 + ; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); From b7391c695b8c29e046445cc1953c7380ae36eb66 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:36:28 +1100 Subject: [PATCH 066/203] signalbackup-tools: unbreak on Darwin systems --- .../signalbackup-tools/default.nix | 9 ++++++--- .../fix-build-darwin-clang14.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c3b9caf9ab4b..643bc76c332d 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }: -stdenv.mkDerivation rec { +(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; version = "20230223-1"; @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; }; + patches = [ + ./fix-build-darwin-clang14.patch + ]; + postPatch = '' patchShebangs BUILDSCRIPT_MULTIPROC.bash44 ''; @@ -36,6 +40,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch new file mode 100644 index 000000000000..564d91fe97a7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch @@ -0,0 +1,13 @@ +diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h +index e9fc3fb..a620571 100644 +--- a/signalbackup/signalbackup.h ++++ b/signalbackup/signalbackup.h +@@ -148,7 +148,7 @@ class SignalBackup + std::string pre; + std::string replacement; + std::string post; +- bool operator<(Range const &other) ++ bool operator<(Range const &other) const + { + return (start < other.start) || + (start == other.start && start + length < other.start + other.length) || From 4f2d703d91e958e79bd38254e5c8e09edcd5d583 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 10 Jan 2023 13:15:36 -0500 Subject: [PATCH 067/203] ssm-session-manager-plugin: Build from source Source is linked from https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html#plugin-github Go 1.20 is used for `go test -skip`, since one test fails, seemingly because it does network-related things that do not work in the sandbox. --- .../ssm-session-manager-plugin/default.nix | 76 ++++++++++--------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 244c581b6f95..fb74efd47ef5 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,51 +1,55 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: -let - ver = "1.2.331.0"; - source = { - url = rec { - "x86_64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - "aarch64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_arm64/session-manager-plugin.deb"; - "x86_64-darwin" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - "aarch64-darwin" = x86_64-darwin; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - sha256 = rec { - "x86_64-linux" = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; - "aarch64-linux" = "sha256-QE6+EjLoydTPuLitG6fALXAtvIkfyoFuWij8Z2HT6+Q="; - "x86_64-darwin" = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; - "aarch64-darwin" = x86_64-darwin; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; -in -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchFromGitHub +, buildGo120Package +}: + +buildGo120Package rec { pname = "ssm-session-manager-plugin"; - version = ver; + version = "1.2.331.0"; - src = fetchurl source; + goPackagePath = "github.com/aws/SSMCLI"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook - dpkg - ] ++ lib.optionals stdenv.isDarwin [ - unzip - ]; + src = fetchFromGitHub { + owner = "aws"; + repo = "session-manager-plugin"; + rev = version; + sha256 = "MnTiczFdiP9Xn9fkElVp6tPl7K7PWNyOGjsyLnQHreY="; + }; - unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; + postPatch = '' + mv vendor{,-old} + mv vendor-old/src vendor + rm -r vendor-old + ''; + + preBuild = '' + pushd go/src/${lib.escapeShellArg goPackagePath} + echo -n ${lib.escapeShellArg version} > VERSION + go run src/version/versiongenerator/version-gen.go + popd + ''; + + doCheck = true; + checkFlags = "-skip TestSetSessionHandlers"; + + preCheck = '' + if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then + echo 'wrong version' + exit 1 + fi + ''; installPhase = '' runHook preInstall - - install -m755 -D ${archivePath}/bin/session-manager-plugin $out/bin/session-manager-plugin - + install -Dm555 go/bin/sessionmanagerplugin-main "$out/bin/session-manager-plugin" runHook postInstall ''; meta = with lib; { homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ mbaillie ]; + license = licenses.asl20; + maintainers = with maintainers; [ amarshall mbaillie ]; }; } From 9c00800a68f2961e464240902407bcb27f53fa72 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 10 Jan 2023 13:16:39 -0500 Subject: [PATCH 068/203] ssm-session-manager-plugin: 1.2.331.0 -> 1.2.398.0 --- .../cluster/ssm-session-manager-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index fb74efd47ef5..93040240a1e3 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -6,15 +6,15 @@ buildGo120Package rec { pname = "ssm-session-manager-plugin"; - version = "1.2.331.0"; + version = "1.2.398.0"; - goPackagePath = "github.com/aws/SSMCLI"; + goPackagePath = "github.com/aws/session-manager-plugin"; src = fetchFromGitHub { owner = "aws"; repo = "session-manager-plugin"; rev = version; - sha256 = "MnTiczFdiP9Xn9fkElVp6tPl7K7PWNyOGjsyLnQHreY="; + sha256 = "ufNnr/sxOHUDUsGXwxp1yloVAI6DMtuEdjcQZ2XaHRg="; }; postPatch = '' From 2a2831c9e9f3b7f2d62373a3700a2c9c0862ea3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= Date: Sat, 4 Mar 2023 14:18:34 +0300 Subject: [PATCH 069/203] ko: add developer-guy to maintainers list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Apaydın --- pkgs/development/tools/ko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index ab77a3d0606d..447b7ba6987a 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -60,6 +60,6 @@ buildGoModule rec { ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications. ''; license = licenses.asl20; - maintainers = with maintainers; [ nickcao jk vdemeester ]; + maintainers = with maintainers; [ nickcao jk vdemeester developer-guy ]; }; } From c777db77a3e0aab5f406142fadc7ad43838b8d73 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Mar 2023 12:21:27 +0100 Subject: [PATCH 070/203] element-{web,desktop}: 1.11.23 -> 1.11.24 ChangeLog web: https://github.com/vector-im/element-web/releases/tag/v1.11.24 ChangeLog desktop: https://github.com/vector-im/element-desktop/releases/tag/v1.11.24 --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index bf1458c264eb..05cfe1d87b67 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.23", - "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", - "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", - "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", - "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" + "version": "1.11.24", + "desktopSrcHash": "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=", + "desktopYarnHash": "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97", + "webSrcHash": "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=", + "webYarnHash": "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y" } From a75ef43adfb56aeefa78bfe29a4acb5154446efd Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 4 Mar 2023 13:18:41 +0100 Subject: [PATCH 071/203] wireshark: format --- .../networking/sniffers/wireshark/default.nix | 97 +++++++++++++------ 1 file changed, 69 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 5d69667f1bfb..b12e5ba4fb5c 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,18 +1,46 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, perl, flex, bison -, gettext, libpcap, libnl, c-ares, gnutls, libgcrypt, libgpg-error, geoip, openssl -, lua5, python3, libcap, glib, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook -, withQt ? true, qt5 ? null -, ApplicationServices, SystemConfiguration, gmp +{ lib +, stdenv +, buildPackages +, fetchurl +, pkg-config +, pcre2 +, perl +, flex +, bison +, gettext +, libpcap +, libnl +, c-ares +, gnutls +, libgcrypt +, libgpg-error +, geoip +, openssl +, lua5 +, python3 +, libcap +, glib +, libssh +, nghttp2 +, zlib +, cmake +, makeWrapper +, wrapGAppsHook +, withQt ? true +, qt5 ? null +, ApplicationServices +, SystemConfiguration +, gmp , asciidoctor }: -assert withQt -> qt5 != null; +assert withQt -> qt5 != null; let version = "4.0.3"; variant = if withQt then "qt" else "cli"; - -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "wireshark-${variant}"; inherit version; outputs = [ "out" "dev" ]; @@ -42,12 +70,24 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ - gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt - libgpg-error gnutls geoip c-ares glib zlib - ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ]) - ++ lib.optionals stdenv.isLinux [ libcap libnl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + gettext + pcre2 + libpcap + lua5 + libssh + nghttp2 + openssl + libgcrypt + libgpg-error + gnutls + geoip + c-ares + glib + zlib + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ]) + ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -70,22 +110,23 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else lib.optionalString withQt '' - pwd - install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop + '' else + lib.optionalString withQt '' + pwd + install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop - install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg - mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} + install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg + mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} - cp config.h $dev/include/wireshark/ - cp ../epan/*.h $dev/include/epan/ - cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ - cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ - cp ../include/ws_*.h $dev/include/ - cp ../wiretap/*.h $dev/include/wiretap/ - cp ../wsutil/*.h $dev/include/wsutil/ - cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ - ''); + cp config.h $dev/include/wireshark/ + cp ../epan/*.h $dev/include/epan/ + cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ + cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../include/ws_*.h $dev/include/ + cp ../wiretap/*.h $dev/include/wiretap/ + cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ + ''); dontFixCmake = true; From dede4a1dadd5613f0f438180ef5a14c2a3e41887 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 16:29:50 +0000 Subject: [PATCH 072/203] pe-bear: 0.6.1 -> 0.6.5 --- pkgs/applications/misc/pe-bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 5dd8fac6de8b..06642f7e496a 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho="; + sha256 = "sha256-qFEfrXX2Rpmo4eF1Z/dKBN/NxMovK3mDfQPxYp85eB8="; fetchSubmodules = true; }; From 1616a0aa4d4ffe8aa77fa90f9148960954b9c1f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 16:54:26 +0000 Subject: [PATCH 073/203] bazarr: 1.1.4 -> 1.2.0 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 0b26b527fe02..4269df35d27b 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.1.4"; + version = "1.2.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-eitChQTTkiNY/NbDM+u2ZlyuczzJ9nVjIS1sS05DO3Q="; + sha256 = "sha256-rlph8On/dc9Xyx8/KQzp4vX49wY4fr1oTtBEyfVhrsc="; }; nativeBuildInputs = [ unzip makeWrapper ]; From ddac6e045f121a12541d9faf3842a5868b204358 Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 4 Mar 2023 17:56:24 +0100 Subject: [PATCH 074/203] wireshark: 4.0.3 -> 4.0.4 --- .../networking/sniffers/wireshark/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b12e5ba4fb5c..3ac1d8cd94aa 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPackages -, fetchurl +, fetchFromGitLab , pkg-config , pcre2 , perl @@ -24,6 +24,7 @@ , nghttp2 , zlib , cmake +, ninja , makeWrapper , wrapGAppsHook , withQt ? true @@ -37,7 +38,7 @@ assert withQt -> qt5 != null; let - version = "4.0.3"; + version = "4.0.4"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -45,9 +46,11 @@ stdenv.mkDerivation { inherit version; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; + src = fetchFromGitLab { + repo = "wireshark"; + owner = "wireshark"; + rev = "v${version}"; + hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw="; }; cmakeFlags = [ @@ -64,7 +67,7 @@ stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] + nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -84,7 +87,8 @@ stdenv.mkDerivation { c-ares glib zlib - ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ]) + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals (withQt && stdenv.isLinux) [ qt5.qtwayland ] ++ lib.optionals stdenv.isLinux [ libcap libnl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); From 55a25b0acaa26956ac3e335711a603008ca6ab1a Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 4 Mar 2023 18:19:04 +0100 Subject: [PATCH 075/203] wireshark: add more dependencies --- .../networking/sniffers/wireshark/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 3ac1d8cd94aa..14f8db6a7e84 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -14,7 +14,18 @@ , gnutls , libgcrypt , libgpg-error -, geoip +, libmaxminddb +, libopus +, bcg729 +, spandsp3 +, libkrb5 +, speexdsp +, libsmi +, lz4 +, snappy +, zstd +, minizip +, sbc , openssl , lua5 , python3 @@ -83,13 +94,23 @@ stdenv.mkDerivation { libgcrypt libgpg-error gnutls - geoip + libmaxminddb + libopus + bcg729 + spandsp3 + libkrb5 + speexdsp + libsmi + lz4 + snappy + zstd + minizip c-ares glib zlib ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ lib.optionals (withQt && stdenv.isLinux) [ qt5.qtwayland ] - ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isLinux [ libcap libnl sbc ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); From 353859c8fb494a5c99ba61266605181347f0eb0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 18:09:56 +0000 Subject: [PATCH 076/203] python310Packages.bpycv: 0.2.43 -> 0.3.6 --- pkgs/development/python-modules/bpycv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 5052cf2eb173..90931af25457 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "bpycv"; - version = "0.2.43"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6LXhKuNkX3yKeZARLXmOVNAUQhJghtzKhnszJ1G/a8U="; + sha256 = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; }; propagatedBuildInputs = [ From 5248f53462ad2004fa6d2128521844cc41d0b83e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 19:40:48 +0000 Subject: [PATCH 077/203] vassal: 3.6.12 -> 3.6.13 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 9055a86d506a..c7971c7d3874 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.12"; + version = "3.6.13"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-NSGadwVn1/nvHiJFENBPDsOUPwesunZMsvn+ms7u4Sw="; + sha256 = "sha256-5YswOh2jnOafctp7q8INtIqQwx1ugGm0QP9vDfal7t0="; }; buildInputs = [ From a3f3ede0cfd0a31d65637296cac21b7e28506e5d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Mar 2023 22:25:38 +0000 Subject: [PATCH 078/203] ocamlPackages.ocaml-freestanding: mark as broken --- pkgs/development/ocaml-modules/ocaml-freestanding/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 3588495884f8..85b741dbc199 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = true; # Not compatible with solo5 ≥ 0.7 description = "Freestanding OCaml runtime"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; From 50e35e9b6c8fbd2e84bf569bfb3c7dd9ab6a6329 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 01:40:37 +0200 Subject: [PATCH 079/203] obliv-c: migrate to OCaml 4.14 --- pkgs/development/compilers/obliv-c/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 3e13b9247fb9..f2eadee57937 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); + buildInputs = [ ocamlPackages.num ]; propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; @@ -19,6 +20,9 @@ stdenv.mkDerivation rec { patches = [ ./ignore-complex-float128.patch ]; + # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209 + env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'"; + preBuild = '' patchShebangs . ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..85ba768df5a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15529,8 +15529,10 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c - { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; + obliv-c = callPackage ../development/compilers/obliv-c { + stdenv = gcc10StdenvCompat; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; ocaml-ng = callPackage ./ocaml-packages.nix { }; ocaml = ocamlPackages.ocaml; From cc4169d737e092ef877cf8b8d9b940df849a7312 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:03:44 +0200 Subject: [PATCH 080/203] glsurf: migrate to OCaml 4.14 --- pkgs/applications/science/math/glsurf/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 808d89ef9636..bfc1998238e2 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ] ++ (with ocamlPackages; [ camlp4 lablgl - camlimages_4_2_4 + camlimages + num ]); postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..50c76dfb8ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20169,7 +20169,9 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { + unsafeStringSupport = true; + }); }; glui = callPackage ../development/libraries/glui {}; From 3796e5913698883eb2ef6d6cc6c797fd302a4bc4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:21:12 +0200 Subject: [PATCH 081/203] vampire: unbreak on aarch64-linux --- pkgs/applications/science/logic/vampire/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 92cad0c61e5a..253c88705aea 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -28,14 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/vprover/vampire/pull/55.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) - # https://github.com/vprover/vampire/pull/56 - (fetchpatch { - name = "fenv.patch"; - url = "https://github.com/vprover/vampire/pull/56.patch"; - sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; - }) ]; + postPatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true + ''; + enableParallelBuilding = true; fixupPhase = '' @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://vprover.github.io/"; description = "The Vampire Theorem Prover"; platforms = platforms.unix; From 919dd0892c74a6cbca47000182909766d8380385 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sun, 5 Mar 2023 11:55:27 +1100 Subject: [PATCH 082/203] signalbackup-tools: 20230223-1 -> 20230304-3 --- .../signalbackup-tools/default.nix | 8 ++------ .../fix-build-darwin-clang14.patch | 13 ------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 643bc76c332d..3793b3a66868 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,19 +2,15 @@ (if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230223-1"; + version = "20230304-3"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; + hash = "sha256-y6ApImUkS25kUPih/hl1ngLAkeBAX+MhJ6XuiVU9aZQ="; }; - patches = [ - ./fix-build-darwin-clang14.patch - ]; - postPatch = '' patchShebangs BUILDSCRIPT_MULTIPROC.bash44 ''; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch deleted file mode 100644 index 564d91fe97a7..000000000000 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h -index e9fc3fb..a620571 100644 ---- a/signalbackup/signalbackup.h -+++ b/signalbackup/signalbackup.h -@@ -148,7 +148,7 @@ class SignalBackup - std::string pre; - std::string replacement; - std::string post; -- bool operator<(Range const &other) -+ bool operator<(Range const &other) const - { - return (start < other.start) || - (start == other.start && start + length < other.start + other.length) || From 953d54f69117f4c79269e11f69ebafee5507d972 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 11 Feb 2023 21:05:49 -0500 Subject: [PATCH 083/203] rust-analyzer: use nix-update-script --- .../tools/rust/rust-analyzer/default.nix | 5 +-- .../tools/rust/rust-analyzer/update.sh | 36 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100755 pkgs/development/tools/rust/rust-analyzer/update.sh diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f00c79b3e76c..5f265c43613c 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -8,6 +8,7 @@ , libiconv , useMimalloc ? false , doCheck ? true +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { # Code format check requires more dependencies but don't really matter for packaging. # So just ignore it. - checkFlags = ["--skip=tidy::check_code_formatting"]; + checkFlags = [ "--skip=tidy::check_code_formatting" ]; nativeBuildInputs = lib.optional useMimalloc cmake; @@ -57,7 +58,7 @@ rustPlatform.buildRustPackage rec { ''; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { }; # FIXME: Pass overrided `rust-analyzer` once `buildRustPackage` also implements #119942 tests.neovim-lsp = callPackage ./test-neovim-lsp.nix { }; }; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh deleted file mode 100755 index 36c3fd3941b9..000000000000 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch libarchive -# shellcheck shell=bash -set -euo pipefail -cd "$(dirname "$0")" -owner=rust-lang -repo=rust-analyzer -nixpkgs=../../../../.. - -# Update lsp - -ver=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -old_ver=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) -if grep -q 'cargoSha256 = ""' ./default.nix; then - old_ver='broken' -fi -if [[ "$ver" == "$old_ver" ]]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$ver") -# Clear cargoSha256 to avoid inconsistency. -sed -e "s#version = \".*\"#version = \"$ver\"#" \ - -e "/fetchFromGitHub/,/}/ s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ - -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \ - --in-place ./default.nix - -echo "Prebuilding for cargoSha256" -cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ - --in-place ./default.nix From 4140f453e932ccc92bef8fea370d6f88b6d09973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 02:10:20 +0000 Subject: [PATCH 084/203] praat: 6.3.08 -> 6.3.09 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index a00f60e73286..1d9dbc590739 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.08"; + version = "6.3.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo="; + sha256 = "sha256-oidYxG3A0yZGAJzjf5WvspEIbh1d/SXNHJsxKsSRifI="; }; configurePhase = '' From e10f9f1fbfb20acbf9b1643c7ec39e6d28bc2174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 02:36:21 +0000 Subject: [PATCH 085/203] polkadot: 0.9.38 -> 0.9.39 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 7a7e461b1a21..096ff9bd9b0e 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.38"; + version = "0.9.39"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4="; + hash = "sha256-ewjab9BtItJWtadEZO1PH5+2fOAafNof+2uVm8e78V4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o="; + cargoHash = "sha256-KqdUh+ES9UB01yrmNVXdiyYZPh9pjJOEjcuwlJr6Jxc="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From d008d899ce44f8ce6f20442db157c96b5e31b096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 03:52:18 +0000 Subject: [PATCH 086/203] shotman: 0.4.0 -> 0.4.1 --- pkgs/tools/wayland/shotman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index f285fb12821e..6bb83aafae7c 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-BWHQtaDnM6lBEMkD8Y7M2NrWD78rY3yL8dzsa6PBiR0="; + hash = "sha256-u8vnRNxi7wLn0M2VZu9YTZuSAM/0afHRP01vve9tD9c="; }; - cargoHash = "sha256-uckdpzCD3ItUVvpF2fHofcZFkQZzt8Xz/VWFiQ9Hkrs="; + cargoHash = "sha256-2HAtkIIJMpYQ+Bk07L8D1w3YlfEuHTcbq14reFja0Kk="; nativeBuildInputs = [ pkg-config makeWrapper ]; From 58306ceb17c8daea391a6bb888fc68b75fff0718 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 05:14:17 +0000 Subject: [PATCH 087/203] morgen: 2.6.6 -> 2.6.7 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index a6bb64bbdf7c..f6e8ac7e6401 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; + sha256 = "sha256-DlwAMA/YEnB9Z6Ry1Hvu9R9TgTw737PLtZfAVEKLjPY="; }; nativeBuildInputs = [ From 72024b159a71b057534ad2472f0c99f85407d4b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 05:49:11 +0000 Subject: [PATCH 088/203] tvm: 0.10.0 -> 0.11.0 --- pkgs/development/compilers/tvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index e2245f800ad0..f8ac0be26dae 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-v3F+qncs3PFkRllrdWvrle/ofg9thX4BJlvILQz9B6A="; + sha256 = "sha256-feFOmpbC2lN3oH7NiCK9mCjBKTfjpI3JqLNad9MUk9A="; }; nativeBuildInputs = [ cmake ]; From 5424180bc5d13d2b3707e572f5d410d67a02d582 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 06:58:39 +0000 Subject: [PATCH 089/203] nats-server: 2.9.14 -> 2.9.15 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 76cbb2730cbb..4e3c5c146556 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.14"; + version = "2.9.15"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI="; + hash = "sha256-j++DjPMyBVBMOKcZQkkPwTYC0f1PD5vQVtx0yJL75Vw="; }; - vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo="; + vendorHash = "sha256-bBJZiETZCwtcsH9w43aFwUU8lmttrCKwie4So9kiZc4="; doCheck = false; From 46cdbdaa318325b42bbfb05e4a6db3d10b195864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 08:11:10 +0000 Subject: [PATCH 090/203] linkerd_edge: 23.2.3 -> 23.3.1 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9f3169b88b4e..b1b807d96489 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.2.3"; - sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9"; - vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw="; + version = "23.3.1"; + sha256 = "10vl3lay9f823qp0cqh4a7fzfkh8qcl0k6jwdjvrd93d4rasvnsm"; + vendorSha256 = "sha256-DPYGh2lUgyYqquaNVRWb2CCAAFi0bm3ZKHNOoVq6dJ4="; } From 6ba0151a846af3938196f830f7c128678a7ff89c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 09:35:29 +0000 Subject: [PATCH 091/203] terragrunt: 0.44.0 -> 0.44.4 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index d683fc520a10..23df7ddd9a65 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.44.0"; + version = "0.44.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6LL/ipDqNoiNWR/H5WzJVsJcgorYx6+jo+TjlfifsDo="; + hash = "sha256-Y+7Q9b6c6oetlFUgSQXUcOuGywgrQGK9Lb6oiwiyp7M="; }; - vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; + vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; doCheck = false; From a56529a95f30709bb7cc4d956d1a08961cf588d1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 12:05:39 +0200 Subject: [PATCH 092/203] glsurf: fix runtime error --- pkgs/applications/science/math/glsurf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index bfc1998238e2..ec3bb4c795b3 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { substituteInPlace "$f" --replace "+camlp4" \ "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4" done + + # Fatal error: exception Sys_error("Mutex.unlock: Operation not permitted") + sed -i "/gl_started/d" src/draw.ml* src/main.ml ''; installPhase = '' From 7aa0bc3c377d753c0964542eccd997aabaaf78a3 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 5 Mar 2023 21:06:57 +1100 Subject: [PATCH 093/203] feedbackd: 0.0.3 -> 0.1.0 --- pkgs/applications/misc/feedbackd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index b19cec6f7e5d..eb7a56dceeee 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -24,13 +24,13 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.0.20220523"; - sha256 = "sha256-RyUZj+tpJSYhyoK+E98CTIoHwXwBdB1YHVnO5821exo="; + rev = "v0.1.0"; + sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; }; in stdenv.mkDerivation rec { pname = "feedbackd"; - version = "0.0.3"; + version = "0.1.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-ehWLC9PDDcD+muUPruzp8UvNddJBdrmW6gFxKVouY3c="; + hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc="; fetchSubmodules = true; }; From 3e45de22cda188da91528d8294047e73d0f8776f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 10:07:11 +0000 Subject: [PATCH 094/203] acorn: 0.5.1 -> 0.6.0 --- pkgs/applications/networking/cluster/acorn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index cc79ae5d59fe..a1f9eb227aba 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; + hash = "sha256-X4EXF6t6RzjHCbo2+oB69sFoqeRc5blSmB7x1iQCYIA="; }; - vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; + vendorHash = "sha256-cx+7vbVpoeNwE4mNaQKuguALObyCrEA7EQPdnJ0H9mM="; ldflags = [ "-s" From b92e565723097a3425a0e2c7b47f30041085f940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 11:25:45 +0000 Subject: [PATCH 095/203] python310Packages.s3fs: 2023.1.0 -> 2023.3.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index b212af78a26c..eec3bbff8316 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.1.0"; + version = "2023.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iy4oNyQj6T8mMSIIqScuIqli3dCnnWP5poaTtq9f8Yc="; + hash = "sha256-XBVN7Tjjw9jw66f+wnBvKbQeDDlfGfv+87qOcMaFsEk="; }; postPatch = '' From d6a97b41824b41af29ad19a11dea9b34270d7586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 12:24:07 +0000 Subject: [PATCH 096/203] python310Packages.apispec: 6.0.2 -> 6.1.0 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index d7fc0929ec43..f385c87d8558 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.0.2"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; + hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk="; }; propagatedBuildInputs = [ From f1e518e06f4ac43238d376787c278d088758c986 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 5 Mar 2023 13:54:45 +0100 Subject: [PATCH 097/203] bolt: 0.9.2 -> 0.9.5 --- pkgs/os-specific/linux/bolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index fba4f8adbabe..2765b6647a7f 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "eXjj7oD5HOW/AG2uxDa0tSleKmbouFd2fwlL2HHFiMA="; + sha256 = "sha256-j1UO8lkVoS56hwPQXH8aIr1UegM6PdtaBXKZn50GP60="; }; patches = [ From b2acf6bcd1d6b1615b40b3c8c01538d332eaf36a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 14:24:33 +0000 Subject: [PATCH 098/203] thermald: 2.5.1 -> 2.5.2 --- pkgs/tools/system/thermald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index fcc90685b4cc..5de802ba8804 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.1"; + version = "2.5.2"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-j3WurlNJ67iXBt+jn1iGGtGup8m6OYQtqJTYwUkJ4Ro="; + sha256 = "sha256-Ex3HSGJJDPPciX0Po9TpySVPUL257wz1ZjaLCa2igCM="; }; nativeBuildInputs = [ From eadfa0886a1ab1e18aad53ba0103456abe7b0f3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Mar 2023 15:28:32 +0100 Subject: [PATCH 099/203] python310Packages.aiodiscover: 1.4.13 -> 1.4.14 Diff: https://github.com/bdraco/aiodiscover/compare/v1.4.13...v1.4.14 --- pkgs/development/python-modules/aiodiscover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index b5b46190fee2..57f6b389e9d8 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tIbLb4Jk3vR1hVcdUPuYJrse7BcfE4Z/dXShs/uBDBo="; + sha256 = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; }; propagatedBuildInputs = [ From 0e09eee2c066791be7f17f53d1fc01457e4953ea Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 5 Mar 2023 22:33:59 +0800 Subject: [PATCH 100/203] hikari: 2.3.2 -> 2.3.3 --- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 5ee2c8c35e49..508f13f985b2 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "hikari"; - version = "2.3.2"; + version = "2.3.3"; src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-At4b6mkArKe6knNWouLdZ9v8XhfHaUW+aB+CHyEBg8o="; + sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI="; }; nativeBuildInputs = [ pkg-config bmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090f5a4123cb..55c579e0171f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30569,9 +30569,7 @@ with pkgs; wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_14; - }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; From da59030939a95114cf38cd589da4a7f5f7ca8b74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Mar 2023 15:35:05 +0100 Subject: [PATCH 101/203] python310Packages.aiodiscover: add changelog to meta --- pkgs/development/python-modules/aiodiscover/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 57f6b389e9d8..044bbf7be6e1 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; + rev = "refs/tags/v${version}"; + hash = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; }; propagatedBuildInputs = [ @@ -35,8 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" \ - --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" + --replace '"pytest-runner>=5.2",' "" ''; nativeCheckInputs = [ @@ -56,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; homepage = "https://github.com/bdraco/aiodiscover"; + changelog = "https://github.com/bdraco/aiodiscover/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 44172b3c66ded6942aea293c09d5437117956f3b Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Sun, 5 Mar 2023 12:27:09 +0100 Subject: [PATCH 102/203] udict: init at 0.1.2 --- .../0001-update-version-in-lock-file.patch | 25 +++++++++++ pkgs/applications/misc/udict/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch create mode 100644 pkgs/applications/misc/udict/default.nix diff --git a/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch b/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch new file mode 100644 index 000000000000..1cd4c613e357 --- /dev/null +++ b/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch @@ -0,0 +1,25 @@ +From 4952ceece60ff2e7eabec45411b8824da6673bff Mon Sep 17 00:00:00 2001 +From: m +Date: Sun, 5 Mar 2023 11:25:40 +0100 +Subject: [PATCH] update version in lock file + +--- + Cargo.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.lock b/Cargo.lock +index d571155..ca28bef 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1554,7 +1554,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + + [[package]] + name = "udict" +-version = "0.1.1" ++version = "0.1.2" + dependencies = [ + "reqwest", + "scraper", +-- +2.38.4 + diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix new file mode 100644 index 000000000000..0a8522669e92 --- /dev/null +++ b/pkgs/applications/misc/udict/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "udict"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "lsmb"; + repo = "udict"; + rev = "v${version}"; + hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY="; + }; + + cargoHash = "sha256-WI+dz7FKa3kot3gWr/JK/v6Ua/u2ioZ04Jwk8t9r1ls="; + + cargoPatches = [ + ./0001-update-version-in-lock-file.patch + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Urban Dictionary CLI - written in Rust"; + homepage = "https://github.com/lsmb/udict"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090f5a4123cb..506e9484afdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39436,4 +39436,6 @@ with pkgs; gnss-share = callPackage ../servers/gnss-share { }; ali = callPackage ../tools/networking/ali { }; + + udict = callPackage ../applications/misc/udict { }; } From 8caf109c28ba10ab9ea71bd57a18c06451c9a8f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 16:26:07 +0000 Subject: [PATCH 103/203] carapace: 0.21.0 -> 0.22.0 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 32185663e133..2db3697f1a21 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-vpYBgDX0CxTNphmdwrI56AtlPlf2DGf3BZ+jWwdanpw="; + sha256 = "sha256-G6tpPkB31nHdMzmHNp2w85rp0O08/ynrirWJTqVSmjE="; }; - vendorHash = "sha256-Qi2fkAdO0clpKowSdoxyanIB65oagqEnw5gCqVHPJb0="; + vendorHash = "sha256-mz03GysUI64RiAChgIjyKORcW+WRbYIxbdICDBQGoBk="; subPackages = [ "./cmd/carapace" ]; From 78c57b6c1cd31b0a0a8e1e527893e150e26bb48b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 16:30:41 +0000 Subject: [PATCH 104/203] neil: 0.1.47 -> 0.1.55 --- pkgs/development/tools/neil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index e4af4f24e19a..4d162946226c 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.47"; + version = "0.1.55"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; + sha256 = "sha256-+0+d0XZhZeRTAXRvA3QcWvbuOqlhNbFo2gTnROevJtU="; }; nativeBuildInputs = [ makeWrapper ]; From 38ba8261dd85015f007c7534a6a6074df11b1484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 16:40:51 +0000 Subject: [PATCH 105/203] simdjson: 3.1.2 -> 3.1.3 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 29730ddd806e..a44dc213f6ea 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Yc4P54cn7cvP+ythlmOMIkDz7PuutJXsgkGhNUcoxvc="; + sha256 = "sha256-VDwpCPyjhkXgehcMJs6srD3PFtlC2m4jurJum6wNeVY="; }; nativeBuildInputs = [ cmake ]; From 040821978dc5c2f26ce5c322b37b1ec363f0720d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 16:42:18 +0000 Subject: [PATCH 106/203] squid: 5.7 -> 5.8 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 4b7ce81b459b..26fe887cb774 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - hash = "sha256-awdTqrpMnE79Mz5nEkyuz3rWzC04WB8Z0vAyH1t+zYE="; + hash = "sha256-fpafjI31acuGRtZ+5Z/b8mJ76toSlUwwHnwanBwRc08="; }; nativeBuildInputs = [ pkg-config ]; From 9a23d3c8cd0387379380b3f082e46f7e4bf71ea4 Mon Sep 17 00:00:00 2001 From: R-VdP <141248+R-VdP@users.noreply.github.com> Date: Sun, 5 Mar 2023 18:13:50 +0100 Subject: [PATCH 107/203] pcloud: 1.10.1 -> 1.11.0 Changelog: https://www.pcloud.com/release-notes/linux.html --- pkgs/applications/networking/pcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index caba7159214e..5f148711c822 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,12 @@ let pname = "pcloud"; - version = "1.10.1"; - code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV"; + version = "1.11.0"; + code = "XZspqgVZxM1CCER1we0esiDGuAxshjRSY77X"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI="; + hash = "sha256-EXJ+5LwVF5lTXc5zlppRQLCm0EZwqG3ndfK4LIjmWwc="; }; appimageContents = appimageTools.extractType2 { From c299df8dec7cff18d1d696047339d4ebb286aea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 17:33:47 +0000 Subject: [PATCH 108/203] openseachest: 22.07 -> 23.03 --- pkgs/tools/system/openseachest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index b2b6516ba78a..fe806bd21dbb 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "openseachest"; - version = "22.07"; + version = "23.03"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - sha256 = "sha256-YZOQfABDr5DGkL08TYn908XdCSCJCg+9nlWXRBjYBOU="; + sha256 = "sha256-D/TvT+LnAVhkQ32U+VdW7AA3BfKurmK4mwIY8vwXIpc="; fetchSubmodules = true; }; From 877d70784585dee16fa6a758b5d719aaf607fc0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 17:44:02 +0000 Subject: [PATCH 109/203] oven-media-engine: 0.15.0 -> 0.15.1 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 6aefa4f45342..b14efeaabecf 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM="; + sha256 = "sha256-Ob+0Ak0ELyHrZfeCiACX2IHsp+6jE//iqPoW6je6GfQ="; }; sourceRoot = "source/src"; From 353885536c7c82e119e486e3bcc7ff6fecaca2a4 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sun, 5 Mar 2023 12:54:28 -0500 Subject: [PATCH 110/203] drawterm: unstable-2021-10-02 -> unstable-2023-03-05 --- pkgs/tools/admin/drawterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index f694cb935b42..f75baff338fc 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "drawterm"; - version = "unstable-2021-10-02"; + version = "unstable-2023-03-05"; src = fetchgit { url = "git://git.9front.org/plan9front/drawterm"; - rev = "c6f547e1a46ebbf7a290427fe3a0b66932d671a0"; - sha256 = "09v2vk5s23q0islfz273pqy696zhzh3gqi25hadr54lif0511wsl"; + rev = "ed9cff5a4c39322744c4708699c9ae6651b7c9ab"; + sha256 = "LM6UnggoxKC3e6xOlHYk9VFF99Abbdmp37nuUML8RgI="; }; buildInputs = [ From 1360d4cc5133bf700044e6d343169d289143a183 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 4 Mar 2023 22:24:16 -0500 Subject: [PATCH 111/203] zig: build offline documentation --- pkgs/development/compilers/zig/0.10.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index 966be329befc..860baf1d6045 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { pname = "zig"; version = "0.10.1"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "ziglang"; @@ -52,7 +53,17 @@ stdenv.mkDerivation rec { "-DZIG_TARGET_MCPU=baseline" ]; + postBuild = '' + ./zig2 build-exe ../doc/docgen.zig + ./docgen ./zig2 ../doc/langref.html.in ./langref.html + ''; + doCheck = true; + + postInstall = '' + install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html + ''; + installCheckPhase = '' $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig ''; From 786bf693bae56d7ee705e809c4ab2d4244cdca36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 19:02:16 +0000 Subject: [PATCH 112/203] argocd: 2.6.2 -> 2.6.3 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 86af4aef1065..f0ceb7f269ba 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-H/jrjU3iIlO75eN2Av/zuGe2G5KbJw9Xj6MCbWgTFEs="; + sha256 = "sha256-l2cuCS5CtAbmv7wHvccNA+DJ8+hN5/xHWTqZFGyBKGQ="; }; proxyVendor = true; # darwin/linux hash mismatch From 5050b9c48fd2fc920963c607831dba2047bd81fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 19:09:49 +0000 Subject: [PATCH 113/203] holochain-launcher: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/holochain-launcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 3508ff012259..94d63a9a3a4f 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY="; + sha256 = "sha256-vYsJBMtdkbe87Xn8Ah0eT+azFWfm3ZUooejs7oB2KVQ="; }; nativeBuildInputs = [ From 3d173e9635eb413cf1cf4744b02de6551e342718 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Sun, 5 Mar 2023 11:18:33 -0800 Subject: [PATCH 114/203] xborders: init at 3.4 --- pkgs/tools/X11/xborders/default.nix | 57 +++++++++++++++++++++++++++++ pkgs/tools/X11/xborders/setup.py | 12 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/tools/X11/xborders/default.nix create mode 100644 pkgs/tools/X11/xborders/setup.py diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/tools/X11/xborders/default.nix new file mode 100644 index 000000000000..f9e78034c3c0 --- /dev/null +++ b/pkgs/tools/X11/xborders/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3Packages +, fetchFromGitHub +, libwnck +, gtk3 +, libnotify +, wrapGAppsHook +, gobject-introspection +, substituteAll +}: + +python3Packages.buildPythonPackage rec { + pname = "xborders"; + version = "3.4"; # in version.txt + + src = fetchFromGitHub { + owner = "deter0"; + repo = "xborder"; + rev = "e74ae532b9555c59d195537934fa355b3fea73c5"; + hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4="; + }; + + buildInputs = [ + libwnck + gtk3 + libnotify + ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + requests + pygobject3 + ]; + + postPatch = let + setup = substituteAll { + src = ./setup.py; + desc = meta.description; # "description" is reserved + inherit pname version; + }; + in '' + ln -s ${setup} setup.py + ''; + + meta = with lib; { + description = "Active window border replacement for window managers"; + homepage = "https://github.com/deter0/xborder"; + license = licenses.unlicense; + maintainers = with maintainers; [ elnudev ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xborders/setup.py b/pkgs/tools/X11/xborders/setup.py new file mode 100644 index 000000000000..a002625fa064 --- /dev/null +++ b/pkgs/tools/X11/xborders/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='@pname@', + version='@version@', + author='deter0', + description='@desc@', + install_requires=['pycairo', 'requests', 'PyGObject'], + scripts=[ + 'xborders', + ], +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cf952910163..326536404500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33956,6 +33956,8 @@ with pkgs; gtk = gtk2; }; + xborders = callPackage ../tools/X11/xborders { }; + xxh = callPackage ../tools/networking/xxh { }; kodiPackages = recurseIntoAttrs (kodi.packages); From 0f2d84601c1f93fa311940fdde6adb8854e244e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 19:33:58 +0000 Subject: [PATCH 115/203] komga: 0.161.0 -> 0.162.0 --- pkgs/servers/komga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index e1db293f6499..5af5a44d1685 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.161.0"; + version = "0.162.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-TZ/TxX9OgDGx8zD2mI8cTDPZSqBjkYN3Uy+W9MXbJOI="; + sha256 = "sha256-RcEAqMfpXH7PudLOROpSZw/5HrEeuBFBkllOjGdXZCU="; }; nativeBuildInputs = [ From c0a41e924b33d6e05b807f2f7816814d91b028d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 19:42:36 +0000 Subject: [PATCH 116/203] blaze: 3.8.1 -> 3.8.2 --- pkgs/development/libraries/blaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix index d09f5083a948..ad68b6df4d59 100644 --- a/pkgs/development/libraries/blaze/default.nix +++ b/pkgs/development/libraries/blaze/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blaze"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromBitbucket { owner = "blaze-lib"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-fe6J0aquk4j+b11Sq+ihagWA/LMTYnAgIHbaDCZacP0="; + hash = "sha256-Jl9ZWFqBvLgQwCoMNX3g7z02yc7oYx+d6mbyLBzBJOs="; }; strictDeps = true; From 8e3984de4c7334e0d6077e834b7e0212c7e9d585 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 19:59:04 +0000 Subject: [PATCH 117/203] avalanchego: 1.9.9 -> 1.9.10 --- pkgs/applications/networking/avalanchego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index f2e8a5d3b82c..6ef894c168e4 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM="; + hash = "sha256-lzobtncxL/7Lf/+kVzIdyP0dTzerMJRAoT7OBFdeEgc="; }; - vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8="; + vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; From 2b814394c8846365598348f00c5b93cfa911b5ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 20:05:14 +0000 Subject: [PATCH 118/203] rpi-imager: 1.7.3 -> 1.7.4 --- pkgs/tools/misc/rpi-imager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index ab4933f52d88..e875d5a59550 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D2FNg8SEUDQA466jfxBFhK0t8/5WJHx1fBTaCH0N+UQ="; + sha256 = "sha256-ahETmUhlPZ3jpxmzDK5pS6yLc6UxCJFOtWolAtSrDVQ="; }; nativeBuildInputs = [ cmake util-linux ]; From 2bd6fc164cf473bd1d3b03a725169c8369fc217b Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Sun, 5 Mar 2023 21:08:34 +0100 Subject: [PATCH 119/203] ntfy-sh: 2.1.1 -> 2.1.2 Diff: https://github.com/binwiederhier/ntfy/compare/v2.1.1...v2.1.2 Release notes: https://docs.ntfy.sh/releases/#ntfy-server-v212 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +- pkgs/tools/misc/ntfy-sh/node-packages.nix | 260 +++++++++++----------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index d8b816579c18..e29afc59f665 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-XjSPlaKYkUbiQQQHc/Sm6jWl9oJwOotZBzP6OBmrZLk="; + sha256 = "sha256-pBwlFkkXDgPhGfn2bhwuJTGQz+O0ADhPUU2Fogl98zA="; }; - vendorSha256 = "sha256-an1OseJT+0StTGFfEXob42X2V+9xIaav5tJh4cjDJ0c="; + vendorSha256 = "sha256-XePJaXD83731r5CJG1PHnpU6s+443yq8mrqx7ZPU8Gs="; doCheck = false; diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix index 588e68c1b6ec..266de2e8de38 100644 --- a/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix @@ -1642,67 +1642,67 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@mui/base-5.0.0-alpha.118" = { + "@mui/base-5.0.0-alpha.119" = { name = "_at_mui_slash_base"; packageName = "@mui/base"; - version = "5.0.0-alpha.118"; + version = "5.0.0-alpha.119"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.118.tgz"; - sha512 = "GAEpqhnuHjRaAZLdxFNuOf2GDTp9sUawM46oHZV4VnYPFjXJDkIYFWfIQLONb0nga92OiqS5DD/scGzVKCL0Mw=="; + url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz"; + sha512 = "XA5zhlYfXi67u613eIF0xRmktkatx6ERy3h+PwrMN5IcWFbgiL1guz8VpdXON+GWb8+G7B8t5oqTFIaCqaSAeA=="; }; }; - "@mui/core-downloads-tracker-5.11.9" = { + "@mui/core-downloads-tracker-5.11.11" = { name = "_at_mui_slash_core-downloads-tracker"; packageName = "@mui/core-downloads-tracker"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.9.tgz"; - sha512 = "YGEtucQ/Nl91VZkzYaLad47Cdui51n/hW+OQm4210g4N3/nZzBxmGeKfubEalf+ShKH4aYDS86XTO6q/TpZnjQ=="; + url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.11.tgz"; + sha512 = "0YK0K9GfW1ysw9z4ztWAjLW+bktf+nExMyn2+EQe1Ijb0kF2kz1kIOmb4+di0/PsXG70uCuw4DhEIdNd+JQkRA=="; }; }; - "@mui/icons-material-5.11.9" = { + "@mui/icons-material-5.11.11" = { name = "_at_mui_slash_icons-material"; packageName = "@mui/icons-material"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.9.tgz"; - sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw=="; + url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.11.tgz"; + sha512 = "Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw=="; }; }; - "@mui/material-5.11.10" = { + "@mui/material-5.11.11" = { name = "_at_mui_slash_material"; packageName = "@mui/material"; - version = "5.11.10"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.11.10.tgz"; - sha512 = "hs1WErbiedqlJIZsljgoil908x4NMp8Lfk8di+5c7o809roqKcFTg2+k3z5ucKvs29AXcsdXrDB/kn2K6dGYIw=="; + url = "https://registry.npmjs.org/@mui/material/-/material-5.11.11.tgz"; + sha512 = "sSe0dmKjB1IGOYt32Pcha+cXV3IIrX5L5mFAF9LDRssp/x53bluhgLLbkc8eTiJvueVvo6HAyze6EkFEYLQRXQ=="; }; }; - "@mui/private-theming-5.11.9" = { + "@mui/private-theming-5.11.11" = { name = "_at_mui_slash_private-theming"; packageName = "@mui/private-theming"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.9.tgz"; - sha512 = "XMyVIFGomVCmCm92EvYlgq3zrC9K+J6r7IKl/rBJT2/xVYoRY6uM7jeB+Wxh7kXxnW9Dbqsr2yL3cx6wSD1sAg=="; + url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.11.tgz"; + sha512 = "yLgTkjNC1mpye2SOUkc+zQQczUpg8NvQAETvxwXTMzNgJK1pv4htL7IvBM5vmCKG7IHAB3hX26W2u6i7bxwF3A=="; }; }; - "@mui/styled-engine-5.11.9" = { + "@mui/styled-engine-5.11.11" = { name = "_at_mui_slash_styled-engine"; packageName = "@mui/styled-engine"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.9.tgz"; - sha512 = "bkh2CjHKOMy98HyOc8wQXEZvhOmDa/bhxMUekFX5IG0/w4f5HJ8R6+K6nakUUYNEgjOWPYzNPrvGB8EcGbhahQ=="; + url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.11.tgz"; + sha512 = "wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg=="; }; }; - "@mui/system-5.11.9" = { + "@mui/system-5.11.11" = { name = "_at_mui_slash_system"; packageName = "@mui/system"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/system/-/system-5.11.9.tgz"; - sha512 = "h6uarf+l3FO6l75Nf7yO+qDGrIoa1DM9nAMCUFZQsNCDKOInRzcptnm8M1w/Z3gVetfeeGoIGAYuYKbft6KZZA=="; + url = "https://registry.npmjs.org/@mui/system/-/system-5.11.11.tgz"; + sha512 = "a9gaOAJBjpzypDfhbGZQ8HzdcxdxsKkFvbp1aAWZhFHBPdehEkARNh7mj851VfEhD/GdffYt85PFKFKdUta5Eg=="; }; }; "@mui/types-7.2.3" = { @@ -1714,13 +1714,13 @@ let sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw=="; }; }; - "@mui/utils-5.11.9" = { + "@mui/utils-5.11.11" = { name = "_at_mui_slash_utils"; packageName = "@mui/utils"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.9.tgz"; - sha512 = "eOJaqzcEs4qEwolcvFAmXGpln+uvouvOS9FUX6Wkrte+4I8rZbjODOBDVNlK+V6/ziTfD4iNKC0G+KfOTApbqg=="; + url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.11.tgz"; + sha512 = "neMM5rrEXYQrOrlxUfns/TGgX4viS8K2zb9pbQh11/oUUYFlGI32Tn+PHePQx7n6Fy/0zq6WxdBFC9VpnJ5JrQ=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1777,13 +1777,13 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@remix-run/router-1.3.2" = { + "@remix-run/router-1.3.3" = { name = "_at_remix-run_slash_router"; packageName = "@remix-run/router"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz"; - sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="; + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.3.tgz"; + sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w=="; }; }; "@rollup/plugin-babel-5.3.1" = { @@ -2227,13 +2227,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-18.14.2" = { + "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.2"; + version = "18.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; - sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; + sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; }; }; "@types/parse-json-4.0.0" = { @@ -2434,85 +2434,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.53.0" = { + "@typescript-eslint/eslint-plugin-5.54.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz"; - sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"; + sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw=="; }; }; - "@typescript-eslint/experimental-utils-5.53.0" = { + "@typescript-eslint/experimental-utils-5.54.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz"; - sha512 = "4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.54.0.tgz"; + sha512 = "rRYECOTh5V3iWsrOzXi7h1jp3Bi9OkJHrb3wECi3DVqMGTilo9wAYmCbT+6cGdrzUY3MWcAa2mESM6FMik6tVw=="; }; }; - "@typescript-eslint/parser-5.53.0" = { + "@typescript-eslint/parser-5.54.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz"; - sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"; + sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ=="; }; }; - "@typescript-eslint/scope-manager-5.53.0" = { + "@typescript-eslint/scope-manager-5.54.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz"; - sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"; + sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg=="; }; }; - "@typescript-eslint/type-utils-5.53.0" = { + "@typescript-eslint/type-utils-5.54.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz"; - sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"; + sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ=="; }; }; - "@typescript-eslint/types-5.53.0" = { + "@typescript-eslint/types-5.54.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz"; - sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"; + sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ=="; }; }; - "@typescript-eslint/typescript-estree-5.53.0" = { + "@typescript-eslint/typescript-estree-5.54.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz"; - sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"; + sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ=="; }; }; - "@typescript-eslint/utils-5.53.0" = { + "@typescript-eslint/utils-5.54.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.53.0.tgz"; - sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"; + sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw=="; }; }; - "@typescript-eslint/visitor-keys-5.53.0" = { + "@typescript-eslint/visitor-keys-5.54.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz"; - sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz"; + sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -3433,13 +3433,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001458" = { + "caniuse-lite-1.0.30001460" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001458"; + version = "1.0.30001460"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; - sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz"; + sha512 = "Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.4.0" = { @@ -4513,13 +4513,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-to-chromium-1.4.311" = { + "electron-to-chromium-1.4.320" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.311"; + version = "1.4.320"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz"; - sha512 = "RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz"; + sha512 = "h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q=="; }; }; "emittery-0.10.2" = { @@ -4900,13 +4900,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.4.2" = { + "esquery-1.5.0" = { name = "esquery"; packageName = "esquery"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"; - sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"; + sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="; }; }; "esrecurse-4.3.0" = { @@ -5989,13 +5989,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.1" = { + "is-array-buffer-3.0.2" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; }; }; "is-arrayish-0.2.1" = { @@ -6952,13 +6952,13 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "lilconfig-2.0.6" = { + "lilconfig-2.1.0" = { name = "lilconfig"; packageName = "lilconfig"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"; + sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; }; }; "lines-and-columns-1.2.4" = { @@ -8869,22 +8869,22 @@ let sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; }; }; - "react-router-6.8.1" = { + "react-router-6.8.2" = { name = "react-router"; packageName = "react-router"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz"; - sha512 = "Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg=="; + url = "https://registry.npmjs.org/react-router/-/react-router-6.8.2.tgz"; + sha512 = "lF7S0UmXI5Pd8bmHvMdPKI4u4S5McxmHnzJhrYi9ZQ6wE+DA8JN5BzVC5EEBuduWWDaiJ8u6YhVOCmThBli+rw=="; }; }; - "react-router-dom-6.8.1" = { + "react-router-dom-6.8.2" = { name = "react-router-dom"; packageName = "react-router-dom"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz"; - sha512 = "67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ=="; + url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.2.tgz"; + sha512 = "N/oAF1Shd7g4tWy+75IIufCGsHBqT74tnzHQhbiUTYILYF0Blk65cg+HPZqwC+6SqEyx033nKqU7by38v3lBZg=="; }; }; "react-scripts-5.0.1" = { @@ -11295,23 +11295,23 @@ let sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@leichtgewicht/ip-codec-2.0.4" - (sources."@mui/base-5.0.0-alpha.118" // { + (sources."@mui/base-5.0.0-alpha.119" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/core-downloads-tracker-5.11.9" - sources."@mui/icons-material-5.11.9" - (sources."@mui/material-5.11.10" // { + sources."@mui/core-downloads-tracker-5.11.11" + sources."@mui/icons-material-5.11.11" + (sources."@mui/material-5.11.11" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/private-theming-5.11.9" - sources."@mui/styled-engine-5.11.9" - sources."@mui/system-5.11.9" + sources."@mui/private-theming-5.11.11" + sources."@mui/styled-engine-5.11.11" + sources."@mui/system-5.11.11" sources."@mui/types-7.2.3" - (sources."@mui/utils-5.11.9" // { + (sources."@mui/utils-5.11.11" // { dependencies = [ sources."react-is-18.2.0" ]; @@ -11331,7 +11331,7 @@ let ]; }) sources."@popperjs/core-2.11.6" - sources."@remix-run/router-1.3.2" + sources."@remix-run/router-1.3.3" sources."@rollup/plugin-babel-5.3.1" sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/plugin-replace-2.4.2" @@ -11383,7 +11383,7 @@ let sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.2" sources."@types/prop-types-15.7.5" @@ -11405,20 +11405,20 @@ let sources."@types/ws-8.5.4" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.53.0" - sources."@typescript-eslint/experimental-utils-5.53.0" - sources."@typescript-eslint/parser-5.53.0" - sources."@typescript-eslint/scope-manager-5.53.0" - sources."@typescript-eslint/type-utils-5.53.0" - sources."@typescript-eslint/types-5.53.0" - sources."@typescript-eslint/typescript-estree-5.53.0" - (sources."@typescript-eslint/utils-5.53.0" // { + sources."@typescript-eslint/eslint-plugin-5.54.0" + sources."@typescript-eslint/experimental-utils-5.54.0" + sources."@typescript-eslint/parser-5.54.0" + sources."@typescript-eslint/scope-manager-5.54.0" + sources."@typescript-eslint/type-utils-5.54.0" + sources."@typescript-eslint/types-5.54.0" + sources."@typescript-eslint/typescript-estree-5.54.0" + (sources."@typescript-eslint/utils-5.54.0" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.53.0" + sources."@typescript-eslint/visitor-keys-5.54.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -11554,7 +11554,7 @@ let sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001460" sources."case-sensitive-paths-webpack-plugin-2.4.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -11723,7 +11723,7 @@ let sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.311" + sources."electron-to-chromium-1.4.320" sources."emittery-0.8.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" @@ -11818,7 +11818,7 @@ let }) sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."estree-walker-1.0.1" @@ -11981,7 +11981,7 @@ let sources."internal-slot-1.0.5" sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -12287,7 +12287,7 @@ let sources."language-tags-1.0.5" sources."leven-3.1.0" sources."levn-0.4.1" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."loader-runner-4.3.0" sources."loader-utils-2.0.4" @@ -12558,8 +12558,8 @@ let sources."react-infinite-scroll-component-6.1.0" sources."react-is-16.13.1" sources."react-refresh-0.11.0" - sources."react-router-6.8.1" - sources."react-router-dom-6.8.1" + sources."react-router-6.8.2" + sources."react-router-dom-6.8.2" sources."react-scripts-5.0.1" sources."react-transition-group-4.4.5" sources."read-cache-1.0.0" From 1ae55a93f8a23610fb1b729458567198eb03b49f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 20:13:16 +0000 Subject: [PATCH 120/203] coreth: 0.11.7 -> 0.11.8 --- pkgs/applications/networking/coreth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 76464c0d980a..5f857caee92c 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-PMjgEZ7D1peoW5ubOB/QrnmKVZs4/ToIBKH9zBT1J10="; + hash = "sha256-O6dTbhnZPWd7BKMwaPfUOPwcvwzQoHUKR9Zj7uKqtGM="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-Ne3+NJsEJKjvkLShJxiiOq/UoORF7ggv/j7ltPgrSfQ="; + vendorHash = "sha256-nJA83SfMv+5xKKyJTtaSRsro1XR+3sNiszBeXRRY5NA="; ldflags = [ "-s" From 1e45fc393bf819cf2f211c9ea237283246465d97 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 5 Mar 2023 21:03:11 +0100 Subject: [PATCH 121/203] chromiumDev: 112.0.5596.2 -> 112.0.5615.12 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 389261af9657..c2f7767aeb8a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "112.0.5596.2", - "sha256": "03s6phrqv3a6vdkig9npkvnpgc8hcfb6fqgxlmlcmhrf9cszvycg", - "sha256bin64": "1an3gmxcfkzfx30ympli8r7p3xp93i8zmvrayvgddvb8xszrbc3c", + "version": "112.0.5615.12", + "sha256": "1kkpfaqr3rzxlj7kn2l8gchvq17w03mcf3aajqv193jazcb083ci", + "sha256bin64": "1ci3vmr6q665rp8h7b1y7gmkv4zczjw5ryf0yycwfcll087ym6g6", "deps": { "gn": { - "version": "2023-02-07", + "version": "2023-02-17", "url": "https://gn.googlesource.com/gn", - "rev": "edf6ef4b06b42c58292faea78498aff76bdf68ed", - "sha256": "1l3wz5rxg6q4923gxwx7hrrbx8123i7iniw8ihajp7v4qz27xbcp" + "rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108", + "sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c" } } }, From a5e4818b2b2721b62558a2e70fb8a91bb69ad039 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Mar 2023 21:29:33 +0100 Subject: [PATCH 122/203] python310Packages.bthome-ble: 2.7.0 -> 2.8.0 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v2.8.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index c3f6a9766dab..fd4ea9a6fde6 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wt/TA8bymjYgYSb63Viqf6ToUE1ffa2a3SEVFuTHh94="; + hash = "sha256-SdYS/S3wBmIl/f+0H67PcMRX7GiJqAkysvlENshB1yY="; }; nativeBuildInputs = [ From 1c696382ae5e3eb31f689c55ffd15ff1087f1315 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 20:46:55 +0000 Subject: [PATCH 123/203] autorestic: 1.7.5 -> 1.7.6 --- pkgs/tools/backup/autorestic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 7bc9805117b9..163172145415 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gf2sqMI8dG7+sVSqe2f5oG7vqQ9UDKAqPUS+MPVB7SI="; + sha256 = "sha256-jlCCARbZSAHK0ojlTdtUl7fo+MAtuQYo64lZeKyQ9ho="; }; - vendorHash = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; + vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; nativeBuildInputs = [ installShellFiles ]; From fbaaa34c7a1b3f4d7923a987ab3946326e225227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 21:02:01 +0000 Subject: [PATCH 124/203] fetchmail: 6.4.36 -> 6.4.37 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fef4f8ce7877..c6280232b8e9 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.36"; + version = "6.4.37"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo="; + sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo="; }; buildInputs = [ openssl python3 ]; From fddd8787d374141fbbb45ed68debba11483450b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 21:17:06 +0000 Subject: [PATCH 125/203] openfortivpn: 1.19.0 -> 1.20.1 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 87b7ae1970cb..c63ae2968f5f 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HwKkgRS3Hccym78T+suFkIP5nmQDWRAwm0l/PaS1p7o="; + sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From 437508639df090459b1a9f1871ab7966913687b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 21:22:57 +0000 Subject: [PATCH 126/203] cemu: 2.0-26 -> 2.0-28 --- pkgs/applications/emulators/cemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 91f6cb0de1a6..45257fbf7545 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-26"; + version = "2.0-28"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE="; + hash = "sha256-qKrj3XPtFVy0/KH18D0oCeVUQQmIdkYJYrCKD82c/+s="; }; patches = [ From 5dda1cbe9549cdf25c4ac70df5d7b230a613fbc3 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Sun, 5 Mar 2023 17:10:43 -0500 Subject: [PATCH 127/203] grapejuice: 7.2.1 -> 7.8.3 --- pkgs/games/grapejuice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index a8f306977104..629ecac05647 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "7.2.1"; + version = "7.8.3"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas="; + sha256 = "sha256-jNh3L6JDuJryFpHQaP8UesBmepmJopoHxb/XUfOwZz4="; }; nativeBuildInputs = [ From cda984b5ec21de133374025cffe9cbf548d839bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 22:45:16 +0000 Subject: [PATCH 128/203] kics: 1.6.10 -> 1.6.11 --- pkgs/tools/admin/kics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 7f5ee05fe3cc..f195ef0d6d37 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-tff/L/rNkZXl7Ublg4MckDPul/BhdNJVUXGtPcdi3Fk="; + sha256 = "sha256-0tUm6+nfmrAoeigk+mhDMoQAbXBPLeuWyJqfcI5KbTY="; }; - vendorHash = "sha256-4Zt+1spcUR04NU7Pl3ImnOnwtj9Rsgz2aLYqaFDLvyU="; + vendorHash = "sha256-7QiLZG8V7OtQldLwXjYnDGExIWhWpShPf3p8EVighBA="; subPackages = [ "cmd/console" ]; From 1fc187089b742fb79f07d88ede3b9939281ce3ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 00:16:48 +0100 Subject: [PATCH 129/203] ares-rs: init at 0.9.0 --- pkgs/tools/security/ares-rs/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/ares-rs/default.nix diff --git a/pkgs/tools/security/ares-rs/default.nix b/pkgs/tools/security/ares-rs/default.nix new file mode 100644 index 000000000000..433cdaa5792a --- /dev/null +++ b/pkgs/tools/security/ares-rs/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ares-rs"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "bee-san"; + repo = "ares"; + rev = "refs/tags/${version}"; + hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; + }; + + cargoHash = "sha256-7zDq66oWT+j6t9LEBUoeby8MQ1Ihhvk3KLwWPQAThyc="; + + meta = with lib; { + description = "Automated decoding of encrypted text without knowing the key or ciphers used"; + homepage = "https://github.com/bee-san/ares"; + changelog = "https://github.com/bee-san/Ares/releases/tag${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "ares"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..669955a60a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,6 +290,8 @@ with pkgs; ansi = callPackage ../development/tools/ansi { }; + ares-rs = callPackage ../tools/security/ares-rs { }; + arti = callPackage ../tools/security/arti { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 1a79103b2b4fc48e07347f188ec2d68023c635ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 23:47:12 +0000 Subject: [PATCH 130/203] rauc: 1.8 -> 1.9 --- pkgs/tools/misc/rauc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index a43bb78e8a59..7bc613ac3f93 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lSTC/WDwa6WVPd+Tj6XdKpwwENfAweUnE6lCyXQvAXU="; + sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk="; }; passthru = { From a7cfc9afdf51ebcb571f463847c0ac8cae2cd0e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 00:50:56 +0100 Subject: [PATCH 131/203] python310Packages.ospd: add changelog to meta --- pkgs/development/python-modules/ospd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index 4525d455757c..a9e6ba10d981 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; + rev = "refs/tags/v${version}"; + hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for vulnerability scanners which support OSP"; homepage = "https://github.com/greenbone/ospd"; + changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; }; From 23dec20de6262748af0492e26cdbe86a8dcf7840 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 00:56:48 +0100 Subject: [PATCH 132/203] ospd-openvas: init at 22.4.6 https://github.com/greenbone/ospd-openvas --- pkgs/tools/security/ospd-openvas/default.nix | 55 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/tools/security/ospd-openvas/default.nix diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix new file mode 100644 index 000000000000..1a95f099b236 --- /dev/null +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ospd-openvas"; + version = "22.4.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "ospd-openvas"; + rev = "refs/tags/v${version}"; + hash = "sha256-tgLOO4L/P6USiPf72uZse36r8HhXJnUUT8PfZH4E/jg="; + }; + + pythonRelaxDeps = [ + "packaging" + "python-gnupg" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + deprecated + lxml + packaging + paho-mqtt + psutil + python-gnupg + redis + sentry-sdk + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ospd_openvas" + ]; + + meta = with lib; { + description = "OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"; + homepage = "https://github.com/greenbone/ospd-openvas"; + changelog = "https://github.com/greenbone/ospd-openvas/blob/${version}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..ab6980e56ac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,6 +5405,8 @@ with pkgs; ossutil = callPackage ../tools/admin/ossutil {}; + ospd-openvas = callPackage ../tools/security/ospd-openvas {}; + osv-detector = callPackage ../tools/security/osv-detector {}; osv-scanner = callPackage ../tools/security/osv-scanner {}; From 521fb3f6a67fb10722fe5e6abe036c54f2eb6137 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 01:09:38 +0100 Subject: [PATCH 133/203] gvm-libs: add changelog to meta --- pkgs/development/libraries/gvm-libs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index a35a256b5505..b24788122b1d 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; + rev = "refs/tags/v${version}"; + hash = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Libraries module for the Greenbone Vulnerability Management Solution"; homepage = "https://github.com/greenbone/gvm-libs"; + changelog = "https://github.com/greenbone/gvm-libs/releases/tag/v${version}"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; From a97d17a444c2fb22839418c564d7502a9ba6de91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 01:15:06 +0100 Subject: [PATCH 134/203] gvm-libs: 21.4.4 -> 22.4.4 Diff: https://github.com/greenbone/gvm-libs/compare/refs/tags/v21.4.4...v22.4.4 Changelog: https://github.com/greenbone/gvm-libs/releases/tag/v22.4.4 --- pkgs/development/libraries/gvm-libs/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index b24788122b1d..b2c872e06fda 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , cmake +, doxygen , fetchFromGitHub , glib , glib-networking @@ -14,6 +15,7 @@ , libuuid , libxcrypt , libxml2 +, paho-mqtt-c , pkg-config , zlib , freeradius @@ -21,17 +23,18 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.4"; + version = "22.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; + hash = "sha256-qsEIjoaq+iBl6iTdSXrxf7LYin/qiGtJ/LaD4bONbI0="; }; nativeBuildInputs = [ cmake + doxygen pkg-config ]; @@ -49,6 +52,7 @@ stdenv.mkDerivation rec { libuuid libxcrypt libxml2 + paho-mqtt-c zlib ]; From ede665f2ef01f54831624a413030f7b6cb0ba661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 00:15:37 +0000 Subject: [PATCH 135/203] miopengemm: 5.4.2 -> 5.4.3 --- pkgs/development/libraries/miopengemm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index d363f524f199..f288cfda5456 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" From d4b88e4d15100cbd70bfaabe0a8b9f97e694d25c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 01:28:47 +0000 Subject: [PATCH 136/203] python310Packages.kaggle: 1.5.12 -> 1.5.13 --- pkgs/development/python-modules/kaggle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 6b67818decfc..a07450fab76a 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.5.12"; + version = "1.5.13"; src = fetchPypi { inherit pname version; - sha256 = "b4d87d107bff743aaa805c2b382c3661c4c175cdb159656d4972be2a9cef42cb"; + sha256 = "sha256-g2TFbDYSXLgZWHbZEdC8nvvBcxZ+ljuenveTeJupp/4="; }; # The version bounds in the setup.py file are unnecessarily restrictive. From b9c88ad0a09144667147b19c29f4187052820690 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 01:46:10 +0000 Subject: [PATCH 137/203] python310Packages.google-cloud-error-reporting: 1.8.2 -> 1.9.0 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index b9dfd63441ba..3d7f5bdab756 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.8.2"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bwl1gWLux5LJMZIS/tJFMhHs1LcaDVCTgNrke6ASiBI="; + hash = "sha256-5URk8yZy5ld17p7UXf5y+kciM2bH8NmgEvJ1SqwYJ9o="; }; propagatedBuildInputs = [ From 626cc1f3e645d8b3815d27c4bef8210c651aa680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 01:50:43 +0000 Subject: [PATCH 138/203] firefox-beta-bin-unwrapped: 111.0b6 -> 111.0b8 --- .../browsers/firefox-bin/beta_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index c8a8a85c3724..246cd15af3f8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b6"; + version = "111.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1ee70baaef25a9e412c3c4b57f86bd6875390dc5e342a74aa42a1a8ed6317340"; + sha256 = "269dc39cbd876a480c7e5ffba2e2485b0d38bea9acb575a6de7597decf211ae0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20c8f0710d6bebcb51fe27e3969048a61e1957a680843751ed9c526668932e5d"; + sha256 = "2d96546d48f3048b6a2ce46e1b4aaede84e6a303d70458983b05dffcd9c08e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3eb9397dfbc37bb54ed8193c3c28eafcf85e3c439b50470a171a591c0ba14049"; + sha256 = "793a8d77b4addf0ced87d5f15d53c6c1e82ceb95d2c0056ce2c6a98d694751c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "eaa2b0a1177b476a6e4da80ca11c4719872e649f7bec0ac1006bd347e6b627cd"; + sha256 = "fb8624c6bc03bdcc0a30f10e9b81dbdb16cdcb35f89ad6c7485102ba8bdbf513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "637676aa8418dc6f1d3061d2dc2f6a19b80df26b5aa5b04d2fea697c417c75fa"; + sha256 = "d4509b771d11ea1c896f16d76762dc2c43585650aa1039adb8747095b444857c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2e1b4ad6c88cfb4369299b952ee7c1d1ddf97461c82d496b1687a6558d008518"; + sha256 = "89444c573fe9854a6f8bfeb700b4e6867b0b4653ce77691b1625ef1a663bc570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6d3fac5c4402889a9fab97747e397082a75de3651c450ffde52e61b6a105d09e"; + sha256 = "2f66c9a6a4e32a229e18c0a25964b675f360b6f49237e6057a4c95fac345eb44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8c0a04a1d4aa8c27a1afd33251dc6b789b82c8cb2a946a4314032ee211a50d62"; + sha256 = "6e36ae61a32eeec05f629a996ca66d3b5149da42a1ba7814095f8e49ae368bc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "fe5a611afd91bd0724d03ba65acdc5bdef79693771c769bb7ea25ead33d8a61e"; + sha256 = "55f9b57bd28300368d346ea23eff96183909a4bf1c7dfca40fa826e82e092d8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "10beb0d6cfa7a384090e42827b200eea2bd53454aef1dd9f1a4a49f43d4d82b1"; + sha256 = "0d080e978ecb9749d7584c523e09fbe5821a13021c2be0a86100e3b89bc0d020"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ec8a5e0ca3484c3d422d87a09f014ab9efc0b0c0e11785233d6da72b649d24e8"; + sha256 = "be4f73c95edbef52d0758e4d7a1bd727ce761aa544a8893a25492330982554f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "15a12109eb1a129fdda1171102aec0bf2e5483d10b0ca3739ec26d6433fe0d33"; + sha256 = "8c81f99a4f3c1b2a60e3ab13f16ae99fc86a60dbf866b1626401e84335fe9f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "71025d3cb8b72f0110cdf0243164115f188c1a4bd864f6ff17304f2e58190cfa"; + sha256 = "1aa57869adfcbfd93abf27dbefec6b804227f2154ab5892b827fd0d68fabe059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1a0eaad50ef10bafcfeba322950fe2d8872c3ea8d2e09146c1cb1c245bc2ddd2"; + sha256 = "c657012c8907084eb4ce301e7833fe669e0be96a0f32ee270040c99358c63e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "06a5f8b14a92d611bb9977f7c574e498b1cf83b4a7ccf7c0517bef8cc1b5c4c0"; + sha256 = "a446f29ac2668f2cef6deb6330f193407e1ab250e08c1033fbb1ae775c2c12e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fff902bed4909de9044a6e4217b1525a791a854ea148b0f31f0c7ab06efad667"; + sha256 = "dc187d329fff2c6cd84ddb6cf47c047ff41d7ee7d795dc7c9a2523362c3d515e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "172fbee0184cb829755b0c681593de7f146156f01b8b5fa1c093549d66b091d4"; + sha256 = "311da7ac12ad5748f4f301374f6fe474053ed7448d76fd8d0eee0427274b4fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4f4734b7b68fc3002250cfe3b78cb27925a7267553be5b4c86aaeefea3666f29"; + sha256 = "6b1634343ad72f9f917fb2491f7593d7f59eed963c263abbe72cceeee44e01d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a29da2c2bbe243fa1b5080962b68b77260d91ea3d16b68c4033c4c683f49d929"; + sha256 = "608e1981096855d4b11e035fe2f0520574bf4d6126f0ca695c76ad7e71859fdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d0aa992170821e77222daaace13d059bb077e53ff38bda23a1218a99e2a4f994"; + sha256 = "e6e508da92c33e92cbb35c8faeaf0e97a42ea60496e1082b17471c5310f4fc48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b0e00806bb1d55a0c911b7e022282f3d066158401192fd432bb47e968c9a980c"; + sha256 = "74619673bbef29b09055a6ad7f9793f184a752ef08b97bb10872548cfad74385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "891ca73ee7608902b4a2a0311c615bad9aff1d6514983597202c1baad26b6477"; + sha256 = "70bd112e0803b92789ef9bbc18dad26444c35788c7f8eb65f8677aa7a9690033"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1b8650ac822e3176ef2f47e32a6deca53bb53193289dc1b63562831fad2e70a6"; + sha256 = "69fd115da6f9262e0ff9c1ffc45575fdbcdfd54d377289d622d0266cbf390ae3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0a8b46212f36890f4e7671f97a400a0a3a18583bd5fc6a112e6bdadc360a910f"; + sha256 = "d7e31eed1e72f2edfec79e8a10fc7d7f56fcb3c51f99b59ab075cbb06d7a8c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9e3df1097dec9dd8e624d974bf2266a48ec064f2b1ea3cffd6a7f6fa99672cb6"; + sha256 = "1c2493d9aee6a9d82df2fabd29d8fc25032cf7d16480db772d7bae9b50d55267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f2f91fb924b27f9449cf58439a5216e313f77b1ee607a57ed3ba64473b2c8a9e"; + sha256 = "75ec2c9d79fdd9af3a8cdaf2fd644a936cd8bf7338f0a66ec1e2e2812b2b3d69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0a6eeed4f58e19f62ba6a35d4ee59190ee3bff0c4a6194c6ce3c2a3b6d75aa74"; + sha256 = "5b4d3cd852dbb075c78a0e05a55dcc5a072e6f17111343d4a444a93f738a343c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b10f6abce1f7e9bb7a2bd0977d2fa4d76b587c868e7636b49f95da5e1e502a94"; + sha256 = "f3eaf9e6a2288f52f08adaffaef18f3057dc78888da96138b5fca1ec1f82fcf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "72478742a27db5ba63b06b4f26edc3a03b1719227cb2bb177b965c2805628d25"; + sha256 = "e74d817c9d8c9cfd0fb4b0e6ceb55a9825880323daeb283dff08ec10ac3d03a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9a232a430c8108bd944395dfaceb1d3f350482cd10f1f3f54e30f86691c52e65"; + sha256 = "58499484b222c68aea2386f62eafbeac6179dae1df5fb60a22d57f63f91e77ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "180da12ee212d6a4d387f8d365998de80910727d8999a84d3cd23357289af485"; + sha256 = "4685a514ed0f627b58464ab7949e2570fe1f3eb903e21816e384d599728f294f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "892750a511be03e2e30e4cc7bb9da509f0ee027b08a7480d01f7d84f912ea648"; + sha256 = "ffab5a17ba7a8dc900a7727b380c5cda427c634acac6f5d856da09e6186b555d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "da3f23947dd3796dd3011dad46bde701f151a777e23290ac1519f9e06b72ec35"; + sha256 = "1d89d921b2dd9644fbb2b600573b4aad3ac832f2da66a3bee44607a53e268008"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9db563609d6d740e60606d1d1abff553c04ae2d8ad7873ec375fd15f6a2e1cf2"; + sha256 = "054ad2f7a95fd0dac604d1e709c736cd6ada53adeae63b8468a2d1dd0e9f60c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e8fefc8bbd9f489b5eaa14c14d8c1456557b1c85fdb9188fc2ec14f7b7a53794"; + sha256 = "a46fc891c9f658b6610d901aefb83f9bd7e5ae19a64b429c1077691bcbca045b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5067b3002fbcdb76b42b452d200d1fcd9cc3cedcab81d4b97aa39541fa93dc65"; + sha256 = "4f7390dff95dbce0c5b0489602e0659b330c1868ed76c7901ddf5860a4df8ee8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "29ad1bb43e2cf17510fe94a9bbb0f6b03149ae997ecf362cf40a74586787734a"; + sha256 = "7eb0fe2607754d2f6f2c7ce67b2e9d6a52b61695fd603ab2a9750cedb83be589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5096da1af9fc8dc358d86512f4ec416e114df0eac1d6f4a0bbae5b2a9bc37906"; + sha256 = "e48ff3117f7b12a5e62431c49a26745ba556e674b09499803966163377f90597"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e3e68af4c1c4e6a2c5c2328584af7fbac6b1160cbe20face8d02ae713cab735f"; + sha256 = "b2a7fa276e1e42a5b2d6f2e9f6b0cf8c4d5a06a11d5961ddf36e4e244e583593"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "713b63f6c31f620f2d079147a1c547e3622b31cde6bbb77ac6ab764145a3624f"; + sha256 = "4ba54e390d4ca56c5fa247453f5eedb9a76ca5765da53c1c4537eb10f9ed45a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b2b5390fad804c3708f1a4931cfc2d182e4ae27df47fef552a44099119c6b0ab"; + sha256 = "0fc2f5c3fa0ffc29b290316f68021687e692495d858d66362bd09d7755ca61a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c3287d8e8c3b4431f9b3a1da523d482372f2b461146fc5146e387176f11122bc"; + sha256 = "1d164328ff99d9f052ba9d3efd4cd9c14fd3a665c9e515e3666125363519e7a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "af1f514e8014a808659b7f01ec5274db11e5a682342dfabd69ba5338732af465"; + sha256 = "ec7e4ca3529624db58e413c9e36bd367ab108f73aa09e20587d7b680e854a95b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6039e0b4c76e1a86d0e76eb64682c6e57588b0f385249e2b88cbd280f712c5f3"; + sha256 = "6c9f1ddee7ba12c6f075819dc86a36522cf1d58e88d41378d14b6c6fa2a923d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2bc580b09cb87a8bee5f19ad25da43db92c61ee76d68f94ed75ba750f9074c1c"; + sha256 = "007f641d8f3a4348fc53efe404aeeeb018bb8003048826e16bae2107f7f791a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9f9b0381fe4c044020e9fc1c66203d9d521156b1050ea6ef9b9fd32197333974"; + sha256 = "26449a321dda6ee431207f0c412bd4e7bd65663f43979c1c294627f2cb97c4d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ab640bb474b99f786546fb198439f3ec9216ca7a1e9d9ff829fe9edc869d5ad8"; + sha256 = "039254afb85950ab3aafd335328a0dfd0b4b2009aa58d78233853bbaf3156e25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6146c01a30e33f05b8e33e9cb296b98c3564a413f4360bf657bd13c1e875a89f"; + sha256 = "249f3b342d8f7399c74a2bfc613af09af0d5e7accc020bc6963e20d0cacd56b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "58d8cfd0ff22c434aa897d709b7b6d9dd631448b348021641443b50c05116a24"; + sha256 = "452c2bd007a2759d3bcead151de1da48a744958d60160d35786c04be90917dd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ae41be247d71227f68f419b81b547a71625a10ff21e93271598fc38de528d696"; + sha256 = "8e53044f6659e853a4df3f5213320343355548357d519221525a040e0a97dfb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2ce9ca925b47853ae07efe2370bac839b270c867dd650578461f37ffb109a08a"; + sha256 = "0c60fe915d8fee0adc05a432e2985209f2f86bf4972d434e2090249b8b1c8ea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "36798fe697913dd15c8831fd9ba287c6e9a1ff9bfa7d57ae518055ff5f097ae9"; + sha256 = "5221ae7ccd0793e4a752deda5363c390c6bd54e54700f7022f6b723f1196f835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "74e394513597d01ab3eb9ea373ed1eabe081b7ff3d14a486b5133e05784ee212"; + sha256 = "f762705b947ea334b4e15007c6123a75e28fa416d609955e3c35040737728e45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f20b4c48e5864a32c9b44068618cbf0eaec0f157398a735ef5bd66738c546995"; + sha256 = "e39779eef6d953aa87b6ccd2ab5b71802b5201e9cd333de45388894359bc62de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e144c1a15cfa846be6cbf5c0bd2130c515ee36cc5f4748bcc705facd40f812a2"; + sha256 = "eb3b95d9f579bd14e8d6eab765c14ecbfd6a93d4b222f5e4a16708f9bb169662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "85a71e0baf24a1d0dd856f20b9cba5e03db6acdde4e4d19f4958c37bfdd82b6c"; + sha256 = "6589fede696924d56ede3590d6af100dd558e7e7ca6f44a55fea37140915f095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "744e378a3a3006ddf00aacbb9ca635ca4e7bc98b1b2d63af51a3c9c2f4bf23c1"; + sha256 = "6976e3c805dac1409cc6a541b81a057cdc312f15ef3387f1ff9a05d6b529c6e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "100a1f77b83d80c319021a185eade6cb21e95036c57290ae7f0c8326c1195b32"; + sha256 = "773e04d3e9e4c818aab45fa5fbfc0baa1edf2e8d3cc0fcedb55ae2bc495b844d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e9006a9e8ecdb35b473b34f43088609507e8e5c23656ceb1071ddf7e30254a46"; + sha256 = "a5b9e9eca192461672e1f29d951686c4f606566c6f024f2b8664aff85cc72a2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4d1da84d06562f7d81f0a7911ec5b0cf01f59dfa88862602cd8c554bcb8dbde9"; + sha256 = "0b1f166f08d62949c0ba4f72225c8149befc9ba94913bcc54ff2dda687a01c1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6b0251405bfde6ec7ce719143d56f74ec0557f5603e491ec78048e2409322c79"; + sha256 = "82aac072c7299281c1d0133616c6e0c3f5c03df72e892e48731ac19b11f04e24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "100d05845b95841cc7c084cc2657602e1c0520a7e6ae9073c9b8f33dcfbbbc67"; + sha256 = "fd31c8f26fec85b85c09370b91e71e8ad577984d4e77d965f528388101a645c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b2fd3304bb6a6f0ac370177d244ee14d973abd088152b861b4e583d9a02cd600"; + sha256 = "6fc6484f7163d9aa5b29b10fb1c9e4f5c865c38d481414383e62a688db0ab981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0b235d44c0c77bdff0c3a5d24d16c0231145099d36a382c3e25c08f2607f6005"; + sha256 = "e56aa4c8bbd75bfa303aeee791a7f54df47ca45a90c40828a11de28261fc12d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "413625b9d9a7795db98b1597146afbb634405ac1865a56c9eda5c1c0c8ba8a74"; + sha256 = "e59ed8962cd267eacadd8c273c109b05b2c7d8abd89ebbf9c0505ac598330847"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "223101645d322985b119597bf750cb811856ec081ca0109736cee556549a4a76"; + sha256 = "e07856e116d21f71221fe6d09baa9de7b39c393466ab397e83e05a6072ed53cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fd664ec6f9f3c7d01c27dd3a538bdceded371a995cc2b4f3f5754014ee50af30"; + sha256 = "5eb1a0b5aa86304bda9b135354798c4bf273a542bfafdae58493b861fe9bf1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a9c71bbc38faf6485292c989a47b35ffdee930f112809c06396359107f2928fe"; + sha256 = "827c5e383d8bcb6c8351e94b62d28d98837bf22e5c0ab7b20f0ee7c3fd7df7fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "67f72c9bfde8f68720e52eb96a986195edcb0fc36eb5b122ac460a6c5506f0be"; + sha256 = "4e33cbedb9ec4294bc3c590d50f050f955a95973ac2a888bf7246482d8ef38c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0bc28ca44d311a409fde1f628fc4f511875d7e56aebc8b234599b755a06f7d1b"; + sha256 = "aaf09e1bc3021619edba3b86d0599360705cf8282202d19d68b3945772906f86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "28b367b1b201486bde7ea970ca1e124a1abacf99715b103e79bda7dc779aca02"; + sha256 = "388ca99b77bad8b85256ef8c94f42d5e94eb1e541e696b5616e871dc0380c857"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "41ccdb0645ca0010dcd96659eaf7cb87eb9ae9fef24f701f196bc9f92c6b1f76"; + sha256 = "7f9254889e2e26295dfd878fc5a1296a535ad12bc97832c652c611289c1fdf94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6ae80689d049c3dbc3b86ba8478815dcc68805f3f9a61afa286d76a4243de66b"; + sha256 = "ea983344e14e43e57761de7ff86622c370353be8b9098cc65789f015ffa08302"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4f4533b7e443b8cde10baee0a68b3db9cab9762344c4f9376c9ff2aca34c2813"; + sha256 = "1ceab92a1c89cf6c281da104736bdb07245c6b493640bbb0d289d3304b8f76f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa5e0cd6774e03884683394450abd7172180058ec02c706ba986ecbe67f387eb"; + sha256 = "c01a0ffee6bd39435cc49856c112df51c3ef10c3aec1f916980bd09e2ac3ba28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "0f73dc37b643df022b3d914f5f544fcbadcbf1bdf85f4abb6d186cdd2ef6b730"; + sha256 = "64a0065aa656ff81b9d4354d325becbc46344a767eaace692ce6c662d591c26c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bfc9c8fe82bced904268c3cfce53c1b34066879f298ee45944812639eb8cca99"; + sha256 = "143591dd532ea1250decb6d36296075e575746293f554498a51a86c82515e354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "fbb01fa4b75d25004cc5a79d21ca2013ab0833bd394f42867fba70c0a7091e44"; + sha256 = "b77079edc573f00a2e1fd840a18a9d8a1b275f0adc9e2d56d35c8963b9433000"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d73b8c6bf55b42e58410205a99d15af98bdbfec550434cd5815451955bd8598a"; + sha256 = "28f71392241f5f7871cf10e40d4eaf951615666e8780e79f560f7997748e7cc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f5d030c94c6f9a074ebbd97f18a6c14eeef9b00f73d11421614d1cf7e4b05efe"; + sha256 = "9e968c177b199b5bb6dc196c591b64aef4b8c3f801f203cc3e41f77234d4e218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8c6b3810988ba862c2419e583f3d14dd9722dfbf7c1a55d7e72b9d09cd2d46d1"; + sha256 = "0e58438f597a87218d9d50f44b60d397f807f11179b8f854ca9387705ec6ccc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8aa97c4ce2484735a009399ebeeadc8270fbce1806890ae17e5d42b6bf69338d"; + sha256 = "b66743d01ef65d1fc3be41741c9458350062df8167dea418bb8e3d7ff3c9e510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "57018f57ba6721ff11b5944e6b1d1825894ddd5b422b6bb3c1730be31437aedd"; + sha256 = "106a68c050abf166fcbe6b0e8aa96b6c3f75c4165bb467fb628f0b9ed0284c96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "48f5b50ad9f7d96ddc26b091f70c195e7f1abcce1347de74cc994364a47e045b"; + sha256 = "bd712df03192b43cd45202673f34dbfcc4a28d6299d0a0a5c7a4ceaab06eac27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d69e319133bc57559273111e85d573389151e841bc4381b909fa767a4b7fa634"; + sha256 = "32b4563a2a1a595d95299eee00731614e9ec117675b8a0063cd2fe37c5d3cc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1e06f9e2071c846aa703ee1da367512ba27f5854237e041b6c1f03ef2d8b3c07"; + sha256 = "17767bd33ca9f86236b909ec58116bfaa61b3440afa698e4fc9ae3fac89de0f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ffbec68627bb7660a2a5e55982e4405d74d48d56912506aca96ec42198e82337"; + sha256 = "af69ccf3e497a9c3c5e36f9b808f21c7c6a81b2f8e5fdbb5187d53d2e880976f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "add9451aaa5c20c3b963fda1cc0e75eb4ba4b84311f10ba405c10b8392d78ab9"; + sha256 = "ff8b14add93bc4395e8be6fa8f6630d8a7a2183a64a038a8e152ce30dea73ebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "da0772a5156e0ec08a5ce30c6ee7dc9cefe51cfd72790cbc53d6f2f3eb25a8e4"; + sha256 = "b9db822d4afc8d72cade1e03b396db1bfa96bc00caa66fc93be70f8509e0768c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "604d1b9e09334a639164dbbf5c3b974cbdfd0607d0823cb154381a406e43997d"; + sha256 = "67ce391735971500b8b6739282fefb781cb9a67140e8d508d65715d2e613d792"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2e1469c867e54ad1c6ba8504cf594ebb2f7167f619dce35073bc19c42f0db52f"; + sha256 = "aea24e2cadbfd9cbae87a21b5ff8a24c8a8fdde1f79b2b44637a779eccd2ecfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3310fcff33e6e6c93a17f73ef9a4c7557245e6881b87fef89fba61e24cf18aa6"; + sha256 = "d4960566c8b33b4c8fe2b7c50d6af9e5bba2cfc2e3ef6dd0c3e96b36a85d4a0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e9efa109578943b4779a89206ff2d096c4067bc996789d1a5a28885978a9acd4"; + sha256 = "fcedca9235e77dd06a53afe0ffcec131a49fc99ca0fe5edefe9d31287cfcb5da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b83faddf077b8c346b5ca76c7e78c23bdcaabd7b2edef2747a89de5eff19179b"; + sha256 = "b5b041aee3b4c4f205e8ef59d22f6284112b18a273fbc2432d2ba3f440b71b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "610732c62364f6c4a5873ba4003d549011eb424e312795749d76c58fe90c85ad"; + sha256 = "192ea167b65a86b9834982d017b9100865fab79cc0cbc174df137d7c1d4a213e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d0da17dac024d6cc3e636408f4736f586fc6695dd6b6614166ce4d6cf9321761"; + sha256 = "f6abb675ed43c2a6b346b8700603fea938482e2492d4241ec63620b19ad6f93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e90b17a36ea6dcd9189e1c6b0d8f152b0d56a852922ddf9e4ca9abf3bed724dd"; + sha256 = "17a48c248e13751476e83be211ab94643311d62051ca7b32cdff942623a9a301"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5d8fd0e91d7c8e3930a4be87560d6293680bd17f7e275ab619b23b772093ec95"; + sha256 = "a60b7f5c90c043c9c2540527dcd689d08e693a8348d1c2c1241e1f63e66472fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e67450564d27eeb7e605b673ccebd86924195a76d6eb7aa52603f1d8e3198f57"; + sha256 = "13684be7d69c332457e7c1f97072869ed87900744ccfa5dd9c9b198716c3b4b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7822b37160091511fc120ab7c6d11ebaab8cd601e1c4c89931140917a28f6e6b"; + sha256 = "eda9bc5547a095dbdfda0554a07970d75c5b8b4a421c5c79bf7ff06ce44245ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "67c634da5c832ad7d39088b397d0e34c69837e0e6c36604ffef4ada917df9341"; + sha256 = "cf0f925a584c5317b420d36bc79f8cde96d59f6996b65a200908f43990a12914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c08af1538f18f6c19eaad1c830b115ae168db2b5554e223f5be985e57e156e6a"; + sha256 = "18be90927891a5c05ceec6572004dd0a6f1a0859c6e01b476473908f91212f5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "922d7f8217b29e2bd22c237b47db29fe510a33587df0281cbc55ed75da17dac3"; + sha256 = "5f63450e0539fddcc1038610be1ba0cc6b2be4662fd9eb6719fdc5d4c31c6c68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "68f64732c29def431f7d87fc90d35e3fcc74f8e284c30ec959f2ef8a5fce4445"; + sha256 = "f636c78f6658e83adc5610b4c27c75bd3673a60ad107a9844a8618eb097766ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "423ffa467fd8001614882e36aa26857dcaa9466fdd3a819decd7cd5816ae7ffc"; + sha256 = "67f4263d9f41b46403ef98bf13b0be52b25b495cb3b65ea215e987178af717f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5d349b29dca8f2e3f8b7f3815811c87e2bdea47c0686dd6bb2272546d4c94586"; + sha256 = "0992a93710781628687b5869338b6cbe76a1c8341f76057bed213eed08c2eb5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8c9d2818217257bfeca1aff0250530fdaad569436f1c9218fa8ff839bbeb42fc"; + sha256 = "6e3b6835ad6d71af0f7b9945f26cb3bdeae35143297f56850bdae17ede9e87df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1ea72a0bc20a3c5a986ae5d2ec43e6347b0631f21e98ef9d2e5847e76e6686b0"; + sha256 = "acb71ef9be3016e639db77aaa0c7ad74e47797d88ad42bdaecdda7f63bca0b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "895b803948074af1c6b4fcc12a17594179a5af35d58b3a85ece79e40cea6d56b"; + sha256 = "184dba37d13b8b59c9398644ecd674af2284054803f1d576e0949a6b865a0f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "87c6538c14fb8e51c464df8e3b6999f0fc8cd20ac3b1285d5a0856271f9fd1fd"; + sha256 = "1c08acbea74425df40948691c2212631fdfe6e0c2eae32db0c695623ab0cb88d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7085d95b9d9afdf17becec98b86a76d815cddb3fe43cbae15831156daeda337d"; + sha256 = "52d15fa6ac4bcdbd7e2eaed2ca782ca35392ead5481f5b2388b3d6e7f98874b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "251524d2ec9988ca5d72128cc4de2ad0aa4a80c576a1517dc27081fe158c99b3"; + sha256 = "59ea849914caf82346401f0831add849c7db0812a8cc737fc3d927d82223ea96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ef87a4bb863140d72542e7cc02172028bac7781f806d0f52d51339acc7d49efa"; + sha256 = "79393e803a125b2026d8ac4a7ca39e4ea08792c4337046241578684960746665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "37d34d26264da9ce96829d5c2cb7ab1156c9420043a3d6cea7ef4e87256b9417"; + sha256 = "ad08d645469f71030af139985de3c2fec86d98a2d212e31a24975e899cf5a9ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "463e68256aa98781f77c8a2467f58c40a89ff43ba38d728fba648b4f76da0850"; + sha256 = "9096779a6ebfe0c3f95afce66e6dc8c27fe8a5380ae95d1f252a70f6571ece46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a479727e6546452cd4ad14f90fbb48136f336734abf0dc0e92a56065ed4679c1"; + sha256 = "f2c98d60f624a4bb19482516abb0734f6066600cd4883c0a5ba8fd2e05018bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a39b122fbef49420cbe7c12b0cfda10a061ba644aba36e77971b08bfaa213862"; + sha256 = "0e26278a6b4c7ba649842256cbebcc8130513f9dc76d5f878f9610ba59801df1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e653f75cb2e7616389e93737a2bba59c7422a11ca7cf7f670fc9c868fc089be2"; + sha256 = "33c184d7f74dcdc7004206bb4db1810c8d96b8b64adeb9f5b9d312922b3100ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d9b02475bf5146d232f8fb2e96b4da93142c2a4090addb9fc8f636d38de021b6"; + sha256 = "46833d7749b4eaa54c2cebee5d62a4ae473f55a136617c57db60c2c3da264e47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dfdc5682800de16e0327549b1f444eff08bf6a4cf5a38d9cb7a6909207afd324"; + sha256 = "20754336bc44e34cb8619d77fb4843068ea2eb8c2c9516060af650a17ebec943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "81e9791af2c7a896c38a752178b9fbff6da0f95ae84ae0fc0a0b315161b4b8f9"; + sha256 = "a1843a6aee18f2b996a2cadf5a07994138b9a721e9bfe8790b168021bd77724f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "59083c9ba66dbd20079d96f24e94fb44d9152dcc973f4e283574de0ca3818dee"; + sha256 = "8db377519662f9d2cc9a55f493105ec184c157dbb2426fb86a1f3b109cca213c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6fb7a30e23479614dc4f77b728af3736bac41af0a9f45a43ad776d5c0b22e260"; + sha256 = "7ff7a066239aea60634796291196b083bc2d5eb855bfb4e9d7beaa24f6f8d262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5af5000ff60d6c647317d9026bfe75b2af93fa7078414d9ca7e33d078e894b5d"; + sha256 = "3326717180afc0580b20f36a2a94e375baa72194f459f09c01f72266c51fb4fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ec88b3bb69c589cac44b07194904c73dd77b6ccb6cf4f0df5b3d668f70a96968"; + sha256 = "f8fadc3a9a8406e4b408c80900ecfdf0e982217ec9f8c0347f0882698c5a11b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9b459d0782b0e2d7efe60a23bb3f81d546978f5bc8e230644de8fe3618231c06"; + sha256 = "8ab2d5752ccc1e33620650f76bdde525f078fcb2b30769641a639de3fe90b6b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "35f382b4387d8f4b89fd9ea9dd73da1765098f00942714e5de39ff51230a54f5"; + sha256 = "547994faad72d930850d7fe824ad734f6ddebeaed9b27d9f60324ed472b8a11c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "90d90cb11ca58f16018b270608882754ffcf89503811f4d17ca14645e1935284"; + sha256 = "d23ad96f1a70355e4a710e751f7d1222b5abb630e8e28136cb455c4ffbef998c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "92ee0798472b4c17c0d30145ec4db414ba0f641b1f58904d43726d6cad826149"; + sha256 = "f8d8bac8b2fc2f5267f53f2bf7b83b92bc64d58cbd53f718c49ed8da5c7318a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "76fb6ee46121973a20a8edc737781980e04ced07761418e0d9d9121eb0209585"; + sha256 = "587ad4225cfca77855961d170c1cee0680459b115793f4dd123ba38767abce92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ebf40f448c55b455da214a4822c83b55f6a7010101167eeefa0ee7b554802f66"; + sha256 = "6d54ea2900492a74f4de0720d8b6630b21708ccb0460654a7ed6fb0defd34cf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "861bc300603dae711b152cf20b8be1f6a6247c8e1c87b92dd44c30e71f5437a8"; + sha256 = "2309289fe4450928b37cdab4070aaf555b2f707018bdd0af1879763dc495fa02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4fdd7c7eda0730a168d913f437435dd0f46e3e97a69bfa7b7e3abd3817e81edc"; + sha256 = "614c2710d7498d8527c467e344ff4475e1e6741376166ada64c320335f9db7ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3b17ff465c8956ab8baaa71ee3eb7fac5ff12daca655629ed7d50b0ee0500253"; + sha256 = "3384f827b4d4abf8955a277706ce0de2a2f3307580d42534b7183e861b86310e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "efdea88bba602a91e2935f6dd53f874f8ef1fb33ccba045b5392c25650a85637"; + sha256 = "f9c8c5b61f23182cad2f028903b921d7d0b106324278c9b9e7057ce35bd592f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8c75c2bb5f61b94f9a44027293340532e104b5899f7e4555b27a00d3bb2ad4fa"; + sha256 = "3a6ca2363b6eb2a240c53e13bef7a8feabce2e9450d15cbd99d0267406af4853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "21853766ad4f9cb09fe2a5919353dc3ec71e99b1034ded1c82725dfa0d489720"; + sha256 = "5f8d2a9234dbff2c7c3b416bdaad877a945346d6ecd3faad98f25643cdb32e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "86dca0143ddfef6fec63cf70d5dfa5322cca8561f4270cfef936340eec8dd4ca"; + sha256 = "7f30aec3a02c3f092810482e3d90ddf93aa7304988a75d8391eaebabaf474bee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0bc4e3af051329405f2b660319f8f984c136133b86f54594d96523ad148d98a5"; + sha256 = "df750038ae58b9ad47db756ed5e009c3d633e9444f48b9d1b2ba0e9de5784318"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d5308fe2d705d127496097e627e0943feae7b6068642733c36d5ef9dfb812678"; + sha256 = "325d66bf2399ebc62c95f263b20a2c294b396ebac31de454d94d31f32ee6f6fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "674d7f3f9af1bd63f0ac5bf690c23fb051461259baa4c5fe49f914804291cbcf"; + sha256 = "1f2b583782ceaa153cb52ce0a787c51541131f771682cca2753dfe3d96cb92a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "bba2bc622a90f1051ad4ceb74f502580ec30a1b5df56a27d7ed6e3a0fa6797b1"; + sha256 = "aa5f1242cdad391c66bd799977c4512e494333f20ca66db180089c5916fdac6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b2dcbbfd89a03fd0408ca292fcf40f879a5df920823aae5a9ee13f57fe22ea01"; + sha256 = "9e3ec577fd89ed029a05170a707ad20b650282fc646a39ebff63f858a2f259b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec0e866ccde7b96ed65f4d0f06bab2e232319a20edd38fcaa19bce650635a4e5"; + sha256 = "119e846be03a97aaaccd846b9dfcc4ffd9b74db6065ddb9e20c9755c455d3d10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d14f7c7b93034f8f2ee6807e64de7f73f600b3071744ec6d5cf1b996ae56b357"; + sha256 = "efa3e76e979f1dbb01fb04254de7a307c78770acdeabdd8dcad3d042177ac72e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6c6fcc5fa0333a589f8a897fdb05957b93016e4afc0c476995ceb148df6454c1"; + sha256 = "44b163479d1c4cd7aba090433dd212a71ef17502484f9476036f0feaff471fb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a3c967dbf2f276a6a2e60e60c5e225211d6372619fc052e11ee4b0132e174cd4"; + sha256 = "a2ff925d483f13b08aadd94444dc01836b1efd66be4989ee643f347933cfec01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "16f6e527fc617738e7e153b9bc7c012c4bc0b6c242f641465d2db01d48ff89fe"; + sha256 = "84a2b7f5ba2713cfb0d208c8727c52c51d55a9f3fac879a069c523b3529b67d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7e27cd38b5defe430189554f929f43be72278c0d5ed010c5ac78920d52993934"; + sha256 = "aef00fda24e748c845acf9357e84c2136c399cf6b859227dca8a4775ad8bed83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c7faad118878aa68078c850730ebc0abc4d4f199625af975eecc76900e920f4f"; + sha256 = "34dbed0bfd8dc823247746938b81d76f7679d99da8e133927c477ec62ab31b50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5b30917c8f689882813f9f25870ea104d780fc476329231cb37b9358ce2c1bc0"; + sha256 = "47a2e1c02cc85cac00c97342c8f4ef329c2925ca7b7427b20b426a440d4f3dd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a3916d54ad28297316294065b41cfe99237acf29752b9bf8a6ea886ea77000e6"; + sha256 = "9dbc7e2a054d9d0a4579a52ec0755d5e9e18a80a5a8ab14f10ff799d2a0c9e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "65ca0ebc62d144c0a5f7a8f29544de601487523628544ad8050b8367d02e1f31"; + sha256 = "5bd5aaa044b2a2873d6174ceabac557a8592f9b79e76afaab22e3f7a9bd03486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "af9939e9f2be3b7aa823649e285e027565275d602148f7049001176f2bf3cd56"; + sha256 = "b476b0141126a7bd877fede45f3e3b5d6cc3011b5fcdd4386ab7122a5d7b086c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "536481db78eecb11c9b5dd7e9cdf5cea0fae6593b373aeb6774dc55b97e9e749"; + sha256 = "b66cdf440275d4799e71d34a07fef436dd12eff18f51448b4f2f02020dcc6ceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "181d1bd71d1cb96370e54bfe678deb50d3884b9042b0b7fb901e65faeee9e3c8"; + sha256 = "fa7bdf3c2da92f7a6636bfa24658ab355edee1631f579f3ecfa9cf8cd8ce3de7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2c52d62b7a45259460a1198fbc176bafda3c826a5e30d085ec9fae622100fd5d"; + sha256 = "4dbbd458324f85b8a7eab2db3f14db21fbdcf13f6e1149e8c11b9101f6518ffb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7cdc34f750e7fcdf68c07169cbd23dfd5225a77a325ab4e5056a5e75be488536"; + sha256 = "3f26be2ade71d4bae842918ab87db1603703aae22f868cdc0e803b6066644986"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "dcf20c70faa4fc6434b86418f49658b564a312d7c05045e9d7bbbe08e3412b92"; + sha256 = "be1f40281f13d8381bd2d3c33f4cfff9d6a7e2bf7e759ed9a03b2928aa71b0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a0f837de6a7ea9ae287b2bd8aa8d07d3e495489a4a4e25877547ecbd1aa635de"; + sha256 = "e09be22cd422296513b6139640e33e9288abd82361f0d7c4951eb40786f4dbf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "29bd052f0fc211f15b0449104047359f0e54a7395b615d1bc0f25a3a1e2f747e"; + sha256 = "3233d65c85aa14f48e98fa013a96a65ec690e85518519dcef64e2af1700e708f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cae243bcd0f790ca156f7aa9c6602a0dcf9e482e2fd98890b741729be27c63f"; + sha256 = "d5521848f261eafcba30c2b7270b2265cd6cecb2bc0a072c2cb4659f34e19bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "42adf4de407edb938b98ed3a27b1491dbe463d42fdf3e63c60a7ce83eaab1d7a"; + sha256 = "a87019f3b1870f6d4a074c26505a271c5820e43bfb9741b63903fd8b1a33ef8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f1e3e7db826643527896e7d1568a9040ac534327858bad653953e1be9c960e52"; + sha256 = "245f864d137c8ca72015f342c747d7e67c49de94893e58fb010d1bb3244993b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b1a51f7770ee6c3a23859c90fab894aaa3c2aa36f49c3fb9d520542a9492e044"; + sha256 = "4b6a71cec55eb771e61f7e083954cc0423c38efc4e04f2352cd64ff7b208d0d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9688da318359cbb4e0f37ff0dd7a9ec727dbb9e997ab1c0247cfbfffbb8820f0"; + sha256 = "a92cfb32046d6f246e1ab1acbc7d4fc1ddca12c93638b11ffffeb7522cc4bebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "e5fc128298e297d2d7b6fc788ce1566bfcdf868962441dd4ee11af3acbafb7d9"; + sha256 = "b7cb0ee3f8dd4e1b8b5550444a9c3cee50a64c622febe9e545f6aec463286630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "53e10046449208e44acd8f9cc11d2500cb0be0e0fabc2dc7883cc8347a436aa2"; + sha256 = "eaf0f00ba24966d15aaaedff25d572891e9c4762b046b8349cdf02aefe2e3a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a36cbe8b97febd8ad1fdcedace1a0a087dfde07586e207ae92a9f4f7b6fa7538"; + sha256 = "fa744ec3cfff9346070094ef055641cf7704cea2cd1acb728ec940c9157fdb7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "46db41b7ae8c30a889131c7f9e1f6adf2af8fe13d872d951134b06a3591e5e27"; + sha256 = "8097c48bec46e426b22e0bdce252b0ea67c173a6ab3612e66735a4d8392a997c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b07dfb59d5bdd02ea2e55ab0684bd2d4192e888578670e536b847823f49e7b1f"; + sha256 = "911ecca7d29a5d6ad6371fc2785238a3ed4a99481b752924fc6b48e37779c0e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1bd366a3ebf1eecc4eeb30e6f43852fe55c00d0db330607d90647fac00cff9fb"; + sha256 = "541b825482e5446e020529a09d29c25b8742953315fc30f074c5ce2dc575a419"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "99cfa9de6bc60f84b5cb44a4e139d3a609cab4f1bec126b4cd6c6c6b287dfbed"; + sha256 = "7d5a22eb6eb9317c278dedbc016d25a882462a094c0f3e4006594930925bb39a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "352fcdad76adf69d708638e81468add5542fe6298ec3b13ba500f8dd7d2a7907"; + sha256 = "ccd5a185c8da07def1ed7fab0b4ed4279f8b8b73e9135073bfe6a7a928722410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "24015a6e677171ea1609cf551e038f10606f34d5c8fdc9f28263e83d219442fd"; + sha256 = "7cffec4453563a4eaf94f5f53422dabf1b4087470bd5cc5d25cca2781ef46f44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f3fcb0597580ec67a33aee155bc9ad626fd01b40ca8aee9bbd51b372361f09fc"; + sha256 = "00cb10d57f563da7cf7272a4c169446e29f956d7dda8d877c7088d35c167e31d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "5fe26295471bf18171b64eb9a5204453556459763b439b7ea0a5afc5b2115b5a"; + sha256 = "18fb8e71fe1b9d76ca51da60346c54c4c0b92b0e95b855871fbb5fcf89e1195d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "295ce6d814f4b7b356ea01da7fd0c83ac443614a21d45da89c0691f0dc914705"; + sha256 = "488614b08b8850028e14dead6cbfd69bb680475e3ef08cc09954d201cf614c1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a1b85d136a2a1086da69592739d8fc1429e34aa7f180c56f3b270630fee8a6a2"; + sha256 = "a4bd6d0bac1396ebc9f233468d4c258bd1700fb25c9af473a8b040d1ca3876f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "eed2e61f123ef88c71d2d9a1f0fa6019856c2c0e7cc5d3de760091785741f897"; + sha256 = "7ef48eb84c4a667ae3faac898e112fa595c1db561a3dfe9116a843b07b8779fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "66d6ed76a9e659703b2d586b97a76ae8b7af22dac3a01d4d902cd5747ee3735b"; + sha256 = "08660dbb36d937a42a0f9d223db550dcb916cf538c9adf4fdea8e72b12b586dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "24644a2feda81a5e5f2ad70d420a018a4d36507130699f0175d0e3a9837d3e9d"; + sha256 = "d31009f1e1e506772db2b43b64ee66e91d6f069d9c423645847c5e67212b2798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a1b5d23e4c1cb67cbdc9842e2ea5878f4b6be9b9899bfa59d0e5689d589f3e0f"; + sha256 = "f6768a336fe0bb6a8ac92633238cde92fae73e58338379ad27be8f6ab07a93e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "879c5b1f90b6fa51a648417e70a770479f844f5fc4cc124b0b7ea68eb458dbe6"; + sha256 = "aa1a1fa5d64c611bc53bab303ca463949f1e0e2d5d8b3ff7ba9b33ac7b0d9c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "94f19f7e0ef54acbf79d16b1228367704c968aebd10d3b8afaa0379f503ccd4c"; + sha256 = "a185a54d5f29b4d6f2d34a530b498fd3a67636b068279a01427f6f0c29bd221b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2efa5241fdf5211e8452e5b8c6d07a989fc3585a7ee00b0a60fccdac140ab531"; + sha256 = "401677189e0c0a2c17f433aa4574cf92075ff7e4f028eb6a1a9092e1dd30a5cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8a18cbed900564fcaa0cf52d6be461f3e7e6146841568006f409fcc8f5241bea"; + sha256 = "c0039e65a43f59f9495c7a2022d4982849a0ea6fc611b25d348c02ed3dd7d671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ef901fe934af0978089b7463f743f583e9f2c46c617234b2206cc5e0c31daaaa"; + sha256 = "bfce50f6e107d4a49d0349e1ef8234c4b7bb67d6f135f8dddb5512364464e6a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6847dca8150ba6dac5f7082ae518b9fcba129320e93909b9340ce5adeae6540f"; + sha256 = "aacb23547b2a20b4ca5b548694ab3e265ea18ff5fe77d7d77dd00298e73fd801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ac72b502b1fc8cea75ec2b878b957d52fa8fcc29663b7003c334ec6932e5ece5"; + sha256 = "f87db79ce94e8e964b3ff3a89efd0d53e4a5753854778845f9548aa7d41ffba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1f2ef4a9dd341c3151c7e66c8d9fc1e0f62f33ec397e3ff399bb56dee89532a4"; + sha256 = "e7e786a25afb44e53c52b19ac545ee455ff505cef4393fe698057df6d5fbff3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6026af884fb2f1c899fbd28f99d383ca34fd4e6540c37e08904155df3d6e2907"; + sha256 = "426ee6932fca23e26a4cc6943adacd798c74406c47fd71a023c2f2ef503855fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "36f70f8275de2201ee29387c2724f908ae92a22d8e1c830f5e4572f2d8a8838b"; + sha256 = "47ed2f1510095a6a9120f3962f8ae817c5cc2e6431c6b80583fd64e7650593fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f46da613145e3ecbcaff8334fe54e340dbce9b0c4fffa0121958abd6fd1e1445"; + sha256 = "14dc9e8d8301d7ca3a5af0f61d4a2db35c29cad07d083e272aa947454fa47d4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "048b6285f5600b2c09a63f5c90c2b8fde0159e6c3bc7f282482bf4e3b0581e78"; + sha256 = "f02797ca77be238488ca7511d940307d8946b1ceeb31f3ed46e242e2a46fda2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "21da3f9a45abb3156ca14c399c2b6329801135d37c3e969b0e7f615311649a72"; + sha256 = "05f8d37542245f10bcd6cae6aaea5e171d6ead2c2ae3ee1dfdf663a47a127ee9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e0e6509645516ae50f044755da40a30685edf2d33ee38d213000507db3a25d34"; + sha256 = "6f254c3ac71ec2eac74c907b89064f72840cabe1555a827a4941aec060edfbcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b8904a816b1f6f3290bb2b9d79e2bbe92d01dd5fef059c7ebe4a70cdcdd4cc74"; + sha256 = "262b3d430b34a3da6020e1d1ae60414049347f0869e8cde4273601da0d55c258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "307a472ac7ca779883e162a5dd780cc9ef69cd1e09f8aa03f33cb0501960bc32"; + sha256 = "2db8e3c9f6438576ed774b76b962650cb7f037c97b07f4d1e18f03ab02d1b017"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ffc5c9f740ef19167a463de5b5a85d75aa9cdad85f0d476734b01350c48de9e3"; + sha256 = "4d0eff7854d49607316218489212f7a61bbf7b95118140fea8f44a72431f576c"; } ]; } From 1d79811a4211ad6f1b9f9f2b4279145ec531f92c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 5 Mar 2023 21:09:33 -0500 Subject: [PATCH 139/203] wine: fix build failure on Darwin --- pkgs/applications/emulators/wine/base.nix | 10 +++++++--- pkgs/applications/emulators/wine/darwin-qos.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/emulators/wine/darwin-qos.patch diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ed9e24a910f6..28efcf5875bf 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -108,9 +108,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]))); patches = [ ] - # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available - # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. - ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch + ++ lib.optionals stdenv.isDarwin [ + # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available + # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + ./darwin-metal-compat.patch + # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. + ./darwin-qos.patch + ] ++ patches'; configureFlags = prevConfigFlags diff --git a/pkgs/applications/emulators/wine/darwin-qos.patch b/pkgs/applications/emulators/wine/darwin-qos.patch new file mode 100644 index 000000000000..e9bd813feaab --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-qos.patch @@ -0,0 +1,12 @@ +diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c +index cde37c48b0d..be237bc0ad3 100644 +--- a/dlls/ntdll/unix/loader.c ++++ b/dlls/ntdll/unix/loader.c +@@ -65,6 +65,7 @@ + # undef LoadResource + # undef GetCurrentThread + # include ++# include + # include + # include + # include From be7a05a70f46bdbb072c25535fb576198b409651 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 02:22:27 +0000 Subject: [PATCH 140/203] brev-cli: 0.6.207 -> 0.6.208 --- pkgs/development/misc/brev-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3dd4776a146d..5a0f3138bbef 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.207"; + version = "0.6.208"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w="; + sha256 = "sha256-fgbHaY0trO7MiYxhdatq81PaOIVQpSIU3cUnrIvGI2M="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; From 8fdababce4969d18f9d86664fa5dc292dd16a883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 02:41:23 +0000 Subject: [PATCH 141/203] android-udev-rules: 20230104 -> 20230303 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index aa6cb53051d8..5575ece33149 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20230104"; + version = "20230303"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70="; + sha256 = "sha256-ddalOVt0gLuTcwk322fNNn6WNZx1Ubsa4MgaG0Lmn2k="; }; installPhase = '' From c9babe3fc1a435e2f36e3b8f0af89ff489757f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 03:01:51 +0000 Subject: [PATCH 142/203] xd: 0.4.2 -> 0.4.4 --- pkgs/applications/networking/p2p/xd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index b73c962240fc..8283a2ec4bee 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-AavNiFZlpX6XZQLP1kl9igA833i0gxOTYGubo3MvpSU="; + sha256 = "sha256-YUstYGIED6ivt+p+aHIK76dLCj+xjytWnZrra49cCi8="; }; - vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; + vendorHash = "sha256-wO+IICtGVHhrPa1JUwlx+PuNS32FJNKYmboLd3lFl4w="; nativeCheckInputs = [ perl ]; From f8ae1e7fe9934d335ee7886f1f8e583213c47fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 03:02:15 +0000 Subject: [PATCH 143/203] lxgw-neoxihei: 1.006 -> 1.007 --- pkgs/data/fonts/lxgw-neoxihei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 3ae29a8e2a41..2ca2473b3647 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.006"; + version = "1.007"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-n7TTunWOHGWLxvs75r5My1il0KELOZbAgTGqtMpQ+mQ="; + hash = "sha256-ChYpRCw8DAo8bo6fJ+5LyF+FGmER+4nY2aEx1GIROdU="; }; dontUnpack = true; From 9780b8e2673dfd01279e4147f410887b93f3e032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Mon, 6 Mar 2023 04:09:23 +0100 Subject: [PATCH 144/203] ginkgo: fix darwin build --- pkgs/development/tools/ginkgo/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 9ef3a6e2099c..67ff6886225b 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }: buildGoModule rec { pname = "ginkgo"; @@ -16,6 +16,13 @@ buildGoModule rec { # types tests are missing CodeLocation excludedPackages = [ "integration" "types" ]; + __darwinAllowLocalNetworking = true; + + passthru.tests.version = testers.testVersion { + package = ginkgo; + command = "ginkgo version"; + }; + meta = with lib; { homepage = "https://onsi.github.io/ginkgo/"; changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; From d6d742cf89e417cef066a30284a1e94ac44aeb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 4 Mar 2023 09:06:06 -0800 Subject: [PATCH 145/203] rnote: 0.5.14 -> 0.5.16 Diff: https://github.com/flxzt/rnote/compare/v0.5.14...v0.5.16 Changelog: https://github.com/flxzt/rnote/releases/tag/v0.5.16 --- pkgs/applications/graphics/rnote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 0af4a3909825..1dcb3c5802a8 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.14"; + version = "0.5.16"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU="; + hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M="; + hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0="; }; nativeBuildInputs = [ From 5765d33f3540e12d7864dc3a155b8332a8dc0ec4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 5 Mar 2023 22:23:06 -0500 Subject: [PATCH 146/203] binutils: fix MinGW link failures with import libs --- .../tools/misc/binutils/default.nix | 3 ++ .../tools/misc/binutils/mingw-abort-fix.patch | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/mingw-abort-fix.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 967f62d7c9cd..10a0281b075c 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -101,6 +101,9 @@ stdenv.mkDerivation (finalAttrs: { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) + # This patch fixes a bug in 2.40 on MinGW, which breaks DXVK when cross-building from Darwin. + # See https://sourceware.org/bugzilla/show_bug.cgi?id=30079 + ++ lib.optional stdenv.targetPlatform.isMinGW ./mingw-abort-fix.patch ; outputs = [ "out" "info" "man" "dev" ] diff --git a/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch b/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch new file mode 100644 index 000000000000..b322d6ad7cd1 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch @@ -0,0 +1,30 @@ +From b7eab2a9d4f4e92692daf14b09fc95ca11b72e30 Mon Sep 17 00:00:00 2001 +From: Michael Matz +Date: Thu, 9 Feb 2023 15:29:00 +0100 +Subject: [PATCH 1/1] Fix PR30079: abort on mingw + +the early-out in wild_sort is not enough, it might still be +that filenames are equal _and_ the wildcard list doesn't specify +a sort order either. Don't call compare_section then. + +Tested on all targets. +--- + ld/ldlang.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ld/ldlang.c b/ld/ldlang.c +index 84a2914fc26..b5e0d026ae4 100644 +--- a/ld/ldlang.c ++++ b/ld/ldlang.c +@@ -649,7 +649,8 @@ wild_sort (lang_wild_statement_type *wild, + looking at the sections for this file. */ + + /* Find the correct node to append this section. */ +- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0) ++ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none ++ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0) + tree = &((*tree)->left); + else + tree = &((*tree)->right); +-- +2.31.1 From 8c7e78ad9d29610e57c394d06aa4e8dda1914ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 03:32:40 +0000 Subject: [PATCH 147/203] jfrog-cli: 2.34.2 -> 2.34.6 --- pkgs/tools/misc/jfrog-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 48b7726dad7b..d07791380885 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.34.2"; - vendorHash = "sha256-23UlxJAuX5kH1gMskcL2Wh8eh2VtFabyuvJfulmuYeg="; + version = "2.34.6"; + vendorHash = "sha256-EhdE94djk/Or5K4BZtJ3NPNPWt5lODV10zgYWfZ/4OI="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-x9lQcga5aspabJ/MYaVn8UJ+Zp6Bjrlzh28q6Uuwem0="; + sha256 = "sha256-d2kEl2zT0vlcjii5V54oWE1TIKPPEUuCbvrrjPMme3E="; }; postInstall = '' From 22cea1844af6a6b88d97c8997c67fb6bf6be619e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 03:34:02 +0000 Subject: [PATCH 148/203] litecoin: 0.21.2.1 -> 0.21.2.2 --- pkgs/applications/blockchains/litecoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index 3eeeafe8d815..378ae2f2efeb 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "litecoin" + lib.optionalString (!withGui) "d"; - version = "0.21.2.1"; + version = "0.21.2.2"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "sha256-WJFdac5hGrHy9o3HzjS91zH+4EtJY7kUJAQK+aZaEyo="; + sha256 = "sha256-TuDc47TZOEQA5Lr4DQkEhnO/Szp9h71xPjaBL3jFWuM="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 684306b246d05168e42425a3610df7e2c4d51fcd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Mar 2023 04:20:00 +0000 Subject: [PATCH 149/203] ocamlPackages.sedlex: 3.0 -> 3.1 https://github.com/ocaml-community/sedlex/releases/tag/v3.1 --- .../ocaml-modules/sedlex/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index cfe1938bf55b..27756fdcd26e 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -6,13 +6,19 @@ , gen , ppxlib , uchar +, ppx_expect }: let param = - if lib.versionAtLeast ppxlib.version "0.26.0" then { - version = "3.0"; - sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; - } else { + if lib.versionAtLeast ppxlib.version "0.26.0" then + if lib.versionAtLeast ocaml.version "4.14" then { + version = "3.1"; + sha256 = "sha256-qG8Wxd/ATwoogeKJDyt5gkGhP5Wvc0j0mMqcoVDkeq4="; + } else { + version = "3.0"; + sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; + } + else { version = "2.5"; sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; } @@ -34,6 +40,7 @@ let url = "${baseUrl}/ucd/PropList.txt"; sha256 = "sha256-4FwKKBHRE9rkq9gyiEGZo+qNGH7huHLYJAp4ipZUC/0="; }; + atLeast31 = lib.versionAtLeast param.version "3.1"; in buildDunePackage rec { pname = "sedlex"; @@ -49,7 +56,10 @@ buildDunePackage rec { }; propagatedBuildInputs = [ - gen uchar ppxlib + gen + ppxlib + ] ++ lib.optionals (!atLeast31) [ + uchar ]; preBuild = '' @@ -59,6 +69,10 @@ buildDunePackage rec { ln -s ${PropList} src/generator/data/PropList.txt ''; + checkInputs = lib.optionals atLeast31 [ + ppx_expect + ]; + doCheck = true; dontStrip = true; From 1d503d2c17eb26ddee3d915047388600ece49ae6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 06:58:01 +0000 Subject: [PATCH 150/203] mkgmap: 4905 -> 4906 --- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 2726f37f4aa0..195c083fbfe9 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4905"; + version = "4906"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-EYUysLit/bO/IjVmAbxqIvVFm9Ub50+RKFn7ZdspapU="; + sha256 = "sha256-N1VU5XOENCQiUnDCFpotx+8Pr3VFuWLu1ABcbm0feOM="; }; patches = [ From 915bc5fb1de4f6e1798586d0f7f9e470f2647aee Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 6 Mar 2023 02:27:27 +0000 Subject: [PATCH 151/203] podman-tui: 0.7.0 -> 0.9.0 --- pkgs/applications/virtualization/podman-tui/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index b13908495a53..c5b8dbb12093 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-UhlhNmVPTOXVWpL4pxF5c6ZQj//pXrzZWlRUaKGSTSA="; + hash = "sha256-qw7ylukG7M31rUtoZqbcjWchcEB14uvb2k1cjIjy8qA="; }; vendorHash = null; @@ -24,7 +24,6 @@ buildGoModule rec { let skippedTests = [ "TestDialogs" - "TestNetdialogs" ]; in '' From cd20e3b85e7fd8c5a3f303634022d7f794ac292b Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:13:58 +0100 Subject: [PATCH 152/203] colima: patch `sw_vers` on darwin --- pkgs/applications/virtualization/colima/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e49c2a659121..05038f564e3d 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , buildGoModule , fetchFromGitHub , installShellFiles @@ -44,6 +45,11 @@ buildGoModule rec { subPackages = [ "cmd/colima" ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace util/util.go \ + --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" + ''; + postInstall = '' wrapProgram $out/bin/colima \ --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} From c5d748d650139e4b86248ab80c0e490d13561191 Mon Sep 17 00:00:00 2001 From: imlonghao Date: Mon, 6 Mar 2023 10:56:45 +0800 Subject: [PATCH 153/203] bgpq4: 1.8 -> 1.9 --- pkgs/tools/networking/bgpq4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 0ec15e9c35c3..aa7d9727fb89 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o="; + sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI="; }; nativeBuildInputs = [ From 6ea505ee4ea6a148132f7b4fd93f8d36aa1b25b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 5 Mar 2023 10:53:44 +0100 Subject: [PATCH 154/203] mesa: enable vulkan intel drivers on 32bit --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480c2d8c8584..c0252eb92336 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -51,9 +51,9 @@ "imagination-experimental" # PowerVR Rogue (currently N/A) "panfrost" # ARM Mali Midgard and up (T/G series) ] - ++ lib.optionals stdenv.isx86_64 [ - "intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 - "intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only + ++ lib.optionals stdenv.hostPlatform.isx86 [ + "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build + "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) ] else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] From d23c04cdbd5460ae548803bb10fd04b9da4037a0 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:42:37 +0100 Subject: [PATCH 155/203] colima: build and test all packages --- pkgs/applications/virtualization/colima/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 05038f564e3d..f340ebdcd762 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -43,8 +43,6 @@ buildGoModule rec { -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; - subPackages = [ "cmd/colima" ]; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace util/util.go \ --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" From cb363523dad54f575dae55d245d73018712a6f7f Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 6 Mar 2023 09:42:43 +0100 Subject: [PATCH 156/203] gitlab: 15.8.3 -> 15.8.4 (#219406) https://about.gitlab.com/releases/2023/03/02/security-release-gitlab-15-9-2-released/ --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 63d22703d284..f068e7618d08 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.8.3", - "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", + "version": "15.8.4", + "repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=", "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.8.3-ee", + "rev": "v15.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.8.3", - "GITLAB_PAGES_VERSION": "15.8.3", + "GITALY_SERVER_VERSION": "15.8.4", + "GITLAB_PAGES_VERSION": "15.8.4", "GITLAB_SHELL_VERSION": "14.15.0", - "GITLAB_WORKHORSE_VERSION": "15.8.3" + "GITLAB_WORKHORSE_VERSION": "15.8.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index aab5bfbd6a6f..53b290066be2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.8.3"; + version = "15.8.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; + sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc="; }; vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 252be4e56313..a01d8aa221f5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.8.3"; + version = "15.8.4"; src = fetchFromGitLab { owner = data.owner; From e6c8a2f3e340cbf7dbecfd5c66baf716b212a139 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 6 Mar 2023 09:56:37 +0100 Subject: [PATCH 157/203] linuxPackages_latest.jool: fix build (#219138) --- pkgs/os-specific/linux/jool/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 9246ca679a65..2d1a44790814 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -12,6 +12,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/jool/plain/debian/patches/0001-Linux-6.2.patch?id=3708a5b6c492b7d8e9f78596e61ae8f74ec9640f"; + hash = "sha256-GkyDY6tcJp7Xd28mrDorEJHxsEowZBJP7BRAdPpsyF8="; + }) + ]; + prePatch = '' sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; From 358ca90b5f2e1e9a7263e8b4690d131d214c504b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 27 Feb 2023 10:21:29 +0100 Subject: [PATCH 158/203] luaPackages: adding several neovim plugins telescope.nvim, haskell-tools.nvim, telescope-manix --- maintainers/scripts/luarocks-packages.csv | 3 + .../lua-modules/generated-packages.nix | 81 ++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4f7e26ec58e3..60389f9abb2d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -19,6 +19,7 @@ fennel,,,,,,misterio77 fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, +haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, @@ -102,6 +103,8 @@ std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, +telescope.nvim,,,,,5.1, +telescope-manix,,,,,, tl,,,,,,mephistophiles vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 189e896dfaea..4ce37ca0c15d 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -560,7 +560,30 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ fetchzip, lua, fifo, luaossl, lpeg_patterns, lpeg, basexx, buildLuarocksPackage, cqueues, bit32, binaryheap, luaOlder, compat53 }: +haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +buildLuarocksPackage { + pname = "haskell-tools.nvim"; + version = "1.9.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/haskell-tools.nvim-1.9.1-1.rockspec"; + sha256 = "1m7fasn5iz9hv9l1ycsjiaah14i1s5nssvqq9sypbwcpc9slj93b"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/1.9.1.zip"; + sha256 = "0m425ipfvbb1f1m2wmz8qg57b901vspvvpckxr380crbwl3dflpr"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = { + homepage = "https://github.com/mrcjkb/haskell-tools.nvim"; + description = "Supercharge your Haskell experience in neovim!"; + license.fullName = "GPL-2.0"; + }; +}) {}; + +http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -2853,7 +2876,61 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, buildLuarocksPackage, argparse, luafilesystem, fetchgit }: +telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "telescope-manix"; + version = "0.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; + sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; + sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua telescope-nvim ]; + + meta = { + homepage = "https://github.com/mrcjkb/telescope-manix"; + description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix"; + license.fullName = "GPL-2.0"; + }; +}) {}; + +telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +buildLuarocksPackage { + pname = "telescope.nvim"; + version = "scm-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/telescope.nvim-scm-1.rockspec"; + sha256 = "07mjkv1nv9b3ifxk2bbpbhvp0awblyklyz6aaqw418x4gm4q1g35"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/nvim-telescope/telescope.nvim", + "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", + "date": "2023-02-26T13:26:12+01:00", + "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", + "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = { + homepage = "https://github.com/nvim-telescope/telescope.nvim"; + description = "Find, Filter, Preview, Pick. All lua, all the time."; + license.fullName = "MIT"; + }; +}) {}; + +tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "tl"; version = "0.15.1-1"; From 332073ba4277f8643362ccfc6f20b0050549a4b9 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:54:01 +0100 Subject: [PATCH 159/203] colima: add darwin tools to native build inputs --- pkgs/applications/virtualization/colima/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index f340ebdcd762..481d8408e860 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -32,7 +32,8 @@ buildGoModule rec { ''; }; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ] + ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4="; @@ -43,11 +44,6 @@ buildGoModule rec { -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace util/util.go \ - --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" - ''; - postInstall = '' wrapProgram $out/bin/colima \ --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} From b5f0fdc371c33207144bf0b4b8de26c3fb613076 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Mar 2023 09:14:20 +0000 Subject: [PATCH 160/203] workflows/backport: Copy security label in backport PRs Since v1.2.0 the backport action supports copying labels from the source to the backport PR. This is useful for copying the security label from the original PR to the backport PR, so relevant security updates don't get lost. --- .github/workflows/backport.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 9a87e0e39588..60ceb304ee8a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,6 +27,7 @@ jobs: uses: korthout/backport-action@v1.2.0 with: # Config README: https://github.com/korthout/backport-action#backport-action + copy_labels_pattern: 'severity:\ssecurity' pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. From 4caf0ce0e266f5a6ca9be701e307d2872d45dcfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 09:32:25 +0000 Subject: [PATCH 161/203] n8n: 0.215.1 -> 0.218.0 --- .../networking/n8n/node-packages.nix | 1702 +++++++++++------ 1 file changed, 1143 insertions(+), 559 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 0b08453a9625..096df023c6f6 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -22,6 +22,15 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; + "@authenio/xml-encryption-2.0.2" = { + name = "_at_authenio_slash_xml-encryption"; + packageName = "@authenio/xml-encryption"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@authenio/xml-encryption/-/xml-encryption-2.0.2.tgz"; + sha512 = "cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -40,22 +49,22 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.1" = { + "@azure/core-client-1.7.2" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; - sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz"; + sha512 = "ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag=="; }; }; - "@azure/core-http-2.3.1" = { + "@azure/core-http-3.0.0" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz"; - sha512 = "cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz"; + sha512 = "BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -85,13 +94,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.10.1" = { + "@azure/core-rest-pipeline-1.10.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; - sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz"; + sha512 = "e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q=="; }; }; "@azure/core-tracing-1.0.0-preview.12" = { @@ -121,13 +130,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.1.1" = { + "@azure/core-util-1.2.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; - sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; }; }; "@azure/identity-1.5.2" = { @@ -157,13 +166,13 @@ let sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; }; }; - "@azure/logger-1.0.3" = { + "@azure/logger-1.0.4" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz"; - sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz"; + sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; "@azure/ms-rest-azure-env-2.0.0" = { @@ -247,49 +256,49 @@ let sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; - "@azure/storage-blob-12.12.0" = { + "@azure/storage-blob-12.13.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.12.0"; + version = "12.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.12.0.tgz"; - sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.13.0.tgz"; + sha512 = "t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA=="; }; }; - "@babel/parser-7.20.15" = { + "@babel/parser-7.21.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.15"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; - sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; }; - "@babel/runtime-7.20.13" = { + "@babel/runtime-7.21.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; - sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; + sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; }; }; - "@codemirror/autocomplete-6.4.0" = { + "@codemirror/autocomplete-6.4.2" = { name = "_at_codemirror_slash_autocomplete"; packageName = "@codemirror/autocomplete"; - version = "6.4.0"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.0.tgz"; - sha512 = "HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA=="; + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz"; + sha512 = "8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ=="; }; }; - "@codemirror/commands-6.2.0" = { + "@codemirror/commands-6.2.1" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.0.tgz"; - sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz"; + sha512 = "FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA=="; }; }; "@codemirror/lang-css-6.0.2" = { @@ -301,31 +310,31 @@ let sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; }; }; - "@codemirror/lang-javascript-6.1.3" = { + "@codemirror/lang-javascript-6.1.4" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz"; - sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz"; + sha512 = "OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A=="; }; }; - "@codemirror/language-6.5.0" = { + "@codemirror/language-6.6.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.5.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.5.0.tgz"; - sha512 = "dI+dV/u2klIt0Y9kE3TH9vuBidAB3xuuDPofwzvnW8ZKqJnKTbT3EjyV7DeKcmrRgXMhlPTL7AdH1V5KOCYuHQ=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz"; + sha512 = "cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg=="; }; }; - "@codemirror/lint-6.1.0" = { + "@codemirror/lint-6.2.0" = { name = "_at_codemirror_slash_lint"; packageName = "@codemirror/lint"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.0.tgz"; - sha512 = "mdvDQrjRmYPvQ3WrzF6Ewaao+NWERYtpthJvoQ3tK3t/44Ynhk8ZGjTSL9jMEv8CgSMogmt75X8ceOZRDSXHtQ=="; + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz"; + sha512 = "KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg=="; }; }; "@codemirror/state-6.2.0" = { @@ -337,13 +346,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.8.1" = { + "@codemirror/view-6.9.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.8.1"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.8.1.tgz"; - sha512 = "bXWs42i1mnBexaktPABaEpYbt4FbJMnlesObDLF0GE8poRiNaRgm7H/2NfXfD5Swas1ULdFgONLLs4ncwHuz8g=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz"; + sha512 = "bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg=="; }; }; "@colors/colors-1.5.0" = { @@ -535,13 +544,13 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.4" = { + "@grpc/proto-loader-0.7.5" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; - sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.5.tgz"; + sha512 = "mfcTuMbFowq1wh/Rn5KQl6qb95M21Prej3bewD9dUQMurYGVckGO/Pbe2Ocwto6sD05b/mxZLspvqwx60xO2Rg=="; }; }; "@icetee/ftp-0.3.15" = { @@ -616,49 +625,49 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsplumb/browser-ui-5.13.2" = { + "@jsplumb/browser-ui-5.13.4" = { name = "_at_jsplumb_slash_browser-ui"; packageName = "@jsplumb/browser-ui"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz"; - sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ=="; + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.4.tgz"; + sha512 = "N+Sp/jrrpYhWd7KTcMhsqoMjzmlNE/9RUYslKh7D9U9V9p0pTVfRftU7dSsoaP76Gi+juZmIGU/drSqG+z64OA=="; }; }; - "@jsplumb/common-5.13.2" = { + "@jsplumb/common-5.13.4" = { name = "_at_jsplumb_slash_common"; packageName = "@jsplumb/common"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz"; - sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q=="; + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.4.tgz"; + sha512 = "pgWUAYmMbdpTyZV252N1sT+dyGFuRrl5yIprhQk1xlhTgh4korYVrzNH4594KujQB45gBuIKpSyauwh5FzlFAA=="; }; }; - "@jsplumb/connector-bezier-5.13.2" = { + "@jsplumb/connector-bezier-5.13.4" = { name = "_at_jsplumb_slash_connector-bezier"; packageName = "@jsplumb/connector-bezier"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz"; - sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg=="; + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.4.tgz"; + sha512 = "ucnzBRwgWWwNQwgyUKZSg4QM5Pu19rYhpozHI5/FrZ8jxk1f3xEa4jv8teHvZO1MKs5ZGXfBobuy54wT5O+gtw=="; }; }; - "@jsplumb/core-5.13.2" = { + "@jsplumb/core-5.13.4" = { name = "_at_jsplumb_slash_core"; packageName = "@jsplumb/core"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz"; - sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A=="; + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.4.tgz"; + sha512 = "dlgvw1oYGmakV+HrfyRf1hJB9XwmfmgCakwuhLoSJz+IEaJ136QjEmmcoH/mf4x5GCnraUieI6LaYUskjDhtmQ=="; }; }; - "@jsplumb/util-5.13.2" = { + "@jsplumb/util-5.13.4" = { name = "_at_jsplumb_slash_util"; packageName = "@jsplumb/util"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz"; - sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g=="; + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.4.tgz"; + sha512 = "dLwr9qb7kQy0KKaiFRfe+6lxN9StxpZAxT/QQwfBkYE2Iwify372pK92vM5HEc62Me12pS/s6F3qXj3sDKlUmQ=="; }; }; "@kafkajs/confluent-schema-registry-1.0.6" = { @@ -715,13 +724,13 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; - "@lezer/html-1.3.1" = { + "@lezer/html-1.3.3" = { name = "_at_lezer_slash_html"; packageName = "@lezer/html"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz"; - sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw=="; + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz"; + sha512 = "04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA=="; }; }; "@lezer/javascript-1.4.1" = { @@ -841,13 +850,13 @@ let sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; }; }; - "@oclif/core-1.26.1" = { + "@oclif/core-1.26.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.1.tgz"; - sha512 = "g+OWJcM7JOVI53caTEtq0BB1nPotWctRLUyFODPgvDqXhVR7QED+Qz3LwFAMD8dt7/Ar2ZNq15U3bnpnOv453A=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.2.tgz"; + sha512 = "6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw=="; }; }; "@oclif/errors-1.3.6" = { @@ -994,6 +1003,60 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; + "@redis/bloom-1.2.0" = { + name = "_at_redis_slash_bloom"; + packageName = "@redis/bloom"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; + sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; + }; + }; + "@redis/client-1.5.6" = { + name = "_at_redis_slash_client"; + packageName = "@redis/client"; + version = "1.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.6.tgz"; + sha512 = "dFD1S6je+A47Lj22jN/upVU2fj4huR7S9APd7/ziUXsIXDL+11GPYti4Suv5y8FuXaN+0ZG4JF+y1houEJ7ToA=="; + }; + }; + "@redis/graph-1.1.0" = { + name = "_at_redis_slash_graph"; + packageName = "@redis/graph"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz"; + sha512 = "16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg=="; + }; + }; + "@redis/json-1.0.4" = { + name = "_at_redis_slash_json"; + packageName = "@redis/json"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz"; + sha512 = "LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw=="; + }; + }; + "@redis/search-1.1.2" = { + name = "_at_redis_slash_search"; + packageName = "@redis/search"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.2.tgz"; + sha512 = "/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA=="; + }; + }; + "@redis/time-series-1.0.4" = { + name = "_at_redis_slash_time-series"; + packageName = "@redis/time-series"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"; + sha512 = "ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng=="; + }; + }; "@rudderstack/rudder-sdk-node-1.0.6" = { name = "_at_rudderstack_slash_rudder-sdk-node"; packageName = "@rudderstack/rudder-sdk-node"; @@ -1003,13 +1066,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.15.19" = { + "@sap/hana-client-2.15.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.15.19"; + version = "2.15.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; - sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.22.tgz"; + sha512 = "mzqWiZ5Its8aCXGdv9EA4ROgwoLdqKoEgbKOnLjUtk2xuliGJ2L9Y54xcMSTtzDAUUEhZCKMDPTXloCqYAUpCQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1030,49 +1093,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.37.1" = { + "@sentry/core-7.40.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz"; - sha512 = "eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.40.0.tgz"; + sha512 = "OPAobQG0GTY++r5LWUcOA1lS+2TY2Lmw/i5s4kL9WbY+f08dbLNEGNBObY7/V98OL4f7OG+nWaPFybgM7kqUTQ=="; }; }; - "@sentry/integrations-7.37.1" = { + "@sentry/integrations-7.40.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.37.1.tgz"; - sha512 = "/7VZXw7/DxZPsGNEaU/gcKRNPtmK75mz9oM71C5UbRDDEdFSEeVq2jG+tOq2lIsd2VQlsAmN3DG5yqiGA9C4eQ=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.40.0.tgz"; + sha512 = "8TLo7RKKpTXRDdeeBFNaA3YA4NG5hbAkl2o9wDHJW5NJouyr7IK6ia6qd2v94RXJAVB7nnjtQUdnkXGR59E4RA=="; }; }; - "@sentry/node-7.37.1" = { + "@sentry/node-7.40.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz"; - sha512 = "nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.40.0.tgz"; + sha512 = "S2pcLBUsCg3+WYlyQbXKPey3H1yaZPt9fpJTPAoabbidYXweBAbtFjSCRwPFwCQMzWusWxlYEwWRT77C07pHVg=="; }; }; - "@sentry/types-7.37.1" = { + "@sentry/types-7.40.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz"; - sha512 = "c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.40.0.tgz"; + sha512 = "dIbqBenbmDx1F8pvfC11C88J83ecwumUhV+YOIxcmVd1fmlPF2hXWZ01+NTkTDkCu341sJx4wPQogByFy8FwGA=="; }; }; - "@sentry/utils-7.37.1" = { + "@sentry/utils-7.40.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz"; - sha512 = "/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.40.0.tgz"; + sha512 = "ZdCbTpAXPiVVfvNJVftnDhsctOui71MDUhVIdLkgg4Cuic+WHGPRmmZ+H6uZdp7vRaeB+Uvnn5+t2iSAVo/mAA=="; }; }; "@servie/events-1.0.0" = { @@ -1093,22 +1156,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.35" = { + "@swc/core-1.3.37" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.35"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz"; - sha512 = "KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.37.tgz"; + sha512 = "VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw=="; }; }; - "@swc/wasm-1.3.35" = { + "@swc/wasm-1.3.37" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.35"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.35.tgz"; - sha512 = "8xBOgl9eziAuqF4HYwYx4Kh6eHfOQECvO0ZMlrFNW0jgE+ntqxcRjBhuzZ6iWb24nifzXbuGLQntbns4IJYJgQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.37.tgz"; + sha512 = "cRlyLuQrMKE6ppo07jVcYAEK69l+O+g+u5xZBon466vA416IK86jHYxGZqXRP+HEF6P/imntLbJgj9F/AGFEBA=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1327,13 +1390,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.13.0" = { + "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.13.0"; + version = "18.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; - sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; + sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1372,13 +1435,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/serve-static-1.15.0" = { + "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; + sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; }; }; "@types/stack-trace-0.0.29" = { @@ -1426,22 +1489,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/uuid-9.0.0" = { + "@types/uuid-9.0.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz"; - sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz"; + sha512 = "rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA=="; }; }; - "@types/validator-13.7.12" = { + "@types/validator-13.7.13" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.12"; + version = "13.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; - sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.13.tgz"; + sha512 = "EMfHccxNKXaSxTK6DN0En9WsXa7uR4w3LQtx31f6Z2JjG5hJQeVX5zUYMZoatjZgnoQmRcT94WnNWwi0BzQW6Q=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1588,13 +1651,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.1" = { + "agentkeepalive-4.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; - sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; }; }; "aggregate-error-3.1.0" = { @@ -1966,13 +2029,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1313.0" = { + "aws-sdk-2.1328.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1313.0"; + version = "2.1328.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz"; - sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1328.0.tgz"; + sha512 = "ud8ieE+hGX/cWHkQ9kMxQw6w+onbv71PDrcPmP2j8cmYv5IPlM5Zh8/tpsmXApLYDmQMuZ3TtssiB1KmoSbzgA=="; }; }; "aws-sign2-0.7.0" = { @@ -2227,6 +2290,15 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; + "body-parser-1.20.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"; + sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; + }; + }; "body-parser-xml-2.0.3" = { name = "body-parser-xml"; packageName = "body-parser-xml"; @@ -2479,6 +2551,15 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; + "camelcase-6.3.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; + }; + }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -2623,6 +2704,15 @@ let sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="; }; }; + "class-transformer-0.5.1" = { + name = "class-transformer"; + packageName = "class-transformer"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz"; + sha512 = "SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="; + }; + }; "class-validator-0.14.0" = { name = "class-validator"; packageName = "class-validator"; @@ -2677,13 +2767,13 @@ let sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; }; }; - "cli-progress-3.11.2" = { + "cli-progress-3.12.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.11.2"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz"; - sha512 = "lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz"; + sha512 = "tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A=="; }; }; "cli-width-3.0.0" = { @@ -3064,13 +3154,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.27.2" = { + "core-js-3.29.0" = { name = "core-js"; packageName = "core-js"; - version = "3.27.2"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; - sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; "core-util-is-1.0.2" = { @@ -3136,13 +3226,13 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; - "cron-parser-4.7.1" = { + "cron-parser-4.8.0" = { name = "cron-parser"; packageName = "cron-parser"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"; - sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.0.tgz"; + sha512 = "VjwVZx26j7lukZmG3gtAvPYkD6wuMuIdYhEzrmpHtSGO9dvKkv+EhReFY7HQPsGuGUfy+by3IOriuzyrzxl9MQ=="; }; }; "cross-spawn-4.0.2" = { @@ -3388,6 +3478,15 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; + "deep-equal-2.2.0" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"; + sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -3496,15 +3595,6 @@ let sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -3730,13 +3820,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "element-ui-2.15.12" = { + "element-ui-2.15.13" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.12"; + version = "2.15.13"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.12.tgz"; - sha512 = "Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.13.tgz"; + sha512 = "LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg=="; }; }; "emoji-regex-8.0.0" = { @@ -3865,6 +3955,15 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-get-iterator-1.1.3" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"; + sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; + }; + }; "es-set-tostringtag-2.0.1" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; @@ -4972,13 +5071,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-9.0.3" = { + "html-to-text-9.0.4" = { name = "html-to-text"; packageName = "html-to-text"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; - sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.4.tgz"; + sha512 = "ckrQ5N2yZS7qSgKxUbqrBZ02NxD5cSy7KuYjCNIf+HWbdzY3fbjYjQsoRIl6TiaZ4+XWOi0ggFP8/pmgCK/o+A=="; }; }; "htmlparser2-6.1.0" = { @@ -5323,13 +5422,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.1" = { + "is-array-buffer-3.0.2" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; }; }; "is-arrayish-0.3.2" = { @@ -5476,6 +5575,15 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; + "is-map-2.0.2" = { + name = "is-map"; + packageName = "is-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; + sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; + }; + }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -5575,6 +5683,15 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; + "is-set-2.0.2" = { + name = "is-set"; + packageName = "is-set"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; + sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; + }; + }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -5647,6 +5764,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-weakmap-2.0.1" = { + name = "is-weakmap"; + packageName = "is-weakmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; + sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; + }; + }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -5656,6 +5782,15 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; + "is-weakset-2.0.2" = { + name = "is-weakset"; + packageName = "is-weakset"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; + sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -5692,13 +5827,22 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.6.5" = { + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; + "isbot-3.6.6" = { name = "isbot"; packageName = "isbot"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.5.tgz"; - sha512 = "BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.6.tgz"; + sha512 = "98aGl1Spbx1led422YFrusDJ4ZutSNOymb2avZ2V4BCCjF3MqAF2k+J2zoaLYahubaFkb+3UyvbVDVlk/Ngrew=="; }; }; "isexe-2.0.0" = { @@ -5755,13 +5899,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.11.4" = { + "jose-4.13.1" = { name = "jose"; packageName = "jose"; - version = "4.11.4"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.11.4.tgz"; - sha512 = "94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ=="; + url = "https://registry.npmjs.org/jose/-/jose-4.13.1.tgz"; + sha512 = "MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ=="; }; }; "jquery-3.6.3" = { @@ -6043,13 +6187,13 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "ldapts-4.2.2" = { + "ldapts-4.2.4" = { name = "ldapts"; packageName = "ldapts"; - version = "4.2.2"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.2.tgz"; - sha512 = "UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ=="; + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.4.tgz"; + sha512 = "crE50bd+UA7bJcbOy2IynWJHTQwrG2FeySo1AqokGtApG7xoCVxz/sO5JLe2Xso1zb/Z+Zh65ERHkpJaGRJaEA=="; }; }; "leac-0.6.0" = { @@ -6097,13 +6241,22 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.19" = { + "libmime-5.2.1" = { + name = "libmime"; + packageName = "libmime"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz"; + sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; + }; + }; + "libphonenumber-js-1.10.21" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.19"; + version = "1.10.21"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; - sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.21.tgz"; + sha512 = "/udZhx49av2r2gZR/+xXSrwcR8smX/sDNrVpOFrvW+CA26TfYTVZfwb3MIDvmwAYMLs7pXuJjZX0VxxGpqPhsA=="; }; }; "libpq-1.8.12" = { @@ -6196,6 +6349,24 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha512 = "hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw=="; + }; + }; + "lodash.assignwith-4.2.0" = { + name = "lodash.assignwith"; + packageName = "lodash.assignwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; + sha512 = "ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g=="; + }; + }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -6205,6 +6376,15 @@ let sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; }; }; + "lodash.clone-4.5.0" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"; + sha512 = "GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg=="; + }; + }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -6214,13 +6394,22 @@ let sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; + "lodash.compact-3.0.1" = { + name = "lodash.compact"; + packageName = "lodash.compact"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + url = "https://registry.npmjs.org/lodash.compact/-/lodash.compact-3.0.1.tgz"; + sha512 = "2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ=="; + }; + }; + "lodash.concat-4.5.0" = { + name = "lodash.concat"; + packageName = "lodash.concat"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.concat/-/lodash.concat-4.5.0.tgz"; + sha512 = "US6b1Nqek3shg2qmv1IjTN5P7tPL1RKu77VpdGtVprxmnTI/HlsHGqI2Oa5Irznk0ZB5IXHwocMeMZK8vf4+CA=="; }; }; "lodash.defaults-4.2.0" = { @@ -6232,6 +6421,51 @@ let sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; }; }; + "lodash.difference-4.5.0" = { + name = "lodash.difference"; + packageName = "lodash.difference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; + }; + }; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha512 = "TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="; + }; + }; + "lodash.every-4.6.0" = { + name = "lodash.every"; + packageName = "lodash.every"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.every/-/lodash.every-4.6.0.tgz"; + sha512 = "isF82d+65/sNvQ3aaQAW7LLHnnTxSN/2fm4rhYyuufLzA4VtHz6y6S5vFwe6PQVr2xdqUOyxBbTNKDpnmeu50w=="; + }; + }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha512 = "yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg=="; + }; + }; + "lodash.first-3.0.0" = { + name = "lodash.first"; + packageName = "lodash.first"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.first/-/lodash.first-3.0.0.tgz"; + sha512 = "FnBs6c5eWZY1P88K2+NHiLZjp+pBRbLbt9kDGBCtiY+tfRGhR7LmIxTphpspmRXxyQeJXM5LHoq62yVjcBjcCw=="; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -6241,6 +6475,15 @@ let sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; + "lodash.flow-3.5.0" = { + name = "lodash.flow"; + packageName = "lodash.flow"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz"; + sha512 = "ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="; + }; + }; "lodash.get-4.4.2" = { name = "lodash.get"; packageName = "lodash.get"; @@ -6277,6 +6520,15 @@ let sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; }; + "lodash.isarray-4.0.0" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; + sha512 = "V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g=="; + }; + }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -6286,6 +6538,15 @@ let sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; }; }; + "lodash.isempty-4.4.0" = { + name = "lodash.isempty"; + packageName = "lodash.isempty"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha512 = "oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="; + }; + }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -6313,6 +6574,15 @@ let sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; }; }; + "lodash.isobject-3.0.2" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha512 = "3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -6340,6 +6610,33 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; + "lodash.last-3.0.0" = { + name = "lodash.last"; + packageName = "lodash.last"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz"; + sha512 = "14mq7rSkCxG4XMy9lF2FbIOqqgF0aH0NfPuQ3LPR3vIh0kHnUvIYP70dqa1Hf47zyXfQ8FzAg0MYOQeSuE1R7A=="; + }; + }; + "lodash.lt-3.9.2" = { + name = "lodash.lt"; + packageName = "lodash.lt"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.lt/-/lodash.lt-3.9.2.tgz"; + sha512 = "WMyxj1+48IlnUWMYALOD6+o61apx5xdiXDtHBOp6QlkeZ19QpX7LiqHMXCnZWGd35QMZoZV/iJIhIhM01WPz3A=="; + }; + }; + "lodash.map-4.6.0" = { + name = "lodash.map"; + packageName = "lodash.map"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; + sha512 = "worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q=="; + }; + }; "lodash.merge-4.6.2" = { name = "lodash.merge"; packageName = "lodash.merge"; @@ -6349,6 +6646,15 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; + "lodash.mergewith-4.6.2" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; + sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; + }; + }; "lodash.omit-4.5.0" = { name = "lodash.omit"; packageName = "lodash.omit"; @@ -6376,6 +6682,15 @@ let sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; }; }; + "lodash.partialright-4.2.1" = { + name = "lodash.partialright"; + packageName = "lodash.partialright"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz"; + sha512 = "yebmPMQZH7i4El6SdJTW9rn8irWl8VTcsmiWqm/I4sY8/ZjbSo0Z512HL6soeAu3mh5rhx5uIIo6kYJOQXbCxw=="; + }; + }; "lodash.pick-4.4.0" = { name = "lodash.pick"; packageName = "lodash.pick"; @@ -6385,6 +6700,24 @@ let sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; + "lodash.pickby-4.6.0" = { + name = "lodash.pickby"; + packageName = "lodash.pickby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"; + sha512 = "AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q=="; + }; + }; + "lodash.reduce-4.6.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha512 = "6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw=="; + }; + }; "lodash.remove-4.7.0" = { name = "lodash.remove"; packageName = "lodash.remove"; @@ -6412,6 +6745,24 @@ let sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; }; }; + "lodash.some-4.6.0" = { + name = "lodash.some"; + packageName = "lodash.some"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"; + sha512 = "j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ=="; + }; + }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; + }; + }; "lodash.split-4.4.2" = { name = "lodash.split"; packageName = "lodash.split"; @@ -6430,6 +6781,42 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; + "lodash.tonumber-4.0.3" = { + name = "lodash.tonumber"; + packageName = "lodash.tonumber"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz"; + sha512 = "SY0SwuPOHRwKcCNTdsntPYb+Zddz5mDUIVFABzRMqmAiL41pMeyoQFGxYAw5zdc9NnH4pbJqiqqp5ckfxa+zSA=="; + }; + }; + "lodash.tostring-4.1.4" = { + name = "lodash.tostring"; + packageName = "lodash.tostring"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.4.tgz"; + sha512 = "xWHJ0LY7cSz/C/4ghNNiYA1Ong0VLdzAzrjDHvOzN+eJHzDEHme2+k+w/9Pk8dtdwcASMUbxN1/mtj6mFI25Ng=="; + }; + }; + "lodash.trim-4.5.1" = { + name = "lodash.trim"; + packageName = "lodash.trim"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.trim/-/lodash.trim-4.5.1.tgz"; + sha512 = "nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg=="; + }; + }; + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; + }; + }; "lodash.unionby-4.8.0" = { name = "lodash.unionby"; packageName = "lodash.unionby"; @@ -6466,6 +6853,24 @@ let sha512 = "bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="; }; }; + "lodash.upperfirst-4.3.1" = { + name = "lodash.upperfirst"; + packageName = "lodash.upperfirst"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; + sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; + }; + }; + "lodash.zip-4.2.0" = { + name = "lodash.zip"; + packageName = "lodash.zip"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz"; + sha512 = "C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="; + }; + }; "lodash.zipobject-4.1.3" = { name = "lodash.zipobject"; packageName = "lodash.zipobject"; @@ -6547,13 +6952,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.14.1" = { + "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.14.1"; + version = "7.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; "lru-memoizer-2.2.0" = { @@ -6574,22 +6979,22 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-3.2.1" = { + "luxon-3.3.0" = { name = "luxon"; packageName = "luxon"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"; - sha512 = "QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz"; + sha512 = "An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="; }; }; - "mailparser-3.6.3" = { + "mailparser-3.6.4" = { name = "mailparser"; packageName = "mailparser"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.3.tgz"; - sha512 = "Yi6poKSsZsmjEcUexv3H4w4+TIeyN9u3+TCdC43VK7fe4rUOGDJ3wL4kMhNLiTOScCA1Rpzldv1hcf6g1MLtZQ=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.4.tgz"; + sha512 = "4bDgbLdlcBKX8jtVskfn/G93nZo3lf7pyuLbAQ031SHQLihEqxtRwHrb9SXMTqiTkEGlOdpDrZE5uH18O+2A+A=="; }; }; "mailsplit-5.4.0" = { @@ -6880,13 +7285,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.3" = { + "minipass-4.2.4" = { name = "minipass"; packageName = "minipass"; - version = "4.0.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz"; - sha512 = "OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; + sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; }; }; "minipass-collect-1.0.2" = { @@ -6961,13 +7366,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-2.1.3" = { + "mkdirp-2.1.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; - sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.5.tgz"; + sha512 = "jbjfql+shJtAPrFoKxHOXip4xS+kul9W3OzfzzrqueWK2QMGon2bFH2opl6W9EagBThjEz+iysyi/swOoVfB/w=="; }; }; "mkdirp-classic-0.5.3" = { @@ -6997,13 +7402,13 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.40" = { + "moment-timezone-0.5.41" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.40"; + version = "0.5.41"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz"; + sha512 = "e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg=="; }; }; "monaco-editor-0.33.0" = { @@ -7096,13 +7501,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.3" = { + "msgpackr-1.8.4" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; - sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.4.tgz"; + sha512 = "BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg=="; }; }; "mssql-7.3.5" = { @@ -7159,49 +7564,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.154.1" = { + "n8n-core-0.157.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.154.1"; + version = "0.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz"; - sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.157.0.tgz"; + sha512 = "NYUqQGUJKNNEf39ZDzQsGSBlSxsTV47S0LPLvAy+7jlOXw9ZiITJC2bX9s3DHotN0rPm+asBGs3aZeUWb+Ygyw=="; }; }; - "n8n-design-system-0.53.0" = { + "n8n-design-system-0.56.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.53.0"; + version = "0.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.53.0.tgz"; - sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.56.0.tgz"; + sha512 = "DY7U6jCp9MxHc0n69WqdGSVBCZTv4O5S/FuPrppYWH+OkI2kZxxidFi28HmTM/VnQo53A3pKFG5oDBbZDFt8wA=="; }; }; - "n8n-editor-ui-0.181.1" = { + "n8n-editor-ui-0.184.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.181.1"; + version = "0.184.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz"; - sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.184.0.tgz"; + sha512 = "fXxMKEhcgx205P5flp1sqTinrgtZIL6xthCZ92uEoT90pnTiZ54nCCgmY8QftMwhuAgomaJ/Ud6i93LJo0CA8A=="; }; }; - "n8n-nodes-base-0.213.1" = { + "n8n-nodes-base-0.216.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.213.1"; + version = "0.216.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz"; - sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.216.0.tgz"; + sha512 = "/78YbR/SQCXrkYNwco7Y2kzu+IneHNDPULfySPgbstqFrpiUvJhcaQbb7fAVGA/L/C+Wk9+EEXknZdjrvFVzow=="; }; }; - "n8n-workflow-0.136.1" = { + "n8n-workflow-0.139.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.136.1"; + version = "0.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz"; - sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.139.0.tgz"; + sha512 = "dNf58QHqORHQCpxPlrkydonKapKo+goNRIvS43L5zupNsLqvGbvu8p6GkdeUQwXEO7RnJ/xcUIaLrKMm+8nE9A=="; }; }; "named-placeholders-1.1.3" = { @@ -7402,13 +7807,13 @@ let sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.4" = { + "node-html-parser-6.1.5" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.4"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.4.tgz"; - sha512 = "3muP9Uy/Pz7bQa9TNYVQzWJhNZMqyCx7xJle8kz2/y1UgzAUyXXShc1IcPaJy6u07CE3K5rQcRwlvHzmlySRjg=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.5.tgz"; + sha512 = "fAaM511feX++/Chnhe475a0NHD8M7AxDInsqQpz6x63GRF7xYNdS8Vo5dKsIVPgsOvG7eioRRTZQnWBrhDHBSg=="; }; }; "node-machine-id-1.1.12" = { @@ -7447,15 +7852,6 @@ let sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; - "nodemailer-6.8.0" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; - sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; - }; - }; "nodemailer-6.9.1" = { name = "nodemailer"; packageName = "nodemailer"; @@ -7591,6 +7987,15 @@ let sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -7690,13 +8095,13 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.4.1" = { + "open-8.4.2" = { name = "open"; packageName = "open"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; - sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; + url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; + sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; }; }; "openapi-types-10.0.0" = { @@ -7861,6 +8266,15 @@ let sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; "param-case-3.0.4" = { name = "param-case"; packageName = "param-case"; @@ -8266,13 +8680,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.30" = { + "pinia-2.0.32" = { name = "pinia"; packageName = "pinia"; - version = "2.0.30"; + version = "2.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; - sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.32.tgz"; + sha512 = "8Tw4OrpCSJ028UUyp0gYPP/wyjigLoEceuO/x1G+FlHVf73337e5vLm4uDmrRIoBG1hvaed/eSHnrCFjOc4nkA=="; }; }; "popsicle-12.1.0" = { @@ -8392,13 +8806,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.4.0" = { + "posthog-node-2.5.4" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.4.0"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; - sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.5.4.tgz"; + sha512 = "CdywlVh0CZU05/3MrBc0qY/zsLdU2X9XSz/yL1qMRhbyZhD8lrnuGlI69G2cpzZtli6S/nu64wcmULz/mFFA5w=="; }; }; "prebuild-install-7.1.1" = { @@ -8770,6 +9184,15 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "raw-body-2.5.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -8797,22 +9220,22 @@ let sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readable-web-to-node-stream-3.0.2" = { @@ -8869,6 +9292,15 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; + "redis-4.6.5" = { + name = "redis"; + packageName = "redis"; + version = "4.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-4.6.5.tgz"; + sha512 = "O0OWA36gDQbswOdUuAhRL6mTZpHFN525HlgZgDaVNgCJIAZR3ya06NTESb0R+TUZ+BFaDpz6NnnVvoMx9meUFg=="; + }; + }; "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; @@ -9193,13 +9625,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.7.3" = { + "samlify-2.8.10" = { + name = "samlify"; + packageName = "samlify"; + version = "2.8.10"; + src = fetchurl { + url = "https://registry.npmjs.org/samlify/-/samlify-2.8.10.tgz"; + sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; + }; + }; + "sanitize-html-2.9.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.7.3"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.3.tgz"; - sha512 = "jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.9.0.tgz"; + sha512 = "KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg=="; }; }; "sax-1.2.1" = { @@ -9445,13 +9886,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.16.0" = { + "simple-git-3.17.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; - sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.17.0.tgz"; + sha512 = "JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw=="; }; }; "simple-lru-cache-0.0.2" = { @@ -9499,13 +9940,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.18" = { + "snowflake-sdk-1.6.19" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.18"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; - sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.19.tgz"; + sha512 = "aTN9/aqIy7oqz3KPb4iJVfmG7na+FvEQgJVZtSHODAnhOAH4OVBtvdlTTK15rld5NixxYYhIyzi1K6oXythEPA=="; }; }; "socks-2.7.1" = { @@ -9769,6 +10210,15 @@ let sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; + "stop-iteration-iterator-1.0.0" = { + name = "stop-iteration-iterator"; + packageName = "stop-iteration-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"; + sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ=="; + }; + }; "stoppable-1.1.0" = { name = "stoppable"; packageName = "stoppable"; @@ -9976,22 +10426,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.15.5" = { + "swagger-ui-dist-4.17.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.5"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; - sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.17.0.tgz"; + sha512 = "31zNkTaOItkhyoKQMs1HIRZ+0kwBPcmp1R0TcVsAmZpT8QGWFI6k9wfTfllQ1t2oE8IoHVUwL5V0VTAKUosvNg=="; }; }; - "swagger-ui-express-4.6.0" = { + "swagger-ui-express-4.6.2" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.6.0"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.0.tgz"; - sha512 = "ZxpQFp1JR2RF8Ar++CyJzEDdvufa08ujNUJgMVTMWPi86CuQeVdBtvaeO/ysrz6dJAYXf9kbVNhWD7JWocwqsA=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.2.tgz"; + sha512 = "MHIOaq9JrTTB3ygUJD+08PbjM5Tt/q7x80yz9VTFIatw8j5uIWKcr90S0h5NLMzFEDC6+eVprtoeA5MDZXCUKQ=="; }; }; "syslog-client-1.1.1" = { @@ -10291,15 +10741,6 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; - "tough-cookie-4.1.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"; - sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; - }; - }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -10453,6 +10894,15 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; + "typedi-0.10.0" = { + name = "typedi"; + packageName = "typedi"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typedi/-/typedi-0.10.0.tgz"; + sha512 = "v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w=="; + }; + }; "typeorm-0.3.12" = { name = "typeorm"; packageName = "typeorm"; @@ -10525,6 +10975,15 @@ let sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; + "underscore-1.13.6" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.6"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; "unescape-1.0.1" = { name = "unescape"; packageName = "unescape"; @@ -10570,15 +11029,6 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-0.2.0" = { - name = "universalify"; - packageName = "universalify"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"; - sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; - }; - }; "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; @@ -10669,6 +11119,15 @@ let sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; + "utf-8-validate-6.0.3" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz"; + sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA=="; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -11056,6 +11515,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-collection-1.0.1" = { + name = "which-collection"; + packageName = "which-collection"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; + sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; + }; + }; "which-typed-array-1.1.9" = { name = "which-typed-array"; packageName = "which-typed-array"; @@ -11182,13 +11650,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.12.0" = { + "ws-8.12.1" = { name = "ws"; packageName = "ws"; - version = "8.12.0"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz"; - sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; + url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; + sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; }; }; "xlsx-0.17.5" = { @@ -11200,6 +11668,24 @@ let sha512 = "lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g=="; }; }; + "xml-1.0.1" = { + name = "xml"; + packageName = "xml"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"; + sha512 = "huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw=="; + }; + }; + "xml-crypto-3.0.1" = { + name = "xml-crypto"; + packageName = "xml-crypto"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.0.1.tgz"; + sha512 = "7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw=="; + }; + }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -11236,6 +11722,15 @@ let sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; + "xpath-0.0.32" = { + name = "xpath"; + packageName = "xpath"; + version = "0.0.32"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; + sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; + }; + }; "xpath.js-1.1.0" = { name = "xpath.js"; packageName = "xpath.js"; @@ -11335,13 +11830,13 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.6.2" = { + "yargs-17.7.1" = { name = "yargs"; packageName = "yargs"; - version = "17.6.2"; + version = "17.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"; - sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"; + sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; }; }; "yargs-parser-20.2.9" = { @@ -11386,10 +11881,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.215.1"; + version = "0.218.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz"; - sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.218.0.tgz"; + sha512 = "U8BRKXk1rQxF8QwPJfZwNJ9K0uTdxPXzulN1EQokOwm12MzRCBIocTYzTzGu9I8pHvyQMhcev8T4zLmZd5bvhw=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11403,31 +11898,43 @@ in sources."js-yaml-4.1.0" ]; }) + sources."@authenio/xml-encryption-2.0.2" sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.4.0" - sources."@azure/core-client-1.7.1" - (sources."@azure/core-http-2.3.1" // { + (sources."@azure/core-client-1.7.2" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + ]; + }) + (sources."@azure/core-http-3.0.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tough-cookie-4.1.2" - sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" sources."@azure/core-lro-2.5.1" sources."@azure/core-paging-1.5.0" - sources."@azure/core-rest-pipeline-1.10.1" - sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.1.1" - (sources."@azure/identity-2.1.0" // { + (sources."@azure/core-rest-pipeline-1.10.2" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) + sources."@azure/core-tracing-1.0.0-preview.12" + sources."@azure/core-util-1.2.0" + (sources."@azure/identity-1.5.2" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" - sources."open-8.4.1" ]; }) - sources."@azure/keyvault-keys-4.6.0" - sources."@azure/logger-1.0.3" + (sources."@azure/keyvault-keys-4.6.0" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + ]; + }) + sources."@azure/logger-1.0.4" sources."@azure/ms-rest-azure-env-2.0.0" (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ @@ -11441,27 +11948,28 @@ in sources."@azure/msal-common-10.0.0" ]; }) - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.15.0" // { + sources."@azure/msal-common-4.5.1" + (sources."@azure/msal-node-1.0.0-beta.6" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."jsonwebtoken-8.5.1" + sources."semver-5.7.1" ]; }) - (sources."@azure/storage-blob-12.12.0" // { + (sources."@azure/storage-blob-12.13.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - sources."@babel/parser-7.20.15" - sources."@babel/runtime-7.20.13" - sources."@codemirror/autocomplete-6.4.0" - sources."@codemirror/commands-6.2.0" + sources."@babel/parser-7.21.2" + sources."@babel/runtime-7.21.0" + sources."@codemirror/autocomplete-6.4.2" + sources."@codemirror/commands-6.2.1" sources."@codemirror/lang-css-6.0.2" - sources."@codemirror/lang-javascript-6.1.3" - sources."@codemirror/language-6.5.0" - sources."@codemirror/lint-6.1.0" + sources."@codemirror/lang-javascript-6.1.4" + sources."@codemirror/language-6.6.0" + sources."@codemirror/lint-6.2.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.8.1" + sources."@codemirror/view-6.9.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11482,24 +11990,14 @@ in }) sources."@fortawesome/vue-fontawesome-2.0.10" sources."@gar/promisify-1.1.3" - (sources."@google-cloud/common-3.10.0" // { - dependencies = [ - sources."duplexify-4.1.2" - sources."readable-stream-3.6.0" - ]; - }) + sources."@google-cloud/common-3.10.0" sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/spanner-5.18.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."through2-4.0.2" - ]; - }) + sources."@google-cloud/spanner-5.18.0" (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.4" + sources."@grpc/proto-loader-0.7.5" sources."long-5.2.1" sources."protobufjs-7.2.2" sources."yargs-16.2.0" @@ -11521,20 +12019,20 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@js-joda/core-5.5.2" + sources."@js-joda/core-3.2.0" sources."@jsdevtools/ono-7.1.3" - sources."@jsplumb/browser-ui-5.13.2" - sources."@jsplumb/common-5.13.2" - sources."@jsplumb/connector-bezier-5.13.2" - sources."@jsplumb/core-5.13.2" - sources."@jsplumb/util-5.13.2" + sources."@jsplumb/browser-ui-5.13.4" + sources."@jsplumb/common-5.13.4" + sources."@jsplumb/connector-bezier-5.13.4" + sources."@jsplumb/core-5.13.4" + sources."@jsplumb/util-5.13.4" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" - sources."@lezer/html-1.3.1" + sources."@lezer/html-1.3.3" sources."@lezer/javascript-1.4.1" sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" @@ -11555,7 +12053,7 @@ in }) sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.8" - (sources."@oclif/core-1.26.1" // { + (sources."@oclif/core-1.26.2" // { dependencies = [ sources."supports-color-8.1.1" sources."wrap-ansi-7.0.0" @@ -11588,53 +12086,59 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@redis/bloom-1.2.0" + (sources."@redis/client-1.5.6" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + sources."@redis/graph-1.1.0" + sources."@redis/json-1.0.4" + sources."@redis/search-1.1.2" + sources."@redis/time-series-1.0.4" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ sources."bull-3.29.3" sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.15.19" // { + (sources."@sap/hana-client-2.15.22" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - (sources."@selderee/plugin-htmlparser2-0.10.0" // { - dependencies = [ - sources."domhandler-5.0.3" - ]; - }) - (sources."@sentry/core-7.37.1" // { + sources."@selderee/plugin-htmlparser2-0.10.0" + (sources."@sentry/core-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.37.1" // { + (sources."@sentry/integrations-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.37.1" // { + (sources."@sentry/node-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.37.1" - (sources."@sentry/utils-7.37.1" // { + sources."@sentry/types-7.40.0" + (sources."@sentry/utils-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.35" - sources."@swc/wasm-1.3.35" + sources."@swc/core-1.3.37" + sources."@swc/wasm-1.3.37" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" - sources."@tootallnate/once-2.0.0" + sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -11654,7 +12158,7 @@ in sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.13.0" + sources."@types/node-18.14.6" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11663,14 +12167,14 @@ in sources."@types/pumpify-1.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/stack-trace-0.0.29" sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.0" - sources."@types/validator-13.7.12" + sources."@types/uuid-9.0.1" + sources."@types/validator-13.7.13" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11695,11 +12199,7 @@ in }) sources."adler-32-1.2.0" sources."agent-base-6.0.2" - (sources."agentkeepalive-4.2.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) + sources."agentkeepalive-4.3.0" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" @@ -11724,7 +12224,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."arg-4.1.3" @@ -11754,7 +12254,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1313.0" // { + (sources."aws-sdk-2.1328.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11788,19 +12288,20 @@ in sources."better-sqlite3-8.1.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" - sources."bignumber.js-2.4.0" + sources."bignumber.js-9.1.1" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" sources."bindings-1.5.0" sources."bintrees-1.0.2" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."buffer-5.7.1" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-2.11.0" sources."bn.js-4.12.0" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" sources."iconv-lite-0.4.24" @@ -11812,8 +12313,8 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-4.7.2" - sources."buffer-5.7.1" + sources."bson-1.1.6" + sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" @@ -11821,7 +12322,7 @@ in sources."bufferutil-4.0.7" (sources."bull-4.10.4" // { dependencies = [ - sources."cron-parser-4.7.1" + sources."cron-parser-4.8.0" ]; }) sources."busboy-1.6.0" @@ -11841,6 +12342,7 @@ in sources."callback-stream-1.1.0" sources."callsites-3.1.0" sources."camel-case-4.1.2" + sources."camelcase-6.3.0" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -11857,24 +12359,39 @@ in dependencies = [ sources."async-2.6.4" sources."split-array-stream-1.0.3" + sources."through2-2.0.5" + ]; + }) + (sources."cheerio-1.0.0-rc.6" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" + sources."htmlparser2-6.1.0" + sources."parse5-6.0.1" + ]; + }) + (sources."cheerio-select-1.6.0" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" ]; }) - sources."cheerio-1.0.0-rc.6" - sources."cheerio-select-1.6.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" + sources."class-transformer-0.5.1" sources."class-validator-0.14.0" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" sources."cli-cursor-3.1.0" (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."parse5-5.1.1" sources."yargs-16.2.0" ]; }) - sources."cli-progress-3.11.2" + sources."cli-progress-3.12.0" sources."cli-width-3.0.0" sources."client-oauth2-4.3.3" (sources."cliui-7.0.4" // { @@ -11928,7 +12445,7 @@ in }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.27.2" + sources."core-js-3.29.0" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."create-require-1.1.1" @@ -11943,7 +12460,13 @@ in sources."crypt-0.0.2" sources."crypto-js-4.1.1" sources."csrf-3.1.0" - sources."css-select-4.3.0" + (sources."css-select-4.3.0" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" + ]; + }) sources."css-what-6.1.0" sources."cssfilter-0.0.10" sources."csstype-3.1.1" @@ -11960,6 +12483,11 @@ in sources."debuglog-1.0.1" sources."decode-uri-component-0.2.2" sources."decompress-response-6.0.0" + (sources."deep-equal-2.2.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" @@ -11978,19 +12506,27 @@ in sources."digest-header-1.0.0" sources."dir-glob-3.0.1" sources."dom-iterator-1.0.0" - sources."dom-serializer-1.4.1" + (sources."dom-serializer-2.0.0" // { + dependencies = [ + sources."entities-4.4.0" + ]; + }) sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" - sources."duplexify-3.7.1" + (sources."duplexify-4.1.2" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."element-ui-2.15.12" + sources."element-ui-2.15.13" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" @@ -12004,6 +12540,11 @@ in sources."es-abstract-1.21.1" sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" + (sources."es-get-iterator-1.1.3" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" @@ -12027,9 +12568,12 @@ in sources."expand-tilde-2.0.2" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."cookie-0.5.0" sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ms-2.0.0" + sources."raw-body-2.5.1" ]; }) sources."express-async-errors-3.1.1" @@ -12125,7 +12669,6 @@ in sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ - sources."@tootallnate/once-1.1.2" sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -12158,12 +12701,7 @@ in sources."yallist-4.0.0" ]; }) - (sources."google-gax-2.30.5" // { - dependencies = [ - sources."duplexify-4.1.2" - sources."readable-stream-3.6.0" - ]; - }) + sources."google-gax-2.30.5" sources."google-p12-pem-3.1.4" sources."google-timezones-json-1.0.2" sources."gopd-1.0.1" @@ -12190,23 +12728,26 @@ in sources."he-1.2.0" sources."header-case-2.0.4" sources."heap-0.2.7" - sources."help-me-1.1.0" - sources."highlight.js-10.7.3" - sources."homedir-polyfill-1.0.3" - (sources."html-to-text-9.0.3" // { + (sources."help-me-1.1.0" // { dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."highlight.js-10.7.3" + sources."homedir-polyfill-1.0.3" + (sources."html-to-text-9.0.4" // { + dependencies = [ sources."deepmerge-4.3.0" - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" + ]; + }) + (sources."htmlparser2-8.0.1" // { + dependencies = [ sources."entities-4.4.0" - sources."htmlparser2-8.0.1" ]; }) - sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http-proxy-agent-5.0.0" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-duration-3.28.0" @@ -12249,7 +12790,7 @@ in sources."is-3.3.0" sources."is-absolute-1.0.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -12265,6 +12806,7 @@ in sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-lambda-1.0.1" + sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -12276,6 +12818,7 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-stream-ended-0.1.4" @@ -12284,31 +12827,29 @@ in sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.6.5" + sources."isbot-3.6.6" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.11.4" + sources."jose-4.13.1" sources."jquery-3.6.3" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" - sources."jsbi-4.3.0" + sources."jsbi-3.2.5" sources."jsbn-0.1.1" sources."jsesc-3.0.2" - (sources."json-bigint-1.0.0" // { - dependencies = [ - sources."bignumber.js-9.1.1" - ]; - }) + sources."json-bigint-1.0.0" sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -12319,6 +12860,7 @@ in (sources."jsonpath-1.1.1" // { dependencies = [ sources."esprima-1.2.2" + sources."underscore-1.12.1" ]; }) sources."jsonschema-1.4.1" @@ -12329,7 +12871,7 @@ in sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" - (sources."ldapts-4.2.2" // { + (sources."ldapts-4.2.4" // { dependencies = [ sources."uuid-9.0.0" ]; @@ -12338,8 +12880,8 @@ in sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - sources."libmime-5.2.0" - sources."libphonenumber-js-1.10.19" + sources."libmime-5.2.1" + sources."libphonenumber-js-1.10.21" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12353,36 +12895,64 @@ in }) sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash.assign-4.2.0" + sources."lodash.assignwith-4.2.0" sources."lodash.camelcase-4.3.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" + sources."lodash.compact-3.0.1" + sources."lodash.concat-4.5.0" sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.every-4.6.0" + sources."lodash.find-4.6.0" + sources."lodash.first-3.0.0" sources."lodash.flatten-4.4.0" + sources."lodash.flow-3.5.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.intersection-4.4.0" sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-4.0.0" sources."lodash.isboolean-3.0.3" + sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" sources."lodash.isinteger-4.0.4" sources."lodash.isnumber-3.0.3" + sources."lodash.isobject-3.0.2" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.iteratee-4.7.0" + sources."lodash.last-3.0.0" + sources."lodash.lt-3.9.2" + sources."lodash.map-4.6.0" sources."lodash.merge-4.6.2" + sources."lodash.mergewith-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" + sources."lodash.partialright-4.2.1" sources."lodash.pick-4.4.0" + sources."lodash.pickby-4.6.0" + sources."lodash.reduce-4.6.0" sources."lodash.remove-4.7.0" sources."lodash.set-4.3.2" sources."lodash.snakecase-4.1.1" + sources."lodash.some-4.6.0" + sources."lodash.sortby-4.7.0" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" + sources."lodash.tonumber-4.0.3" + sources."lodash.tostring-4.1.4" + sources."lodash.trim-4.5.1" + sources."lodash.union-4.6.0" sources."lodash.unionby-4.8.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" + sources."lodash.upperfirst-4.3.1" + sources."lodash.zip-4.2.0" sources."lodash.zipobject-4.1.3" sources."logform-2.5.1" sources."long-4.0.0" @@ -12391,14 +12961,17 @@ in sources."lru-cache-4.0.2" sources."lru-memoizer-2.2.0" sources."lru_map-0.3.3" - sources."luxon-3.2.1" - (sources."mailparser-3.6.3" // { + sources."luxon-3.3.0" + (sources."mailparser-3.6.4" // { dependencies = [ sources."linkify-it-4.0.1" - sources."nodemailer-6.8.0" ]; }) - sources."mailsplit-5.4.0" + (sources."mailsplit-5.4.0" // { + dependencies = [ + sources."libmime-5.2.0" + ]; + }) (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -12408,11 +12981,8 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" sources."lru-cache-6.0.0" sources."minipass-3.3.6" - sources."socks-proxy-agent-6.2.1" sources."yallist-4.0.0" ]; }) @@ -12442,7 +13012,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-4.0.3" + sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12488,9 +13058,13 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.40" + sources."moment-timezone-0.5.41" sources."monaco-editor-0.33.0" - sources."mongodb-4.14.0" + (sources."mongodb-3.7.3" // { + dependencies = [ + sources."bl-2.2.1" + ]; + }) (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" @@ -12501,7 +13075,10 @@ in (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."pump-3.0.0" + sources."readable-stream-3.6.1" + sources."split2-3.2.2" + sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; }) @@ -12512,12 +13089,8 @@ in sources."tslib-1.14.1" ]; }) - sources."msgpackr-1.8.3" - (sources."mssql-8.1.4" // { - dependencies = [ - sources."commander-9.5.0" - ]; - }) + sources."msgpackr-1.8.4" + sources."mssql-7.3.5" sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { @@ -12528,33 +13101,61 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.154.1" // { + (sources."n8n-core-0.157.0" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) - (sources."n8n-design-system-0.53.0" // { + (sources."n8n-design-system-0.56.0" // { dependencies = [ sources."argparse-2.0.1" sources."markdown-it-12.3.2" sources."vue2-boring-avatars-0.3.8" ]; }) - sources."n8n-editor-ui-0.181.1" - (sources."n8n-nodes-base-0.213.1" // { + sources."n8n-editor-ui-0.184.0" + (sources."n8n-nodes-base-0.216.0" // { dependencies = [ + sources."@azure/core-tracing-1.0.1" + sources."@azure/identity-2.1.0" + sources."@azure/msal-common-7.6.0" + (sources."@azure/msal-node-1.15.0" // { + dependencies = [ + sources."@azure/msal-common-10.0.0" + ]; + }) + sources."@js-joda/core-5.5.2" + (sources."bl-5.1.0" // { + dependencies = [ + sources."buffer-6.0.3" + ]; + }) + sources."bson-4.7.2" + sources."buffer-5.7.1" sources."chokidar-3.5.2" + sources."commander-9.5.0" + sources."jsbi-4.3.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."mongodb-4.14.0" + sources."mssql-8.1.4" + sources."node-abort-controller-3.1.1" + sources."open-8.4.2" + sources."readable-stream-3.6.1" + sources."redis-3.1.2" + sources."sprintf-js-1.1.2" + sources."tedious-14.7.0" ]; }) - (sources."n8n-workflow-0.136.1" // { + (sources."n8n-workflow-0.139.0" // { dependencies = [ sources."ast-types-0.15.2" ]; }) (sources."named-placeholders-1.1.3" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.18.3" ]; }) sources."nan-2.17.0" @@ -12569,7 +13170,7 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-abi-3.33.0" - sources."node-abort-controller-3.1.1" + sources."node-abort-controller-2.0.0" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.9" @@ -12579,19 +13180,15 @@ in sources."are-we-there-yet-3.0.1" sources."gauge-4.0.4" sources."npmlog-6.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."which-2.0.2" ]; }) sources."node-gyp-build-4.6.0" sources."node-html-markdown-1.3.0" - (sources."node-html-parser-6.1.4" // { + (sources."node-html-parser-6.1.5" // { dependencies = [ sources."css-select-5.1.0" - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" - sources."entities-4.4.0" ]; }) sources."node-machine-id-1.1.12" @@ -12611,6 +13208,7 @@ in sources."object-assign-4.1.1" sources."object-hash-3.0.0" sources."object-inspect-1.12.3" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" @@ -12638,8 +13236,7 @@ in sources."p-timeout-3.2.0" (sources."pac-proxy-agent-5.0.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" + sources."socks-proxy-agent-5.0.1" ]; }) (sources."pac-resolver-5.0.1" // { @@ -12648,12 +13245,17 @@ in ]; }) sources."packet-reader-1.0.0" + sources."pako-1.0.11" sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" - sources."parse5-6.0.1" - sources."parse5-htmlparser2-tree-adapter-6.0.1" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseley-0.11.0" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" @@ -12706,14 +13308,10 @@ in sources."pg-protocol-1.6.0" sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" - (sources."pgpass-1.0.5" // { - dependencies = [ - sources."split2-4.1.0" - ]; - }) + sources."pgpass-1.0.5" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.30" + sources."pinia-2.0.32" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -12726,12 +13324,16 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.4.0" // { + (sources."posthog-node-2.5.4" // { dependencies = [ sources."axios-0.27.2" ]; }) - sources."prebuild-install-7.1.1" + (sources."prebuild-install-7.1.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) sources."prelude-ls-1.1.2" sources."prettier-2.8.4" sources."pretty-bytes-5.6.0" @@ -12752,19 +13354,18 @@ in sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" sources."lru-cache-5.1.1" + sources."socks-proxy-agent-5.0.1" sources."yallist-3.1.1" ]; }) sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-2.0.1" (sources."pumpify-1.5.1" // { dependencies = [ - sources."pump-2.0.1" + sources."duplexify-3.7.1" ]; }) sources."punycode-2.3.0" @@ -12778,20 +13379,20 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { + (sources."raw-body-2.5.2" // { dependencies = [ sources."iconv-lite-0.4.24" ]; }) sources."rc-1.2.8" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."readdirp-3.6.0" @@ -12802,7 +13403,7 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-3.1.2" + sources."redis-4.6.5" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -12860,7 +13461,8 @@ in sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.7.3" // { + sources."samlify-2.8.10" + (sources."sanitize-html-2.9.0" // { dependencies = [ sources."deepmerge-4.3.0" ]; @@ -12906,15 +13508,16 @@ in sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.16.0" + sources."simple-git-3.17.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" - (sources."snowflake-sdk-1.6.18" // { + (sources."snowflake-sdk-1.6.19" // { dependencies = [ sources."axios-0.27.2" + sources."bignumber.js-2.4.0" sources."debug-3.2.7" sources."mkdirp-1.0.4" sources."tmp-0.2.1" @@ -12922,18 +13525,14 @@ in ]; }) sources."socks-2.7.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.2.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" sources."spex-3.2.0" sources."split-array-stream-2.0.0" sources."split-on-first-1.1.0" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."split2-4.1.0" sources."sprintf-js-1.0.3" sources."sql.js-1.8.0" sources."sqlite3-5.1.4" @@ -12944,7 +13543,7 @@ in (sources."ssh2-sftp-client-7.2.3" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."sshpk-1.17.0" @@ -12959,10 +13558,11 @@ in sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" + sources."stop-iteration-iterator-1.0.0" sources."stoppable-1.1.0" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-events-1.0.5" @@ -12988,8 +13588,8 @@ in sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.15.5" - sources."swagger-ui-express-4.6.0" + sources."swagger-ui-dist-4.17.0" + sources."swagger-ui-express-4.6.2" sources."syslog-client-1.1.1" (sources."tar-6.1.13" // { dependencies = [ @@ -13000,32 +13600,45 @@ in (sources."tar-fs-2.1.1" // { dependencies = [ sources."chownr-1.1.4" + sources."pump-3.0.0" ]; }) (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."tarn-3.0.2" sources."tdigest-0.1.2" - (sources."tedious-14.7.0" // { + (sources."tedious-11.8.0" // { dependencies = [ sources."bl-5.1.0" - sources."buffer-6.0.3" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."sprintf-js-1.1.2" ]; }) - sources."teeny-request-7.2.0" + (sources."teeny-request-7.2.0" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."throttle-debounce-1.1.0" sources."through-2.3.8" - sources."through2-2.0.5" - sources."through2-filter-3.0.0" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) + (sources."through2-filter-3.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) sources."throwback-4.1.0" sources."timeago.js-4.0.2" sources."tinycolor2-1.6.0" @@ -13048,7 +13661,7 @@ in dependencies = [ sources."cliui-8.0.1" sources."wrap-ansi-7.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; }) @@ -13065,53 +13678,19 @@ in sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" + sources."typedi-0.10.0" (sources."typeorm-0.3.12" // { dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.12" - (sources."@azure/identity-1.5.2" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@azure/msal-common-4.5.1" - (sources."@azure/msal-node-1.0.0-beta.6" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" - sources."bl-2.2.1" - sources."bson-1.1.6" - sources."buffer-6.0.3" sources."cliui-8.0.1" sources."dotenv-16.0.3" sources."glob-8.1.0" sources."js-yaml-4.1.0" - sources."jsbi-3.2.5" - (sources."jsonwebtoken-8.5.1" // { - dependencies = [ - sources."jws-3.2.2" - ]; - }) - sources."jwa-2.0.0" - sources."jws-4.0.0" sources."minimatch-5.1.6" - sources."mkdirp-2.1.3" - sources."mongodb-3.7.3" - sources."mssql-7.3.5" - sources."node-abort-controller-2.0.0" - sources."readable-stream-3.6.0" - sources."semver-5.7.1" - sources."sprintf-js-1.1.2" - (sources."tedious-11.8.0" // { - dependencies = [ - sources."bl-5.1.0" - ]; - }) + sources."mkdirp-2.1.5" sources."uuid-9.0.0" sources."wrap-ansi-7.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; }) @@ -13121,7 +13700,7 @@ in sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.12.1" + sources."underscore-1.13.6" sources."unescape-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -13144,10 +13723,11 @@ in sources."iconv-lite-0.4.24" sources."ip-1.1.8" sources."ms-2.0.0" + sources."pump-3.0.0" sources."statuses-1.5.0" ]; }) - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.3" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -13191,6 +13771,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."widest-line-3.1.0" @@ -13201,12 +13782,12 @@ in }) (sources."winston-3.8.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."wmf-1.0.2" @@ -13215,10 +13796,13 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."xlsx-0.17.5" + sources."xml-1.0.1" + sources."xml-crypto-3.0.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xpath-0.0.32" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" (sources."xss-1.0.14" // { From 3195969509c0569a6371a345738454e7c9191540 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 6 Mar 2023 10:15:28 +0100 Subject: [PATCH 162/203] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 1030 ++++++++--------- 1 file changed, 515 insertions(+), 515 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 92813ed4637e..436a6781e831 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-02-13"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "3f6fd348df53b9d15aa0a58709562cf0a3b4636a"; - sha256 = "1dyxlam666wvydhmpxvyli3j7immifmw8yb1fyxhdrllivnrkd00"; + rev = "1ebbec2053a5d79bfbffc5291396fdbeea41329b"; + sha256 = "0finyr9xzy69pdgniwzhv08mkasg4kpay6g0viw0vskv4a5a58ki"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-02-21"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "0f9606ee3e7c0e2d3437b88b6aad77ed82609e97"; - sha256 = "0kks1rlblniwimzxdjjqypz4s7l6c6lv0bxhsgkyhl2vw978n2xx"; + rev = "44badee0f1aa5ec72b570634d18985fd70c68983"; + sha256 = "1if1aqby7l1k9947a8vyhm95dz7yvbwh9sqjmhy0x7rphngr60ll"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-02-15"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a4798a9fb5fd3ac8e132065597b397cab347d3ca"; - sha256 = "0al1dri6yv3n7a0xdf5lln6dvq4h5zqlxmyc1lgii260kk7zirgq"; + rev = "809c05360a0dabfc018093a090045d292d362ef4"; + sha256 = "0snw06vb1vi34j99r4ivil4byqd40hv35f0qcfsrzga25s8gi055"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,12 +353,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-02-19"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "6333a123c8681415ae141edc0943d0f7b377e619"; - sha256 = "0f2nbcjcsi993c5lf8mvm5ma80clm793iqhwdq4amjmxxqsdipxp"; + rev = "4c07aa025f5ec3c35159942fd4f913499cbed3cc"; + sha256 = "0grpcsdswa2ig2v3dw225qw67hz7cpvd7fhszbnnvqwfmnmzqyz9"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-02-07"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; - sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; + rev = "0de94d11f9286ecd176aa8a7299aabb8646d16c9"; + sha256 = "0lfq8vsh46sdjf310fn6zvc6hpbr2z12cac6shrvvjdwn4wpbfz0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-02-19"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "faadebfd77f176bd8acfab8bc9decac4abba26b0"; - sha256 = "0jzbapmrca4pqxl5nwra4wm29hgfcq5v0zng2a5hivbbjqrk7zzs"; + rev = "5b788392ec571621891e1b73887af5ac12056610"; + sha256 = "1m2jlhxwqpgl7v8q60pjwcim9brzaaywb6ax44ddbnyj31b86cby"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2023-01-05"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "bc77f9f7565928169fe35d64123736b7d918f30c"; - sha256 = "0bn4712rwyr0fwwb8fx1cpxpz7x6fppfh24l20xpgaphdg0j78ih"; + rev = "436d3d9d490367c9f47c6ef427daca1c0942ea22"; + sha256 = "1fm02v0npvl6cfddq5yy55rw3a0h76x76vvcglgcw8w9xcq9aviv"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-02-13"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c3f9bccb8c04b01d5d0712b8691658af0b0ddb16"; - sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; + rev = "c8e914604963063b7bb827e9b6f5a6ca741dad60"; + sha256 = "1qsj1gpgg946q49awy700a5z2kdn4dhlnswqjx6qi7jdv8ly8slv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,24 +583,24 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; - sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; + rev = "4b0ba68022d8612b04b26844f1ce5e708c0d23b0"; + sha256 = "06vswjzazbnybj2a6prsd9ckgk36fwj0059vhk55qjxsalrh0zfv"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2023-01-07"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2"; - sha256 = "1rj1c4jljz83w1509y39lagmr86xngivzsjzngrdivnw3swbc59y"; + rev = "44d2886a9ec38abac61b4c73c2e57fb752232cfe"; + sha256 = "1kd6l0vy1mnpmchjjrmfmfizia5vs8rsnin9cdwb8awa4hlsf37h"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -691,12 +691,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2023-01-18"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "bd240b2a2ac5c975216744fda57abe5ff8f39957"; - sha256 = "0mwrn4kxqn96n1jyr3sk1y39g8smgpa9kcdip3928p5vzsa8lbir"; + rev = "80750a80e7999318f14d754bb68b64de7af93bc3"; + sha256 = "1z3mg13q862lcypb9cj0im2kwng4m79g76mzph5pvdi2yhj3y0n5"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -787,12 +787,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-16"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "08b362ba12af1053871b192614b627bcb3c5299d"; - sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; + rev = "8fb04cef34aff609fb84ab6dd753dc2d6babfad8"; + sha256 = "1bx5gxlsiav8ix8npc5vwm1lnhhvxvbri8qf2jwl0xc6f3p5dgx1"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -847,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-02-16"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; - sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; + rev = "b2956f1a3cb8a8e1b6cd4d3f678cc40abdb5ec92"; + sha256 = "1b57ryzcl9ff4nky8zq3lzg9g96pl3ig3c4kmiz8dg0zjgsn0x4p"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-20"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "55eb481d2554c7e612e52b68aa23be2090dc58cf"; - sha256 = "1fff73c663z6pcvkic9ngr9hs9vn6fpxw72x2ivwwiz7d983i93q"; + rev = "23348f3979912fb36a1442fb0d07e8d2e739aea2"; + sha256 = "0lwpx013yxq28s0k5k0sbbyb8nxmjr8nl6xsy2zjillb3rkkaf7v"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -919,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-02-12"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; - sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; + rev = "426d29708064d5b1bfbb040424651c92af1f3f64"; + sha256 = "12vpiznrnj1kw47bp8q3d6pgnb1j84mqvp1svarmqzbsg621gd0r"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1015,24 +1015,24 @@ final: prev: bufferize-vim = buildVimPluginFrom2Nix { pname = "bufferize.vim"; - version = "2022-06-25"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "bufferize.vim"; - rev = "013857c12340bc14e285727eaf7d0bfb9807c768"; - sha256 = "1f4681p7zxchzi628n633j54y6mw13ayjcw0sf6yy2iywrrppdfy"; + rev = "ec7c4445a97f19e5784a6fb6ad3c3d4a8ff505ac"; + sha256 = "1jnk54w1px4dklyjhkng684vd659j0p4vkd1qh8rxaqy7i8a9314"; }; meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-02-20"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "cbb798dd2db7841550cd2c6c6dde12dfda055928"; - sha256 = "0wy8cdrsirk94il9qyv1c29mcysr41mjrr8f595pkb5zyd45lb34"; + rev = "3677aceb9a72630b0613e56516c8f7151b86f95c"; + sha256 = "10dkqgyidvzj710yj65ygzd34n0ixcih61r2zmyp0y9njjsa5qdn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-02-08"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; - sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; + rev = "66e6d0955efb6beb68912dce3ff484e8805d975c"; + sha256 = "0ij73gqpsbs663sqjy0nl04s9hgsn4700bqfg7hsk6534q72mxi3"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1087,12 +1087,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-01-22"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; - sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; + rev = "e66fd3a18eff0c9c4c772a5e5fd9ad68753c6d8e"; + sha256 = "0205xra3ag9x6l173y5gfxjkmhzgp02slfarx5930j50k0mmn5is"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1315,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-02-17"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; - sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; + rev = "6f3f7cd71ddae4f8526b433213a81105422d6317"; + sha256 = "0ab316nm2l8w1lhqlwadhbxx8f7kd4d62x54qzavamg53p5833q9"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1387,12 +1387,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-02-14"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "191ec4788656c3d1ad59c9edc3d96e132f93e039"; - sha256 = "0ln32vw0kqjfc8m4qn963f656hivg3v275dj0xqis25pcdwqpidg"; + rev = "a798a25b21e7204597f56029af2e8a17d65e2518"; + sha256 = "07n5a8lz1n2i2rc5ff5r8r4mwf5k30jw5xys4sla730xlfxarvm4"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1555,12 +1555,12 @@ final: prev: cmp-pandoc-nvim = buildVimPluginFrom2Nix { pname = "cmp-pandoc.nvim"; - version = "2022-05-03"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "aspeddro"; repo = "cmp-pandoc.nvim"; - rev = "cb2980263e14fb3c1b776edbd2c7a312b67c65ae"; - sha256 = "0d439njzdnm1qhnig2qr9ywq3q72vpb6wqxwil9czhqzn80swrj9"; + rev = "30faa4456a7643c4cb02d8fa18438fd484ed7602"; + sha256 = "0fl903hcy85f21xmgf1dx31lxjwgplkcg4m8i989yhqr6irwwi6f"; }; meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; @@ -1615,12 +1615,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2023-02-19"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "1b1c0235c54e3fc9e77504ed8d36028f64e6f48d"; - sha256 = "12ivpbxpqvxb6c2p0snpr65d45ppx57l8aylnb3l39ciabknjhdm"; + rev = "a6cb553143573861d2d98da86ceb3074c87fc536"; + sha256 = "1w2g2zdhdw15mmy3pigx059kvfhr192w92yxpfqnsqf80dhvf56s"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-20"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "bf9bde0a86022c494c995778a5bf7210f2420601"; - sha256 = "0fyyq22f33q949v5cabjynbj311279cxfm4wb3mi6v1agzpxh8lb"; + rev = "995a70cde230fd5ae0b670ff75b8b00b45312126"; + sha256 = "1yfrbrwl1iq3h25xlgcnxwnz31d0bxcpcxjw76fjfhxwa2l7iy5g"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1831,12 +1831,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2023-01-23"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; - sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; + rev = "83b9859aaf8066d95892e01eb9c01571a4b325dd"; + sha256 = "11nab2bvna9q8h87ikjj44mzc4irf80xa2hh3r2lmq65z6p1kpdw"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -2047,12 +2047,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-01-07"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "d2e69a13b32e8574decfe81ea275292234eba6ea"; - sha256 = "0b1f0dx5xknm83b0ydq8ndf4207a5nqzvsbjzh4rngwxpc5kf5nc"; + rev = "82cdd72049fc729854d69747be2673bc8ba8d97f"; + sha256 = "0qpc4fqjyq9kyb1rvwgp192v34fzmv5nacdsvc0pycyanbmh04hf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2083,24 +2083,24 @@ final: prev: copilot-cmp = buildVimPluginFrom2Nix { pname = "copilot-cmp"; - version = "2023-01-07"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760"; - sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3"; + rev = "92535dfd9c430b49ca7d9a7da336c5db65826b65"; + sha256 = "14kacnvskly4p7r5k0zkx8lcxqcc7g29zw16xsyr3mj7xp3lpvq6"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-02-17"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5304ea7079f38df200f4357401f1510fd00560a8"; - sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; + rev = "b41d4c9c7d4f5e0272bcf94061b88e244904c56f"; + sha256 = "1r2mllgpdsnk4c1jzfshyy9sqsw0vcjv0d4r3ja9abzk7jpq5x4z"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2119,24 +2119,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "eba0531cea9fe292059dbecf677d36a07f9c28b2"; - sha256 = "059p1rjjhk4i2fxi9zgd923j7ksj9cfx4f9smhnqdqgmkm57lnwd"; + rev = "3a32343a473cce5288a9732f90df67c533642427"; + sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "531faab60ba9418eb180a4a127a661bed98b46a2"; - sha256 = "0lkkyd9iz89lnalvf2i8yz9ssiwiavvnmavxzn0siw7p69x2fkr2"; + rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6"; + sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "272a39c8f483c0bf6137dd382363639aab83a23e"; - sha256 = "0yy9lyh9wx7wa4s6ishqg3g0lb0z3c6hhywghpvyd16kldf6lrd9"; + rev = "a25bbdd8fb1bf0259f255c73e1119c3a75727a93"; + sha256 = "11ddr1prx4k3vkg66h6fwwjdlr1l0zc69j73l80sgjy6v8n32dvm"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-02-10"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; - sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; + rev = "c33aae75745877ee1ef16f5781478f4f2f120623"; + sha256 = "1yd7msvgvbmvnnvv94izl33cnny36bmpnv4hkw757j7p88yxpan5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "0d5e201629a85617fb7efef61c3212fb4529f31a"; - sha256 = "1jylspgsfana9chd5ywx3ylk54fkgj5r2jhy5x7145k1zmwq49qv"; + rev = "d6362d5dc18caee23e580ce4b39cdca71d99a7f3"; + sha256 = "1mjlqs8pvccqrmq0wygnr7arydllyvzznj68bzki23wmbdpa256n"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2395,12 +2395,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-11-24"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "3926c67752a14acecc293dedd1cbf9d9bfb68541"; - sha256 = "1l3xfxg9hzhvq9wi401dpfx58ajxd39f628kjca6id0rhziz8wmc"; + rev = "28acc58a394b5faf718ad40243164e5f588f2df5"; + sha256 = "0p9fcvn1x5hng9z8ra3v7nyybdshsq53vw76gl554klwg91gn8ak"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2685,12 +2685,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-02-06"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; - sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; + rev = "ffeff288c47739a1fcb411343716b993bfaa48e5"; + sha256 = "0hbcsigr7i02krr4wnbw6ib2c202iz2vrnckck32a89si01m1l38"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2745,12 +2745,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-02-05"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; - sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; + rev = "5f44f829481640be0f96759c965ae22a3bcaf7ce"; + sha256 = "1z3mvrli3bn5jpx1n1mdp79q3w1iybfpaxzk7i1dwc7ixhzz1lgk"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2769,12 +2769,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-25"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; - sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; + rev = "bc581eccc5a5f7f2cebbe48df23080f2178f32bc"; + sha256 = "09p4p4a5mvy5n3an4rfb8hzm9bc76jgsjg5hmravl1faz176h8vp"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2855,24 +2855,24 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-25"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; - sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; + rev = "164a44fe8655ff66073189bf6b0a718bfaffa0c0"; + sha256 = "19n2sa0frq62qppfp0j82vqp83pf44sv5lzk2avrv0clc55ncggl"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2022-09-18"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "760d27a7674140c1c1a838b363c52fd705163045"; - sha256 = "19n0gaiilwp6idv6ahy0mkyv3jv73lsal8i71ks029zjw0dfifjm"; + rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3"; + sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -2987,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-02-18"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "dca3e56021cb5c39f401c9d83531743416c3365f"; - sha256 = "0hrkidscljbggsvkajvmqn1x79raa1bpjbwiqjgp3b1vckhyzz3h"; + rev = "8a5bde3dc52c58c40ddc9784149ba21489371021"; + sha256 = "1mnf46i1xydms08kzp52d58k9hk0f8qx0h83hnxvy1yv09q4q4cr"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-02-13"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "980e80e8fe44caaeb9de501c8e97a559b17db2f4"; - sha256 = "1aw5455gin4ki3sn2ml38acqi2w94mhbx37pkajfbb5bfagdpdb0"; + rev = "4c1739137acd3e7f03e2065a7be8a4dc41c7e461"; + sha256 = "0bvbdfs9gnncrsca5azb82cd7h3va1v6j6xa2sjn580maqmyyv4z"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3060,24 +3060,24 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-02-05"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; - sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; + rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa"; + sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-12-21"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "8a4c961330cc4688087f23d18fa7d2f1af9a4902"; - sha256 = "1s7ckv8xj8pjbl99niz3bb15ybhjvhqhs0vxj1a0vanfi8n4pjlb"; + rev = "ed949c13e1a942db29ababa35e8c7864ced90eb6"; + sha256 = "06cvpzfhbhsxvkwp05v776jj675g02w3zbc5n2gz0acy7rb37cqx"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-02-19"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; - sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; + rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1"; + sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-21"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "b15ef042f7006827e7413baad89a0e8541079c9e"; - sha256 = "0svjfw6nsczqpfqic1zvpnz3bn9iivzp81i5kkq7vqgks11ji0w9"; + rev = "d4c2e3f32da453afb55e1becbe4b92357576db9b"; + sha256 = "0hji2bm5d8yvz7m07bab7qb58is3n17z9xl8sfxhj19k20917bbz"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3240,12 +3240,12 @@ final: prev: gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags.vim"; - version = "2022-07-05"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "1a503e591ce2a4f891dab006a6f9c6008783fc7c"; - sha256 = "1i65f9svr17c252bv5np8fzar6ybxvy2k0cb8k84vajyv9sx060a"; + rev = "6542d8e3036aae43f2a821f48b291d6c31990654"; + sha256 = "04vmnvncddm8xaqzc4qhlhv2d9js59ja550921227cn8dzipadan"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; @@ -3300,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-02-07"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; - sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; + rev = "1ad47c6454a5a53d3f4ffdd4022e84f4a6e376cb"; + sha256 = "07119ndsavmhi3km0jkdfk3xw6rhainxdp8vhgqrg54286aqj1d3"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-16"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f388995990aba04cfdc7c3ab870c33e280601109"; - sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; + rev = "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be"; + sha256 = "07r6qplvm4svc0cj4khsa83bc66dkrv93jbb1vg9l0v9h5ds8b9p"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3408,24 +3408,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-02-10"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; - sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; + rev = "5a8ccfb1876b1b2e29ea32c63221be6df45870d1"; + sha256 = "0zgjwp7ijbgbg6m5m1nqkyxsvswkppp61ars4vrhlyd8zf2pd1bw"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "7a6c02dd199f62e4c87c4e9641b0963c6b0ad81f"; - sha256 = "1jzl73fxpa370jxh9i134jpgnm9badim3i581h5n5id8qgfnibng"; + rev = "0225f85e0a3246c6daf1ecbbbf9009d754879643"; + sha256 = "0pdy3856p9apll1jlm0z7knkjkx61c03pbi0997zsgaskxr3h6qr"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3468,24 +3468,24 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-12-31"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "54a5e18f6a42b39021b7aef62aae4dda8680d666"; - sha256 = "1bbrjmywbdggl4l7mzg7fahp86qwr0gi4nw2b8arpj2cr8r9hy9f"; + rev = "390a8bf9f83cc0e31a5154357bc4bfad8e79b889"; + sha256 = "0yv32yd78gs7cqgwcsiwm8zyc2fabfbfakfljdfihcfaa3y2lzap"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; goyo-vim = buildVimPluginFrom2Nix { pname = "goyo.vim"; - version = "2022-09-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "7f5d35a65510083ea5c2d0941797244b9963d4a9"; - sha256 = "1gb34x4djv34z3s1v6c1kcngwzfyx9vslhjx5vm73lbxyxs2nkjl"; + rev = "fa0263d456dd43f5926484d1c4c7022dfcb21ba9"; + sha256 = "1xiqviqbwhiaclax0zlazsahda5f54waqmd9zgjwxwklivj7cqxv"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -3540,24 +3540,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-22"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; - sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; + rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65"; + sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-02-11"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; - sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; + rev = "3e31f9ab01fed42ebac75738c681daacb8c82bff"; + sha256 = "0klqcd3cdyzvbbl26yz482a3sj2qyfb9f2xkf91hnzb2dx2cazhz"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3611,24 +3611,24 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2023-01-23"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; - sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; + rev = "f7040fd0c44e7a4010369136547de5604b9c22a1"; + sha256 = "1l6szs047f0hhpxwifr0gwpf70bx1ypl2p0w1hny7vfxh6yhybbk"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; - haskell-tools-nvim = buildVimPluginFrom2Nix { + haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "f95c5b019777768c0498bef05e1ee095f7d9398f"; - sha256 = "0pz4xma58zwzi1705lmv7q6ijjqcrgydip47cbp6h7si1sl42kl4"; + rev = "29a1619e56a0ff024587e0c482d1a691576343d3"; + sha256 = "1zd50s1h44lhp6apy6nvddl0l0mapl4m96gjasgyg2bsrsyczz6l"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4091,12 +4091,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-01-16"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "4c8d48726621a7f3998c7ed35b2c2535abc22def"; - sha256 = "0fq022r5wyvhrrmr6calw7bcz31hf30smz412y0g8g3bxildql3i"; + rev = "193427320939d111845bd095b301d9d57e6f28f6"; + sha256 = "0wd6wkgbr9vfsji7g7b0zbsxykq1yiya8nsy9r8qkdxq1cn1isjg"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4175,24 +4175,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2023-02-20"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "d22d54c7558415faf6f518db1e00d995d595a99d"; - sha256 = "0v7j8bjd5naf5qbr362r82nqa4grwj2r9wk68s5dv9zg576ybm0p"; + rev = "92a7cc4e4122e38f5fd5ee68f34416b3cf9f477d"; + sha256 = "0pgh22lv711iafkivbpfbpdkb3fw8zfrqpz30glxcdamva178fx5"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "8077428e63feb0f3bf795d53b23ba1695b28ab0e"; - sha256 = "12bq0ppdm7frjgd336lvp3crw9ivsl5lj33f7fjvpqgsib7gy87r"; + rev = "e89acede13f46a5db229133cf0c87aee74938c56"; + sha256 = "0ynhwx4q73fqzlkkyfahlxd4rd231w1bymmjj621k3dpkcw1gw7k"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4247,12 +4247,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; - sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; + rev = "d34680b16af977928228e57c68e5a162f1649e3c"; + sha256 = "1ykqzjakhpyr8znxilg4w0xgadkq3p93d6mkp3n4my886i6d4881"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4523,12 +4523,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-23"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; - sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; + rev = "2bbe7541747fd339bdd8923fc45631a09bb4f1e5"; + sha256 = "0vmsgp0ld2y5r339q0pqm4qi1vlhbbp6c4mbgbip2li3mb6b1w3w"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4559,12 +4559,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2023-02-06"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; - sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; + rev = "1423a6114f5540681a694330c22c36b0ca21f1d4"; + sha256 = "1rwrhn32izidzzhs0vjanqr5id5b9jszk03xzxxmkmk4f34lhchb"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4595,12 +4595,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-02-19"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "674a60c7d4f2a90c75d66fe98603d7ca708939dc"; - sha256 = "1iha7i85bsamnb7gqnnhh784xycfwfg8vbyc93d42wpsksm7yjzr"; + rev = "79d2091809a295aba94f9ea72cd622bca198d046"; + sha256 = "0vq1n4c2qk84vr4axzkqy2svc3z2kanvqd7apdiqb0zh59qc8bw6"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4702,12 +4702,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "92276ba735056dab04b0508e421a6a5d729e3f81"; - sha256 = "1vfkra9xygdm6ffdlkdca636i97hazhv1l66zpn3lwlliyqi1pzv"; + rev = "9b5be5e9b460fad7134991d3fd0434466959db08"; + sha256 = "197yzj8i7bqbnikhq89cza9wj1hbhd4yhyj77b5iwv26p252jnbq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,24 +4763,24 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2023-01-07"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1"; - sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm"; + rev = "76aca5069c5ce5c0099e30168649e6393e494f26"; + sha256 = "1m20a1sl9dhsdh981vf3gzi0fx9lacr147kh24v5p54ami9ch0l7"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-02-14"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "93e58e100f37ef4fb0f897deeed20599dae9d128"; - sha256 = "1d6ym8g3fix2m6412485kbm43mb61wdb3ggm3q6ddqxxvh06n41c"; + rev = "e4badf7984f7a5f0ac7dc10657dbedbd99a82f94"; + sha256 = "0s7jrvbd75zfhf07jf3gihv2j6rrvwfbvdwd07k14hzhm46xw914"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4799,12 +4799,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "b8a6632a0f2d263199d5d480ca85477fe0f414ab"; - sha256 = "0622x0k1xi5z6jdz2bpqvym34ysk38axfyjq45m6hhl6qcy0ysxg"; + rev = "8dbd5ca28c70f15814d1749717f86da9bfd1c8ba"; + sha256 = "0v8irgx18spljayrv1pdpnmnl4c9qsl74fny9b6kf9lrp2xbmfwk"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2023-01-13"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "c5f6a24d526a8ddcd651c5d1291de89a51f923fa"; - sha256 = "1lwrxaaa11q9fwmiagy4zgx0chc69fdapqq5kw2nqc7f4wrqc6mm"; + rev = "bd945ff7374dedebd0868f262aa8452d5f0f1910"; + sha256 = "1pqsnnqb7byia9figdjnkqrn0ppria39d039xx772n2nsyz9n070"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4871,12 +4871,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-02-14"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "369f16f29559cb15931d3d5acfcf253969f74066"; - sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p"; + rev = "c65901227e5a3671dbcb054745566a1c78f9f0c8"; + sha256 = "1100nsfnryg2xdjza1ar01s080jahafwwcpzn01fgkkr32kvvkrj"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4919,12 +4919,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-08-13"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "6d7208e3bcf53862d52e82c3a3db61116ce61f4c"; - sha256 = "1n5axz0xv3wdvy0ic60897cdb16pn1bgsvyl0qcpq5xnlbbw53d4"; + rev = "fe7862463624e5fb186551ede702605d8d9322e3"; + sha256 = "1ch9glxa82z71yyb3n54hbmrkbwxwn0kcpjkjfdmb3mgp2bjgfnc"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -5207,12 +5207,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-02-12"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "245cf1e68840defcc75a16297740f6203f5a045d"; - sha256 = "1w933phd5p0jdgmcdxcsv6ddhs7zx11amp5ziixzfh91a845shmf"; + rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4"; + sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "ca85eea7841f043671ebd6c784771f08b9d34231"; - sha256 = "0pf44ydg6m70haban92fl7yvl3755jqw6h1icaglci8p198gsvln"; + rev = "c2604560ea764ad5f72e52f38c52ef7fc2d1be98"; + sha256 = "1azfgk373wy883lmfwv7kp4y213nx9kcxn76v274mb5dl2bi4k4n"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5255,48 +5255,48 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-02-13"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac"; - sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i"; + rev = "c6b8ff8f0d261c8fb99a55ec7cc5dcf9cb928293"; + sha256 = "1zsj7rbvv0sjz5sbhwp7zzbap490vgivispbqnvgafxyk0v78xni"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "16bd62efc3fcdcd0f6682ea47f1f6070850f9963"; - sha256 = "1d5bqxfdg01hnx239v7bi301325ihvdypy0p4b1ay5py5jckld9h"; + rev = "891fad5829f91cbc3d0866f7abd028d233b8763e"; + sha256 = "0288iqk9rymsql0qnr9093qpadcwiqbd88grq25vkygs33czbif6"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-01-16"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06"; - sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3"; + rev = "93d997dbddfe084e77ba4541c54a7b8bfd754fb1"; + sha256 = "1yqmpgjrlqkqvmmk0ib8bwkcn8z78sm21yl6xlbq4pa219zwdm1z"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-02-20"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "bde758e658c1cdc794293afbde698b5aaa93c5de"; - sha256 = "093gg1k7z0afhg8m2zvpkbf6aqb2ggjz50lrrf3wq0j25qsj1f4i"; + rev = "85380916cec322b1351785cac4f4e3f24de36b2a"; + sha256 = "0pyykjbwih2zswigqrganm9aaw6brdpxacy8vyr2p9xkv2nsli1k"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5351,12 +5351,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-17"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; - sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; + rev = "764dec5de14947f2f5d08bd3e0452324538e9a4d"; + sha256 = "0qii2n70xlh5s8icnpgb1yn86w262p6smk0a2qyqrgy2m64ayjin"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5411,24 +5411,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-02-17"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; - sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; + rev = "95f95e346090ad96c657f021ad4d47f93c915598"; + sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; - sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; + rev = "2cbceaf57884b2548bb5516acea342944c983216"; + sha256 = "03wfi20l278yx0v95a5hwj91zcriqzjdl3hdl34hjkw6glj3sr3h"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5555,12 +5555,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-02-17"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; - sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; + rev = "3f647a560306306cb35854d639b39717f5390175"; + sha256 = "0vlq852jr1mjaf2x1npi27jh3i6bl8npvpfkcrgjcigd8hwcr206"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5591,12 +5591,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "cbe9ee8184e46311efbce79d9806f3ee803a2521"; - sha256 = "16jv396s6mpk6w9fhrkh1wgc484647x1vs05y05j6smgi5h1hrlg"; + rev = "7be82f345f82f304ae817e3910d001aa96be01b1"; + sha256 = "1skrfbn196q1vhbvkh2z57ix32lfyhycbgkzpaf80f59jkcclwrq"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5627,24 +5627,24 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "c97c44bc86522ceead8c9c9b775b2e1215549158"; - sha256 = "03zyfnzqj20yv9cy6pvh8r5j5v0mgcay7jv4lmgi3gsp0z4qa8ia"; + rev = "1e46896d9096a878355cc5163624f4ae9217c5d6"; + sha256 = "06lkkpp2ax5llxzwyrz79y3jnm27d0nhb1id54fn4dhh1w79yx31"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-02-07"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; - sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; + rev = "c22651651da01239fc4afac4cdb7261797d5f02e"; + sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5699,36 +5699,36 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-02-01"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "d147222a1300901656f3ebd5b95f91732785a329"; - sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; + rev = "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be"; + sha256 = "0gwbfrwki6mm6w5lvzh7g154m1g4c2kajbbhb0i37492kwc4syn4"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-02-20"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "689cdd78f70af20a37b5309ebc287ac645ae4f76"; - sha256 = "1fja54wrmqafqww1ifkpmidwq52r246sana9j57dm92j3l39fv5q"; + rev = "456cd2754c56c991c5e4df60a807d054c1bc7148"; + sha256 = "03nhv5iby38x6whs3ialqsi16482w96mz5dhkq5qki3mkcaqin8z"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2022-10-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1"; - sha256 = "1g8nnrxyfgn3v9k4xi7dh1b29vnp73k5x7vz002q7xar4alj468z"; + rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; + sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -5771,24 +5771,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-02-17"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; - sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; + rev = "ab49517cfd1765b3f3de52c1f0fda6190b44e27b"; + sha256 = "059whyg91hi7abr14fg60pfpnm87cl1iqz31hfl5wiiwrfaa1fsf"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-02-16"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; - sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; + rev = "0cab02bac9ca02a70db9e1d07e25fdb630b18a21"; + sha256 = "1id7k4kknckivgxjxp90b5hkxyyfrfka4kvyiid6aa2lz1nmcbpb"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5819,12 +5819,12 @@ final: prev: nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2023-02-17"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; - sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; + rev = "9f1ed6ef6594df9a74762a86f469d12036584976"; + sha256 = "0fcvhxsr6nfi1sg5cy46dyy20rzc7g25y7ha0bhl2cprvz3frph1"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5843,12 +5843,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8202df9561b90102b41dbc1ad71945534ef4ea39"; - sha256 = "15mpzg05x36vnbq9gs5q71fw9hin8b635r5lf42v6crdqw8wghmf"; + rev = "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a"; + sha256 = "0rx3k5wj5fx6s6chg0cpj85cdii9kmqn0yknsvl82gnv4nc480dc"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2022-10-29"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193"; - sha256 = "0zqwdj7qk8sldz99c3f5m2xmvl2kj7n18f9jr9q17nb70rz490xn"; + rev = "dde3084106a70b9a79d48f426f6d6fec6fd203f7"; + sha256 = "1nk72p1lqs5gl5lr8fp1nd6qpif90xlp38pc7znaflgyp9lm0a45"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -5951,12 +5951,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; - sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; + rev = "c1bfcd89ef440a44d02ade7e71befb1e5aa358ca"; + sha256 = "151xls5s4zg3w0sia0wbypaqxfwyw4zmzifjvs9z9g53anb7zffv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5987,12 +5987,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-02-18"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; - sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; + rev = "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd"; + sha256 = "1l45dcmirnyryy5qkf007bzmb35nvyhqn56myfz47h835w0qhn44"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6083,12 +6083,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-02-14"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "dbd396e7729ad35c9c238f9e20fe3c701d63bb3d"; - sha256 = "07l52iv763rjzwkwl9avd8p7kb8wf0ir6nvayi0pl38dfphb2qhm"; + rev = "ab18169ccf4251d455edca3f6448a559c6322b10"; + sha256 = "0d4nslrj1yyddkqd09m0y6wanhlnismbzz2i876bg2v9pi8d1prg"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6119,24 +6119,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-09"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; - sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; + rev = "db08bfb87300fca2db91d15b64ca88a62970fb58"; + sha256 = "0rybpdkcja0kadf9arwx6r33nj7mzmadq660w7jcni3niy7545sw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2023-02-19"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "4c4082cf94ccd32f5780859c875f91ddef763694"; - sha256 = "0clqgq8whvcnpxlqhyw721kyljhsyvmx8mqfq8qaxys8b6cf8fwy"; + rev = "11b1d0368e5b23b9c356da8e5f70bb5827f27f62"; + sha256 = "1sv9p5kn0v7m2r8zq6j43hvg2bavai3qhymxh7mc4bw9jfa621md"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6179,12 +6179,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; - sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; + rev = "cadebae41e11610ba22a7c95dcf5ebc0f8af8f13"; + sha256 = "0v3ywf8cbv52h02dc04q5d59zxj3ag87rcgjxnzb7zz89kbb1dbg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6203,12 +6203,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b5db147e28337319331d516a826b00976f3584de"; - sha256 = "14hjgk0g81mn26xwd3hspzi2jqiy1viiyc6pz3zqnmn66g958bfl"; + rev = "1a2d5f5224c65b0709bf5da0ccd9cad29272083a"; + sha256 = "1qhq71zbyz9idmm56wxq64k1i46dmn4n2cpjxmpawlab7m2wvi3c"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6251,12 +6251,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-27"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; - sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; + rev = "0da75dcb1fdea2e7f3ae6c7b1f1036243fbd66a9"; + sha256 = "1javf9in4vjf8jb8vjyi7hq2rz3yn1alsr1vr335k6byx7d7zxdx"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6275,12 +6275,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-02-04"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6"; - sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m"; + rev = "cdd24539bcf114a499827e9b32869fe74836efe7"; + sha256 = "1iwpfls99mibmp8s2zw21hngvhqhnj6v03ddrv17qd2pwgdaarm4"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6311,12 +6311,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2023-01-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "bdd647f61a05c9b8a57c83b78341a0690e9c29d7"; - sha256 = "0fnn4jarxmp43jyk4j13wpk9zd7r7pjjmgqbr8brzfd3f9xabx6c"; + rev = "281e4d793c550c866bea3fb85d39de1f0188fb50"; + sha256 = "0zdjhbyi2hg4cincnykp2xdhqzcg9213vyim5lrwqaj0wwvlakyw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -6335,24 +6335,24 @@ final: prev: nvim-osc52 = buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; - sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + rev = "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31"; + sha256 = "0x6fxayhyabag688r142bj10lilyg13ba65d0rbk9jcx1y4702j9"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2022-11-16"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "2e48f2e1ebc198f3624645f13f5ce64d20708272"; - sha256 = "0gim4d50k7y0w0gp108lkkn2300jhgk5jspqv17y2gagv28brr1q"; + rev = "82251c54cd60f8504dfd9acd853eae57fe832447"; + sha256 = "0zix075fb342a1j162xxiqajs0ayaxa7l3zbya3jkvp1d497s1m3"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; @@ -6419,24 +6419,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-02-17"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; - sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; + rev = "b71b64afe9fedbfdd25a8abec897ff4af3bd553a"; + sha256 = "0qbfjzmwfl70fahsi6g0vcdx03znfmzwp6wxqry6h141f62xv6vb"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-02-17"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; - sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; + rev = "8680311f6de05d45b010883db7cc1912b7f0d0e4"; + sha256 = "0svkczs2xiy72vbcnsbkd4jbivq1raspmy89mb6q3zz6b1r0p5rv"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6467,24 +6467,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c"; - sha256 = "1qdz4ark1xjwc3xkcc3dm9cxinnfhd8mi0kawb8qjy87gw73i9mz"; + rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c"; + sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-22"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ba35d094c1dfffa652e9c20971c51bd5271c1d25"; - sha256 = "0kvp7wd14q4z7a4y7yscbl3ksbjqzwm10f79jfwigfxgd7f0h5r3"; + rev = "980f0816cc28c20e45715687a0a21b5b39af59eb"; + sha256 = "1w1n2z4qbp72nwg6nvsch1c4pzfsx19r8z11yqpqq19k4vky36vc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6527,12 +6527,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-02-18"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2f3583001e2bf793480f38cf0d055571787b0259"; - sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; + rev = "4b30081d2736e09f90c890a8a7adfe4df36f5b36"; + sha256 = "1w6wv5mpw05hmx0p4y3r3nir81wwrp6alj23gjwrqpzcjhdvh4z9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6551,59 +6551,59 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2023-01-16"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "a0f89563ba36b3bacd62cf967b46beb4c2c29e52"; - sha256 = "0z91g5yn4i24myiv1dw0w28nd5j5vkgfp2jrn8wfkrrkmdmj6yqw"; + rev = "729d83ecb990dc2b30272833c213cc6d49ed5214"; + sha256 = "1ddfnz7cscnfl7g0i7kv5x15pnbd87v2qm1lgzxap1x63vm1m7vh"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-02-13"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "496ff7ea19cdd4e4b7cf2aeeb6780d015f3f9fa5"; - sha256 = "0li2mcxppk37dqxpln6py056i7mzwf541f7mcd037h1zy14075bs"; + rev = "81f9a2e752edc793a34355be952dd1ebb1d5701b"; + sha256 = "1zc8p31dmlwsqrz8p9r6xnhq9zwgvq82crgr339w0ndn3m0wy508"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-20"; + version = "2023-03-03"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "99768947820b969bcd99c4252c6166a984f99be4"; - sha256 = "0swhhj6algx9j9020rcwbra8qw0nxk5c2pan0vjv4g18byya7i2y"; + rev = "293e12e90f0928845582b9a3db7258eaa8e92a65"; + sha256 = "069nyc2bxi5wyvbnyqmdif2vqk7fv0kfgz3b7r7xgjf6s4kgw9yl"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-ufo = buildVimPluginFrom2Nix { pname = "nvim-ufo"; - version = "2023-02-03"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "b70c9ef0f8e2673a11387a39185ff249e00df19f"; - sha256 = "1fx3w2mlc23m55whvvrs1g648yg862i50100wfxxljmfkvnc12yv"; + rev = "9e829d5cfa3de6a2ff561d86399772b0339ae49d"; + sha256 = "1fwarqkjsmpwaj63ijb27g4glc235f3fjiw3mjapvcxajpl05lfy"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-02-19"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "4709a504d2cd2680fb511675e64ef2790d491d36"; - sha256 = "0b3h95x2xhrhwspfazibpknxrli70vjahbf52h74yda4ji0n2x4a"; + rev = "b2060eac2fbc84e0637ea706378ff66451e7c424"; + sha256 = "1x31lcf20cq8bb2cwdvx1cmsa18m315ni70qxrx99gncab6vwkz0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6682,24 +6682,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-02-13"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "f336322f865cfa310ae15435c6bec337687b6b20"; - sha256 = "1gyf9avw82fpdw8cvn611xzl0kq140b4ik7b4cc7mblmk6xmdqwp"; + rev = "ab5dbe20dc276348019676e5c3e97cb391e46b1b"; + sha256 = "0w463ylm4x09qxxwmi6rq98bdnra28p3izrqmcjrh87j44qrbhvh"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-02-12"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; - sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; + rev = "b36ba91b7a4d05ee43617383f68cf6ed6fc2f08e"; + sha256 = "1xnyv6wlvh87yzjhbmxirp8agc3w1p6hgiw1gayfv9x72jvp4c8m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6755,12 +6755,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; - sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; + rev = "435a38f7d84373584f3f3b283fe5b1d7c0fb8abf"; + sha256 = "167k6j4n01djxb39l9zq1d8xmbd7lxjz1272d112myp01ccycp3x"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6827,12 +6827,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "0dcf03dc2d9c96166d20b82875ce7eea484b5fdc"; - sha256 = "1qvwcfid1vs9a0k3xn2ki5iiwgv246qkdzsl2pndsrv04gk42j07"; + rev = "149e8dec961562c63091ad6910fec4ead61eaa7f"; + sha256 = "0y628knjcc4hbqaq5vblxjfmn7ihfai1zx0axwb8rqwq13kwbpz0"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -7068,12 +7068,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-10-29"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "685bc8e3890d2feb07ccf919522c97f7d33b94e4"; - sha256 = "0s734kpy3hslb7n6y94cv08clvxh5qp6br1ns3178y99ysv36vkx"; + rev = "1c2e9c93c7c85126c2197f5e770054f53b1926fb"; + sha256 = "1q3lqngb54gnnbzvqy02lxdrzbmk9lyd2rl4q8caj3xx0wfbxlpb"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -7333,12 +7333,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-02-15"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "cd0311d65cb3b8f8737b52f3294eb77d2fcec826"; - sha256 = "08n5ri9d9zm8r7mss6wxfjpyzsdvgrb18795ngvgyg34c10i0pcg"; + rev = "5edff6189cb0f4fae77ee751de5109a8f87cb9c7"; + sha256 = "03wn00adx79p86yk204zqrrxz6gpwkdm7ghscw77y1fxjkmaik0v"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7573,12 +7573,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2023-01-17"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "e683ed0fc57eda718c6b28dce0ff5190089d13d3"; - sha256 = "09d34043bn9n89f2gg5y9whiza0rh6rf63qspl0r9bgiygl534b1"; + rev = "eb7f35f6a652f60d3b4f262d64d4846adbd4d104"; + sha256 = "0n3n80sq9kxamih47q1z6lsbh7adic612cklikva379kqygmvdlj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -7622,12 +7622,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-02-13"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c"; - sha256 = "16wsgb62xcps24xickrly8hqwdvdc5kiylq965xq0q5g74kiz9jh"; + rev = "52b521618511b3a874255c8a717ace7155fd5f21"; + sha256 = "1nhyrwwf05q9dvc8r4dwpcb8ira1rz2wicnq260splh9hv1wqly3"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7682,12 +7682,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-24"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; - sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; + rev = "296f7fa3432f7d9b55b27ad0023f8824701cfec4"; + sha256 = "01ba785c8bc8ya6nf2xa2xlc96ls2rpga4nxlspykj6lncjpmql1"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7802,12 +7802,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2023-02-19"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "cdc1eb05496c2ecdeea7c7bf7ab0b6ab5b421f24"; - sha256 = "0rm8ml6nxkl0sgwbhsp5xjjjn45dq2pdg8amaywp0vjdnjcq9pi5"; + rev = "26ca36c698eeb9d7257562b0102fd9735a8ba2ac"; + sha256 = "1j0j62j1y69n8kkiibx8canhb52v0q04kpdmwxvxsgy23slnl289"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -7851,12 +7851,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-12-27"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "e6a11a702483d26f767f937575d549ac73b2fea3"; - sha256 = "0f8674wisl5l7xwglk6zw956yd0s9ml20dwfvxmvslz0c1an8q0c"; + rev = "97a9e1e319eec2d7e9731be4c6ac9638a1a2d79d"; + sha256 = "1fzrp7jdlgw5f27m3jwvsq0knaf5zlhh5b72if493xaajibil0bx"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7995,12 +7995,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-02-03"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; - sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; + rev = "a3fd7bf4d61fdbe00356a646744b2fe6f97524b6"; + sha256 = "03crzap4czx1am4jsxq6c58nf6f5kg9wrmvcf9l5cic2vj5gwh6a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -8153,12 +8153,12 @@ final: prev: targets-vim = buildVimPluginFrom2Nix { pname = "targets.vim"; - version = "2019-12-08"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; - sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; + rev = "642d3a4ce306264b05ea3219920b13ea80931767"; + sha256 = "0mwi2m75j8cxwa0nx53ivg53vc67v2ncq8gx86s8bvwyfl4249q7"; }; meta.homepage = "https://github.com/wellle/targets.vim/"; }; @@ -8237,12 +8237,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-02-19"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "6eb6bb45b7a9bed94a464a3e1dadfe870459628c"; - sha256 = "0b96wrjvy9mp9qpjhi4jb1mrzsfwww21lahjhgx8kk9y4ml503dg"; + rev = "61b3769065131129716974f7fb63f82ee409bd80"; + sha256 = "0qxnr7fkjbj9f4cvdqwnq8hxv50v0z5d8dzdjpfzr0x4f3ahcdvx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8322,17 +8322,17 @@ final: prev: telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { pname = "telescope-lsp-handlers.nvim"; - version = "2021-09-07"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "gbrlsnchs"; repo = "telescope-lsp-handlers.nvim"; - rev = "d6d5983b0131ee2c386ca9e349f6621e12d971cb"; - sha256 = "1x51mlj1c3cwmcjqssh89049q91423jxm3rv8s25pcw493zb2x6b"; + rev = "de02085d6af1633942549a238bc7a5524fa9b201"; + sha256 = "0z1pja96hzsjv30bnzps8pwgmmy5rc1rkramrqm0r6wlplg36302"; }; meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/"; }; - telescope-manix = buildVimPluginFrom2Nix { + telescope-manix = buildNeovimPluginFrom2Nix { pname = "telescope-manix"; version = "2023-02-03"; src = fetchFromGitHub { @@ -8452,14 +8452,14 @@ final: prev: meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; - telescope-nvim = buildVimPluginFrom2Nix { + telescope-nvim = buildNeovimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "a486ac3e8fb2198f3636da1927ed57a28836fbd8"; - sha256 = "1a2qdqxvp3d1i1wlc7gac1vqfbp0idcnk6y78vmjgziksamj4579"; + rev = "a3f17d3baf70df58b9d3544ea30abe52a7a832c2"; + sha256 = "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8695,24 +8695,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ecf9dacccbcf0d66d9aa9074fdbb5ed51575399a"; - sha256 = "12x47qf98lxwvc6hpw60vwax9aw7wnh21y9j2kxzndzjxi7v6lik"; + rev = "31d38d11390bcd35a568fcc65a79b7d6ec89de62"; + sha256 = "1g134rc5gwrdpi2w3ab1k07v4spl5frimc68mkw7jx14ipwxf7q8"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-02-09"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; - sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; + rev = "a310c1ddb3a7d8b940834238f79f7bfd494ba76a"; + sha256 = "0wz9n7jmhwz1c7fdqfbpr51qls4n464r1rrp05ygrw1f7kbcw12d"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8743,12 +8743,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-02-10"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; - sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; + rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59"; + sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8767,24 +8767,24 @@ final: prev: trim-nvim = buildVimPluginFrom2Nix { pname = "trim.nvim"; - version = "2022-10-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "909150606eab44979eb9595145796f5bcb067955"; - sha256 = "0fd7cknf1cwbn3hlsf94323m6k2g4a9kiil4dqmkazvllqn83pg7"; + rev = "f33e8856b8fa085bed9d7dd36a8ff2c34aaf0c36"; + sha256 = "14wr23kclfs1hvp5bpyd112q3b21m0vckywypbhi16v87781aks0"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-02-20"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "3b754285635a66a93aeb15fa71a23417d8997217"; - sha256 = "0bgm93g4yh5f84nf7h2w9gb3glaffk2dl2p5b0cp38x033lz1yk9"; + rev = "67337644e38144b444d026b0df2dc5fa0038930f"; + sha256 = "0v6s890dr5xq1d9zgs7rink7s5aqgx8ybvjwjzyy0f0qr6f2b5z5"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8863,12 +8863,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2023-02-17"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; - sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; + rev = "485f01efde4e22cb1ce547b9e8c9238f36566f21"; + sha256 = "13bpnacif1r40ncln14m013gnh6n9dnbvawnnna44splr6x39dan"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -8887,12 +8887,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; - sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; + rev = "5f4f9e3c6c745a222d6ab9e3b7dc1ef796a3e81f"; + sha256 = "14kh6bk6dh6ilj7n2rfjfipn6r1nl2g439w0kxqw05rgidzrnnq5"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -8911,12 +8911,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-30"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; - sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; + rev = "12d716b8e53ff8188af309a750d622edfa3eccb5"; + sha256 = "0g0i9v7plbbgz079aas5dgd39xyp7bkrlcjbvb5m1zx1f58vdrbb"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8983,12 +8983,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-02-15"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c28c3fd97b25776038f51b8062790395bc2dae21"; - sha256 = "1npfs6dy0k89wf848wsjx48mkaphswxwlmwhvddxkqfwmld26xgp"; + rev = "d0bceccaea6bd3fe017f4f609e7c91ff712196e3"; + sha256 = "06694178b5a4yqhc6wml0wkw1qfdpn6w29cgzg726j55lizf9mi5"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9067,12 +9067,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-02-20"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "c164cac033087d73b3a94650c02f6c092ee56115"; - sha256 = "0n3gj93ankh8nwiwsmydgg0v8vz4bxbymbh551kgj4aigpivip01"; + rev = "880a562ff9176773897930b5a26a496f68e5a985"; + sha256 = "0id4l89cbwkfkhxj90n8mc6vmqkgig5w21l3brvvfzc8hsrs15a6"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9163,12 +9163,12 @@ final: prev: vim-addon-local-vimrc = buildVimPluginFrom2Nix { pname = "vim-addon-local-vimrc"; - version = "2015-03-19"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; + rev = "28514f4aedba1fd824fad8ccbd65fb41bb8057f0"; + sha256 = "1xhdywcyyr86jvrpghn46avgc6qy220fnyjg6rg3pqvf20hz6ld1"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; @@ -10255,12 +10255,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2023-02-03"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a"; - sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18"; + rev = "c3411c95290063f56dfe13b485882111ef403c6e"; + sha256 = "0dip6vajky1hyc3xs8bjbwv5dycrv4lmyzicj6g7y8pgbddl283a"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -10435,24 +10435,24 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-01-14"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "06c73980682f61307e890fe652d1343be82e7ec7"; - sha256 = "0xwf9613h5lq8wsjh4y4k4pz80cpbnc8kddhsk77jfpnf305pi4c"; + rev = "ca44a13a379d9af75092bc2fe2efee8c5248e876"; + sha256 = "046gfn5hxhcd9fnbz4fi0l59cgngc73y1x2hvxvdyy698fx56wz0"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-01-29"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; - sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; + rev = "e180763212c10664d1405449dfcd5cd00e8bd4d7"; + sha256 = "0vi9vyv978rb9kmnbfhk6nwg1mardyd5yr73k4d460nsxsf15c5a"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10507,12 +10507,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-02-09"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; - sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; + rev = "caf1bc99b63a80cc3a35cc9d05320dfa75d7ebfa"; + sha256 = "12ldjrmip3wgyb2sk1a9d9ikdwg642cw077pmn2x9xim9p88b6y7"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10603,12 +10603,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-12-21"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "00df1089b6267f47c7c0f13536789feb9db1e65b"; - sha256 = "1qj22fhkhamva23jn1f1044vj01p3n4203zdhqasn8836jpw0f82"; + rev = "edb607cc4b329099da825c028c53b1264dbd2350"; + sha256 = "0n8vxdck4xx7y2jr04izvgiqjfqljk8j157hxgy5vvf1fg3jzs2s"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -10651,12 +10651,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b8a41085bfd67fee97ad075c6df65590ce7417a7"; - sha256 = "0m477wpyjxx0g7gdrcwnnhp6s8z23wlb7nljd6lrjkf1lqphb5i7"; + rev = "23cc4bca2f586c8c2f7d2cb78bbbfec4b7361763"; + sha256 = "0hi17i24wrcj0lbs8c7p8m92bzhxp4f531c0612z5iqjxadsi66v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10964,14 +10964,14 @@ final: prev: vim-indent-guides = buildVimPluginFrom2Nix { pname = "vim-indent-guides"; - version = "2021-10-13"; + version = "2023-02-22"; src = fetchFromGitHub { - owner = "nathanaelkane"; + owner = "preservim"; repo = "vim-indent-guides"; - rev = "765084d38bf102a95ab966fb06472e83fa7deff7"; - sha256 = "0gffchphg5chg3311x0mb8xd4ir8psdmdscqpx37bxz5w9n7qsdp"; + rev = "9a106c73f64b16f898276ca87cd55326a2e5cf4c"; + sha256 = "1vm1c7bc3ny6s1nw8zrwr43xym9ryhsmn6xr00i89zphkyci9q55"; }; - meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; + meta.homepage = "https://github.com/preservim/vim-indent-guides/"; }; vim-indent-object = buildVimPluginFrom2Nix { @@ -11265,12 +11265,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-02-05"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; - sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; + rev = "8e735f84d2d954229ee65f4dc71bfc0bec897d98"; + sha256 = "09dl9i2y5drvgnvbid075w5sd0ad7ry1p1am2bfgykjcs1pz3jp1"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11325,12 +11325,12 @@ final: prev: vim-llvm = buildVimPluginFrom2Nix { pname = "vim-llvm"; - version = "2022-09-06"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "acad2bd168778545972d6eef58560376869da373"; - sha256 = "0cjg5dpv68k6cji3k1qjwg24ghadbxzkcfq8i2a3cs18pchmr18x"; + rev = "fcf5358f55ccc93202e496772f49f70b94230268"; + sha256 = "03fx1v6wq00zspg635c5km75ylidm7j93lipns8s3gsa3h1vs76a"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; @@ -11385,12 +11385,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-02-06"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; - sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; + rev = "80cd62f8f2c9c571aa31027b77ab7b8aac3d6346"; + sha256 = "1sykxwg2xhv1gsrlwhv3j6mm1gyl7ph5zscw9bnb1qffs4iqd4a6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11457,12 +11457,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-11-24"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "df4be8626e2c5b2a42eb60e1f100fce469b81f7d"; - sha256 = "0z0lgxjxs2vjbzkmmp1286rrc57am5l7igiapq4fx4jr5bzyrbz6"; + rev = "5d3d1b6cbdc4be0b4c6105c1ab1f769d76d3c68f"; + sha256 = "0rp8nwdhqf73fmzlyvcksqyaqcbyk0qcp6vhkfx4h0r8spd890xb"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -11926,12 +11926,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-11-24"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "e6298736a7835bcb365dd45a8e8bfe86d935c1f8"; - sha256 = "0j08s46s8v2zgh9bf3djkdbga94mycr9if8bh3d4yq68bw8q463b"; + rev = "14685fcc4f487ca42dfe786dd54e4b2913370085"; + sha256 = "1svilmpw4ln2734978llwgxzgn5fpnmqswfq4mmq67ibkv68205j"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11974,12 +11974,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2023-02-05"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; - sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; + rev = "d4fc6f8234c37eef16b6de8055c5fe53b7d7316a"; + sha256 = "03papfmlyrn410c7dflwbxinwymlvizdmwvyvrg24gdxc5vvp24q"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -12202,12 +12202,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2023-01-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "3a088946adb24a2fac7b47f3dea97a3b99f52ddd"; - sha256 = "11vklmj35gj7l4n84fpn503rhpmbg7inlmwlvs3adgc0bfpccflf"; + rev = "e5144baa1f5937de3081c38122b6906e094b2b24"; + sha256 = "1v5g77vr24ry0lgxr93whx04wssfysivv29k02x7nzzaqblmdkhc"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -12538,12 +12538,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2023-01-06"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "16283468becaa6985839f96fea212f8634fbd7d2"; - sha256 = "0grp80kahfnjkns5mbkprigr2j2vh38ajy0r7rh7pp17s3awdy7i"; + rev = "a7eea09ba654a371a90ca77186bf10930b897e80"; + sha256 = "1pch0f3xwzm0kj70in7n9yza05sgnw34rm8fgxmjfm5n19vslrz5"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12646,12 +12646,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-01-15"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "5308556987857eb0fc5f1a774496b29d8dd70f34"; - sha256 = "0c0bqc3cs4k6vzfrpamzay98rxqi7pjg3vgr8sxj0z7ljc5x1101"; + rev = "bea75d10247cc81632747084c290f4a7138e7d69"; + sha256 = "1cjflfxljzr4jx1n2rqrv97s1ci2lb6m9j2hkhivnkhzbazzr8h5"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12754,12 +12754,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-02-13"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b"; - sha256 = "05x30vn156x5r57pz4p0ha44riwbprxph4rc98fl507229mnmp60"; + rev = "c7e61b73a546c9dd0525cd158cc1613bb48e414a"; + sha256 = "02m3pq8lk1qk0mdjjila59grsg2bpsir02jlrir1dmk3ifsy38wh"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -13187,12 +13187,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2b61cd2726d2f2cab5ab66761732143268f78b5c"; - sha256 = "07z5sialjki7w8qipqplpg67jgshgbckv9nmp83x40vrjypsiml9"; + rev = "7c94396ca10e53b09c2c0da8e0dab0fbf5a8acf1"; + sha256 = "03pd044wqxh24c5jm2wwa15icbhf9dd1cw3645lphy1zsyy59rsx"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13487,12 +13487,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2022-07-05"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "5dd613ed68a0ecf0fc6c11cd4098c03583786bf0"; - sha256 = "0p9ykfwdl9m0016v7yi622w9lz8xgi7562gh8xpjzwbzszxds76i"; + rev = "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1"; + sha256 = "1jc4kylbwp6qp84bhdx21lh45gjrqdkzjlvgi9bkdbjs1v7did6s"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -13523,12 +13523,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2023-01-06"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "c75c8bfb0ce01d17bb41cf2c351f98ee3c019bb7"; - sha256 = "0zjbfhz2k414y61kksbh2za6b90ixrshgczppss377jcrxv2y0fi"; + rev = "6e7ebd59489f2e4d0562850ff2ba04831a26b00b"; + sha256 = "17x5sn33kg8zg7jxm5wg4fzj0733vgz3z43d6r0f03zg5l7p27lf"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13727,12 +13727,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-02-07"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; - sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; + rev = "1dba52e6e886bc60184da405a11f8ec22d2f2b49"; + sha256 = "0xgjm626bzs8pf6c79syn49nriprllz289pi62jkwsnh2hxkncxn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13740,12 +13740,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8bbd3b0308ba8238c4d00a24d68a6074e19ccc0a"; - sha256 = "10ahwp0nzz34iq4i8rv1lx45c87zp87wvwg0fn3rwy9hd35gpnn9"; + rev = "6f7e507ed1c397838798e43a8249612864c929ba"; + sha256 = "0qvp05ad880qpmsnxiv43yas6i2wzd344gmlg2x9ydh1h5bgm2m8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13848,12 +13848,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-02-10"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "5224c261825263f46f6771f1b644cae33cd06995"; - sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; + rev = "fb027738340502b556c3f43051f113bcaa7e8e63"; + sha256 = "15f9n7j73rq119qkv4kk3mgw605z93921n7af0x6qywrwaq3smp1"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -14029,12 +14029,12 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-02-08"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; - sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; + rev = "4f2e70d75b7ece1c2a7c852664db492537078996"; + sha256 = "1g19pgxla0f04wihw1k43and7mf07fb23a1ca0zq8f6gsczbxgjq"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -14113,24 +14113,24 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2023-01-18"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "f247421ca0c1934b8bb29abe06d334f0adc93d14"; - sha256 = "1h17aqjicfhp4qsrbwgw3vry8cvy8raxj9bq013n2vzq6h38392h"; + rev = "e50df0b0160363f5dcae60c4f633ade78e59bdc8"; + sha256 = "0qviqfbdss95jz51afpxwrxbvml4lcqpspn8gzv2q0m8avqnlrq8"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-02-21"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "22e55672793be043a5ce9790e7617322ef4ab445"; - sha256 = "0smpk37fiwq4rmgiy2b3f3yyhkwynfy6i70hrxblqn9as5kk7cjc"; + rev = "5e2c9cf8277c42fb634007126c36d765fd176f4a"; + sha256 = "0g9sjx5l0b71wvbgz71v3rm8y55dhi3bmx790aj8bs4f96npdvnp"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14149,12 +14149,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ea91862411d16f4e4bed9c6fef452b8c1b2a662f"; - sha256 = "0fm3kkfvr816n90pl07wyy8mhzpz4rn93xy61hys7cj53q99fngq"; + rev = "1188c4a39167237d551d279c9f84a3e34c7c2329"; + sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14173,12 +14173,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2023-02-19"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "d724faa9bfcd37f1995071e678e30af2229eb1a1"; - sha256 = "0ibcifqm3vrdvq2dzm4qyh7y0i134653irq33jg3kmqijxzzrb58"; + rev = "484eb68c69345b5185e370d91ba631accd522776"; + sha256 = "1l74j5hq3gs4pfln7inbidza1vfrrl8z5pg77njmb7yx1ilc4l9q"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -14197,12 +14197,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "73380b25ec27e9df788752174703cfdad98e66dd"; - sha256 = "0z50c074bk2jsvsglwdw532i8zp0w8yb2sfk5izgm9hk02n2niys"; + rev = "109286f8def4187c3a35494b8760fd14105e9d8c"; + sha256 = "0pf2q8m4jsh9mlxyw0788mh80lfx8wnj1k0h3xg1d0czxdlad9w8"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; @@ -14233,12 +14233,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-01-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "845a6ad5443e3559dde42910c4523a5835c9233b"; - sha256 = "189h3x01jz0hqcvrldfpicnl64f05v00hr93vyldj2isdrspm3pc"; + rev = "f977f0885384776e5f0e3bffa51abbbfd57d90cc"; + sha256 = "1kav03xi1vwasvl56dlwcjy7bli6vynpkf0afhrm8r4dqzxfa6cc"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From 66fa5d3036f1fafa9d58c379f34e881a8250e91b Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 6 Mar 2023 10:18:15 +0100 Subject: [PATCH 163/203] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 327 +++++++++++++----- 1 file changed, 235 insertions(+), 92 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3ed61e541d90..13d540a829d1 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -91,6 +91,17 @@ }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex"; }; + bicep = buildGrammar { + language = "bicep"; + version = "b94a098"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-bicep"; + rev = "b94a0983b69ebb75e9129329a188199ad6ebcec0"; + hash = "sha256-YCVOgLmtCWd4FwfwmQUZhSzP2wS2ZDLwXP1BRrpE0Ls="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; + }; blueprint = buildGrammar { language = "blueprint"; version = "6ef91ca"; @@ -104,34 +115,34 @@ }; c = buildGrammar { language = "c"; - version = "7175a6d"; + version = "f357890"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; - hash = "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A="; + rev = "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"; + hash = "sha256-TLaqolQEN3m3YuNo8JbuRyaEmbWQCWyJJUaDDv4GFDY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "5b6c4d0"; + version = "fcacbeb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; - hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; + rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d"; + hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; capnp = buildGrammar { language = "capnp"; - version = "cb85cdd"; + version = "fc6e2ad"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; - hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; + rev = "fc6e2addf103861b9b3dffb82c543eb6b71061aa"; + hash = "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -148,12 +159,12 @@ }; clojure = buildGrammar { language = "clojure"; - version = "262d6d6"; + version = "421546c"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; - hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; + rev = "421546c2547c74d1d9a0d8c296c412071d37e7ca"; + hash = "sha256-GfDaUZjvTELXkRzJXK303QyPDQr7ozfrz/4iOQNDQTU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -201,14 +212,25 @@ }; meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; + cpon = buildGrammar { + language = "cpon"; + version = "eedb93b"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-cpon"; + rev = "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"; + hash = "sha256-8x+oUbiwt7prGc5cli5HabHoH3q/mBnQzO1Wy2Bauac="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-cpon"; + }; cpp = buildGrammar { language = "cpp"; - version = "56cec4c"; + version = "03fa93d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; - hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; + rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076"; + hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -225,15 +247,26 @@ }; cuda = buildGrammar { language = "cuda"; - version = "a02c214"; + version = "91c3ca3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; - hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; + rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847"; + hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; + cue = buildGrammar { + language = "cue"; + version = "4ffcda8"; + src = fetchFromGitHub { + owner = "eonpatapon"; + repo = "tree-sitter-cue"; + rev = "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2"; + hash = "sha256-a72Z67LXmEuHF/mKIaxi1Y9TNzqLjAiPYR3+VUu9fso="; + }; + meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; + }; d = buildGrammar { language = "d"; version = "c2fbf21"; @@ -269,6 +302,17 @@ generate = true; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; + dhall = buildGrammar { + language = "dhall"; + version = "affb6ee"; + src = fetchFromGitHub { + owner = "jbellerb"; + repo = "tree-sitter-dhall"; + rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8"; + hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ="; + }; + meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall"; + }; diff = buildGrammar { language = "diff"; version = "f69bde8"; @@ -382,12 +426,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "2422bc9"; + version = "9fe5cdf"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "2422bc9373094bfa97653ac540e08759f812523c"; - hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; + rev = "9fe5cdfab0f0d753112e9949a3501f64b75a3d92"; + hash = "sha256-nJikCiksuOAEXEvX2eQ2jZoVmzPQLJ36l4mk0irPW3c="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -426,12 +470,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "67cf1c9"; + version = "31552ac"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a"; - hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ="; + rev = "31552ac43ecaffa443a12ebea68cc526d334892f"; + hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -470,12 +514,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "31ebb7c"; + version = "a4b57cc"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"; - hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw="; + rev = "a4b57cc3bcbfc24550e858159647e9238e7ad1ac"; + hash = "sha256-31FQlLVn5T/9858bPsZQkvejGVjO0ok5T5A13a+S91Y="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -637,12 +681,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "3bdba07"; + version = "0da7f82"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; - hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; + rev = "0da7f826e85b3e589e217adf69a6fd89ee4301b9"; + hash = "sha256-5PCwcbF+UOmn4HE99RgBoDvC7w/QP1lo870+11S6cok="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -692,12 +736,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "8e2f090"; + version = "306d485"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; - hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; + rev = "306d48516a6b3dbb18a184692e8edffa8403018f"; + hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -758,23 +802,23 @@ }; java = buildGrammar { language = "java"; - version = "dd597f1"; + version = "3c24aa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; - hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; + rev = "3c24aa9365985830421a3a7b6791b415961ea770"; + hash = "sha256-06spTQhAIJvixfZ858vPKKv6FJ1AC4JElQzkugxfTuo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "15e85e8"; + version = "5720b24"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; - hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; + rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7"; + hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -857,12 +901,12 @@ }; kdl = buildGrammar { language = "kdl"; - version = "c3c4856"; + version = "e36f054"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "c3c4856464842e05366b1f3ebc4434c9194cad43"; - hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg="; + rev = "e36f054a60c4d9e5ae29567d439fdb8790b53b30"; + hash = "sha256-ZZLe7WBDIX1x1lmuHE1lmZ93YWXTW3iwPgXXbxXR/n4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; @@ -890,12 +934,12 @@ }; latex = buildGrammar { language = "latex"; - version = "6b7ea83"; + version = "376f640"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; - hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs="; + rev = "376f64097b7a26691a2ca60dc94e4dfa417be932"; + hash = "sha256-9hcmCr9HfhKt5dkNN24haubrOySqpxzMoLVEGO53lxk="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -932,6 +976,17 @@ }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; + luap = buildGrammar { + language = "luap"; + version = "bfb38d2"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-luap"; + rev = "bfb38d254f380362e26b5c559a4086ba6e92ba77"; + hash = "sha256-HpKqesIa+x3EQGnWV07jv2uEW9A9TEN4bPNuecXEaFI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-luap"; + }; m68k = buildGrammar { language = "m68k"; version = "d097b12"; @@ -956,28 +1011,39 @@ }; markdown = buildGrammar { language = "markdown"; - version = "7e7aa9a"; + version = "fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; - hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; + rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"; + hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "7e7aa9a"; + version = "fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; - hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; + rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"; + hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; + matlab = buildGrammar { + language = "matlab"; + version = "2d5d3d5"; + src = fetchFromGitHub { + owner = "mstanciu552"; + repo = "tree-sitter-matlab"; + rev = "2d5d3d5193718a86477d4335aba5b34e79147326"; + hash = "sha256-Rpa/F3MIFRmHunJFsuvbs3h3vDlR3U7UZ+sTN5tJS8U="; + }; + meta.homepage = "https://github.com/mstanciu552/tree-sitter-matlab"; + }; menhir = buildGrammar { language = "menhir"; version = "db7953a"; @@ -1002,12 +1068,12 @@ }; meson = buildGrammar { language = "meson"; - version = "5f3138d"; + version = "3d6dfbd"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; - hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s="; + rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"; + hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; @@ -1113,14 +1179,25 @@ }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; + passwd = buildGrammar { + language = "passwd"; + version = "2023939"; + src = fetchFromGitHub { + owner = "ath3"; + repo = "tree-sitter-passwd"; + rev = "20239395eacdc2e0923a7e5683ad3605aee7b716"; + hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4="; + }; + meta.homepage = "https://github.com/ath3/tree-sitter-passwd"; + }; perl = buildGrammar { language = "perl"; - version = "749d26f"; + version = "ff1f0ac"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; - rev = "749d26fe13fb131b92e6515416096e572575b981"; - hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE="; + rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"; + hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4="; }; meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; @@ -1157,6 +1234,17 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + po = buildGrammar { + language = "po"; + version = "d6aed22"; + src = fetchFromGitHub { + owner = "erasin"; + repo = "tree-sitter-po"; + rev = "d6aed225290bc71a15ab6f06305cb11419360c56"; + hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg="; + }; + meta.homepage = "https://github.com/erasin/tree-sitter-po"; + }; poe_filter = buildGrammar { language = "poe_filter"; version = "80dc101"; @@ -1190,6 +1278,17 @@ }; meta.homepage = "https://github.com/mitchellh/tree-sitter-proto"; }; + prql = buildGrammar { + language = "prql"; + version = "5f6c4e4"; + src = fetchFromGitHub { + owner = "PRQL"; + repo = "tree-sitter-prql"; + rev = "5f6c4e4a90633b19e2077c1d37248989789d64be"; + hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ="; + }; + meta.homepage = "https://github.com/PRQL/tree-sitter-prql"; + }; pug = buildGrammar { language = "pug"; version = "884e225"; @@ -1203,12 +1302,12 @@ }; python = buildGrammar { language = "python"; - version = "528855e"; + version = "6282715"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "528855eee2665210e1bf5556de48b8d8dacb8932"; - hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo="; + rev = "62827156d01c74dc1538266344e788da74536b8a"; + hash = "sha256-hVtX4Dyqrq+cSvKTmKMxLbAplcCdR8dfFDoIZNtPFA0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1223,6 +1322,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; + qmldir = buildGrammar { + language = "qmldir"; + version = "6b2b5e4"; + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "tree-sitter-qmldir"; + rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"; + hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4="; + }; + meta.homepage = "https://github.com/Decodetalkers/tree-sitter-qmldir"; + }; qmljs = buildGrammar { language = "qmljs"; version = "ab75be9"; @@ -1258,12 +1368,12 @@ }; racket = buildGrammar { language = "racket"; - version = "1a5df02"; + version = "c2f7baa"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b"; - hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk="; + rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985"; + hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1346,12 +1456,12 @@ }; rust = buildGrammar { language = "rust"; - version = "f7fb205"; + version = "fbf9e50"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; - hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU="; + rev = "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"; + hash = "sha256-hWooQfE7sWXfOkGai3hREoEulcwWT6XPT4xAc+dfjKk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -1401,12 +1511,12 @@ }; smali = buildGrammar { language = "smali"; - version = "5a742af"; + version = "a67a429"; src = fetchFromSourcehut { owner = "~yotam"; repo = "tree-sitter-smali"; - rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5"; - hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM="; + rev = "a67a429784dafa0ca4342d71e6530137ca803883"; + hash = "sha256-Pby6RZKPXyPR41E9m2iRsLgVt7bOn2AZyyb4lvcwYwY="; }; meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali"; }; @@ -1423,14 +1533,14 @@ }; solidity = buildGrammar { language = "solidity"; - version = "52ed088"; + version = "1680203"; src = fetchFromGitHub { - owner = "YongJieYongJie"; + owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; - hash = "sha256-ZyeUYtE0pyQIPnZhza6u6yQO0Mx8brgAUmUpIXYZwb4="; + rev = "168020304759ad5d8b4a88a541a699134e3730c5"; + hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560="; }; - meta.homepage = "https://github.com/YongJieYongJie/tree-sitter-solidity"; + meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; sparql = buildGrammar { language = "sparql"; @@ -1445,16 +1555,27 @@ }; sql = buildGrammar { language = "sql"; - version = "3a3f92b"; + version = "1cb7c7a"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380"; - hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs="; + rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b"; + hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; + starlark = buildGrammar { + language = "starlark"; + version = "8ad93a7"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-starlark"; + rev = "8ad93a74c2a880bc16325affba3cc66c14bb2bde"; + hash = "sha256-HHGE7P/QAPCyu7wecRiDLrQIm8lndFjKOOb9xiyXsfc="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; + }; supercollider = buildGrammar { language = "supercollider"; version = "90c6d9f"; @@ -1490,12 +1611,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0c32d29"; + version = "fe2e325"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "0c32d2948b79939b6464d9ced40fca43912cd486"; - hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4="; + rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508"; + hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1604,12 +1725,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "5d20856"; + version = "c6e56d4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "5d20856f34315b068c41edaee2ac8a100081d259"; - hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; + rev = "c6e56d44c686a67c89e29e773e662567285d610f"; + hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1638,24 +1759,35 @@ }; typescript = buildGrammar { language = "typescript"; - version = "5d20856"; + version = "c6e56d4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "5d20856f34315b068c41edaee2ac8a100081d259"; - hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; + rev = "c6e56d44c686a67c89e29e773e662567285d610f"; + hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; + ungrammar = buildGrammar { + language = "ungrammar"; + version = "debd26f"; + src = fetchFromGitHub { + owner = "Philipp-M"; + repo = "tree-sitter-ungrammar"; + rev = "debd26fed283d80456ebafa33a06957b0c52e451"; + hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU="; + }; + meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; + }; v = buildGrammar { language = "v"; - version = "136f3a0"; + version = "66cf9d3"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; - hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; + rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"; + hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1759,14 +1891,25 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-yang"; }; + yuck = buildGrammar { + language = "yuck"; + version = "48af129"; + src = fetchFromGitHub { + owner = "Philipp-M"; + repo = "tree-sitter-yuck"; + rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030"; + hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ="; + }; + meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; + }; zig = buildGrammar { language = "zig"; - version = "6b3f578"; + version = "f3bc9ff"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; - hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; + rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"; + hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; From 7e4e8b9e3cd28ab7b29c16a747ff16da47f2d52a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 09:45:23 +0000 Subject: [PATCH 164/203] gitRepo: 2.31 -> 2.32 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 8bd9d315d005..2e3eeeb3d6f0 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.31"; + version = "2.32"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ="; + sha256 = "sha256-WY77F4culQ1y8UDIhI117AHBL5mEk40s8HpP3+5muZI="; }; # Fix 'NameError: name 'ssl' is not defined' From 11d602559bbf8eb3101957c04800eaa0aacfa974 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 11:20:50 +0100 Subject: [PATCH 165/203] python310Packages.tplink-omada-client: 1.1.0 -> 1.1.1 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index c51830b7fc7b..26d908037bae 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo="; + hash = "sha256-Fg1rhTS9aP7C1URDfoC3w1w1IduToxYUtwTLDM3916U="; }; nativeBuildInputs = [ From 146322465ff2996ad5143f13e10d6cd5ab23c52a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 11:23:28 +0100 Subject: [PATCH 166/203] python310Packages.tplink-omada-client: add changelog to meta --- pkgs/development/python-modules/tplink-omada-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 26d908037bae..570849a744c2 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the TP-Link Omada SDN Controller API"; homepage = "https://github.com/MarkGodwin/tplink-omada-api"; + changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 663f17398c1820feaa192a523907ba294fe21319 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 11:50:58 +0100 Subject: [PATCH 167/203] python310Packages.screenlogicpy: 0.7.2 -> 0.8.0 Changelog: https://github.com/dieselrabbit/screenlogicpy/releases/tag/v0.8.0 --- pkgs/development/python-modules/screenlogicpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 3bc5e45bd3ba..24529b63a5d1 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.7.2"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0yQ0upLkx5oroEH9BvIOfM5bgmVJw8o83IeAao5ncVs="; + hash = "sha256-VZ2WZpty7PXxU0uqJ/dftUNBW3QEIXrLghKxsW9lsgE="; }; propagatedBuildInputs = [ From c15f803d8e729a0963d207f61826fb75ec1c8d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 10:51:26 +0000 Subject: [PATCH 168/203] python310Packages.scikit-survival: 0.19.0.post1 -> 0.20.0 --- pkgs/development/python-modules/scikit-survival/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 708979a4cb2e..c129f4651e5e 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.19.0.post1"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk="; + sha256 = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; }; nativeBuildInputs = [ From 9e6c5da715c721429f308d1ae7de8665b53c86dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 11:53:43 +0100 Subject: [PATCH 169/203] python310Packages.caio: 0.9.11 -> 0.9.12 Changelog: https://github.com/mosquito/caio/releases/tag/0.9.12 --- pkgs/development/python-modules/caio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index a7dcab5cacd4..0e1bf5b4c2f4 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.11"; + version = "0.9.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE="; + hash = "sha256-uMq/3yWP9OwaVxixGAFCLMsDPoJhmIuG0I7hO7AnIOk="; }; nativeCheckInputs = [ From 41020c3241acbdd15e0c3e9ad947826abc8638b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Mar 2023 12:14:35 +0100 Subject: [PATCH 170/203] bind: avoid tests on aarch64-linux for now They fail on some machines repeatedly and they were only enabled around a day ago (6fa61985866). --- pkgs/servers/dns/bind/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 952ef5690201..e7e904cb94cd 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -61,7 +61,9 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isStatic; + # TODO: investigate the aarch64-linux failures; see this and linked discussions: + # https://github.com/NixOS/nixpkgs/pull/192962 + doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux); checkTarget = "unit"; checkInputs = [ cmocka From b6cc2f2979a19ec2983cef156d5d44b2fe0e545f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Mar 2023 12:25:37 +0100 Subject: [PATCH 171/203] element-desktop: electron_22 -> electron_23 (#219823) Apparently this got changed in 1.11.24[1], but wasn't mentioned in the release notes. Thank you yu-re-ka for pointing that out! [1] https://github.com/vector-im/element-desktop/commit/1462e879450c8bd386b8a4cfc910b58f9ff23c85 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bac25804dd8b..55967d9fd84d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4570,7 +4570,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_22; + electron = electron_23; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From 2d1959e4451ba8920d4cf2c38cbdd002fc51eb37 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Mon, 6 Mar 2023 15:17:20 +0100 Subject: [PATCH 172/203] libqalculate, qalculate-gtk: 4.5.1 -> 4.6.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/applications/science/math/qalculate-qt/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index dd1b7c301ae2..0c82e7ebf376 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-ilPz2W9pcbK5dnYl7Tuxf9p7ag/KmEufckooXBUcCk0="; + sha256 = "sha256-RdvoBs/QeBR032nMh79TLMGU6U7dsY6Ep+QKq4IKRTk="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index dbcacb36be6b..e610297a9020 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-qt"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; + hash = "sha256-/TDzjlB8rW/TorndcLbxY9pc3q7vY3M6eLxBRfnBs9Y="; }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 29cccbd5708e..3f02ec4515b4 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-ipnWrh3L+wp6Qaw9UQVBVHLJvzrpyPFnKbi0U5zlxWU="; + sha256 = "sha256-Chjkpb0v+nzl63UWprEl+BB4+cFtXrLQzTELhf7u/KY="; }; outputs = [ "out" "dev" "doc" ]; From ba0b8cd1051da6499a3fb4adffc25b5dda1f7149 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 15:43:05 +0100 Subject: [PATCH 173/203] python310Packages.exchangelib: 4.7.6 -> 4.9.0 Changelog: https://github.com/ecederstrand/exchangelib/blob/v4.9.0/CHANGELOG.md --- pkgs/development/python-modules/exchangelib/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index b9e8313263e9..2abdb941fc8f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.6"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -36,15 +36,10 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oarmdc2PuE4kQ/qUqQhuzdTpIrrMFCK72CrVmoSH1DI="; + hash = "sha256-4oRIL5s2qN1tB8uijLiPkQTR4cXg4KsxqyZebw/cVkE="; }; patches = [ - (fetchpatch { - name = "tests-timezones.patch"; - url = "https://github.com/ecederstrand/exchangelib/commit/d5d386f54adec8ab02f871332b89e1176c214ba2.diff"; - hash = "sha256-E3Ys6IDJ/yMsvi+1GKbwckkhbNrc9JLM/+GrPtUz+mY="; - }) (fetchpatch { name = "tests-timezones-2.patch"; url = "https://github.com/ecederstrand/exchangelib/commit/419eafcd9261bfd0617823ee437204d5556a8271.diff"; From f8560b606d8bccadce7643de99bbbff3dba2fbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 14:49:52 +0000 Subject: [PATCH 174/203] python310Packages.google-cloud-iot: 2.8.1 -> 2.9.0 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index f3fdc38124aa..2aab21e7e785 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.8.1"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rh23HbHv1FVmiZtyofv0bktv7tZWN3IS5jQawzbFfRk="; + hash = "sha256-mr14CDo+M01ZRfNLerFNeikExmIcV0j17zX/Xn8JT80="; }; propagatedBuildInputs = [ From 45b97fbf3c90dbc017c6a181bcbc8764f141084a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 15:50:14 +0100 Subject: [PATCH 175/203] python310Packages.exchangelib: add changelog to meta --- pkgs/development/python-modules/exchangelib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 2abdb941fc8f..d218b6cc06ec 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; homepage = "https://github.com/ecederstrand/exchangelib"; + changelog = "https://github.com/ecederstrand/exchangelib/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ catern ]; }; From 97a2554073bc9aca7faf0bdf39c2f392f55d1ca0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 16:59:58 +0200 Subject: [PATCH 176/203] ponyc: fix build --- pkgs/development/compilers/ponyc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 18443efae7a2..9311c3112c82 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3, +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { @@ -36,6 +36,11 @@ stdenv.mkDerivation (rec { sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"; }; }) + (fetchpatch { + name = "remove-decnet-header.patch"; + url = "https://github.com/ponylang/ponyc/commit/e5b9b5daec5b19415d519b09954cbd3cf5f34220.patch"; + hash = "sha256-60cOhBBwQxWLwEx+svtFtJ7POQkHzJo2LDPRJ5L/bNk="; + }) ]; postUnpack = '' @@ -93,6 +98,6 @@ stdenv.mkDerivation (rec { homepage = "https://www.ponylang.org"; license = licenses.bsd2; maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; }) From 4056bd515fcf848a63c3e009c078f51f06b1cd07 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 17:03:36 +0200 Subject: [PATCH 177/203] mnemosyne: fix build on darwin --- pkgs/games/mnemosyne/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4a92b8c1014a..33392d6ca05d 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,7 @@ -{ fetchurl +{ lib +, stdenv , python +, fetchurl , anki }: @@ -29,18 +31,16 @@ python.pkgs.buildPythonApplication rec { ]; prePatch = '' - substituteInPlace setup.py --replace /usr $out - find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", + substituteInPlace setup.py \ + --replace '("", ["/usr/local/bin/mplayer"])' "" ''; - # No tests/ directrory in tarball + # No tests/ directory in tarball doCheck = false; postInstall = '' mkdir -p $out/share/applications - mv $out/${python.sitePackages}/$out/share/locale $out/share mv mnemosyne.desktop $out/share/applications - rm -r $out/${python.sitePackages}/nix ''; dontWrapQtApps = true; From fce04513bdbd1befff2fb9d79606472ebc6818d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 15:14:15 +0000 Subject: [PATCH 178/203] python310Packages.yattag: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/yattag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 6bac02af7f80..2a04ace1e00c 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; + sha256 = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; }; meta = with lib; { From c37be28c5ce35a9ce27f282aad7b3ee5b00dd7af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 16:27:35 +0100 Subject: [PATCH 179/203] python310Packages.yattag: update meta --- pkgs/development/python-modules/yattag/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 2a04ace1e00c..16b2ac364e71 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -10,8 +10,9 @@ buildPythonPackage rec { }; meta = with lib; { - description = "Generate HTML or XML in a pythonic way. Pure python alternative to web template engines. Can fill HTML forms with default values and error messages."; - license = [ licenses.lgpl21 ]; + description = "Library to generate HTML or XML"; homepage = "https://www.yattag.org/"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ ]; }; } From a22c1ad4658695d83a0c2511e86dc4703abf24e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 16:29:17 +0100 Subject: [PATCH 180/203] python310Packages.yattag: disable on unsupported Python releases --- pkgs/development/python-modules/yattag/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 16b2ac364e71..ea66c259b212 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -1,12 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "yattag"; version = "1.15.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; + hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; }; meta = with lib; { From 2cb1fddb1741b6c9a7e194bc1c628cb930ba454f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 16:31:06 +0100 Subject: [PATCH 181/203] python310Packages.yattag: add pythonImportsCheck --- pkgs/development/python-modules/yattag/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index ea66c259b212..9fd5e993ec98 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -16,6 +16,10 @@ buildPythonPackage rec { hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; }; + pythonImportsCheck = [ + "yattag" + ]; + meta = with lib; { description = "Library to generate HTML or XML"; homepage = "https://www.yattag.org/"; From 37cb89729485c70a324076b465f10a019733d629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 6 Mar 2023 16:32:01 +0100 Subject: [PATCH 182/203] ddnet: 16.7.2 -> 16.8 https://ddnet.org/downloads/#16.8 --- pkgs/games/ddnet/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 1aaa752fbd6e..57d69bebfa42 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -33,19 +33,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.7.2"; + version = "16.8"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; + hash = "sha256-QhRJJQ87WMsf2yTac2lDRj7B+mTaw2r+RProUr+3zoo="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + hash = "sha256-36Afg0Tsf1/dGhZhd5tbxjMX4dKHqGEhIXS4Lal/rXI="; }; nativeBuildInputs = [ @@ -82,15 +82,6 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - patches = [ - (fetchpatch { - # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' - # https://github.com/ddnet/ddnet/pull/5913 - url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch"; - hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs="; - }) - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ From 0385eec0567ba6b52c45fe4d7d66736ad84b44a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 15:38:14 +0000 Subject: [PATCH 183/203] rust-analyzer-unwrapped: 2023-02-27 -> 2023-03-06 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f00c79b3e76c..4f8fc5beebc5 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-02-27"; - cargoSha256 = "sha256-TjUwtM0QlU6A/dE1H7wljfeRAIy8e9Z6hDIh6z1QZ0s="; + version = "2023-03-06"; + cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-DD86WRVpIGT2xoCDVYA5CMiMzUPgPUM9gJst65v0uXw="; + sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY="; }; auditable = true; # TODO: remove when this is the default From 4b23fea83c5fa2941d8fa8a59cfd04afa040db3d Mon Sep 17 00:00:00 2001 From: Sage Hane Date: Mon, 6 Mar 2023 15:05:53 +0100 Subject: [PATCH 184/203] pokefinder: Add `qtwayland` for Linux --- pkgs/tools/games/pokefinder/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 176cdc76ee0f..fe2c8bdf5608 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -4,6 +4,7 @@ , cmake , qtbase , qttools +, qtwayland , wrapQtAppsHook , gitUpdater }: @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ qtbase qttools ] + ++ lib.optionals stdenv.isLinux [ qtwayland ]; passthru.updateScript = gitUpdater { }; From fcc9c904caab87f83779eca73a21e226ab54f06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Mar 2023 17:51:34 +0100 Subject: [PATCH 185/203] xorg.xorgserver: fixup build on *-darwin Broken by the update in be54beb. --- pkgs/servers/x11/xorg/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index dcd6071fa33c..33493d6a243d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -755,7 +755,7 @@ self: super: in attrs // (let version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; + commonBuildInputs = attrs.buildInputs ++ [ xtrans libxcvt ]; commonPropagatedBuildInputs = [ dbus libGL libGLU libXext libXfont libXfont2 libepoxy libunwind libxshmfence pixman xorgproto zlib @@ -791,7 +791,7 @@ self: super: # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch ]; - buildInputs = commonBuildInputs ++ [ libdrm libxcvt mesa ]; + buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; From 1bf51415baa7bcbeca221a702441694e9a5b2b7b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Mar 2023 18:23:22 +0100 Subject: [PATCH 186/203] ocamlPackages.camlimages_4_2_4: remove broken --- .../ocaml-modules/camlimages/4.2.4.nix | 80 ------------------- pkgs/top-level/ocaml-packages.nix | 2 - 2 files changed, 82 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/camlimages/4.2.4.nix diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix deleted file mode 100644 index 53115c4ecb8e..000000000000 --- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, ocaml -, findlib -, omake -, graphicsmagick -, libpng -, libjpeg -, libexif -, libtiff -, libXpm -, freetype -, giflib -, ghostscript -}: - -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02" && lib.versionOlder ocaml.version "4.10") - "camlimages 4.2.4 is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-${pname}-${version}"; - pname = "camlimages"; - version = "4.2.4"; - - src = fetchFromGitLab { - owner = "camlspotter"; - repo = pname; - rev = "c4f0ec4178fd18cb85872181965c5f020c349160"; - sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr"; - }; - - strictDeps = true; - - nativeBuildInputs = [ - omake - ocaml - findlib - graphicsmagick - ]; - - propagatedBuildInputs = [ - libpng - libjpeg - libexif - libtiff - libXpm - freetype - giflib - ghostscript - ]; - - buildPhase = '' - runHook preBuild - omake - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - omake install - runHook postInstall - ''; - - createFindlibDestdir = true; - - meta = with lib; { - # 4.2.5 requires OCaml >= 4.06 - branch = "4.2.4"; - # incompatible with omake >= 0.10 - broken = true; - homepage = "https://gitlab.com/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2Only; - maintainers = [ - maintainers.vbgl - maintainers.sternenseemann - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b91c1ae009ba..967d61aa0a6c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -144,8 +144,6 @@ let then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - camlimages_4_2_4 = callPackage ../development/ocaml-modules/camlimages/4.2.4.nix { }; - camlimages = callPackage ../development/ocaml-modules/camlimages { }; class_group_vdf = callPackage ../development/ocaml-modules/class_group_vdf { }; From d934806f6201e1749f98d47611dbf90d5fcdc0e7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Mar 2023 18:23:28 +0100 Subject: [PATCH 187/203] =?UTF-8?q?omake:=200.10.5=20=E2=86=92=200.10.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/omake/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index b7d670ce4a7e..32650f80b581 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -1,19 +1,18 @@ -{ lib, stdenv, fetchurl, ocaml, ncurses }: +{ lib, stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { pname = "omake"; - version = "0.10.5"; + version = "0.10.6"; src = fetchurl { url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q="; + hash = "sha256-AuSZEnybyk8HaDZ7mbwDqjFXMXVQ7TDRuRU/aRY8/yE="; }; strictDeps = true; nativeBuildInputs = [ ocaml ]; - buildInputs = [ ncurses ]; meta = { description = "A build system designed for scalability and portability"; From 8ba93b07f9cc5533070c9df076b727ee2178d071 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Mar 2023 18:31:43 +0100 Subject: [PATCH 188/203] python310Packages.aliyun-python-sdk-iot: 8.51.0 -> 8.52.0 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index e421d0b9d709..5fb603a22788 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.51.0"; + version = "8.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Aqyvlb+a6Hos6zc6xkd249WUlk8RpdK475eozjwVDDA="; + hash = "sha256-ztuOTjWBlmTS9IvHqNW+mBi1AT0YW3RjwCZTwEcddpE="; }; propagatedBuildInputs = [ From 9687cb670bb87129e3ed4e3dcc90955b06bc1861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 18:15:48 +0000 Subject: [PATCH 189/203] fselect: 0.8.1 -> 0.8.2 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index c58508f4195e..ed64002fedd2 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-oJyaK39ZCY7RB1U2yBMJg0tvJxnLE5iRLSnywYe9LNU="; + sha256 = "sha256-JhiNLlgnVIrecYNlestociTXHBxfUMTQHSzo3/ePXds="; }; - cargoSha256 = "sha256-sT/WfnROBi4PNcEbs381cMGyKPRuQ3PdJ2kzr/paycQ="; + cargoHash = "sha256-HOOxr5hBrenziai+TxatgXjMi8G3xqIM8OqdMeeKEgg="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; From 9e88cf2c9eec4a91ab6114cbf446930f65ed9e36 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 6 Mar 2023 18:18:06 +0000 Subject: [PATCH 190/203] xorg.xf86videosuncg6: 1.1.2 -> 1.1.3 Release notes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/merge_requests/2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 18 ------------------ pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index afa864fdbf63..b2938cba8226 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2700,11 +2700,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-suncg6"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; - sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz"; + sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index dcd6071fa33c..1816845e4011 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -490,24 +490,6 @@ self: super: xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8 - postPatch = '' - patch -p1 < - #include "gcstruct.h" - #include "cg6_regs.h" - EOF - ''; }); xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f2f7d14ddfaa..888a5aa041f8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -116,7 +116,7 @@ mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 From 46f6c447aa6ce45a68dd89864377a1a8d5d0362e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 6 Mar 2023 18:21:11 +0000 Subject: [PATCH 191/203] xorg.xf86videosunffb: 1.2.2 -> 1.2.3 Release notes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/merge_requests/2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 18 ------------------ pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b2938cba8226..d77c63ff63be 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2716,11 +2716,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-sunffb"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; - sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz"; + sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1816845e4011..44af4d18145e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -494,24 +494,6 @@ self: super: xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22 - postPatch = '' - patch -p1 < Date: Mon, 6 Mar 2023 18:22:56 +0000 Subject: [PATCH 192/203] xorg.xf86videosunleo: 1.2.2 -> 1.2.3 Release notes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/merge_requests/2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 18 ------------------ pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d77c63ff63be..9b336a4447e8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2732,11 +2732,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-sunleo"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; - sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz"; + sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 44af4d18145e..b64adcc1fe30 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -498,24 +498,6 @@ self: super: xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/commit/f58ba53e6b6fe1b6e21d6aa3901a11e6130b95b0 - postPatch = '' - patch -p1 < - #include "gcstruct.h" - #include "leo_regs.h" - EOF - ''; }); xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1aa58d7ad5bd..72ae0963f8e8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz -mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 From 7a550f8b8d26a7036dd0e1d4215c95de4e8f01dd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 6 Mar 2023 18:26:18 +0000 Subject: [PATCH 193/203] xorg.xf86videotrident: 1.3.8 -> 1.4.0 Release notes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/4 --- pkgs/servers/x11/xorg/default.nix | 6 ++--- pkgs/servers/x11/xorg/overrides.nix | 36 ----------------------------- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9b336a4447e8..b7df4ee2b04f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2780,11 +2780,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-trident"; - version = "1.3.8"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; - sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; + url = "mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz"; + sha256 = "16qqn1brz50mwcy42zi1wsw9af56qadsaaiwm9hn1p6plyf22xkz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b64adcc1fe30..41a4a8dce5bb 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -500,42 +500,6 @@ self: super: meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin }); - xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: { - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4 - postPatch = '' - patch -p1 < Date: Mon, 6 Mar 2023 18:31:25 +0000 Subject: [PATCH 194/203] xorg.xf86videoqxl: 0.1.5 -> 0.1.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 10 ---------- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b7df4ee2b04f..97f8ce4a715a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2572,11 +2572,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-qxl"; - version = "0.1.5"; + version = "0.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; - sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz"; + sha256 = "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 41a4a8dce5bb..27ff68213a1b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -509,16 +509,6 @@ self: super: }); xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: { - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/issues/12 - postPatch = '' - patch -p1 < Date: Sun, 5 Mar 2023 02:06:17 -0800 Subject: [PATCH 195/203] sapling: 0.2.20230124-180750-hf8cd450a -> 0.2.20230228-144002-h9440b05e --- .../version-management/sapling/Cargo.lock | 733 ++++++++---------- .../version-management/sapling/default.nix | 13 +- .../version-management/sapling/deps.json | 4 +- 3 files changed, 343 insertions(+), 407 deletions(-) diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index ff91d07e87be..c18683f53274 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -21,6 +21,15 @@ dependencies = [ "synstructure", ] +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -91,6 +100,15 @@ name = "anyhow" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" [[package]] name = "arc-swap" @@ -155,12 +173,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", - "futures-lite", ] [[package]] @@ -175,15 +192,31 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "095183a3539c7c7649b2beb87c2d3f0591f3a7fed07761cc546d244e27e0238c" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "atexit" +version = "0.1.0" +dependencies = [ + "once_cell", +] + +[[package]] +name = "atomic" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +dependencies = [ + "autocfg", +] + [[package]] name = "atomicfile" version = "0.1.0" @@ -260,6 +293,21 @@ dependencies = [ "types", ] +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.10.1" @@ -314,6 +362,7 @@ dependencies = [ "cpython", "cpython_ext", "paste", + "pyatexit", "pyauth", "pyblackbox", "pybytes", @@ -321,7 +370,9 @@ dependencies = [ "pycheckout", "pyclientinfo", "pycliparser", + "pyconchparser", "pyconfigloader", + "pycopytrace", "pydag", "pydiffhelpers", "pydirs", @@ -460,21 +511,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.17" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bstr" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "serde", @@ -482,9 +521,9 @@ dependencies = [ [[package]] name = "bufsize" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" +checksum = "51bbc61bc8800fb287f3394487c159af745cdf2e74743f12245d874ce20eb529" dependencies = [ "bytes 1.4.0", ] @@ -543,9 +582,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" dependencies = [ "serde", ] @@ -667,7 +706,6 @@ dependencies = [ "atty", "bitflags", "strsim 0.8.0", - "term_size", "textwrap 0.11.0", "unicode-width", "vec_map", @@ -688,7 +726,7 @@ dependencies = [ "regex", "strsim 0.10.0", "termcolor", - "terminal_size 0.2.3", + "terminal_size 0.2.5", "textwrap 0.16.0", "unicase", ] @@ -784,12 +822,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "quote", ] @@ -839,6 +877,7 @@ dependencies = [ "lazy_static", "log", "mime", + "parking_lot 0.11.2", "regex", "reqwest", "reqwest-eventsource", @@ -872,7 +911,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1007,6 +1046,16 @@ dependencies = [ "util", ] +[[package]] +name = "copytrace" +version = "0.1.0" +dependencies = [ + "anyhow", + "dag", + "git2", + "types", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -1141,11 +1190,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", - "crossbeam-channel 0.5.6", - "crossbeam-deque 0.8.2", - "crossbeam-epoch 0.9.13", + "crossbeam-channel 0.5.7", + "crossbeam-deque 0.8.3", + "crossbeam-epoch 0.9.14", "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1169,12 +1218,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1190,13 +1239,13 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.13", - "crossbeam-utils 0.8.14", + "crossbeam-epoch 0.9.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1216,14 +1265,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", - "memoffset 0.7.1", + "crossbeam-utils 0.8.15", + "memoffset 0.8.0", "scopeguard", ] @@ -1245,7 +1294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1271,9 +1320,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] @@ -1289,7 +1338,7 @@ dependencies = [ "libc", "mio 0.7.14", "parking_lot 0.11.2", - "signal-hook 0.3.14", + "signal-hook 0.3.15", "signal-hook-mio", "winapi 0.3.9", ] @@ -1335,13 +1384,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" dependencies = [ - "bstr 0.2.17", "csv-core", - "itoa 0.4.8", + "itoa 1.0.6", "ryu", "serde", ] @@ -1365,6 +1413,16 @@ dependencies = [ "syn", ] +[[package]] +name = "ctrlc" +version = "3.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +dependencies = [ + "nix 0.26.2", + "windows-sys 0.45.0", +] + [[package]] name = "curl" version = "0.4.44" @@ -1382,9 +1440,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.59+curl-7.86.0" +version = "0.4.60+curl-7.88.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" dependencies = [ "cc", "libc", @@ -1398,9 +1456,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -1410,9 +1468,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -1425,15 +1483,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -1527,7 +1585,8 @@ dependencies = [ [[package]] name = "deltae" version = "0.3.0" -source = "git+https://github.com/markbt/deltae?rev=1c6e9c7c9184751bd17795d78896d522e77a2ce4#1c6e9c7c9184751bd17795d78896d522e77a2ce4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412cd91a4ec62fcc739ea50c40babe21e3de60d69f36393cce377c7c04ead5a" [[package]] name = "dev-logger" @@ -1579,15 +1638,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1944,9 +1994,9 @@ checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1954,7 +2004,7 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#d35b962b6f3dc787ed64c8d6b1b49a986e69f4d0" +source = "git+https://github.com/facebook/fb303.git?branch=main#5d78ac1eb00320cb53f4333c5c55fecf51177393" dependencies = [ "anyhow", "async-trait", @@ -1975,7 +2025,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "fbinit_macros", "quickcheck", @@ -1984,7 +2034,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "proc-macro2", "quote", @@ -1994,7 +2044,7 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5641439382254134d192ca8fe3c9af23f87b5fa" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#a8ffeb94383c4c6dbdff5997a49851e830a18984" dependencies = [ "anyhow", "async-trait", @@ -2015,7 +2065,7 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "byteorder", "bytes 1.4.0", @@ -2025,7 +2075,7 @@ dependencies = [ [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "bytes 1.4.0", @@ -2042,7 +2092,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "tokio", ] @@ -2060,14 +2110,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2092,7 +2142,7 @@ dependencies = [ "crc32fast", "futures 0.1.31", "libc", - "miniz_oxide", + "miniz_oxide 0.4.4", "tokio-io", ] @@ -2148,25 +2198,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - [[package]] name = "fsinfo" version = "0.1.0" @@ -2200,22 +2231,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futures" version = "0.1.31" @@ -2237,17 +2252,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-batch" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" -dependencies = [ - "futures 0.3.26", - "futures-timer", - "pin-utils", -] - [[package]] name = "futures-channel" version = "0.3.26" @@ -2396,6 +2400,12 @@ dependencies = [ "syn", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "git2" version = "0.14.4" @@ -2449,7 +2459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.2.0", + "bstr", "fnv", "log", "regex", @@ -2457,9 +2467,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes 1.4.0", "fnv", @@ -2470,7 +2480,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", ] @@ -2660,8 +2670,10 @@ name = "hgmain" version = "0.1.0" dependencies = [ "anyhow", + "atexit", "clidispatch", "configloader", + "ctrlc", "dirs 2.0.2", "encoding", "hgcommands", @@ -2693,7 +2705,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "lazy_static", ] @@ -2701,7 +2713,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2720,13 +2732,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes 1.4.0", "fnv", - "itoa 1.0.5", + "itoa 1.0.6", ] [[package]] @@ -2817,7 +2829,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa 1.0.6", "pin-project-lite", "socket2", "tokio", @@ -2936,7 +2948,7 @@ dependencies = [ "fs2", "hex", "libc", - "memmap", + "memmap2", "minibench", "minibytes", "once_cell", @@ -2955,37 +2967,18 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ + "arbitrary", "autocfg", "hashbrown 0.12.3", "rayon", "serde", ] -[[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "insta" -version = "1.26.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" dependencies = [ "console", "lazy_static", @@ -3089,15 +3082,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -3133,12 +3126,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lazystr" version = "0.1.0" @@ -3328,9 +3315,7 @@ name = "manifest-tree" version = "0.1.0" dependencies = [ "anyhow", - "async-runtime", - "futures 0.3.26", - "futures-batch", + "crossbeam 0.8.2", "manifest", "minibench", "minibytes", @@ -3341,7 +3326,7 @@ dependencies = [ "quickcheck", "rand 0.8.5", "rand_chacha 0.3.1", - "sha-1", + "sha1", "storemodel", "thiserror", "tracing", @@ -3387,21 +3372,11 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -3432,9 +3407,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -3523,7 +3498,7 @@ name = "minibytes" version = "0.1.0" dependencies = [ "bytes 1.4.0", - "memmap", + "memmap2", "quickcheck", "serde", ] @@ -3545,22 +3520,12 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.6.23" +name = "miniz_oxide" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", + "adler", ] [[package]] @@ -3571,45 +3536,21 @@ checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", - "miow 0.3.7", + "miow", "ntapi", "winapi 0.3.9", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3628,9 +3569,11 @@ dependencies = [ "anyhow", "clap 3.2.23", "dirs 2.0.2", + "hex", "identity", "libc", "serde", + "sha2 0.10.6", "toml", ] @@ -3702,17 +3645,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "network-doctor" version = "0.1.0" @@ -3741,6 +3673,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "static_assertions", +] + [[package]] name = "nodemap" version = "0.1.0" @@ -3780,24 +3724,6 @@ dependencies = [ "futures 0.3.26", ] -[[package]] -name = "notify" -version = "4.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio 0.6.23", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - [[package]] name = "ntapi" version = "0.3.7" @@ -3878,10 +3804,19 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.17.0" +name = "object" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -4109,9 +4044,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -4119,9 +4054,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -4129,9 +4064,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", @@ -4142,9 +4077,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", @@ -4426,6 +4361,15 @@ dependencies = [ "getopts", ] +[[package]] +name = "pyatexit" +version = "0.1.0" +dependencies = [ + "atexit", + "cpython", + "cpython_ext", +] + [[package]] name = "pyauth" version = "0.1.0" @@ -4514,6 +4458,15 @@ dependencies = [ "pyconfigloader", ] +[[package]] +name = "pyconchparser" +version = "0.1.0" +dependencies = [ + "conch-parser", + "cpython", + "cpython_ext", +] + [[package]] name = "pyconfigloader" version = "0.1.0" @@ -4526,6 +4479,17 @@ dependencies = [ "version", ] +[[package]] +name = "pycopytrace" +version = "0.1.0" +dependencies = [ + "copytrace", + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "types", +] + [[package]] name = "pydag" version = "0.1.0" @@ -5015,7 +4979,7 @@ dependencies = [ "cpython", "cpython_ext", "crossbeam 0.7.3", - "memmap", + "memmap2", "minibytes", "pyrevisionstore", "quickcheck", @@ -5085,7 +5049,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "proc-macro2", "quickcheck", @@ -5225,9 +5189,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -5235,13 +5199,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ - "crossbeam-channel 0.5.6", - "crossbeam-deque 0.8.2", - "crossbeam-utils 0.8.14", + "crossbeam-channel 0.5.7", + "crossbeam-deque 0.8.3", + "crossbeam-utils 0.8.15", "num_cpus", ] @@ -5276,18 +5240,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "a9af2cf09ef80e610097515e80095b7f76660a92743c4185aff5406cd5ce3dd5" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "9c501201393982e275433bc55de7d6ae6f00e7699cd5572c5b57581cd69c881b" dependencies = [ "proc-macro2", "quote", @@ -5356,8 +5320,10 @@ dependencies = [ "async-runtime", "configloader", "configmodel", + "eagerepo", "edenapi", "fail", + "gitstore", "hgcommits", "identity", "manifest-tree", @@ -5434,7 +5400,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tower-service", "trust-dns-resolver", "url", @@ -5500,7 +5466,7 @@ dependencies = [ "lz4-pyframe", "manifest-tree", "maplit", - "memmap", + "memmap2", "mincode", "minibytes", "mockito", @@ -5517,7 +5483,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha-1", + "sha1", "sha2 0.10.6", "storemodel", "tempfile", @@ -5623,6 +5589,12 @@ dependencies = [ "ordered-multimap", ] +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + [[package]] name = "rustc_version" version = "0.4.0" @@ -5634,9 +5606,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ "bitflags", "errno", @@ -5681,9 +5653,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safemem" @@ -5733,9 +5705,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "5d5e082f6ea090deaf0e6dd04b68360fd5cddb152af6ce8927c9d25db299f98c" [[package]] name = "sct" @@ -5810,12 +5782,13 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" +source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90" dependencies = [ "anyhow", "byteorder", "bytes 1.4.0", "serde", + "serde_bytes", "thiserror", ] @@ -5851,11 +5824,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] @@ -5879,31 +5852,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.10.6", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - [[package]] name = "sha1_smol" version = "1.0.0" @@ -5970,9 +5934,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -5986,14 +5950,14 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio 0.7.14", - "signal-hook 0.3.14", + "signal-hook 0.3.15", ] [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -6033,9 +5997,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -6048,9 +6012,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -6059,7 +6023,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6141,21 +6105,14 @@ dependencies = [ [[package]] name = "streampager" version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43e4988f446d8d15c370527d38cdd35b470139775edeeca4c03921486c9b65a" dependencies = [ - "anyhow", "bit-set", - "clap 2.34.0", - "dirs 3.0.2", + "dirs 2.0.2", "enum_dispatch", "indexmap", "lazy_static", "lru", "memmap2", - "notify", - "pest", - "pest_derive", "regex", "scopeguard", "serde", @@ -6237,9 +6194,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" @@ -6249,9 +6206,9 @@ checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -6282,26 +6239,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi 0.3.9", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -6325,12 +6271,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" dependencies = [ "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6396,7 +6342,7 @@ dependencies = [ "libc", "log", "memmem", - "nix", + "nix 0.24.3", "num-derive", "num-traits", "ordered-float 3.4.0", @@ -6426,7 +6372,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "term_size", "unicode-width", ] @@ -6436,7 +6381,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size 0.2.3", + "terminal_size 0.2.5", "unicode-width", ] @@ -6462,10 +6407,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if 1.0.0", "once_cell", ] @@ -6509,7 +6455,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "clap 2.34.0", @@ -6529,11 +6475,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "libc", "num_threads", "serde", @@ -6549,9 +6495,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -6583,15 +6529,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes 1.4.0", "libc", "memchr", - "mio 0.8.5", + "mio 0.8.6", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", @@ -6599,7 +6545,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6626,9 +6572,9 @@ dependencies = [ [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -6647,14 +6593,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", ] [[package]] @@ -6677,7 +6623,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "async-io", "futures 0.3.26", @@ -6704,9 +6650,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes 1.4.0", "futures-core", @@ -6889,7 +6835,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "time 0.3.17", + "time 0.3.20", "tracing", "tracing-core", "tracing-log", @@ -7018,7 +6964,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "sha-1", + "sha1", "thiserror", "util", "vlqencoding", @@ -7057,9 +7003,9 @@ checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "775c11906edafc97bc378816b94585fbd9a054eabaf86fdd0ced94af449efab7" [[package]] name = "unicode-normalization" @@ -7131,7 +7077,7 @@ dependencies = [ "hostname 0.3.1", "lazystr", "libc", - "memmap", + "memmap2", "once_cell", "rand 0.8.5", "shellexpand", @@ -7143,13 +7089,14 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ + "atomic", "getrandom 0.2.8", "serde", - "sha1", + "sha1_smol", ] [[package]] @@ -7345,7 +7292,7 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" +source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90" dependencies = [ "anyhow", "bytes 1.4.0", @@ -7630,16 +7577,6 @@ dependencies = [ "watchman_client", ] -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "xdiff" version = "0.1.0" @@ -7697,9 +7634,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.6+zstd.1.5.2" +version = "2.0.7+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" dependencies = [ "cc", "libc", @@ -7729,7 +7666,7 @@ dependencies = [ "parking_lot 0.11.2", "quickcheck", "serde", - "sha-1", + "sha1", "tempfile", "tracing", "types", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 80cc6bf9e936..4028c41232ff 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE"; + hash = "sha256-e+S5gyyJF3bu6Yo+KjG2lLfjToYzzFj10GTcrPfzxDE="; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM"; + sha256 = "sha256-bJpfa1i3G5Ym5CLVpCt+7q5FNv34CoJBefXaf4qlxNA="; }; # Builds the NodeJS server that runs with `sl web` @@ -101,12 +101,11 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I="; - "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; - "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0="; - "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU="; + "cloned-0.1.0" = "sha256-WHsvgnbAYrFx22p3rbMzlCIaZ8+BTsMswiTv4h+A/ZI="; + "fb303_core-0.0.0" = "sha256-bg4+4kdHfgaEbLzkCftdLH++QKherIAfM7IzlWeOWKI="; + "fbthrift-0.0.1+unstable" = "sha256-0qvab0a3PdvlOq2teXKjYrB9UbWLKzMbHgv/3LSsT+4="; "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; - "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8="; + "serde_bser-0.3.1" = "sha256-Sk3prRcLr2ExXvq7Px4+NRXbY8ZaRWOYexnaUAqQ4ao="; }; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index eeedd64b9506..a40543fde87a 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20230124-180750-hf8cd450a", - "versionHash": "5465836048527734544" + "version": "0.2.20230228-144002-h9440b05e", + "versionHash": "6463510610610398322" } From 1eb6f7eaabb3ea59195f151c6aee6acdee6ed804 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 4 Mar 2023 16:12:06 -0500 Subject: [PATCH 196/203] trealla: only put valgrind in checkInputs if not darwin --- pkgs/development/interpreters/trealla/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 94cc6577998e..7e7196282bd2 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xxd ]; buildInputs = [ readline openssl libffi ]; - checkInputs = [ valgrind ]; + checkInputs = lib.optionals (!stdenv.isDarwin) [ valgrind ]; enableParallelBuilding = true; installPhase = '' From 014968da10a43bf9c4547cfc7ee63be5c7476398 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 5 Mar 2023 08:21:35 -0500 Subject: [PATCH 197/203] Update pkgs/development/interpreters/trealla/default.nix Co-authored-by: Gabriel Dougherty --- pkgs/development/interpreters/trealla/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 7e7196282bd2..84637bed1d09 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xxd ]; buildInputs = [ readline openssl libffi ]; - checkInputs = lib.optionals (!stdenv.isDarwin) [ valgrind ]; + checkInputs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ valgrind ]; enableParallelBuilding = true; installPhase = '' From 1511944c6f4e5b2b86c751c8b8072beb8d69ac5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 19:10:21 +0000 Subject: [PATCH 198/203] treesheets: unstable-2023-02-25 -> unstable-2023-03-05 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a18307c77548..545a116d3480 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-02-25"; + version = "unstable-2023-03-05"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "e2acd675e6aeac609ae071aa169b2661c1fbd862"; - sha256 = "y7y9DQ6oy/1EuLl4FAkRJd0zzMRm/2OOvnfWtwpf8AU="; + rev = "0208ba3b43d0618f6d25e99bfb68dcd6f2e19868"; + sha256 = "bxiAbD9s+O49t2hV0cdbDnSNMkBZOm6Z1cs7sQwlaYQ="; }; nativeBuildInputs = [ From a4384ecfb23b72e8e37103df64aee9bcae0d53ef Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:14:57 +0200 Subject: [PATCH 199/203] llpp: 33 -> 41 --- pkgs/applications/misc/llpp/default.nix | 32 ++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 443a03c2ad22..427be6031585 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,27 +1,34 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, +{ stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "33"; + version = "41"; - src = fetchgit { - url = "git://repo.or.cz/llpp.git"; + src = fetchFromGitHub { + owner = "criticic"; + repo = pname; rev = "v${version}"; - sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs"; - fetchSubmodules = false; + hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE="; }; - patches = (substituteAll { - inherit version; - src = ./fix-build-bash.patch; - }); + patches = [ + (fetchpatch { + name = "system-makedeps.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; + hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; + }) + ]; + + postPatch = '' + sed -i "2d;s/ver=.*/ver=${version}/" build.bash + ''; strictDeps = true; - nativeBuildInputs = [ makeWrapper ocaml ]; + nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; @@ -53,9 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; - # Project is unmaintained and fails to build: - # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int') - broken = true; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55967d9fd84d..8180f1ab5191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31287,7 +31287,7 @@ with pkgs; linuxsampler = callPackage ../applications/audio/linuxsampler { }; llpp = callPackage ../applications/misc/llpp { - inherit (ocaml-ng.ocamlPackages_4_09) ocaml; + inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; lls = callPackage ../applications/networking/lls { }; From 9ba06d5e2ff3eda353e2968cf2635873d8d6ed39 Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Mon, 6 Mar 2023 20:16:05 +0100 Subject: [PATCH 200/203] duden: init at 0.18.0 --- pkgs/applications/misc/duden/default.nix | 40 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/misc/duden/default.nix diff --git a/pkgs/applications/misc/duden/default.nix b/pkgs/applications/misc/duden/default.nix new file mode 100644 index 000000000000..0d310e8c23dc --- /dev/null +++ b/pkgs/applications/misc/duden/default.nix @@ -0,0 +1,40 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonPackage rec { + pname = "duden"; + version = "0.18.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = version; + hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + crayons + pyxdg + pyyaml + requests + setuptools + ]; + + pythonImportsCheck = [ "duden" ]; + + meta = with lib; { + description = "CLI for http://duden.de dictionary written in Python"; + homepage = "https://github.com/radomirbosak/duden"; + changelog = "https://github.com/radomirbosak/duden/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdbc13df66a6..9c5ae6d6ac59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39463,4 +39463,6 @@ with pkgs; ali = callPackage ../tools/networking/ali { }; udict = callPackage ../applications/misc/udict { }; + + duden = callPackage ../applications/misc/duden { }; } From 9b985ffb118dc36281b728570c1bc77ca4bd9ef4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:12:55 +0200 Subject: [PATCH 201/203] weidu: patch against OCaml 4.14 --- pkgs/tools/games/weidu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/tools/games/weidu/default.nix index 91c6217d893a..f63e5d41d3fe 100644 --- a/pkgs/tools/games/weidu/default.nix +++ b/pkgs/tools/games/weidu/default.nix @@ -9,10 +9,10 @@ }: let - # 1. Needs ocaml >= 4.04 and <= 4.11 + # 1. Needs ocaml >= 4.04 and <= 4.11 (patched against 4.14) # 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with # that disabled as weidu is strongly dependent on mutable strings - ocaml' = ocaml-ng.ocamlPackages_4_11.ocaml.override { + ocaml' = ocaml-ng.ocamlPackages_4_14.ocaml.override { unsafeStringSupport = true; }; @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { --replace elkhound ${elkhound}/bin/elkhound mkdir -p obj/{.depend,x86_LINUX} + + # undefined reference to `caml_hash_univ_param' + sed -i "20,21d;s/old_hash_param/hash_param/" hashtbl-4.03.0/myhashtbl.ml ''; nativeBuildInputs = [ elkhound ocaml' perl which gnumake42 ]; From d61ab7452c9652b0b6051f1a2a9f7da38d67dceb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:18:20 +0200 Subject: [PATCH 202/203] mldonkey: migrate to OCaml 4.14 --- pkgs/applications/networking/p2p/mldonkey/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 1291caa088ff..7bc5e2f59679 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch"; hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8="; }) + # Fixes OCaml 4.14 compat + (fetchpatch { + url = "https://github.com/FabioLolix/AUR-artifacts/raw/6721c2d4ef0be9a99499ecf2787e378e50b915e9/mldonkey-fix-build.patch"; + hash = "sha256-HPW/CKfhywy+Km5/64Iok4tO9LJjAk53jVlsYzIRPfs="; + }) ]; preConfigure = '' @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4 ]; buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55967d9fd84d..af7df59edb6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31555,7 +31555,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_13.ocaml.override { + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { unsafeStringSupport = true; }); }; From 883997cb3af6825772ab4d4d38e78109c241c53d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 21:21:36 +0000 Subject: [PATCH 203/203] erdtree: 1.1.0 -> 1.2.0 --- pkgs/tools/system/erdtree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/tools/system/erdtree/default.nix index 7cd1deb3ced6..fd2ee51ad9be 100644 --- a/pkgs/tools/system/erdtree/default.nix +++ b/pkgs/tools/system/erdtree/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "erdtree"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "solidiquis"; repo = pname; rev = "v${version}"; - hash = "sha256-W9rTsumZZ3O0kOc+dT9TC/Z/Katb3q6yFreAVCvX5qo="; + hash = "sha256-VSIeEyMFY10aHLCRmTh0EaGa08KPqrStsPLrssDT0TE="; }; - cargoHash = "sha256-6jFBNkiCFBQbpiYkNZ6dyXH/ZnFHZYFliMZFlE/DodM="; + cargoHash = "sha256-0kDRrsiGJw4iv4CD3FRE4zIBfGO352vnp2KD1RiZafg="; meta = with lib; { description = "File-tree visualizer and disk usage analyzer";